Simulator: Input, outputs and FSM

17 files changed, 595 insertions, 243 deletions

diff --git a/src/stm32f/includes/Core/delay.h b/src/common/includes/Core/delay.h
index 73ed669..73ed669 100644
--- a/src/stm32f/includes/Core/delay.h
+++ b/src/common/includes/Core/delay.h
diff --git a/src/fsm/fsm.h b/src/common/includes/Core/fsm.h
index 41f0503..41f0503 100644
--- a/src/fsm/fsm.h
+++ b/src/common/includes/Core/fsm.h
diff --git a/src/fsm/pio.h b/src/common/includes/GPIO/pio.h
index 9e7d4fb..19d3e15 100644
--- a/src/fsm/pio.h
+++ b/src/common/includes/GPIO/pio.h
@@ -27,42 +27,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "fsm.h"
-#include "stm32f4xx_rcc.h"
-#include "stm32f4xx_gpio.h"
-
-/* See pio.txt for PIO allocation details */
-
-/* On GPIO C */
-#define GPIO_PIN_QRP_n    GPIO_Pin_1
-#define GPIO_PIN_TX       GPIO_Pin_2
-#define GPIO_PIN_1750_n   GPIO_Pin_4
-#define GPIO_PIN_MOD_OFF  GPIO_Pin_5
-#define GPIO_PIN_SQ_n     GPIO_Pin_6
-#define GPIO_PIN_U        GPIO_Pin_8
-#define GPIO_PIN_QRP_out  GPIO_Pin_9
-#define GPIO_PIN_D        GPIO_Pin_11
-#define GPIO_PIN_REPLIE_n GPIO_Pin_13
-#define GPIO_PIN_FAX_n    GPIO_Pin_14
-
-
-#define GPIOC_OUTPUT_PINS ( \
-                           GPIO_PIN_TX | \
-                           GPIO_PIN_MOD_OFF | \
-                           GPIO_PIN_QRP_out | \
-                           0)
-
-#undef GPIOC_OPENDRAIN_PINS
-#undef GPIOC_INPUT_PU_PINS
-
-#define GPIOC_INPUT_PINS ( \
-                          GPIO_PIN_QRP_n | \
-                          GPIO_PIN_1750_n | \
-                          GPIO_PIN_SQ_n | \
-                          GPIO_PIN_U | \
-                          GPIO_PIN_D | \
-                          GPIO_PIN_REPLIE_n | \
-                          0 )
+#include "Core/fsm.h"
 
 /* Analog inputs */
 // TODO: SWR forward power
@@ -76,5 +41,7 @@ void pio_set_qrp(int on);
 
 void pio_set_fsm_signals(struct fsm_input_signals_t* sig);
 
+int pio_read_button();
+
 #endif // _PIO_H_
 
diff --git a/src/common/includes/GPIO/usart.h b/src/common/includes/GPIO/usart.h
index 62c86c9..21936d7 100644
--- a/src/common/includes/GPIO/usart.h
+++ b/src/common/includes/GPIO/usart.h
@@ -48,6 +48,7 @@ void usart_debug(const char *format, ...);
 
 // Send a string to the PC
 void usart_debug_puts(const char* str);
+void usart_debug_puts_no_header(const char* str);
 
 // Get a MAX_NMEA_SENTENCE_LEN sized NMEA sentence
 // Return 1 on success
diff --git a/src/common/src/Core/common.c b/src/common/src/Core/common.c
index 476d1b4..2077a16 100644
--- a/src/common/src/Core/common.c
+++ b/src/common/src/Core/common.c
@@ -158,6 +158,11 @@ void common_init(void)
 static void common_increase_timestamp(TimerHandle_t t)
 {
     common_timestamp++;
+
+#ifdef SIMULATOR
+    //Simulator rate is 100ticks/s
+    common_timestamp += 9;
+#endif
 }
 
 uint64_t timestamp_now(void)
diff --git a/src/fsm/fsm.c b/src/common/src/Core/fsm.c
index 0c8cbed..e5d7ca7 100644
--- a/src/fsm/fsm.c
+++ b/src/common/src/Core/fsm.c
@@ -23,9 +23,9 @@
 */
 
 #include <string.h>
-#include "common.h"
-#include "fsm.h"
-#include "usart.h"
+#include "Core/common.h"
+#include "Core/fsm.h"
+#include "GPIO/usart.h"
 
 static struct fsm_input_signals_t fsm_in;
 static struct fsm_output_signals_t fsm_out;
@@ -36,6 +36,9 @@ static fsm_state_t current_state;
 // in ms using the timestamp_now() function
 static uint64_t timestamp_state[_NUM_FSM_STATES];
 
