Merge pull request #9161 from tcm0116/2.0.x-eeprom

[2.0.x] Fix EEPROM SettingsData for 32-bit architectures
2.0.x
Scott Lahteine 7 years ago committed by GitHub
commit 5578dccaa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -71,6 +71,8 @@
#include "../feature/fwretract.h"
#endif
#pragma pack(push, 1) // No padding between variables
typedef struct PID { float Kp, Ki, Kd; } PID;
typedef struct PIDC { float Kp, Ki, Kd, Kc; } PIDC;
@ -170,7 +172,7 @@ typedef struct SettingsDataStruct {
//
// 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_fan_speed[2]; // M145 S0 F
@ -247,6 +249,8 @@ typedef struct SettingsDataStruct {
} SettingsData;
#pragma pack(pop)
MarlinSettings settings;
uint16_t MarlinSettings::datasize() { return sizeof(SettingsData); }

Loading…
Cancel
Save