From c7c101bb1c36a32e22586a412b2d8273d7dece95 Mon Sep 17 00:00:00 2001
From: uhi22 <uhi@hnng.de>
Date: Tue, 12 Dec 2023 10:03:16 +0100
Subject: [PATCH] features: default logging of TCP traffic in both directions.
 Logging of voltages during precharge.

---
 ccs/ccs32_globals.h     |  1 +
 ccs/myHelpers.h         | 18 +++++-------------
 ccs/myLogging.h         | 23 +++++++++++++++++++++++
 ccs/pevStateMachine.cpp |  3 +++
 ccs/tcp.cpp             | 18 +++++++++++++-----
 include/param_prj.h     |  6 ++++--
 6 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 ccs/myLogging.h

diff --git a/ccs/ccs32_globals.h b/ccs/ccs32_globals.h
index 28d77c2..d53c137 100644
--- a/ccs/ccs32_globals.h
+++ b/ccs/ccs32_globals.h
@@ -10,6 +10,7 @@
 #include <libopencm3/stm32/spi.h>
 #include <libopencm3/stm32/timer.h>
 #include <libopencm3/stm32/dma.h>
+#include "myLogging.h"
 #include "configuration.h"
 #include "printf.h"
 #include "connMgr.h"
diff --git a/ccs/myHelpers.h b/ccs/myHelpers.h
index b8d0cef..644974b 100644
--- a/ccs/myHelpers.h
+++ b/ccs/myHelpers.h
@@ -1,24 +1,14 @@
 
 /* Interface header for myHelpers.c */
 
+#ifndef MY_HELPERS_H
+#define MY_HELPERS_H
+
 /* Global Defines */
 
 #define STR_TMP_SIZE 400
 #define MY_SERIAL_PRINTBUFFERLEN 400
 
-enum Module
-{
-   MOD_CONNMGR = 1,
-   MOD_HWIF = 2,
-   MOD_HOMEPLUG = 4,
-   MOD_PEV = 8,
-   MOD_QCA = 16,
-   MOD_TCP = 32,
-   MOD_TCPTRAFFIC = 64,
-   MOD_IPV6 = 128,
-   MOD_MODEMFINDER = 256
-};
-
 extern uint16_t checkpointNumber;
 
 /* Global Functions */
@@ -28,3 +18,5 @@ extern void showAsHex(uint8_t *data, uint16_t len, const char *description);
 extern void sanityCheck(const char *hint);
 extern void mySerialPrint(void);
 extern void setCheckpoint(uint16_t newcheckpoint);
+
+#endif
\ No newline at end of file
diff --git a/ccs/myLogging.h b/ccs/myLogging.h
new file mode 100644
index 0000000..b5dc659
--- /dev/null
+++ b/ccs/myLogging.h
@@ -0,0 +1,23 @@
+
+/* definitions for logging */
+
+#ifndef MY_LOGGING_H
+#define MY_LOGGING_H
+
+enum Module
+{
+   MOD_CONNMGR = 1,
+   MOD_HWIF = 2,
+   MOD_HOMEPLUG = 4,
+   MOD_PEV = 8,
+   MOD_QCA = 16,
+   MOD_TCP = 32,
+   MOD_TCPTRAFFIC = 64,
+   MOD_IPV6 = 128,
+   MOD_MODEMFINDER = 256
+};
+
+/* Here we define, which logging data is produced after power-on */
+#define DEFAULT_LOGGINGMASK (MOD_TCPTRAFFIC | MOD_HOMEPLUG | MOD_PEV)
+
+#endif
\ No newline at end of file
diff --git a/ccs/pevStateMachine.cpp b/ccs/pevStateMachine.cpp
index d6b74b0..39f2f6a 100644
--- a/ccs/pevStateMachine.cpp
+++ b/ccs/pevStateMachine.cpp
@@ -693,6 +693,9 @@ void stateFunctionWaitForPreChargeResponse(void)
                               dinDocDec.V2G_Message.Body.PreChargeRes.EVSEPresentVoltage.Multiplier);
          Param::SetInt(Param::evsevtg, EVSEPresentVoltage);
          u = hardwareInterface_getInletVoltage();
