From 0e036b9d8ac9d4310231ab9eb4944fc8fdfadaf7 Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Wed, 24 Aug 2022 11:49:47 +0200
Subject: [PATCH] Save some more RAM in protocol_logic

---
 Firmware/mmu2_log.h              |  4 ++++
 Firmware/mmu2_protocol_logic.cpp | 22 +++++++++++-----------
 Firmware/mmu2_protocol_logic.h   |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Firmware/mmu2_log.h b/Firmware/mmu2_log.h
index a70182489..c4ad0bb67 100644
--- a/Firmware/mmu2_log.h
+++ b/Firmware/mmu2_log.h
@@ -24,6 +24,8 @@ void LogEchoEvent_P(const char *msg);
 
 #define MMU2_ECHO_MSG(S) do{ SERIAL_ECHO_START; SERIAL_MMU2(); SERIAL_ECHO(S); }while(0)
 #define MMU2_ERROR_MSG(S) do{ SERIAL_ERROR_START; SERIAL_MMU2(); SERIAL_ECHO(S); }while(0)
+#define MMU2_ECHO_MSGRPGM(S) do{ SERIAL_ECHO_START; SERIAL_MMU2(); SERIAL_ECHORPGM(S); }while(0)
+#define MMU2_ERROR_MSGRPGM(S) do{ SERIAL_ERROR_START; SERIAL_MMU2(); SERIAL_ECHORPGM(S); }while(0)
 
 #else // #ifndef UNITTEST
 
@@ -31,5 +33,7 @@ void LogEchoEvent_P(const char *msg);
 #define MMU2_ERROR_MSG(S) /* */
 #define SERIAL_ECHO(S) /* */
 #define SERIAL_ECHOLN(S) /* */
+#define MMU2_ECHO_MSGRPGM(S) /* */
+#define MMU2_ERROR_MSGRPGM(S) /* */
 
 #endif // #ifndef UNITTEST
diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp
index 6fa7ff9b3..480a7af20 100644
--- a/Firmware/mmu2_protocol_logic.cpp
+++ b/Firmware/mmu2_protocol_logic.cpp
@@ -598,7 +598,7 @@ void ProtocolLogic::LogRequestMsg(const uint8_t *txbuff, uint8_t size){
     }
     tmp[size+1] = '\n';
     tmp[size+2] = 0;
-    if( !strncmp(tmp, ">S0.\n", rqs) && !strncmp(lastMsg, tmp, rqs) ){
+    if( !strncmp_P(tmp, PSTR(">S0*99.\n"), rqs) && !strncmp(lastMsg, tmp, rqs) ){
         // @@TODO we skip the repeated request msgs for now 
         // to avoid spoiling the whole log just with ">S0" messages
         // especially when the MMU is not connected.
@@ -611,12 +611,12 @@ void ProtocolLogic::LogRequestMsg(const uint8_t *txbuff, uint8_t size){
     memcpy(lastMsg, tmp, rqs);
 }
 
-void ProtocolLogic::LogError(const char *reason){
+void ProtocolLogic::LogError(const char *reason_P){
     char lrb[lastReceivedBytes.size() * 3];
     FormatLastReceivedBytes(lrb);
     
-    MMU2_ERROR_MSG(reason);
-    SERIAL_ECHO(", last bytes: ");
+    MMU2_ERROR_MSGRPGM(reason_P);
+    SERIAL_ECHOPGM(", last bytes: ");
     SERIAL_ECHOLN(lrb);
 }
 
@@ -627,9 +627,9 @@ void ProtocolLogic::LogResponse(){
     SERIAL_ECHOLN();
 }
 
-StepStatus ProtocolLogic::SuppressShortDropOuts(const char *msg, StepStatus ss) {
+StepStatus ProtocolLogic::SuppressShortDropOuts(const char *msg_P, StepStatus ss) {
     if( dataTO.Record(ss) ){
-        LogError(msg);
+        LogError(msg_P);
         return dataTO.InitialCause();
     } else {
         return Processing; // suppress short drop outs of communication
@@ -640,7 +640,7 @@ StepStatus ProtocolLogic::HandleCommunicationTimeout() {
     uart->flush(); // clear the output buffer
     protocol.ResetResponseDecoder();
     Start();
-    return SuppressShortDropOuts("Communication timeout", CommunicationTimeout);
+    return SuppressShortDropOuts(PSTR("Communication timeout"), CommunicationTimeout);
 }
 
 StepStatus ProtocolLogic::HandleProtocolError() {
@@ -648,7 +648,7 @@ StepStatus ProtocolLogic::HandleProtocolError() {
     state = State::InitSequence;
     currentState = &delayedRestart;
     delayedRestart.Restart();
-    return SuppressShortDropOuts("Protocol Error", ProtocolError);
+    return SuppressShortDropOuts(PSTR("Protocol Error"), ProtocolError);
 }
 
 StepStatus ProtocolLogic::Step() {
@@ -678,16 +678,16 @@ StepStatus ProtocolLogic::Step() {
         // we have to repeat it - that's the only thing we can do
         // no change in state
         // @@TODO wait until Q0 returns command in progress finished, then we can send this one
-        LogError("Command rejected");
+        LogError(PSTR("Command rejected"));
         command.Restart();
         break;
     case CommandError:
-        LogError("Command Error");
+        LogError(PSTR("Command Error"));
         // we shall probably transfer into the Idle state and await further instructions from the upper layer
         // Idle state may solve the problem of keeping up the heart beat running
         break;
     case VersionMismatch:
-        LogError("Version mismatch");
+        LogError(PSTR("Version mismatch"));
         Stop(); // cannot continue
         break;
     case ProtocolError:
diff --git a/Firmware/mmu2_protocol_logic.h b/Firmware/mmu2_protocol_logic.h
index b31d68b7f..609e20f04 100644
--- a/Firmware/mmu2_protocol_logic.h
+++ b/Firmware/mmu2_protocol_logic.h
@@ -268,7 +268,7 @@ private:
     StepStatus ExpectingMessage(uint32_t timeout);
     void SendMsg(RequestMsg rq);
     void SwitchToIdle();
-    StepStatus SuppressShortDropOuts(const char *msg, StepStatus ss);
+    StepStatus SuppressShortDropOuts(const char *msg_P, StepStatus ss);
     StepStatus HandleCommunicationTimeout();
     StepStatus HandleProtocolError();
     bool Elapsed(uint32_t timeout) const;
@@ -277,7 +277,7 @@ private:
     void FormatLastReceivedBytes(char *dst);
     void FormatLastResponseMsgAndClearLRB(char *dst);
     void LogRequestMsg(const uint8_t *txbuff, uint8_t size);
-    void LogError(const char *reason);
+    void LogError(const char *reason_P);
     void LogResponse();
     void SwitchFromIdleToCommand();
     void SwitchFromStartToIdle();