From c48269af4d909ab0649ff0d3c79fc8c50f53329e Mon Sep 17 00:00:00 2001 From: AymarMuhikira Date: Sat, 13 Jul 2019 16:54:23 -0400 Subject: [PATCH 1/2] Project built by Aymar Muhikira from the OBC-1.0 branch --- .../Src/OS/SEGGER_SYSVIEW_FreeRTOS.h | 2 +- .../cubeMX/SystemView/Src/SEGGER/SEGGER.h | 2 +- .../cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.c | 1 + .../cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.h | 2 +- .../cubeMX/disco/EWARM/Project.emProject | 65 +- .../cubeMX/disco/EWARM/Project.emSession | 88 +- .../cubeMX/disco/EWARM/disco/Exe/disco.elf | Bin 568177 -> 562715 bytes .../cubeMX/disco/EWARM/disco/Exe/disco.map | 2828 +++++----- .../disco/EWARM/disco/Obj/Cortex_M_Startup.d | 2 +- .../disco/EWARM/disco/Obj/Cortex_M_Startup.o | Bin 5404 -> 3940 bytes .../cubeMX/disco/EWARM/disco/Obj/SEGGER_RTT.d | 10 +- .../cubeMX/disco/EWARM/disco/Obj/SEGGER_RTT.o | Bin 27484 -> 27520 bytes .../disco/EWARM/disco/Obj/SEGGER_SYSVIEW.d | 26 +- .../disco/EWARM/disco/Obj/SEGGER_SYSVIEW.o | Bin 76884 -> 76928 bytes .../EWARM/disco/Obj/SEGGER_SYSVIEW_FreeRTOS.d | 20 +- .../EWARM/disco/Obj/SEGGER_SYSVIEW_FreeRTOS.o | Bin 13932 -> 13988 bytes .../EWARM/disco/Obj/SEGGER_THUMB_Startup.d | 2 +- .../EWARM/disco/Obj/SEGGER_THUMB_Startup.o | Bin 7252 -> 6792 bytes .../disco/EWARM/disco/Obj/bsp_driver_sd.asm | 4957 +++++++++++++++++ .../disco/EWARM/disco/Obj/bsp_driver_sd.d | 8 +- .../disco/EWARM/disco/Obj/bsp_driver_sd.o | Bin 23132 -> 23168 bytes .../cubeMX/disco/EWARM/disco/Obj/cmsis_os.d | 22 +- .../cubeMX/disco/EWARM/disco/Obj/cmsis_os.o | Bin 39900 -> 39936 bytes .../cubeMX/disco/EWARM/disco/Obj/croutine.asm | 1285 +++++ .../cubeMX/disco/EWARM/disco/Obj/croutine.d | 18 +- .../cubeMX/disco/EWARM/disco/Obj/croutine.o | Bin 6388 -> 6408 bytes .../cubeMX/disco/EWARM/disco/Obj/disco.ind | 20 +- .../cubeMX/disco/EWARM/disco/Obj/diskio.d | 28 +- .../cubeMX/disco/EWARM/disco/Obj/diskio.o | Bin 11428 -> 11464 bytes .../disco/EWARM/disco/Obj/event_groups.d | 42 +- .../disco/EWARM/disco/Obj/event_groups.o | Bin 17052 -> 17100 bytes .../cubeMX/disco/EWARM/disco/Obj/fatfs.asm | 1890 +++++++ .../cubeMX/disco/EWARM/disco/Obj/fatfs.d | 20 +- .../cubeMX/disco/EWARM/disco/Obj/fatfs.o | Bin 9288 -> 9324 bytes .../cubeMX/disco/EWARM/disco/Obj/ff.d | 28 +- .../cubeMX/disco/EWARM/disco/Obj/ff.o | Bin 72276 -> 72308 bytes .../cubeMX/disco/EWARM/disco/Obj/ff_gen_drv.d | 28 +- .../cubeMX/disco/EWARM/disco/Obj/ff_gen_drv.o | Bin 11248 -> 11284 bytes .../cubeMX/disco/EWARM/disco/Obj/freertos.d | 18 +- .../cubeMX/disco/EWARM/disco/Obj/freertos.o | Bin 6352 -> 6372 bytes .../cubeMX/disco/EWARM/disco/Obj/heap_4.asm | 2910 ++++++++++ .../cubeMX/disco/EWARM/disco/Obj/heap_4.d | 20 +- .../cubeMX/disco/EWARM/disco/Obj/heap_4.o | Bin 13568 -> 13604 bytes .../cubeMX/disco/EWARM/disco/Obj/list.asm | 2225 ++++++++ .../cubeMX/disco/EWARM/disco/Obj/list.d | 20 +- .../cubeMX/disco/EWARM/disco/Obj/list.o | Bin 10220 -> 10256 bytes .../cubeMX/disco/EWARM/disco/Obj/main.d | 53 +- .../cubeMX/disco/EWARM/disco/Obj/main.o | Bin 52692 -> 52772 bytes .../cubeMX/disco/EWARM/disco/Obj/obc.d | 62 +- .../cubeMX/disco/EWARM/disco/Obj/obc.o | Bin 38532 -> 38596 bytes .../cubeMX/disco/EWARM/disco/Obj/port.d | 32 +- .../cubeMX/disco/EWARM/disco/Obj/port.o | Bin 13820 -> 13872 bytes .../cubeMX/disco/EWARM/disco/Obj/queue.d | 38 +- .../cubeMX/disco/EWARM/disco/Obj/queue.o | Bin 29104 -> 29156 bytes .../cubeMX/disco/EWARM/disco/Obj/sd_diskio.d | 22 +- .../cubeMX/disco/EWARM/disco/Obj/sd_diskio.o | Bin 13828 -> 13860 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal.o | Bin 22200 -> 22236 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_adc.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_adc.o | Bin 29412 -> 29448 bytes .../EWARM/disco/Obj/stm32f4xx_hal_adc_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_adc_ex.o | Bin 24172 -> 24204 bytes .../EWARM/disco/Obj/stm32f4xx_hal_cortex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_cortex.o | Bin 28584 -> 28616 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_dma.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_dma.o | Bin 19028 -> 19060 bytes .../EWARM/disco/Obj/stm32f4xx_hal_dma_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_dma_ex.o | Bin 12816 -> 12852 bytes .../EWARM/disco/Obj/stm32f4xx_hal_flash.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_flash.o | Bin 18416 -> 18444 bytes .../EWARM/disco/Obj/stm32f4xx_hal_flash_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_flash_ex.o | Bin 19056 -> 19092 bytes .../disco/Obj/stm32f4xx_hal_flash_ramfunc.d | 8 +- .../disco/Obj/stm32f4xx_hal_flash_ramfunc.o | Bin 6692 -> 6708 bytes .../EWARM/disco/Obj/stm32f4xx_hal_gpio.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_gpio.o | Bin 15972 -> 16008 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_msp.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_msp.o | Bin 31048 -> 31084 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_pwr.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_pwr.o | Bin 17652 -> 17684 bytes .../EWARM/disco/Obj/stm32f4xx_hal_pwr_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_pwr_ex.o | Bin 12648 -> 12684 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_rcc.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_rcc.o | Bin 22664 -> 22700 bytes .../EWARM/disco/Obj/stm32f4xx_hal_rcc_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_rcc_ex.o | Bin 12184 -> 12216 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_rtc.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_rtc.o | Bin 26636 -> 26672 bytes .../EWARM/disco/Obj/stm32f4xx_hal_rtc_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_rtc_ex.o | Bin 35044 -> 35076 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_sd.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_sd.o | Bin 57540 -> 57576 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_spi.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_spi.o | Bin 46824 -> 46856 bytes .../disco/EWARM/disco/Obj/stm32f4xx_hal_tim.d | 8 +- .../disco/EWARM/disco/Obj/stm32f4xx_hal_tim.o | Bin 85748 -> 85784 bytes .../EWARM/disco/Obj/stm32f4xx_hal_tim_ex.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_tim_ex.o | Bin 38092 -> 38124 bytes .../disco/Obj/stm32f4xx_hal_timebase_TIM.d | 8 +- .../disco/Obj/stm32f4xx_hal_timebase_TIM.o | Bin 19060 -> 19096 bytes .../EWARM/disco/Obj/stm32f4xx_hal_uart.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_hal_uart.o | Bin 37040 -> 37076 bytes .../disco/EWARM/disco/Obj/stm32f4xx_it.d | 20 +- .../disco/EWARM/disco/Obj/stm32f4xx_it.o | Bin 19892 -> 19928 bytes .../EWARM/disco/Obj/stm32f4xx_ll_sdmmc.d | 8 +- .../EWARM/disco/Obj/stm32f4xx_ll_sdmmc.o | Bin 14664 -> 14700 bytes .../cubeMX/disco/EWARM/disco/Obj/syscall.d | 26 +- .../cubeMX/disco/EWARM/disco/Obj/syscall.o | Bin 10704 -> 10744 bytes .../disco/EWARM/disco/Obj/system_stm32f4xx.d | 8 +- .../disco/EWARM/disco/Obj/system_stm32f4xx.o | Bin 10752 -> 10764 bytes .../cubeMX/disco/EWARM/disco/Obj/tasks.d | 42 +- .../cubeMX/disco/EWARM/disco/Obj/tasks.o | Bin 54500 -> 54548 bytes .../cubeMX/disco/EWARM/disco/Obj/timers.asm | 1285 +++++ .../cubeMX/disco/EWARM/disco/Obj/timers.d | 40 +- .../cubeMX/disco/EWARM/disco/Obj/timers.o | Bin 6384 -> 6404 bytes .../FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h | 2 +- .../Third_Party/FreeRTOS/Source/croutine.c | 2 +- .../FreeRTOS/Source/event_groups.c | 10 +- .../Third_Party/FreeRTOS/Source/list.c | 2 +- .../Source/portable/IAR/ARM_CM4F/port.c | 6 +- .../FreeRTOS/Source/portable/MemMang/heap_4.c | 2 +- .../Third_Party/FreeRTOS/Source/queue.c | 8 +- .../Third_Party/FreeRTOS/Source/tasks.c | 10 +- .../Third_Party/FreeRTOS/Source/timers.c | 10 +- .../cubeMX/disco/Src/freertos.c | 2 +- .../cubeMX/disco/Src/main.c | 8 +- .../Src/OS/SEGGER_SYSVIEW_FreeRTOS.c | 5 +- .../Src/OS/SEGGER_SYSVIEW_FreeRTOS.h | 2 +- .../cubeMX/obc/SystemView/Src/SEGGER/SEGGER.h | 2 +- .../obc/SystemView/Src/SEGGER/SEGGER_RTT.h | 2 +- .../SystemView/Src/SEGGER/SEGGER_SYSVIEW.c | 2 + .../Src/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h | 4 +- .../Src/SEGGER/SEGGER_SYSVIEW_Int.h | 2 +- services/core/pkt_pool.h | 4 +- services/core/su_mnlp.h | 12 +- services/core/upsat.h | 4 +- services/platform/obc/hal/stm32/obc_hal.h | 4 +- services/platform/obc/hal/stm32/uart_hal.h | 4 +- services/platform/obc/housekeeping.h | 2 +- services/platform/obc/obc.c | 4 +- services/platform/obc/obc.h | 4 +- services/services/scheduling_service.h | 4 +- services/services/time_management_service.h | 4 +- 143 files changed, 16553 insertions(+), 1981 deletions(-) create mode 100644 obc/upsat-obc-software-master/cubeMX/disco/EWARM/disco/Obj/bsp_driver_sd.asm create mode 100644 obc/upsat-obc-software-master/cubeMX/disco/EWARM/disco/Obj/croutine.asm create mode 100644 obc/upsat-obc-software-master/cubeMX/disco/EWARM/disco/Obj/fatfs.asm create mode 100644 obc/upsat-obc-software-master/cubeMX/disco/EWARM/disco/Obj/heap_4.asm create mode 100644 obc/upsat-obc-software-master/cubeMX/disco/EWARM/disco/Obj/list.asm create mode 100644 obc/upsat-obc-software-master/cubeMX/disco/EWARM/disco/Obj/timers.asm diff --git a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h index 109b720..32b33e7 100644 --- a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h +++ b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h @@ -52,7 +52,7 @@ Purpose : Interface between FreeRTOS and SystemView. #ifndef SYSVIEW_FREERTOS_H #define SYSVIEW_FREERTOS_H -#include "/home/ignacio/Documents/ecss/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_SYSVIEW.h" +#include "C:\Users\Aymar\Desktop\MSG\msg-obc-software\obc\upsat-obc-software-master\cubeMX\SystemView\Src\SEGGER\SEGGER_SYSVIEW.h" /********************************************************************* * diff --git a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER.h b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER.h index bb534cd..55b8ee6 100644 --- a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER.h +++ b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER.h @@ -50,7 +50,7 @@ Purpose : Global types etc & general purpose utility functions #ifndef SEGGER_H // Guard against multiple inclusion #define SEGGER_H -#include "/home/ignacio/Documents/ecss/obc/upsat-obc-software-master/cubeMX/SystemView/Src/Config/Global.h" // Type definitions: U8, U16, U32, I8, I16, I32 +#include "C:\Users\Aymar\Desktop\MSG\msg-obc-software\obc\upsat-obc-software-master\cubeMX\SystemView\Src\Config\Global.h" // Type definitions: U8, U16, U32, I8, I16, I32 #if defined(__cplusplus) extern "C" { /* Make sure we have C-declarations in C++ programs */ diff --git a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.c b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.c index 2e6efac..51eded5 100644 --- a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.c +++ b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.c @@ -417,6 +417,7 @@ static unsigned _GetAvailWriteSpace(SEGGER_RTT_BUFFER_UP* pRing) { * Return value * Number of bytes that have been read. */ + unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned BufferSize) { unsigned NumBytesRem; unsigned NumBytesRead; diff --git a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.h b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.h index 013f4b2..9d03d28 100644 --- a/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.h +++ b/obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.h @@ -52,7 +52,7 @@ Purpose : Implementation of SEGGER real-time transfer which allows #ifndef SEGGER_RTT_H #define SEGGER_RTT_H -#include "/home/ignacio/Documents/ecss/obc/upsat-obc-software-master/cubeMX/SystemView/Src/Config/SEGGER_RTT_Conf.h" +#include "C:\Users\Aymar\Desktop\MSG\msg-obc-software\obc\upsat-obc-software-master\cubeMX\SystemView\Src\Config\SEGGER_RTT_Conf.h" /********************************************************************* * diff --git a/obc/upsat-obc-software-master/cubeMX/disco/EWARM/Project.emProject b/obc/upsat-obc-software-master/cubeMX/disco/EWARM/Project.emProject index ff3df2e..2f76a80 100644 --- a/obc/upsat-obc-software-master/cubeMX/disco/EWARM/Project.emProject +++ b/obc/upsat-obc-software-master/cubeMX/disco/EWARM/Project.emProject @@ -3,11 +3,8 @@ @@ -25,15 +22,10 @@ + c_user_include_directories=";./../Inc;./../Drivers/STM32F4xx_HAL_Driver/Inc;./../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;./../Middlewares/Third_Party/FatFs/src/drivers;./../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM4F;./../Middlewares/Third_Party/FatFs/src;./../Middlewares/Third_Party/FreeRTOS/Source/include;./../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS;./../Drivers/CMSIS/Include;./../Drivers/CMSIS/Device/ST/STM32F4xx/Include" /> @@ -102,54 +94,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +