Skip to content
This repository was archived by the owner on Feb 14, 2021. It is now read-only.

Project built by Aymar Muhikira from the OBC-1.0 branch #4

Open
AymarMuhikira wants to merge 2 commits into
base: OBC-1.0
Choose a base branch
from
Open

Project built by Aymar Muhikira from the OBC-1.0 branch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c48269a
Project built by Aymar Muhikira from the OBC-1.0 branch
AymarMuhikira Jul 13, 2019
f0dcfb0
Steps to build the project from branch OBC 1.0
AymarMuhikira Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion obc/upsat-obc-software-master/cubeMX/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*********************************************************************
*
Expand Down
2 changes: 1 addition & 1 deletion obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 1 addition & 0 deletions obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion obc/upsat-obc-software-master/cubeMX/SystemView/Src/SEGGER/SEGGER_RTT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*********************************************************************
*
Expand Down
65 changes: 10 additions & 55 deletions obc/upsat-obc-software-master/cubeMX/disco/EWARM/Project.emProject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@
<project Name="disco">
<configuration
Name="Common"
arm_architecture="v7EM"
arm_core_type="Cortex-M4"
arm_endian="Little"
arm_fp_abi="Hard"
arm_fpu_type="FPv4-SP-D16"
arm_linker_variant="SEGGER"
arm_simulator_memory_simulation_parameter="RX 08000000,00100000,FFFFFFFF;RWX 20000000,00020000,CDCDCDCD"
arm_target_device_name="STM32F405RG"
arm_target_interface_type="SWD"
debug_start_from_entry_point_symbol="No"
debug_target_connection="J-Link"
link_linker_script_file="$(StudioDir)/samples/SEGGER_Flash.icf"
linker_section_placements_segments="FLASH RX 0x08000000 0x00100000;RAM RWX 0x20000000 0x00020000"
linker_section_placements_segments="FLASH1 RX 0x08000000 0x00100000;RAM1 RWX 0x20000000 0x00020000"
project_directory=""
project_type="Executable" />
<folder Name="Internal Files">
Expand All @@ -25,15 +22,10 @@
<configuration
CMSIS_CORE="Yes"
Name="disco"
arm_assembler_variant="clang"
arm_linker_variant="SEGGER"
arm_target_interface_type="JTAG"
build_intermediate_directory="disco/Obj"
build_output_directory="disco/Exe"
c_preprocessor_definitions="USE_HAL_DRIVER;STM32F405xx"
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"
debug_target_connection="Simulator"
gcc_cplusplus_language_standard="gnu++14" />
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" />
<folder Name="Application">
<folder Name="EWARM">
<file file_name="./../Drivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s">
Expand Down Expand Up @@ -102,54 +94,17 @@
<file file_name="./../Middlewares/Third_Party/FreeRTOS/Source/queue.c" />
</folder>
</folder>
<folder Name="Extra">
<folder Name="OS">
<file file_name="../../SystemView/Src/OS/os_trace.h" />
<file file_name="../../SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h" />
<file file_name="../../SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.c" />
</folder>
<folder Name="Config">
<file file_name="../../SystemView/Src/Config/Global.h" />
<file file_name="../../SystemView/Src/Config/os_cfg_trace.h" />
<file file_name="../../SystemView/Src/Config/SEGGER_RTT_Conf.h" />
<file file_name="../../SystemView/Src/Config/SEGGER_SYSVIEW_Conf.h" />
<file file_name="../../SystemView/Src/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c" />
</folder>
<folder Name="RTOS">
<file file_name="../../SystemView/Src/SEGGER/SEGGER.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_RTT.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW_Int.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_RTT.c" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW.c" />
</folder>
<folder Name="The last 2" />
</folder>
<folder Name="Services">
<folder Name="OBC">
<file file_name="../../../../../services/platform/obc/hal/stm32/obc_hal.h" />
<file file_name="../../../../../services/platform/obc/hal/stm32/obc_hal.c" />
</folder>
<folder Name="ExtraFiles">
<file file_name="../../obc/SystemView/Src/SEGGER/SEGGER_SYSVIEW.c" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_RTT.c" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_RTT.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW.h" />
<file file_name="../../obc/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.c" />
<file file_name="../../obc/SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.h" />
<file file_name="../../../../../services/platform/obc/obc.c" />
<file file_name="../../../../../services/platform/obc/obc.h" />
</folder>
</project>
<configuration Name="Internal" hidden="Yes" />
<configuration
Name="disco"
arm_architecture="v7EM"
arm_core_type="Cortex-M4"
arm_endian="Little"
arm_fp_abi="Hard"
arm_fpu_type="FPv4-SP-D16"
arm_linker_variant="SEGGER"
arm_simulator_memory_simulation_parameter="RX 08000000,00100000,FFFFFFFF;RWX 20000000,00020000,CDCDCDCD"
arm_target_device_name="STM32F405RG"
arm_target_interface_type="SWD"
debug_target_connection="J-Link"
gcc_entry_point="reset_handler"
inherited_configurations="Internal"
linker_memory_map_macros=""
linker_section_placements_segments="FLASH RX 0x0001B000 0x00040000; SRAM RWX 0x20002000 0x00004000" />
<configuration Name="disco" inherited_configurations="Internal" />
</solution>
Loading