1.add panasonic fpxh plc test app 2.add panasonic fpxh plc readme file

2023-11-24 10:23:24 +08:00
parent 81924837dd
commit e5e654988b
10 changed files with 171 additions and 5 deletions
@@ -412,11 +412,7 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
 - To use this feature let the following define uncommented.
 - To disable it and process by CPU comment the  the checksum.
 */
-<<<<<<< HEAD
 #define CHECKSUM_BY_HARDWARE
-=======
-#define CHECKSUM_BY_HARDWARE
->>>>>>> f27c6d2091fa87777963810d926380f3ab178dab

 #ifdef CHECKSUM_BY_HARDWARE
 /* CHECKSUM_GEN_IP==0: Generate checksums by hardware for outgoing IP packets.*/