broadcast improvements and cleaning

- broadcast improvements with broadcast auto reset - code cleaning
Paciente8159 · Sep 24, 2024 · ecd7fec · ecd7fec
1 parent afa2511
commit ecd7fec
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 418 deletions.
diff --git a/uCNC/src/cnc.c b/uCNC/src/cnc.c
@@ -650,7 +650,7 @@ void cnc_reset(void)
 #ifdef ENABLE_MAIN_LOOP_MODULES
  EVENT_INVOKE(cnc_reset, NULL);
 #endif
- grbl_stream_broadcast(true);
+ grbl_stream_start_broadcast();
  grbl_protocol_print(MSG_STARTUP);
 }
 

diff --git a/uCNC/src/core/parser.c b/uCNC/src/core/parser.c
@@ -482,7 +482,7 @@ static uint8_t parser_grbl_command(void)
 
  settings_save(block_address, NULL, UINT16_MAX);
  // run startup block
- grbl_stream_broadcast(true);
+ grbl_stream_start_broadcast();
  grbl_stream_eeprom(block_address);
  // checks the command validity
  error = parser_fetch_command(&next_state, &words, &cmd);
@@ -493,7 +493,7 @@ static uint8_t parser_grbl_command(void)
  // error = parser_validate_command(&next_state, &words, &cmd);
  // }
 
- grbl_stream_broadcast(false);
+
  // reset streams
  grbl_stream_change(NULL);
 
@@ -721,7 +721,7 @@ static uint8_t parser_fetch_command(parser_state_t *new_state, parser_words_t *w
 #ifdef ECHO_CMD
  if (!wordcount)
  {
- grbl_stream_broadcast(true);
+ grbl_stream_start_broadcast();
  grbl_protocol_print(MSG_ECHO);
  }
 #endif
@@ -733,7 +733,7 @@ static uint8_t parser_fetch_command(parser_state_t *new_state, parser_words_t *w
  parser_discard_command();
 #ifdef ECHO_CMD
  grbl_protocol_print(MSG_END);
- grbl_stream_broadcast(false);
+
 #endif
  return error;
  }
@@ -791,7 +791,7 @@ static uint8_t parser_fetch_command(parser_state_t *new_state, parser_words_t *w
  DEBUG_PUTC('\n');
 #ifdef ECHO_CMD
  grbl_protocol_print(MSG_END);
- grbl_stream_broadcast(false);
+
 #endif
  return STATUS_OK;
  case 'G':
@@ -835,7 +835,6 @@ static uint8_t parser_fetch_command(parser_state_t *new_state, parser_words_t *w
  parser_discard_command();
 #ifdef ECHO_CMD
  grbl_protocol_print(MSG_END);
- grbl_stream_broadcast(false);
 #endif
  return error;
  }

diff --git a/uCNC/src/hal/mcus/esp32/esp32_arduino.cpp b/uCNC/src/hal/mcus/esp32/esp32_arduino.cpp
@@ -153,7 +153,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  WiFi.mode(WIFI_AP_STA);
@@ -163,7 +163,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
 
@@ -206,7 +206,7 @@ extern "C"
  else
  {
  sprintf((char *)str, "SSID>%s", wifi_settings.ssid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
  *(cmd_params->error) = STATUS_OK;
  return EVENT_HANDLED;
@@ -225,13 +225,13 @@ extern "C"
 
  // print the list of networks seen:
  sprintf((char *)str, "%d available networks", numSsid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
 
  // print the network number and name for each network found:
  for (int netid = 0; netid < numSsid; netid++)
  {
  sprintf((char *)str, "%d) %s\tSignal: %ddBm", netid, WiFi.SSID(netid).c_str(), WiFi.RSSI(netid));
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
  *(cmd_params->error) = STATUS_OK;
  return EVENT_HANDLED;
@@ -320,17 +320,17 @@ extern "C"
  {
  case 1:
  sprintf((char *)str, "IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  case 2:
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  sprintf((char *)str, "STA IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  sprintf((char *)str, "AP IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
  }
@@ -379,9 +379,9 @@ extern "C"
  connected = true;
  grbl_protocol_feedback("Connected to WiFi");
  sprintf((char *)str, "SSID>%s", wifi_settings.ssid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  sprintf((char *)str, "IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
 
  if (telnet_server.hasClient())
@@ -812,7 +812,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  WiFi.mode(WIFI_AP_STA);
@@ -822,7 +822,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
  }

diff --git a/uCNC/src/hal/mcus/esp8266/esp8266_arduino.cpp b/uCNC/src/hal/mcus/esp8266/esp8266_arduino.cpp
@@ -115,7 +115,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  WiFi.mode(WIFI_AP_STA);
@@ -125,7 +125,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
 
@@ -168,7 +168,7 @@ extern "C"
  else
  {
  sprintf((char *)str, "SSID>%s", wifi_settings.ssid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
  *(cmd_params->error) = STATUS_OK;
  return EVENT_HANDLED;
@@ -187,13 +187,13 @@ extern "C"
 
  // print the list of networks seen:
  sprintf((char *)str, "%d available networks", numSsid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
 
  // print the network number and name for each network found:
  for (int netid = 0; netid < numSsid; netid++)
  {
  sprintf((char *)str, "%d) %s\tSignal: %ddBm", netid, WiFi.SSID(netid).c_str(), WiFi.RSSI(netid));
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
  *(cmd_params->error) = STATUS_OK;
  return EVENT_HANDLED;
@@ -284,17 +284,17 @@ extern "C"
  {
  case 1:
  sprintf((char *)str, "STA IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  sprintf((char *)str, "AP IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  case 2:
  sprintf((char *)str, "IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
  }
@@ -343,9 +343,9 @@ extern "C"
  connected = true;
  grbl_protocol_feedback("Connected to WiFi");
  sprintf((char *)str, "SSID>%s", wifi_settings.ssid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  sprintf((char *)str, "IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
 
  if (telnet_server.hasClient())
@@ -756,7 +756,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  WiFi.mode(WIFI_AP_STA);
@@ -766,7 +766,7 @@ extern "C"
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
  }

diff --git a/uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp b/uCNC/src/hal/mcus/rp2040/rp2040_arduino.cpp
@@ -155,7 +155,7 @@ bool mcu_custom_grbl_cmd(void *args)
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  WiFi.mode(WIFI_AP_STA);
@@ -165,7 +165,7 @@ bool mcu_custom_grbl_cmd(void *args)
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
 
@@ -207,7 +207,7 @@ bool mcu_custom_grbl_cmd(void *args)
  else
  {
  sprintf((char *)str, "SSID>%s", wifi_settings.ssid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
  *(cmd_params->error) = STATUS_OK;
  return EVENT_HANDLED;
@@ -226,13 +226,13 @@ bool mcu_custom_grbl_cmd(void *args)
 
  // print the list of networks seen:
  sprintf((char *)str, "%d available networks", numSsid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
 
  // print the network number and name for each network found:
  for (int netid = 0; netid < numSsid; netid++)
  {
  sprintf((char *)str, "%d) %s\tSignal: %ddBm", netid, WiFi.SSID(netid), WiFi.RSSI(netid));
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
  *(cmd_params->error) = STATUS_OK;
  return EVENT_HANDLED;
@@ -320,17 +320,17 @@ bool mcu_custom_grbl_cmd(void *args)
  {
  case 1:
  sprintf((char *)str, "STA IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  sprintf((char *)str, "AP IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  case 2:
  sprintf((char *)str, "IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
  }
@@ -379,9 +379,9 @@ bool rp2040_wifi_clientok(void)
  connected = true;
  grbl_protocol_feedback("Connected to WiFi");
  sprintf((char *)str, "SSID>%s", wifi_settings.ssid);
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  sprintf((char *)str, "IP>%s", WiFi.localIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  }
 
  if (telnet_server.hasClient())
@@ -789,7 +789,7 @@ void rp2040_wifi_bt_init(void)
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  default:
  WiFi.mode(WIFI_AP_STA);
@@ -799,7 +799,7 @@ void rp2040_wifi_bt_init(void)
  grbl_protocol_feedback("AP started");
  grbl_protocol_feedback("SSID>" BOARD_NAME);
  sprintf((char *)str, "IP>%s", WiFi.softAPIP().toString().c_str());
- grbl_protocol_sprintf(str);
+ grbl_protocol_feedback("%s", str);
  break;
  }
  }

diff --git a/uCNC/src/interface/grbl_interface.h b/uCNC/src/interface/grbl_interface.h
@@ -177,7 +177,7 @@ extern "C"
 #define MSG_HELP "[HLP:$$ $# $G $I $N $x=val $Nx=line $J=line $C $X $H ~ ! ? ctrl-x]" MSG_EOL
 
 // Non query feedback messages
-#define MSG_START "[MSG:"
+#define MSG_START "MSG:"
 #define MSG_END "]" MSG_EOL
 #define MSG_FEEDBACK MSG_START "%S" MSG_END
 #define MSG_FEEDBACK_PRINTF MSG_START "%s" MSG_END