Diff: main.cpp

Revision:

6:ec491c9aae8f

Parent:

4:0b54e0395ac1

Child:

7:c5ebecef1a84

--- a/main.cpp	Wed Mar 27 17:04:04 2019 +0000
+++ b/main.cpp	Wed Mar 27 17:50:52 2019 +0000
@@ -3,7 +3,6 @@
 #include "BlockDevice.h"
 #include "LittleFileSystem.h"
 #include "NetworkInterface.h"
-#include "mbed_trace.h"
 #include "Nanostack.h"
 #include "ns_file_system.h"
 
@@ -16,16 +15,25 @@
 // Currently, this split is at 256/768 for FS/upgrade.
 BlockDevice* bd = BlockDevice::get_default_instance();
 SlicingBlockDevice sd(bd, 0, MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS);
-LittleFileSystem fs("fs", &sd);
 
-// An event queue is a very useful structure to debounce information between contexts (e.g. ISR and normal threads)
-// This is great because things such as network operations are illegal in ISR, so updating a resource in a button's fall() function is not allowed.
-EventQueue eventQueue;
+#if COMPONENT_SD || COMPONENT_NUSD
+// Use FATFileSystem for SD card type blockdevices
+FATFileSystem fs("fs");
+#else
+// Use LittleFileSystem for non-SD block devices to enable wear leveling and other functions
+LittleFileSystem fs("fs");
+#endif
 
+// Default User button for GET example and for resetting the storage
 InterruptIn button(BTN0);
 
-//------------------------------------------------------------------------------
-// Includes and declarations for our sensor array
+// How often to fetch sensor data (in seconds)
+#define SENSORS_POLL_INTERVAL 3.0
+
+// Send all sensor data or just limited (useful for when running out of memory)
+#define SEND_ALL_SENSORS
+
+// Sensors related includes and initialization
 #include "BMP280.h"
 #include "Si1133.h"
 #include "SI7021.h"
@@ -33,10 +41,6 @@
 #include "AMS_CCS811.h"
 #include "ICM20648.h"
 
-// Define measurement intervals in seconds
-#define SENSORS_POLL_INTERVAL 3.0
-#define SEND_ALL_SENSORS
-
 /* Turn on power supply to ENV sensor suite */
 DigitalOut env_en(PF9, 1);
 /* Turn on power to CCS811 sensor */
@@ -61,6 +65,7 @@
 MbedCloudClientResource *res_button;
 MbedCloudClientResource *res_led;
 
+// Additional resources for sensor readings
 #ifdef SEND_ALL_SENSORS
 MbedCloudClientResource *res_light;
 MbedCloudClientResource *res_pressure;
@@ -80,10 +85,20 @@
 MbedCloudClientResource *res_temperature4;
 #endif /* SEND_ALL_SENSORS */
 
+// An event queue is a very useful structure to debounce information between contexts (e.g. ISR and normal threads)
+// This is great because things such as network operations are illegal in ISR, so updating a resource in a button's fall() function is not allowed.
+EventQueue eventQueue;
+
 // When the device is registered, this variable will be used to access various useful information, like device ID etc.
 static const ConnectorClientEndpointInfo* endpointInfo;
 
-
+/**
+ * POST handler - prints the content of the payload
+ * @param resource The resource that triggered the callback
+ * @param buffer If a body was passed to the POST function, this contains the data.
+ *               Note that the buffer is deallocated after leaving this function, so copy it if you need it longer.
+ * @param size Size of the body
+ */
 void blink_callback(MbedCloudClientResource *resource, const uint8_t *buffer, uint16_t size) {
     static int num_count = 0;
     static int event = 0;
@@ -335,7 +350,6 @@
     if (storage_status != 0) {
         printf("Storage mounting failed.\n");
     }
-
 #if USE_BUTTON == 1
     // If the User button is pressed ons start, then format storage.
     bool btn_pressed = (button.read() == MBED_CONF_APP_BUTTON_PRESSED_STATE);
@@ -356,6 +370,8 @@
         printf("You can hold the user button during boot to format the storage and change the device identity.\n");
     }
 
+    sensors_init();
+
     Nanostack::get_instance(); // ensure Nanostack is initialised
     ns_file_system_set_root_path("/fs/");
 
@@ -490,8 +506,6 @@
     res_temperature4->methods(M2MMethod::GET);
 #endif /* SEND_ALL_SENSORS */
 
-    sensors_init();
-
     // Callback that fires when registering is complete
     client.on_registered(&registered);