1
0
forked from me/IronOS

Quick fix for multiple definition of structs (#33)

This commit is contained in:
mkninc
2017-07-26 01:18:41 +02:00
committed by Ben V. Brown
parent 56f31b02aa
commit 2e823b6594
6 changed files with 20 additions and 8 deletions

View File

@@ -17,7 +17,7 @@
#include "Settings.h"
#include "Analog.h"
#include <string.h>
enum {
typedef enum {
STARTUP, //we are sitting on the prompt to push a button
SOLDERING, //Normal operating mode
TEMP_ADJ, //Adjust the set temperature
@@ -29,10 +29,10 @@ enum {
DCINDISP, //Disp the input voltage && Cal the DCin voltage divider
TEMPCAL, //Cal tip temp offset
} operatingMode;
} operatingModeEnum;
#define SETTINGSOPTIONSCOUNT 10 /*Number of settings in the settings menu*/
enum {
typedef enum {
UVCO = 0,
SLEEP_TEMP,
SLEEP_TIME,
@@ -44,7 +44,7 @@ enum {
LEFTY,
BOOSTMODE,
BOOSTTEMP,
} settingsPage;
} settingsPageEnum;
void ProcessUI();
void DrawUI();

View File

@@ -12,9 +12,9 @@
#include "Analog.h"
#include "Interrupt.h"
struct {
typedef struct {
uint32_t kp, ki, kd; //PID values
} pidSettings;
} pidSettingsType;
int32_t computePID(uint16_t setpoint);
void setupPID(void);

View File

@@ -25,7 +25,7 @@
/*
* This struct must be a multiple of 2 bytes as it is saved / restored from flash in uint16_t chunks
*/
struct {
typedef struct {
uint16_t SolderingTemp; //current set point for the iron
uint32_t SleepTemp; //temp to drop to in sleep
uint8_t version; //Used to track if a reset is needed on firmware upgrade
@@ -42,7 +42,9 @@ struct {
uint16_t tempCalibration; //Temperature calibration value
uint16_t voltageDiv; //Voltage divisor factor
uint16_t BoostTemp; //Boost mode set point for the iron
} systemSettings;
} systemSettingsType;
extern systemSettingsType systemSettings;
void saveSettings();
void restoreSettings();