Travail de train GPS

7 files changed, 98 insertions, 13 deletions

diff --git a/src/common/src/Core/common.c b/src/common/src/Core/common.c
index 8c63917..4adca26 100644
--- a/src/common/src/Core/common.c
+++ b/src/common/src/Core/common.c
@@ -128,11 +128,14 @@ int local_time(struct tm *time)
             time->tm_isdst = 1;
         }
 
+        time->tm_year -= 1900;  //TODO Same on hardware ?
+
         // Let mktime fix the struct tm *time
         if (mktime(time) == (time_t)-1) {
             // TODO inform about failure
             valid = 0;
         }
+
     }
 
     return valid;
diff --git a/src/common/src/Core/main.c b/src/common/src/Core/main.c
index feac593..4eebfa2 100644
--- a/src/common/src/Core/main.c
+++ b/src/common/src/Core/main.c
@@ -320,7 +320,6 @@ static void gps_monit_task(void *pvParameters) {
         int time_valid = local_time(&time);
 
         if (time_valid) {
-            printf("Valid\n");
             if (time.tm_sec % 4 >= 2) {
                 leds_turn_on(LED_BLUE);
             }
diff --git a/src/common/src/GPS/gps.c b/src/common/src/GPS/gps.c
index 61c8c48..568a181 100644
--- a/src/common/src/GPS/gps.c
+++ b/src/common/src/GPS/gps.c
@@ -56,6 +56,7 @@ int gps_utctime(struct tm *timeutc) {
         timeutc->tm_sec   = gps_timeutc.tm_sec;
         valid             = gps_timeutc_valid;
     }
+
     xSemaphoreGive(timeutc_semaphore);
 
     return valid;
diff --git a/src/simulator/.gitignore b/src/simulator/.gitignore
index 02e1499..994218c 100644
--- a/src/simulator/.gitignore
+++ b/src/simulator/.gitignore
@@ -1 +1,2 @@
 FreeRTOS-Sim
+vc.h
diff --git a/src/simulator/src/Core/main.c b/src/simulator/src/Core/main.c
index a326dbf..85e6a81 100644
--- a/src/simulator/src/Core/main.c
+++ b/src/simulator/src/Core/main.c
@@ -31,6 +31,49 @@ static void thread_gui(void *arg) {
     main_gui();
 }
 
+
+extern int gui_gps_send_frame;
+extern int gui_gps_frames_valid;
+extern char gui_gps_lat[64];
+extern int gui_gps_lat_hem;
+extern char gui_gps_lon[64];
+extern int gui_gps_lon_hem;
+extern int gui_gps_send_current_time;
+
+static void thread_gui_gps(void *arg) {
+
+    while(1) {
+        vTaskDelay(1000 / portTICK_RATE_MS);
+
+        if (gui_gps_send_frame) {
+
+            char gps_frame_buffer[128];
+            int gps_buffer_pointer = 0;
+
+            strcpy(gps_frame_buffer + gps_buffer_pointer, "$GPRMC,");
+            gps_buffer_pointer += 7;
+
+            strcpy(gps_frame_buffer + gps_buffer_pointer, "225446,");
+            gps_buffer_pointer += 7;
+
+            if (gui_gps_frames_valid) {
+                gps_frame_buffer[gps_buffer_pointer] = 'A';
+            } else {
+                gps_frame_buffer[gps_buffer_pointer] = 'V';
+            }
+            gps_buffer_pointer++;
+            gps_frame_buffer[gps_buffer_pointer] = ',';
+            gps_buffer_pointer++;
+
+
+            gps_frame_buffer[gps_buffer_pointer] = '\0';
+            printf("%s\n", gps_frame_buffer);
+
+        }
+
+    }
+}
+
 void init() {
 
     /* pthread_t pth; */
@@ -45,4 +88,12 @@ void init() {
             tskIDLE_PRIORITY + 2UL,
             &task_handle);
 
+    xTaskCreate(
+            thread_gui_gps,
+            "Thread GUI GPS",
+            configMINIMAL_STACK_SIZE,
+            (void*) NULL,
+            tskIDLE_PRIORITY + 2UL,
+            &task_handle);
+
 }
diff --git a/src/simulator/src/Gui/gui.c b/src/simulator/src/Gui/gui.c
index 81c80b6..72fa9ae 100644
--- a/src/simulator/src/Gui/gui.c
+++ b/src/simulator/src/Gui/gui.c
@@ -53,6 +53,21 @@ char led_green = 0;
 char led_orange = 0;
 char led_red = 0;
 
+/**
+ * GPS
+ */
+int gui_gps_send_frame = 1;
+int gui_gps_frames_valid = 1;
+char gui_gps_lat[64] = "4719.59788";
+int gui_gps_lat_len = 10;
+static const char *gps_NS[] = {"North", "South"};
+int gui_gps_lat_hem = 0;
+char gui_gps_lon[64] = "00830.92084";
+int gui_gps_lon_len = 10;
+static const char *gps_EW[] = {"East", "West"};
+int gui_gps_lon_hem = 0;
+int gui_gps_send_current_time = 1;
+
 struct XWindow {
     Display *dpy;
     Window win;
@@ -162,8 +177,9 @@ int main_gui() {
                     int sample_buffer, samples;
                     glXGetFBConfigAttrib(win.dpy, fbc[i], GLX_SAMPLE_BUFFERS, &sample_buffer);
                     glXGetFBConfigAttrib(win.dpy, fbc[i], GLX_SAMPLES, &samples);
-                    if ((fb_best < 0) || (sample_buffer && samples > best_num_samples))
+                    if ((fb_best < 0) || (sample_buffer && samples > best_num_samples)) {
                         fb_best = i; best_num_samples = samples;
+                    }
                 }
             }
             win.fbc = fbc[fb_best];
@@ -307,12 +323,8 @@ int main_gui() {
                 if (l > 1) {
                     nk_text(ctx, current_pointer - l, l, NK_TEXT_LEFT);
                 }
-
-                /* nk_layout_row_end(ctx); */
-
-
-                nk_end(ctx);
             }
+            nk_end(ctx);
 
 
             if (nk_begin(ctx, &layout, "LEDs", nk_rect(460, 50, 100, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
@@ -321,7 +333,6 @@ int main_gui() {
 
                 struct nk_color color;
 
-
                 nk_text(ctx, "", 0, NK_TEXT_LEFT);
 
                 color.r = 255; color.g = 0; color.b = 0;
@@ -368,9 +379,32 @@ int main_gui() {
 
                 nk_text(ctx, "", 0, NK_TEXT_LEFT);
 
-                nk_end(ctx);
+            }
+            nk_end(ctx);
+
+            if (nk_begin(ctx, &layout, "GPS", nk_rect(460, 210, 200, 455), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+
+                nk_layout_row_dynamic(ctx, 30, 1);
+                nk_checkbox_label(ctx, "Send frames", &gui_gps_send_frame);
+                nk_checkbox_label(ctx, "Valid frames", &gui_gps_frames_valid);
+
+                nk_layout_row_dynamic(ctx, 30, 2);
+
+                nk_label(ctx, "Latitude:", NK_TEXT_LEFT);
+                nk_edit_string(ctx, NK_EDIT_SIMPLE, gui_gps_lat, &gui_gps_lat_len, 64, nk_filter_float);
+                nk_label(ctx, "", NK_TEXT_LEFT);
+                gui_gps_lat_hem = nk_combo(ctx, gps_NS, LEN(gps_NS), gui_gps_lat_hem, 30);
+
+                nk_label(ctx, "Longitude:", NK_TEXT_LEFT);
+                nk_edit_string(ctx, NK_EDIT_SIMPLE, gui_gps_lon, &gui_gps_lon_len, 64, nk_filter_float);
+                nk_label(ctx, "", NK_TEXT_LEFT);
+                gui_gps_lon_hem = nk_combo(ctx, gps_EW, LEN(gps_EW), gui_gps_lon_hem, 30);
+
+                nk_layout_row_dynamic(ctx, 30, 1);
+                nk_checkbox_label(ctx, "Send current time", &gui_gps_send_current_time);
 
             }
+            nk_end(ctx);
 
 
         }
diff --git a/src/simulator/vc.h b/src/simulator/vc.h
deleted file mode 100644
index fa3f184..0000000
--- a/src/simulator/vc.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated by Makefile.
-// Do not edit this file!
-#define GIT_VERSION "9069fc1"
-