Skip to content

Commit

Permalink
Merge pull request #24 from akadamson/master
Browse files Browse the repository at this point in the history
default PID for gopro sized gimbals, added zip of GUI, updated Makefile ...
  • Loading branch information
akadamson committed Dec 14, 2013
2 parents 2ed032b + 3b46219 commit 7096831
Show file tree
Hide file tree
Showing 11 changed files with 248 additions and 244 deletions.
2 changes: 1 addition & 1 deletion FlashV2.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set flasher="%ProgramFiles(x86)%\STMicroelectronics\STM32 ST-LINK Utility\ST-LIN

:flash
set filename=%1%
if "%filename%" == "" set filename=out\STM32Gimbal.bin
if "%filename%" == "" set filename=out\STM32Gimbal.USB.bin

%flasher% -c SWD -P %filename% 0x08004000 -V -Rst
pause
Binary file added GUI/EvvGC_GUI_v0_4/EvvGC_GUI_v0_4.zip
Binary file not shown.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ LIB_DIRS =

# libraries (additional libraries for linking, e.g. "-lm -lsome_name" to link
# math library libm.a and libsome_name.a)
LIBS =
LIBS = -lm

# additional directories with source files (absolute or relative paths to
# folders with source files, current folder is always included)
Expand Down Expand Up @@ -152,13 +152,13 @@ C_FLAGS += -fsingle-precision-constant
AS_FLAGS = -Wa,-amhls=$(OUT_DIR_F)$(notdir $(<:.$(AS_EXT)=.lst))

# flags for linker
LD_FLAGS = -T$(LD_SCRIPT) -g -Wl,-Map=$(OUT_DIR_F)$(PROJECT).map,--cref,--no-warn-mismatch
LD_USB_FLAGS = -T$(LD_USB_SCRIPT) -g -Wl,-Map=$(OUT_DIR_F)$(PROJECT_USB).map,--cref,--no-warn-mismatch
LD_FLAGS = -T$(LD_SCRIPT) -Wl,-Map=$(OUT_DIR_F)$(PROJECT).map,--cref,--no-warn-mismatch
LD_USB_FLAGS = -T$(LD_USB_SCRIPT) -Wl,-Map=$(OUT_DIR_F)$(PROJECT_USB).map,--cref,--no-warn-mismatch

# process option for removing unused code
ifeq ($(REMOVE_UNUSED), 1)
LD_FLAGS += -Wl,--gc-sections
LD_USB_FLAGS += -Wl,--gc-sections
LD_FLAGS += -Xlinker --gc-sections
LD_USB_FLAGS += -Xlinker --gc-sections
OPTIMIZATION += -ffunction-sections -fdata-sections
endif

Expand Down
Binary file modified built-versions/0.4/STM32Gimbal.USB.bin
Binary file not shown.
Binary file modified built-versions/0.4/STM32Gimbal.bin
Binary file not shown.
14 changes: 7 additions & 7 deletions built-versions/0.4/STM32Gimbal.hex
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,9 @@
:102EF80000232B6013601D46174C00212068C4F284
:102F08001C21FDF745FF2946FDF73AFE0021C4F2D2
:102F18002021FDF7F1FF0346014623603846FDF7FF
:102F28002DFEF8BD46F266612046C3F6E6614FF015
:102F28002DFEF8BD4CF6CD412046C3F60C714FF08E
:102F380040442C60FDF72CFF054606480560DBE79A
:102F480046F266612046C3F6E6614FF08044F0E73A
:102F48004CF6CD412046C3F60C714FF08044F0E7B3
:102F5800C8090020140A0020F40900202DE9F04FC8
:102F6800DFF89C9299B0D9F800308346581CC9F80C
:102F7800000002F097FF02F0B9FF16A802F08CFCDF
Expand Down Expand Up @@ -3561,7 +3561,7 @@
:10DE68007669636553746174652025336420205690
:10DE78004350436F6E6E6563744D6F64652025640F
:10DE88000D0A000056657273696F6E3A2025730D8E
:10DE98000A000000302E342E352E3100746573745C
:10DE98000A000000302E342E352E3200746573745B
:10DEA800207068617365206F7574707574202535EE
:10DEB8002E31660D0A0000000D0A636F6E666967F1
:10DEC80020646174613A2000202530325820000017
Expand Down Expand Up @@ -3623,8 +3623,8 @@
:10E2480068207265766973696F6E203230323630B5
:10E25800315D0D0A00000000457676474320666967
:10E26800726D77617265205625732C206275696C12
:10E27800642064617465204E6F7620313620323018
:10E2880031332030383A31353A3132200D0A000026
:10E278006420646174652044656320313420323041
:10E2880031332031303A30373A3037200D0A000028
:10E2980072756E6E696E67206F6E20657874657230
:10E2A8006E616C2048534520636C6F636B2C206350
:10E2B8006C6F636B20726174652069732025644DEF
Expand Down Expand Up @@ -3759,8 +3759,8 @@
:08EAC8003CBF737FDD4F1575A3
:08EAD0003027FF7F0100000068
:10EAD8000204060800000000010203040102030406
:10EAE80006070809FFFFFFFF3132336162633334E1
:10EAF80035303136EC51B8BD50000000010000003F
:10EAE80006070809FFFFFFFF28553C1E3728233774
:10EAF8003C303040EC51B8BD50000000010000002F
:10EB0800C80000000000000000000000010203042B
:10EB18000607080900A24A04480000001A03530027
:10EB280054004D00330032000000000000000000D7
Expand Down
Binary file modified built-versions/0.4/STM32Gimbal.zip
Binary file not shown.
Loading

0 comments on commit 7096831

Please sign in to comment.