Diff: Battery/Battery.h

Revision:

8:0acda4f2e0a8

Parent:

5:57b06b4b47c6

Child:

10:30c9e8df0032

--- a/Battery/Battery.h	Fri Jun 03 11:26:10 2016 +0000
+++ b/Battery/Battery.h	Fri Jun 03 13:24:20 2016 +0000
@@ -44,8 +44,8 @@
     // *********************
     // * Public variables: *
     // *********************
-    char* logDir=NULL;
-    float maxChargeRate=0.0; // Charge rate in amps
+    char* logDir;
+    float maxChargeRate; // Charge rate in amps
 
     // *********************
     // * Public functions: *
@@ -71,48 +71,48 @@
      * Name of log directory, include last /
      */
 
-    char count=0;
-    char* txFileName=NULL;
+    char count;
+    char* txFileName;
 
-    char* fullTxFilePath=NULL;
+    char* fullTxFilePath;
 
-    int sizeRead=0;
-    unsigned int fileLength=0;
-    unsigned int filePointer=0;
-    unsigned int fileLeft=0;
-    char *sdBuffer=NULL;
-    unsigned int sdBuffPnt=0;
+    int sizeRead;
+    unsigned int fileLength;
+    unsigned int filePointer;
+    unsigned int fileLeft;
+    char *sdBuffer;
+    unsigned int sdBuffPnt;
     /**
      * Open channel address of the locker
      */
-    long long openAddr=0;
+    long long openAddr;
 
     /**
      * Private channel address of the locker
      */
-    long long privateAddr=0;
+    long long privateAddr;
 
-    unsigned int countSD=0;
+    unsigned int countSD;
 
     // **********************
     // * Protected flags: *
     // **********************
-    volatile char * flag=NULL;
-    volatile char checkedIn=0;
-    volatile char flagGetTime=0;
-    volatile char flagNextFile=0;
-    volatile char flagSendFileName=0;
-    volatile char flagSendFileSize=0;
-    volatile char flagSendFile=0;
-    volatile char flagSendFileDone=0;
+    volatile char * flag;
+    volatile char checkedIn;
+    volatile char flagGetTime;
+    volatile char flagNextFile;
+    volatile char flagSendFileName;
+    volatile char flagSendFileSize;
+    volatile char flagSendFile;
+    volatile char flagSendFileDone;
 
 
     // **********************
     // * Protected interrupts: *
     // **********************
-    InterruptIn* button=NULL;
-    Ticker* txWatch=NULL;
-    Timeout* delay=NULL;
+    InterruptIn* button;
+    Ticker* txWatch;
+    Timeout* delay;
 
     // **********************
     // * Protected functions: *
@@ -169,7 +169,7 @@
     // * Private variables: *
     // **********************
 
-    volatile bool maxRT=false;
+    volatile bool maxRT;
 
 };
 #endif