Rename SoC to Soc and LoadPoint to Loadpoint (evcc-io#5549)

FanDjango · Dec 23, 2022 · 03d6d14 · 03d6d14
1 parent 54f204c
commit 03d6d14
Show file tree

Hide file tree

Showing 165 changed files with 1,054 additions and 1,032 deletions.
diff --git a/api/api.go b/api/api.go
@@ -55,8 +55,8 @@ type ActionConfig struct {
 	Mode       *ChargeMode `mapstructure:"mode,omitempty"`       // Charge Mode
 	MinCurrent *float64    `mapstructure:"minCurrent,omitempty"` // Minimum Current
 	MaxCurrent *float64    `mapstructure:"maxCurrent,omitempty"` // Maximum Current
-	MinSoC     *int        `mapstructure:"minSoC,omitempty"`     // Minimum SoC
-	TargetSoC  *int        `mapstructure:"targetSoC,omitempty"`  // Target SoC
+	MinSoc     *int        `mapstructure:"minSoc,omitempty"`     // Minimum Soc
+	TargetSoc  *int        `mapstructure:"targetSoc,omitempty"`  // Target Soc
 }
 
 // Merge merges all non-nil properties of the additional config into the base config.
@@ -71,11 +71,11 @@ func (a ActionConfig) Merge(m ActionConfig) ActionConfig {
 	if m.MaxCurrent != nil {
 		a.MaxCurrent = m.MaxCurrent
 	}
-	if m.MinSoC != nil {
-		a.MinSoC = m.MinSoC
+	if m.MinSoc != nil {
+		a.MinSoc = m.MinSoc
 	}
-	if m.TargetSoC != nil {
-		a.TargetSoC = m.TargetSoC
+	if m.TargetSoc != nil {
+		a.TargetSoc = m.TargetSoc
 	}
 	return a
 }
@@ -107,9 +107,9 @@ type MeterCurrent interface {
 	Currents() (float64, float64, float64, error)
 }
 
-// Battery is able to provide battery SoC in %
+// Battery is able to provide battery Soc in %
 type Battery interface {
-	SoC() (float64, error)
+	Soc() (float64, error)
 }
 
 // ChargeState provides current charging status
@@ -204,7 +204,7 @@ type VehiclePosition interface {
 
 // SocLimiter returns the vehicles charge limit
 type SocLimiter interface {
-	TargetSoC() (float64, error)
+	TargetSoc() (float64, error)
 }
 
 // VehicleChargeController allows to start/stop the charging session on the vehicle side

diff --git a/api/proto/pb/vehicle.pb.go b/api/proto/pb/vehicle.pb.go
diff --git a/api/proto/pb/vehicle_grpc.pb.go b/api/proto/pb/vehicle_grpc.pb.go
diff --git a/api/proto/vehicle.proto b/api/proto/vehicle.proto
@@ -6,7 +6,7 @@ option go_package = "proto/pb";
 
 service Vehicle {
 	rpc New (NewRequest) returns (NewReply) {}
-	rpc SoC (SoCRequest) returns (SoCReply) {}
+	rpc Soc (SocRequest) returns (SocReply) {}
 }
 
 message NewRequest {
@@ -19,11 +19,11 @@ message NewReply {
 	int64 vehicle_id = 1;
 }
 
-message SoCRequest {
+message SocRequest {
 	string token = 1;
 	int64 vehicle_id = 2;
 }
 
-message SoCReply {
+message SocReply {
 	double soc = 1;
 }
diff --git a/assets/js/components/Energyflow/Energyflow.story.vue b/assets/js/components/Energyflow/Energyflow.story.vue
@@ -25,7 +25,7 @@ import Energyflow from "./Energyflow.vue";
 				:gridPower="1200"
 				:homePower="2000"
 				:batteryPower="800"
-				:batterySoC="77"
+				:batterySoc="77"
 				siteTitle="Home"
 			/>
 		</Variant>
@@ -40,7 +40,7 @@ import Energyflow from "./Energyflow.vue";
 				:loadpointsPower="1400"
 				:activeLoadpointsCount="1"
 				:batteryPower="-1500"
-				:batterySoC="75"
+				:batterySoc="75"
 				siteTitle="Home"
 			/>
 		</Variant>
@@ -53,7 +53,7 @@ import Energyflow from "./Energyflow.vue";
 				:gridPower="700"
 				:homePower="3300"
 				:batteryPower="1500"
-				:batterySoC="30"
+				:batterySoc="30"
 				siteTitle="Home"
 			/>
 		</Variant>
@@ -67,7 +67,7 @@ import Energyflow from "./Energyflow.vue";
 				:loadpointsPower="7500"
 				:activeLoadpointsCount="2"
 				:batteryPower="-700"
-				:batterySoC="95"
+				:batterySoc="95"
 				siteTitle="Home"
 			/>
 		</Variant>
@@ -82,7 +82,7 @@ import Energyflow from "./Energyflow.vue";
 				:loadpointsPower="5600"
 				:activeLoadpointsCount="2"
 				:batteryPower="800"
-				:batterySoC="76"
+				:batterySoc="76"
 				siteTitle="Home"
 			/>
 		</Variant>
@@ -97,7 +97,7 @@ import Energyflow from "./Energyflow.vue";
 				:loadpointsPower="5500"
 				:activeLoadpointsCount="1"
 				:batteryPower="0"
-				:batterySoC="0"
+				:batterySoc="0"
 				siteTitle="Home"
 			/>
 		</Variant>
@@ -110,7 +110,7 @@ import Energyflow from "./Energyflow.vue";
 				:gridPower="-300"
 				:homePower="300"
 				:batteryPower="-100"
-				:batterySoC="55"
+				:batterySoc="55"
 				siteTitle="Home"
 			/>
 		</Variant>