Skip to content

Commit

Permalink
Заменен загрузчик на ST CUBE. I2C реботает. Требуется проверка работы…
Browse files Browse the repository at this point in the history
… записи памяти
  • Loading branch information
g_tanchin committed Aug 18, 2016
1 parent 156d73c commit ef5f609
Show file tree
Hide file tree
Showing 135 changed files with 58,874 additions and 73,287 deletions.
5 changes: 3 additions & 2 deletions .cproject
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="STM32F030"/>
<listOptionValue builtIn="false" value="HSE_VALUE=16000000"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="STM32F030x6"/>
<listOptionValue builtIn="false" value="BLUENRG=1"/>
<listOptionValue builtIn="false" value="WATCHDOG=0"/>
<listOptionValue builtIn="false" value="USE_STDPERIPH_DRIVER"/>
<listOptionValue builtIn="false" value="ONE_WIRE=1"/>
</option>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.779950081" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std" value="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c99" valueType="enumerated"/>
<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.104434050" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
</tool>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1090550073" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
Expand Down Expand Up @@ -139,7 +139,8 @@
<listOptionValue builtIn="false" value="libs.ld"/>
<listOptionValue builtIn="false" value="sections.ld"/>
</option>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart.785600946" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart.785600946" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.nostart" value="false" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano.2092942924" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano" value="true" valueType="boolean"/>
<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input.976749587" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
Expand Down
2 changes: 1 addition & 1 deletion .settings/language.settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1563855075175603230" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1644985027160785769" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
Binary file removed Debug/expedition.0.bin
Binary file not shown.
Binary file modified Debug/expedition.bin
Binary file not shown.
Binary file added Debug/expedition.elf
Binary file not shown.
3,064 changes: 1,278 additions & 1,786 deletions Debug/expedition.map

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions Debug/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ RM := rm -rf
# All of the sources participating in the build are defined here
-include sources.mk
-include system/src/stm32f0-stdperiph/subdir.mk
-include system/src/newlib/subdir.mk
-include system/src/diag/subdir.mk
-include system/src/cortexm/subdir.mk
-include system/src/cmsis/subdir.mk
-include src/subdir.mk
-include bluenrg/src/subdir.mk
Expand Down Expand Up @@ -62,7 +59,7 @@ all: expedition.elf secondary-outputs
expedition.elf: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: Cross ARM C++ Linker'
arm-none-eabi-g++ -mcpu=cortex-m0 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -Wall -Wextra -g3 -T mem.ld -T libs.ld -T sections.ld -nostartfiles -Xlinker --gc-sections -L"../ldscripts" -Wl,-Map,"expedition.map" -o "expedition.elf" $(OBJS) $(USER_OBJS) $(LIBS)
arm-none-eabi-g++ -mcpu=cortex-m0 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -Wall -Wextra -g3 -T mem.ld -T libs.ld -T sections.ld -Xlinker --gc-sections -L"../ldscripts" -Wl,-Map,"expedition.map" --specs=nano.specs -o "expedition.elf" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '

Expand Down
3 changes: 0 additions & 3 deletions Debug/sources.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ S_UPPER_DEPS :=
# Every subdirectory with source files must be described here
SUBDIRS := \
system/src/stm32f0-stdperiph \
system/src/newlib \
system/src/diag \
system/src/cortexm \
system/src/cmsis \
src \
bluenrg/src \
Expand Down
6 changes: 3 additions & 3 deletions Debug/src/my_function.d
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
src/my_function.o: ../src/my_function.c \
/home/jet/work/workspace/expedition/system/inc/cmsis/stm32f0xx.h \
/home/jet/work/workspace/expedition/system/inc/cmsis/stm32f030x6.h \
/home/jet/work/workspace/expedition/system/inc/cmsis/core_cm0.h \
/home/jet/work/workspace/expedition/system/inc/cmsis/core_cmInstr.h \
/home/jet/work/workspace/expedition/system/inc/cmsis/cmsis_gcc.h \
/home/jet/work/workspace/expedition/system/inc/cmsis/core_cmFunc.h \
/home/jet/work/workspace/expedition/system/inc/cmsis/system_stm32f0xx.h \
/home/jet/work/workspace/expedition/inc/stm32f0xx_conf.h \
Expand Down Expand Up @@ -45,12 +45,12 @@ src/my_function.o: ../src/my_function.c \

/home/jet/work/workspace/expedition/system/inc/cmsis/stm32f0xx.h:

/home/jet/work/workspace/expedition/system/inc/cmsis/stm32f030x6.h:

/home/jet/work/workspace/expedition/system/inc/cmsis/core_cm0.h:

/home/jet/work/workspace/expedition/system/inc/cmsis/core_cmInstr.h:

/home/jet/work/workspace/expedition/system/inc/cmsis/cmsis_gcc.h:

/home/jet/work/workspace/expedition/system/inc/cmsis/core_cmFunc.h:

/home/jet/work/workspace/expedition/system/inc/cmsis/system_stm32f0xx.h:
Expand Down
5 changes: 1 addition & 4 deletions Debug/src/subdir.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../src/_write.c \
../src/eeprom.c \
../src/init.c \
../src/logger.c \
Expand All @@ -16,7 +15,6 @@ C_SRCS += \
../src/time.c

OBJS += \
./src/_write.o \
./src/eeprom.o \
./src/init.o \
./src/logger.o \
Expand All @@ -28,7 +26,6 @@ OBJS += \
./src/time.o

C_DEPS += \
./src/_write.d \
./src/eeprom.d \
./src/init.d \
./src/logger.d \
Expand All @@ -44,7 +41,7 @@ C_DEPS += \
src/%.o: ../src/%.c
@echo 'Building file: $<'
@echo 'Invoking: Cross ARM C Compiler'
arm-none-eabi-gcc -mcpu=cortex-m0 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -Wall -Wextra -g3 -DDEBUG -DSTM32F030 -DHSE_VALUE=16000000 -DUSE_HAL_DRIVER -DSTM32F030x6 -DBLUENRG=1 -DWATCHDOG=0 -DUSE_STDPERIPH_DRIVER -DONE_WIRE=1 -I"/home/jet/work/workspace/expedition/inc" -I"/home/jet/work/workspace/expedition/system/inc" -I"/home/jet/work/workspace/expedition/system/inc/cmsis" -I"/home/jet/work/workspace/expedition/system/inc/stm32f0-stdperiph" -I"/home/jet/work/workspace/expedition/bluenrg/inc" -std=gnu11 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -c -o "$@" "$<"
arm-none-eabi-gcc -mcpu=cortex-m0 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -Wall -Wextra -g3 -DDEBUG -DSTM32F030 -DHSE_VALUE=16000000 -DSTM32F030x6 -DBLUENRG=1 -DWATCHDOG=0 -DUSE_STDPERIPH_DRIVER -DONE_WIRE=1 -I"/home/jet/work/workspace/expedition/inc" -I"/home/jet/work/workspace/expedition/system/inc" -I"/home/jet/work/workspace/expedition/system/inc/cmsis" -I"/home/jet/work/workspace/expedition/system/inc/stm32f0-stdperiph" -I"/home/jet/work/workspace/expedition/bluenrg/inc" -std=c99 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -c -o "$@" "$<"
@echo 'Finished building: $<'
@echo ' '

Expand Down
Binary file removed Debug/stm32f0.probe.elf
Binary file not shown.
Loading

0 comments on commit ef5f609

Please sign in to comment.