fixed null char reading from eeprom

Paciente8159 · Oct 10, 2023 · 44797bd · 44797bd
1 parent 6fb119b
commit 44797bd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/makefiles/virtual/uCNC.dev b/makefiles/virtual/uCNC.dev
@@ -9,7 +9,7 @@ Libs=
 PrivateResource=
 ResourceIncludes=
 MakeIncludes=
-Compiler=-DWIN_INTERFACE=2 -DENABLE_EXTRA_SYSTEM_CMDS -DWIN_COM_NAME=COM11 -DBOARD=BOARD_VIRTUAL -DMCU=MCU_VIRTUAL_WIN_@@_
+Compiler=-DWIN_INTERFACE=2 -DENABLE_EXTRA_SYSTEM_CMDS -DWIN_COM_NAME=COM11 -DBOARD=BOARD_VIRTUAL -DMCU=MCU_VIRTUAL -DDISABLE_MULTISTREAM_SERIAL_@@_
 CppCompiler=_@@_
 Linker=-lws2_32_@@_
 IsCpp=0

diff --git a/uCNC/src/cnc.c b/uCNC/src/cnc.c
@@ -1030,10 +1030,16 @@ static void cnc_io_dotasks(void)
 void cnc_run_startup_blocks(void)
 {
 	serial_broadcast(true);
-	serial_stream_eeprom(STARTUP_BLOCK0_ADDRESS_OFFSET);
-	cnc_exec_cmd();
-	serial_stream_eeprom(STARTUP_BLOCK1_ADDRESS_OFFSET);
-	cnc_exec_cmd();
+	if (settings_check_startup_gcode(STARTUP_BLOCK0_ADDRESS_OFFSET))
+	{
+		serial_stream_eeprom(STARTUP_BLOCK0_ADDRESS_OFFSET);
+		cnc_exec_cmd();
+	}
+	if (settings_check_startup_gcode(STARTUP_BLOCK1_ADDRESS_OFFSET))
+	{
+		serial_stream_eeprom(STARTUP_BLOCK1_ADDRESS_OFFSET);
+		cnc_exec_cmd();
+	}
 	serial_broadcast(false);
 	serial_stream_change(NULL);
 }
diff --git a/uCNC/src/core/parser.c b/uCNC/src/core/parser.c
@@ -669,8 +669,7 @@ static uint8_t parser_fetch_command(parser_state_t *new_state, parser_words_t *w
 	{
 		uint8_t word = 0;
 		float value = 0;
-		// this flushes leading white chars and also takes care of processing comments
-		parser_get_next_preprocessed(true);
+
 #ifdef ECHO_CMD
 		if (!wordcount)
 		{
@@ -2021,7 +2020,8 @@ static void parser_get_comment(uint8_t start_char)
 
 static uint8_t parser_get_token(uint8_t *word, float *value)
 {
-	uint8_t c = serial_getc();
+	// this flushes leading white chars and also takes care of processing comments
+	uint8_t c = parser_get_next_preprocessed(false);
 
 	// if other uint8_t starts tokenization
 	if (c >= 'a' && c <= 'z')

diff --git a/uCNC/src/interface/serial.c b/uCNC/src/interface/serial.c
@@ -173,6 +173,10 @@ static FORCEINLINE uint8_t _serial_peek(void)
 	while (!serial_available())
 		;
 	peek = stream_getc();
+	// prevents null char reading from eeprom
+	if(!peek) {
+		peek = '\n';
+	}
 	serial_peek_buffer = peek;
 	return peek;
 }

diff --git a/uCNC/src/interface/settings.c b/uCNC/src/interface/settings.c
@@ -305,7 +305,7 @@ bool settings_allows_negative(setting_offset_t id)
 	}
 #endif
 #ifdef ENABLE_SKEW_COMPENSATION
-	if (id >=37 && id <= 39)
+	if (id >= 37 && id <= 39)
 	{
 		return true;
 	}
@@ -595,6 +595,9 @@ void settings_erase(uint16_t address, uint8_t size)
 
 bool settings_check_startup_gcode(uint16_t address)
 {
+	serial_putc('>');
+	serial_putc(':');
+
 #ifndef RAM_ONLY_SETTINGS
 	uint8_t size = (RX_BUFFER_SIZE - 1); // defined in serial.h
 	uint8_t crc = 0;
@@ -615,14 +618,16 @@ bool settings_check_startup_gcode(uint16_t address)
 
 	if (crc ^ mcu_eeprom_getc(cmd_address))
 	{
-		serial_putc('>');
-		serial_putc(':');
 		protocol_send_error(STATUS_SETTING_READ_FAIL);
 		settings_erase(address, 1);
 		return false;
 	}
-#endif
+
 	return true;
+#else
+	protocol_send_ok();
+	return false;
+#endif
 }
 
 void settings_save_startup_gcode(uint16_t address)
@@ -635,7 +640,8 @@ void settings_save_startup_gcode(uint16_t address)
 	{
 		c = serial_getc();
 		crc = crc7(c, crc);
-		mcu_eeprom_putc(address++, (uint8_t)c);
+		mcu_eeprom_putc(address, (uint8_t)c);
+		address++;
 		size--;
 	} while (size && c);