zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5560 from thinkyhead/rc_bl_status

Browse source 
Have bed leveling status output current status, not requested.
This commit is contained in:
Scott Lahteine 2016-12-19 19:18:06 -08:00 committed by GitHub
parent 20218e553d 6d6a1db6ec
commit 04f77df6c0
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View file

@ -7030,20 +7030,21 @@ void quickstop_stepper() {
if (code_seen('Z')) set_z_fade_height(code_value_linear_units()); if (code_seen('Z')) set_z_fade_height(code_value_linear_units());
#endif #endif
if (to_enable && !( const bool new_status =
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
mbl.active() mbl.active()
#else #else
planner.abl_enabled planner.abl_enabled
#endif #endif
) ) { ;
to_enable = false;
if (to_enable && !new_status) {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_M420_FAILED); SERIAL_ERRORLNPGM(MSG_ERR_M420_FAILED);
} }
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLNPAIR("Bed Leveling ", to_enable ? MSG_ON : MSG_OFF); SERIAL_ECHOLNPAIR("Bed Leveling ", new_status ? MSG_ON : MSG_OFF);
// V to print the matrix or mesh // V to print the matrix or mesh
if (code_seen('V')) { if (code_seen('V')) {

2
Marlin/configuration_store.cpp
View file

@ -183,7 +183,7 @@ void Config_Postprocess() {
bool eeprom_write_error; bool eeprom_write_error;
void _EEPROM_writeData(int &pos, uint8_t* value, uint16_t size) { void _EEPROM_writeData(int &pos, const uint8_t* value, uint16_t size) {
if (eeprom_write_error) return; if (eeprom_write_error) return;
while (size--) { while (size--) {
uint8_t * const p = (uint8_t * const)pos; uint8_t * const p = (uint8_t * const)pos;