Revision 72:b500e1507b5f, committed 2016-08-11

Comitter:

stefanrousseau

Date:

Thu Aug 11 21:14:32 2016 +0000

Parent:

71:45a5e426df81

Child:

74:3e3ee15584e5

Commit message:

Add 4s startup delay and changed GPS_valid to number of satellites.

Changed in this revision

--- a/main.cpp	Thu Aug 11 17:04:09 2016 +0000
+++ b/main.cpp	Thu Aug 11 21:14:32 2016 +0000
@@ -58,7 +58,7 @@
     .Virtual_Sensor6    = "0",
     .Virtual_Sensor7    = "0",
     .Virtual_Sensor8    = "0",
-    .GPS_Valid          = "0",
+    .GPS_Satellites     = "0",
     .GPS_Latitude       = "0",
     .GPS_Longitude      = "0",
     .GPS_Altitude       = "0",
@@ -82,7 +82,7 @@
         }
         case TEMP_HUMIDITY_ACCELEROMETER_GPS:
         {
-            sprintf(modem_string, "GET %s%s?serial=%s&temp=%s&humidity=%s&accelX=%s&accelY=%s&accelZ=%s&gps_valid=%s&latitude=%s&longitude=%s&altitude=%s&speed=%s&course=%s %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, SENSOR_DATA.Temperature, SENSOR_DATA.Humidity, SENSOR_DATA.AccelX,SENSOR_DATA.AccelY,SENSOR_DATA.AccelZ,SENSOR_DATA.GPS_Valid,SENSOR_DATA.GPS_Latitude,SENSOR_DATA.GPS_Longitude,SENSOR_DATA.GPS_Altitude,SENSOR_DATA.GPS_Speed,SENSOR_DATA.GPS_Course, FLOW_URL_TYPE, MY_SERVER_URL);
+            sprintf(modem_string, "GET %s%s?serial=%s&temp=%s&humidity=%s&accelX=%s&accelY=%s&accelZ=%s&gps_satellites=%s&latitude=%s&longitude=%s&altitude=%s&speed=%s&course=%s %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, SENSOR_DATA.Temperature, SENSOR_DATA.Humidity, SENSOR_DATA.AccelX,SENSOR_DATA.AccelY,SENSOR_DATA.AccelZ,SENSOR_DATA.GPS_Satellites,SENSOR_DATA.GPS_Latitude,SENSOR_DATA.GPS_Longitude,SENSOR_DATA.GPS_Altitude,SENSOR_DATA.GPS_Speed,SENSOR_DATA.GPS_Course, FLOW_URL_TYPE, MY_SERVER_URL);
             break;
         }
         case TEMP_HUMIDITY_ACCELEROMETER_PMODSENSORS:
@@ -202,7 +202,8 @@
 
 int main() {
     static unsigned ledOnce = 0;
-
+    //delay so that the debug terminal can open after power-on reset:
+    wait (4.0);
     pc.baud(115200);
     PRINTF(GRN "Hello World from the Cellular IoT Kit!\r\n\r\n");
 

--- a/sensors.cpp	Thu Aug 11 17:04:09 2016 +0000
+++ b/sensors.cpp	Thu Aug 11 21:14:32 2016 +0000
@@ -475,14 +475,14 @@
 
 void Read_GPS()
 {
-    unsigned char gps_valid = 0; //default
+    unsigned char gps_satellites = 0; //default
     int lat_sign;
     int long_sign;
     if (bGPS_present)
     {
         if ((gps_get_status() == 'A') && (gps_get_mode2() != '1'))
         {
-            gps_valid = 1;
+            gps_satellites = gps_get_sate_in_veiw(); //show the number of satellites
         }
         if (gps_get_ns() == 'S')
         {
@@ -501,14 +501,14 @@
             long_sign = 1;
         }    
 #if (0)
-        PRINTF("gps_valid             : %d\r\n", gps_valid);
+        PRINTF("gps_satellites        : %d\r\n", gps_satellites);
         PRINTF("gps_get_latitude      : %f\r\n", (lat_sign * gps_get_latitude()));
         PRINTF("gps_get_longitude     : %f\r\n", (long_sign * gps_get_longitude()));
         PRINTF("gps_get_altitude      : %f meters\r\n", gps_get_altitude());
         PRINTF("gps_get_speed         : %f knots\r\n", gps_get_speed());
         PRINTF("gps_get_course        : %f degrees\r\n", gps_get_course());
 #endif
-        sprintf(SENSOR_DATA.GPS_Valid, "%d", gps_valid);
+        sprintf(SENSOR_DATA.GPS_Satellites, "%d", gps_satellites);
         sprintf(SENSOR_DATA.GPS_Latitude, "%f", (lat_sign * gps_get_latitude()));
         sprintf(SENSOR_DATA.GPS_Longitude, "%f", (long_sign * gps_get_longitude()));
         sprintf(SENSOR_DATA.GPS_Altitude, "%f", gps_get_altitude());

--- a/sensors.h	Thu Aug 11 17:04:09 2016 +0000
+++ b/sensors.h	Thu Aug 11 21:14:32 2016 +0000
@@ -47,7 +47,7 @@
     char  Virtual_Sensor6[SENSOR_FIELD_LEN_LIMIT];
     char  Virtual_Sensor7[SENSOR_FIELD_LEN_LIMIT];
     char  Virtual_Sensor8[SENSOR_FIELD_LEN_LIMIT];
-    char  GPS_Valid[SENSOR_FIELD_LEN_LIMIT];
+    char  GPS_Satellites[SENSOR_FIELD_LEN_LIMIT];
     char  GPS_Latitude[SENSOR_FIELD_LEN_LIMIT];
     char  GPS_Longitude[SENSOR_FIELD_LEN_LIMIT];
     char  GPS_Altitude[SENSOR_FIELD_LEN_LIMIT];