Browse Source

2022-02-13 / Wendell

Actions
1. modify UserPrice, TotalCost, AccountBalance, CostDiscount type to float

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
Wendell 3 years ago
parent
commit
390e1781c8
1 changed files with 14 additions and 14 deletions
  1. 14 14
      EVSE/Projects/define.h

+ 14 - 14
EVSE/Projects/define.h

@@ -322,7 +322,7 @@ enum CoreProfile {
      TimeOffsetNextTransition,
      SystemUptimeSec,
      FreeVend,
-	 FreeVendIdtag,
+     FreeVendIdtag,
      OcppServer,
      MaintainServer,
      StatusNotificationPeriodically,
@@ -865,10 +865,10 @@ struct ConnectorInfoData
     float                   CapabilityCurrent;              // unit 0.1A
     float                   CapabilityPower;                // unit 0.1kW
 
-    unsigned int            UserPrice;                      // connector user's user price, unit: 0.01 (dollar / kWh)
-    unsigned int            TotalCost;                      // connector user's total cost, unit: 0.01 dollar
-    int                     AccountBalance;                 // connector user's account balance, unit: 0.01 dollar
-    int                     CostDiscount;                   // connector user's account balance, unit: 0.01 dollar
+    float                   UserPrice;                      // connector user's user price, unit: 1 (dollar / kWh)
+    float                   TotalCost;                      // connector user's total cost, unit: 1 dollar
+    float                   AccountBalance;                 // connector user's account balance, unit: 1 dollar
+    float                   CostDiscount;                   // connector user's account balance, unit: 1 dollar
 };
 
 typedef union
@@ -1490,10 +1490,10 @@ struct AlarmCodeData
             unsigned char DcInputOVP:1;                             //bit 7
             //AlarmVal[16]
             unsigned char DcInputUVP:1;                             //bit 0
-            unsigned char PsuCanCommFault:1;                        //bit 1 ~ bit 7
-            unsigned char PsuDcDcOtp:1;                        //bit 2 ~ bit 7
-            unsigned char PsuDcDcOvp:1;                        //bit 3 ~ bit 7
-            unsigned char :4;                        //reserved bit 4 ~ bit 7
+            unsigned char PsuCanCommFault:1;                        //bit 1
+            unsigned char PsuDcDcOtp:1;                             //bit 2
+            unsigned char PsuDcDcOvp:1;                             //bit 3
+            unsigned char :4;                                       //reserved bit 4 ~ bit 7
             //AlarmVal[17]
             unsigned char :8;                                       //reserved bit 0 ~ bit 7
             //AlarmVal[18]
@@ -4585,7 +4585,7 @@ struct StructWeatherInfo
 
 struct StructLineStatusPage
 {
-	unsigned char SerialNo[CONNECTOR_QUANTITY][37];
+    unsigned char SerialNo[CONNECTOR_QUANTITY][37];
 };
 
 struct StructCreditDeductResult
@@ -4597,7 +4597,7 @@ struct StructCreditDeductResult
     unsigned char RRN[20];
     unsigned char storeId[20];
     unsigned char approvalNo[20];
-    double		  amount;
+    double        amount;
     unsigned char deductResult:1;
     unsigned char isDonateInvoice:1;
 };
@@ -4607,7 +4607,7 @@ struct StructTcciCustomData
     struct StructChargerInfo ChargerInfo;
     struct StructWeatherInfo WeatherInfo;
     struct StructCreditDeductResult DeductInfo;
-	struct StructLineStatusPage LineStatusPage;
+    struct StructLineStatusPage LineStatusPage;
     unsigned char TriggerReaderReq[3];
 
     unsigned char ReportCreditDeductReq:1;
@@ -4900,8 +4900,8 @@ enum OCPP20CtrlrVariable
 	OCPPCommCtrlr_WebSocketPingInterval,
 	OCPPCommCtrlr_ResetRetries,
 	OCPPCommCtrlr_PublicKeyWithSignedMeterValue,
-	OCPPCommCtrlr_StatusNotificationPeriodically,
-	OCPPCommCtrlr_StatusNotificationInterval,
+    OCPPCommCtrlr_StatusNotificationPeriodically,
+    OCPPCommCtrlr_StatusNotificationInterval,
     OCPPCommCtrlr_VariableVersion,
 	ReservationCtrlr_Enabled,
 	ReservationCtrlr_Available,