Skip to content
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

Jump to bottom

Finalize VCU Infrastructure #39

Merged
merged 58 commits into from
Mar 3, 2023
Merged

Finalize VCU Infrastructure #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
4c7d69f
project files
rafguevara14 Feb 13, 2023
2f6a071
add logging and error checking to main
rafguevara14 Feb 13, 2023
bc1c698
add common event enums
rafguevara14 Feb 13, 2023
12f4fb8
cleanup task and driver files
rafguevara14 Feb 13, 2023
5d8c316
add timer error checking; rename parameters
rafguevara14 Feb 13, 2023
4922f1d
asynchronously get runtime stats
rafguevara14 Feb 13, 2023
5c30cb3
add commands to trigger car events
rafguevara14 Feb 13, 2023
495996d
return task handles
rafguevara14 Feb 13, 2023
9766f16
unwrap task wrappers; move brakelight to async process
rafguevara14 Feb 13, 2023
3279c3b
add agent watchdog; remove state variables
rafguevara14 Feb 13, 2023
948f1c5
make timer faults directly call state machine
rafguevara14 Feb 13, 2023
b6a9534
add colors!
rafguevara14 Feb 13, 2023
f570b51
add logger task
rafguevara14 Feb 13, 2023
9e71838
add generic event handler
rafguevara14 Feb 13, 2023
74cdf74
add base state machine
rafguevara14 Feb 13, 2023
861af93
increase stack sizes significantly
rafguevara14 Feb 13, 2023
6c3805a
various cleanup
rafguevara14 Feb 13, 2023
41d1be2
up timer priority to 2
rafguevara14 Feb 13, 2023
56ec465
update project files
rafguevara14 Feb 13, 2023
6e78f41
add all and any helper functions
rafguevara14 Feb 13, 2023
73c8ba3
consolidate data types and values
rafguevara14 Feb 13, 2023
d96cfb6
remove task template
rafguevara14 Feb 14, 2023
531d6e9
add thread documentation
rafguevara14 Feb 14, 2023
94d57d3
put fault timers in a struct
rafguevara14 Feb 14, 2023
5ca053d
update png
rafguevara14 Feb 14, 2023
1760d5f
reorganize and cleanup
rafguevara14 Feb 14, 2023
9588d02
replace software watchdog with suspend throttle function
rafguevara14 Feb 17, 2023
636d267
add flush logger
rafguevara14 Feb 17, 2023
61e3478
put priorities into macros
rafguevara14 Feb 17, 2023
7215a14
cleanup
rafguevara14 Feb 17, 2023
bc7bb62
log all events handled by state machine
rafguevara14 Feb 17, 2023
17454f3
add more events
rafguevara14 Feb 17, 2023
6a628f7
change baudrate fix test
rafguevara14 Feb 18, 2023
5d0a001
add sim mode includes
rafguevara14 Feb 18, 2023
ff288b5
add pre processor differences for sim mode
rafguevara14 Feb 18, 2023
2e2a40a
enable all fault timers
rafguevara14 Feb 18, 2023
d05d241
cleanup run time stats function
rafguevara14 Feb 18, 2023
f5e2fcf
rename throttle agent to pedal readings
rafguevara14 Feb 22, 2023
b533f56
rename throttle actor to throttle
rafguevara14 Feb 22, 2023
65179f3
check return of task and queue creation
rafguevara14 Feb 23, 2023
71cf74f
clean pedal readings
rafguevara14 Feb 23, 2023
c7371e7
clean throttle
rafguevara14 Feb 23, 2023
73e3f1b
clean logger
rafguevara14 Feb 23, 2023
8a91889
clean event handler and state machine
rafguevara14 Feb 23, 2023
16c7bee
fix misc compiler errors
rafguevara14 Feb 23, 2023
fbe3b98
ignore debug folder
rafguevara14 Feb 23, 2023
4bc47ef
cleanup misc
rafguevara14 Feb 23, 2023
ff84302
update documentation
rafguevara14 Feb 23, 2023
29a1cc1
remove readme
rafguevara14 Feb 23, 2023
09a6439
minimize logging
rafguevara14 Mar 3, 2023
e9b3458
fix initialization return values
rafguevara14 Mar 3, 2023
5511a07
cleanup logger output
rafguevara14 Mar 3, 2023
5f76353
temporarily raise logger priority
rafguevara14 Mar 3, 2023
2b676c9
don't make it static so characters don't persist and mess up the output
rafguevara14 Mar 3, 2023
3091596
don't transition to severe fault if we are already severe fault
rafguevara14 Mar 3, 2023
144bf83
add logging for suspended throttle
rafguevara14 Mar 3, 2023
f0a5803
remove diagrams folder
rafguevara14 Mar 3, 2023
50ef137
cleanup serial output
rafguevara14 Mar 3, 2023
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
4 changes: 3 additions & 1 deletion VCU/.cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE.1651611372" name="Designate enum type (--enum_type)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE.packed" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH.2058602792" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH" valueType="includePath">
<listOptionValue builtIn="false" value="${HERCULES_FOLDER}/F021 Flash API/02.01.01/include"/>
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Phantom/Drivers/STATE_MACHINE}"/>
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Phantom/support}"/>
<listOptionValue builtIn="false" value="${PROJECT_ROOT}"/>
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
Expand Down Expand Up @@ -359,6 +360,7 @@
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE.756688987" name="Designate enum type (--enum_type)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.ENUM_TYPE.packed" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH.597251475" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.INCLUDE_PATH" valueType="includePath">
<listOptionValue builtIn="false" value="${HERCULES_FOLDER}/F021 Flash API/02.01.01/include"/>
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Phantom/Drivers/STATE_MACHINE}"/>
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/Phantom/support}"/>
<listOptionValue builtIn="false" value="${PROJECT_ROOT}"/>
<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
Expand All @@ -379,7 +381,7 @@
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.PREINCLUDE.1657259802" name="Specify a preinclude file (--preinclude)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.PREINCLUDE" valueType="includeFiles"/>
<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.OPT_LEVEL.1128941080" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.OPT_LEVEL.off" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.2074496387" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.2074496387" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
<listOptionValue builtIn="false" value="VCU_SIM_MODE"/>
</option>
<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compiler.inputType__C_SRCS.1442936630" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compiler.inputType__C_SRCS"/>
Expand Down
1 change: 1 addition & 0 deletions VCU/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
RemoteSystemsTempFiles/
BuildConfig_*/
/SIM_MODE_VCU_REV2/
/Debug/
35 changes: 4 additions & 31 deletions VCU/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ encoding//BuildConfig_VCU-REV2/Phantom/Drivers/RTD_Buzzer/subdir_rules.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/RTD_Buzzer/subdir_vars.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/RTOS/subdir_rules.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/RTOS/subdir_vars.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/STATE_MACHINE/subdir_rules.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/STATE_MACHINE/subdir_vars.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/UART/subdir_rules.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/Drivers/UART/subdir_vars.mk=UTF-8
encoding//BuildConfig_VCU-REV2/Phantom/data_structures/subdir_rules.mk=UTF-8
Expand Down Expand Up @@ -124,6 +126,8 @@ encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/RTD_Buzzer/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/RTD_Buzzer/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/RTOS/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/RTOS/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/STATE_MACHINE/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/STATE_MACHINE/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/UART/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/Drivers/UART/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/data_structures/subdir_rules.mk=UTF-8
Expand All @@ -132,39 +136,8 @@ encoding//SIM_MODE_VCU_REV2/Phantom/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/tasks/source/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/tasks/source/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/test_eeprom/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Phantom/test_eeprom/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Simulation_Mode_VCU_REV2/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/Simulation_Mode_VCU_REV2/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/halcogen_vcu/source/subdir_rules.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/halcogen_vcu/source/subdir_vars.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/makefile=UTF-8
encoding//SIM_MODE_VCU_REV2/objects.mk=UTF-8
encoding//SIM_MODE_VCU_REV2/sources.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/DAC_SPI/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/DAC_SPI/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/EEPROM/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/EEPROM/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/RGB_LED/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/RGB_LED/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/RTD_Buzzer/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/RTD_Buzzer/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/RTOS/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/RTOS/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/UART/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/Drivers/UART/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/data_structures/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/data_structures/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/tasks/source/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/tasks/source/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/test_eeprom/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/Phantom/test_eeprom/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/halcogen_launchpad/source/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/halcogen_launchpad/source/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/halcogen_vcu/source/subdir_rules.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/halcogen_vcu/source/subdir_vars.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/makefile=UTF-8
encoding//Simulation_Mode_VCU_REV2/objects.mk=UTF-8
encoding//Simulation_Mode_VCU_REV2/sources.mk=UTF-8
12 changes: 6 additions & 6 deletions VCU/Debug/Phantom/tasks/source/subdir_vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ C_SRCS += \
../Phantom/tasks/source/task_statemachine.c \
../Phantom/tasks/source/task_test.c \
../Phantom/tasks/source/task_throttle_actor.c \
../Phantom/tasks/source/task_throttle_agent.c \
../Phantom/tasks/source/task_pedal_readings.c \
../Phantom/tasks/source/task_watchdog.c

