diff --git a/.cproject b/.cproject index 0444c03..91bd2e0 100644 --- a/.cproject +++ b/.cproject @@ -110,10 +110,10 @@ - - + + diff --git a/App/Inc/sta/config.hpp b/App/Inc/sta/config.hpp index bab5bb2..06a096a 100644 --- a/App/Inc/sta/config.hpp +++ b/App/Inc/sta/config.hpp @@ -8,7 +8,8 @@ #ifndef INC_STA_CONFIG_HPP_ #define INC_STA_CONFIG_HPP_ -#include +#define STA_STM32_ASEAG +#include // Doesn't really do too much right now. Has to be added for successful compilation. #define STA_PRINTF_USE_STDLIB diff --git a/App/Src/startup.cpp b/App/Src/startup.cpp index 3c1ffd9..74f6967 100644 --- a/App/Src/startup.cpp +++ b/App/Src/startup.cpp @@ -5,8 +5,6 @@ * Author: Dario */ - -#include #include #include #include diff --git a/CAN-Demo.ioc b/CAN-Demo.ioc index 112ceca..a122c67 100644 --- a/CAN-Demo.ioc +++ b/CAN-Demo.ioc @@ -25,7 +25,7 @@ Mcu.IP1=FREERTOS Mcu.IP2=NVIC Mcu.IP3=RCC Mcu.IP4=SYS -Mcu.IP5=UART4 +Mcu.IP5=USART1 Mcu.IPNb=6 Mcu.Name=STM32F407Z(E-G)Tx Mcu.Package=LQFP144 @@ -40,12 +40,12 @@ Mcu.Pin15=PC12 Mcu.Pin16=PB3 Mcu.Pin17=VP_FREERTOS_VS_CMSIS_V2 Mcu.Pin18=VP_SYS_VS_Systick -Mcu.Pin2=PA0-WKUP -Mcu.Pin3=PA1 -Mcu.Pin4=PB12 -Mcu.Pin5=PB13 -Mcu.Pin6=PD8 -Mcu.Pin7=PD9 +Mcu.Pin2=PB12 +Mcu.Pin3=PB13 +Mcu.Pin4=PD8 +Mcu.Pin5=PD9 +Mcu.Pin6=PA9 +Mcu.Pin7=PA10 Mcu.Pin8=PA11 Mcu.Pin9=PA12 Mcu.PinsNb=19 @@ -70,10 +70,8 @@ NVIC.SavedSvcallIrqHandlerGenerated=true NVIC.SavedSystickIrqHandlerGenerated=true NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true\:false\:true\:false NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false -PA0-WKUP.Mode=Asynchronous -PA0-WKUP.Signal=UART4_TX -PA1.Mode=Asynchronous -PA1.Signal=UART4_RX +PA10.Mode=Asynchronous +PA10.Signal=USART1_RX PA11.Locked=true PA11.Mode=CAN_Activate PA11.Signal=CAN1_RX @@ -86,6 +84,8 @@ PA14.Locked=true PA14.Signal=SYS_JTCK-SWCLK PA15.Locked=true PA15.Signal=SYS_JTDI +PA9.Mode=Asynchronous +PA9.Signal=USART1_TX PB12.GPIOParameters=GPIO_Speed,PinState PB12.GPIO_Speed=GPIO_SPEED_FREQ_LOW PB12.Locked=true @@ -177,8 +177,9 @@ RCC.VCOI2SOutputFreq_Value=384000000 RCC.VCOInputFreq_Value=2000000 RCC.VCOOutputFreq_Value=128000000 RCC.VcooutputI2S=192000000 -UART4.IPParameters=VirtualMode -UART4.VirtualMode=Asynchronous +USART1.BaudRate=6200 +USART1.IPParameters=VirtualMode,BaudRate +USART1.VirtualMode=VM_ASYNC VP_FREERTOS_VS_CMSIS_V2.Mode=CMSIS_V2 VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2 VP_SYS_VS_Systick.Mode=SysTick diff --git a/Core/Inc/usart.h b/Core/Inc/usart.h index 0900a3d..f9008d9 100644 --- a/Core/Inc/usart.h +++ b/Core/Inc/usart.h @@ -32,13 +32,13 @@ extern "C" { /* USER CODE END Includes */ -extern UART_HandleTypeDef huart4; +extern UART_HandleTypeDef huart1; /* USER CODE BEGIN Private defines */ /* USER CODE END Private defines */ -void MX_UART4_Init(void); +void MX_USART1_UART_Init(void); /* USER CODE BEGIN Prototypes */ diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c index 14df1a9..1bfdfeb 100644 --- a/Core/Src/freertos.c +++ b/Core/Src/freertos.c @@ -55,16 +55,6 @@ const osThreadAttr_t defaultTask_attributes = { .priority = (osPriority_t) osPriorityNormal, }; - -/* Definitions for uartMutex */ -osMutexId_t uartMutexHandle; -osStaticMutexDef_t uartMutex_cb; -const osMutexAttr_t uartMutex_attributes = { - .name = "uartMutex", - .cb_mem = &uartMutex_cb, - .cb_size = sizeof(uartMutex_cb), -}; - /* Private function prototypes -----------------------------------------------*/ /* USER CODE BEGIN FunctionPrototypes */ @@ -81,7 +71,6 @@ void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */ */ void MX_FREERTOS_Init(void) { /* USER CODE BEGIN Init */ - uartMutexHandle = osMutexNew(&uartMutex_attributes); /* USER CODE END Init */ diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index 167d68e..3dded7a 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -49,9 +49,9 @@ void MX_GPIO_Init(void) /* GPIO Ports Clock Enable */ __HAL_RCC_GPIOH_CLK_ENABLE(); - __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOD_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE(); /*Configure GPIO pin Output Level */ diff --git a/Core/Src/main.c b/Core/Src/main.c index 1415aed..cd8842f 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -99,8 +99,8 @@ int main(void) /* Initialize all configured peripherals */ MX_GPIO_Init(); - MX_UART4_Init(); MX_CAN1_Init(); + MX_USART1_UART_Init(); /* USER CODE BEGIN 2 */ /*txHeader.DLC = 8; diff --git a/Core/Src/usart.c b/Core/Src/usart.c index d5b38a2..76056e3 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -24,34 +24,35 @@ /* USER CODE END 0 */ -UART_HandleTypeDef huart4; +UART_HandleTypeDef huart1; -/* UART4 init function */ -void MX_UART4_Init(void) +/* USART1 init function */ + +void MX_USART1_UART_Init(void) { - /* USER CODE BEGIN UART4_Init 0 */ + /* USER CODE BEGIN USART1_Init 0 */ - /* USER CODE END UART4_Init 0 */ + /* USER CODE END USART1_Init 0 */ - /* USER CODE BEGIN UART4_Init 1 */ + /* USER CODE BEGIN USART1_Init 1 */ - /* USER CODE END UART4_Init 1 */ - huart4.Instance = UART4; - huart4.Init.BaudRate = 115200; - huart4.Init.WordLength = UART_WORDLENGTH_8B; - huart4.Init.StopBits = UART_STOPBITS_1; - huart4.Init.Parity = UART_PARITY_NONE; - huart4.Init.Mode = UART_MODE_TX_RX; - huart4.Init.HwFlowCtl = UART_HWCONTROL_NONE; - huart4.Init.OverSampling = UART_OVERSAMPLING_16; - if (HAL_UART_Init(&huart4) != HAL_OK) + /* USER CODE END USART1_Init 1 */ + huart1.Instance = USART1; + huart1.Init.BaudRate = 6200; + huart1.Init.WordLength = UART_WORDLENGTH_8B; + huart1.Init.StopBits = UART_STOPBITS_1; + huart1.Init.Parity = UART_PARITY_NONE; + huart1.Init.Mode = UART_MODE_TX_RX; + huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; + huart1.Init.OverSampling = UART_OVERSAMPLING_16; + if (HAL_UART_Init(&huart1) != HAL_OK) { Error_Handler(); } - /* USER CODE BEGIN UART4_Init 2 */ + /* USER CODE BEGIN USART1_Init 2 */ - /* USER CODE END UART4_Init 2 */ + /* USER CODE END USART1_Init 2 */ } @@ -59,52 +60,52 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) { GPIO_InitTypeDef GPIO_InitStruct = {0}; - if(uartHandle->Instance==UART4) + if(uartHandle->Instance==USART1) { - /* USER CODE BEGIN UART4_MspInit 0 */ + /* USER CODE BEGIN USART1_MspInit 0 */ - /* USER CODE END UART4_MspInit 0 */ - /* UART4 clock enable */ - __HAL_RCC_UART4_CLK_ENABLE(); + /* USER CODE END USART1_MspInit 0 */ + /* USART1 clock enable */ + __HAL_RCC_USART1_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE(); - /**UART4 GPIO Configuration - PA0-WKUP ------> UART4_TX - PA1 ------> UART4_RX + /**USART1 GPIO Configuration + PA9 ------> USART1_TX + PA10 ------> USART1_RX */ - GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1; + GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_10; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; - GPIO_InitStruct.Alternate = GPIO_AF8_UART4; + GPIO_InitStruct.Alternate = GPIO_AF7_USART1; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); - /* USER CODE BEGIN UART4_MspInit 1 */ + /* USER CODE BEGIN USART1_MspInit 1 */ - /* USER CODE END UART4_MspInit 1 */ + /* USER CODE END USART1_MspInit 1 */ } } void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) { - if(uartHandle->Instance==UART4) + if(uartHandle->Instance==USART1) { - /* USER CODE BEGIN UART4_MspDeInit 0 */ + /* USER CODE BEGIN USART1_MspDeInit 0 */ - /* USER CODE END UART4_MspDeInit 0 */ + /* USER CODE END USART1_MspDeInit 0 */ /* Peripheral clock disable */ - __HAL_RCC_UART4_CLK_DISABLE(); + __HAL_RCC_USART1_CLK_DISABLE(); - /**UART4 GPIO Configuration - PA0-WKUP ------> UART4_TX - PA1 ------> UART4_RX + /**USART1 GPIO Configuration + PA9 ------> USART1_TX + PA10 ------> USART1_RX */ - HAL_GPIO_DeInit(GPIOA, GPIO_PIN_0|GPIO_PIN_1); + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10); - /* USER CODE BEGIN UART4_MspDeInit 1 */ + /* USER CODE BEGIN USART1_MspDeInit 1 */ - /* USER CODE END UART4_MspDeInit 1 */ + /* USER CODE END USART1_MspDeInit 1 */ } } diff --git a/Debug/App/Src/test.d b/Debug/App/Src/test.d index 0a459d9..7641683 100644 --- a/Debug/App/Src/test.d +++ b/Debug/App/Src/test.d @@ -1,6 +1,7 @@ App/Src/test.o: ../App/Src/test.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/can.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -37,6 +38,7 @@ App/Src/test.o: ../App/Src/test.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/can/iter.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/can.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/App/Src/test.o b/Debug/App/Src/test.o index 9988e23..8ba5b78 100644 Binary files a/Debug/App/Src/test.o and b/Debug/App/Src/test.o differ diff --git a/Debug/Core/Src/main.o b/Debug/Core/Src/main.o index 626d8ae..26e41cf 100644 Binary files a/Debug/Core/Src/main.o and b/Debug/Core/Src/main.o differ diff --git a/Debug/Libs/sta-core/src/atomic/mutex.d b/Debug/Libs/sta-core/src/atomic/mutex.d index 49fd7e0..30a687b 100644 --- a/Debug/Libs/sta-core/src/atomic/mutex.d +++ b/Debug/Libs/sta-core/src/atomic/mutex.d @@ -1,7 +1,9 @@ Libs/sta-core/src/atomic/mutex.o: ../Libs/sta-core/src/atomic/mutex.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/atomic/mutex.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/atomic/mutex.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/atomic/mutex.o b/Debug/Libs/sta-core/src/atomic/mutex.o index 26344e1..eb39d49 100644 Binary files a/Debug/Libs/sta-core/src/atomic/mutex.o and b/Debug/Libs/sta-core/src/atomic/mutex.o differ diff --git a/Debug/Libs/sta-core/src/atomic/signal.d b/Debug/Libs/sta-core/src/atomic/signal.d index b1c45c8..73db172 100644 --- a/Debug/Libs/sta-core/src/atomic/signal.d +++ b/Debug/Libs/sta-core/src/atomic/signal.d @@ -1,7 +1,9 @@ Libs/sta-core/src/atomic/signal.o: ../Libs/sta-core/src/atomic/signal.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/atomic/signal.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/atomic/signal.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/atomic/signal.o b/Debug/Libs/sta-core/src/atomic/signal.o index ac3326c..10bcea6 100644 Binary files a/Debug/Libs/sta-core/src/atomic/signal.o and b/Debug/Libs/sta-core/src/atomic/signal.o differ diff --git a/Debug/Libs/sta-core/src/bus/device.d b/Debug/Libs/sta-core/src/bus/device.d index 9ba846f..6dea7bb 100644 --- a/Debug/Libs/sta-core/src/bus/device.d +++ b/Debug/Libs/sta-core/src/bus/device.d @@ -4,10 +4,12 @@ Libs/sta-core/src/bus/device.o: ../Libs/sta-core/src/bus/device.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/mutex.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/device.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/interface.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/mutex.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/bus/device.o b/Debug/Libs/sta-core/src/bus/device.o index 5e6bc98..aaaa5b3 100644 Binary files a/Debug/Libs/sta-core/src/bus/device.o and b/Debug/Libs/sta-core/src/bus/device.o differ diff --git a/Debug/Libs/sta-core/src/bus/i2c/device.d b/Debug/Libs/sta-core/src/bus/i2c/device.d index 89285c5..faf04c3 100644 --- a/Debug/Libs/sta-core/src/bus/i2c/device.d +++ b/Debug/Libs/sta-core/src/bus/i2c/device.d @@ -7,6 +7,7 @@ Libs/sta-core/src/bus/i2c/device.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/device.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/i2c/device.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/i2c/i2c.hpp: @@ -15,4 +16,5 @@ Libs/sta-core/src/bus/i2c/device.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/device.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/bus/i2c/device.o b/Debug/Libs/sta-core/src/bus/i2c/device.o index 0d2c1cf..ed728f4 100644 Binary files a/Debug/Libs/sta-core/src/bus/i2c/device.o and b/Debug/Libs/sta-core/src/bus/i2c/device.o differ diff --git a/Debug/Libs/sta-core/src/bus/i2c/i2c.o b/Debug/Libs/sta-core/src/bus/i2c/i2c.o index 4b9ae8e..3310942 100644 Binary files a/Debug/Libs/sta-core/src/bus/i2c/i2c.o and b/Debug/Libs/sta-core/src/bus/i2c/i2c.o differ diff --git a/Debug/Libs/sta-core/src/bus/interface.d b/Debug/Libs/sta-core/src/bus/interface.d index b72bc90..aeeed49 100644 --- a/Debug/Libs/sta-core/src/bus/interface.d +++ b/Debug/Libs/sta-core/src/bus/interface.d @@ -3,9 +3,11 @@ Libs/sta-core/src/bus/interface.o: ../Libs/sta-core/src/bus/interface.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/mutex.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/interface.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/mutex.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/bus/interface.o b/Debug/Libs/sta-core/src/bus/interface.o index a39ca75..431eb31 100644 Binary files a/Debug/Libs/sta-core/src/bus/interface.o and b/Debug/Libs/sta-core/src/bus/interface.o differ diff --git a/Debug/Libs/sta-core/src/bus/spi/device.d b/Debug/Libs/sta-core/src/bus/spi/device.d index 43af657..01a0c15 100644 --- a/Debug/Libs/sta-core/src/bus/spi/device.d +++ b/Debug/Libs/sta-core/src/bus/spi/device.d @@ -9,6 +9,7 @@ Libs/sta-core/src/bus/spi/device.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/gpio_pin.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/spi/device.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/device.hpp: @@ -19,4 +20,5 @@ Libs/sta-core/src/bus/spi/device.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/gpio_pin.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/bus/spi/device.o b/Debug/Libs/sta-core/src/bus/spi/device.o index 09519f9..dd9724c 100644 Binary files a/Debug/Libs/sta-core/src/bus/spi/device.o and b/Debug/Libs/sta-core/src/bus/spi/device.o differ diff --git a/Debug/Libs/sta-core/src/bus/spi/settings.d b/Debug/Libs/sta-core/src/bus/spi/settings.d index a91d683..eb88f19 100644 --- a/Debug/Libs/sta-core/src/bus/spi/settings.d +++ b/Debug/Libs/sta-core/src/bus/spi/settings.d @@ -3,10 +3,12 @@ Libs/sta-core/src/bus/spi/settings.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/spi/settings.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/spi/settings.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp: diff --git a/Debug/Libs/sta-core/src/bus/spi/settings.o b/Debug/Libs/sta-core/src/bus/spi/settings.o index 311fdc3..0df3619 100644 Binary files a/Debug/Libs/sta-core/src/bus/spi/settings.o and b/Debug/Libs/sta-core/src/bus/spi/settings.o differ diff --git a/Debug/Libs/sta-core/src/bus/spi/spi.o b/Debug/Libs/sta-core/src/bus/spi/spi.o index bf60606..62671e4 100644 Binary files a/Debug/Libs/sta-core/src/bus/spi/spi.o and b/Debug/Libs/sta-core/src/bus/spi/spi.o differ diff --git a/Debug/Libs/sta-core/src/bus/uart/uart.o b/Debug/Libs/sta-core/src/bus/uart/uart.o index 2974b55..3f8c3c9 100644 Binary files a/Debug/Libs/sta-core/src/bus/uart/uart.o and b/Debug/Libs/sta-core/src/bus/uart/uart.o differ diff --git a/Debug/Libs/sta-core/src/can/iter.d b/Debug/Libs/sta-core/src/can/iter.d index 1c4f001..1415327 100644 --- a/Debug/Libs/sta-core/src/can/iter.d +++ b/Debug/Libs/sta-core/src/can/iter.d @@ -2,8 +2,10 @@ Libs/sta-core/src/can/iter.o: ../Libs/sta-core/src/can/iter.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/can/iter.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/bus/can/iter.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/can/iter.o b/Debug/Libs/sta-core/src/can/iter.o index d589288..56570f7 100644 Binary files a/Debug/Libs/sta-core/src/can/iter.o and b/Debug/Libs/sta-core/src/can/iter.o differ diff --git a/Debug/Libs/sta-core/src/debug/assert.d b/Debug/Libs/sta-core/src/debug/assert.d index 0b4d607..108a862 100644 --- a/Debug/Libs/sta-core/src/debug/assert.d +++ b/Debug/Libs/sta-core/src/debug/assert.d @@ -1,12 +1,14 @@ Libs/sta-core/src/debug/assert.o: ../Libs/sta-core/src/debug/assert.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/debug.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/debug.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp: diff --git a/Debug/Libs/sta-core/src/debug/assert.o b/Debug/Libs/sta-core/src/debug/assert.o index 3d7212e..7b14bd8 100644 Binary files a/Debug/Libs/sta-core/src/debug/assert.o and b/Debug/Libs/sta-core/src/debug/assert.o differ diff --git a/Debug/Libs/sta-core/src/debug/printing/printable.d b/Debug/Libs/sta-core/src/debug/printing/printable.d index 9727501..2f80491 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable.d +++ b/Debug/Libs/sta-core/src/debug/printing/printable.d @@ -3,10 +3,12 @@ Libs/sta-core/src/debug/printing/printable.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp: diff --git a/Debug/Libs/sta-core/src/debug/printing/printable.o b/Debug/Libs/sta-core/src/debug/printing/printable.o index a2eb637..07a78f4 100644 Binary files a/Debug/Libs/sta-core/src/debug/printing/printable.o and b/Debug/Libs/sta-core/src/debug/printing/printable.o differ diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_printf.cyclo b/Debug/Libs/sta-core/src/debug/printing/printable_printf.cyclo index 0fd59fe..2d9a97b 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable_printf.cyclo +++ b/Debug/Libs/sta-core/src/debug/printing/printable_printf.cyclo @@ -1,3 +1,3 @@ -/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:26:11:constexpr sta::Printable::Printable() 1 +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:31:11:constexpr sta::Printable::Printable() 1 ../Libs/sta-core/src/debug/printing/printable_printf.cpp:8:5:sta::PrintablePrintf::PrintablePrintf() 1 ../Libs/sta-core/src/debug/printing/printable_printf.cpp:13:10:virtual void sta::PrintablePrintf::print(const char*, size_t) 3 diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_printf.d b/Debug/Libs/sta-core/src/debug/printing/printable_printf.d index 6fd6a1b..47cb8a2 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable_printf.d +++ b/Debug/Libs/sta-core/src/debug/printing/printable_printf.d @@ -4,9 +4,11 @@ Libs/sta-core/src/debug/printing/printable_printf.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable_printf.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_printf.o b/Debug/Libs/sta-core/src/debug/printing/printable_printf.o index c541037..7398365 100644 Binary files a/Debug/Libs/sta-core/src/debug/printing/printable_printf.o and b/Debug/Libs/sta-core/src/debug/printing/printable_printf.o differ diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_printf.su b/Debug/Libs/sta-core/src/debug/printing/printable_printf.su index 92ea160..851b959 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable_printf.su +++ b/Debug/Libs/sta-core/src/debug/printing/printable_printf.su @@ -1,3 +1,3 @@ -/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:26:11:constexpr sta::Printable::Printable() 16 static +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:31:11:constexpr sta::Printable::Printable() 16 static ../Libs/sta-core/src/debug/printing/printable_printf.cpp:8:5:sta::PrintablePrintf::PrintablePrintf() 16 static ../Libs/sta-core/src/debug/printing/printable_printf.cpp:13:10:virtual void sta::PrintablePrintf::print(const char*, size_t) 24 static diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_uart.cyclo b/Debug/Libs/sta-core/src/debug/printing/printable_uart.cyclo index 0f513c9..c317e4b 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable_uart.cyclo +++ b/Debug/Libs/sta-core/src/debug/printing/printable_uart.cyclo @@ -1,3 +1,3 @@ -/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:26:11:constexpr sta::Printable::Printable() 1 +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:31:11:constexpr sta::Printable::Printable() 1 ../Libs/sta-core/src/debug/printing/printable_uart.cpp:13:5:sta::PrintableUART::PrintableUART(sta::UART*) 4 ../Libs/sta-core/src/debug/printing/printable_uart.cpp:20:10:virtual void sta::PrintableUART::print(const char*, size_t) 1 diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_uart.d b/Debug/Libs/sta-core/src/debug/printing/printable_uart.d index 024b1fb..523fcec 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable_uart.d +++ b/Debug/Libs/sta-core/src/debug/printing/printable_uart.d @@ -8,6 +8,7 @@ Libs/sta-core/src/debug/printing/printable_uart.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/printf.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable_uart.hpp: @@ -18,5 +19,6 @@ Libs/sta-core/src/debug/printing/printable_uart.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/printf.hpp: diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_uart.o b/Debug/Libs/sta-core/src/debug/printing/printable_uart.o index 230cc12..e361b14 100644 Binary files a/Debug/Libs/sta-core/src/debug/printing/printable_uart.o and b/Debug/Libs/sta-core/src/debug/printing/printable_uart.o differ diff --git a/Debug/Libs/sta-core/src/debug/printing/printable_uart.su b/Debug/Libs/sta-core/src/debug/printing/printable_uart.su index 680d2dd..a937389 100644 --- a/Debug/Libs/sta-core/src/debug/printing/printable_uart.su +++ b/Debug/Libs/sta-core/src/debug/printing/printable_uart.su @@ -1,3 +1,3 @@ -/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:26:11:constexpr sta::Printable::Printable() 16 static +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/printing/printable.hpp:31:11:constexpr sta::Printable::Printable() 16 static ../Libs/sta-core/src/debug/printing/printable_uart.cpp:13:5:sta::PrintableUART::PrintableUART(sta::UART*) 16 static ../Libs/sta-core/src/debug/printing/printable_uart.cpp:20:10:virtual void sta::PrintableUART::print(const char*, size_t) 24 static diff --git a/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.d b/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.d index 006f05b..db2404b 100644 --- a/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.d +++ b/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/arduino/bus/i2c.o: \ ../Libs/sta-core/src/devices/arduino/bus/i2c.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/arduino/bus/i2c.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/arduino/bus/i2c.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.o b/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.o index 5713970..70d50ba 100644 Binary files a/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.o and b/Debug/Libs/sta-core/src/devices/arduino/bus/i2c.o differ diff --git a/Debug/Libs/sta-core/src/devices/arduino/delay.d b/Debug/Libs/sta-core/src/devices/arduino/delay.d index 87d940e..40a2bb8 100644 --- a/Debug/Libs/sta-core/src/devices/arduino/delay.d +++ b/Debug/Libs/sta-core/src/devices/arduino/delay.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/arduino/delay.o: \ ../Libs/sta-core/src/devices/arduino/delay.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/arduino/delay.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/arduino/delay.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/arduino/delay.o b/Debug/Libs/sta-core/src/devices/arduino/delay.o index ca0dbf8..671e5ca 100644 Binary files a/Debug/Libs/sta-core/src/devices/arduino/delay.o and b/Debug/Libs/sta-core/src/devices/arduino/delay.o differ diff --git a/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.d b/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.d index 29c836b..e49ddcf 100644 --- a/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.d +++ b/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/arduino/gpio_pin.o: \ ../Libs/sta-core/src/devices/arduino/gpio_pin.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/arduino/gpio_pin.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/arduino/gpio_pin.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.o b/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.o index 99b63ea..26cfa1e 100644 Binary files a/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.o and b/Debug/Libs/sta-core/src/devices/arduino/gpio_pin.o differ diff --git a/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.d b/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.d index 90c2376..d062e93 100644 --- a/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.d +++ b/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/raspi/bus/i2c.o: \ ../Libs/sta-core/src/devices/raspi/bus/i2c.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/bus/i2c.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/bus/i2c.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.o b/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.o index 95feb9b..9b41051 100644 Binary files a/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.o and b/Debug/Libs/sta-core/src/devices/raspi/bus/i2c.o differ diff --git a/Debug/Libs/sta-core/src/devices/raspi/bus/spi.d b/Debug/Libs/sta-core/src/devices/raspi/bus/spi.d index 5b9cd7c..1465262 100644 --- a/Debug/Libs/sta-core/src/devices/raspi/bus/spi.d +++ b/Debug/Libs/sta-core/src/devices/raspi/bus/spi.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/raspi/bus/spi.o: \ ../Libs/sta-core/src/devices/raspi/bus/spi.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/bus/spi.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/bus/spi.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/raspi/bus/spi.o b/Debug/Libs/sta-core/src/devices/raspi/bus/spi.o index 33771de..9c2da1c 100644 Binary files a/Debug/Libs/sta-core/src/devices/raspi/bus/spi.o and b/Debug/Libs/sta-core/src/devices/raspi/bus/spi.o differ diff --git a/Debug/Libs/sta-core/src/devices/raspi/delay.d b/Debug/Libs/sta-core/src/devices/raspi/delay.d index c9cb837..884a9eb 100644 --- a/Debug/Libs/sta-core/src/devices/raspi/delay.d +++ b/Debug/Libs/sta-core/src/devices/raspi/delay.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/raspi/delay.o: \ ../Libs/sta-core/src/devices/raspi/delay.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/delay.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/delay.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/raspi/delay.o b/Debug/Libs/sta-core/src/devices/raspi/delay.o index 02b3a75..f49f6dc 100644 Binary files a/Debug/Libs/sta-core/src/devices/raspi/delay.o and b/Debug/Libs/sta-core/src/devices/raspi/delay.o differ diff --git a/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.d b/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.d index 4ccb045..9b63a4b 100644 --- a/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.d +++ b/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/raspi/gpio_pin.o: \ ../Libs/sta-core/src/devices/raspi/gpio_pin.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/gpio_pin.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/raspi/gpio_pin.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.o b/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.o index 6390f4f..810c0ee 100644 Binary files a/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.o and b/Debug/Libs/sta-core/src/devices/raspi/gpio_pin.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/adc.d b/Debug/Libs/sta-core/src/devices/stm32/adc.d index becdbe6..508201d 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/adc.d +++ b/Debug/Libs/sta-core/src/devices/stm32/adc.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/adc.o: \ ../Libs/sta-core/src/devices/stm32/adc.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/adc.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -33,6 +34,7 @@ Libs/sta-core/src/devices/stm32/adc.o: \ ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/adc.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/adc.o b/Debug/Libs/sta-core/src/devices/stm32/adc.o index f8e5eed..9f9ff8d 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/adc.o and b/Debug/Libs/sta-core/src/devices/stm32/adc.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.d b/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.d index 901ff74..5f75bd6 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.d +++ b/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/bus/i2c.o: \ ../Libs/sta-core/src/devices/stm32/bus/i2c.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/bus/i2c.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -34,6 +35,7 @@ Libs/sta-core/src/devices/stm32/bus/i2c.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/bus/i2c.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.o b/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.o index 0f1bf69..80db89b 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.o and b/Debug/Libs/sta-core/src/devices/stm32/bus/i2c.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/bus/spi.d b/Debug/Libs/sta-core/src/devices/stm32/bus/spi.d index dc6de14..d36048e 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/bus/spi.d +++ b/Debug/Libs/sta-core/src/devices/stm32/bus/spi.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/bus/spi.o: \ ../Libs/sta-core/src/devices/stm32/bus/spi.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/bus/spi.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -33,6 +34,7 @@ Libs/sta-core/src/devices/stm32/bus/spi.o: \ ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/bus/spi.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/bus/spi.o b/Debug/Libs/sta-core/src/devices/stm32/bus/spi.o index 1e58eb1..cc3bad5 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/bus/spi.o and b/Debug/Libs/sta-core/src/devices/stm32/bus/spi.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/bus/uart.d b/Debug/Libs/sta-core/src/devices/stm32/bus/uart.d index c050d4f..7a2a4b5 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/bus/uart.d +++ b/Debug/Libs/sta-core/src/devices/stm32/bus/uart.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/bus/uart.o: \ ../Libs/sta-core/src/devices/stm32/bus/uart.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/bus/uart.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -38,6 +39,7 @@ Libs/sta-core/src/devices/stm32/bus/uart.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/bus/uart.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/bus/uart.o b/Debug/Libs/sta-core/src/devices/stm32/bus/uart.o index 1670b89..27faf0e 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/bus/uart.o and b/Debug/Libs/sta-core/src/devices/stm32/bus/uart.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/can.cyclo b/Debug/Libs/sta-core/src/devices/stm32/can.cyclo index f175d26..70d57d4 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/can.cyclo +++ b/Debug/Libs/sta-core/src/devices/stm32/can.cyclo @@ -11,7 +11,7 @@ ../Libs/sta-core/src/devices/stm32/can.cpp:133:10:virtual void sta::STM32CanController::disableFilter(uint8_t) 1 ../Libs/sta-core/src/devices/stm32/can.cpp:142:10:virtual void sta::STM32CanController::clearFilters() 3 ../Libs/sta-core/src/devices/stm32/can.cpp:158:10:void sta::STM32CanController::initFilters() 2 -../Libs/sta-core/src/devices/stm32/can.cpp:172:23:virtual sta::CanPendingRxFifos sta::STM32CanController::getPendingRxFifos() 1 -../Libs/sta-core/src/devices/stm32/can.cpp:182:13:virtual uint8_t sta::STM32CanController::maxFilterCount() const 1 -../Libs/sta-core/src/devices/stm32/can.cpp:186:13:virtual uint8_t sta::STM32CanController::maxFifoCount() const 1 -../Libs/sta-core/src/devices/stm32/can.cpp:190:13:virtual uint8_t sta::STM32CanController::maxPayloadSize() const 1 +../Libs/sta-core/src/devices/stm32/can.cpp:172:23:virtual sta::CanPendingRxFifos sta::STM32CanController::getPendingRxFifos() 3 +../Libs/sta-core/src/devices/stm32/can.cpp:191:13:virtual uint8_t sta::STM32CanController::maxFilterCount() const 1 +../Libs/sta-core/src/devices/stm32/can.cpp:195:13:virtual uint8_t sta::STM32CanController::maxFifoCount() const 1 +../Libs/sta-core/src/devices/stm32/can.cpp:199:13:virtual uint8_t sta::STM32CanController::maxPayloadSize() const 1 diff --git a/Debug/Libs/sta-core/src/devices/stm32/can.d b/Debug/Libs/sta-core/src/devices/stm32/can.d index 40d5fb1..d82f3ef 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/can.d +++ b/Debug/Libs/sta-core/src/devices/stm32/can.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/can.o: \ ../Libs/sta-core/src/devices/stm32/can.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/can.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -40,6 +41,7 @@ Libs/sta-core/src/devices/stm32/can.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/can.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/can.o b/Debug/Libs/sta-core/src/devices/stm32/can.o index 56997c8..f4c8523 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/can.o and b/Debug/Libs/sta-core/src/devices/stm32/can.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/can.su b/Debug/Libs/sta-core/src/devices/stm32/can.su index 2d9756f..efb2f0d 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/can.su +++ b/Debug/Libs/sta-core/src/devices/stm32/can.su @@ -11,7 +11,7 @@ ../Libs/sta-core/src/devices/stm32/can.cpp:133:10:virtual void sta::STM32CanController::disableFilter(uint8_t) 24 static ../Libs/sta-core/src/devices/stm32/can.cpp:142:10:virtual void sta::STM32CanController::clearFilters() 24 static ../Libs/sta-core/src/devices/stm32/can.cpp:158:10:void sta::STM32CanController::initFilters() 24 static -../Libs/sta-core/src/devices/stm32/can.cpp:172:23:virtual sta::CanPendingRxFifos sta::STM32CanController::getPendingRxFifos() 16 static -../Libs/sta-core/src/devices/stm32/can.cpp:182:13:virtual uint8_t sta::STM32CanController::maxFilterCount() const 16 static -../Libs/sta-core/src/devices/stm32/can.cpp:186:13:virtual uint8_t sta::STM32CanController::maxFifoCount() const 16 static -../Libs/sta-core/src/devices/stm32/can.cpp:190:13:virtual uint8_t sta::STM32CanController::maxPayloadSize() const 16 static +../Libs/sta-core/src/devices/stm32/can.cpp:172:23:virtual sta::CanPendingRxFifos sta::STM32CanController::getPendingRxFifos() 24 static +../Libs/sta-core/src/devices/stm32/can.cpp:191:13:virtual uint8_t sta::STM32CanController::maxFilterCount() const 16 static +../Libs/sta-core/src/devices/stm32/can.cpp:195:13:virtual uint8_t sta::STM32CanController::maxFifoCount() const 16 static +../Libs/sta-core/src/devices/stm32/can.cpp:199:13:virtual uint8_t sta::STM32CanController::maxPayloadSize() const 16 static diff --git a/Debug/Libs/sta-core/src/devices/stm32/delay.d b/Debug/Libs/sta-core/src/devices/stm32/delay.d index c79e196..37c2bf6 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/delay.d +++ b/Debug/Libs/sta-core/src/devices/stm32/delay.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/delay.o: \ ../Libs/sta-core/src/devices/stm32/delay.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/delay.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -36,6 +37,7 @@ Libs/sta-core/src/devices/stm32/delay.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/delay.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/delay.o b/Debug/Libs/sta-core/src/devices/stm32/delay.o index e044367..b3a5dd5 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/delay.o and b/Debug/Libs/sta-core/src/devices/stm32/delay.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.d b/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.d index 10b5528..b6e87b9 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.d +++ b/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.d @@ -2,6 +2,7 @@ Libs/sta-core/src/devices/stm32/gpio_pin.o: \ ../Libs/sta-core/src/devices/stm32/gpio_pin.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/gpio_pin.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp \ ../Core/Inc/main.h ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h \ @@ -36,6 +37,7 @@ Libs/sta-core/src/devices/stm32/gpio_pin.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/lang.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/gpio_pin.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/hal.hpp: ../Core/Inc/main.h: diff --git a/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.o b/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.o index 94db576..992c1cd 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.o and b/Debug/Libs/sta-core/src/devices/stm32/gpio_pin.o differ diff --git a/Debug/Libs/sta-core/src/devices/stm32/init.d b/Debug/Libs/sta-core/src/devices/stm32/init.d index f36fd19..410f30f 100644 --- a/Debug/Libs/sta-core/src/devices/stm32/init.d +++ b/Debug/Libs/sta-core/src/devices/stm32/init.d @@ -3,8 +3,10 @@ Libs/sta-core/src/devices/stm32/init.o: \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/init.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/init.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/debug/assert.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/stm32/init.o b/Debug/Libs/sta-core/src/devices/stm32/init.o index 41f9ae8..3bcbe6c 100644 Binary files a/Debug/Libs/sta-core/src/devices/stm32/init.o and b/Debug/Libs/sta-core/src/devices/stm32/init.o differ diff --git a/Debug/Libs/sta-core/src/devices/template/custom_printable.d b/Debug/Libs/sta-core/src/devices/template/custom_printable.d index 136be1c..5011086 100644 --- a/Debug/Libs/sta-core/src/devices/template/custom_printable.d +++ b/Debug/Libs/sta-core/src/devices/template/custom_printable.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/template/custom_printable.o: \ ../Libs/sta-core/src/devices/template/custom_printable.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/template/custom_printable.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/template/custom_printable.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/template/custom_printable.o b/Debug/Libs/sta-core/src/devices/template/custom_printable.o index 86cff0e..5763e4a 100644 Binary files a/Debug/Libs/sta-core/src/devices/template/custom_printable.o and b/Debug/Libs/sta-core/src/devices/template/custom_printable.o differ diff --git a/Debug/Libs/sta-core/src/devices/template/delay.d b/Debug/Libs/sta-core/src/devices/template/delay.d index c2adae5..a459828 100644 --- a/Debug/Libs/sta-core/src/devices/template/delay.d +++ b/Debug/Libs/sta-core/src/devices/template/delay.d @@ -2,7 +2,9 @@ Libs/sta-core/src/devices/template/delay.o: \ ../Libs/sta-core/src/devices/template/delay.cpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/template/delay.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp \ + /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp \ /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/template/delay.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/App/Inc/sta/config.hpp: +/Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/STM32F407xx.hpp: /Users/carlos/Documents/RWTH/space_team/CAN-Demo/Libs/sta-core/include/sta/devices/stm32/mcu/common.hpp: diff --git a/Debug/Libs/sta-core/src/devices/template/delay.o b/Debug/Libs/sta-core/src/devices/template/delay.o index 38cfa84..8dad1b0 100644 Binary files a/Debug/Libs/sta-core/src/devices/template/delay.o and b/Debug/Libs/sta-core/src/devices/template/delay.o differ diff --git a/Debug/objects.list b/Debug/objects.list index 0ae75c9..d5e3f5c 100644 --- a/Debug/objects.list +++ b/Debug/objects.list @@ -32,6 +32,7 @@ "./Libs/TACOS/src/manager.o" "./Libs/TACOS/src/startup.o" "./Libs/TACOS/src/statemachine.o" +"./Libs/TACOS/src/tacos.o" "./Libs/TACOS/src/thread.o" "./Libs/rtos2-utils/src/debug/heap_stats.o" "./Libs/rtos2-utils/src/debug/runtime_stats.o" diff --git a/Libs/rtos2-utils b/Libs/rtos2-utils index ce2bb45..9433b59 160000 --- a/Libs/rtos2-utils +++ b/Libs/rtos2-utils @@ -1 +1 @@ -Subproject commit ce2bb459cf43ed802d773a8da5883776678ed8e2 +Subproject commit 9433b5990d155862454d5d7f99cf86e89a369ef0 diff --git a/Libs/sta-core b/Libs/sta-core index e249963..62e275f 160000 --- a/Libs/sta-core +++ b/Libs/sta-core @@ -1 +1 @@ -Subproject commit e249963b4b2a9d50f437c04fa632ad27e0a3004a +Subproject commit 62e275f667092645c5ad487a36ad7d00bd43cf52