version bump and formating

CHANGELOG.md

@@ -8,6 +8,55 @@
 
 # Changelog
 
+## [1.8.8] - 03-03-2024
+
+## Contributors
+[@lonelycorn](https://github.com/lonelycorn) - modified mcumap macros of ESP32 to improve support for ESP32 family (#649) and removed duplicated servo variables for ESP32 (#648)
+[@ademenev](https://github.com/ademenev) - added kinematics option for MP Scara (#645)
+
+### Added
+
+- Fs page update endpoint (#612)
+- added option for rotational axis work always in relative distances (#624)
+- STM32 NucleoF411RE boardmap with CNC Shield V3 (#628)
+- added option to enable translated pins names status print (#634)
+- added kinematics option for MP Scara (#645)
+- added aditional Grbl emulation level to prevent miss detection of senders (#650)
+- added option to do limit detection at the step ISR (#652)
+
+### Changed
+
+- allow execution of main loop events with HOLD condition active (#633)
+- modified extended settings event hooks to be separated from other overriding events and propagations methods (#635) (#637) (#641)
+- allow detached ports to keep or not an internal buffer (#639)
+- cross architecture definition of NVM_STORAGE_SIZE and setting (#643)
+- moved spindle restore logic to planner override (#647)
+- modified mcumap macros of ESP32 to improve support for ESP32 family (#649) (#654)
+- modified endpoints to support handling of wildcard terminators (#655)
+- on command error now also the parser is forced to sync with other sub-systems (#657)
+- modified behavior of Cycle Start/Resume button to execute only once per press (#657)
+
+### Fixed
+
+- fixed extensions settings event handling that prevented extended settings to be saved (#615)
+- fixed STM32F4 compilation error when I2C HW was defined (#615)
+- fixed program stall while waiting for timeout condition inside an ISR (#619)
+- fixed STM32F4 SPI configuration AFIO fixed (#622)
+- fixed range function for Plasma THC (#627)
+- fixed STM32F4 APB registers of timers in the mcumap (#629)
+- fixed compilation error when tool count was set to 0 (#632)
+- fixed realtime command spindle toggle control over the tool (#631)
+- fixed spindle restart message spawning (#636)
+- fixed uart2 detach from main protocol typo in multiple boards (#638)
+- fixed reset command parsing and early execution (#642)
+- fixed spindle stop/restore after cancel a jog (#644)
+- fixed dwell/delay execute even after a reset occured (#646)
+- removed duplicated servo variables for ESP32 (#648)
+- fixed low speed clock options for STM32F1 (#653)
+- fixed STM32 I2C stop bit logic to prevent trail of pulses at the end of a read operation (#656)
+- fixed pending jog motions after jog cancel (#657)
+- fixed interpolator acceleration calculations to prevent ultra thin time sampling windows (#657)
+
 ## [1.8.7] - 03-02-2024
 
 ## Contributors

uCNC/boardmap_overrides.h

@@ -1,4 +1,4 @@
-//boardmap override dummy file
+// boardmap override dummy file
 
 #ifndef BOARDMAP_OVERRIDES_H
 #define BOARDMAP_OVERRIDES_H

uCNC/cnc_config.h

@@ -10,11 +10,11 @@
 		it under the terms of the GNU General Public License as published by
 		the Free Software Foundation, either version 3 of the License, or
 		(at your option) any later version. Please see
-   <http://www.gnu.org/licenses/>
+	 <http://www.gnu.org/licenses/>
 
 		µCNC is distributed WITHOUT ANY WARRANTY;
 		Also without the implied warranty of MERCHANTABILITY or FITNESS FOR A
-   PARTICULAR PURPOSE. See the	GNU General Public License for more details.
+	 PARTICULAR PURPOSE. See the	GNU General Public License for more details.
 */
 
 #ifndef CNC_CONFIG_H

uCNC/cnc_hal_config.h

@@ -112,8 +112,8 @@ extern "C"
  * Enable this option if you want the rotation axis to work in relative distance mode only
  * This will mean that no matter if the machine is working in absolute (G90) or relative (G91) coordinates
  * the rotational axis will always calculate the motion in relative distance mode
- * 
-*/
+ *
+ */
 // #define AXIS_A_FORCE_RELATIVE_MODE
 // #define AXIS_B_FORCE_RELATIVE_MODE
 // #define AXIS_C_FORCE_RELATIVE_MODE

uCNC/cnc_hal_overrides.h

@@ -1,4 +1,4 @@
-//boardmap override dummy file
+// boardmap override dummy file
 
 #ifndef CNC_HAL_OVERRIDES_H
 #define CNC_HAL_OVERRIDES_H

uCNC/src/cnc.h

@@ -53,40 +53,40 @@ extern "C"
 
 /**
  * Flags and state changes
- * 
+ *
  * EXEC_KILL
  * Set by cnc_alarm.
- * Cleared by reset or unlock depending on the the alarm priority. Cannot be cleared if ESTOP is pressed. 
- * 
+ * Cleared by reset or unlock depending on the the alarm priority. Cannot be cleared if ESTOP is pressed.
+ *
  * EXEC_LIMITS
- * Set when at a transition of a limit switch from inactive to the active state. 
+ * Set when at a transition of a limit switch from inactive to the active state.
  * Cleared by reset or unlock. Not affected by the limit switch state.
- * 
+ *
  * EXEC_UNHOMED
  * Set when the interpolator is abruptly stopped causing the position to be lost.
  * Cleared by homing or unlock.
- * 
+ *
  * EXEC_DOOR
  * Set with when the safety door pin is active or the safety door command is called.
  * Cleared by cycle resume, unlock or reset. If the door is opened it will remain active
- * 
+ *
  */
 // current cnc states (multiple can be active/overlapped at the same time)
-#define EXEC_IDLE 0															// All flags cleared
-#define EXEC_RUN 1															// Motions are being executed
-#define EXEC_HOLD 2															// Feed hold is active
-#define EXEC_JOG 4															// Jogging in execution
-#define EXEC_HOMING 8														// Homing in execution
-#define EXEC_DOOR 16														// Safety door open
-#define EXEC_UNHOMED 32														// Machine is not homed or lost position due to abrupt stop
-#define EXEC_LIMITS 64														// Limits hit
-#define EXEC_KILL 128														// Emergency stop
-#define EXEC_HOMING_HIT (EXEC_HOMING | EXEC_LIMITS)							// Limit switch is active during a homing motion
-#define EXEC_INTERLOCKING_FAIL (EXEC_LIMITS | EXEC_KILL)					// Interlocking check failed
-#define EXEC_ALARM (EXEC_UNHOMED | EXEC_INTERLOCKING_FAIL)					// System alarms
-#define EXEC_RESET_LOCKED (EXEC_ALARM | EXEC_DOOR | EXEC_HOLD)				// System reset locked
-#define EXEC_GCODE_LOCKED (EXEC_ALARM | EXEC_DOOR | EXEC_JOG) 				// Gcode is locked by an alarm or any special motion state
-#define EXEC_ALLACTIVE 255													// All states
+#define EXEC_IDLE 0																						 // All flags cleared
+#define EXEC_RUN 1																						 // Motions are being executed
+#define EXEC_HOLD 2																						 // Feed hold is active
+#define EXEC_JOG 4																						 // Jogging in execution
+#define EXEC_HOMING 8																					 // Homing in execution
+#define EXEC_DOOR 16																					 // Safety door open
+#define EXEC_UNHOMED 32																				 // Machine is not homed or lost position due to abrupt stop
+#define EXEC_LIMITS 64																				 // Limits hit
+#define EXEC_KILL 128																					 // Emergency stop
+#define EXEC_HOMING_HIT (EXEC_HOMING | EXEC_LIMITS)						 // Limit switch is active during a homing motion
+#define EXEC_INTERLOCKING_FAIL (EXEC_LIMITS | EXEC_KILL)			 // Interlocking check failed
+#define EXEC_ALARM (EXEC_UNHOMED | EXEC_INTERLOCKING_FAIL)		 // System alarms
+#define EXEC_RESET_LOCKED (EXEC_ALARM | EXEC_DOOR | EXEC_HOLD) // System reset locked
+#define EXEC_GCODE_LOCKED (EXEC_ALARM | EXEC_DOOR | EXEC_JOG)	 // Gcode is locked by an alarm or any special motion state
+#define EXEC_ALLACTIVE 255																		 // All states
 
 // creates a set of helper masks used to configure the controller
 #define ESTOP_MASK 1
@@ -99,14 +99,14 @@ extern "C"
 /**
  * Basic step and dir IO masks
  * STEPS DIRS and LIMITS can be combined to form MULTI AXIS/LIMITS combinations
- * 
+ *
  * Usually (depends on the kinematic) STEP0 is assigned to AXIS X, STEP1 is assigned to AXIS Y, etc..
  * But STEP0 can be formed by multiple STEPPERS (for example STEPPER0, STEPPER5, STEPPER6 and STEPPER7)
- * 
+ *
  * STEP0_MASK can then be formed by a combinations of stepper IO masks like this
- * 
+ *
  * #define STEP0_MASK (STEPPER0_IO_MASK | STEPPER5_IO_MASK | STEPPER6_IO_MASK | STEPPER7_IO_MASK)
- * 
+ *
  * For auto-squaring LIMITS should also match this STEPx mask by merging all combined limits to form a multi-switch limit
  * **/
 #define STEP_UNDEF_IO_MASK 0

uCNC/src/cnc_build.h

@@ -25,7 +25,7 @@ extern "C"
 #endif
 
 #define CNC_MAJOR_MINOR_VERSION "1.8"
-#define CNC_PATCH_VERSION ".7"
+#define CNC_PATCH_VERSION ".8"
 
 #define CNC_VERSION CNC_MAJOR_MINOR_VERSION CNC_PATCH_VERSION
 

uCNC/src/cnc_hal_config_helper.h

@@ -53,9 +53,9 @@ extern "C"
 // machine tools configurations
 #include "hal/tools/tool.h" //configures the kinematics for the cnc machine
 // final HAL configurations
-#include "../cnc_hal_config.h"	  //inicializes the HAL hardcoded connections
+#include "../cnc_hal_config.h"		//inicializes the HAL hardcoded connections
 #include "../cnc_hal_overrides.h" //config override file
-#include "modules/ic74hc595.h"	  // io extender
+#include "modules/ic74hc595.h"		// io extender
 
 	/**
 	 *

uCNC/src/core/interpolator.h

@@ -95,7 +95,7 @@ extern "C"
 	float itp_get_rt_feed(void);
 	bool itp_is_empty(void);
 	uint8_t itp_sync(void);
-	itp_segment_t* itp_get_rt_segment();
+	itp_segment_t *itp_get_rt_segment();
 	uint8_t itp_set_step_mode(uint8_t mode);
 
 	void itp_sync_spindle(void);

uCNC/src/core/io_control.h

@@ -38,10 +38,10 @@ extern "C"
  *
  **/
 #define io_config_input(pin) io_hal_config_input(pin)
-#define io_config_pullup(pin)  io_hal_config_pullup(pin)
-#define io_get_input(pin)  io_hal_get_input(pin)
-#define io_config_analog(pin)  io_hal_config_analog(pin)
-#define io_get_analog(pin)  io_hal_get_analog(pin)
+#define io_config_pullup(pin) io_hal_config_pullup(pin)
+#define io_get_input(pin) io_hal_get_input(pin)
+#define io_config_analog(pin) io_hal_config_analog(pin)
+#define io_get_analog(pin) io_hal_get_analog(pin)
 
 #define io_config_output(pin) io_hal_config_output(pin)
 #define io_set_output(pin) io_hal_set_output(pin)
@@ -56,10 +56,10 @@ extern "C"
 	MCU_CALLBACK void io_soft_pwm_update(void);
 #endif
 
-	// inputs
-	#ifdef ENABLE_MULTI_STEP_HOMING
+// inputs
+#ifdef ENABLE_MULTI_STEP_HOMING
 	void io_lock_limits(uint8_t limitmask);
-	#endif
+#endif
 	void io_invert_limits(uint8_t limitmask);
 	uint8_t io_get_limits(void);
 	uint8_t io_get_controls(void);

uCNC/src/core/parser.h

@@ -116,11 +116,11 @@ extern "C"
 
 #define PARSER_PARAM_SIZE (sizeof(float) * AXIS_COUNT)	 // parser parameters array size
 #define PARSER_PARAM_ADDR_OFFSET (PARSER_PARAM_SIZE + 1) // parser parameters array size + 1 crc byte
-#define G28HOME COORD_SYS_COUNT							 // G28 index
-#define G30HOME COORD_SYS_COUNT + 1						 // G30 index
-#define G92OFFSET COORD_SYS_COUNT + 2					 // G92 index
+#define G28HOME COORD_SYS_COUNT													 // G28 index
+#define G30HOME COORD_SYS_COUNT + 1											 // G30 index
+#define G92OFFSET COORD_SYS_COUNT + 2										 // G92 index
 
-#define PARSER_CORDSYS_ADDRESS SETTINGS_PARSER_PARAMETERS_ADDRESS_OFFSET							  // 1st coordinate system offset eeprom address (G54)
+#define PARSER_CORDSYS_ADDRESS SETTINGS_PARSER_PARAMETERS_ADDRESS_OFFSET															// 1st coordinate system offset eeprom address (G54)
 #define G28ADDRESS (SETTINGS_PARSER_PARAMETERS_ADDRESS_OFFSET + (PARSER_PARAM_ADDR_OFFSET * G28HOME)) // G28 coordinate offset eeprom address
 #define G30ADDRESS (SETTINGS_PARSER_PARAMETERS_ADDRESS_OFFSET + (PARSER_PARAM_ADDR_OFFSET * G30HOME)) // G28 coordinate offset eeprom address
 #ifdef G92_STORE_NONVOLATILE

uCNC/src/hal/boards/avr/boardmap_rambo14.h

@@ -61,19 +61,19 @@ extern "C"
 
 	// Setup limit pins
 
-#define LIMIT_X_BIT 6	// assigns LIMIT_X pin
+#define LIMIT_X_BIT 6		// assigns LIMIT_X pin
 #define LIMIT_X_PORT B	// assigns LIMIT_X port
-#define LIMIT_X_ISR 0	// assigns LIMIT_X ISR
+#define LIMIT_X_ISR 0		// assigns LIMIT_X ISR
 #define LIMIT_X2_BIT 2	// assigns LIMIT_X pin
 #define LIMIT_X2_PORT A // assigns LIMIT_X port
-#define LIMIT_Y_BIT 5	// assigns LIMIT_Y pin
+#define LIMIT_Y_BIT 5		// assigns LIMIT_Y pin
 #define LIMIT_Y_PORT B	// assigns LIMIT_Y port
-#define LIMIT_Y_ISR 0	// assigns LIMIT_Y ISR
+#define LIMIT_Y_ISR 0		// assigns LIMIT_Y ISR
 #define LIMIT_Y2_BIT 1	// assigns LIMIT_Y pin
 #define LIMIT_Y2_PORT A // assigns LIMIT_Y port
-#define LIMIT_Z_BIT 4	// assigns LIMIT_Z pin
+#define LIMIT_Z_BIT 4		// assigns LIMIT_Z pin
 #define LIMIT_Z_PORT B	// assigns LIMIT_Z port
-#define LIMIT_Z_ISR 0	// assigns LIMIT_Z ISR
+#define LIMIT_Z_ISR 0		// assigns LIMIT_Z ISR
 
 // Setup probe pin
 #define PROBE_BIT 7
@@ -96,12 +96,12 @@ extern "C"
 
 // Setup generic IO Pins
 // Functionalities are set in config.h file
-//#define DOUT0_BIT 5
-//#define DOUT0_PORT B
-//#define DOUT1_BIT 0
+// #define DOUT0_BIT 5
+// #define DOUT0_PORT B
+// #define DOUT1_BIT 0
 // define DOUT1_PORT B
-//#define DOUT2_BIT 3
-//#define DOUT2_PORT C
+// #define DOUT2_BIT 3
+// #define DOUT2_PORT C
 
 // Stepper enable pin. For Grbl on Uno board a single pin is used
 #define STEP0_EN_BIT 7
@@ -117,10 +117,10 @@ extern "C"
 
 	// Setup the Step Timer used has the heartbeat for µCNC
 	// Timer 1 is used by default
-	//#define ITP_TIMER 1
+	// #define ITP_TIMER 1
 	// Setup the RTC Timer used by µCNC to provide an (mostly) accurate time base for all time dependent functions
 	// Timer 0 is set by default
-	//#define RTC_TIMER 0
+	// #define RTC_TIMER 0
 
 // blink led
 #define DOUT31_BIT 7