+
+void fsm_state_switched(char * new_state);
+
 void fsm_init() {
     memset(&fsm_in, 0, sizeof(fsm_in));
     memset(&fsm_out, 0, sizeof(fsm_out));
@@ -362,37 +365,37 @@ void fsm_update() {
         timestamp_state[next_state] = timestamp_now();
         switch (next_state) {
             case FSM_OISIF:
-                usart_debug_puts("FSM: FSM_OISIF\r\n"); break;
+                fsm_state_switched("FSM_OISIF"); break;
             case FSM_OPEN1:
-                usart_debug_puts("FSM: FSM_OPEN1\r\n"); break;
+                fsm_state_switched("FSM_OPEN1"); break;
             case FSM_OPEN2:
-                usart_debug_puts("FSM: FSM_OPEN2\r\n"); break;
+                fsm_state_switched("FSM_OPEN2"); break;
             case FSM_LETTRE:
-                usart_debug_puts("FSM: FSM_LETTRE\r\n"); break;
+                fsm_state_switched("FSM_LETTRE"); break;
             case FSM_ECOUTE:
-                usart_debug_puts("FSM: FSM_ECOUTE\r\n"); break;
+                fsm_state_switched("FSM_ECOUTE"); break;
             case FSM_ATTENTE:
-                usart_debug_puts("FSM: FSM_ATTENTE\r\n"); break;
+                fsm_state_switched("FSM_ATTENTE"); break;
             case FSM_QSO:
-                usart_debug_puts("FSM: FSM_QSO\r\n"); break;
+                fsm_state_switched("FSM_QSO"); break;
             case FSM_ANTI_BAVARD:
-                usart_debug_puts("FSM: FSM_ANTI_BAVARD\r\n"); break;
+                fsm_state_switched("FSM_ANTI_BAVARD"); break;
             case FSM_BLOQUE:
-                usart_debug_puts("FSM: FSM_BLOQUE\r\n"); break;
+                fsm_state_switched("FSM_BLOQUE"); break;
             case FSM_TEXTE_73:
-                usart_debug_puts("FSM: FSM_TEXTE_73\r\n"); break;
+                fsm_state_switched("FSM_TEXTE_73"); break;
             case FSM_TEXTE_HB9G:
-                usart_debug_puts("FSM: FSM_TEXTE_HB9G\r\n"); break;
+                fsm_state_switched("FSM_TEXTE_HB9G"); break;
             case FSM_TEXTE_LONG:
-                usart_debug_puts("FSM: FSM_TEXTE_LONG\r\n"); break;
+                fsm_state_switched("FSM_TEXTE_LONG"); break;
             case FSM_BALISE_LONGUE:
-                usart_debug_puts("FSM: FSM_BALISE_LONGUE\r\n"); break;
+                fsm_state_switched("FSM_BALISE_LONGUE"); break;
             case FSM_BALISE_SPECIALE:
-                usart_debug_puts("FSM: FSM_BALISE_SPECIALE\r\n"); break;
+                fsm_state_switched("FSM_BALISE_SPECIALE"); break;
             case FSM_BALISE_COURTE:
-                usart_debug_puts("FSM: FSM_BALISE_COURTE\r\n"); break;
+                fsm_state_switched("FSM_BALISE_COURTE"); break;
             default:
-                usart_debug_puts("FSM: ERROR!\r\n"); break;
+                fsm_state_switched("ERROR!"); break;
         }
     }
     current_state = next_state;
diff --git a/src/common/src/Core/main.c b/src/common/src/Core/main.c
index f1d8e61..3e99a11 100644
--- a/src/common/src/Core/main.c
+++ b/src/common/src/Core/main.c
@@ -36,13 +36,13 @@
 /* Includes */
 #include "Audio/audio.h"
 #include "Audio/cw.h"
-/* #include "pio.h" */
-/* #include "i2c.h" */
+#include "GPIO/pio.h"
+#include "GPIO/i2c.h"
 #include "GPS/gps.h"
-/* #include "fsm.h" */
+#include "Core/fsm.h"
 #include "Core/common.h"
 #include "GPIO/usart.h"
-/* #include "delay.h" */
+#include "Core/delay.h"
 #include "GPIO/temperature.h"
 #include "GPIO/leds.h"
 #include "vc.h"
@@ -78,16 +78,20 @@ void * threadscheduler(void * arg) {
 
 int main(void) {
     init();
-    /* delay_init(); */
+    delay_init();
     usart_init();
     usart_debug_puts("\r\n******* glutt-o-matique version " GIT_VERSION " *******\r\n");
-    /*  */
-    /* if (RCC_GetFlagStatus(RCC_FLAG_IWDGRST) != RESET) */
-    /* { */
-    /*     usart_debug_puts("WARNING: A IWDG Reset occured!\r\n"); */
-    /* } */
-    /* RCC_ClearFlag(); */
-    /*  */
+
+#ifndef SIMULATOR
+
+    if (RCC_GetFlagStatus(RCC_FLAG_IWDGRST) != RESET)
+    {
+        usart_debug_puts("WARNING: A IWDG Reset occured!\r\n");
+    }
+    RCC_ClearFlag();
+
+#endif
+
     TaskHandle_t task_handle;
     xTaskCreate(
             launcher_task,
@@ -134,13 +138,13 @@ static void launcher_task(void *pvParameters)
 {
     usart_debug_puts("CW init\r\n");
     cw_psk31_init(16000);
-    /*  */
-    /* usart_debug_puts("PIO init\r\n"); */
-    /* pio_init(); */
-    /*  */
-    /* usart_debug_puts("I2C init\r\n"); */
-    /* i2c_init(); */
-    /*  */
+
+    usart_debug_puts("PIO init\r\n");
+    pio_init();
+
+    usart_debug_puts("I2C init\r\n");
+    i2c_init();
+
     usart_debug_puts("common init\r\n");
     common_init();
 
@@ -150,35 +154,35 @@ static void launcher_task(void *pvParameters)
     usart_debug_puts("DS18B20 init\r\n");
     temperature_init();
 
-    /* usart_debug_puts("TaskButton init\r\n"); */
+    usart_debug_puts("TaskButton init\r\n");
 
     TaskHandle_t task_handle;
-    /* xTaskCreate( */
-    /*         detect_button_press, */
-    /*         "TaskButton", */
-    /*         4*configMINIMAL_STACK_SIZE, */
-    /*         (void*) NULL, */
-    /*         tskIDLE_PRIORITY + 2UL, */
-    /*         &task_handle); */
-    /*  */
-    /* if (!task_handle) { */
-    /*     trigger_fault(FAULT_SOURCE_MAIN); */
-    /* } */
-    /*  */
-    /* usart_debug_puts("TaskFSM init\r\n"); */
-    /*  */
-    /* xTaskCreate( */
-    /*         exercise_fsm, */
-    /*         "TaskFSM", */
-    /*         4*configMINIMAL_STACK_SIZE, */
-    /*         (void*) NULL, */
-    /*         tskIDLE_PRIORITY + 2UL, */
-    /*         &task_handle); */
-    /*  */
-    /* if (!task_handle) { */
-    /*     trigger_fault(FAULT_SOURCE_MAIN); */
-    /* } */
-    /*  */
+    xTaskCreate(
+            detect_button_press,
+            "TaskButton",
+            4*configMINIMAL_STACK_SIZE,
+            (void*) NULL,
+            tskIDLE_PRIORITY + 2UL,
+            &task_handle);
+
+    if (!task_handle) {
+        trigger_fault(FAULT_SOURCE_MAIN);
+    }
+
+    usart_debug_puts("TaskFSM init\r\n");
+
+    xTaskCreate(
+            exercise_fsm,
+            "TaskFSM",
+            4*configMINIMAL_STACK_SIZE,
+            (void*) NULL,
+            tskIDLE_PRIORITY + 2UL,
+            &task_handle);
+
+    if (!task_handle) {
+        trigger_fault(FAULT_SOURCE_MAIN);
+    }
+
     usart_debug_puts("TaskGPS init\r\n");
 
     xTaskCreate(
@@ -222,10 +226,6 @@ static void launcher_task(void *pvParameters)
      * for more info.
      */
 
-    cw_psk31_push_message("HB9G HI - TESTING", 50, 440);
-    cw_psk31_push_message("HB9G HI AGAIN", 50, 440);
-    cw_psk31_push_message("HB9G 73", 50, 440);
-
     while (1) {
         vTaskSuspend(NULL);
     }
@@ -234,45 +234,45 @@ static void launcher_task(void *pvParameters)
 
 static void detect_button_press(void *pvParameters)
 {
-    /* int pin_high_count = 0; */
-    /* int last_pin_high_count = 0; */
-    /* const int pin_high_thresh = 10; */
-    /* while (1) { */
-    /*     if (GPIO_ReadInputDataBit(GPIOA,GPIO_Pin_0) == Bit_SET) { */
-    /*         if (pin_high_count < pin_high_thresh) { */
-    /*             pin_high_count++; */
-    /*         } */
-    /*     } */
-    /*     else { */
-    /*         if (pin_high_count > 0) { */
-    /*             pin_high_count--; */
-    /*         } */
-    /*     } */
-    /*  */
-    /*     vTaskDelay(10 / portTICK_RATE_MS); #<{(| Debounce Delay |)}># */
-    /*  */
-    /*     if (pin_high_count == pin_high_thresh && */
-    /*             last_pin_high_count != pin_high_count) { */
-    /*         tm_trigger_button = 1; */
-    /*         usart_debug_puts("Bouton bleu\r\n"); */
-    /*  */
-    /*         if (temperature_valid()) { */
-    /*  */
-    /*             float temp = temperature_get(); */
-    /*  */
-    /*             usart_debug("Temperature %f\r\n", temp); */
-    /*  */
-    /*         } else { */
-    /*             usart_debug_puts("No temp\r\n"); */
-    /*         } */
-    /*     } */
-    /*     else if (pin_high_count == 0 && */
-    /*             last_pin_high_count != pin_high_count) { */
-    /*         tm_trigger_button = 0; */
-    /*     } */
-    /*  */
-    /*     last_pin_high_count = pin_high_count; */
-    /* } */
+    int pin_high_count = 0;
+    int last_pin_high_count = 0;
+    const int pin_high_thresh = 10;
+    while (1) {
+        if (pio_read_button()) {
+            if (pin_high_count < pin_high_thresh) {
+                pin_high_count++;
+            }
+        }
+        else {
+            if (pin_high_count > 0) {
+                pin_high_count--;
+            }
+        }
+
+        vTaskDelay(10 / portTICK_RATE_MS); /* Debounce Delay */
+
+        if (pin_high_count == pin_high_thresh &&
+                last_pin_high_count != pin_high_count) {
+            tm_trigger_button = 1;
+            usart_debug_puts("Bouton bleu\r\n");
+
+            if (temperature_valid()) {
+
+                float temp = temperature_get();
+
+                usart_debug("Temperature %f\r\n", temp);
+
+            } else {
+                usart_debug_puts("No temp\r\n");
+            }
+        }
+        else if (pin_high_count == 0 &&
+                last_pin_high_count != pin_high_count) {
+            tm_trigger_button = 0;
+        }
+
+        last_pin_high_count = pin_high_count;
+    }
 }
 
 static void audio_callback(void* context, int select_buffer) {
@@ -352,95 +352,97 @@ static void gps_monit_task(void *pvParameters) {
 
         vTaskDelay(100 / portTICK_RATE_MS);
 
-        // Reload watchdog //TODO
-        /* IWDG_ReloadCounter(); */
+        // Reload watchdog
+#ifndef SIMULATOR
+        IWDG_ReloadCounter();
+#endif
     }
 }
 
-/* static struct fsm_input_signals_t fsm_input; */
+static struct fsm_input_signals_t fsm_input;
 static void exercise_fsm(void *pvParameters)
 {
-    /* int cw_last_trigger = 0; */
-    /* int last_tm_trigger = 0; */
-    /* int last_tm_trigger_button = 0; */
-    /*  */
-    /* int last_sq = 0; */
-    /* int last_1750 = 0; */
-    /* int last_qrp = 0; */
-    /* int last_cw_done = 0; */
-    /*  */
-    /* fsm_input.humidity = 0; */
-    /* fsm_input.temp = 15; */
-    /* fsm_input.swr_high = 0; */
-    /* fsm_input.sstv_mode = 0; */
-    /* fsm_input.wind_generator_ok = 1; */
-    /* while (1) { */
-    /*     vTaskDelay(10 / portTICK_RATE_MS); */
-    /*  */
-    /*     pio_set_fsm_signals(&fsm_input); */
-    /*  */
-    /*     if (last_sq != fsm_input.sq) { */
-    /*         last_sq = fsm_input.sq; */
-    /*         usart_debug("In SQ %d\r\n", last_sq); */
-    /*     } */
-    /*     if (last_1750 != fsm_input.tone_1750) { */
-    /*         last_1750 = fsm_input.tone_1750; */
-    /*         usart_debug("In 1750 %d\r\n", last_1750); */
-    /*     } */
-    /*     if (last_qrp != fsm_input.qrp) { */
-    /*         last_qrp = fsm_input.qrp; */
-    /*         usart_debug("In QRP %d\r\n", last_qrp); */
-    /*     } */
-    /*  */
-    /*  */
-    /*     if (tm_trigger_button == 1 && last_tm_trigger_button == 0) { */
-    /*         fsm_input.start_tm = 1; */
-    /*     } */
-    /*     last_tm_trigger_button = tm_trigger_button; */
-    /*  */
-    /*     if (tm_trigger == 1 && last_tm_trigger == 0) { */
-    /*         fsm_input.start_tm = 1; */
-    /*     } */
-    /*     last_tm_trigger = tm_trigger; */
-    /*  */
-    /*     int cw_done = !cw_psk31_busy(); */
-    /*     if (last_cw_done != cw_done) { */
-    /*         usart_debug("In CW done %d\r\n", cw_done); */
-    /*         last_cw_done = cw_done; */
-    /*  */
-    /*         fsm_input.cw_psk31_done = cw_done; */
-    /*     } */
-    /*     else { */
-    /*         fsm_input.cw_psk31_done = 0; */
-    /*     } */
-    /*  */
-    /*     if (fsm_input.cw_psk31_done) { */
-    /*         GPIO_ResetBits(GPIOD, GPIOD_BOARD_LED_ORANGE); */
-    /*     } */
-    /*     else { */
-    /*         GPIO_SetBits(GPIOD, GPIOD_BOARD_LED_ORANGE); */
-    /*     } */
-    /*  */
-    /*     fsm_update_inputs(&fsm_input); */
-    /*     fsm_update(); */
-    /*  */
-    /*     struct fsm_output_signals_t fsm_out; */
-    /*     fsm_get_outputs(&fsm_out); */
-    /*  */
-    /*     pio_set_tx(fsm_out.tx_on); */
-    /*     pio_set_mod_off(!fsm_out.modulation); */
-    /*     pio_set_qrp(fsm_out.qrp); // TODO move out of FSM */
-    /*  */
-    /*     // Add message to CW generator only on rising edge of trigger */
-    /*     if (fsm_out.cw_psk31_trigger && !cw_last_trigger) { */
-    /*         cw_psk31_push_message(fsm_out.msg, fsm_out.cw_dit_duration, fsm_out.msg_frequency); */
-    /*  */
-    /*         usart_debug_puts("Out CW trigger\r\n"); */
-    /*     } */
-    /*     cw_last_trigger = fsm_out.cw_psk31_trigger; */
-    /*  */
-    /*     if (fsm_out.ack_start_tm) { */
-    /*         fsm_input.start_tm = 0; */
-    /*     } */
-    /* } */
+    int cw_last_trigger = 0;
+    int last_tm_trigger = 0;
+    int last_tm_trigger_button = 0;
+
+    int last_sq = 0;
+    int last_1750 = 0;
+    int last_qrp = 0;
+    int last_cw_done = 0;
+
+    fsm_input.humidity = 0;
+    fsm_input.temp = 15;
+    fsm_input.swr_high = 0;
+    fsm_input.sstv_mode = 0;
+    fsm_input.wind_generator_ok = 1;
+    while (1) {
+        vTaskDelay(10 / portTICK_RATE_MS);
+
+        pio_set_fsm_signals(&fsm_input);
+
+        if (last_sq != fsm_input.sq) {
+            last_sq = fsm_input.sq;
+            usart_debug("In SQ %d\r\n", last_sq);
+        }
+        if (last_1750 != fsm_input.tone_1750) {
+            last_1750 = fsm_input.tone_1750;
+            usart_debug("In 1750 %d\r\n", last_1750);
+        }
+        if (last_qrp != fsm_input.qrp) {
+            last_qrp = fsm_input.qrp;
+            usart_debug("In QRP %d\r\n", last_qrp);
+        }
+
+
+        if (tm_trigger_button == 1 && last_tm_trigger_button == 0) {
+            fsm_input.start_tm = 1;
+        }
+        last_tm_trigger_button = tm_trigger_button;
+
+        if (tm_trigger == 1 && last_tm_trigger == 0) {
+            fsm_input.start_tm = 1;
+        }
+        last_tm_trigger = tm_trigger;
+
+        int cw_done = !cw_psk31_busy();
+        if (last_cw_done != cw_done) {
+            usart_debug("In CW done %d\r\n", cw_done);
+            last_cw_done = cw_done;
+
+            fsm_input.cw_psk31_done = cw_done;
+        }
+        else {
+            fsm_input.cw_psk31_done = 0;
+        }
+
+        if (fsm_input.cw_psk31_done) {
+            leds_turn_off(LED_ORANGE);
+        }
+        else {
+            leds_turn_on(LED_ORANGE);
+        }
+
+        fsm_update_inputs(&fsm_input);
+        fsm_update();
+
+        struct fsm_output_signals_t fsm_out;
+        fsm_get_outputs(&fsm_out);
+
+        pio_set_tx(fsm_out.tx_on);
+        pio_set_mod_off(!fsm_out.modulation);
+        pio_set_qrp(fsm_out.qrp); // TODO move out of FSM
+
+        // Add message to CW generator only on rising edge of trigger
+        if (fsm_out.cw_psk31_trigger && !cw_last_trigger) {
+            cw_psk31_push_message(fsm_out.msg, fsm_out.cw_dit_duration, fsm_out.msg_frequency);
+
+            usart_debug_puts("Out CW trigger\r\n");
+        }
+        cw_last_trigger = fsm_out.cw_psk31_trigger;
+
+        if (fsm_out.ack_start_tm) {
+            fsm_input.start_tm = 0;
+        }
+    }
 }
diff --git a/src/common/src/GPIO/usart.c b/src/common/src/GPIO/usart.c
index 77272f8..dd20073 100644
--- a/src/common/src/GPIO/usart.c
+++ b/src/common/src/GPIO/usart.c
@@ -80,6 +80,12 @@ void usart_debug_puts(const char* str) {
     xTaskResumeAll();
 }
 
+void usart_debug_puts_no_header(const char* str) {
+    vTaskSuspendAll();
+    usart_puts(USART2, str);
+    xTaskResumeAll();
+}
+
 int usart_get_nmea_sentence(char* nmea) {
     return xQueueReceive(usart_nmea_queue, nmea, portMAX_DELAY);
 }
diff --git a/src/simulator/src/Core/delay.c b/src/simulator/src/Core/delay.c
new file mode 100644
index 0000000..96f8dd5
--- /dev/null
+++ b/src/simulator/src/Core/delay.c
@@ -0,0 +1,11 @@
+void delay_init() {
+}
+
+void delay_us(int micros) {
+    usleep(micros);
+}
+
+void delay_ms(int millis) {
+    sleep(millis);
+}
+
diff --git a/src/simulator/src/Core/fsm.c b/src/simulator/src/Core/fsm.c
new file mode 100644
index 0000000..ec17e56
--- /dev/null
+++ b/src/simulator/src/Core/fsm.c
@@ -0,0 +1,24 @@
+#include "../../../common/src/Core/fsm.c"
+
+
+extern char * gui_last_fsm_states[];
+extern int * gui_last_fsm_states_timestamps[];
+
+
+void fsm_state_switched(char * new_state) {
+    usart_debug_puts("FSM: ");
+    usart_debug_puts_no_header(new_state);
+    usart_debug_puts_no_header("\r\n");
+
+    for (int i = 8; i >= 0; i--) {
+        gui_last_fsm_states[i + 1] = gui_last_fsm_states[i];
+        gui_last_fsm_states_timestamps[i + 1] = gui_last_fsm_states_timestamps[i];
+    }
+
+
+    time_t now = time(NULL);
+    struct tm *t = gmtime(&now);
+
+    gui_last_fsm_states[0] = new_state;
+    gui_last_fsm_states_timestamps[0] = t->tm_hour * 10000 + t->tm_min * 100 + t->tm_sec;
+}
diff --git a/src/simulator/src/Core/main.c b/src/simulator/src/Core/main.c
index 088e344..911191b 100644
--- a/src/simulator/src/Core/main.c
+++ b/src/simulator/src/Core/main.c
@@ -198,9 +198,6 @@ static void thread_gui_gps(void *arg) {
 
 void init() {
 
-    /* pthread_t pth; */
-    /* pthread_create(&pth, NULL, thread_gui, "processing..."); */
-
     TaskHandle_t task_handle;
     xTaskCreate(
             thread_gui,
diff --git a/src/simulator/src/GPIO/i2c.c b/src/simulator/src/GPIO/i2c.c
new file mode 100644
index 0000000..e529543
--- /dev/null
+++ b/src/simulator/src/GPIO/i2c.c
@@ -0,0 +1,2 @@
+void i2c_init() {
+}
diff --git a/src/simulator/src/GPIO/i2c.h b/src/simulator/src/GPIO/i2c.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/simulator/src/GPIO/i2c.h
diff --git a/src/simulator/src/GPIO/pio.c b/src/simulator/src/GPIO/pio.c
new file mode 100644
index 0000000..36a6baf
--- /dev/null
+++ b/src/simulator/src/GPIO/pio.c
@@ -0,0 +1,45 @@
+#include "Core/fsm.h"
+
+extern char gui_out_tx;
+extern char gui_out_mod_off;
+extern char gui_out_qrp;
+
+extern int gui_in_button;
+extern int gui_in_qrp_n;
+extern int gui_in_1750_n;
+extern int gui_in_sq_n;
+extern int gui_in_u;
+extern int gui_in_d;
+extern int gui_in_replie_n;
+extern int gui_in_fax_n;
+
+void pio_init(void) {
+}
+
+void pio_set_tx(int on) {
+    gui_out_tx = on;
+}
+
+void pio_set_mod_off(int mod_off) {
+    gui_out_mod_off = mod_off;
+}
+
+void pio_set_qrp(int on) {
+    gui_out_qrp = on;
+}
+
+void pio_set_fsm_signals(struct fsm_input_signals_t* sig) {
+
+    sig->qrp = gui_in_qrp_n ? 0 : 1;
+    sig->tone_1750 = gui_in_1750_n ? 0 : 1;
+    sig->sq = gui_in_sq_n ? 0 : 1;
+    sig->discrim_u = gui_in_u ? 1 : 0;
+    sig->discrim_d = gui_in_d ? 1 : 0;
+    sig->wind_generator_ok = gui_in_replie_n ? 1 : 0;
+    sig->sstv_mode = gui_in_fax_n ? 0 : 1;
+
+}
+
+int pio_read_button() {
+    return gui_in_button ? 1 : 0;
+}
diff --git a/src/simulator/src/Gui/gui.c b/src/simulator/src/Gui/gui.c
index 2fcebe3..8d6200f 100644
--- a/src/simulator/src/Gui/gui.c
+++ b/src/simulator/src/Gui/gui.c
@@ -101,6 +101,41 @@ int gui_temperature_valid = 1;
 float gui_temperature = 25.0;
 
 
+/**
+ * Outputs
+ */
+char gui_out_tx = 0;
+char gui_out_mod_off = 0;
+char gui_out_qrp = 0;
+
+
+/**
+ * Inputs
+ */
+int gui_in_button = 0;
+int gui_in_qrp_n = 1;
+int gui_in_1750_n = 1;
+int gui_in_sq_n = 1;
+int gui_in_u = 0;
+int gui_in_d = 0;
+int gui_in_replie_n = 1;
+static const char *replie_status[] = {"Replié", "In vent"};
+int gui_in_fax_n = 1;
+
+
+
+int in_button = 0;
+int in_qrp_n = 1;
+int in_1750_n = 1;
+int in_sq_n = 1;
+int in_u = 0;
+int in_d = 0;
+int in_fax_n = 1;
+
+char * gui_last_fsm_states[] = {"", "", "", "", "", "", "", "", "", ""};
+int * gui_last_fsm_states_timestamps[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+
 struct XWindow {
     Display *dpy;
     Window win;
@@ -139,10 +174,12 @@ static int has_extension(const char *string, const char *ext) {
     for (start = string;;) {
         where = strstr((const char*)start, ext);
         if (!where) break;
+
         term = where + strlen(ext);
         if (where == start || *(where - 1) == ' ') {
-            if (*term == ' ' || *term == '\0')
+            if (*term == ' ' || *term == '\0') {
                 return TRUE;
+            }
         }
         start = term;
     }
@@ -231,9 +268,11 @@ int main_gui() {
             ButtonPress | ButtonReleaseMask| ButtonMotionMask |
             Button1MotionMask | Button3MotionMask | Button4MotionMask | Button5MotionMask|
             PointerMotionMask| StructureNotifyMask;
+
         win.win = XCreateWindow(win.dpy, RootWindow(win.dpy, win.vis->screen), 0, 0,
                 WINDOW_WIDTH, WINDOW_HEIGHT, 0, win.vis->depth, InputOutput,
                 win.vis->visual, CWBorderPixel|CWColormap|CWEventMask, &win.swa);
+
         if (!win.win) die("[X11]: Failed to create window\n");
         XFree(win.vis);
         XStoreName(win.dpy, win.win, "glutt-o-matique simulator 3000");
@@ -309,7 +348,7 @@ int main_gui() {
 
             struct nk_panel layout;
 
-            if (nk_begin(ctx, &layout, "UART", nk_rect(50, 50, 400, 300), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+            if (nk_begin(ctx, &layout, "UART", nk_rect(50, 50, 400, 330), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
 
 
                 nk_menubar_begin(ctx);
@@ -360,7 +399,7 @@ int main_gui() {
             nk_end(ctx);
 
 
-            if (nk_begin(ctx, &layout, "LEDs", nk_rect(50, 360, 100, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+            if (nk_begin(ctx, &layout, "LEDs", nk_rect(50, 390, 100, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
 
                 nk_layout_row_static(ctx, 20, 20, 3);
 
@@ -415,7 +454,7 @@ int main_gui() {
             }
             nk_end(ctx);
 
-            if (nk_begin(ctx, &layout, "Audio", nk_rect(160, 360, 100, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+            if (nk_begin(ctx, &layout, "Audio", nk_rect(160, 390, 100, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
 
                 nk_layout_row_static(ctx, 20, 20, 3);
 
@@ -439,7 +478,7 @@ int main_gui() {
             nk_end(ctx);
 
 
-            if (nk_begin(ctx, &layout, "CW", nk_rect(270, 360, 180, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+            if (nk_begin(ctx, &layout, "CW", nk_rect(270, 390, 180, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
 
                 nk_menubar_begin(ctx);
                 nk_layout_row_dynamic(ctx, 25, 1);
@@ -472,7 +511,7 @@ int main_gui() {
             }
             nk_end(ctx);
 
-            if (nk_begin(ctx, &layout, "GPS", nk_rect(460, 50, 200, 465), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+            if (nk_begin(ctx, &layout, "GPS", nk_rect(460, 50, 200, 500), 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);
@@ -548,7 +587,179 @@ int main_gui() {
             }
             nk_end(ctx);
 
-            if (nk_begin(ctx, &layout, "Temperature", nk_rect(670, 50, 200, 200), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+
+            if (nk_begin(ctx, &layout, "Output", nk_rect(670, 380, 200, 170), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+
+                nk_layout_row_dynamic(ctx, 25, 2);
+
+                struct nk_color color;
+
+                nk_label(ctx, "TX", NK_TEXT_LEFT);
+
+                color.r = 0; color.g = 255; color.b = 0;
+
+                if (gui_out_tx == 1) {
+                    color.a = 255;
+                } else {
+                    color.a = 30;
+                }
+                nk_button_color(ctx, color, NK_BUTTON_DEFAULT);
+
+                nk_label(ctx, "Mod OFF", NK_TEXT_LEFT);
+
+                color.r = 255; color.g = 255; color.b = 0;
+
+                if (gui_out_mod_off == 1) {
+                    color.a = 255;
+                } else {
+                    color.a = 30;
+                }
+                nk_button_color(ctx, color, NK_BUTTON_DEFAULT);
+
+                nk_label(ctx, "QRP", NK_TEXT_LEFT);
+
+                color.r = 255; color.g = 0; color.b = 0;
+
+                if (gui_out_qrp == 1) {
+                    color.a = 255;
+                } else {
+                    color.a = 30;
+                }
+                nk_button_color(ctx, color, NK_BUTTON_DEFAULT);
+
+            }
+            nk_end(ctx);
+
+            if (nk_begin(ctx, &layout, "Input", nk_rect(670, 50, 200, 320), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+
+                nk_layout_row_dynamic(ctx, 25, 3);
+
+                struct nk_color color_on = nk_rgb(0, 255, 0);
+                struct nk_color color_off = nk_rgb(255, 0, 0);
+
+                struct nk_color c;
+
+                if (gui_in_button) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "Button", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_button);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_button = !in_button;
+                } else {
+                    gui_in_button = in_button;
+                }
+
+                if (gui_in_qrp_n) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "QRP_n", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_qrp_n);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_qrp_n = !in_qrp_n;
+                } else {
+                    gui_in_qrp_n = in_qrp_n;
+                }
+
+                if (gui_in_1750_n) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "1750_n", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_1750_n);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_1750_n = !in_1750_n;
+                } else {
+                    gui_in_1750_n = in_1750_n;
+                }
+
+                if (gui_in_sq_n) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "SQ_n", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_sq_n);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_sq_n = !in_sq_n;
+                } else {
+                    gui_in_sq_n = in_sq_n;
+                }
+
+                if (gui_in_u) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "U", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_u);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_u = !in_u;
+                } else {
+                    gui_in_u = in_u;
+                }
+
+                if (gui_in_d) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "D", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_d);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_d = !in_d;
+                } else {
+                    gui_in_d = in_d;
+                }
+
+                if (gui_in_fax_n) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_label_colored(ctx, "FAX_n", NK_TEXT_LEFT, c);
+                nk_checkbox_label(ctx, "", &in_fax_n);
+
+                if (nk_button_label(ctx, "", NK_BUTTON_REPEATER)) {
+                    gui_in_fax_n = !in_fax_n;
+                } else {
+                    gui_in_fax_n = in_fax_n;
+                }
+
+                if (gui_in_replie_n) {
+                    c = color_on;
+                } else {
+                    c = color_off;
+                }
+
+                nk_layout_row_dynamic(ctx, 18, 2);
+                nk_label_colored(ctx, "REPLIE_n", NK_TEXT_LEFT, c);
+                gui_in_replie_n = nk_combo(ctx, replie_status, LEN(replie_status), gui_in_replie_n, 30);
+                nk_label(ctx, "", NK_TEXT_LEFT);
+
+
+            }
+            nk_end(ctx);
+
+            if (nk_begin(ctx, &layout, "Temperature", nk_rect(880, 50, 200, 140), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
 
                 nk_layout_row_dynamic(ctx, 25, 1);
 
@@ -565,8 +776,38 @@ int main_gui() {
             }
             nk_end(ctx);
 
+            if (nk_begin(ctx, &layout, "FSM", nk_rect(880, 200, 200, 350), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
+
+                nk_layout_row_dynamic(ctx, 25, 2);
+
+                for (int i = 0; i < 9; i++) {
+                    nk_label(ctx, gui_last_fsm_states[i], NK_TEXT_LEFT);
+
+                    char buffer[50];
+
+                    int v = gui_last_fsm_states_timestamps[i];
+
+                    if (v > 0) {
+
+                        int hours = v / 10000;
+                        v -= hours * 10000;
+                        int minutes = v / 100;
+                        v -= minutes * 100;
+                        int seconds = v;
+
+                        sprintf(buffer, "%02d:%02d:%02d", hours, minutes, seconds);
+
+                    } else {
+                        buffer[0] = '\0';
+                    }
+                    nk_label(ctx, buffer, NK_TEXT_RIGHT);
+
+                }
+
+            }
+            nk_end(ctx);
+
         }
-        /* if (nk_window_is_closed(ctx, "Demo")) break; */
 
         {
             float bg[4];
diff --git a/src/stm32f/src/Core/fsm.c b/src/stm32f/src/Core/fsm.c
new file mode 100644
index 0000000..99413ba
--- /dev/null
+++ b/src/stm32f/src/Core/fsm.c
@@ -0,0 +1,8 @@
+#include "../../../common/src/Core/fsm.c"
+
+
+void fsm_state_switched(char * new_state) {
+    usart_debug_puts("FSM: ");
+    usart_debug_puts(new_state);
+    usart_debug_puts("\r\n");
+}
diff --git a/src/fsm/pio.c b/src/stm32f/src/GPIO/pio.c
index 2ff5447..d8780fe 100644
--- a/src/fsm/pio.c
+++ b/src/stm32f/src/GPIO/pio.c
@@ -22,8 +22,44 @@
  * SOFTWARE.
 */
 
-#include "pio.h"
-#include "common.h"
+#include "stm32f4xx_rcc.h"
+#include "stm32f4xx_gpio.h"
+
+/* See pio.txt for PIO allocation details */
+
+/* On GPIO C */
+#define GPIO_PIN_QRP_n    GPIO_Pin_1
+#define GPIO_PIN_TX       GPIO_Pin_2
+#define GPIO_PIN_1750_n   GPIO_Pin_4
+#define GPIO_PIN_MOD_OFF  GPIO_Pin_5
+#define GPIO_PIN_SQ_n     GPIO_Pin_6
+#define GPIO_PIN_U        GPIO_Pin_8
+#define GPIO_PIN_QRP_out  GPIO_Pin_9
+#define GPIO_PIN_D        GPIO_Pin_11
+#define GPIO_PIN_REPLIE_n GPIO_Pin_13
+#define GPIO_PIN_FAX_n    GPIO_Pin_14
+
+
+#define GPIOC_OUTPUT_PINS ( \
+                           GPIO_PIN_TX | \
+                           GPIO_PIN_MOD_OFF | \
+                           GPIO_PIN_QRP_out | \
+                           0)
+
+#undef GPIOC_OPENDRAIN_PINS
+#undef GPIOC_INPUT_PU_PINS
+
+#define GPIOC_INPUT_PINS ( \
+                          GPIO_PIN_QRP_n | \
+                          GPIO_PIN_1750_n | \
+                          GPIO_PIN_SQ_n | \
+                          GPIO_PIN_U | \
+                          GPIO_PIN_D | \
+                          GPIO_PIN_REPLIE_n | \
+                          0 )
+
+#include "GPIO/pio.h"
+#include "Core/common.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "queue.h"
@@ -145,3 +181,7 @@ void pio_set_mod_off(int mod_off)
         GPIO_ResetBits(GPIOC, GPIO_PIN_MOD_OFF);
     }
 }
+
+int pio_read_button() {
+    return GPIO_ReadInputDataBit(GPIOA,GPIO_Pin_0) == Bit_SET;
+}