Further C compliance work

This commit is contained in:
Josh Stewart 2017-01-19 11:31:05 +11:00
parent 2ee0a91c0b
commit ff87a17ce0
6 changed files with 6 additions and 10 deletions

View File

View File

@ -1,4 +1,4 @@
#include "maths.h"
//Replace the standard arduino map() function to use the div function instead //Replace the standard arduino map() function to use the div function instead
int fastMap(unsigned long x, int in_min, int in_max, int out_min, int out_max) int fastMap(unsigned long x, int in_min, int in_max, int out_min, int out_max)

View File

@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "math.h" #include "math.h"
#include "corrections.h" #include "corrections.h"
#include "timers.h" #include "timers.h"
#include "display.h" //#include "display.h"
#include "decoders.h" #include "decoders.h"
#include "idle.h" #include "idle.h"
#include "auxiliaries.h" #include "auxiliaries.h"
@ -39,13 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "src/PID_v1/PID_v1.h" #include "src/PID_v1/PID_v1.h"
//#include "src/DigitalWriteFast/digitalWriteFast.h" //#include "src/DigitalWriteFast/digitalWriteFast.h"
#include "errors.h" #include "errors.h"
#include "storage.h"
#ifdef __SAM3X8E__ #include <EEPROM.h>
//Do stuff for ARM based CPUs
#else
#include "storage.h"
#endif
struct config1 configPage1; struct config1 configPage1;
struct config2 configPage2; struct config2 configPage2;

View File

@ -1,6 +1,5 @@
#ifndef STORAGE_H #ifndef STORAGE_H
#define STORAGE_H #define STORAGE_H
#include <EEPROM.h>
void writeConfig(); void writeConfig();
void loadConfig(); void loadConfig();

View File

@ -7,6 +7,7 @@ A full copy of the license may be found in the projects root directory
#include "storage.h" #include "storage.h"
#include "globals.h" #include "globals.h"
#include "table.h" #include "table.h"
#include <EEPROM.h>
/* /*
Takes the current configuration (config pages and maps) Takes the current configuration (config pages and maps)

View File

@ -26,6 +26,7 @@ volatile unsigned int dwellLimit_uS;
#if defined (CORE_TEENSY) #if defined (CORE_TEENSY)
IntervalTimer lowResTimer; IntervalTimer lowResTimer;
void oneMSInterval();
#endif #endif
void initialiseTimers(); void initialiseTimers();