From 6269ea499d28734c7ac374594722c3e1b3d70a40 Mon Sep 17 00:00:00 2001 From: roycohen2013 Date: Fri, 21 Aug 2015 22:16:14 -0400 Subject: [PATCH] adding roughly scheduler --- .gitignore | 1 + Firmware/Tiva/utils/scheduler.c | 2 + .../.launches/BareEthernet.launch | 34 +++---- .../projects/HybridEngineControl/.ccsproject | 1 + .../projects/HybridEngineControl/.cproject | 1 + .../projects/HybridEngineControl/.project | 10 ++ .../projects/HybridEngineControl/led_util.c | 33 ++++++- .../projects/HybridEngineControl/led_util.h | 25 ++--- Firmware/projects/HybridEngineControl/main.c | 92 +++++++++++++++--- .../tm4c1294ncpdt_startup_ccs.c | 6 +- .../EthernetDocumentation/022-0137_F.pdf | Bin 0 -> 179382 bytes .../EthernetDocumentation/EE-269.pdf | Bin 0 -> 458377 bytes .../routingDocumentation.txt | 3 + .../EthernetDocumentation/spma051.pdf | Bin 0 -> 158051 bytes .../EthernetDocumentation/spma056.pdf | Bin 0 -> 1430719 bytes 15 files changed, 160 insertions(+), 48 deletions(-) create mode 100644 Hardware/MainFlightComputer/EthernetDocumentation/022-0137_F.pdf create mode 100644 Hardware/MainFlightComputer/EthernetDocumentation/EE-269.pdf create mode 100644 Hardware/MainFlightComputer/EthernetDocumentation/routingDocumentation.txt create mode 100644 Hardware/MainFlightComputer/EthernetDocumentation/spma051.pdf create mode 100644 Hardware/MainFlightComputer/EthernetDocumentation/spma056.pdf diff --git a/.gitignore b/.gitignore index 1c004a0..307523f 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,4 @@ $RECYCLE.BIN/ !/Firmware/Tiva/driverlib/ccs/Debug Firmware/projects/BareEthernet/.launches/BareEthernet.launch Firmware/projects/BareEthernet/.launches/BareEthernet.launch +Firmware/projects/BareEthernet/.launches/BareEthernet.launch diff --git a/Firmware/Tiva/utils/scheduler.c b/Firmware/Tiva/utils/scheduler.c index fcb2a25..adc7bef 100644 --- a/Firmware/Tiva/utils/scheduler.c +++ b/Firmware/Tiva/utils/scheduler.c @@ -32,6 +32,8 @@ #include "driverlib/debug.h" #include "utils/scheduler.h" + + //***************************************************************************** // //! \addtogroup scheduler_api diff --git a/Firmware/projects/BareEthernet/.launches/BareEthernet.launch b/Firmware/projects/BareEthernet/.launches/BareEthernet.launch index 9c64dd7..9d50c8e 100644 --- a/Firmware/projects/BareEthernet/.launches/BareEthernet.launch +++ b/Firmware/projects/BareEthernet/.launches/BareEthernet.launch @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Firmware/projects/HybridEngineControl/.ccsproject b/Firmware/projects/HybridEngineControl/.ccsproject index dd6631b..5601570 100644 --- a/Firmware/projects/HybridEngineControl/.ccsproject +++ b/Firmware/projects/HybridEngineControl/.ccsproject @@ -10,4 +10,5 @@ + diff --git a/Firmware/projects/HybridEngineControl/.cproject b/Firmware/projects/HybridEngineControl/.cproject index 8e063cf..47cd29c 100644 --- a/Firmware/projects/HybridEngineControl/.cproject +++ b/Firmware/projects/HybridEngineControl/.cproject @@ -46,6 +46,7 @@