Final version v1.0

communication.c

@@ -76,8 +76,6 @@ uart_send_command(UART_CTRL_COMMAND command, bool timed) {
         receiveStatus = uart_receive(receiveBuf, 10);
         if(receiveStatus) {
 
-            printf("rx: %s\n", receiveBuf);
-
             if(strncmp("OK", receiveBuf, 2) == 0) {
                 return 1;
             }
@@ -135,4 +133,4 @@ com_get_display_name(char* nameBuf, size_t nameBufSize) {
     }
 
     return 1;
-}
+}

configuration.h

@@ -14,7 +14,7 @@
 
 #define RESULT_OUTPUT_DIR           "results"
 
-#define SHUTDOWN_PRESS_TIME         ((uint32_t)1000000)     /* ~5s */
+#define SHUTDOWN_PRESS_TIME         ((uint32_t)10000000)
 
 /* GPIOs */
 #define GPIO_EXT_TRIGGER_IN         ((unsigned int)5)       /* Physical pin 29, BCM pin 5 */

fb_lib.c

@@ -45,6 +45,7 @@ fb_init(const char* fb_dev_id, struct FbDev* fb_device) {
     fb_device->bpp = vinfo.bits_per_pixel;
     fb_device->linelen = finfo.line_length;
     fb_device->memlen = finfo.smem_len;
+    fb_device->timing = vinfo.left_margin;
 
     /* Map memory */
     fb_device->fbuf = (char *)mmap(0, finfo.smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_device->fb_fd, 0);
@@ -151,7 +152,11 @@ fb_draw_text(const struct FbDev* fb_device, const char* text, int32_t x, int32_t
 
 void
 fb_draw_filled_screen(const struct FbDev* fb_device, uint32_t color) {
-    memset(fb_device->bbuf, color, fb_device->memlen);
+    if(color == COLOR_WHITE) {
+        memset(fb_device->bbuf, color, fb_device->memlen);
+    } else {
+        fb_draw_rect(fb_device, 0, 0, fb_device->w, fb_device->h, color, DRAW_CENTER_NONE);
+    }
 }
 
 void
@@ -218,4 +223,4 @@ _put_pixel(const struct FbDev* fb_device, uint32_t x, uint32_t y, uint32_t color
 uint32_t
 _get_memory_location(const struct FbDev* fb_device, uint32_t ox, uint32_t oy) {
     return ox * fb_device->bpp / 8 + oy * fb_device->linelen;
-}
+}

fb_lib.h

@@ -31,6 +31,7 @@ struct FbDev {
     int fb_fd;          /* File descriptor */
     uint32_t w;         /* Visible screen width */
     uint32_t h;         /* Visible screen height */
+    uint32_t timing;
     uint32_t bpp;       /* Bits per pixel (color depth) */
     uint32_t linelen;   /* Pre-calculated horizontal length */
     uint32_t memlen;    /* Pre-calculated memory size */

main.c

@@ -12,19 +12,22 @@
 
 struct FbDevState framebuf_state = {
         .state = FBSTATE_INITIALIZE,
+		.homesw_mode = 0,
         .n_measurements = DEFAULT_N_MEASUREMENTS,
         .mode = FBMODE_HOME,
+		.colorm = FBCOLOR_B2W,
         .isCalibrated = false,
 };
 int uart0_filestream = -1;
 
 bool mainIsRunning = true;
 bool usbDriveInserted = false;
 bool usbDriveCopied = false;
+struct FbDev framebuf_device;
 
 int
 main() {
-    struct FbDev framebuf_device;
+//    struct FbDev framebuf_device;
 
     if(!fb_init("/dev/fb0", &framebuf_device)) {
         perror("Could not access framebuffer, exit");

main.h

@@ -29,9 +29,17 @@ typedef enum {
     FBMODE_CALIB,
 } FB_MODE;
 
+typedef enum {
+    FBCOLOR_B2W,
+    FBCOLOR_B2R,
+    FBCOLOR_R2G
+} FB_COLORMODE;
+
 struct FbDevState {
     FB_STATE state;                             /* Internal state machine */
     FB_MODE mode;                               /* Internal mode */
+    FB_COLORMODE colorm;			/* Color mode */
+    uint8_t homesw_mode;
     uint32_t n_measurements;                    /* Number of measurements per series, default = 100 */
 
     bool isCalibrated;

menu.c

@@ -29,6 +29,7 @@ menu_switch_pressed(void) {
     homeSwitchPressedTime = 0;
     framebuf_state.mode = FBMODE_HOME;
     framebuf_state.state = FBSTATE_IDLE;
+    framebuf_state.homesw_mode = !framebuf_state.homesw_mode;
 }
 
 void

menu.h

@@ -19,7 +19,6 @@ typedef enum {
 void menu_switch_pressed(void);
 void calib_switch_pressed(void);
 void start_switch_pressed(void);
-void shutdown_switch_pressed(void);
 void* menu_poll(void* vargp);
 void* usbdrive_poll(void* vargp);