Shivam: Timers Wrapper Code Review

.gitignore

@@ -53,3 +53,5 @@ STM32L152-Discovery.elf.launch
 [Dd]ebug
 *.launch
 
+# VS2022
+.vs/

.project

@@ -28,5 +28,6 @@
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
 	</natures>
 </projectDescription>

AvionicsSoftware.ioc

@@ -1,23 +1,4 @@
 #MicroXplorer Configuration settings - do not modify
-ADC1.Channel-58\#ChannelRegularConversion=ADC_CHANNEL_15
-ADC1.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV2
-ADC1.ContinuousConvMode=ENABLE
-ADC1.DMAContinuousRequests=DISABLE
-ADC1.DataAlign=ADC_DATAALIGN_RIGHT
-ADC1.DiscontinuousConvMode=DISABLE
-ADC1.EOCSelection=ADC_EOC_SEQ_CONV
-ADC1.EnableAnalogWatchDog=false
-ADC1.ExternalTrigConv=ADC_SOFTWARE_START
-ADC1.ExternalTrigConvEdge=ADC_EXTERNALTRIGCONVEDGE_NONE
-ADC1.IPParameters=Rank-58\#ChannelRegularConversion,Channel-58\#ChannelRegularConversion,SamplingTime-58\#ChannelRegularConversion,NbrOfConversionFlag,master,ContinuousConvMode,EOCSelection,ExternalTrigConv,ClockPrescaler,Resolution,DataAlign,ScanConvMode,DiscontinuousConvMode,DMAContinuousRequests,NbrOfConversion,ExternalTrigConvEdge,InjNumberOfConversion,EnableAnalogWatchDog
-ADC1.InjNumberOfConversion=0
-ADC1.NbrOfConversion=1
-ADC1.NbrOfConversionFlag=1
-ADC1.Rank-58\#ChannelRegularConversion=1
-ADC1.Resolution=ADC_RESOLUTION_12B
-ADC1.SamplingTime-58\#ChannelRegularConversion=ADC_SAMPLETIME_480CYCLES
-ADC1.ScanConvMode=DISABLE
-ADC1.master=1
 ADC2.Channel-68\#ChannelRegularConversion=ADC_CHANNEL_10
 ADC2.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV2
 ADC2.ContinuousConvMode=ENABLE
@@ -50,104 +31,98 @@ Dma.UART4_RX.0.Priority=DMA_PRIORITY_LOW
 Dma.UART4_RX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode
 FREERTOS.FootprintOK=true
 FREERTOS.INCLUDE_vTaskDelayUntil=1
-FREERTOS.IPParameters=Tasks01,INCLUDE_vTaskDelayUntil,FootprintOK,configMAX_TASK_NAME_LEN,configUSE_NEWLIB_REENTRANT
+FREERTOS.IPParameters=Tasks01,INCLUDE_vTaskDelayUntil,FootprintOK,configMAX_TASK_NAME_LEN,configUSE_NEWLIB_REENTRANT,configTOTAL_HEAP_SIZE,configUSE_TIMERS
 FREERTOS.Tasks01=defaultTask,0,128,StartDefaultTask,Default,NULL
 FREERTOS.configMAX_TASK_NAME_LEN=64
+FREERTOS.configTOTAL_HEAP_SIZE=24576
 FREERTOS.configUSE_NEWLIB_REENTRANT=1
+FREERTOS.configUSE_TIMERS=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
 Mcu.CPN=STM32F405RGT6
 Mcu.Family=STM32F4
