diff --git a/README.md b/README.md index 04cc57c..cabe407 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,5 @@ Note that the compression has been changed from '.zip' to '.7z' as the resulting 25/06/2019 - OBC 0.4 Fixed the infamous xTaskGenericCreate() error by removing an extra semicolon at the end of the declaration. Proceeded forward with a few header errors and managed to arrive to 'hldlc_UT.c'. Apparently, a function defined in 'hldlc.h' called "HLDLC_frame" is defined to take 3 arguments, however the function call in 'hldlc_UT.c' uses 4 different parameters, thus returning an error. We are currently working to understand the nature of the function so we can proceed and decisively remove the extra parameter. After all, the files being compiled now are unity tests that verify the integrity of the code. Therefore, we are currently fixing the last parts of what will eventually become our first testable binary 09/07/2019 - OBC 1.0 Rebuilt the project as an IAR project using the project import tool within Segger, we then proceeded to fix any header references remaining. We encountered an issue with undefined functiones and variables within the project, and all that needed to be done was #define the functions that were never done so, and #include the files where some were defined but not compiled. Finally, we managed to build a binary file which can be found in the EWARM forlder of the OBC directory. + +15/07/2019 -OBC 1.02 Project built on another computer using the project in the OBC 1.0 branch to test that other members can rebuild the project. 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +