Update LED flash frequency

waterloo-rocketry · Nov 19, 2024 · 4b77fd3 · 4b77fd3
1 parent 33857c1
commit 4b77fd3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/board.h b/board.h
@@ -1,10 +1,6 @@
 #ifndef BOARD_H
 #define BOARD_H
 
-#define MAX_TC_TIME_DIFF_ms 200
-#define MAX_HEARTBEAT_TIME_DIFF_ms 2000
-#define MAX_BUS_DEAD_TIME_ms 2000
-
 #define RED_LED_ON() (LATB3 = 0)
 #define RED_LED_OFF() (LATB3 = 1)
 #define RED_LED_TOGGLE() (LATB3 ^= 1)

diff --git a/main.c b/main.c
@@ -10,6 +10,10 @@
 #include "spi.h"
 #include "thermocouple.h"
 
+#define MAX_TC_TIME_DIFF_ms 200 // 5 Hz
+#define MAX_HEARTBEAT_TIME_DIFF_ms 500 // 2 Hz
+#define MAX_BUS_DEAD_TIME_ms 5000 // 5 s
+
 #if (BOARD_UNIQUE_ID == BOARD_ID_THERMOCOUPLE_1)
 #define build_tc_temp_data_msg(timestamp, id, temp, msg)                                           \
     build_temp_data_msg(timestamp, id, temp, msg);

diff --git a/rocketlib b/rocketlib
diff --git a/spi.c b/spi.c
@@ -26,14 +26,13 @@ void spi1_init(void) {
     SPI1CON0bits.EN = 1; // enable SPI
 }
 
-/**/
 uint8_t spi1_exchange(uint8_t data) {
     INTCON0bits.GIE = 0;
     SPI1CON2bits.TXR = 0;
     SPI1CON2bits.RXR = 1;
     SPI1TCNT = 1;
     SPI1TXB = data; /*if we're sending data, send it. if we're recieving, this is 0 (unless you
-   // initialized bad), but makes sure we output a clock*/
+                       initialized bad), but makes sure we output a clock*/
     while (!PIR2bits.SPI1RXIF) {
     } // wait until receive buffer is not empty?? (basically until theres a clock)
     data = SPI1RXB;
@@ -45,7 +44,7 @@ void spi1_exchange_buffer(uint8_t *data, uint8_t data_len) {
     // set data length
     SPI1TCNTL = data_len;
     SPI1TCNTH = 0;
-    // uint8_t *block = data;
+
     while (data_len) {
         *data = spi1_exchange(*data); // sends pointer, so data gets shoved into array
         data++; // increment array
+2 −2		.clang-format
+1 −1		.github/workflows/clang-format-test.yml
+15 −0		.github/workflows/rocketlib-unit-test.yml
+26 −2		common/low_pass_filter.c
+3 −0		doc/index.rst
+109 −0		doc/low_pass_filter.rst
+46 −0		doc/millis.rst
+22 −2		include/common.h
+20 −2		include/low_pass_filter.h
+1 −1		unit_tests/Makefile
+65 −5		unit_tests/low_pass_filter_test.c
+2 −2		unit_tests/unit_test.c
+0 −11		unit_tests/unit_test.h