Diff: main.cpp

Revision:

3:6647d74cf212

Parent:

2:8d3f3f35f089

Child:

4:0b54e0395ac1

--- a/main.cpp	Tue Mar 26 00:14:14 2019 +0000
+++ b/main.cpp	Tue Mar 26 10:29:33 2019 +0000
@@ -34,7 +34,7 @@
 #include "ICM20648.h"
 
 // Define measurement intervals in seconds
-#define SENSORS_POLL_INTERVAL 1.0
+#define SENSORS_POLL_INTERVAL 3.0
 #define SEND_ALL_SENSORS
 
 /* Turn on power supply to ENV sensor suite */
@@ -45,7 +45,7 @@
 DigitalOut hall_en(PB10, 1);
 /* Turn on power to IMU */
 DigitalOut imu_en(PF8, 1);
-
+ 
 I2C env_i2c(PC4, PC5);
 BMP280 sens_press_temp(env_i2c);
 Si1133 sens_light(PC4, PC5);
@@ -213,21 +213,22 @@
 void sensors_init() {
     sens_press_temp.initialize();
 
-    if (!sens_light.open()) {
-        printf("ERROR: Failed to initialize sensor Si1133\n");
-    }
-
     SI7021::SI7021_status_t result = sens_hum_temp.SI7021_SoftReset();
     if (result == SI7021::SI7021_SUCCESS) {
         wait_ms(15);
         SI7021::SI7021_vector_data_t result_data;
-        result = sens_hum_temp.SI7021_Conf(SI7021::SI7021_RESOLUTION_RH_11_TEMP_11, SI7021::SI7021_HTRE_DISABLED);
+        result = sens_hum_temp.SI7021_Conf(SI7021::SI7021_RESOLUTION_RH_11_TEMP_11,
+                                        SI7021::SI7021_HTRE_DISABLED);
         result = sens_hum_temp.SI7021_GetElectronicSerialNumber(&result_data);
         result = sens_hum_temp.SI7021_GetFirmwareRevision(&result_data);
         printf("Si7021 Electronic Serial Number: %16x %16x, firmware rev %02x\n",
-            result_data.ElectronicSerialNumber_MSB,
-            result_data.ElectronicSerialNumber_LSB,
-            result_data.FirmwareRevision);
+                result_data.ElectronicSerialNumber_MSB,
+                result_data.ElectronicSerialNumber_LSB,
+                result_data.FirmwareRevision);
+    }
+
+    if (!sens_light.open()) {
+        printf("ERROR: Failed to initialize sensor Si1133\n");
     }
 
     if (!sens_aqs.init()) {
@@ -238,7 +239,7 @@
         }
 //        sens_aqs.enable_interupt(true);
     }
-
+ 
     if (!sens_imu.open()) {
         printf("ERROR: Failed to initialize sensor ICM20648\n");
     }
