Removed max 80A current limit which aligns to the spec. Who knows how many Amps chargers will have in the future!

jamesharrow · jamesharrow · commit ef9727c26f40 · 2024-06-19T12:04:37.000+01:00
diff --git a/examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h b/examples/energy-management-app/energy-management-common/include/EnergyEvseDelegateImpl.h
@@ -309,9 +309,9 @@ class EnergyEvseDelegate : public EnergyEvse::Delegate
 
 private:
     /* Constants */
-    static constexpr int kDefaultMinChargeCurrent                     = 6000;                  /* 6A */
-    static constexpr int kDefaultUserMaximumChargeCurrent             = kMaximumChargeCurrent; /* 80A */
-    static constexpr int kDefaultRandomizationDelayWindow             = 600;                   /* 600s */
+    static constexpr int kDefaultMinChargeCurrent                     = 6000;  /* 6A */
+    static constexpr int kDefaultUserMaximumChargeCurrent             = 80000; /* 80A */
+    static constexpr int kDefaultRandomizationDelayWindow             = 600;   /* 600s */
     static constexpr int kMaxVehicleIDBufSize                         = 32;
     static constexpr int kPeriodicCheckIntervalRealTimeClockNotSynced = 30;
 
diff --git a/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp b/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp
@@ -83,13 +83,13 @@ Status EnergyEvseDelegate::EnableCharging(const DataModel::Nullable<uint32_t> &
 {
     ChipLogProgress(AppServer, "EnergyEvseDelegate::EnableCharging()");
 
-    if (maximumChargeCurrent < kMinimumChargeCurrent || maximumChargeCurrent > kMaximumChargeCurrent)
+    if (maximumChargeCurrent < kMinimumChargeCurrent)
     {
         ChipLogError(AppServer, "Maximum Current outside limits");
         return Status::ConstraintError;
     }
 
-    if (minimumChargeCurrent < kMinimumChargeCurrent || minimumChargeCurrent > kMaximumChargeCurrent)
+    if (minimumChargeCurrent < kMinimumChargeCurrent)
     {
         ChipLogError(AppServer, "Maximum Current outside limits");
         return Status::ConstraintError;
@@ -344,7 +344,7 @@ Status EnergyEvseDelegate::HwRegisterEvseCallbackHandler(EVSECallbackFunc handle
  */
 Status EnergyEvseDelegate::HwSetMaxHardwareCurrentLimit(int64_t currentmA)
 {
-    if (currentmA < kMinimumChargeCurrent || currentmA > kMaximumChargeCurrent)
+    if (currentmA < kMinimumChargeCurrent)
     {
         return Status::ConstraintError;
     }
@@ -366,7 +366,7 @@ Status EnergyEvseDelegate::HwSetMaxHardwareCurrentLimit(int64_t currentmA)
  */
 Status EnergyEvseDelegate::HwSetCircuitCapacity(int64_t currentmA)
 {
-    if (currentmA < kMinimumChargeCurrent || currentmA > kMaximumChargeCurrent)
+    if (currentmA < kMinimumChargeCurrent)
     {
         return Status::ConstraintError;
     }
@@ -391,7 +391,7 @@ Status EnergyEvseDelegate::HwSetCircuitCapacity(int64_t currentmA)
  */
 Status EnergyEvseDelegate::HwSetCableAssemblyLimit(int64_t currentmA)
 {
-    if (currentmA < kMinimumChargeCurrent || currentmA > kMaximumChargeCurrent)
+    if (currentmA < kMinimumChargeCurrent)
     {
         return Status::ConstraintError;
     }
@@ -1316,7 +1316,7 @@ CHIP_ERROR EnergyEvseDelegate::SetCircuitCapacity(int64_t newValue)
 {
     int64_t oldValue = mCircuitCapacity;
 
-    if (newValue >= kMaximumChargeCurrent)
+    if (newValue < 0)
     {
         return CHIP_IM_GLOBAL_STATUS(ConstraintError);
     }
@@ -1340,7 +1340,7 @@ CHIP_ERROR EnergyEvseDelegate::SetMinimumChargeCurrent(int64_t newValue)
 {
     int64_t oldValue = mMinimumChargeCurrent;
 
-    if (newValue >= kMaximumChargeCurrent)
+    if (newValue < 0)
     {
         return CHIP_IM_GLOBAL_STATUS(ConstraintError);
     }
@@ -1388,7 +1388,7 @@ CHIP_ERROR EnergyEvseDelegate::SetMaximumDischargeCurrent(int64_t newValue)
 {
     int64_t oldValue = mMaximumDischargeCurrent;
 
-    if (newValue >= kMaximumChargeCurrent)
+    if (newValue < 0)
     {
         return CHIP_IM_GLOBAL_STATUS(ConstraintError);
     }
@@ -1410,7 +1410,7 @@ int64_t EnergyEvseDelegate::GetUserMaximumChargeCurrent()
 
 CHIP_ERROR EnergyEvseDelegate::SetUserMaximumChargeCurrent(int64_t newValue)
 {
-    if ((newValue < 0) || (newValue > kMaximumChargeCurrent))
+    if (newValue < 0)
     {
         return CHIP_IM_GLOBAL_STATUS(ConstraintError);
     }
diff --git a/src/app/clusters/energy-evse-server/energy-evse-server.cpp b/src/app/clusters/energy-evse-server/energy-evse-server.cpp
@@ -308,13 +308,13 @@ void Instance::HandleEnableCharging(HandlerContext & ctx, const Commands::Enable
     auto & minimumChargeCurrent = commandData.minimumChargeCurrent;
     auto & maximumChargeCurrent = commandData.maximumChargeCurrent;
 
-    if ((minimumChargeCurrent < kMinimumChargeCurrent) || (minimumChargeCurrent > kMaximumChargeCurrent))
+    if (minimumChargeCurrent < kMinimumChargeCurrent)
     {
         ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);
         return;
     }
 
-    if ((maximumChargeCurrent < kMinimumChargeCurrent) || (maximumChargeCurrent > kMaximumChargeCurrent))
+    if (maximumChargeCurrent < kMinimumChargeCurrent)
     {
         ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);
         return;
@@ -338,7 +338,7 @@ void Instance::HandleEnableDischarging(HandlerContext & ctx, const Commands::Ena
     auto & dischargingEnabledUntil = commandData.dischargingEnabledUntil;
     auto & maximumDischargeCurrent = commandData.maximumDischargeCurrent;
 
-    if ((maximumDischargeCurrent < kMinimumChargeCurrent) || (maximumDischargeCurrent > kMaximumChargeCurrent))
+    if (maximumDischargeCurrent < kMinimumChargeCurrent)
     {
         ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);
         return;
diff --git a/src/app/clusters/energy-evse-server/energy-evse-server.h b/src/app/clusters/energy-evse-server/energy-evse-server.h
@@ -36,7 +36,6 @@ namespace EnergyEvse {
 
 // Spec-defined constraints
 constexpr int64_t kMinimumChargeCurrent         = 0;
-constexpr int64_t kMaximumChargeCurrent         = 80000;
 constexpr uint32_t kMaxRandomizationDelayWindow = 86400;
 constexpr uint8_t kEvseTargetsMaxNumberOfDays   = 7;
 constexpr uint8_t kEvseTargetsMaxTargetsPerDay  = 10;
@@ -173,9 +172,8 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
 public:
     Instance(EndpointId aEndpointId, Delegate & aDelegate, Feature aFeature, OptionalAttributes aOptionalAttrs,
              OptionalCommands aOptionalCmds) :
-        AttributeAccessInterface(MakeOptional(aEndpointId), Id),
-        CommandHandlerInterface(MakeOptional(aEndpointId), Id), mDelegate(aDelegate), mFeature(aFeature),
-        mOptionalAttrs(aOptionalAttrs), mOptionalCmds(aOptionalCmds)
+        AttributeAccessInterface(MakeOptional(aEndpointId), Id), CommandHandlerInterface(MakeOptional(aEndpointId), Id),
+        mDelegate(aDelegate), mFeature(aFeature), mOptionalAttrs(aOptionalAttrs), mOptionalCmds(aOptionalCmds)
     {
         /* set the base class delegates endpointId */
         mDelegate.SetEndpointId(aEndpointId);

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,13 @@ Status EnergyEvseDelegate::EnableCharging(const DataModel::Nullable<uint32_t> &`
`83`	`83`	`{`
`84`	`84`	`ChipLogProgress(AppServer, "EnergyEvseDelegate::EnableCharging()");`
`85`	`85`
`86`		`- if (maximumChargeCurrent < kMinimumChargeCurrent \|\| maximumChargeCurrent > kMaximumChargeCurrent)`
	`86`	`+ if (maximumChargeCurrent < kMinimumChargeCurrent)`
`87`	`87`	`{`
`88`	`88`	`ChipLogError(AppServer, "Maximum Current outside limits");`
`89`	`89`	`return Status::ConstraintError;`
`90`	`90`	`}`
`91`	`91`
`92`		`- if (minimumChargeCurrent < kMinimumChargeCurrent \|\| minimumChargeCurrent > kMaximumChargeCurrent)`
	`92`	`+ if (minimumChargeCurrent < kMinimumChargeCurrent)`
`93`	`93`	`{`
`94`	`94`	`ChipLogError(AppServer, "Maximum Current outside limits");`
`95`	`95`	`return Status::ConstraintError;`
`@@ -344,7 +344,7 @@ Status EnergyEvseDelegate::HwRegisterEvseCallbackHandler(EVSECallbackFunc handle`
`344`	`344`	`*/`
`345`	`345`	`Status EnergyEvseDelegate::HwSetMaxHardwareCurrentLimit(int64_t currentmA)`
`346`	`346`	`{`
`347`		`- if (currentmA < kMinimumChargeCurrent \|\| currentmA > kMaximumChargeCurrent)`
	`347`	`+ if (currentmA < kMinimumChargeCurrent)`
`348`	`348`	`{`
`349`	`349`	`return Status::ConstraintError;`
`350`	`350`	`}`
`@@ -366,7 +366,7 @@ Status EnergyEvseDelegate::HwSetMaxHardwareCurrentLimit(int64_t currentmA)`
`366`	`366`	`*/`
`367`	`367`	`Status EnergyEvseDelegate::HwSetCircuitCapacity(int64_t currentmA)`
`368`	`368`	`{`
`369`		`- if (currentmA < kMinimumChargeCurrent \|\| currentmA > kMaximumChargeCurrent)`
	`369`	`+ if (currentmA < kMinimumChargeCurrent)`
`370`	`370`	`{`
`371`	`371`	`return Status::ConstraintError;`
`372`	`372`	`}`
`@@ -391,7 +391,7 @@ Status EnergyEvseDelegate::HwSetCircuitCapacity(int64_t currentmA)`
`391`	`391`	`*/`
`392`	`392`	`Status EnergyEvseDelegate::HwSetCableAssemblyLimit(int64_t currentmA)`
`393`	`393`	`{`
`394`		`- if (currentmA < kMinimumChargeCurrent \|\| currentmA > kMaximumChargeCurrent)`
	`394`	`+ if (currentmA < kMinimumChargeCurrent)`
`395`	`395`	`{`
`396`	`396`	`return Status::ConstraintError;`
`397`	`397`	`}`
`@@ -1316,7 +1316,7 @@ CHIP_ERROR EnergyEvseDelegate::SetCircuitCapacity(int64_t newValue)`
`1316`	`1316`	`{`
`1317`	`1317`	`int64_t oldValue = mCircuitCapacity;`
`1318`	`1318`
`1319`		`- if (newValue >= kMaximumChargeCurrent)`
	`1319`	`+ if (newValue < 0)`
`1320`	`1320`	`{`
`1321`	`1321`	`return CHIP_IM_GLOBAL_STATUS(ConstraintError);`
`1322`	`1322`	`}`
`@@ -1340,7 +1340,7 @@ CHIP_ERROR EnergyEvseDelegate::SetMinimumChargeCurrent(int64_t newValue)`
`1340`	`1340`	`{`
`1341`	`1341`	`int64_t oldValue = mMinimumChargeCurrent;`
`1342`	`1342`
`1343`		`- if (newValue >= kMaximumChargeCurrent)`
	`1343`	`+ if (newValue < 0)`
`1344`	`1344`	`{`
`1345`	`1345`	`return CHIP_IM_GLOBAL_STATUS(ConstraintError);`
`1346`	`1346`	`}`
`@@ -1388,7 +1388,7 @@ CHIP_ERROR EnergyEvseDelegate::SetMaximumDischargeCurrent(int64_t newValue)`
`1388`	`1388`	`{`
`1389`	`1389`	`int64_t oldValue = mMaximumDischargeCurrent;`
`1390`	`1390`
`1391`		`- if (newValue >= kMaximumChargeCurrent)`
	`1391`	`+ if (newValue < 0)`
`1392`	`1392`	`{`
`1393`	`1393`	`return CHIP_IM_GLOBAL_STATUS(ConstraintError);`
`1394`	`1394`	`}`
`@@ -1410,7 +1410,7 @@ int64_t EnergyEvseDelegate::GetUserMaximumChargeCurrent()`
`1410`	`1410`
`1411`	`1411`	`CHIP_ERROR EnergyEvseDelegate::SetUserMaximumChargeCurrent(int64_t newValue)`
`1412`	`1412`	`{`
`1413`		`- if ((newValue < 0) \|\| (newValue > kMaximumChargeCurrent))`
	`1413`	`+ if (newValue < 0)`
`1414`	`1414`	`{`
`1415`	`1415`	`return CHIP_IM_GLOBAL_STATUS(ConstraintError);`
`1416`	`1416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,13 +308,13 @@ void Instance::HandleEnableCharging(HandlerContext & ctx, const Commands::Enable`
`308`	`308`	`auto & minimumChargeCurrent = commandData.minimumChargeCurrent;`
`309`	`309`	`auto & maximumChargeCurrent = commandData.maximumChargeCurrent;`
`310`	`310`
`311`		`- if ((minimumChargeCurrent < kMinimumChargeCurrent) \|\| (minimumChargeCurrent > kMaximumChargeCurrent))`
	`311`	`+ if (minimumChargeCurrent < kMinimumChargeCurrent)`
`312`	`312`	`{`
`313`	`313`	`ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);`
`314`	`314`	`return;`
`315`	`315`	`}`
`316`	`316`
`317`		`- if ((maximumChargeCurrent < kMinimumChargeCurrent) \|\| (maximumChargeCurrent > kMaximumChargeCurrent))`
	`317`	`+ if (maximumChargeCurrent < kMinimumChargeCurrent)`
`318`	`318`	`{`
`319`	`319`	`ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);`
`320`	`320`	`return;`
`@@ -338,7 +338,7 @@ void Instance::HandleEnableDischarging(HandlerContext & ctx, const Commands::Ena`
`338`	`338`	`auto & dischargingEnabledUntil = commandData.dischargingEnabledUntil;`
`339`	`339`	`auto & maximumDischargeCurrent = commandData.maximumDischargeCurrent;`
`340`	`340`
`341`		`- if ((maximumDischargeCurrent < kMinimumChargeCurrent) \|\| (maximumDischargeCurrent > kMaximumChargeCurrent))`
	`341`	`+ if (maximumDischargeCurrent < kMinimumChargeCurrent)`
`342`	`342`	`{`
`343`	`343`	`ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);`
`344`	`344`	`return;`