Merge pull request #320 from Paciente8159/319-bug-ic74hc595-stepper-e…

…nable-control-missing-and-modules-enabled-error IC74HC595 stepper enable control missing and modules enabled error
Paciente8159 · Oct 25, 2022 · 0bcc89b · 0bcc89b
2 parents 54e339d + 732879b
commit 0bcc89b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
 
 # Changelog
 
+## [1.5.4] - 25-10-2022
+
+### Fixed
+
+- fixed stepper enable pins missing call with IC74HC595 module enabled (#320)
+- fixed compilation error with parser modules enabled (#320)
+- fixed probe IO modules enabling via option (#320)
+
 ## [1.5.3] - 22-10-2022
 
 ### Added
@@ -1043,6 +1051,7 @@ Version 1.1.0 comes with many added features and improvements over the previous
 
 ### Initial release
 
+[1.5.4]: https://github.com/Paciente8159/uCNC/releases/tag/v1.5.4
 [1.5.3]: https://github.com/Paciente8159/uCNC/releases/tag/v1.5.3
 [1.5.2]: https://github.com/Paciente8159/uCNC/releases/tag/v1.5.2
 [1.5.1]: https://github.com/Paciente8159/uCNC/releases/tag/v1.5.1

diff --git a/uCNC/src/cnc_build.h b/uCNC/src/cnc_build.h
@@ -25,7 +25,7 @@ extern "C"
 #endif
 
 #define CNC_MAJOR_MINOR_VERSION "1.5"
-#define CNC_PATCH_VERSION ".3"
+#define CNC_PATCH_VERSION ".4"
 
 #define CNC_VERSION CNC_MAJOR_MINOR_VERSION CNC_PATCH_VERSION
 

diff --git a/uCNC/src/core/io_control.c b/uCNC/src/core/io_control.c
@@ -373,7 +373,7 @@ uint8_t io_get_controls(void)
 
 void io_enable_probe(void)
 {
-#ifdef ENABLE_MOTION_MODULES
+#ifdef ENABLE_IO_MODULES
 	EVENT_INVOKE(probe_enable, NULL);
 #endif
 #ifndef FORCE_SOFT_POLLING
@@ -390,7 +390,7 @@ void io_disable_probe(void)
 	mcu_disable_probe_isr();
 #endif
 #endif
-#ifdef ENABLE_MOTION_MODULES
+#ifdef ENABLE_IO_MODULES
 	EVENT_INVOKE(probe_disable, NULL);
 #endif
 }
@@ -1131,8 +1131,12 @@ void io_set_output(uint8_t pin, bool state)
 
 void io_enable_steppers(uint8_t mask)
 {
-#ifdef ENABLE_IO_MODULES
-	EVENT_INVOKE(enable_steppers, &mask);
+	// #ifdef ENABLE_IO_MODULES
+	// 	EVENT_INVOKE(enable_steppers, &mask);
+	// #endif
+
+#ifdef IC74HC595_HAS_STEPS_EN
+	ic74hc595_enable_steppers(mask);
 #endif
 
 #if !(STEP0_EN < 0)

diff --git a/uCNC/src/core/parser.c b/uCNC/src/core/parser.c
@@ -1084,6 +1084,9 @@ uint8_t parser_exec_command(parser_state_t *new_state, parser_words_t *words, pa
 
 	if (cmd->group_extended)
 	{
+#ifdef ENABLE_PARSER_MODULES
+		gcode_exec_args_t args = {new_state, words, cmd};
+#endif
 		itp_sync();
 		switch (cmd->group_extended)
 		{
@@ -1124,7 +1127,6 @@ uint8_t parser_exec_command(parser_state_t *new_state, parser_words_t *words, pa
 #endif
 		default:
 #ifdef ENABLE_PARSER_MODULES
-			gcode_exec_args_t args = {new_state, words, cmd};
 			return EVENT_INVOKE(gcode_exec, &args);
 #endif
 			return STATUS_GCODE_UNSUPPORTED_COMMAND;

diff --git a/uCNC/src/hal/mcus/stm32f1x/mcu_stm32f1x.c b/uCNC/src/hal/mcus/stm32f1x/mcu_stm32f1x.c
@@ -402,9 +402,6 @@ void mcu_clocks_init()
 	}
 }
 
-#include <stm32f1xx_hal_rcc.h>
-#include <stm32f1xx_hal_rcc_ex.h>
-#include <stm32f1xx_hal_flash.h>
 void mcu_usart_init(void)
 {
 #ifdef MCU_HAS_USB