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,6 +17,10 @@ const char *SettingsLongNames[] = {
" Temperature when in boost mode" };
uint8_t StatusFlags = 0;
uint32_t temporaryTempStorage = 0;
operatingModeEnum operatingMode;
settingsPageEnum settingsPage;
//This does the required processing and state changes
void ProcessUI() {
uint8_t Buttons = getButtons(); //read the buttons status

View File

@@ -7,6 +7,9 @@
#include "PID.h"
#define MAXPIDOUTPUT 50000
pidSettingsType pidSettings;
//This function computes the new value for the ON time of the system
//This is the return value from this function
int32_t computePID(uint16_t setpoint) {

View File

@@ -10,6 +10,9 @@
#include "Settings.h"
#define FLASH_ADDR (0x8000000|0xBC00)/*Flash start OR'ed with the maximum amount of flash - 1024 bytes*/
#define FLASH_LOGOADDR (0x8000000|0xB800) /*second last page of flash set aside for logo image*/
systemSettingsType systemSettings;
void saveSettings() {
//First we erase the flash
FLASH_Unlock(); //unlock flash writing