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();