Merge remote-tracking branch 'upstream/master'

2015-07-30 22:36:12 +02:00
parent 668a5f649b 3fed88a327
commit 21cf253c99
112 changed files with 12848 additions and 2878 deletions
@@ -10,7 +10,7 @@
 #include <Wire.h>
 #include <SI7021.h>
 #include <SPI.h>
-#include <SPIFlash.h>
+#include "utility/SPIFlash.h"
 #include <EEPROM.h>  
 #include <sha204_lib_return_codes.h>
 #include <sha204_library.h>