CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EEPROM SettingsData for 32-bit architectures

Browse Source
This commit is contained in:
Thomas Moore 2018-01-12 19:38:23 -06:00
parent da600e5fbe
commit cfd989d7c5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/module/configuration_store.cpp
View File

@ -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); }