-Mcu.IP0=ADC1
-Mcu.IP1=ADC2
-Mcu.IP10=SYS
-Mcu.IP11=TIM2
-Mcu.IP12=UART4
-Mcu.IP13=UART5
-Mcu.IP14=USART2
-Mcu.IP2=CRC
-Mcu.IP3=DMA
-Mcu.IP4=FREERTOS
-Mcu.IP5=NVIC
-Mcu.IP6=RCC
-Mcu.IP7=SPI1
-Mcu.IP8=SPI2
-Mcu.IP9=SPI3
-Mcu.IPNb=15
+Mcu.IP0=ADC2
+Mcu.IP1=CRC
+Mcu.IP10=TIM2
+Mcu.IP11=UART4
+Mcu.IP12=UART5
+Mcu.IP13=USART2
+Mcu.IP2=DMA
+Mcu.IP3=FREERTOS
+Mcu.IP4=NVIC
+Mcu.IP5=RCC
+Mcu.IP6=SPI1
+Mcu.IP7=SPI2
+Mcu.IP8=SPI3
+Mcu.IP9=SYS
+Mcu.IPNb=14
 Mcu.Name=STM32F405RGTx
 Mcu.Package=LQFP64
-Mcu.Pin0=PC14-OSC32_IN
-Mcu.Pin1=PH0-OSC_IN
-Mcu.Pin10=PA4
-Mcu.Pin11=PA5
-Mcu.Pin12=PA6
-Mcu.Pin13=PA7
-Mcu.Pin14=PC4
-Mcu.Pin15=PC5
-Mcu.Pin16=PB0
-Mcu.Pin17=PB1
-Mcu.Pin18=PB2
-Mcu.Pin19=PB10
-Mcu.Pin2=PH1-OSC_OUT
-Mcu.Pin20=PB11
-Mcu.Pin21=PB13
-Mcu.Pin22=PB14
-Mcu.Pin23=PB15
-Mcu.Pin24=PC6
-Mcu.Pin25=PC7
-Mcu.Pin26=PC8
-Mcu.Pin27=PC9
-Mcu.Pin28=PA8
-Mcu.Pin29=PA13
-Mcu.Pin3=PC0
-Mcu.Pin30=PA14
-Mcu.Pin31=PA15
-Mcu.Pin32=PC10
-Mcu.Pin33=PC11
-Mcu.Pin34=PC12
-Mcu.Pin35=PD2
-Mcu.Pin36=PB3
-Mcu.Pin37=PB4
-Mcu.Pin38=PB5
-Mcu.Pin39=PB6
-Mcu.Pin4=PC2
-Mcu.Pin40=PB7
-Mcu.Pin41=VP_CRC_VS_CRC
-Mcu.Pin42=VP_FREERTOS_VS_CMSIS_V1
-Mcu.Pin43=VP_SYS_VS_tim1
-Mcu.Pin44=VP_TIM2_VS_ClockSourceINT
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0-WKUP
-Mcu.Pin7=PA1
-Mcu.Pin8=PA2
-Mcu.Pin9=PA3
-Mcu.PinsNb=45
+Mcu.Pin0=PH0-OSC_IN
+Mcu.Pin1=PH1-OSC_OUT
+Mcu.Pin10=PA5
+Mcu.Pin11=PA6
+Mcu.Pin12=PA7
+Mcu.Pin13=PC4
+Mcu.Pin14=PB13
+Mcu.Pin15=PB14
+Mcu.Pin16=PB15
+Mcu.Pin17=PC6
+Mcu.Pin18=PC7
+Mcu.Pin19=PC8
+Mcu.Pin2=PC0
+Mcu.Pin20=PC9
+Mcu.Pin21=PA8
+Mcu.Pin22=PA13
+Mcu.Pin23=PA14
+Mcu.Pin24=PA15
+Mcu.Pin25=PC10
+Mcu.Pin26=PC11
+Mcu.Pin27=PC12
+Mcu.Pin28=PD2
+Mcu.Pin29=PB3
+Mcu.Pin3=PC2
+Mcu.Pin30=PB4
+Mcu.Pin31=PB5
+Mcu.Pin32=PB6
+Mcu.Pin33=PB7
+Mcu.Pin34=VP_CRC_VS_CRC
+Mcu.Pin35=VP_FREERTOS_VS_CMSIS_V1
+Mcu.Pin36=VP_SYS_VS_tim1
+Mcu.Pin37=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin4=PC3
+Mcu.Pin5=PA0-WKUP
+Mcu.Pin6=PA1
+Mcu.Pin7=PA2
+Mcu.Pin8=PA3
+Mcu.Pin9=PA4
+Mcu.PinsNb=38
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F405RGTx
-MxCube.Version=6.5.0
-MxDb.Version=DB.6.0.50
-NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:true
+MxCube.Version=6.6.1
+MxDb.Version=DB.6.0.60
+NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 NVIC.DMA1_Stream2_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true
-NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:true
+NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 NVIC.ForceEnableDMAVector=true
-NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:true
-NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:true
-NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:true
-NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:false\:true
+NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
+NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
+NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
+NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
-NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:false\:false\:true
+NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:false\:false\:false
 NVIC.SavedPendsvIrqHandlerGenerated=true
 NVIC.SavedSvcallIrqHandlerGenerated=true
 NVIC.SavedSystickIrqHandlerGenerated=true
-NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:true\:true
+NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:true\:false
 NVIC.TIM1_UP_TIM10_IRQn=true\:15\:0\:false\:false\:true\:false\:false\:true\:true
 NVIC.TimeBase=TIM1_UP_TIM10_IRQn
 NVIC.TimeBaseIP=TIM1
 NVIC.UART5_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true\:true
 NVIC.USART2_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true\:true
-NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:true
+NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 PA0-WKUP.GPIOParameters=GPIO_Label
 PA0-WKUP.GPIO_Label=GPS_UART_TX
 PA0-WKUP.Mode=Asynchronous
@@ -197,22 +172,6 @@ PA8.GPIOParameters=GPIO_Label
 PA8.GPIO_Label=LAUNCH
 PA8.Locked=true
 PA8.Signal=GPIO_Output
-PB0.GPIOParameters=GPIO_Label
-PB0.GPIO_Label=OXIDIZER_TANK_ADC
-PB0.Locked=true
-PB0.Signal=ADCx_IN8
-PB1.GPIOParameters=GPIO_Label
-PB1.GPIO_Label=PROPULSION_3_VALVE_ADC
-PB1.Locked=true
-PB1.Signal=ADCx_IN9
-PB10.GPIOParameters=GPIO_Label
-PB10.GPIO_Label=INJECTION_VALVE
-PB10.Locked=true
-PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label
-PB11.GPIO_Label=PROPULSION_3_VALVE
-PB11.Locked=true
-PB11.Signal=GPIO_Output
 PB13.GPIOParameters=GPIO_Label
 PB13.GPIO_Label=SPI_FLASH_SCK
 PB13.Mode=Full_Duplex_Master
@@ -225,10 +184,6 @@ PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=SPI_FLASH_MOSI
 PB15.Mode=Full_Duplex_Master
 PB15.Signal=SPI2_MOSI
-PB2.GPIOParameters=GPIO_Label
-PB2.GPIO_Label=LOWER_VENT_VALVE
-PB2.Locked=true
-PB2.Signal=GPIO_Output
 PB3.Locked=true
 PB3.Mode=Trace_Asynchronous_SW
 PB3.Signal=SYS_JTDO-SWO
@@ -268,10 +223,6 @@ PC12.GPIO_Label=DEBUG_UART_TX
 PC12.Locked=true
 PC12.Mode=Asynchronous
 PC12.Signal=UART5_TX
-PC14-OSC32_IN.GPIOParameters=GPIO_Label
-PC14-OSC32_IN.GPIO_Label=PMB_GPIO_1
-PC14-OSC32_IN.Locked=true
-PC14-OSC32_IN.Signal=GPIO_Output
 PC2.GPIOParameters=GPIO_Label
 PC2.GPIO_Label=AUX_2
 PC2.Locked=true
@@ -285,12 +236,8 @@ PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=MAG_CS
 PC4.Locked=true
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label
-PC5.GPIO_Label=COMBUSTION_CHAMBER_ADC
-PC5.Locked=true
-PC5.Signal=ADCx_IN15
 PC6.GPIOParameters=GPIO_Label
-PC6.GPIO_Label=KLB_CONTROL
+PC6.GPIO_Label=PMB_CONTROL
 PC6.Locked=true
 PC6.Signal=GPIO_Output
 PC7.GPIOParameters=GPIO_Label
