1
0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-03 03:13:25 +02:00

Some settings fixes.

- fixed uint16_t $80-$84 user settings were using 8 bit variable so upper 8 bits were lost when set.
- Added defaults to $80=$84 and $90-$94 user settings in defaults.h
- Moved cpu map MSG to first message at bootup
- Removed MSG about spindle pin assigned (may add global pinout MSGs for all pins in future)
This commit is contained in:
bdring
2020-02-02 10:03:21 -06:00
parent cc78ba3afa
commit 6e6ce932c4
6 changed files with 65 additions and 8 deletions

View File

@@ -38,6 +38,11 @@ volatile uint8_t sys_rt_exec_accessory_override; // Global realtime executor bit
void setup() {
serial_init(); // Setup serial baud rate and interrupts
#ifdef CPU_MAP_NAME // show the map name at startup
grbl_send(CLIENT_SERIAL,"[MSG:Using cpu_map..." CPU_MAP_NAME "]\r\n");
#endif
settings_init(); // Load Grbl settings from EEPROM
stepper_init(); // Configure stepper pins and interrupt timers

View File

@@ -145,6 +145,47 @@
#define DEFAULT_LASER_MODE 0 // false
#endif
// user settings
#ifndef DEFAULT_USER_INT_80
#define DEFAULT_USER_INT_80 0 // $80 User integer setting
#endif
#ifndef DEFAULT_USER_INT_81
#define DEFAULT_USER_INT_81 0 // $81 User integer setting
#endif
#ifndef DEFAULT_USER_INT_82
#define DEFAULT_USER_INT_82 0 // $82 User integer setting
#endif
#ifndef DEFAULT_USER_INT_83
#define DEFAULT_USER_INT_83 0 // $83 User integer setting
#endif
#ifndef DEFAULT_USER_INT_84
#define DEFAULT_USER_INT_84 0 // $84 User integer setting
#endif
#ifndef DEFAULT_USER_FLOAT_90
#define DEFAULT_USER_FLOAT_90 0.0 // $90 User integer setting
#endif
#ifndef DEFAULT_USER_FLOAT_91
#define DEFAULT_USER_FLOAT_91 0.0 // $92 User integer setting
#endif
#ifndef DEFAULT_USER_FLOAT_92
#define DEFAULT_USER_FLOAT_92 0.0 // $92 User integer setting
#endif
#ifndef DEFAULT_USER_FLOAT_93
#define DEFAULT_USER_FLOAT_93 0.0 // $93 User integer setting
#endif
#ifndef DEFAULT_USER_FLOAT_94
#define DEFAULT_USER_FLOAT_94 0.0 // $94 User integer setting
#endif
// =========== AXIS RESOLUTION ======

View File

@@ -20,7 +20,7 @@
// Grbl versioning system
#define GRBL_VERSION "1.1f"
#define GRBL_VERSION_BUILD "20200115"
#define GRBL_VERSION_BUILD "20200202"
//#include <sdkconfig.h>
#include <Arduino.h>

View File

@@ -266,10 +266,7 @@ void report_feedback_message(uint8_t message_code) // OK to send to all clients
// Welcome message
void report_init_message(uint8_t client)
{
#ifdef CPU_MAP_NAME
grbl_send(client,"[MSG:Using cpu_map..." CPU_MAP_NAME "]\r\n");
#endif
{
grbl_send(client,"\r\nGrbl " GRBL_VERSION " ['$' for help]\r\n");
}

View File

@@ -163,6 +163,20 @@ void settings_restore(uint8_t restore_flag) {
settings.machine_int16[index] = 0;
settings.machine_float[index] = 0.0;
}
// User Integer values
settings.machine_int16[0] = DEFAULT_USER_INT_80;
settings.machine_int16[1] = DEFAULT_USER_INT_81;
settings.machine_int16[2] = DEFAULT_USER_INT_82;
settings.machine_int16[3] = DEFAULT_USER_INT_83;
settings.machine_int16[4] = DEFAULT_USER_INT_84;
// User Integer values
settings.machine_float[0] = DEFAULT_USER_FLOAT_90;
settings.machine_float[1] = DEFAULT_USER_FLOAT_91;
settings.machine_float[2] = DEFAULT_USER_FLOAT_92;
settings.machine_float[3] = DEFAULT_USER_FLOAT_93;
settings.machine_float[4] = DEFAULT_USER_FLOAT_94;
write_global_settings();
@@ -411,7 +425,7 @@ uint8_t settings_store_global_setting(uint8_t parameter, float value) {
case 82:
case 83:
case 84:
settings.machine_int16[parameter - 80] = int_value;
settings.machine_int16[parameter - 80] = (uint16_t)value;
break;
case 90:
@@ -449,4 +463,4 @@ void settings_spi_driver_init() {
#else
grbl_send(CLIENT_ALL, "[MSG: No SPI drivers setup]\r\n");
#endif
}
}

View File

@@ -32,7 +32,7 @@ void spindle_init()
{
#ifdef SPINDLE_PWM_PIN
grbl_sendf(CLIENT_SERIAL, "[MSG:Spindle init on pin %d]\r\n", SPINDLE_PWM_PIN);
#ifdef INVERT_SPINDLE_PWM
grbl_send(CLIENT_SERIAL, "[MSG: INVERT_SPINDLE_PWM]\r\n");
#endif