Merge pull request #18 from TheZeroBeast/Patch-5.0.3

Patch 5.0.3
TheZeroBeast · Nov 21, 2018 · a0eab56 · a0eab56
2 parents f1b32ea + 11f1a44
commit a0eab56
Show file tree

Hide file tree

Showing 92 changed files with 27,814 additions and 41,953 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Firmware/BlinkM.cpp b/Firmware/BlinkM.cpp
@@ -6,23 +6,23 @@
 #ifdef BLINKM
 
 #if (ARDUINO >= 100)
-  # include "Arduino.h"
+# include "Arduino.h"
 #else
-  # include "WProgram.h"
+# include "WProgram.h"
 #endif
 
 #include "BlinkM.h"
 
 void SendColors(byte red, byte grn, byte blu)
 {
-  Wire.begin(); 
-  Wire.beginTransmission(0x09);
-  Wire.write('o');                    //to disable ongoing script, only needs to be used once
-  Wire.write('n');
-  Wire.write(red);
-  Wire.write(grn);
-  Wire.write(blu);
-  Wire.endTransmission();
+    Wire.begin();
+    Wire.beginTransmission(0x09);
+    Wire.write('o');                    //to disable ongoing script, only needs to be used once
+    Wire.write('n');
+    Wire.write(red);
+    Wire.write(grn);
+    Wire.write(blu);
+    Wire.endTransmission();
 }
 
 #endif //BLINKM

diff --git a/Firmware/BlinkM.h b/Firmware/BlinkM.h
@@ -3,9 +3,9 @@
   Library header file for BlinkM library
  */
 #if (ARDUINO >= 100)
-  # include "Arduino.h"
+# include "Arduino.h"
 #else
-  # include "WProgram.h"
+# include "WProgram.h"
 #endif
 
 #include "Wire.h"

diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp
diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h
@@ -54,11 +54,20 @@ void Config_StoreSettings();
 bool Config_RetrieveSettings();
 #else
 FORCE_INLINE void Config_StoreSettings() {}
-FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
+FORCE_INLINE void Config_RetrieveSettings() {
+    Config_ResetDefault();
+    Config_PrintSettings();
+}
 #endif
 
-inline uint8_t calibration_status() { return eeprom_read_byte((uint8_t*)EEPROM_CALIBRATION_STATUS); }
-inline void calibration_status_store(uint8_t status) { eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS, status); }
-inline bool calibration_status_pinda() { return eeprom_read_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA); }
+inline uint8_t calibration_status() {
+    return eeprom_read_byte((uint8_t*)EEPROM_CALIBRATION_STATUS);
+}
+inline void calibration_status_store(uint8_t status) {
+    eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS, status);
+}
+inline bool calibration_status_pinda() {
+    return eeprom_read_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA);
+}
 
 #endif//CONFIG_STORE_H