Merge pull request #9161 from tcm0116/2.0.x-eeprom
[2.0.x] Fix EEPROM SettingsData for 32-bit architectures
This commit is contained in:
commit
5578dccaa0
@ -71,6 +71,8 @@
|
|||||||
#include "../feature/fwretract.h"
|
#include "../feature/fwretract.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#pragma pack(push, 1) // No padding between variables
|
||||||
|
|
||||||
typedef struct PID { float Kp, Ki, Kd; } PID;
|
typedef struct PID { float Kp, Ki, Kd; } PID;
|
||||||
typedef struct PIDC { float Kp, Ki, Kd, Kc; } PIDC;
|
typedef struct PIDC { float Kp, Ki, Kd, Kc; } PIDC;
|
||||||
|
|
||||||
@ -170,9 +172,9 @@ typedef struct SettingsDataStruct {
|
|||||||
//
|
//
|
||||||
// ULTIPANEL
|
// ULTIPANEL
|
||||||
//
|
//
|
||||||
int lcd_preheat_hotend_temp[2], // M145 S0 H
|
int16_t lcd_preheat_hotend_temp[2], // M145 S0 H
|
||||||
lcd_preheat_bed_temp[2], // M145 S0 B
|
lcd_preheat_bed_temp[2], // M145 S0 B
|
||||||
lcd_preheat_fan_speed[2]; // M145 S0 F
|
lcd_preheat_fan_speed[2]; // M145 S0 F
|
||||||
|
|
||||||
//
|
//
|
||||||
// PIDTEMP
|
// PIDTEMP
|
||||||
@ -247,6 +249,8 @@ typedef struct SettingsDataStruct {
|
|||||||
|
|
||||||
} SettingsData;
|
} SettingsData;
|
||||||
|
|
||||||
|
#pragma pack(pop)
|
||||||
|
|
||||||
MarlinSettings settings;
|
MarlinSettings settings;
|
||||||
|
|
||||||
uint16_t MarlinSettings::datasize() { return sizeof(SettingsData); }
|
uint16_t MarlinSettings::datasize() { return sizeof(SettingsData); }
|
||||||
|
Loading…
Reference in New Issue
Block a user