浏览代码

[Improve][Modularization][Module_OcppBackend / Module_OcppBackend20]

2021.09.23 / Folus Wen

Actions:
1. checkChargePointMaxProfile() & checkCompositeSchedule() logic improve.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 3 年之前
父节点
当前提交
4254f40264

文件差异内容过多而无法显示
+ 224 - 224
EVSE/Modularization/ocpp20/MessageHandler.c


+ 27 - 27
EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -1517,7 +1517,7 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != maxProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != maxProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= maxProfile.StackLevel)
 				  )
 				{
@@ -1598,9 +1598,9 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 									sprintf((char*)maxProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -1703,9 +1703,9 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 							sprintf((char*)maxProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -1762,7 +1762,7 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 			DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", maxProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);
@@ -2051,7 +2051,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != txProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != txProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= txProfile.StackLevel)
 				  )
 				{
@@ -2131,9 +2131,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 									sprintf((char*)txProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -2236,9 +2236,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 							sprintf((char*)txProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -2295,7 +2295,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			DEBUG_INFO("Profile valid from: %s\n", txProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", txProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", txProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", txProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", txProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", txProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", txProfile.ChargingSchedule.Duration);
@@ -2345,7 +2345,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != defaultTxProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != defaultTxProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= defaultTxProfile.StackLevel)
 				  )
 				{
@@ -2426,9 +2426,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 									sprintf((char*)defaultTxProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -2531,9 +2531,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 							sprintf((char*)defaultTxProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -2590,7 +2590,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			DEBUG_INFO("Profile valid from: %s\n", defaultTxProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", defaultTxProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", defaultTxProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", defaultTxProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", defaultTxProfile.ChargingSchedule.Duration);
@@ -2639,7 +2639,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != maxProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != maxProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= maxProfile.StackLevel)
 				  )
 				{
@@ -2720,9 +2720,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 									sprintf((char*)maxProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -2825,9 +2825,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 							sprintf((char*)maxProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -2884,7 +2884,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", maxProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);
@@ -3038,7 +3038,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 		DEBUG_INFO("Profile valid from: %s\n", txProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", txProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", txProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", txProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", txProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", txProfile.ChargingSchedule.Duration);
@@ -3197,7 +3197,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 		DEBUG_INFO("Profile valid from: %s\n", defaultTxProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", defaultTxProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", defaultTxProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", defaultTxProfile.ChargingSchedule.Duration);
@@ -3337,7 +3337,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 		DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);

+ 28 - 28
EVSE/Modularization/ocppph/MessageHandler.c

@@ -1222,7 +1222,7 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != maxProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != maxProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= maxProfile.StackLevel)
 				  )
 				{
@@ -1303,9 +1303,9 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 									sprintf((char*)maxProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -1408,9 +1408,9 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 							sprintf((char*)maxProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -1467,7 +1467,7 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 			DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", maxProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);
@@ -1606,7 +1606,7 @@ void checkChargePointMaxProfile(uint32_t durationReq, struct StructChargingProfi
 		DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);
@@ -1756,7 +1756,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != txProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != txProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= txProfile.StackLevel)
 				  )
 				{
@@ -1836,9 +1836,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 									sprintf((char*)txProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -1941,9 +1941,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 							sprintf((char*)txProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)txProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -2000,7 +2000,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			DEBUG_INFO("Profile valid from: %s\n", txProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", txProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", txProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", txProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", txProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", txProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", txProfile.ChargingSchedule.Duration);
@@ -2050,7 +2050,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != defaultTxProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != defaultTxProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= defaultTxProfile.StackLevel)
 				  )
 				{
@@ -2131,9 +2131,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 									sprintf((char*)defaultTxProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -2236,9 +2236,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 							sprintf((char*)defaultTxProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)defaultTxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -2295,7 +2295,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			DEBUG_INFO("Profile valid from: %s\n", defaultTxProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", defaultTxProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", defaultTxProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", defaultTxProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", defaultTxProfile.ChargingSchedule.Duration);
@@ -2344,7 +2344,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			}
 			else
 			{
-				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "ChargingProfileId")) != maxProfile.ChargingProfileId) &&
+				if((json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "chargingProfileId")) != maxProfile.ChargingProfileId) &&
 				   (json_object_get_int(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "stackLevel")) >= maxProfile.StackLevel)
 				  )
 				{
@@ -2425,9 +2425,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 									sprintf((char*)maxProfile.ValidTo, " ");
 								}
 
-								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+								if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 								{
-									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+									sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 								}
 								else
 								{
@@ -2530,9 +2530,9 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 							sprintf((char*)maxProfile.ValidTo, " ");
 						}
 
-						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind") != NULL)
+						if(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind") != NULL)
 						{
-							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "RecurrencyKind")));
+							sprintf((char*)maxProfile.RecurrencyKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(obj, "csChargingProfiles"), "recurrencyKind")));
 						}
 						else
 						{
@@ -2589,7 +2589,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 			DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 			DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 			DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-			DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+			DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 			DEBUG_INFO("Profile start schedule: %s\n", maxProfile.ChargingSchedule.StartSchedule);
 			DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);
@@ -2743,7 +2743,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 		DEBUG_INFO("Profile valid from: %s\n", txProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", txProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", txProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", txProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", txProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", txProfile.ChargingSchedule.Duration);
@@ -2902,7 +2902,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 		DEBUG_INFO("Profile valid from: %s\n", defaultTxProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", defaultTxProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", defaultTxProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", defaultTxProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", defaultTxProfile.ChargingSchedule.Duration);
@@ -3042,7 +3042,7 @@ void checkCompositeSchedule(uint8_t connectorId, uint32_t durationReq, struct St
 		DEBUG_INFO("Profile valid from: %s\n", maxProfile.ValidFrom);
 		DEBUG_INFO("Profile valid to: %s\n", maxProfile.ValidTo);
 		DEBUG_INFO("Profile ChargingProfileKind: %s\n", maxProfile.ChargingProfileKind);
-		DEBUG_INFO("Profile RecurrencyKind: %s\n", maxProfile.RecurrencyKind);
+		DEBUG_INFO("Profile recurrencyKind: %s\n", maxProfile.RecurrencyKind);
 
 		DEBUG_INFO("Profile start schedule: %s\n", compositeProfile->ChargingSchedule.StartSchedule);
 		DEBUG_INFO("Profile schedule duration: %d\n", maxProfile.ChargingSchedule.Duration);

部分文件因为文件数量过多而无法显示