Diff: SolarNanoGrid.h

Revision:

22:93fde34d9a94

Parent:

16:919e37e5a895

Child:

26:10e8b9908631

--- a/SolarNanoGrid.h	Tue Jun 14 22:40:56 2016 +0000
+++ b/SolarNanoGrid.h	Wed Jun 15 00:20:18 2016 +0000
@@ -76,16 +76,7 @@
     // Main loop function:
     virtual void loop(void) = 0;
 
-    // spi pin assignments:
-    /**
-     * Turns SPI on for SD card
-     */
-    void spiSD(void);
-
-    /**
-     * Turns SPI on for nrf
-     */
-    void spiNRF(void);
+    
 
 protected:
     // *********************
@@ -128,10 +119,17 @@
 
 // Other functions:
 
+// spi pin assignments:
 /**
- * Loads the settings from the sd card into memory.
+ * Turns SPI on for SD card
  */
-//bool LoadSongSettings(char * role, int * sdVersion, unsigned int * communityID, unsigned int * id, int * chan);
+void spiSD(void);
+
+/**
+ * Turns SPI on for nrf
+ */
+void spiNRF(void);
+
 
 /**
  * Class to hold of the Song Settings
@@ -148,7 +146,7 @@
         unsigned int communityID;
         unsigned int id;
         int chan;
-        char * LogDir;
+        char LogDir[128];
         bool LoadSongSettings(void);
         
 };