specific protocol changes to take into account production request

1. every command with no value now respond --> <command>:OK\r\n
   no spaces after :
2. every command that respond a value now respond --> <command>:<value>\r\n
   no ok after the value
3. to end each command response an additional line has been added --> EndOfTest\r\n

Author: maidnl

extras/functions_generator_firmware/SKr3_waves/chAT.hpp

@@ -100,6 +100,7 @@ namespace SudoMaker::chAT {
 		std::vector<uint8_t> inhibit_read(size_t raw_data_len);
 		void continue_read() noexcept;
 
+		void dontSendOk();
 		void write_data(const void *buf, size_t len);
 		void write_cstr(const char *buf, ssize_t len = -1);
 		void write_str(std::string str);

extras/functions_generator_firmware/SKr3_waves/chAt_cmds.h

@@ -6,6 +6,7 @@
 #include "pin_def.h"
 #include "led_gauge.h"
 #include "led_array.h"
+#include <string>
 
 
 using namespace std;
@@ -27,6 +28,7 @@ void CAtWrapper::add_cmds() {
             auto &production_code = parser.args[0];
             if(production_code == _PRODUCTION_CODE_MODE) {
                app_status = APP_DIAGNOSTIC;
+               srv.write_response_prompt();
                return chAT::CommandStatus::OK;
             }
             return chAT::CommandStatus::ERROR;
@@ -72,8 +74,12 @@ void CAtWrapper::add_cmds() {
               v = 0;
            }
            v = map(v, 0,ADC_RES, 0, 10);
-           Serial.print(v);
-           srv.write_line_end();   
+           string val = to_string(v);
+           srv.write_response_prompt();
+           srv.write_str(val);
+           //Serial.print(v);
+           srv.write_line_end(); 
+           srv.dontSendOk();  
            return chAT::CommandStatus::OK;
          }
 
@@ -98,22 +104,27 @@ void CAtWrapper::add_cmds() {
             auto &st = parser.args[0];
             if(st == "ON") {
                app_status = APP_DIAGNOSTIC_LED_ON;
+               srv.write_response_prompt();
                return chAT::CommandStatus::OK;
             }
             else if(st == "ON_F1") {
               app_status = APP_DIAGNOSTIC_LED_ON_F1;
+              srv.write_response_prompt();
                return chAT::CommandStatus::OK;
             }
             else if(st == "ON_F2") {
               app_status = APP_DIAGNOSTIC_LED_ON_F2;
+              srv.write_response_prompt();
               return chAT::CommandStatus::OK;
             }
             else if(st == "ON_R") {
               app_status = APP_DIAGNOSTIC_LED_ON_R;
+              srv.write_response_prompt();
               return chAT::CommandStatus::OK;
             }
             else if(st == "OFF") {
                app_status = APP_DIAGNOSTIC;
+               srv.write_response_prompt();
                return chAT::CommandStatus::OK;
             }
             return chAT::CommandStatus::ERROR;
@@ -148,7 +159,7 @@ void CAtWrapper::add_cmds() {
               }
             }
             f1 = (float)atof(f.c_str());
- 
+            srv.write_response_prompt();
             return chAT::CommandStatus::OK;
          }
 
@@ -180,7 +191,7 @@ void CAtWrapper::add_cmds() {
               }
             }
             f2 = (float)atof(f.c_str());
- 
+            srv.write_response_prompt();
             return chAT::CommandStatus::OK;
          }
 
@@ -219,7 +230,7 @@ void CAtWrapper::add_cmds() {
               a1 = 0.0;
             }
 
- 
+            srv.write_response_prompt();
             return chAT::CommandStatus::OK;
          }
 
@@ -256,7 +267,7 @@ void CAtWrapper::add_cmds() {
               a2 = 0.0;
             }
 
- 
+            srv.write_response_prompt();
             return chAT::CommandStatus::OK;
          }
 

extras/functions_generator_firmware/SKr3_waves/server.cpp

@@ -111,6 +111,10 @@ namespace SudoMaker::chAT {
 		bool nonblocking = false;
 		bool parser_debug = false;
 
+		bool inibit_ok = false;
+
+		void dontSendOk() { inibit_ok = true; }
+
 		ATParser parser;
 
 		void do_parse() {
@@ -151,15 +155,17 @@ namespace SudoMaker::chAT {
 		}
 
 		void write_raw(data_holder d) {
-			while (buf_write_len + d.size > buf_write_len_limit) {
+			
+			while (buf_write_len + d.size > buf_write_len_limit) {	
 				if (buf_write.empty()) {
 					return;
 				} else {
+					
 					buf_write_len -= buf_write.front().size;
 					buf_write.pop_front();
 				}
 			}
-
+            
 			auto &nd = buf_write.emplace_back(std::move(d));
 			nd.resolve_holder();
 			buf_write_len += nd.size;
@@ -187,7 +193,13 @@ namespace SudoMaker::chAT {
 		}
 
 		void write_data(const void *buf, size_t len) {
-			write_raw({(uint8_t *) buf, len, 0});
+			data_holder d;
+			d.data = (uint8_t *)buf;
+			d.size = len;
+			d.position = 0;
+
+
+			write_raw(d);
 		}
 
 		void write_cstr(const char *buf, ssize_t len = -1) {
@@ -197,6 +209,8 @@ namespace SudoMaker::chAT {
 		void write_str(std::string str) {
 			data_holder dh;
 			dh.position = 0;
+			
+			dh.size = str.size(); // FIX ERROR 
 			dh.holder = std::move(str);
 
 			write_raw(dh);
@@ -216,13 +230,23 @@ namespace SudoMaker::chAT {
 		}
 
 		void write_ok() {
+
 			static const char str[] = "OK\r\n";
-			write_cstr(str, sizeof(str) - 1);
+			if(!inibit_ok) {
+				write_cstr(str, sizeof(str) - 1);
+			}
+			else {
+			   //write_line_end();
+			}
+			write_cstr("EndOfTest", sizeof("EndOfTest") - 1);
+			write_line_end();
+			inibit_ok = false;
 		}
 
 		void write_response_prompt() {
 			write_str(parser.command);
-			static const char str[] = ": ";
+			// REMOVED SPACE AFTER : at the end of command 
+			static const char str[] = ":";
 			write_cstr(str, sizeof(str) - 1);
 		}
 
@@ -364,6 +388,10 @@ namespace SudoMaker::chAT {
 		pimpl->continue_read();
 	}
 
+	void Server::dontSendOk() {
+		pimpl->dontSendOk();
+	}
+
 	void Server::write_data(const void *buf, size_t len) {
 		return pimpl->write_data(buf, len);
 	}