C_DEPS += \
Expand All @@ -22,7 +22,7 @@ C_DEPS += \
./Phantom/tasks/source/task_statemachine.d \
./Phantom/tasks/source/task_test.d \
./Phantom/tasks/source/task_throttle_actor.d \
./Phantom/tasks/source/task_throttle_agent.d \
./Phantom/tasks/source/task_pedal_readings.d \
./Phantom/tasks/source/task_watchdog.d

OBJS += \
Expand All @@ -32,7 +32,7 @@ OBJS += \
./Phantom/tasks/source/task_statemachine.obj \
./Phantom/tasks/source/task_test.obj \
./Phantom/tasks/source/task_throttle_actor.obj \
./Phantom/tasks/source/task_throttle_agent.obj \
./Phantom/tasks/source/task_pedal_readings.obj \
./Phantom/tasks/source/task_watchdog.obj

OBJS__QUOTED += \
Expand All @@ -42,7 +42,7 @@ OBJS__QUOTED += \
"Phantom\tasks\source\task_statemachine.obj" \
"Phantom\tasks\source\task_test.obj" \
"Phantom\tasks\source\task_throttle_actor.obj" \
"Phantom\tasks\source\task_throttle_agent.obj" \
"Phantom\tasks\source\task_pedal_readings.obj" \
"Phantom\tasks\source\task_watchdog.obj"

C_DEPS__QUOTED += \
Expand All @@ -52,7 +52,7 @@ C_DEPS__QUOTED += \
"Phantom\tasks\source\task_statemachine.d" \
"Phantom\tasks\source\task_test.d" \
"Phantom\tasks\source\task_throttle_actor.d" \
"Phantom\tasks\source\task_throttle_agent.d" \
"Phantom\tasks\source\task_pedal_readings.d" \
"Phantom\tasks\source\task_watchdog.d"

C_SRCS__QUOTED += \
Expand All @@ -62,7 +62,7 @@ C_SRCS__QUOTED += \
"../Phantom/tasks/source/task_statemachine.c" \
"../Phantom/tasks/source/task_test.c" \
"../Phantom/tasks/source/task_throttle_actor.c" \
"../Phantom/tasks/source/task_throttle_agent.c" \
"../Phantom/tasks/source/task_pedal_readings.c" \
"../Phantom/tasks/source/task_watchdog.c"


Loading