@@ -324,7 +271,7 @@ ProjectManager.CustomerFirmwarePackage=
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32F405RGTx
-ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.27.0
+ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.27.1
 ProjectManager.FreePins=true
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
@@ -342,7 +289,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=STM32CubeIDE
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_ADC2_Init-ADC2-false-HAL-true,5-MX_SPI1_Init-SPI1-false-HAL-true,6-MX_USART2_UART_Init-USART2-false-HAL-true,7-MX_UART4_Init-UART4-false-HAL-true,8-MX_CRC_Init-CRC-false-HAL-true,9-MX_SPI3_Init-SPI3-false-HAL-true,10-MX_UART5_Init-UART5-false-HAL-true,11-MX_DMA_Init-DMA-false-HAL-true,12-MX_SPI2_Init-SPI2-false-HAL-true,13-MX_TIM2_Init-TIM2-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-true,3-MX_ADC2_Init-ADC2-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true,5-MX_USART2_UART_Init-USART2-false-HAL-true,6-MX_UART4_Init-UART4-false-HAL-true,7-MX_CRC_Init-CRC-false-HAL-true,8-MX_SPI3_Init-SPI3-false-HAL-true,9-MX_UART5_Init-UART5-false-HAL-true,10-MX_DMA_Init-DMA-false-HAL-true,11-MX_SPI2_Init-SPI2-false-HAL-true,12-MX_TIM2_Init-TIM2-false-HAL-true
 RCC.48MHZClocksFreq_Value=84000000
 RCC.AHBFreq_Value=168000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV8
@@ -378,12 +325,6 @@ RCC.VCOOutputFreq_Value=336000000
 RCC.VcooutputI2S=192000000
 SH.ADCx_IN10.0=ADC2_IN10,IN10
 SH.ADCx_IN10.ConfNb=1
-SH.ADCx_IN15.0=ADC1_IN15,IN15
-SH.ADCx_IN15.ConfNb=1
-SH.ADCx_IN8.0=ADC1_IN8,IN8
-SH.ADCx_IN8.ConfNb=1
-SH.ADCx_IN9.0=ADC1_IN9,IN9
-SH.ADCx_IN9.ConfNb=1
 SH.S_TIM2_CH1_ETR.0=TIM2_CH1,PWM Generation1 CH1
 SH.S_TIM2_CH1_ETR.ConfNb=1
 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_256

Components/Communication/Inc/UARTTask.hpp

@@ -0,0 +1,56 @@
+/**
+ ******************************************************************************
+ * File Name          : UARTTask.hpp
+ * Description        :
+ ******************************************************************************
+*/
+#ifndef SOAR_COMMS_UARTTASK_HPP_
+#define SOAR_COMMS_UARTTASK_HPP_
+/* Includes ------------------------------------------------------------------*/
+#include "Task.hpp"
+#include "SystemDefines.hpp"
+
+
+
+/* Macros ------------------------------------------------------------------*/
+enum UART_TASK_COMMANDS {
+	UART_TASK_COMMAND_NONE = 0,
+	UART_TASK_COMMAND_SEND_DEBUG,
+	UART_TASK_COMMAND_MAX
+};
+
+
+/* Class ------------------------------------------------------------------*/
+class UARTTask : public Task
+{
+public:
+	static UARTTask& Inst() {
+		static UARTTask inst;
+		return inst;
+	}
+
+	void InitTask();
+
+protected:
+	static void RunTask(void* pvParams) { UARTTask::Inst().Run(pvParams); } // Static Task Interface, passes control to the instance Run();
+
+	void Run(void* pvParams);	// Main run code
+
+	void ConfigureUART();
+	void HandleCommand(Command& cm);
+
+private:
+	UARTTask() : Task(UART_TASK_QUEUE_DEPTH_OBJS) {}	// Private constructor
+	UARTTask(const UARTTask&);						// Prevent copy-construction
+	UARTTask& operator=(const UARTTask&);			// Prevent assignment
+};
+
+
+/* Utility Functions ------------------------------------------------------------------*/
+namespace UARTUtils
+{
+
+}
+
+
+#endif	// SOAR_COMMS_UARTTASK_HPP_