diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3663cbe12..a4f2302b1 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1499,7 +1499,9 @@ void setup() #ifdef SNMM if (eeprom_read_dword((uint32_t*)EEPROM_BOWDEN_LENGTH) == 0x0ffffffff) { //bowden length used for SNMM int _z = BOWDEN_LENGTH; - for(int i = 0; i<4; i++) EEPROM_save_B(EEPROM_BOWDEN_LENGTH + i * 2, &_z); + for(uint8_t i = 0; i < 4; i++) { + eeprom_update_word((uint16_t*)EEPROM_BOWDEN_LENGTH + i, _z); + } } #endif @@ -1544,7 +1546,9 @@ void setup() //eeprom_write_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 0); eeprom_write_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 1); int16_t z_shift = 0; - for (uint8_t i = 0; i < 5; i++) EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + i * 2, &z_shift); + for (uint8_t i = 0; i < 5; i++) { + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i, z_shift); + } eeprom_write_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE, 0); } if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 255) { @@ -1568,8 +1572,8 @@ void setup() #ifdef PAT9125 fsensor_setup_interrupt(); #endif //PAT9125 - for (int i = 0; i<4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); - + eeprom_update_block(bowden_length, (uint16_t*)EEPROM_BOWDEN_LENGTH, sizeof(bowden_length)); + #ifndef DEBUG_DISABLE_STARTMSGS KEEPALIVE_STATE(PAUSED_FOR_USER); @@ -5422,7 +5426,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) { float temp = (40 + i * 5); printf_P(_N("\nStep: %d/6 (skipped)\nPINDA temperature: %d Z shift (mm):0\n"), i + 2, (40 + i*5)); - if (i >= 0) EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + i * 2, &z_shift); + if (i >= 0) { + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i, z_shift); + } if (start_temp <= temp) break; } @@ -5461,7 +5467,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) printf_P(_N("\nPINDA temperature: %.1f Z shift (mm): %.3f"), current_temperature_pinda, current_position[Z_AXIS] - zero_z); - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + i * 2, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i, z_shift); } lcd_temp_cal_show_result(true); homing_flag = false; @@ -5546,7 +5552,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) printf_P(_N("\nTemperature: %d Z shift (mm): %.3f\n"), t_c, current_position[Z_AXIS] - zero_z); - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + i*2, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i, z_shift); } @@ -5668,7 +5674,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) }else{ // Save it to the eeprom babystepLoadZ = babystepz; - EEPROM_save_B(EEPROM_BABYSTEP_Z0+(BabyPosition*2),&babystepLoadZ); + eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z0 + BabyPosition, babystepLoadZ); // adjust the Z babystepsTodoZadd(babystepLoadZ); } @@ -8348,7 +8354,9 @@ Sigma_Exit: SERIAL_PROTOCOLLN("index, temp, ustep, um"); for (uint8_t i = 0; i < 6; i++) { - if(i>0) EEPROM_read_B(EEPROM_PROBE_TEMP_SHIFT + (i-1) * 2, &usteps); + if(i > 0) { + usteps = eeprom_read_word((uint16_t*) EEPROM_PROBE_TEMP_SHIFT + (i - 1)); + } float mm = ((float)usteps) / cs.axis_steps_per_unit[Z_AXIS]; i == 0 ? SERIAL_PROTOCOLPGM("n/a") : SERIAL_PROTOCOL(i - 1); SERIAL_PROTOCOLPGM(", "); @@ -8363,21 +8371,23 @@ Sigma_Exit: else if (code_seen('!')) { // ! - Set factory default values eeprom_write_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 1); int16_t z_shift = 8; //40C - 20um - 8usteps - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT, z_shift); z_shift = 24; //45C - 60um - 24usteps - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + 2, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + 1, z_shift); z_shift = 48; //50C - 120um - 48usteps - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + 4, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + 2, z_shift); z_shift = 80; //55C - 200um - 80usteps - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + 6, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + 3, z_shift); z_shift = 120; //60C - 300um - 120usteps - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + 8, &z_shift); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + 4, z_shift); SERIAL_PROTOCOLLN("factory restored"); } else if (code_seen('Z')) { // Z - Set all values to 0 (effectively disabling PINDA temperature compensation) eeprom_write_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 1); int16_t z_shift = 0; - for (uint8_t i = 0; i < 5; i++) EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + i * 2, &z_shift); + for (uint8_t i = 0; i < 5; i++) { + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i, z_shift); + } SERIAL_PROTOCOLLN("zerorized"); } else if (code_seen('S')) { // Sxxx Iyyy - Set compensation ustep value S for compensation table index I @@ -8385,13 +8395,15 @@ Sigma_Exit: if (code_seen('I')) { uint8_t index = code_value_uint8(); if (index < 5) { - EEPROM_save_B(EEPROM_PROBE_TEMP_SHIFT + index * 2, &usteps); + eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + index, usteps); SERIAL_PROTOCOLLN("OK"); SERIAL_PROTOCOLLN("index, temp, ustep, um"); for (uint8_t i = 0; i < 6; i++) { usteps = 0; - if (i>0) EEPROM_read_B(EEPROM_PROBE_TEMP_SHIFT + (i - 1) * 2, &usteps); + if (i > 0) { + usteps = eeprom_read_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + (i - 1)); + } float mm = ((float)usteps) / cs.axis_steps_per_unit[Z_AXIS]; i == 0 ? SERIAL_PROTOCOLPGM("n/a") : SERIAL_PROTOCOL(i - 1); SERIAL_PROTOCOLPGM(", "); @@ -10891,7 +10903,7 @@ static void temp_compensation_apply() { if (calibration_status() == CALIBRATION_STATUS_CALIBRATED) { if (target_temperature_bed % 10 == 0 && target_temperature_bed >= 60 && target_temperature_bed <= 100) { i_add = (target_temperature_bed - 60) / 10; - EEPROM_read_B(EEPROM_PROBE_TEMP_SHIFT + i_add * 2, &z_shift); + z_shift = eeprom_read_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i_add); z_shift_mm = z_shift / cs.axis_steps_per_unit[Z_AXIS]; }else { //interpolation @@ -10921,7 +10933,10 @@ float temp_comp_interpolation(float inp_temperature) { shift[0] = 0; for (i = 0; i < n; i++) { - if (i>0) EEPROM_read_B(EEPROM_PROBE_TEMP_SHIFT + (i-1) * 2, &shift[i]); //read shift in steps from EEPROM + if (i > 0) { + //read shift in steps from EEPROM + shift[i] = eeprom_read_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + (i - 1)); + } temp_C[i] = 50 + i * 10; //temperature in C #ifdef PINDA_THERMISTOR constexpr int start_compensating_temp = 35; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e90eaa8a6..d7643769a 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2905,20 +2905,6 @@ static void lcd_menu_xyz_offset() menu_back_if_clicked(); } -// Save a single axis babystep value. -void EEPROM_save_B(int pos, int* value) -{ - eeprom_update_byte((unsigned char*)pos, (unsigned char)((*value) & 0xff)); - eeprom_update_byte((unsigned char*)pos + 1, (unsigned char)((*value) >> 8)); -} - -// Read a single axis babystep value. -void EEPROM_read_B(int pos, int* value) -{ - *value = (int)eeprom_read_byte((unsigned char*)pos) | (int)(eeprom_read_byte((unsigned char*)pos + 1) << 8); -} - - // Note: the colon behind the text (X, Y, Z) is necessary to greatly shorten // the implementation of menu_draw_float31 static void lcd_move_x() { @@ -3188,15 +3174,15 @@ void lcd_adjust_z() { fsm = cursor_pos; if (fsm == 1) { int babystepLoadZ = 0; - EEPROM_read_B(EEPROM_BABYSTEP_Z, &babystepLoadZ); + babystepLoadZ = eeprom_read_word((uint16_t*)EEPROM_BABYSTEP_Z); CRITICAL_SECTION_START babystepsTodo[Z_AXIS] = babystepLoadZ; CRITICAL_SECTION_END } else { int zero = 0; - EEPROM_save_B(EEPROM_BABYSTEP_X, &zero); - EEPROM_save_B(EEPROM_BABYSTEP_Y, &zero); - EEPROM_save_B(EEPROM_BABYSTEP_Z, &zero); + eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_X, zero); + eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Y, zero); + eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, zero); } _delay(500); } @@ -4180,8 +4166,8 @@ void lcd_pick_babystep(){ if (lcd_clicked()) { fsm = cursor_pos; int babyStepZ; - EEPROM_read_B(EEPROM_BABYSTEP_Z0+((fsm-1)*2),&babyStepZ); - EEPROM_save_B(EEPROM_BABYSTEP_Z,&babyStepZ); + babyStepZ = eeprom_read_word((uint16_t*)EEPROM_BABYSTEP_Z0+(fsm-1)); + eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, babyStepZ); calibration_status_store(CALIBRATION_STATUS_CALIBRATED); _delay(500); @@ -4203,36 +4189,16 @@ void lcd_move_menu_axis() MENU_END(); } -void EEPROM_save(int pos, uint8_t* value, uint8_t size) -{ - do - { - eeprom_write_byte((unsigned char*)pos, *value); - pos++; - value++; - } while (--size); -} - -void EEPROM_read(int pos, uint8_t* value, uint8_t size) -{ - do - { - *value = eeprom_read_byte((unsigned char*)pos); - pos++; - value++; - } while (--size); -} - #ifdef SDCARD_SORT_ALPHA static void lcd_sort_type_set() { uint8_t sdSort; - EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort)); + sdSort = eeprom_read_byte((uint8_t*) EEPROM_SD_SORT); switch (sdSort) { case SD_SORT_TIME: sdSort = SD_SORT_ALPHA; break; case SD_SORT_ALPHA: sdSort = SD_SORT_NONE; break; default: sdSort = SD_SORT_TIME; } - eeprom_update_byte((unsigned char *)EEPROM_SD_SORT, sdSort); + eeprom_update_byte((uint8_t*)EEPROM_SD_SORT, sdSort); card.presort_flag = true; } #endif //SDCARD_SORT_ALPHA @@ -5226,7 +5192,7 @@ do\ MENU_ITEM_TOGGLE_P(_T(MSG_SD_CARD), _T(MSG_NORMAL), lcd_toshiba_flash_air_compatibility_toggle);\ \ uint8_t sdSort;\ - EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));\ + sdSort = eeprom_read_byte((uint8_t*) EEPROM_SD_SORT);\ switch (sdSort)\ {\ case SD_SORT_TIME: MENU_ITEM_TOGGLE_P(_T(MSG_SORT), _T(MSG_SORT_TIME), lcd_sort_type_set); break;\ @@ -5619,7 +5585,7 @@ void lcd_hw_setup_menu(void) // can not be "static" static void lcd_settings_menu() { - EEPROM_read(EEPROM_SILENT, (uint8_t*)&SilentModeMenu, sizeof(SilentModeMenu)); + SilentModeMenu = eeprom_read_byte((uint8_t*) EEPROM_SILENT); MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); @@ -5779,7 +5745,7 @@ void bowden_menu() { lcd_puts_at_P(1, i, PSTR("Extruder ")); lcd_print(i); lcd_print(": "); - EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); + bowden_length[i] = eeprom_read_word((uint16_t*)EEPROM_BOWDEN_LENGTH + i); lcd_print(bowden_length[i] - 48); } @@ -5849,7 +5815,7 @@ void bowden_menu() { _delay(100); if (lcd_clicked()) { Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); - EEPROM_save_B(EEPROM_BOWDEN_LENGTH + cursor_pos * 2, &bowden_length[cursor_pos]); + eeprom_update_word((uint16_t*)EEPROM_BOWDEN_LENGTH + cursor_pos, bowden_length[cursor_pos]); if (lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Continue with another bowden?"))) { lcd_update_enable(true); lcd_clear(); @@ -5859,7 +5825,7 @@ void bowden_menu() { lcd_puts_at_P(1, i, PSTR("Extruder ")); lcd_print(i); lcd_print(": "); - EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); + bowden_length[i] = eeprom_read_word((uint16_t*)EEPROM_BOWDEN_LENGTH + i); lcd_print(bowden_length[i] - 48); } @@ -6747,9 +6713,7 @@ static void lcd_tune_menu() calculate_extruder_multipliers(); } - EEPROM_read(EEPROM_SILENT, (uint8_t*)&SilentModeMenu, sizeof(SilentModeMenu)); - - + SilentModeMenu = eeprom_read_byte((uint8_t*) EEPROM_SILENT); MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); //1 diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index d61f7586b..36fcad573 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -36,8 +36,6 @@ void lcd_adjust_z(); void lcd_pick_babystep(); void lcd_alright(); void show_preheat_nozzle_warning(); -void EEPROM_save_B(int pos, int* value); -void EEPROM_read_B(int pos, int* value); void lcd_wait_interact(); void lcd_loading_filament(); void lcd_change_success();