Multi board compatibility work

platformio.ini

@@ -15,12 +15,14 @@ framework=arduino
 build_unflags = -Os
 build_flags = -O3 -ffast-math
 lib_deps = EEPROM
+src_filter = +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<src/FlashStorage/>
 
 [env:teensy35]
 platform=teensy
 board=teensy35
 framework=arduino
 lib_deps = EEPROM, FlexCAN
+src_filter = +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<src/FlashStorage/>
 
 ;Not currently working
 ;[env:LaunchPad_tm4c1294ncpdt]
@@ -36,6 +38,7 @@ framework = arduino
 board = genericSTM32F103RB
 lib_deps = EEPROM
 build_flags = -fpermissive -std=gnu++11
+src_filter = +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<src/FlashStorage/>
 
 [env:bluepill_f103c8]
 platform = ststm32
@@ -45,13 +48,14 @@ board = bluepill_f103c8
 lib_deps = EEPROM
 ;build_flags = -fpermissive -std=gnu++11 -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,-Map,output.map
 build_flags = -fpermissive -std=gnu++11 -Os 
+src_filter = +<*> -<.git/> -<svn/> -<example/> -<examples/> -<test/> -<tests/> -<src/FlashStorage/>
 
 ;SAMD21
 [env:samd21]
 platform = atmelsam
 framework = arduino
 board = zeroUSB
-lib_deps = EEPROM
+;lib_deps = EEPROM
 build_flags = -fpermissive -std=gnu++11
 upload_protocol = sam-ba
 

speeduino/idle.ino

@@ -490,7 +490,7 @@ static inline void enableIdle()
 
 #if defined(CORE_AVR) //AVR chips use the ISR for this
 ISR(TIMER4_COMPC_vect)
-#elif defined (CORE_TEENSY) || defined (CORE_STM32)
+#else
 static inline void idleInterrupt() //Most ARM chips can simply call a function
 #endif
 {

speeduino/src/FlashStorage/FlashAsEEPROM.cpp

@@ -18,7 +18,6 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#if defined(CORE_SAMD21)
 #include "FlashAsEEPROM.h"
 
 FlashStorage(eeprom_storage, EEPROM_EMULATION);
@@ -71,5 +70,4 @@ void EEPROMClass::commit()
   }
 }
 
-EEPROMClass EEPROM;
-#endif
+EEPROMClass EEPROM;

speeduino/src/FlashStorage/FlashStorage.cpp

@@ -16,7 +16,6 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#if defined(CORE_SAMD21)
 #include "FlashStorage.h"
 
 static const uint32_t pageSizes[] = { 8, 16, 32, 64, 128, 256, 512, 1024 };
@@ -98,5 +97,3 @@ void FlashClass::read(const volatile void *flash_ptr, void *data, uint32_t size)
 {
   memcpy(data, (const void *)flash_ptr, size);
 }
-
-#endif