+         if (Param::GetInt(Param::logging) & MOD_PEV) {
+             printf("Inlet %dV, accu %dV\r\n", u, hardwareInterface_getAccuVoltage());
+         }
          if (ABS(u-hardwareInterface_getAccuVoltage()) < PARAM_U_DELTA_MAX_FOR_END_OF_PRECHARGE)
          {
             addToTrace(MOD_PEV, "Difference between accu voltage and inlet voltage is small. Sending PowerDeliveryReq.");
diff --git a/ccs/tcp.cpp b/ccs/tcp.cpp
index 186701e..0c44975 100644
--- a/ccs/tcp.cpp
+++ b/ccs/tcp.cpp
@@ -200,11 +200,19 @@ void tcp_transmit(void)
       tcpHeaderLen = 20; /* 20 bytes normal header, no options */
       if (tcpPayloadLen+tcpHeaderLen<TCP_TRANSMIT_PACKET_LEN)
       {
-         memcpy(&TcpTransmitPacket[tcpHeaderLen], tcpPayload, tcpPayloadLen);
-         tcp_prepareTcpHeader(TCP_FLAG_PSH + TCP_FLAG_ACK); /* data packets are always sent with flags PUSH and ACK. */
-         tcp_packRequestIntoIp();
-         lastUnackTransmissionTime = rtc_get_ms(); /* record the time of transmission, to be able to detect the timeout */
-         retryCounter = TCP_MAX_NUMBER_OF_RETRANSMISSIONS; /* Allow n retries of the same packet */
+          /* The packet fits into our transmit buffer. */
+          if (Param::GetInt(Param::logging) & MOD_TCPTRAFFIC) {
+            printf("[%u] TCP will transmit: ", rtc_get_ms());
+            for (uint16_t i=0; i < tcpPayloadLen; i++) {
+              printf("%02x", tcpPayload[i]);
+            }
+            printf("\r\n");
+          }
+          memcpy(&TcpTransmitPacket[tcpHeaderLen], tcpPayload, tcpPayloadLen);
+          tcp_prepareTcpHeader(TCP_FLAG_PSH + TCP_FLAG_ACK); /* data packets are always sent with flags PUSH and ACK. */
+          tcp_packRequestIntoIp();
+          lastUnackTransmissionTime = rtc_get_ms(); /* record the time of transmission, to be able to detect the timeout */
+          retryCounter = TCP_MAX_NUMBER_OF_RETRANSMISSIONS; /* Allow n retries of the same packet */
       }
       else
       {
diff --git a/include/param_prj.h b/include/param_prj.h
index 9b2d0f1..4c7fc0f 100644
--- a/include/param_prj.h
+++ b/include/param_prj.h
@@ -39,7 +39,9 @@
  */
 
  //Define a version string of your firmware here
-#define VER 0.21.B
+#define VER 0.22.B
+
+#include "myLogging.h"
 
 /* Entries must be ordered as follows:
    1. Saveable parameters (id != 0)
@@ -62,7 +64,7 @@
     TESTP_ENTRY(CAT_CHARGE,  soc,         "%",       0,      100,    0,      5   ) \
     TESTP_ENTRY(CAT_CHARGE,  batvtg,      "V",       0,      1000,   1000,   6   ) \
     TESTP_ENTRY(CAT_TEST,    locktest,    LOCK,      0,      2,      0,      9   ) \
-    TESTP_ENTRY(CAT_TEST,    logging,     MODULES,   0,      511,    0,      15  ) \
+    TESTP_ENTRY(CAT_TEST,    logging,     MODULES,   0,      511,    DEFAULT_LOGGINGMASK,    15  ) \
     VALUE_ENTRY(opmode,      OPMODES, 2000 ) \
     VALUE_ENTRY(version,     VERSTR,  2001 ) \
     VALUE_ENTRY(lasterr,     errorListString,  2002 ) \