Automatic code formatting

Also fix small typo in SerialLCD::createChar()

Author: thomasjfox

Arduino_Pedelec_Controller/Arduino_Pedelec_Controller.ino

@@ -263,7 +263,7 @@ void setup()
     digitalWrite(switch_disp_2, HIGH);    // turn on pullup resistors on display-switch 2
 #endif
 #ifdef SUPPORT_SWITCH_ON_POTI_PIN
-  digitalWrite(poti_in, HIGH);
+    digitalWrite(poti_in, HIGH);
 #endif
 
 #ifdef SUPPORT_LIGHTS_SWITCH
@@ -317,7 +317,7 @@ void setup()
     hrmi_open();
 #endif
 #ifdef SUPPORT_RTC
-  Wire.begin();
+    Wire.begin();
 #endif
 #ifndef SUPPORT_PAS
     pedaling=true;
@@ -433,7 +433,8 @@ void loop()
             wh=variable.wh;
             km=variable.kilometers;
             mah=variable.mah;
-        } else
+        }
+        else
             display_show_important_info(FROM_FLASH(msg_battery_charged), 5);
 #endif
         if (voltage<6.0)                                   //do not write new data to eeprom when on USB Power
@@ -668,13 +669,13 @@ void loop()
 #endif
 
 #ifdef SUPPORT_RTC
-    now=rtc.get_time(); //read current time
-    //Serial.print(now.hh, DEC);
-    //Serial.print(':');
-    //Serial.print(now.mm, DEC);
-    //Serial.print(':');
-    //Serial.print(now.ss, DEC);
-    //Serial.println();
+        now=rtc.get_time(); //read current time
+        //Serial.print(now.hh, DEC);
+        //Serial.print(':');
+        //Serial.print(now.mm, DEC);
+        //Serial.print(':');
+        //Serial.print(now.ss, DEC);
+        //Serial.println();
 #endif
 
         last_writetime=millis();

Arduino_Pedelec_Controller/ds1307.cpp

@@ -25,15 +25,16 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #define DS1307_ADDRESS 0x68
 
 #if (ARDUINO >= 100)
- #include <Arduino.h> // capital A so it is error prone on case-sensitive filesystems
+#include <Arduino.h> // capital A so it is error prone on case-sensitive filesystems
 #else
- #include <WProgram.h>
+#include <WProgram.h>
 #endif
 
 static uint8_t bcd2bin (uint8_t val) { return val - 6 * (val >> 4); }
 static uint8_t bin2bcd (uint8_t val) { return val + 6 * (val / 10); }
 
