diff --git a/Doxyfile b/Doxyfile index e530180..d020816 100644 --- a/Doxyfile +++ b/Doxyfile @@ -42,19 +42,19 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "HELIA" +PROJECT_NAME = "Project HELIA" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v0.1.1 +PROJECT_NUMBER = v0.1.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "REXUS/BEXUS Experiment On Board Flight Software documentation" +PROJECT_BRIEF = "REXUS/BEXUS Experiment On-Board Flight Software Documentation" # With the PROJECT_LOGO tag one can specify a logo or an icon that is included # in the documentation. The maximum height of the logo should not exceed 55 @@ -1308,7 +1308,7 @@ HTML_FILE_EXTENSION = .html # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_HEADER = +HTML_HEADER = header.html # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard @@ -1348,7 +1348,7 @@ HTML_STYLESHEET = # documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = doxygen-awesome-css/doxygen-awesome.css # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note @@ -1358,7 +1358,7 @@ HTML_EXTRA_STYLESHEET = # files will be copied as-is; there are no commands or markers available. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_FILES = +HTML_EXTRA_FILES = doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js doxygen-awesome-css/doxygen-awesome-fragment-copy-button.js doxygen-awesome-css/doxygen-awesome-paragraph-link.js # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output # should be rendered with a dark or light theme. @@ -1371,7 +1371,7 @@ HTML_EXTRA_FILES = # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_COLORSTYLE = AUTO_LIGHT +HTML_COLORSTYLE = LIGHT # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to diff --git a/header.html b/header.html new file mode 100644 index 0000000..4f18651 --- /dev/null +++ b/header.html @@ -0,0 +1,82 @@ + + + + + + + + +$projectname: $title +$title + + + + + + + + +$treeview +$search +$mathjax +$darkmode + +$extrastylesheet + + + + + + + + +
+ + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
$projectname $projectnumber +
+
$projectbrief
+ 		+
$projectbrief
+ 		$searchbox
$searchbox
+
+ + \ No newline at end of file diff --git a/src/Master/HAL/esp32/pins.h b/src/Master/HAL/esp32/pins.h index c564931..4bf9b11 100644 --- a/src/Master/HAL/esp32/pins.h +++ b/src/Master/HAL/esp32/pins.h @@ -1,6 +1,6 @@ -/** @file pins.h +/** @file pins.h * @brief Master board wiring - * + * */ #ifndef HELIA_MASTER_PINS_H #define HELIA_MASTER_PINS_H diff --git a/src/Master/flight_phase.h b/src/Master/flight_phase.h index ff6b5e8..aa4303c 100644 --- a/src/Master/flight_phase.h +++ b/src/Master/flight_phase.h @@ -54,7 +54,7 @@ typedef enum { /** @brief Auto-transition DESCENDING -> LANDED after this long with no * motion noted via master_flight_note_motion() - * Currently this is set to 5 minutes... It might be a little bit longer lmao (5 mins for testing) + * Currently this is set to 5 minutes... It might be a little bit longer lmao (5 mins for testing) * */ #define MASTER_LANDING_NO_MOTION_MS (5u * 60u * 1000u) @@ -72,7 +72,6 @@ master_phase_t master_flight_phase(const master_flight_t *f); /** @brief Human-readable phase name for logging */ const char *master_phase_name(master_phase_t p); - master_flight_result_t master_flight_set_phase(master_flight_t *f, master_phase_t next, uint32_t now_ms); void master_flight_tick(master_flight_t *f, uint32_t now_ms); diff --git a/src/Master/setup.c b/src/Master/setup.c index 9db6ed6..f1f718c 100644 --- a/src/Master/setup.c +++ b/src/Master/setup.c @@ -79,7 +79,7 @@ static void comms_task(void *arg) { .sin_port = htons(CONFIG_TTC_UDP_DOWNLINK_PORT), .sin_addr.s_addr = inet_addr(CONFIG_TTC_GROUND_IP), }; - uint8_t dl_seq = 0; + uint8_t dl_seq = 0; while (1) { can_frame_t rx, tx[MASTER_COMMS_MAX_TX]; diff --git a/src/Master/ttc.c b/src/Master/ttc.c index 8ea8de5..cf59f03 100644 --- a/src/Master/ttc.c +++ b/src/Master/ttc.c @@ -22,10 +22,10 @@ size_t ttc_pack_downlink(uint8_t *pkt, size_t pkt_len, uint8_t seq, const can_fr return TTC_DL_HDR_LEN + TTC_DL_FRAME_LEN; } -/* Everything below owns a task and sockets, so it's ESP-IDF-only - * This is very close to what the old ttc_uplink_task() did, but now it's a separate file +/* Everything below owns a task and sockets, so it's ESP-IDF-only + * This is very close to what the old ttc_uplink_task() did, but now it's a separate file * I'm very close to putting this in the HAL layer (TODO?) -*/ + */ #ifdef ESP_PLATFORM #include diff --git a/src/Master/ttc.h b/src/Master/ttc.h index eed7278..2f1c733 100644 --- a/src/Master/ttc.h +++ b/src/Master/ttc.h @@ -22,7 +22,7 @@ extern "C" { #endif /** @brief Exact size of a packed downlink packet (4-byte header + 11-byte - * frame). + * frame). * Size the buffer passed to ttc_pack_downlink() with this */ #define TTC_DL_PACKET_LEN 15u