Whitespace

mthorley · mthorley · commit 369ce0987985 · 2021-03-01T13:37:24.000+11:00
diff --git a/include/FanControl.h b/include/FanControl.h
@@ -21,8 +21,8 @@
     var, 1, fans, "Fanid out of range")
 
 /**
- * Abstract base class for all Fan Control. 
- * Sub types include Arduino and MAX31790 classes. 
+ * Abstract base class for all Fan Control.
+ * Sub types include Arduino and MAX31790 classes.
  */
 class FanControl
 {
diff --git a/include/MAX31790FanControl.h b/include/MAX31790FanControl.h
@@ -14,7 +14,7 @@
 #define PWMOUT_TARGET_DUTY_CYCLE(ch) (0x40+(ch-1)*2)
 #define TACH_TARGET(ch)		         (0x50+(ch-1)*2)
 
-#define MAX_DUTY_CYCLE_SCALE 511    // range is 0-511 
+#define MAX_DUTY_CYCLE_SCALE 511    // range is 0-511
 
 /**
  * Global Configuration
@@ -91,7 +91,7 @@ class MAX31790 : public FanControl
 
 private:
     RESULT readByte(const uint8_t address, uint8_t& result);
-    RESULT readBytes(const uint8_t address, const uint8_t n, uint8_t* result);    
+    RESULT readBytes(const uint8_t address, const uint8_t n, uint8_t* result);
     RESULT writeByte(const uint8_t address, const uint8_t byte);
     RESULT writeBytes(const uint8_t address, const uint8_t* bytes, const uint8_t nBytes);
     
diff --git a/include/MqttManager.h b/include/MqttManager.h
@@ -34,7 +34,7 @@ class MqttManager : public Print {
     const String   _clientID;   // client identifier
     const String   _serverIP;   // mqtt server IP endpoint
     const uint16_t _port;       // mqtt server port
-    String         _buf;        // log buffer    
+    String         _buf;        // log buffer
 
     const String topicTempRackTop  = "device/temp/rack/top";
     const String topicTempRackBase = "device/temp/rack/base";
diff --git a/include/OLEDDisplay.h b/include/OLEDDisplay.h
@@ -42,12 +42,12 @@ class OLEDDisplay {
     void setOrientation(OLED_Orientation orient);   // rotate
 
 protected:
-    void internalRender(RackState_t&rs, const NetworkState_t& ns);        
+    void internalRender(RackState_t&rs, const NetworkState_t& ns);
     void drawFloat2_1DP(int x, int y, float f);
     void drawPercentage(int x, int y, uint8_t pc);
-    void drawTempErrStates(const Thermos_t& thermos, int x, int y);        
+    void drawTempErrStates(const Thermos_t& thermos, int x, int y);
     void drawFanErrStates(const Fans_t& fans, int x, int y);
-    void drawNetworkState(const NetworkState_t& ns, int x, int y);        
+    void drawNetworkState(const NetworkState_t& ns, int x, int y);
     uint8_t getPercentageRPM(const FanState_t& fan) const;
 
 private:
diff --git a/src/ArduinoFanControl.cpp b/src/ArduinoFanControl.cpp
@@ -111,7 +111,7 @@ RESULT ArduinoFanControl::setPWMForAll(const uint16_t dutyCycle)
     
     RESULT res = RES_OK;
     for(int i=1; i<=getFanCount(); i++) {
-        res = res & setPWM(i, dutyCycle);        
+        res = res & setPWM(i, dutyCycle);
     }
     return res;
 }
diff --git a/src/OLEDDisplay.cpp b/src/OLEDDisplay.cpp
@@ -7,7 +7,7 @@ void OLEDDisplay::initialise() {
     setOrientation(OLED_Orientation::ROTATE_90);    // when mounted in 2U rack - see rackmount-pi-arduino
 
     if (_usingIRSensor)
-        pinMode(_IRPin, INPUT);    
+        pinMode(_IRPin, INPUT);
 }
 
 void OLEDDisplay::setOrientation(OLED_Orientation orient) {
@@ -23,7 +23,7 @@ void OLEDDisplay::setOrientation(OLED_Orientation orient) {
 
         default:
             _rotation = SevenSegmentRender::Rotation_t::ROT_0;
-            Log.error(F("Orientation not supported"));            
+            Log.error(F("Orientation not supported"));
             break;
     }
 }
@@ -48,12 +48,12 @@ void OLEDDisplay::render(RackState_t&rs, const NetworkState_t& ns) {
 
     if (!_usingIRSensor) {
         // just render if no IR sensor is configured
-        internalRender(rs, ns);        
+        internalRender(rs, ns);
         return;
     }
 
     // if IR sensor triggered ...
-    byte state = digitalRead(_IRPin);    
+    byte state = digitalRead(_IRPin);
     if (state == 1 || _firstDisplay) {
         internalRender(rs, ns);
     }
@@ -64,7 +64,7 @@ void OLEDDisplay::render(RackState_t&rs, const NetworkState_t& ns) {
         }
         else {
             displayOff();
-            _l = 0;            
+            _l = 0;
         }
     }
 }
@@ -178,7 +178,7 @@ void OLEDDisplay::drawTempErrStates(const Thermos_t& thermos, int x, int y) {
         }
         else {
             // clear
-            _oled.drawFilledBox(x, y, x+w, y+10, BLACK);            
+            _oled.drawFilledBox(x, y, x+w, y+10, BLACK);
         }
         x += w + 3;
     }
@@ -195,7 +195,7 @@ void OLEDDisplay::drawFanErrStates(const Fans_t& fans, int x, int y) {
         }
         else {
             // clear
-            _oled.drawFilledBox(x, y, x+w, y+10, BLACK);            
+            _oled.drawFilledBox(x, y, x+w, y+10, BLACK);
         }
         x += w + 3;
     }
diff --git a/src/RackTempController.cpp b/src/RackTempController.cpp
@@ -161,11 +161,11 @@ void RackTempController::readTempStates(Thermos_t& thermos) {
     //  searchAndPrintAddresses();
     
     // Iterate through all devices ensuring they are still connected
-    for (auto it = thermos.begin(); it != thermos.end(); it++) {        
+    for (auto it = thermos.begin(); it != thermos.end(); it++) {
         Temperature_t& thermo = it->second;
         if (!_tempSensors.isConnected(thermo.addr)) {
             Log.warning(F("Unable to find thermometer %s"), it->first.c_str());
-            thermo.result = ERR_FAILED_TO_FIND_DEVICE;            
+            thermo.result = ERR_FAILED_TO_FIND_DEVICE;
         }
     }
     
@@ -174,7 +174,7 @@ void RackTempController::readTempStates(Thermos_t& thermos) {
     _tempSensors.requestTemperatures();
 
     // Get temperature for each thermometer
-    for (auto it = thermos.begin(); it != thermos.end(); it++) {        
+    for (auto it = thermos.begin(); it != thermos.end(); it++) {
         Temperature_t& thermo = it->second;
         // if device found, then read temp
         if (thermo.result != ERR_FAILED_TO_FIND_DEVICE) {
@@ -183,7 +183,7 @@ void RackTempController::readTempStates(Thermos_t& thermos) {
                 Log.warning(F("Failed to read %s temperature"), it->first.c_str());
             }
             else {
-                Log.notice(F("%s.tempCelsuis - %F"), it->first.c_str(), thermo.tempCelsuis);         
+                Log.notice(F("%s.tempCelsuis - %F"), it->first.c_str(), thermo.tempCelsuis);
             }
         }
     }
@@ -296,7 +296,7 @@ RackState_t RackTempController::build_debug() const {
     
     rs.thermos.insert({ 
         "topRack", {
-            { 0x28, 0xFF, 0xBF, 0xDC, 0x51, 0x17, 0x04, 0x48 }, //keyes 
+            { 0x28, 0xFF, 0xBF, 0xDC, 0x51, 0x17, 0x04, 0x48 }, //keyes
             0.0,
             RES_OK
         }
diff --git a/src/SevenSegmentRender.cpp b/src/SevenSegmentRender.cpp
@@ -149,7 +149,7 @@ void SevenSegmentRender::drawLargeNumeric(const int x, const int y, const uint8_
             _oled.displayBMP(oled7seg_9_24bit_38x50, x, y);
             break;
         case BLANK:
-            // display background '8' image        
+            // display background '8' image
             _oled.displayBMP(oled7seg_base_24bit_38x50, x, y);
             break;
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -108,16 +108,16 @@ void setup(void)
         
         if (mqttManager.initialise()==0) {
             oled.render("Mqtt initialised");
-            Log.notice(F("Mqtt initialised"));    
+            Log.notice(F("Mqtt initialised"));
         }
         else {
             oled.render("Mqtt failed initialise");
-            Log.notice(F("Mqtt failed to initialise"));             
+            Log.notice(F("Mqtt failed to initialise"));
         } 
     }
     else {
         oled.render("Ethernet failed to initialised");
-        Log.error(F("Ethernet failed to initalise %d"), res);        
+        Log.error(F("Ethernet failed to initalise %d"), res);
     }
 }
   

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ RESULT ArduinoFanControl::setPWMForAll(const uint16_t dutyCycle)`
`111`	`111`
`112`	`112`	`RESULT res = RES_OK;`
`113`	`113`	`for(int i=1; i<=getFanCount(); i++) {`
`114`		`- res = res & setPWM(i, dutyCycle);`
	`114`	`+ res = res & setPWM(i, dutyCycle);`
`115`	`115`	`}`
`116`	`116`	`return res;`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ void OLEDDisplay::initialise() {`
`7`	`7`	`setOrientation(OLED_Orientation::ROTATE_90); // when mounted in 2U rack - see rackmount-pi-arduino`
`8`	`8`
`9`	`9`	`if (_usingIRSensor)`
`10`		`- pinMode(_IRPin, INPUT);`
	`10`	`+ pinMode(_IRPin, INPUT);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`void OLEDDisplay::setOrientation(OLED_Orientation orient) {`
`@@ -23,7 +23,7 @@ void OLEDDisplay::setOrientation(OLED_Orientation orient) {`
`23`	`23`
`24`	`24`	`default:`
`25`	`25`	`_rotation = SevenSegmentRender::Rotation_t::ROT_0;`
`26`		`- Log.error(F("Orientation not supported"));`
	`26`	`+ Log.error(F("Orientation not supported"));`
`27`	`27`	`break;`
`28`	`28`	`}`
`29`	`29`	`}`
`@@ -48,12 +48,12 @@ void OLEDDisplay::render(RackState_t&rs, const NetworkState_t& ns) {`
`48`	`48`
`49`	`49`	`if (!_usingIRSensor) {`
`50`	`50`	`// just render if no IR sensor is configured`
`51`		`- internalRender(rs, ns);`
	`51`	`+ internalRender(rs, ns);`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// if IR sensor triggered ...`
`56`		`- byte state = digitalRead(_IRPin);`
	`56`	`+ byte state = digitalRead(_IRPin);`
`57`	`57`	`if (state == 1 \|\| _firstDisplay) {`
`58`	`58`	`internalRender(rs, ns);`
`59`	`59`	`}`
`@@ -64,7 +64,7 @@ void OLEDDisplay::render(RackState_t&rs, const NetworkState_t& ns) {`
`64`	`64`	`}`
`65`	`65`	`else {`
`66`	`66`	`displayOff();`
`67`		`- _l = 0;`
	`67`	`+ _l = 0;`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -178,7 +178,7 @@ void OLEDDisplay::drawTempErrStates(const Thermos_t& thermos, int x, int y) {`
`178`	`178`	`}`
`179`	`179`	`else {`
`180`	`180`	`// clear`
`181`		`- _oled.drawFilledBox(x, y, x+w, y+10, BLACK);`
	`181`	`+ _oled.drawFilledBox(x, y, x+w, y+10, BLACK);`
`182`	`182`	`}`
`183`	`183`	`x += w + 3;`
`184`	`184`	`}`
`@@ -195,7 +195,7 @@ void OLEDDisplay::drawFanErrStates(const Fans_t& fans, int x, int y) {`
`195`	`195`	`}`
`196`	`196`	`else {`
`197`	`197`	`// clear`
`198`		`- _oled.drawFilledBox(x, y, x+w, y+10, BLACK);`
	`198`	`+ _oled.drawFilledBox(x, y, x+w, y+10, BLACK);`
`199`	`199`	`}`
`200`	`200`	`x += w + 3;`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,11 +161,11 @@ void RackTempController::readTempStates(Thermos_t& thermos) {`
`161`	`161`	`// searchAndPrintAddresses();`
`162`	`162`
`163`	`163`	`// Iterate through all devices ensuring they are still connected`
`164`		`- for (auto it = thermos.begin(); it != thermos.end(); it++) {`
	`164`	`+ for (auto it = thermos.begin(); it != thermos.end(); it++) {`
`165`	`165`	`Temperature_t& thermo = it->second;`
`166`	`166`	`if (!_tempSensors.isConnected(thermo.addr)) {`
`167`	`167`	`Log.warning(F("Unable to find thermometer %s"), it->first.c_str());`
`168`		`- thermo.result = ERR_FAILED_TO_FIND_DEVICE;`
	`168`	`+ thermo.result = ERR_FAILED_TO_FIND_DEVICE;`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`@@ -174,7 +174,7 @@ void RackTempController::readTempStates(Thermos_t& thermos) {`
`174`	`174`	`_tempSensors.requestTemperatures();`
`175`	`175`
`176`	`176`	`// Get temperature for each thermometer`
`177`		`- for (auto it = thermos.begin(); it != thermos.end(); it++) {`
	`177`	`+ for (auto it = thermos.begin(); it != thermos.end(); it++) {`
`178`	`178`	`Temperature_t& thermo = it->second;`
`179`	`179`	`// if device found, then read temp`
`180`	`180`	`if (thermo.result != ERR_FAILED_TO_FIND_DEVICE) {`
`@@ -183,7 +183,7 @@ void RackTempController::readTempStates(Thermos_t& thermos) {`
`183`	`183`	`Log.warning(F("Failed to read %s temperature"), it->first.c_str());`
`184`	`184`	`}`
`185`	`185`	`else {`
`186`		`- Log.notice(F("%s.tempCelsuis - %F"), it->first.c_str(), thermo.tempCelsuis);`
	`186`	`+ Log.notice(F("%s.tempCelsuis - %F"), it->first.c_str(), thermo.tempCelsuis);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -296,7 +296,7 @@ RackState_t RackTempController::build_debug() const {`
`296`	`296`
`297`	`297`	`rs.thermos.insert({`
`298`	`298`	`"topRack", {`
`299`		`- { 0x28, 0xFF, 0xBF, 0xDC, 0x51, 0x17, 0x04, 0x48 }, //keyes`
	`299`	`+ { 0x28, 0xFF, 0xBF, 0xDC, 0x51, 0x17, 0x04, 0x48 }, //keyes`
`300`	`300`	`0.0,`
`301`	`301`	`RES_OK`
`302`	`302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,16 +108,16 @@ void setup(void)`
`108`	`108`
`109`	`109`	`if (mqttManager.initialise()==0) {`
`110`	`110`	`oled.render("Mqtt initialised");`
`111`		`- Log.notice(F("Mqtt initialised"));`
	`111`	`+ Log.notice(F("Mqtt initialised"));`
`112`	`112`	`}`
`113`	`113`	`else {`
`114`	`114`	`oled.render("Mqtt failed initialise");`
`115`		`- Log.notice(F("Mqtt failed to initialise"));`
	`115`	`+ Log.notice(F("Mqtt failed to initialise"));`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`else {`
`119`	`119`	`oled.render("Ethernet failed to initialised");`
`120`		`- Log.error(F("Ethernet failed to initalise %d"), res);`
	`120`	`+ Log.error(F("Ethernet failed to initalise %d"), res);`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`