Merge pull request #509 from Paciente8159/sync-latest.changes-v1.7

patches #499 #501 #507 and #508
Paciente8159 · Sep 25, 2023 · 249add7 · 249add7
2 parents a2b9bff + d95c20e
commit 249add7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/uCNC/src/cnc.c b/uCNC/src/cnc.c
@@ -412,6 +412,11 @@ bool cnc_has_alarm()
 	return (cnc_get_exec_state(EXEC_KILL) || (cnc_state.alarm != EXEC_ALARM_NOALARM));
 }
 
+uint8_t cnc_get_alarm(void)
+{
+	return cnc_state.alarm;
+}
+
 void cnc_stop(void)
 {
 	itp_stop();

diff --git a/uCNC/src/cnc.h b/uCNC/src/cnc.h
@@ -158,6 +158,7 @@ extern "C"
 	void cnc_home(void);
 	void cnc_alarm(int8_t code);
 	bool cnc_has_alarm();
+	uint8_t cnc_get_alarm(void);
 	void cnc_stop(void);
 	uint8_t cnc_unlock(bool force);
 	void cnc_delay_ms(uint32_t miliseconds);

diff --git a/uCNC/src/cnc_hal_config_helper.h b/uCNC/src/cnc_hal_config_helper.h
@@ -656,6 +656,17 @@ extern "C"
 #else
 #define STEP3_ITP_MASK STEP3_MASK
 #endif
+#if (STEP4_MASK == STEP_DUAL0)
+#define STEP4_ITP_MASK (STEP4_MASK | STEP_DUAL0_MASK)
+#elif (STEP4_MASK == STEP_DUAL1)
+#define STEP4_ITP_MASK (STEP4_MASK | STEP_DUAL1_MASK)
+#elif (STEP4_MASK == STEP_DUAL2)
+#define STEP4_ITP_MASK (STEP4_MASK | STEP_DUAL2_MASK)
+#elif (STEP4_MASK == STEP_DUAL3)
+#define STEP4_ITP_MASK (STEP4_MASK | STEP_DUAL3_MASK)
+#else
+#define STEP4_ITP_MASK STEP4_MASK
+#endif
 #if (STEP5_MASK == STEP_DUAL0)
 #define STEP5_ITP_MASK (STEP5_MASK | STEP_DUAL0_MASK)
 #elif (STEP5_MASK == STEP_DUAL1)

diff --git a/uCNC/src/modules/language/language_en.h b/uCNC/src/modules/language/language_en.h
@@ -63,6 +63,21 @@ extern "C"
 #define STR_SETTINGS_LOADED "Settings loaded"
 #define STR_SETTINGS_SAVED "Settings saved"
 #define STR_SETTINGS_RESET "Settings reset"
+// alarms
+#define STR_ALARM_0 "Unknowned"
+#define STR_ALARM_1 "Hard limits hit"
+#define STR_ALARM_2 "Soft limits hit"
+#define STR_ALARM_3 "Aborted by user"
+#define STR_ALARM_4 "Probe hit"
+#define STR_ALARM_5 "Probe no hit"
+#define STR_ALARM_6 "Home reset"
+#define STR_ALARM_7 "Door opened"
+#define STR_ALARM_8 "Limits in contact"
+#define STR_ALARM_9 "Failed home find"
+#define STR_ALARM_10 "Failed autolevel"
+#define STR_ALARM_11 "Limits are active"
+#define STR_ALARM_12 "Tool sync fail"
+#define STR_ALARM_13 "Limits tripped"
 
 #ifdef __cplusplus
 }

diff --git a/uCNC/src/modules/system_menu.c b/uCNC/src/modules/system_menu.c
@@ -266,10 +266,10 @@ void system_menu_action(uint8_t action)
 	int16_t currentindex = g_system_menu.current_index;
 
 	// kill alarm is active
-	if (cnc_get_exec_state(EXEC_ALARM))
+	if (cnc_get_exec_state(EXEC_INTERLOCKING_FAIL) || cnc_has_alarm())
 	{
 		// never go idle
-		g_system_menu.action_timeout = UINT32_MAX;
+		g_system_menu.action_timeout = mcu_millis() + SYSTEM_MENU_MODAL_POPUP_MS;
 		g_system_menu.flags |= SYSTEM_MENU_MODE_REDRAW;
 		// leave. ignore all actions
 		return;
@@ -413,7 +413,7 @@ void system_menu_render(void)
 		g_system_menu.flags &= ~SYSTEM_MENU_MODE_REDRAW;
 		uint8_t item_index = 0;
 
-		if (cnc_get_exec_state(EXEC_ALARM))
+		if (cnc_get_exec_state(EXEC_INTERLOCKING_FAIL) || cnc_has_alarm())
 		{
 			system_menu_render_alarm();
 			return;
@@ -736,7 +736,7 @@ static bool system_menu_action_jog(uint8_t action, system_menu_item_t *item)
 	else if (g_system_menu.flags & SYSTEM_MENU_MODE_SIMPLE_EDIT)
 	{
 		// one jog command at time
-		if (serial_get_rx_freebytes() > 32 && !cnc_get_exec_state(EXEC_RUN))
+		if (serial_get_rx_freebytes() > 32)
 		{
 			char buffer[SYSTEM_MENU_MAX_STR_LEN];
 			memset(buffer, 0, SYSTEM_MENU_MAX_STR_LEN);