Your ROOT_URL in app.ini is https://git.ondrovo.com/ but you are visiting http://159.69.29.240:49153/electro/stm32f103-cmake-boilerplate/commit/eb8d4d07fc4a0294de13adb2ea368048fc4b2a9c?style=split&whitespace=show-all You should set ROOT_URL correctly, otherwise the web may not work correctly.
electro
/
stm32f103-cmake-boilerplate
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed project etc

Browse Source
master
Ondřej Hruška 9 years ago
parent 4b4b626283
commit eb8d4d07fc
8 changed files with 12 additions and 11 deletions
  1. 8
      .idea/f103-bluepill.iml
  2. 6
      .idea/misc.xml
  3. 4
      .idea/modules.xml
  4. 2
      CMakeLists.txt
  5. 1
      Src/main.c
  6. 0
      f103-bluepill.ioc
  7. 2
      f103-bluepill.xml
  8. 0
      f103.cmake

8
.idea/f103-simon.iml → .idea/f103-bluepill.iml
Unescape View File

@ -2,7 +2,6 @@
<module type="CPP_MODULE" version="4"> <module type="CPP_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/bluepill.cmake" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/CMakeLists.txt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/User/utils/debug.h" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/User/utils/debug.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/User/utils/timebase.h" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/User/utils/timebase.h" isTestSource="false" />
@ -19,26 +18,27 @@
<sourceFolder url="file://$MODULE_DIR$/User/user_main.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/User/user_main.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/User/init.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/User/init.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/User/handlers.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/User/handlers.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_hal_msp.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/f103.cmake" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Src/gpio.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Src/gpio.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_it.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_it.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Src/main.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Src/main.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Src/usart.c" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Src/usart.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Src/stm32f1xx_hal_msp.c" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/STM32F103C8Tx_FLASH.ld" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/STM32F103C8Tx_FLASH.ld" isTestSource="false" />
</content> </content>
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Header Search Paths"> <library name="Header Search Paths">
<CLASSES> <CLASSES>
<root url="file:///usr/arm-none-eabi/include" />
<root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include-fixed" /> <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include-fixed" />
<root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include" /> <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include" />
<root url="file:///usr/arm-none-eabi/include" />
<root url="file://$MODULE_DIR$/Drivers" /> <root url="file://$MODULE_DIR$/Drivers" />
</CLASSES> </CLASSES>
<SOURCES> <SOURCES>
<root url="file:///usr/arm-none-eabi/include" />
<root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include-fixed" /> <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include-fixed" />
<root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include" /> <root url="file:///usr/lib/gcc/arm-none-eabi/6.1.1/include" />
<root url="file:///usr/arm-none-eabi/include" />
<root url="file://$MODULE_DIR$/Drivers" /> <root url="file://$MODULE_DIR$/Drivers" />
</SOURCES> </SOURCES>
</library> </library>

6
.idea/misc.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" /> <component name="CMakeWorkspace" PROJECT_DIR="$USER_HOME$/devel/f103-bluepill" />
<component name="CidrRootsConfiguration"> <component name="CidrRootsConfiguration">
<libraryRoots> <libraryRoots>
<file path="$PROJECT_DIR$/Drivers" /> <file path="$USER_HOME$/devel/f103-bluepill/Drivers" />
</libraryRoots> </libraryRoots>
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@ -16,4 +16,4 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
</project> </project>

4
.idea/modules.xml
Unescape View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/f103-simon.iml" filepath="$PROJECT_DIR$/.idea/f103-simon.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/f103-bluepill.iml" filepath="$PROJECT_DIR$/.idea/f103-bluepill.iml" />
</modules> </modules>
</component> </component>
</project> </project>

2
CMakeLists.txt
Unescape View File

@ -1,4 +1,4 @@
project(f103-simon C ASM) project(f103-bluepill C ASM)
cmake_minimum_required(VERSION 3.5.0) cmake_minimum_required(VERSION 3.5.0)
file(GLOB_RECURSE USER_SOURCES "Src/*.c" "User/*.c") file(GLOB_RECURSE USER_SOURCES "Src/*.c" "User/*.c")

1
Src/main.c
Unescape View File

@ -36,6 +36,7 @@
#include "gpio.h" #include "gpio.h"
/* USER CODE BEGIN Includes */ /* USER CODE BEGIN Includes */
#include "handlers.h"
#include "user_main.h" #include "user_main.h"
/* USER CODE END Includes */ /* USER CODE END Includes */

0
bluepill.ioc → f103-bluepill.ioc
Unescape View File

2
bluepill.xml → f103-bluepill.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<targetDefinitions xmlns="http://openstm32.org/stm32TargetDefinitions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openstm32.org/stm32TargetDefinitions stm32TargetDefinitions.xsd"> <targetDefinitions xmlns="http://openstm32.org/stm32TargetDefinitions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openstm32.org/stm32TargetDefinitions stm32TargetDefinitions.xsd">
<board id="f103-simon"> <board id="f103-simon">
<name>f103-simon</name> <name>f103-bluepill</name>
<mcuId>STM32F103C8Tx</mcuId> <!-- mcu--> <mcuId>STM32F103C8Tx</mcuId> <!-- mcu-->
<dbgIF>SWD</dbgIF> <dbgIF>SWD</dbgIF>
<dbgDEV /> <dbgDEV />

0
bluepill.cmake → f103.cmake
Unescape View File

Write Preview
Loading…
Cancel
Save