Przeglądaj źródła

2021.01.06 / Vern

    Actions:
    1. remove OVP protection (OVP will be done by system)
    2. judge and install the proper QCA 7000 driver by kernel version

    Files:
    1. EVSE/Projects/CCS/Apps/SeccComm.c
    2. EVSE/Projects/CCS/Apps/main.c

    Image version: D0.18.S0
    Image checksum: XXXXXXXX

    Hardware PWB P/N : XXXXXXX
    Hardware Version : XXXXXXX
vern.chang 4 lat temu
rodzic
commit
222fefd385

BIN
EVSE/Projects/CCS/Apps/SeccComm


+ 2 - 1
EVSE/Projects/CCS/Apps/SeccComm.c

@@ -1908,6 +1908,7 @@ void Error_Monitor()
             EVCOMM_SYS_INFO.EvBatteryMaxVoltage != 0)
         {
             //Part A: OVP Protection
+            #if 0
             if (EVCOMM_SYS_INFO.PresentChargingVoltage >= (EVCOMM_SYS_INFO.EvBatteryMaxVoltage * 1.02)) // 2%
             {
                 sprintf(buf_log_evcomm_fork2,
@@ -1929,7 +1930,7 @@ void Error_Monitor()
                 Proc_EVStopRes(ShmInternalComm->FD_CAN_Socket);
                 End_Process();
             }
-
+	    #endif
             //Part B: Over Voltage Request Protection
             if (EVCOMM_SYS_INFO.EvBatterytargetVoltage >= (EVCOMM_SYS_INFO.EvBatteryMaxVoltage * 1.02))
             {

+ 33 - 1
EVSE/Projects/CCS/Apps/main.c

@@ -51,6 +51,34 @@ int LoadSysConfigAndInfo(struct SysConfigData *ptr);
 int SpawnTask();
 int StoreUsrConfigData(struct SysConfigData *UsrData);
 
+
+unsigned int isKernelSupportNAT()
+{
+	unsigned int result = 0;
+	unsigned int version = 0;
+	FILE *fp;
+	char cmd[256];
+	char buf[512];
+
+	// Get IP address & net mask
+	strcpy(cmd, "uname -v");
+	fp = popen(cmd, "r");
+	if(fp != NULL)
+	{
+		if(fgets(buf, sizeof(buf), fp) != NULL)
+		{
+			sscanf(buf, "#%d", &version);
+		//	DEBUG_INFO("Kernel version: %d\n", version);
+
+			if(version >= 30)
+				result = 1;
+		}
+	}
+	pclose(fp);
+
+	return result;
+}
+
 /*===========================================================================
 FUNCTION: main
 DESCRIPTION:
@@ -195,7 +223,11 @@ void System_Init()
     Eth0_PortSetting_Base(ETH0_PORT_BASE); //192.168.0.20
 
     // ---------- Hardware Init ---------
-    system("/sbin/insmod /lib/qcaspi.ko");
+    if(isKernelSupportNAT() == 1)
+		system("/sbin/insmod /lib/qcaspi_nat.ko");
+	else
+		system("/sbin/insmod /lib/qcaspi.ko");
+   // system("/sbin/insmod /lib/qcaspi.ko");
     sleep(2);
     system("/sbin/ifconfig eth1 192.168.0.11 netmask 255.255.255.0 up");
     sleep(1);

+ 1 - 1
EVSE/Projects/CCS/Apps/version.h

@@ -5,7 +5,7 @@
                      initiated by Joseph D. Anderson
                            (since 2019/12/03)
 =============================================================================*/
-#define FIRMWARE_VERSION            "D0.17.S0"   //8-Byte(ASCII Code), “tx.yz.ab.cd”
+#define FIRMWARE_VERSION            "D0.18.S0"   //8-Byte(ASCII Code), “tx.yz.ab.cd”
 #define HARDWARE_VERSION            "CCS_8.0x"      //8-Byte(ASCII Code): CSU-03-RW, CCS_Board, REV:5.0
 #define LINUX_IMAGE_VERSION         "dd2da761d59f2cdd4064c9d95f8c302a442d33f3 (2019-01-04)"
 #define RTC_DEFAULT_TIME            1595486300      //Epoch time (decimal)

BIN
EVSE/Projects/CCS/Images/ramdisk.gz