@@ -249,15 +250,16 @@
  * This function is called periodically.
  */
 void sensors_update() {
-    SI7021::SI7021_status_t rht_reading, humidity_reading, temp2_reading;
+    SI7021::SI7021_status_t sens_hum_temp_reading, humidity_reading, temp2_reading;
     SI7021::SI7021_vector_data_t humidity_data, temp2_data;
 
-    // BMP280 pressure and temperature (2)
-    float pressure_value = sens_press_temp.getPressure(), temp1_value = sens_press_temp.getPressure();
+    // BMP280 pressure and temperature (1)
+    float pressure_value = sens_press_temp.getPressure();
+    float temp1_value = sens_press_temp.getTemperature();
 
-    // Si7021 humidity and temperature (1)
-    rht_reading = sens_hum_temp.SI7021_TriggerHumidity(SI7021::SI7021_NO_HOLD_MASTER_MODE);
-    if (rht_reading == SI7021::SI7021_SUCCESS) {
+    // Si7021 humidity and temperature (2)
+    sens_hum_temp_reading = sens_hum_temp.SI7021_TriggerHumidity(SI7021::SI7021_NO_HOLD_MASTER_MODE);
+    if (sens_hum_temp_reading == SI7021::SI7021_SUCCESS) {
         wait_ms(30);
         humidity_reading = sens_hum_temp.SI7021_ReadHumidity(&humidity_data);
         temp2_reading = sens_hum_temp.SI7021_ReadTemperatureFromRH(&temp2_data);
@@ -276,53 +278,52 @@
     // Si7210 field and temperature (3)
     sens_hall.measureOnce();
     float field_value = sens_hall.getFieldStrength() / 1000, temp3_value = sens_hall.getTemperature() / 1000;
-
+ 
+    // ICM20648 accelerometer and gyroscope
     float acc_x, acc_y, acc_z, gyr_x, gyr_y, gyr_z, temp4_value;
     sens_imu.get_accelerometer(&acc_x, &acc_y, &acc_z);
     sens_imu.get_gyroscope(&gyr_x, &gyr_y, &gyr_z);
     sens_imu.get_temperature(&temp4_value);
 
     printf("                                                                 \n");
-    printf("BMP280 temp:   %7.2f C,   pressure: %7.2f mbar       \n", temp1_value, pressure_value);
-    printf("Si7021 temp:   %7.2f C,   humidity: %7.2f %%         \n", temp2_data.Temperature, humidity_data.RelativeHumidity);
-    printf("Si7210 temp:   %7.2f C,   field: %7.2f mT            \n", temp3_value, field_value);
-    printf("Si1133 light:  %7.2f lux, UV level: %7.2f            \n", light_value, uv_index_value);
-    printf("CCS811 CO2:    %7d ppm, VoC:     %7d ppb         \n", co2_value, tvoc_value);
-    printf("ICM20648 acc:  %7.2f x, %7.2f y, %7.2f z [mg]           \n", acc_x, acc_y, acc_z);
-    printf("ICM20648 gyro: %7.2f x, %7.2f y, %7.2f z [mdps]         \n", gyr_x, gyr_y, gyr_z);
+    printf("BMP280 temp:   %7.2f C,   pressure: %7.2f [mbar]            \n", temp1_value, pressure_value);
+    printf("Si7021 temp:   %7.2f C,   humidity: %7.2f %%                \n", temp2_data.Temperature, humidity_data.RelativeHumidity);
+    printf("Si7210 temp:   %7.2f C,   field:    %7.2f [mT]              \n", temp3_value, field_value);
+    printf("Si1133 light:  %7.2f lux, UV level: %7.2f                   \n", light_value, uv_index_value);
+    printf("CCS811 CO2:    %7d ppm, VoC:      %7d ppb                   \n", co2_value, tvoc_value);
+    printf("ICM20648 acc:  %7.2f x, %6.2f y,   %7.2f z [mg]            \n", acc_x, acc_y, acc_z);
+    printf("ICM20648 gyro: %7.2f x, %6.2f y,   %7.2f z [mdps]          \n", gyr_x, gyr_y, gyr_z);
 
     printf("\r\033[8A");
 
     if (endpointInfo) {
 #ifdef SEND_ALL_SENSORS
-        res_pressure->set_value(pressure_value);
-        res_temperature1->set_value(temp1_value);
-
+        res_pressure->set_value((float)pressure_value);
+        res_temperature1->set_value((float)temp1_value);
+ 
         if (humidity_reading == SI7021::SI7021_SUCCESS) {
-            res_humidity->set_value(humidity_data.RelativeHumidity);
+            res_humidity->set_value((float)humidity_data.RelativeHumidity);
         }
         if (temp2_reading == SI7021::SI7021_SUCCESS) {
-            res_temperature2->set_value(temp2_data.Temperature);
+            res_temperature2->set_value((float)temp2_data.Temperature);
         }
 
-        res_field->set_value(field_value);
-        res_temperature3->set_value(temp3_value);
+        res_field->set_value((float)field_value);
+        res_temperature3->set_value((float)temp3_value);
 
         if (light_reading) {
-            res_light->set_value(light_value);
+            res_light->set_value((float)light_value);
         }
 
         res_co2->set_value(co2_value);
         res_tvoc->set_value(tvoc_value);
 
-        res_accelerometer_x->set_value(acc_x);
-        res_accelerometer_y->set_value(acc_y);
-        res_accelerometer_z->set_value(acc_z);
-        res_gyroscope_x->set_value(gyr_x);
-        res_gyroscope_y->set_value(gyr_y);
-        res_gyroscope_z->set_value(gyr_z);
-
-        res_temperature4->set_value(temp4_value);
+        res_accelerometer_x->set_value((float)acc_x);
+        res_accelerometer_y->set_value((float)acc_y);
+        res_accelerometer_z->set_value((float)acc_z);
+        res_gyroscope_x->set_value((float)gyr_x);
+        res_gyroscope_y->set_value((float)gyr_y);
+        res_gyroscope_z->set_value((float)gyr_z);
 #endif /* SEND_ALL_SENSORS */
     }
 }
@@ -389,57 +390,58 @@
     }
 
     /* Create resources */
-    res_led = client.create_resource("3201/0/5853", "LED blinking (R:G:B:count)");
+    res_led = client.create_resource("3201/0/5853", "LED blinking (R:G:B:cnt)");
     res_led->observable(false);
     res_led->set_value("0:0:0:0");
     res_led->attach_post_callback(blink_callback);
     res_led->methods(M2MMethod::POST);
 
-    res_button = client.create_resource("3200/0/5501", "Button Click Count");
+    res_button = client.create_resource("3200/0/5501", "button_count");
     res_button->set_value(0);
     res_button->methods(M2MMethod::GET);
     res_button->observable(true);
     res_button->attach_notification_callback(button_callback);
 
-#ifdef SEND_ALL_SENSORS
-    res_light = client.create_resource("3301/0/5853", "LightIntensity (LUX)");
-    res_light->set_value(0);
-    res_light->observable(true);
-    res_light->methods(M2MMethod::GET);
-
+#ifdef SEND_ALL_SENSORS 
     // Sensor BMP280
     res_pressure = client.create_resource("3323/0/5853", "Barometric pressure (hPa)");
     res_pressure->set_value(0);
     res_pressure->observable(true);
     res_pressure->methods(M2MMethod::GET);
-
+ 
     res_temperature1 = client.create_resource("3303/0/5853", "Temperature BMP280 (C)");
     res_temperature1->set_value(0);
     res_temperature1->observable(true);
     res_temperature1->methods(M2MMethod::GET);
-    res_temperature2->methods(M2MMethod::GET);
-
+ 
     // Sensor Si7021
     res_humidity = client.create_resource("3304/0/5853", "Humidity (%)");
     res_humidity->set_value(0);
     res_humidity->observable(true);
     res_humidity->methods(M2MMethod::GET);
-
+ 
     res_temperature2 = client.create_resource("3303/1/5853", "Temperature Si7021 (C)");
     res_temperature2->set_value(0);
     res_temperature2->observable(true);
-
-    // Sensor Si7210
-    res_field = client.create_resource("3304/0/5853", "Magnetic Field (mT)");
+    res_temperature2->methods(M2MMethod::GET);
+ 
+     // Sensor Si7210
+    res_field = client.create_resource("33257/0/5853", "Magnetic Field (mT)");
     res_field->set_value(0);
     res_field->observable(true);
     res_field->methods(M2MMethod::GET);
-
+ 
     res_temperature3 = client.create_resource("3303/2/5853", "Temperature Si7210 (C)");
     res_temperature3->set_value(0);
     res_temperature3->observable(true);
     res_temperature3->methods(M2MMethod::GET);
 
+    // Sensor Si1133
+    res_light = client.create_resource("3301/0/5853", "LightIntensity (LUX)");
+    res_light->set_value(0);
+    res_light->observable(true);
+    res_light->methods(M2MMethod::GET);
+
     // Sensor CCS811
     res_co2 = client.create_resource("33255/0/5853", "CO2 (ppm)");
     res_co2->set_value(0);
@@ -450,38 +452,38 @@
     res_tvoc->set_value(0);
     res_tvoc->observable(true);
     res_tvoc->methods(M2MMethod::GET);
-
+ 
     // Sensor ICM20648
     res_accelerometer_x = client.create_resource("3313/0/5702", "Accelerometer X");
     res_accelerometer_x->set_value(0);
     res_accelerometer_x->methods(M2MMethod::GET);
     res_accelerometer_x->observable(true);
-
+ 
     res_accelerometer_y = client.create_resource("3313/0/5703", "Accelerometer Y");
     res_accelerometer_y->set_value(0);
     res_accelerometer_y->methods(M2MMethod::GET);
     res_accelerometer_y->observable(true);
-
+ 
     res_accelerometer_z = client.create_resource("3313/0/5704", "Accelerometer Z");
     res_accelerometer_z->set_value(0);
     res_accelerometer_z->methods(M2MMethod::GET);
     res_accelerometer_z->observable(true);
-
+ 
     res_gyroscope_x = client.create_resource("3334/0/5702", "Gyroscope X");
     res_gyroscope_x->set_value(0);
     res_gyroscope_x->methods(M2MMethod::GET);
     res_gyroscope_x->observable(true);
-
+ 
     res_gyroscope_y = client.create_resource("3334/0/5703", "Gyroscope Y");
     res_gyroscope_y->set_value(0);
     res_gyroscope_y->methods(M2MMethod::GET);
     res_gyroscope_y->observable(true);
-
+ 
     res_gyroscope_z = client.create_resource("3334/0/5704", "Gyroscope Z");
     res_gyroscope_z->set_value(0);
     res_gyroscope_z->methods(M2MMethod::GET);
     res_gyroscope_z->observable(true);
-
+ 
     res_temperature4 = client.create_resource("3303/3/5853", "Temperature ICM20648 (C)");
     res_temperature4->set_value(0);
     res_temperature4->observable(true);