gpsapp: Implement gps_event and gps_redraw

Note: still standalone, 'bear'-metal application, not yet hooked to FreeRTOS

gpsapp: Implement gps_event and gps_redraw
Note: still standalone, 'bear'-metal application, not yet hooked to FreeRTOS
8e4812a8 · Theodor-Adrian Stana · d0a85e24 · 8e4812a8 · 8e4812a8
Commit 8e4812a8 authored Aug 26, 2014 by Theodor-Adrian Stana
Hide whitespace changes
Inline Side-by-side

Showing with 29 additions and 12 deletions

event.h sw/common/event.h +2 -1

gpsapp.c sw/gps/gpsapp.c +27 -11

No files found.
--- a/sw/common/event.h
+++ b/sw/common/event.h
@@ -32,7 +32,8 @@
 */
 enum event_type {
    BUTTON_PRESSED,
-    SENSOR
+    SENSOR,
+    RTC_TICK
 };

 /**

--- a/sw/gps/gpsapp.c
+++ b/sw/gps/gpsapp.c
@@ -45,15 +45,34 @@
 #include <em_leuart.h>
 #include <em_gpio.h>

+#include <event.h>
+
 #include <drivers/lcd.h>
 #include <gfx/graphics.h>
 #include <gfx/ui.h>

 #include "gps.h"

+static int i = 0;
+
+static void gps_redraw(struct ui_widget *w)
+{
+        char buf[4];
+
+        i+=2;
+        gfx_clear(&w->dc, 0);
+        sprintf(buf, "%d", i);
+        gfx_text(&w->dc, &font_helv38b, 0, 0, buf, 1);
+}
+
+static void gps_event(struct ui_widget *w, const struct event *evt)
+{
+        w->flags |= WF_DIRTY;
+}
+
 static struct ui_widget gps_screen = {
-        NULL, //gps_redraw,
-        NULL, //gps_event,
+        gps_redraw,
+        gps_event,
        {0, 0, 127, 127},
        0,
        WF_ACTIVE | WF_VISIBLE
@@ -66,9 +85,9 @@ static struct ui_widget gps_screen = {

 void main(void *params)
 {
-        int i = 0,
-            j;
-        char buf[4];
+        struct event evt;
+        evt.type = RTC_TICK;
+        int i = 0;

        /* Init clocks */
        // TODO: move to common init
@@ -79,6 +98,7 @@ void main(void *params)
        GPIO_PinModeSet(gpioPortE, 11, gpioModePushPull, 0);
        GPIO_PinModeSet(gpioPortE, 12, gpioModePushPull, 0);

+        /* Initialize GPS module */
        gps_init();

        // TODO: remove, this is done in startMain()
@@ -92,13 +112,9 @@ void main(void *params)
        ui_update(NULL);

        while (1) {
-                i++;
-                gfx_clear(&gps_screen.dc, 0);
-                sprintf(buf, "%d", i);
-                gfx_text(&gps_screen.dc, &font_helv38b, 0, 0, buf, 1);
-                ui_update(NULL);
-                for (j = 0; j < 100000; j++)
+                for (i = 0; i < 100000; i++)
                        ;
+                ui_update(&evt);
        }
 }