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

Obc 1.12 #5

Open
AymarMuhikira wants to merge 5 commits into
base: OBC-1.1
Choose a base branch
from
Open

Obc 1.12 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7152b1c
Project built from OBC-1.1 with relative paths
AymarMuhikira Aug 1, 2019
c8338f8
Added the flashing instructions for windows
AymarMuhikira Aug 1, 2019
4903c29
Added comments for global variables in main
AymarMuhikira Aug 2, 2019
c13c34e
Merge branch 'OBC-1.12' of https://github.com/mcgillspace/msg-obc-sof…
AymarMuhikira Aug 2, 2019
b70c930
Update README.md
Oct 7, 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
4 changes: 2 additions & 2 deletions OBC/cubeMX/SystemView/Src/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ Purpose : Defines defaults for configurable defines used in
**********************************************************************
*/

#include "SEGGER_SYSVIEW_Conf.h"
#include "SEGGER_RTT_Conf.h"
#include "../Config/SEGGER_SYSVIEW_Conf.h"
#include "../Config/SEGGER_RTT_Conf.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion OBC/cubeMX/SystemView/Src/SEGGER/SEGGER_SYSVIEW_Int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Purpose : SEGGER SysView internal header.
*/

#include "SEGGER_SYSVIEW.h"
#include "SEGGER_SYSVIEW_Conf.h"
#include "../Config/SEGGER_SYSVIEW_Conf.h"
#include "SEGGER_SYSVIEW_ConfDefaults.h"

#ifdef __cplusplus
Expand Down
28 changes: 10 additions & 18 deletions OBC/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 @@ -24,17 +21,12 @@
</folder>
<configuration
CMSIS_CORE="Yes"
Connection="USB"
Name="disco"
arm_assembler_variant="gcc"
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_c_language_standard="gnu11"
linker_output_format="None" />
debug_target_connection="Simulator" />
<folder Name="Application">
<folder Name="EWARM">
<file file_name="./../Drivers/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s">
Expand Down Expand Up @@ -63,18 +55,18 @@
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c" />
<file file_name="./../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c" />
Expand All @@ -83,8 +75,8 @@
<folder Name="Middlewares">
<folder Name="FatFs">
<file file_name="./../Middlewares/Third_Party/FatFs/src/diskio.c" />
<file file_name="./../Middlewares/Third_Party/FatFs/src/ff.c" />
<file file_name="./../Middlewares/Third_Party/FatFs/src/option/syscall.c" />
<file file_name="./../Middlewares/Third_Party/FatFs/src/ff.c" />
<file file_name="./../Middlewares/Third_Party/FatFs/src/ff_gen_drv.c" />
<file file_name="./../Middlewares/Third_Party/FatFs/src/drivers/sd_diskio.c" />
</folder>
Expand All @@ -103,9 +95,9 @@
<file file_name="./../Middlewares/Third_Party/FreeRTOS/Source/queue.c" />
</folder>
</folder>
<folder Name="EXtras">
<file file_name="../../obc/SystemView/Src/SEGGER/SEGGER_SYSVIEW.c" />
<file file_name="../../obc/SystemView/Src/SEGGER/SEGGER_SYSVIEW.h" />
<folder Name="Extra_files">
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW.c" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_SYSVIEW.h" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_RTT.c" />
<file file_name="../../SystemView/Src/SEGGER/SEGGER_RTT.h" />
<file file_name="../../SystemView/Src/OS/SEGGER_SYSVIEW_FreeRTOS.c" />
Expand Down
49 changes: 49 additions & 0 deletions OBC/cubeMX/disco/EWARM/Project.emSession
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!DOCTYPE CrossStudio_Session_File>
<session>
<Bookmarks/>
<Breakpoints groups="Breakpoints" active_group="Breakpoints">
<Exceptions set="MemManage;UsageFault_Coprocessor;UsageFault_CheckingError;UsageFault_StateError;BusFault;ExceptionEntryReturnFault;HardFault"/>
</Breakpoints>
<ExecutionProfileWindow/>
<FrameBufferWindow>
<FrameBufferWindow bufferHeight="-1" addressSpace="" addressText="" bufferWidth="-1"/>
</FrameBufferWindow>
<Memory1/>
<Memory2/>
<Memory3/>
<Memory4/>
<Project>
<ProjectSessionItem path="Project"/>
<ProjectSessionItem path="Project;disco"/>
<ProjectSessionItem path="Project;disco;Application"/>
<ProjectSessionItem path="Project;disco;Application;User"/>
<ProjectSessionItem path="Project;disco;Extra_files"/>
<ProjectSessionItem path="Project;disco;Middlewares"/>
</Project>
<Register1/>
<Register2/>
<Register3/>
<Register4/>
<Threads>
<ThreadsWindow showLists=""/>
</Threads>
<TraceWindow>
<Trace enabled="Yes"/>
</TraceWindow>
<Watch1>
<Watches active="1" update="Never"/>
</Watch1>
<Watch2>
<Watches active="0" update="Never"/>
</Watch2>
<Watch3>
<Watches active="0" update="Never"/>
</Watch3>
<Watch4>
<Watches active="0" update="Never"/>
</Watch4>
<Files>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="61" useTextEdit="1" useBinaryEdit="0" left="0" path="../Src/main.c" selected="1" top="29" codecName="Default"/>
</Files>
<ARMCrossStudioWindow activeProject="disco" fileDialogDefaultFilter="*.c" autoConnectTarget="Simulator" buildConfiguration="disco" sessionSettings="" debugSearchFileMap="" fileDialogInitialDirectory="C:/Users/Aymar/Desktop/MSG/msg-obc-software/Services/platform/obc" debugSearchPath="" autoConnectCapabilities="4543"/>
</session>
Binary file modified OBC/cubeMX/disco/EWARM/disco/Exe/disco.elf
View file
Open in desktop
Binary file not shown.
Loading