Merge branch 'BYTON-GB'

EVSE/Projects/BYTON-GB/Apps/main.c

@@ -1178,7 +1178,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.23.60.XXXX.B0");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.24.60.XXXX.B0");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -1936,13 +1936,10 @@ void checkTask()
 		system("/root/Module_EventLogging &");
 	}
 
-	if(strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") != 0)
+	if(system("pidof -s OcppBackend > /dev/null") != 0)
 	{
-		if(system("pidof -s OcppBackend > /dev/null") != 0)
-		{
-			DEBUG_INFO("OcppBackend not running, restart it.\r\n");
-			system("/root/OcppBackend &");
-		}
+		DEBUG_INFO("OcppBackend not running, restart it.\r\n");
+		system("/root/OcppBackend &");
 	}
 
 	if(system("pidof -s Module_AlarmDetect > /dev/null") != 0)
@@ -2589,7 +2586,6 @@ int main(void)
 					if((ShmCharger->gun_info[gun_index].primaryMcuState.relay_state == ON))
 					{
 						ShmCharger->gun_info[ShmOCPP16Data->UnlockConnector[gun_index].ConnectorId-1].isUnlockerConnetor = OFF;
-						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].OutputEnergy = 0;
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedEnergy = 0;
 						getDateTimeString((char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartDateTime);
 						ShmCharger->gun_info[gun_index].powerConsumption.power_consumption_at_start = ShmCharger->gun_info[gun_index].powerConsumption.power_consumption;
@@ -2624,11 +2620,10 @@ int main(void)
 					else
 					{
 						setLedMotion(gun_index,LED_ACTION_CHARGING);
-						ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (ShmCharger->gun_info[gun_index].powerConsumption.power_consumption - ShmCharger->gun_info[gun_index].powerConsumption.power_consumption_at_start)/100;
+						ShmOCPP16Data->StopTransaction[gun_index].MeterStop = (ShmCharger->gun_info[gun_index].powerConsumption.power_consumption/100);
 						ftime(&endChargingTime[gun_index]);
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration = DiffTimeb(startChargingTime[gun_index], endChargingTime[gun_index])/1000;
 						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedEnergy = ((float)(ShmCharger->gun_info[gun_index].powerConsumption.power_consumption - ShmCharger->gun_info[gun_index].powerConsumption.power_consumption_at_start))/100;
-						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].OutputEnergy =  ((float)(ShmCharger->gun_info[gun_index].powerConsumption.power_consumption - ShmCharger->gun_info[gun_index].powerConsumption.power_consumption_at_start))/100;
 
 						// Response StartTransactionConf
 						if(ShmOCPP16Data->CpMsg.bits[gun_index].StartTransactionConf == ON)

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/arch/arm/boot/dts/.am335x-evm.dtb.dts.tmp

@@ -1444,7 +1444,6 @@
                 compatible = "nxp,pcf85063";
                 reg = <0x51>;
         };
-
 };
 
 &usb {
@@ -1479,7 +1478,11 @@
 &elm {
  status = "okay";
 };
+<<<<<<< HEAD
+# 402 "arch/arm/boot/dts/am335x-evm.dts"
+=======
 # 403 "arch/arm/boot/dts/am335x-evm.dts"
+>>>>>>> master
 &gpmc {
  status = "okay";
  pinctrl-names = "default", "sleep";
@@ -1665,7 +1668,11 @@
   };
  };
 };
+<<<<<<< HEAD
+# 508 "arch/arm/boot/dts/am335x-evm.dts" 2
+=======
 # 509 "arch/arm/boot/dts/am335x-evm.dts" 2
+>>>>>>> master
 
 &tps {
  vcc1-supply = <&vbat>;
@@ -1764,7 +1771,11 @@
   phy-mode = "mii";
 
 };
+<<<<<<< HEAD
+# 614 "arch/arm/boot/dts/am335x-evm.dts"
+=======
 # 615 "arch/arm/boot/dts/am335x-evm.dts"
+>>>>>>> master
 &tscadc {
  status = "okay";
 

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/arch/arm/boot/dts/am335x-evm.dts

@@ -344,7 +344,6 @@
                 compatible = "nxp,pcf85063";
                 reg = <0x51>;
         };
-
 };
 #endif
 &usb {