Skip to content

Feature/es/liquids base fw #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ETSells wants to merge 5 commits into from
Closed

Feature/es/liquids base fw #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b38e6ca
remove test and unity
ETSells Feb 7, 2026
3f15099
Add test submodule
ETSells Feb 7, 2026
2148f90
Terminal & hotfire build w/ modern mod
ETSells Feb 7, 2026
ef9f99f
chore: Pull up submodules
ETSells Feb 7, 2026
859bc50
Addressing: Nick review
ETSells Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "Unity"]
path = Unity
url = https://github.com/ThrowTheSwitch/Unity.git
[submodule "mod"]
path = mod
url = git@github.com:SunDevilRocketry/mod.git
url = https://github.com/SunDevilRocketry/mod.git
[submodule "lib"]
path = lib
url = git@github.com:SunDevilRocketry/lib.git
url = https://github.com/SunDevilRocketry/lib.git
[submodule "test"]
path = test
url = https://github.com/SunDevilRocketry/test.git
1 change: 0 additions & 1 deletion Unity
Open in desktop
Submodule Unity deleted from 385292
2 changes: 1 addition & 1 deletion app/hotfire/rev4/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "main.h"
#include "init.h"
#include "sdr_pin_defines_L0002.h"
#include "sdr_error.h"
#include "error_sdr.h"
#include "valve_control.h"

/* Low-level modules */
Expand Down
7 changes: 6 additions & 1 deletion app/hotfire/rev5/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ protocol.c \
data_logger.c \
terminal.c \
$(INIT_DIR)/init.c \
$(UTIL_DIR)/sdr_error.c \
$(MOD_DIR)/commands/commands.c \
$(MOD_DIR)/common/common.c \
$(MOD_DIR)/error_sdr/error_sdr.c \
$(MOD_DIR)/ignition/ignition.c \
$(MOD_DIR)/led/led.c \
$(MOD_DIR)/math_sdr/math_sdr.c \
$(MOD_DIR)/power/power.c \
$(MOD_DIR)/flash/flash.c \
$(MOD_DIR)/loadcell/loadcell.c \
Expand Down Expand Up @@ -175,10 +177,13 @@ C_INCLUDES = \
-I$(LIB_DIR)/Drivers/CMSIS/Device/ST/STM32H7xx/Include \
-I$(LIB_DIR)/Drivers/CMSIS/Include \
-I$(MOD_DIR)/commands \
-I$(MOD_DIR)/common \
-I$(MOD_DIR)/error_sdr \
-I$(MOD_DIR)/ignition \
-I$(MOD_DIR)/flash \
-I$(MOD_DIR)/led \
-I$(MOD_DIR)/loadcell \
-I$(MOD_DIR)/math_sdr \
-I$(MOD_DIR)/power \
-I$(MOD_DIR)/pressure \
-I$(MOD_DIR)/rs485 \
Expand Down
2 changes: 1 addition & 1 deletion app/hotfire/rev5/disarm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "valve_control.h"
#include "pressure.h"
#include "sensor.h"
#include "sdr_error.h"
#include "error_sdr.h"
#include "led.h"

/*------------------------------------------------------------------------------
Expand Down
18 changes: 12 additions & 6 deletions app/hotfire/rev5/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "main.h"
#include "init.h"
#include "sdr_pin_defines_L0002.h"
#include "sdr_error.h"
#include "error_sdr.h"
#include "valve_control.h"
#include "terminal.h"

Expand Down Expand Up @@ -67,6 +67,7 @@ volatile bool lox_purge_flag = false; /* LOX tank purge */
volatile bool kbottle_closed_flag = false; /* KBottle is closed */
volatile bool tanks_safe_flag = false; /* Tanks are safe */
volatile bool telreq_wait_flag = false; /* Controller busy */
volatile uint32_t tdelta, previous_time; /* Sensor timing */

/* Sensor data */
SENSOR_DATA_PING_PONG sensor_ping_pong_buffer = {0};
Expand Down Expand Up @@ -156,6 +157,10 @@ flash_status = FLASH_OK;
thermo_status = THERMO_OK;
terminal_status = TERMINAL_OK;

/* Sensor */
tdelta = 0;
previous_time = 0;


/*------------------------------------------------------------------------------
External Hardware Initializations
Expand Down Expand Up @@ -216,20 +221,20 @@ if ( vc_connect() != VC_OK )
Error_Handler( ERROR_VC_OFFLINE_ERROR );
}

/* Enable the main valve stepper motor drivers */
// /* Enable the main valve stepper motor drivers */
if ( vc_enable_main_valves() != VC_OK )
{
Error_Handler( ERROR_VC_INIT_ERROR );
}

/* Calibrate the main propellant valves */
// /* Calibrate the main propellant valves */
if ( vc_calibrate_main_valves() != VC_OK )
{
Error_Handler( ERROR_VC_INIT_ERROR );
}
HAL_Delay( VALVE_CALIBRATION_TIME ); /* Wait for calibration to finish */
HAL_Delay( VALVE_CALIBRATION_TIME ); /* Wait for calibration to finish */

/* Reset solenoid positions */
// /* Reset solenoid positions */
if ( vc_reset_solenoids() != VC_OK )
{
Error_Handler( ERROR_VC_INIT_ERROR );
Expand Down Expand Up @@ -336,4 +341,5 @@ while (1)

/*******************************************************************************
* END OF FILE *
*******************************************************************************/

*******************************************************************************/
2 changes: 1 addition & 1 deletion app/hotfire/rev5/terminal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "main.h"
#include "sdr_pin_defines_L0002.h"
#include "init.h"
#include "sdr_error.h"
#include "error_sdr.h"
#include "terminal.h"

/* Low-level modules */
Expand Down
2 changes: 1 addition & 1 deletion app/ping/rev5/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern "C" {
Standard Includes
------------------------------------------------------------------------------*/
#include "stm32h7xx_hal.h"
#include "sdr_error.h"
#include "error_sdr.h"


/*------------------------------------------------------------------------------
Expand Down
7 changes: 6 additions & 1 deletion app/terminal/rev5/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ UTIL_DIR = $(LIB_DIR)/util
C_SOURCES = \
main.c \
$(INIT_DIR)/init.c \
$(UTIL_DIR)/sdr_error.c \
$(MOD_DIR)/common/common.c \
$(MOD_DIR)/error_sdr/error_sdr.c \
$(MOD_DIR)/commands/commands.c \
$(MOD_DIR)/ignition/ignition.c \
$(MOD_DIR)/led/led.c \
$(MOD_DIR)/power/power.c \
$(MOD_DIR)/flash/flash.c \
$(MOD_DIR)/loadcell/loadcell.c \
$(MOD_DIR)/math_sdr/math_sdr.c \
$(MOD_DIR)/pressure/pressure.c \
$(MOD_DIR)/rs485/rs485.c \
$(MOD_DIR)/sensor/sensor.c \
Expand Down Expand Up @@ -160,10 +162,13 @@ C_INCLUDES = \
-I$(LIB_DIR)/Drivers/CMSIS/Device/ST/STM32H7xx/Include \
-I$(LIB_DIR)/Drivers/CMSIS/Include \
-I$(MOD_DIR)/commands \
-I$(MOD_DIR)/common \
-I$(MOD_DIR)/error_sdr \
-I$(MOD_DIR)/ignition \
-I$(MOD_DIR)/flash \
-I$(MOD_DIR)/led \
-I$(MOD_DIR)/loadcell \
-I$(MOD_DIR)/math_sdr \
-I$(MOD_DIR)/power \
-I$(MOD_DIR)/pressure \
-I$(MOD_DIR)/rs485 \
Expand Down
8 changes: 7 additions & 1 deletion app/terminal/rev5/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "main.h"
#include "sdr_pin_defines_L0002.h"
#include "init.h"
#include "sdr_error.h"
#include "error_sdr.h"

/* Low-level modules */
#include "commands.h"
Expand Down Expand Up @@ -54,6 +54,9 @@ UART_HandleTypeDef huart1; /* USB UART handler struct */
UART_HandleTypeDef huart2; /* Valve controller UART handle */
UART_HandleTypeDef huart4; /* Wireless interface UART handle */

/* Sensor */
volatile uint32_t tdelta, previous_time;


/*------------------------------------------------------------------------------
Application entry point
Expand Down Expand Up @@ -89,6 +92,9 @@ THERMO_STATUS thermo_status; /* Thermocouple status code */
USB_STATUS usb_status; /* Status of USB operations */
VALVE_STATUS valve_status; /* Valve API return codes */

/* Sensor */
tdelta, previous_time = 0;


/*------------------------------------------------------------------------------
MCU Initialization
Expand Down
2 changes: 1 addition & 1 deletion init/rev5/config/Src/stm32h7xx_hal_msp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Standard Includes
------------------------------------------------------------------------------*/
#include "main.h"
#include "sdr_error.h"
#include "error_sdr.h"


/*------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion init/rev5/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "sdr_pin_defines_L0002.h"
#include "main.h"
#include "init.h"
#include "sdr_error.h"
#include "error_sdr.h"


/*------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion lib
Open in desktop
Submodule lib updated 6028 files
2 changes: 1 addition & 1 deletion mod
Open in desktop
Submodule mod updated 52 files
+ − .DS_Store
+72 −0 .github/workflows/mod-runner.yml
+5 −0 .vscode/settings.json
+11 −0 LICENSE
+1 −0 NOTICE
+2 −1 README.md
+165 −0 baro/baro.c
+18 −2 baro/baro.h
+45 −0 buzzer/buzzer.c
+19 −1 buzzer/buzzer.h
+93 −0 camera/camera.c
+80 −0 camera/camera.h
+97 −2 commands/commands.c
+55 −1 commands/commands.h
+71 −0 common/common.c
+124 −0 common/common.h
+318 −0 error_sdr/error_sdr.c
+186 −0 error_sdr/error_sdr.h
+12 −1 flash/flash.c
+15 −2 flash/flash.h
+460 −0 gps/gps.c
+156 −0 gps/gps.h
+46 −0 ignition/ignition.c
+18 −1 ignition/ignition.h
+422 −11 imu/imu.c
+117 −11 imu/imu.h
+11 −0 led/led.c
+11 −0 led/led.h
+11 −0 loadcell/loadcell.c
+11 −0 loadcell/loadcell.h
+67 −0 math_sdr/math_sdr.c
+91 −0 math_sdr/math_sdr.h
+11 −0 power/power.c
+11 −0 power/power.h
+11 −0 pressure/pressure.c
+11 −0 pressure/pressure.h
+11 −0 rs485/rs485.c
+11 −0 rs485/rs485.h
+807 −131 sensor/sensor.c
+87 −17 sensor/sensor.h
+290 −0 servo/servo.c
+97 −0 servo/servo.h
+11 −0 solenoid/solenoid.c
+11 −0 solenoid/solenoid.h
+11 −0 temp/temp.c
+11 −0 temp/temp.h
+12 −1 usb/usb.c
+11 −0 usb/usb.h
+11 −0 valve/valve.c
+11 −0 valve/valve.h
+11 −0 wireless/wireless.c
+11 −0 wireless/wireless.h
1 change: 1 addition & 0 deletions test
Open in desktop
Submodule test added at abd31c
65 changes: 0 additions & 65 deletions test/mock/lib/Drivers/STM32H7xx_HAL_Driver/Src/mock_stm32h7xx_hal_uart.c
View file
Open in desktop

This file was deleted.

Loading