瀏覽代碼

Merge remote-tracking branch 'origin/DQC480'

Folus Wen 2 年之前
父節點
當前提交
7989d44091
共有 3 個文件被更改,包括 8 次插入1 次删除
  1. 1 1
      .gitignore
  2. 5 0
      EVSE/Projects/DQC480/Apps/Module_EvComm.c
  3. 2 0
      EVSE/Projects/DQC480/Apps/Module_EvComm.h

+ 1 - 1
.gitignore

@@ -12,7 +12,7 @@
 #.*
 *.o
 *.o.*
-#*.a
+*.a
 *.s
 *.so.dbg
 *.mod.c

+ 5 - 0
EVSE/Projects/DQC480/Apps/Module_EvComm.c

@@ -1958,6 +1958,11 @@ void WriteChargingInfoResponse(int socket, struct PACKET_STRUCTURE *packet, unsi
         current = (unsigned short)(chargingInfo[gun]->PresentChargingCurrent * 10);
     }
 
+#ifdef DQC480
+    voltage=(unsigned short)(chargingInfo[gun]->FireChargingVoltage);
+    current=(unsigned short)(chargingInfo[gun]->PresentChargingCurrent*10);
+#endif
+
     memset(&sendBuffer, 0x00, sizeof(sendBuffer));
     sendBuffer.Header.se = packet->Header.se;
     sendBuffer.Header.id = packet->Header.id;

+ 2 - 0
EVSE/Projects/DQC480/Apps/Module_EvComm.h

@@ -53,6 +53,8 @@
 
 #define AUTO_GUN_SELECTION_ID           0xFF
 
+//#define DQC480
+
 struct Message
 {
 	int				size;