Scott Lahteine 6 лет назад
Родитель
Сommit
e7c6abd767
1 измененных файлов: 63 добавлений и 63 удалений
  1. 63
    63
      Marlin/configuration_store.cpp

+ 63
- 63
Marlin/configuration_store.cpp Просмотреть файл

@@ -42,15 +42,15 @@
42 42
 #define EEPROM_OFFSET 100
43 43
 
44 44
 /**
45
- * V44 EEPROM Layout:
45
+ * V45 EEPROM Layout:
46 46
  *
47 47
  *  100  Version                                    (char x4)
48 48
  *  104  EEPROM CRC16                               (uint16_t)
49 49
  *
50 50
  *  106            E_STEPPERS                       (uint8_t)
51
- *  107  M92 XYZE  planner.axis_steps_per_mm        (float x4 ... x8)
52
- *  123  M203 XYZE planner.max_feedrate_mm_s        (float x4 ... x8)
53
- *  139  M201 XYZE planner.max_acceleration_mm_per_s2 (uint32_t x4 ... x8)
51
+ *  107  M92 XYZE  planner.axis_steps_per_mm        (float x4 ... x8) + 64
52
+ *  123  M203 XYZE planner.max_feedrate_mm_s        (float x4 ... x8) + 64
53
+ *  139  M201 XYZE planner.max_acceleration_mm_per_s2 (uint32_t x4 ... x8) + 64
54 54
  *  155  M204 P    planner.acceleration             (float)
55 55
  *  159  M204 R    planner.retract_acceleration     (float)
56 56
  *  163  M204 T    planner.travel_acceleration      (float)
@@ -62,7 +62,7 @@
62 62
  *  187  M205 Z    planner.max_jerk[Z_AXIS]         (float)
63 63
  *  191  M205 E    planner.max_jerk[E_AXIS]         (float)
64 64
  *  195  M206 XYZ  home_offset                      (float x3)
65
- *  207  M218 XYZ  hotend_offset                    (float x3 per additional hotend)
65
+ *  207  M218 XYZ  hotend_offset                    (float x3 per additional hotend) +16
66 66
  *
67 67
  * Global Leveling:                                 4 bytes
68 68
  *  219            z_fade_height                    (float)
@@ -88,86 +88,86 @@
88 88
  *  316            z_values[][]                     (float x9, up to float x256) +988
89 89
  *
90 90
  * AUTO_BED_LEVELING_UBL:                           2 bytes
91
- *  324  G29 A     planner.leveling_active          (bool)
92
- *  325  G29 S     ubl.storage_slot                 (int8_t)
91
+ *  352  G29 A     planner.leveling_active          (bool)
92
+ *  353  G29 S     ubl.storage_slot                 (int8_t)
93 93
  *
94 94
  * DELTA:                                           44 bytes
95
- *  352  M666 H    delta_height                     (float)
96
- *  364  M666 XYZ  delta_endstop_adj                (float x3)
97
- *  368  M665 R    delta_radius                     (float)
98
- *  372  M665 L    delta_diagonal_rod               (float)
99
- *  376  M665 S    delta_segments_per_second        (float)
100
- *  380  M665 B    delta_calibration_radius         (float)
101
- *  384  M665 X    delta_tower_angle_trim[A]        (float)
102
- *  388  M665 Y    delta_tower_angle_trim[B]        (float)
103
- *  392  M665 Z    delta_tower_angle_trim[C]        (float)
95
+ *  354  M666 H    delta_height                     (float)
96
+ *  358  M666 XYZ  delta_endstop_adj                (float x3)
97
+ *  370  M665 R    delta_radius                     (float)
98
+ *  374  M665 L    delta_diagonal_rod               (float)
99
+ *  378  M665 S    delta_segments_per_second        (float)
100
+ *  382  M665 B    delta_calibration_radius         (float)
101
+ *  386  M665 X    delta_tower_angle_trim[A]        (float)
102
+ *  390  M665 Y    delta_tower_angle_trim[B]        (float)
103
+ *  394  M665 Z    delta_tower_angle_trim[C]        (float)
104 104
  *
105 105
  * [XYZ]_DUAL_ENDSTOPS:                             12 bytes
106
- *  352  M666 X    x_endstop_adj                    (float)
107
- *  356  M666 Y    y_endstop_adj                    (float)
108
- *  360  M666 Z    z_endstop_adj                    (float)
106
+ *  354  M666 X    x_endstop_adj                    (float)
107
+ *  358  M666 Y    y_endstop_adj                    (float)
108
+ *  362  M666 Z    z_endstop_adj                    (float)
109 109
  *
110 110
  * ULTIPANEL:                                       6 bytes
111
- *  396  M145 S0 H lcd_preheat_hotend_temp          (int x2)
112
- *  400  M145 S0 B lcd_preheat_bed_temp             (int x2)
113
- *  404  M145 S0 F lcd_preheat_fan_speed            (int x2)
111
+ *  398  M145 S0 H lcd_preheat_hotend_temp          (int x2)
112
+ *  402  M145 S0 B lcd_preheat_bed_temp             (int x2)
113
+ *  406  M145 S0 F lcd_preheat_fan_speed            (int x2)
114 114
  *
115 115
  * PIDTEMP:                                         82 bytes
116
- *  408  M301 E0 PIDC  Kp[0], Ki[0], Kd[0], Kc[0]   (float x4)
117
- *  428  M301 E1 PIDC  Kp[1], Ki[1], Kd[1], Kc[1]   (float x4)
118
- *  440  M301 E2 PIDC  Kp[2], Ki[2], Kd[2], Kc[2]   (float x4)
119
- *  456  M301 E3 PIDC  Kp[3], Ki[3], Kd[3], Kc[3]   (float x4)
120
- *  472  M301 E4 PIDC  Kp[3], Ki[3], Kd[3], Kc[3]   (float x4)
121
- *  488  M301 L        lpq_len                      (int)
116
+ *  410  M301 E0 PIDC  Kp[0], Ki[0], Kd[0], Kc[0]   (float x4)
117
+ *  426  M301 E1 PIDC  Kp[1], Ki[1], Kd[1], Kc[1]   (float x4)
118
+ *  442  M301 E2 PIDC  Kp[2], Ki[2], Kd[2], Kc[2]   (float x4)
119
+ *  458  M301 E3 PIDC  Kp[3], Ki[3], Kd[3], Kc[3]   (float x4)
120
+ *  474  M301 E4 PIDC  Kp[3], Ki[3], Kd[3], Kc[3]   (float x4)
121
+ *  490  M301 L        lpq_len                      (int)
122 122
  *
123 123
  * PIDTEMPBED:                                      12 bytes
124
- *  490  M304 PID  thermalManager.bedKp, .bedKi, .bedKd (float x3)
124
+ *  492  M304 PID  bedKp, .bedKi, .bedKd            (float x3)
125 125
  *
126 126
  * DOGLCD:                                          2 bytes
127
- *  502  M250 C    lcd_contrast                     (uint16_t)
127
+ *  504  M250 C    lcd_contrast                     (uint16_t)
128 128
  *
129 129
  * FWRETRACT:                                       33 bytes
130
- *  504  M209 S    autoretract_enabled              (bool)
131
- *  505  M207 S    retract_length                   (float)
132
- *  509  M207 F    retract_feedrate_mm_s            (float)
133
- *  513  M207 Z    retract_zlift                    (float)
134
- *  517  M208 S    retract_recover_length           (float)
135
- *  521  M208 F    retract_recover_feedrate_mm_s    (float)
136
- *  525  M207 W    swap_retract_length              (float)
137
- *  529  M208 W    swap_retract_recover_length      (float)
138
- *  533  M208 R    swap_retract_recover_feedrate_mm_s (float)
130
+ *  506  M209 S    autoretract_enabled              (bool)
131
+ *  507  M207 S    retract_length                   (float)
132
+ *  511  M207 F    retract_feedrate_mm_s            (float)
133
+ *  515  M207 Z    retract_zlift                    (float)
134
+ *  519  M208 S    retract_recover_length           (float)
135
+ *  523  M208 F    retract_recover_feedrate_mm_s    (float)
136
+ *  527  M207 W    swap_retract_length              (float)
137
+ *  531  M208 W    swap_retract_recover_length      (float)
138
+ *  535  M208 R    swap_retract_recover_feedrate_mm_s (float)
139 139
  *
140 140
  * Volumetric Extrusion:                            21 bytes
141
- *  537  M200 D    parser.volumetric_enabled        (bool)
142
- *  538  M200 T D  planner.filament_size            (float x5) (T0..3)
141
+ *  539  M200 D    parser.volumetric_enabled        (bool)
142
+ *  540  M200 T D  planner.filament_size            (float x5) (T0..3)
143 143
  *
144 144
  * HAVE_TMC2130:                                    22 bytes
145
- *  558  M906 X    Stepper X current                (uint16_t)
146
- *  560  M906 Y    Stepper Y current                (uint16_t)
147
- *  562  M906 Z    Stepper Z current                (uint16_t)
148
- *  564  M906 X2   Stepper X2 current               (uint16_t)
149
- *  566  M906 Y2   Stepper Y2 current               (uint16_t)
150
- *  568  M906 Z2   Stepper Z2 current               (uint16_t)
151
- *  570  M906 E0   Stepper E0 current               (uint16_t)
152
- *  572  M906 E1   Stepper E1 current               (uint16_t)
153
- *  574  M906 E2   Stepper E2 current               (uint16_t)
154
- *  576  M906 E3   Stepper E3 current               (uint16_t)
155
- *  578  M906 E4   Stepper E4 current               (uint16_t)
145
+ *  560  M906 X    Stepper X current                (uint16_t)
146
+ *  562  M906 Y    Stepper Y current                (uint16_t)
147
+ *  564  M906 Z    Stepper Z current                (uint16_t)
148
+ *  566  M906 X2   Stepper X2 current               (uint16_t)
149
+ *  568  M906 Y2   Stepper Y2 current               (uint16_t)
150
+ *  570  M906 Z2   Stepper Z2 current               (uint16_t)
151
+ *  572  M906 E0   Stepper E0 current               (uint16_t)
152
+ *  574  M906 E1   Stepper E1 current               (uint16_t)
153
+ *  576  M906 E2   Stepper E2 current               (uint16_t)
154
+ *  578  M906 E3   Stepper E3 current               (uint16_t)
155
+ *  580  M906 E4   Stepper E4 current               (uint16_t)
156 156
  *
157 157
  * LIN_ADVANCE:                                     8 bytes
158
- *  580  M900 K    extruder_advance_k               (float)
159
- *  584  M900 WHD  advance_ed_ratio                 (float)
158
+ *  582  M900 K    extruder_advance_k               (float)
159
+ *  586  M900 WHD  advance_ed_ratio                 (float)
160 160
  *
161 161
  * HAS_MOTOR_CURRENT_PWM:
162
- *  588  M907 X    Stepper XY current               (uint32_t)
163
- *  592  M907 Z    Stepper Z current                (uint32_t)
164
- *  596  M907 E    Stepper E current                (uint32_t)
162
+ *  590  M907 X    Stepper XY current               (uint32_t)
163
+ *  594  M907 Z    Stepper Z current                (uint32_t)
164
+ *  598  M907 E    Stepper E current                (uint32_t)
165 165
  *
166 166
  * CNC_COORDINATE_SYSTEMS                           108 bytes
167
- *  600  G54-G59.3 coordinate_system                (float x 27)
167
+ *  602  G54-G59.3 coordinate_system                (float x 27)
168 168
  *
169
- *  708                                Minimum end-point
170
- * 2025 (704 + 36 + 9 + 288 + 988)     Maximum end-point
169
+ *  710                                   Minimum end-point
170
+ * 2239 (710 + 208 + 36 + 9 + 288 + 988)  Maximum end-point
171 171
  *
172 172
  * ========================================================================
173 173
  * meshes_begin (between max and min end-point, directly above)
@@ -449,7 +449,7 @@ void MarlinSettings::postprocess() {
449 449
       EEPROM_WRITE(storage_slot);
450 450
     #endif // AUTO_BED_LEVELING_UBL
451 451
 
452
-    // 10 floats for DELTA / [XYZ]_DUAL_ENDSTOPS
452
+    // 11 floats for DELTA / [XYZ]_DUAL_ENDSTOPS
453 453
     #if ENABLED(DELTA)
454 454
       EEPROM_WRITE(delta_height);              // 1 float
455 455
       EEPROM_WRITE(delta_endstop_adj);         // 3 floats
@@ -480,11 +480,11 @@ void MarlinSettings::postprocess() {
480 480
         EEPROM_WRITE(dummy);
481 481
       #endif
482 482
 
483
-      for (uint8_t q = 7; q--;) EEPROM_WRITE(dummy);
483
+      for (uint8_t q = 8; q--;) EEPROM_WRITE(dummy);
484 484
 
485 485
     #else
486 486
       dummy = 0.0f;
487
-      for (uint8_t q = 10; q--;) EEPROM_WRITE(dummy);
487
+      for (uint8_t q = 11; q--;) EEPROM_WRITE(dummy);
488 488
     #endif
489 489
 
490 490
     #if DISABLED(ULTIPANEL)

Загрузка…
Отмена
Сохранить