Minor changes on the payload state machine

Now we always jump to PAYLOAD_SWITCHING_OFF state before going to PAYLOAD_NO_POWER, this way we can safely turn off the payload and warn the MCH about the failure

Minor changes on the payload state machine
Now we always jump to PAYLOAD_SWITCHING_OFF state before going to PAYLOAD_NO_POWER, this way we can safely turn off the payload and warn the MCH about the failure
07aa8c88 · Henrique Silva · 96315b6f · 07aa8c88 · 07aa8c88
Commit 07aa8c88 authored Feb 22, 2016 by Henrique Silva
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 12 deletions

payload.c modules/payload.c +3 -11

payload.h modules/payload.h +1 -1

No files found.
--- a/modules/payload.c
+++ b/modules/payload.c
@@ -174,7 +174,7 @@ void payload_init( void )
    }
 }

-void vTaskPayload(void *pvParmeters)
+void vTaskPayload(void *pvParameters)
 {
    payload_state state = PAYLOAD_NO_POWER;
    payload_state new_state = PAYLOAD_STATE_NO_CHANGE;
@@ -184,8 +184,6 @@ void vTaskPayload(void *pvParmeters)
    uint8_t FPGA_boot_DONE = 0;
    uint8_t QUIESCED_req = 0;

-    uint8_t evt_msg;
-
    uint8_t current_message;

    TickType_t xLastWakeTime;
@@ -263,22 +261,16 @@ void vTaskPayload(void *pvParmeters)
            break;

        case PAYLOAD_FPGA_BOOTING:
-            if (QUIESCED_req == 1) {
+            if (QUIESCED_req == 1 || P12V_good == 0) {
                new_state = PAYLOAD_SWITCHING_OFF;
            } else if (FPGA_boot_DONE) {
                new_state = PAYLOAD_FPGA_WORKING;
-            } else if (P12V_good == 0) {
-                QUIESCED_req = 0;
-                new_state = PAYLOAD_NO_POWER;
            }
            break;

        case PAYLOAD_FPGA_WORKING:
-            if (QUIESCED_req == 1) {
+            if (QUIESCED_req == 1 || P12V_good == 0) {
                new_state = PAYLOAD_SWITCHING_OFF;
-            } else if (P12V_good == 0) {
-                QUIESCED_req = 0;
-                new_state = PAYLOAD_NO_POWER;
            }
            break;


--- a/modules/payload.h
+++ b/modules/payload.h
@@ -57,7 +57,7 @@ typedef enum {
 #define PAYLOAD_BASE_DELAY 100

 void payload_send_message(uint8_t msg);
-void vTaskPayload(void *pvParmeters);
+void vTaskPayload(void *pvParameters);
 void payload_init(void);

 #ifdef MODULE_HPM