Skip to content

Commit

Permalink
Merge branch 'eeprom' of https://github.com/XPila/Prusa-Firmware-Buddy
Browse files Browse the repository at this point in the history
…into A3IDES-678_Separate_INI_file_handler
  • Loading branch information
michalrudolf committed Mar 9, 2020
2 parents c61c184 + 75494a7 commit 637c31d
Show file tree
Hide file tree
Showing 34 changed files with 1,813 additions and 797 deletions.
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ target_sources(
$<$<BOOL:${FILAMENT_SENSOR}>:src/common/thread_measurement.c>
src/common/diag.c
src/common/eeprom.c
src/common/eeprom_loadsave.c
src/common/marlin_vars.c
src/common/marlin_host.c
src/common/sim_bed.c
Expand All @@ -408,7 +409,7 @@ target_sources(
src/common/hwio_a3ides_2209_02.c
src/common/putslave.c
src/common/safe_state.c
src/common/variant8.c
src/common/variant8.cpp
src/common/dbg.c
src/common/dump.c
src/common/marlin_client.c
Expand All @@ -431,12 +432,13 @@ target_sources(
src/common/gcode_file.cpp
src/common/gcode_thumb_decoder.cpp
src/common/print_utils.cpp
src/common/Marlin_eeprom.cpp
src/common/base64_stream_decoder.cpp
src/common/support_utils.cpp
src/common/errors.c
src/common/lang.c
src/common/minda_broken_cable_detection.c
src/common/crc32.c
$<$<STREQUAL:${PRINTER},MINI>:src/common/minda_broken_cable_detection.c>
$<$<STREQUAL:${PRINTER},MINI>:src/common/MindaRedscreen.c>
src/marlin_stubs/G28.cpp
src/marlin_stubs/M876.cpp
src/marlin_stubs/pause/G27.cpp
Expand Down
5 changes: 4 additions & 1 deletion doc/dump.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ offset size content
0x00020000 0x00010000 CCRAM (0x10000000..0x1000ffff)
0x00030000 0x00008000 System + OTP (0x1fff0000..0x1fff8000)
0x00038000 0x00100000 Flash (0x08000000..0x080fffff)

planned, not implemented
0x00138000 0x00000800 EEPROM0 (0x0000..0x0800) saved eeprom
0x00138800 0x00000800 EEPROM1 (0x0000..0x0800) current eeprom
0x00139000

##registers - CCRAM (0x1000ff00-0x1000ffff)
offset size content
Expand Down
8 changes: 8 additions & 0 deletions doc/eeprom.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@ i2c nfc eeprom st25dv64k
User space: 0x0000..0x0800
Marlin: 0x0064..0x02ce
Prusa: 0x0400..?

FW version EE version Marlin EE
4.0.0-final+1965 2 V1
4.0.1-final+1974 2 V1
4.0.2-final+1977 2 V1
4.0.3-RC1+246 2 V2 - removed FS

4.0.4- 3 N/A
70 changes: 70 additions & 0 deletions doc/marlin_eeprom_4_0_2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
Marlin eeprom for FW versions 4.0.0-4.0.2

WRITE ver 0x0064 0x04
SKIP working_crc 0x0068 0x02
WRITE esteppers 0x006a 0x01
WRITE planner.settings 0x006b 0x48
WRITE planner_max_jerk 0x00b3 0x10
WRITE planner.junction_deviation_mm 0x00c3 0x04
WRITE home_offset 0x00c7 0x0c
WRITE runout_sensor_enabled 0x00d3 0x01
WRITE runout_distance_mm 0x00d4 0x04
WRITE zfh 0x00d8 0x04
WRITE dummy 0x00dc 0x04
WRITE mesh_num_x 0x00e0 0x01
WRITE mesh_num_y 0x00e1 0x01
WRITE dummy 0x00e2 0x04
WRITE dummy 0x00e6 0x04
WRITE dummy 0x00ea 0x04
WRITE dummy 0x00ee 0x04
WRITE dummy 0x00f2 0x04
WRITE dummy 0x00f6 0x04
WRITE dummy 0x00fa 0x04
WRITE dummy 0x00fe 0x04
WRITE dummy 0x0102 0x04
WRITE probe_offset 0x0106 0x0c
WRITE dummy 0x0112 0x04
WRITE dummy 0x0116 0x04
WRITE dummy 0x011a 0x04
WRITE dummy 0x011e 0x04
WRITE dummy 0x0122 0x04
WRITE dummy 0x0126 0x04
WRITE dummy 0x012a 0x04
WRITE dummy 0x012e 0x04
WRITE dummy 0x0132 0x04
WRITE grid_max_x 0x0136 0x01
WRITE grid_max_y 0x0137 0x01
WRITE bilinear_grid_spacing 0x0138 0x04
WRITE bilinear_start 0x013c 0x04
WRITE z_values 0x0140 0x40
WRITE ubl_active 0x0180 0x01
WRITE storage_slot 0x0181 0x01
WRITE servo_angles 0x0182 0x10
WRITE bltouch_last_written_mode 0x0192 0x01
WRITE ui_preheat_hotend_temp 0x0193 0x04
WRITE ui_preheat_bed_temp 0x0197 0x04
WRITE ui_preheat_fan_speed 0x019b 0x02
WRITE pidc 0x019d 0x10
WRITE lpq_len 0x01ad 0x02
WRITE thermalManager.temp_bed.pid 0x01af 0x0c
WRITE lcd_contrast 0x01bb 0x02
WRITE recovery_enabled 0x01bd 0x01
WRITE autoretract_defaults 0x01be 0x20
WRITE autoretract_enabled 0x01de 0x01
WRITE parser.volumetric_enabled 0x01df 0x01
WRITE planner.filament_size 0x01e0 0x04
WRITE tmc_stepper_current 0x01e4 0x1a
WRITE tmc_hybrid_threshold 0x01fe 0x34
WRITE tmc_sgt 0x0232 0x08
WRITE tmc_stealth_enabled 0x023a 0x0d
WRITE planner.extruder_advance_K 0x0247 0x04
WRITE no_current 0x024b 0x0c
WRITE coordinate_system 0x0257 0x6c
WRITE planner.skew_factor 0x02c3 0x0c
WRITE fc_settings 0x02cf 0x08
WRITE backlash_distance_mm 0x02d7 0x0c
WRITE backlash_correction 0x02e3 0x01
WRITE backlash_smoothing_mm 0x02e4 0x04
WRITE extui_data 0x02e8 0x30
WRITE version 0x0064 0x04
WRITE final_crc 0x0068 0x02
70 changes: 70 additions & 0 deletions doc/marlin_eeprom_4_0_3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
Marlin eeprom for FW version 4.0.3

WRITE ver 0x0064 0x04
SKIP working_crc 0x0068 0x02
WRITE esteppers 0x006a 0x01
WRITE planner.settings 0x006b 0x48
WRITE planner.max_jerk 0x00b3 0x10
WRITE dummy 0x00c3 0x04
WRITE home_offset 0x00c7 0x0c
WRITE runout_sensor_enabled 0x00d3 0x01
WRITE runout_distance_mm 0x00d4 0x04
WRITE zfh 0x00d8 0x04
WRITE dummy 0x00dc 0x04
WRITE mesh_num_x 0x00e0 0x01
WRITE mesh_num_y 0x00e1 0x01
WRITE dummy 0x00e2 0x04
WRITE dummy 0x00e6 0x04
WRITE dummy 0x00ea 0x04
WRITE dummy 0x00ee 0x04
WRITE dummy 0x00f2 0x04
WRITE dummy 0x00f6 0x04
WRITE dummy 0x00fa 0x04
WRITE dummy 0x00fe 0x04
WRITE dummy 0x0102 0x04
WRITE probe_offset 0x0106 0x0c
WRITE dummy 0x0112 0x04
WRITE dummy 0x0116 0x04
WRITE dummy 0x011a 0x04
WRITE dummy 0x011e 0x04
WRITE dummy 0x0122 0x04
WRITE dummy 0x0126 0x04
WRITE dummy 0x012a 0x04
WRITE dummy 0x012e 0x04
WRITE dummy 0x0132 0x04
WRITE grid_max_x 0x0136 0x01
WRITE grid_max_y 0x0137 0x01
WRITE bilinear_grid_spacing 0x0138 0x04
WRITE bilinear_start 0x013c 0x04
WRITE z_values 0x0140 0x40
WRITE ubl_active 0x0180 0x01
WRITE storage_slot 0x0181 0x01
WRITE servo_angles 0x0182 0x10
WRITE bltouch_last_written_mode 0x0192 0x01
WRITE ui_preheat_hotend_temp 0x0193 0x04
WRITE ui_preheat_bed_temp 0x0197 0x04
WRITE ui_preheat_fan_speed 0x019b 0x02
WRITE pidc 0x019d 0x10
WRITE lpq_len 0x01ad 0x02
WRITE thermalManager.temp_bed.pid 0x01af 0x0c
WRITE lcd_contrast 0x01bb 0x02
WRITE recovery_enabled 0x01bd 0x01
WRITE autoretract_defaults 0x01be 0x20
WRITE autoretract_enabled 0x01de 0x01
WRITE parser.volumetric_enabled 0x01df 0x01
WRITE planner.filament_size 0x01e0 0x04
WRITE tmc_stepper_current 0x01e4 0x1a
WRITE tmc_hybrid_threshold 0x01fe 0x34
WRITE tmc_sgt 0x0232 0x08
WRITE tmc_stealth_enabled 0x023a 0x0d
WRITE planner.extruder_advance_K 0x0247 0x04
WRITE no_current 0x024b 0x0c
WRITE coordinate_system 0x0257 0x6c
WRITE planner.skew_factor 0x02c3 0x0c
WRITE fc_settings 0x02cf 0x08
WRITE backlash_distance_mm 0x02d7 0x0c
WRITE backlash_correction 0x02e3 0x01
WRITE backlash_smoothing_mm 0x02e4 0x04
WRITE extui_data 0x02e8 0x30
WRITE version 0x0064 0x04
WRITE final_crc 0x0068 0x02
2 changes: 1 addition & 1 deletion include/marlin/Configuration_A3ides_2209_MINI.h
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@
// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//
#define EEPROM_SETTINGS // Enable for M500 and M501 commands
//#define EEPROM_SETTINGS // Enable for M500 and M501 commands
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
//#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.

Expand Down
Loading

0 comments on commit 637c31d

Please sign in to comment.