[Improve][EVSE-Emulator][Makefile]

2022.07.20 / Folus Wen

Actions:
1. CCS Makefile content fix.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Projects/AW-CCS/Apps/CCS/Makefile

@@ -128,8 +128,13 @@ PCBATesterTask:
 	rm -f PCBATester
 
 init:
-	rm -rfv ../Images/root
-	mkdir -p ../Images/root
+ifeq ($(CCSType),AWCCS)
+        rm -rfv ../../Images/root
+        mkdir -p ../../Images/root
+else
+        rm -rfv ../Images/root
+        mkdir -p ../Images/root
+endif
 #	cp -rfv ../Images/boot/reset_soft.sh ../Images/root/
 #	cp -rfv ../Images/boot/stop.sh ../Images/root/
 #	cp -rfv ../Images/boot/reboot.sh ../Images/root/

EVSE/Projects/EVSE-Emulator/Apps/CCS/Makefile

@@ -6,7 +6,7 @@
 #                           (since 2019/07/19)
 #=============================================================================
 	
-ifeq ($(CCSType),AWCCS)
+ifeq ($(CCSType),Emulator)
 -include ../../../../../Rules.make
 export PATH=/bin:/sbin:/usr/bin:$(SDK_PATH_TARGET)/usr/bin:$PATH
 SSL_PATH= ../../../../GPL/openssl-1.0.2g/
@@ -45,7 +45,7 @@ EXI_ENGINE =	exi_engine/api/api.c \
 				exi_engine/xmldsig/xmldsigEXIDatatypesEncoder.c
 
 all: init secc
-ifeq ($(CCSType),AWCCS)
+ifeq ($(CCSType),Emulator)
 secc:  CsuCommTask SeccCommTask 
 else
 secc: MainTask SeccCommTask CsuCommTask FactoryConfigTask FWUpdateTask PCBATesterTask
@@ -61,7 +61,7 @@ MainTask:
 	rm -f main
 
 CsuCommTask:
-ifeq ($(CCSType),AWCCS)
+ifeq ($(CCSType),Emulator)
 	rm -f CsuComm
 	@echo "=============== Make AC CsuCommTask==========================="
 	$(CC) -D $(CCSType) CsuComm.c ${EXI_ENGINE} -lm -o CsuComm
@@ -76,7 +76,7 @@ endif
 
 SeccCommTask:
 	rm -f SeccComm
-ifeq ($(CCSType),AWCCS)
+ifeq ($(CCSType),Emulator)
 	@echo "=============== Make AC SeccCommTask==========================="
 	$(CC) -D $(CCSType) SeccComm.c NidNmk.c ${EXI_ENGINE} -lm -o SeccComm $(CFLAGS)
 	cp -f SeccComm ../../Images/root
@@ -128,8 +128,13 @@ PCBATesterTask:
 	rm -f PCBATester
 
 init:
+ifeq ($(CCSType),Emulator)
+	rm -rfv ../../Images/root
+	mkdir -p ../../Images/root
+else
 	rm -rfv ../Images/root
 	mkdir -p ../Images/root
+endif
 #	cp -rfv ../Images/boot/reset_soft.sh ../Images/root/
 #	cp -rfv ../Images/boot/stop.sh ../Images/root/
 #	cp -rfv ../Images/boot/reboot.sh ../Images/root/

EVSE/Projects/EVSE-Emulator/Apps/Images/root/cacert.pem

@@ -1,14 +0,0 @@
-subject=/C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
-issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
------BEGIN X509 CERTIFICATE-----
-
-MIIBgjCCASwCAQQwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV
-BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MTAwOTIz
-MzIwNVoXDTk4MDcwNTIzMzIwNVowYDELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM
-RDEZMBcGA1UEChMQTWluY29tIFB0eS4gTHRkLjELMAkGA1UECxMCQ1MxGzAZBgNV
-BAMTElNTTGVheSBkZW1vIHNlcnZlcjBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3
-LCXcScWua0PFLkHBLm2VejqpA1F4RQ8q0VjRiPafjx/Z/aWH3ipdMVvuJGa/wFXb
-/nDFLDlfWp+oCPwhBtVPAgMBAAEwDQYJKoZIhvcNAQEEBQADQQArNFsihWIjBzb0
-DCsU0BvL2bvSwJrPEqFlkDq3F4M6EGutL9axEcANWgbbEdAvNJD1dmEmoWny27Pn
-IMs6ZOZB
------END X509 CERTIFICATE-----

EVSE/Projects/EVSE-Emulator/Apps/Images/root/cakey.pem

@@ -1,24 +0,0 @@
-issuer= /C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=CA
-subject=/C=AU/SOP=QLD/O=Mincom Pty. Ltd./OU=CS/CN=SSLeay demo server
------BEGIN X509 CERTIFICATE-----
-
-MIIBgjCCASwCAQQwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV
-BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MTAwOTIz
-MzIwNVoXDTk4MDcwNTIzMzIwNVowYDELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM
-RDEZMBcGA1UEChMQTWluY29tIFB0eS4gTHRkLjELMAkGA1UECxMCQ1MxGzAZBgNV
-BAMTElNTTGVheSBkZW1vIHNlcnZlcjBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3
-LCXcScWua0PFLkHBLm2VejqpA1F4RQ8q0VjRiPafjx/Z/aWH3ipdMVvuJGa/wFXb
-/nDFLDlfWp+oCPwhBtVPAgMBAAEwDQYJKoZIhvcNAQEEBQADQQArNFsihWIjBzb0
-DCsU0BvL2bvSwJrPEqFlkDq3F4M6EGutL9axEcANWgbbEdAvNJD1dmEmoWny27Pn
-IMs6ZOZB
------END X509 CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-
-MIIBPAIBAAJBALcsJdxJxa5rQ8UuQcEubZV6OqkDUXhFDyrRWNGI9p+PH9n9pYfe
-Kl0xW+4kZr/AVdv+cMUsOV9an6gI/CEG1U8CAwEAAQJAXJMBZ34ZXHd1vtgL/3hZ
-hexKbVTx/djZO4imXO/dxPGRzG2ylYZpHmG32/T1kaHpZlCHoEPgHoSzmxYXfxjG
-sQIhAPmZ/bQOjmRUHM/VM2X5zrjjM6z18R1P6l3ObFwt9FGdAiEAu943Yh9SqMRw
-tL0xHGxKmM/YJueUw1gB6sLkETN71NsCIQCeT3RhoqXfrpXDoEcEU+gwzjI1bpxq
-agiNTOLfqGoA5QIhAIQFYjgzONxex7FLrsKBm16N2SFl5pXsN9SpRqqL2n63AiEA
-g9VNIQ3xwpw7og3IbONifeku+J9qGMGQJMKwSTwrFtI=
------END RSA PRIVATE KEY-----