Probing cycle and view build info bug fixes.
- Probing cycle would drop into a QUEUED state, if multiple G38.2 are sent. It would not honor the auto cycle start flags. To fix, the auto cycle start state is saved at the beginning of the probing cycle and restored at the end, since the feed hold it uses to stop a triggered probe will disable the auto start flag. For now it’s a patch, rather than a permanent fix. - protocol_buffer_synchronize() also has a failure case. Auto cycle start does not get executed when the system is waiting in here, so if it’s in a QUEUED state already, it won’t resume. Patched here, but not fully resolved. - Fixed a problem with the “view build info” command. The EEPROM write would do weird things and corrupt the EEPROM. Not sure exactly what caused it, but it’s likely a compiler problem with an improperly defined EEPROM address. It didn’t have enough room to store a full string. To fix, the build info EEPROM range was increased and the max number of STARTUP_BLOCKS was reduced to 2 from 3. - Lastly, when a $I view build info is used for the first time, it would normally show an EEPROM read error, since it wasn’t cleared or wasn’t therein the first place. It will now not show that error. A patch rather than a permanent fix again.
This commit is contained in:
19
settings.c
19
settings.c
@ -33,7 +33,7 @@ settings_t settings;
|
||||
// Method to store startup lines into EEPROM
|
||||
void settings_store_startup_line(uint8_t n, char *line)
|
||||
{
|
||||
uint16_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
|
||||
uint32_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
|
||||
memcpy_to_eeprom_with_checksum(addr,(char*)line, LINE_BUFFER_SIZE);
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@ void settings_store_build_info(char *line)
|
||||
// Method to store coord data parameters into EEPROM
|
||||
void settings_write_coord_data(uint8_t coord_select, float *coord_data)
|
||||
{
|
||||
uint16_t addr = coord_select*(sizeof(float)*N_AXIS+1) + EEPROM_ADDR_PARAMETERS;
|
||||
uint32_t addr = coord_select*(sizeof(float)*N_AXIS+1) + EEPROM_ADDR_PARAMETERS;
|
||||
memcpy_to_eeprom_with_checksum(addr,(char*)coord_data, sizeof(float)*N_AXIS);
|
||||
}
|
||||
|
||||
@ -105,15 +105,14 @@ void settings_reset() {
|
||||
// Reads startup line from EEPROM. Updated pointed line string data.
|
||||
uint8_t settings_read_startup_line(uint8_t n, char *line)
|
||||
{
|
||||
uint16_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
|
||||
uint32_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
|
||||
if (!(memcpy_from_eeprom_with_checksum((char*)line, addr, LINE_BUFFER_SIZE))) {
|
||||
// Reset line with default value
|
||||
line[0] = 0; // Empty line
|
||||
settings_store_startup_line(n, line);
|
||||
return(false);
|
||||
} else {
|
||||
return(true);
|
||||
}
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
@ -124,25 +123,23 @@ uint8_t settings_read_build_info(char *line)
|
||||
// Reset line with default value
|
||||
line[0] = 0; // Empty line
|
||||
settings_store_build_info(line);
|
||||
return(false);
|
||||
} else {
|
||||
return(true);
|
||||
// No error. Usually only happens once when called for first time.
|
||||
}
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
// Read selected coordinate data from EEPROM. Updates pointed coord_data value.
|
||||
uint8_t settings_read_coord_data(uint8_t coord_select, float *coord_data)
|
||||
{
|
||||
uint16_t addr = coord_select*(sizeof(float)*N_AXIS+1) + EEPROM_ADDR_PARAMETERS;
|
||||
uint32_t addr = coord_select*(sizeof(float)*N_AXIS+1) + EEPROM_ADDR_PARAMETERS;
|
||||
if (!(memcpy_from_eeprom_with_checksum((char*)coord_data, addr, sizeof(float)*N_AXIS))) {
|
||||
// Reset with default zero vector
|
||||
clear_vector_float(coord_data);
|
||||
settings_write_coord_data(coord_select,coord_data);
|
||||
return(false);
|
||||
} else {
|
||||
return(true);
|
||||
}
|
||||
return(true);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user