feature: in case of two announced schemas and the charger chose DIN, …

…then use DIN. Reduced logging.
uhi22 · May 15, 2024 · 661d232 · 661d232
1 parent 875fe0b
commit 661d232
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/ccs/pevStateMachine.cpp b/ccs/pevStateMachine.cpp
@@ -496,8 +496,22 @@ static void stateFunctionWaitForSupportedApplicationProtocolResponse(void)
             pev_enterState(PEV_STATE_End); /* nothing more to do here */
          } else if ((Param::GetInt(Param::PlcSchema) == 2) && (aphsDoc.supportedAppProtocolRes.SchemaID_isUsed==1)) {
              /* we requested DIN+ISO, and the charger should decide for one of those. */
-             /* todo: evaluate the SchemaID */
-            addToTrace(MOD_PEV, "Todo:select the intended schema");
+             if (aphsDoc.supportedAppProtocolRes.SchemaID == 1) {
+                /* The charger decided to use Schema 1, which we announced as DIN */
+                addToTrace(MOD_PEV, "Checkpoint403: Schema DIN negotiated (decided by charger). And Checkpoint500: Will send SessionSetupReq");
+                setCheckpoint(500);
+                pev_sendSessionSetupRequest();
+                pev_enterState(PEV_STATE_WaitForSessionSetupResponse);
+             } else if (aphsDoc.supportedAppProtocolRes.SchemaID == 2) {
+                /* The charger decided to use Schema 2, which we announced as ISO */
+                #ifdef USE_ISO1
+                  addToTrace(MOD_PEV, "Checkpoint403: Schema ISO1 negotiated (decided by charger).");
+                  pevStateMachineISO1_Start(); /* Start the ISO1 state machine */
+                #endif
+                pev_enterState(PEV_STATE_End); /* nothing more to do here */
+             } else {
+                addToTrace(MOD_PEV, "Error: Charger decided for a schema which we did not announce.");
+             }
          }
       }
    }

diff --git a/ccs/tcp.cpp b/ccs/tcp.cpp
@@ -179,7 +179,7 @@ static void tcp_sendFirstAck(void)
 
 static void tcp_sendAck(void)
 {
-   addToTrace(MOD_TCP, "[TCP] sending ACK");
+   //addToTrace(MOD_TCP, "[TCP] sending ACK");
    tcpHeaderLen = 20; /* 20 bytes normal header, no options */
    tcpPayloadLen = 0;   /* only the TCP header, no data is in the first ACK message. */
    tcp_prepareTcpHeader(TCP_FLAG_ACK);
@@ -195,7 +195,7 @@ void tcp_transmit(void)
       if (tcpPayloadLen+tcpHeaderLen<TCP_TRANSMIT_PACKET_LEN)
       {
           /* The packet fits into our transmit buffer. */
-          addToTrace(MOD_TCPTRAFFIC, "TCP will transmit:", tcpPayload, tcpPayloadLen);
+          //addToTrace(MOD_TCPTRAFFIC, "TCP will transmit:", 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 */