-void RTC_DS1307::adjust_time(uint8_t hh, uint8_t mm, uint8_t ss) {
+void RTC_DS1307::adjust_time(uint8_t hh, uint8_t mm, uint8_t ss)
+{
     WIRE.beginTransmission(DS1307_ADDRESS);
     WIRE.write(0);
     WIRE.write(bin2bcd(ss));
@@ -42,14 +43,15 @@ void RTC_DS1307::adjust_time(uint8_t hh, uint8_t mm, uint8_t ss) {
     WIRE.endTransmission();
 }
 
-Time RTC_DS1307::get_time() {
-  WIRE.beginTransmission(DS1307_ADDRESS);
-  WIRE.write(0);	
-  WIRE.endTransmission();
-  WIRE.requestFrom(DS1307_ADDRESS, 7);
-  uint8_t ss = bcd2bin(WIRE.read() & 0x7F);
-  uint8_t mm = bcd2bin(WIRE.read());
-  uint8_t hh = bcd2bin(WIRE.read());
-  return (Time){hh,mm,ss};
+Time RTC_DS1307::get_time()
+{
+    WIRE.beginTransmission(DS1307_ADDRESS);
+    WIRE.write(0);
+    WIRE.endTransmission();
+    WIRE.requestFrom(DS1307_ADDRESS, 7);
+    uint8_t ss = bcd2bin(WIRE.read() & 0x7F);
+    uint8_t mm = bcd2bin(WIRE.read());
+    uint8_t hh = bcd2bin(WIRE.read());
+    return (Time) {hh,mm,ss};
 }
 

Arduino_Pedelec_Controller/ds1307.h

@@ -21,14 +21,15 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #ifndef _ds1307_H_
 #define _ds1307_H_
 
-struct Time   
+struct Time
 {
-    uint8_t hh; //hours  
+    uint8_t hh; //hours
     uint8_t mm; //minutes
     uint8_t ss; //seconds
 };
 
-class RTC_DS1307 {
+class RTC_DS1307
+{
 public:
     static void adjust_time(uint8_t hh, uint8_t mm, uint8_t ss);
     Time get_time(void);

Arduino_Pedelec_Controller/serial_command.cpp

@@ -36,7 +36,7 @@ serial_command serial_commands[] =
     {{"hh"}},     //4: set/get hours
     {{"mm"}},     //5: set/get minutes
     {{"ss"}},     //6: set/get seconds
-    
+
 };
 const byte n_commands = sizeof(serial_commands)/sizeof(serial_command); //number of commands that we have
 
@@ -97,19 +97,19 @@ static void handle_command()
                 Serial.println(odo/1000.0*wheel_circumference,0);
                 break;
             case 4:              //hours read
-                #ifdef SUPPORT_RTC
+#ifdef SUPPORT_RTC
                 Serial.println(now.hh);
-                #endif
-            break;
+#endif
+                break;
             case 5:              //minutes read
-                #ifdef SUPPORT_RTC
+#ifdef SUPPORT_RTC
                 Serial.println(now.mm);
-                #endif
+#endif
                 break;
             case 6:              //seconds read
-                #ifdef SUPPORT_RTC
+#ifdef SUPPORT_RTC
                 Serial.println(now.ss);
-                #endif
+#endif
                 break;
         }
 
@@ -134,19 +134,19 @@ static void handle_command()
             handle_switch(static_cast<switch_name>(atoi(numberstring)), 0, PRESSED_LONG);
             break;
         case 4:              //hours write
-            #ifdef SUPPORT_RTC
+#ifdef SUPPORT_RTC
             rtc.adjust_time(atoi(numberstring),now.mm,now.ss);
-            #endif
+#endif
             break;
         case 5:              //minutes write
-            #ifdef SUPPORT_RTC
+#ifdef SUPPORT_RTC
             rtc.adjust_time(now.hh,atoi(numberstring),now.ss);
-            #endif
+#endif
             break;
         case 6:              //seconds write
-            #ifdef SUPPORT_RTC
+#ifdef SUPPORT_RTC
             rtc.adjust_time(now.hh,now.mm,atoi(numberstring));
-            #endif
+#endif
             break;
     }
     Serial.println(MY_F("OK"));
@@ -179,7 +179,8 @@ void parse_serial(const char &read_c)
             {
                 // store first character
                 cmdbuf[0] = read_c;
-            } else
+            }
+            else
             {
                 cmdbuf[1] = read_c;
 
@@ -197,7 +198,8 @@ void parse_serial(const char &read_c)
                 // User input is done
                 handle_command();
                 parse_state = Reset;
-            } else
+            }
+            else
             {
                 // Store character
                 if (number_pos < sizeof(numberstring)-1)        // reserve one byte for the terminating zero (atoi())

Arduino_Pedelec_Controller/serial_lcd.cpp

@@ -86,7 +86,7 @@ void SerialLCD::home()
 
 /**
  * @brief Set display contrast
- * 
+ *
  * @param contrast Value between 1 and 50
  */
 void SerialLCD::setContrast(const byte &contrast)
@@ -98,7 +98,7 @@ void SerialLCD::setContrast(const byte &contrast)
 
 /**
  * @brief Set backlight brightness
- * 
+ *
  * @param brightness Backlight brightness. Value between 1 and 8. '1' is off.
  */
 void SerialLCD::setBacklight(const byte& brightness)
@@ -110,7 +110,7 @@ void SerialLCD::setBacklight(const byte& brightness)
 
 /**
  * @brief Set cursor x/y position. Use an out-of-screen position to hide the cursor
- * 
+ *
  * @param x Horizontal position, starting at 0
  * @param y Line, starting at 0
  */
@@ -151,7 +151,7 @@ void SerialLCD::createChar(byte address, const byte data[])
     address = address & 0x7;
 
     write(0xFE);
-    write(0x54),
+    write(0x54);
     write(address);
 
     for (byte i = 0; i < 8; ++i)