diff --git a/scripts/event_header_generator/event_generator.py b/scripts/event_header_generator/event_generator.py
index ad54de4cb95cebcf00f2036079e5608b521f9aae..29f350aae72566b225434a5acf88f7f74370b71e 100644
--- a/scripts/event_header_generator/event_generator.py
+++ b/scripts/event_header_generator/event_generator.py
@@ -134,6 +134,9 @@ if has_duplicates(topics):
print("Duplicate topics found! Terminating.")
exit()
+events.sort()
+topics.sort()
+
print("{} events loaded.".format(len(events)))
print("{} topics loaded.".format(len(topics)))
diff --git a/src/boards/DeathStack/EventFunctions.cpp b/src/boards/DeathStack/EventFunctions.cpp
index ac5fb9ec8fc9aaa98becc6602891fe1dc279dcac..32ea9171eeafd12ed90e298b71887386af15a536 100644
--- a/src/boards/DeathStack/EventFunctions.cpp
+++ b/src/boards/DeathStack/EventFunctions.cpp
@@ -27,7 +27,7 @@
*/
// Generated from: https://docs.google.com/spreadsheets/d/1msICDqJtSseSP_JAoAPoKIzpKlI6bI2n8lwws1X2hz4
-// Autogen date: 2019-05-20 16:15:05.731880
+// Autogen date: 2019-05-20 17:09:34.002542
#include "Events.h"
@@ -45,39 +45,41 @@ string getEventString(uint8_t event)
{ EV_ADA_APOGEE_DETECTED, "EV_ADA_APOGEE_DETECTED" },
{ EV_ADA_DPL_ALT_DETECTED, "EV_ADA_DPL_ALT_DETECTED" },
{ EV_ADA_READY, "EV_ADA_READY" },
+ { EV_APOGEE, "EV_APOGEE" },
+ { EV_BUTTON_DOWN, "EV_BUTTON_DOWN" },
+ { EV_BUTTON_LONG_PRESS, "EV_BUTTON_LONG_PRESS" },
+ { EV_BUTTON_SHORT_PRESS, "EV_BUTTON_SHORT_PRESS" },
+ { EV_BUTTON_UP, "EV_BUTTON_UP" },
+ { EV_BUTTON_VERY_LONG_PRESS, "EV_BUTTON_VERY_LONG_PRESS" },
{ EV_CALIBRATE_ADA, "EV_CALIBRATE_ADA" },
{ EV_CUT_ALL, "EV_CUT_ALL" },
{ EV_CUT_DROGUE, "EV_CUT_DROGUE" },
{ EV_CUT_MAIN, "EV_CUT_MAIN" },
- { EV_MOT_MIN_OPEN_TIME, "EV_MOT_MIN_OPEN_TIME" },
- { EV_MOT_OPEN_LIMIT, "EV_MOT_OPEN_LIMIT" },
- { EV_MOT_CLOSE_LIMIT, "EV_MOT_CLOSE_LIMIT" },
- { EV_NC_CLOSE, "EV_NC_CLOSE" },
- { EV_NC_OPEN, "EV_NC_OPEN" },
- { EV_NC_STOP, "EV_NC_STOP" },
- { EV_APOGEE, "EV_APOGEE" },
{ EV_DPL_ALTITUDE, "EV_DPL_ALTITUDE" },
+ { EV_FLIGHTSTATS_TIMEOUT, "EV_FLIGHTSTATS_TIMEOUT" },
{ EV_INIT_ERROR, "EV_INIT_ERROR" },
{ EV_INIT_OK, "EV_INIT_OK" },
{ EV_LANDED, "EV_LANDED" },
{ EV_LIFTOFF, "EV_LIFTOFF" },
+ { EV_MOT_CLOSE_LIMIT, "EV_MOT_CLOSE_LIMIT" },
+ { EV_MOT_MIN_OPEN_TIME, "EV_MOT_MIN_OPEN_TIME" },
+ { EV_MOT_OPEN_LIMIT, "EV_MOT_OPEN_LIMIT" },
+ { EV_NC_CLOSE, "EV_NC_CLOSE" },
{ EV_NC_DETACHED, "EV_NC_DETACHED" },
- { EV_TEST_MODE, "EV_TEST_MODE" },
- { EV_FLIGHTSTATS_TIMEOUT, "EV_FLIGHTSTATS_TIMEOUT" },
- { EV_BUTTON_DOWN, "EV_BUTTON_DOWN" },
- { EV_BUTTON_UP, "EV_BUTTON_UP" },
- { EV_BUTTON_SHORT_PRESS, "EV_BUTTON_SHORT_PRESS" },
- { EV_BUTTON_LONG_PRESS, "EV_BUTTON_LONG_PRESS" },
- { EV_BUTTON_VERY_LONG_PRESS, "EV_BUTTON_VERY_LONG_PRESS" },
+ { EV_NC_OPEN, "EV_NC_OPEN" },
+ { EV_NC_STOP, "EV_NC_STOP" },
+ { EV_SEND_HR_TM, "EV_SEND_HR_TM" },
+ { EV_SEND_LR_TM, "EV_SEND_LR_TM" },
+ { EV_SEND_TEST_TM, "EV_SEND_TEST_TM" },
+ { EV_START_ROGALLO_CONTROL, "EV_START_ROGALLO_CONTROL" },
{ EV_TC_ABORT_ROGALLO, "EV_TC_ABORT_ROGALLO" },
- { EV_TC_START_ROGALLO_CONTROL, "EV_TC_START_ROGALLO_CONTROL" },
{ EV_TC_ARM, "EV_TC_ARM" },
- { EV_TC_SET_DPL_ALTITUDE, "EV_TC_SET_DPL_ALTITUDE" },
{ EV_TC_BOARD_RESET, "EV_TC_BOARD_RESET" },
- { EV_TC_CUT_MAIN, "EV_TC_CUT_MAIN" },
+ { EV_TC_CALIBRATE_ADA, "EV_TC_CALIBRATE_ADA" },
+ { EV_TC_CLOSE_LOG, "EV_TC_CLOSE_LOG" },
{ EV_TC_CUT_ALL, "EV_TC_CUT_ALL" },
{ EV_TC_CUT_FIRST_DROGUE, "EV_TC_CUT_FIRST_DROGUE" },
- { EV_TC_CLOSE_LOG, "EV_TC_CLOSE_LOG" },
+ { EV_TC_CUT_MAIN, "EV_TC_CUT_MAIN" },
{ EV_TC_DISARM, "EV_TC_DISARM" },
{ EV_TC_END_MISSION, "EV_TC_END_MISSION" },
{ EV_TC_FORCE_INIT, "EV_TC_FORCE_INIT" },
@@ -86,13 +88,15 @@ string getEventString(uint8_t event)
{ EV_TC_NC_CLOSE, "EV_TC_NC_CLOSE" },
{ EV_TC_NC_OPEN, "EV_TC_NC_OPEN" },
{ EV_TC_NC_STOP, "EV_TC_NC_STOP" },
- { EV_TC_START_SENSOR_LOGGING, "EV_TC_START_SENSOR_LOGGING" },
- { EV_TC_STOP_SENSOR_LOGGING, "EV_TC_STOP_SENSOR_LOGGING" },
+ { EV_TC_SET_DPL_ALTITUDE, "EV_TC_SET_DPL_ALTITUDE" },
{ EV_TC_SET_REFERENCE_ALTITUDE, "EV_TC_SET_REFERENCE_ALTITUDE" },
{ EV_TC_SET_REFERENCE_TEMP, "EV_TC_SET_REFERENCE_TEMP" },
- { EV_TC_CALIBRATE_ADA, "EV_TC_CALIBRATE_ADA" },
+ { EV_TC_START_ROGALLO_CONTROL, "EV_TC_START_ROGALLO_CONTROL" },
+ { EV_TC_START_SENSOR_LOGGING, "EV_TC_START_SENSOR_LOGGING" },
+ { EV_TC_STOP_SENSOR_LOGGING, "EV_TC_STOP_SENSOR_LOGGING" },
{ EV_TC_TEST_MODE, "EV_TC_TEST_MODE" },
{ EV_TC_TEST_SERVO, "EV_TC_TEST_SERVO" },
+ { EV_TEST_MODE, "EV_TEST_MODE" },
{ EV_TIMEOUT_APOGEE, "EV_TIMEOUT_APOGEE" },
{ EV_TIMEOUT_ARM, "EV_TIMEOUT_ARM" },
{ EV_TIMEOUT_CUTTING, "EV_TIMEOUT_CUTTING" },
@@ -100,11 +104,7 @@ string getEventString(uint8_t event)
{ EV_TIMEOUT_MOT_CLOSE, "EV_TIMEOUT_MOT_CLOSE" },
{ EV_TIMEOUT_MOT_OPEN, "EV_TIMEOUT_MOT_OPEN" },
{ EV_TIMEOUT_SHADOW_MODE, "EV_TIMEOUT_SHADOW_MODE" },
- { EV_UMBILICAL_DETACHED, "EV_UMBILICAL_DETACHED" },
- { EV_SEND_HR_TM, "EV_SEND_HR_TM" },
- { EV_SEND_LR_TM, "EV_SEND_LR_TM" },
- { EV_SEND_TEST_TM, "EV_SEND_TEST_TM" },
- { EV_START_ROGALLO_CONTROL, "EV_START_ROGALLO_CONTROL" }
+ { EV_UMBILICAL_DETACHED, "EV_UMBILICAL_DETACHED" }
};
auto it = event_string_map.find(event);
return it == event_string_map.end() ? "EV_UNKNOWN" : it->second;
@@ -114,14 +114,14 @@ string getTopicString(uint8_t topic)
{
static const map<uint8_t, string> topic_string_map{
{ TOPIC_ADA, "TOPIC_ADA" },
+ { TOPIC_CAN, "TOPIC_CAN" },
{ TOPIC_DEPLOYMENT, "TOPIC_DEPLOYMENT" },
{ TOPIC_FLIGHT_EVENTS, "TOPIC_FLIGHT_EVENTS" },
{ TOPIC_FMM, "TOPIC_FMM" },
{ TOPIC_IGNITION, "TOPIC_IGNITION" },
+ { TOPIC_STATS, "TOPIC_STATS" },
{ TOPIC_TC, "TOPIC_TC" },
- { TOPIC_TMTC, "TOPIC_TMTC" },
- { TOPIC_CAN, "TOPIC_CAN" },
- { TOPIC_STATS, "TOPIC_STATS" }
+ { TOPIC_TMTC, "TOPIC_TMTC" }
};
auto it = topic_string_map.find(topic);
return it == topic_string_map.end() ? "TOPIC_UNKNOWN" : it->second;
diff --git a/src/boards/DeathStack/Events.h b/src/boards/DeathStack/Events.h
index f0ec57b80f4f393056e5c56d268335cb03540bb5..19420bb457d64abb9efd0e9a5472e4d4b91619cc 100644
--- a/src/boards/DeathStack/Events.h
+++ b/src/boards/DeathStack/Events.h
@@ -27,7 +27,7 @@
*/
// Generated from: https://docs.google.com/spreadsheets/d/1msICDqJtSseSP_JAoAPoKIzpKlI6bI2n8lwws1X2hz4
-// Autogen date: 2019-05-20 16:15:05.731880
+// Autogen date: 2019-05-20 17:09:34.002542
#ifndef SRC_SHARED_BOARDS_HOMEONE_EVENTS_H
#define SRC_SHARED_BOARDS_HOMEONE_EVENTS_H
@@ -54,39 +54,41 @@ enum Events : uint8_t
EV_ADA_APOGEE_DETECTED = EV_FIRST_SIGNAL,
EV_ADA_DPL_ALT_DETECTED,
EV_ADA_READY,
+ EV_APOGEE,
+ EV_BUTTON_DOWN,
+ EV_BUTTON_LONG_PRESS,
+ EV_BUTTON_SHORT_PRESS,
+ EV_BUTTON_UP,
+ EV_BUTTON_VERY_LONG_PRESS,
EV_CALIBRATE_ADA,
EV_CUT_ALL,
EV_CUT_DROGUE,
EV_CUT_MAIN,
- EV_MOT_MIN_OPEN_TIME,
- EV_MOT_OPEN_LIMIT,
- EV_MOT_CLOSE_LIMIT,
- EV_NC_CLOSE,
- EV_NC_OPEN,
- EV_NC_STOP,
- EV_APOGEE,
EV_DPL_ALTITUDE,
+ EV_FLIGHTSTATS_TIMEOUT,
EV_INIT_ERROR,
EV_INIT_OK,
EV_LANDED,
EV_LIFTOFF,
+ EV_MOT_CLOSE_LIMIT,
+ EV_MOT_MIN_OPEN_TIME,
+ EV_MOT_OPEN_LIMIT,
+ EV_NC_CLOSE,
EV_NC_DETACHED,
- EV_TEST_MODE,
- EV_FLIGHTSTATS_TIMEOUT,
- EV_BUTTON_DOWN,
- EV_BUTTON_UP,
- EV_BUTTON_SHORT_PRESS,
- EV_BUTTON_LONG_PRESS,
- EV_BUTTON_VERY_LONG_PRESS,
+ EV_NC_OPEN,
+ EV_NC_STOP,
+ EV_SEND_HR_TM,
+ EV_SEND_LR_TM,
+ EV_SEND_TEST_TM,
+ EV_START_ROGALLO_CONTROL,
EV_TC_ABORT_ROGALLO,
- EV_TC_START_ROGALLO_CONTROL,
EV_TC_ARM,
- EV_TC_SET_DPL_ALTITUDE,
EV_TC_BOARD_RESET,
- EV_TC_CUT_MAIN,
+ EV_TC_CALIBRATE_ADA,
+ EV_TC_CLOSE_LOG,
EV_TC_CUT_ALL,
EV_TC_CUT_FIRST_DROGUE,
- EV_TC_CLOSE_LOG,
+ EV_TC_CUT_MAIN,
EV_TC_DISARM,
EV_TC_END_MISSION,
EV_TC_FORCE_INIT,
@@ -95,13 +97,15 @@ enum Events : uint8_t
EV_TC_NC_CLOSE,
EV_TC_NC_OPEN,
EV_TC_NC_STOP,
- EV_TC_START_SENSOR_LOGGING,
- EV_TC_STOP_SENSOR_LOGGING,
+ EV_TC_SET_DPL_ALTITUDE,
EV_TC_SET_REFERENCE_ALTITUDE,
EV_TC_SET_REFERENCE_TEMP,
- EV_TC_CALIBRATE_ADA,
+ EV_TC_START_ROGALLO_CONTROL,
+ EV_TC_START_SENSOR_LOGGING,
+ EV_TC_STOP_SENSOR_LOGGING,
EV_TC_TEST_MODE,
EV_TC_TEST_SERVO,
+ EV_TEST_MODE,
EV_TIMEOUT_APOGEE,
EV_TIMEOUT_ARM,
EV_TIMEOUT_CUTTING,
@@ -109,14 +113,10 @@ enum Events : uint8_t
EV_TIMEOUT_MOT_CLOSE,
EV_TIMEOUT_MOT_OPEN,
EV_TIMEOUT_SHADOW_MODE,
- EV_UMBILICAL_DETACHED,
- EV_SEND_HR_TM,
- EV_SEND_LR_TM,
- EV_SEND_TEST_TM,
- EV_START_ROGALLO_CONTROL
+ EV_UMBILICAL_DETACHED
};
-const std::vector<uint8_t> EVENT_LIST {EV_ADA_APOGEE_DETECTED, EV_ADA_DPL_ALT_DETECTED, EV_ADA_READY, EV_CALIBRATE_ADA, EV_CUT_ALL, EV_CUT_DROGUE, EV_CUT_MAIN, EV_MOT_MIN_OPEN_TIME, EV_MOT_OPEN_LIMIT, EV_MOT_CLOSE_LIMIT, EV_NC_CLOSE, EV_NC_OPEN, EV_NC_STOP, EV_APOGEE, EV_DPL_ALTITUDE, EV_INIT_ERROR, EV_INIT_OK, EV_LANDED, EV_LIFTOFF, EV_NC_DETACHED, EV_TEST_MODE, EV_FLIGHTSTATS_TIMEOUT, EV_BUTTON_DOWN, EV_BUTTON_UP, EV_BUTTON_SHORT_PRESS, EV_BUTTON_LONG_PRESS, EV_BUTTON_VERY_LONG_PRESS, EV_TC_ABORT_ROGALLO, EV_TC_START_ROGALLO_CONTROL, EV_TC_ARM, EV_TC_SET_DPL_ALTITUDE, EV_TC_BOARD_RESET, EV_TC_CUT_MAIN, EV_TC_CUT_ALL, EV_TC_CUT_FIRST_DROGUE, EV_TC_CLOSE_LOG, EV_TC_DISARM, EV_TC_END_MISSION, EV_TC_FORCE_INIT, EV_TC_LAUNCH, EV_TC_MANUAL_MODE, EV_TC_NC_CLOSE, EV_TC_NC_OPEN, EV_TC_NC_STOP, EV_TC_START_SENSOR_LOGGING, EV_TC_STOP_SENSOR_LOGGING, EV_TC_SET_REFERENCE_ALTITUDE, EV_TC_SET_REFERENCE_TEMP, EV_TC_CALIBRATE_ADA, EV_TC_TEST_MODE, EV_TC_TEST_SERVO, EV_TIMEOUT_APOGEE, EV_TIMEOUT_ARM, EV_TIMEOUT_CUTTING, EV_TIMEOUT_END_MISSION, EV_TIMEOUT_MOT_CLOSE, EV_TIMEOUT_MOT_OPEN, EV_TIMEOUT_SHADOW_MODE, EV_UMBILICAL_DETACHED, EV_SEND_HR_TM, EV_SEND_LR_TM, EV_SEND_TEST_TM, EV_START_ROGALLO_CONTROL};
+const std::vector<uint8_t> EVENT_LIST {EV_ADA_APOGEE_DETECTED, EV_ADA_DPL_ALT_DETECTED, EV_ADA_READY, EV_APOGEE, EV_BUTTON_DOWN, EV_BUTTON_LONG_PRESS, EV_BUTTON_SHORT_PRESS, EV_BUTTON_UP, EV_BUTTON_VERY_LONG_PRESS, EV_CALIBRATE_ADA, EV_CUT_ALL, EV_CUT_DROGUE, EV_CUT_MAIN, EV_DPL_ALTITUDE, EV_FLIGHTSTATS_TIMEOUT, EV_INIT_ERROR, EV_INIT_OK, EV_LANDED, EV_LIFTOFF, EV_MOT_CLOSE_LIMIT, EV_MOT_MIN_OPEN_TIME, EV_MOT_OPEN_LIMIT, EV_NC_CLOSE, EV_NC_DETACHED, EV_NC_OPEN, EV_NC_STOP, EV_SEND_HR_TM, EV_SEND_LR_TM, EV_SEND_TEST_TM, EV_START_ROGALLO_CONTROL, EV_TC_ABORT_ROGALLO, EV_TC_ARM, EV_TC_BOARD_RESET, EV_TC_CALIBRATE_ADA, EV_TC_CLOSE_LOG, EV_TC_CUT_ALL, EV_TC_CUT_FIRST_DROGUE, EV_TC_CUT_MAIN, EV_TC_DISARM, EV_TC_END_MISSION, EV_TC_FORCE_INIT, EV_TC_LAUNCH, EV_TC_MANUAL_MODE, EV_TC_NC_CLOSE, EV_TC_NC_OPEN, EV_TC_NC_STOP, EV_TC_SET_DPL_ALTITUDE, EV_TC_SET_REFERENCE_ALTITUDE, EV_TC_SET_REFERENCE_TEMP, EV_TC_START_ROGALLO_CONTROL, EV_TC_START_SENSOR_LOGGING, EV_TC_STOP_SENSOR_LOGGING, EV_TC_TEST_MODE, EV_TC_TEST_SERVO, EV_TEST_MODE, EV_TIMEOUT_APOGEE, EV_TIMEOUT_ARM, EV_TIMEOUT_CUTTING, EV_TIMEOUT_END_MISSION, EV_TIMEOUT_MOT_CLOSE, EV_TIMEOUT_MOT_OPEN, EV_TIMEOUT_SHADOW_MODE, EV_UMBILICAL_DETACHED};
/**
* @brief Returns the name of the provided event
diff --git a/src/boards/DeathStack/Topics.h b/src/boards/DeathStack/Topics.h
index ce6090149aac05d547d58c60833d83b76d3545f9..b5dcf340c932f09e63a23a21e0b476618e0859b9 100644
--- a/src/boards/DeathStack/Topics.h
+++ b/src/boards/DeathStack/Topics.h
@@ -27,7 +27,7 @@
*/
// Generated from: https://docs.google.com/spreadsheets/d/1msICDqJtSseSP_JAoAPoKIzpKlI6bI2n8lwws1X2hz4
-// Autogen date: 2019-05-20 16:15:05.731880
+// Autogen date: 2019-05-20 17:09:34.002542
#ifndef SRC_SHARED_BOARDS_HOMEONE_TOPICS_H
#define SRC_SHARED_BOARDS_HOMEONE_TOPICS_H
@@ -46,17 +46,17 @@ namespace DeathStackBoard
enum Topics : uint8_t
{
TOPIC_ADA,
+ TOPIC_CAN,
TOPIC_DEPLOYMENT,
TOPIC_FLIGHT_EVENTS,
TOPIC_FMM,
TOPIC_IGNITION,
+ TOPIC_STATS,
TOPIC_TC,
- TOPIC_TMTC,
- TOPIC_CAN,
- TOPIC_STATS
+ TOPIC_TMTC
};
-const std::vector<uint8_t> TOPIC_LIST {TOPIC_ADA, TOPIC_DEPLOYMENT, TOPIC_FLIGHT_EVENTS, TOPIC_FMM, TOPIC_IGNITION, TOPIC_TC, TOPIC_TMTC, TOPIC_CAN, TOPIC_STATS};
+const std::vector<uint8_t> TOPIC_LIST {TOPIC_ADA, TOPIC_CAN, TOPIC_DEPLOYMENT, TOPIC_FLIGHT_EVENTS, TOPIC_FMM, TOPIC_IGNITION, TOPIC_STATS, TOPIC_TC, TOPIC_TMTC};
/**
* @brief Returns the name of the provided event