Oleg Semyonov
992bd696a6
*.mk: fix double '/' in path names ($dir always returns it as a last char)
...
Also minor formatting of all library.mk files.
Conflicts:
flight/PiOS/Common/Libraries/CMSIS2/library.mk
2013-03-24 13:06:08 +02:00
Oleg Semyonov
38d822d2f5
Makefile: rework OSD Makefile and target to use new make system
...
Conflicts:
flight/targets/OSD/Makefile
2013-03-24 13:06:07 +02:00
Oleg Semyonov
7e02642b01
Move 3rd party printf formatter functions from PiOS to Libraries folder
...
They are not a PiOS, but 3rd party libraries. They even should not
be placed to the same (PiOS) library directory due to the printf symbol
clashes (if all *.c from the folder are built). So they are moved, and
each target can include that one which is necessary/desired.
2013-03-24 13:06:06 +02:00
Oleg Semyonov
404ba00f70
Makefile: rework Revolution Makefile to use new make system
...
Conflicts:
flight/targets/Revolution/Makefile
2013-03-24 13:06:05 +02:00
Oleg Semyonov
f465a04b88
pios: add new options from Revolution to pios.h and pios_config.h
2013-03-24 13:06:04 +02:00
Oleg Semyonov
886c6b8775
Makefile: rework RevoMini Makefile to use new make system
...
Conflicts:
flight/targets/RevoMini/Makefile
flight/targets/RevoMini/UAVObjects.inc
2013-03-24 13:06:03 +02:00
Oleg Semyonov
c518a58215
Makefile: remove hardly used make options from CopterControl Makefile
...
It was reasonable to use "USE_FEATURE" on the make level when we didn't
have optional modules. Now is better to add them using += make operator.
Conflicts:
flight/targets/CopterControl/Makefile
2013-03-24 13:06:02 +02:00
Oleg Semyonov
5c13162824
Makefile: some rearrangements between apps-defs.mk and target Makefiles
...
Conflicts:
flight/targets/PipXtreme/Makefile
make/apps-defs.mk
2013-03-24 13:06:00 +02:00
Oleg Semyonov
dbe1c39c47
pios: include memory allocator for F4 FreeRTOS targets by default
...
This is by analogy to F1 FreeRTOS tagrgets which always use heap_1.
2013-03-24 13:05:59 +02:00
Oleg Semyonov
6502cea50e
pios_bl_helper.h: why all these empty lines?
2013-03-24 13:05:58 +02:00
Oleg Semyonov
3c97b5a7c6
Clean up pios_config.h for BL, BU, some FW (not all yet)
...
Conflicts:
flight/targets/Bootloaders/CopterControl/inc/pios_config.h
2013-03-24 13:05:57 +02:00
Oleg Semyonov
446abf6190
pios: add more global config options used by Revo
...
Conflicts:
flight/PiOS/pios.h
flight/targets/RevoMini/System/inc/pios_config.h
2013-03-24 13:05:55 +02:00
Oleg Semyonov
49ed34fd7b
insgps: move definition of NavStruct variable from header to source file
2013-03-24 13:05:54 +02:00
Oleg Semyonov
9bcbcbeb34
Remove never used op_config.h files (all occurences were empty)
2013-03-24 13:05:53 +02:00
Oleg Semyonov
9b3d3e62ab
Makefile: fix Makefile for BootloaderUpdater (STM32F10x only targets)
...
Conflicts:
flight/targets/Bootloaders/BootloaderUpdater/Makefile
2013-03-24 13:05:52 +02:00
Oleg Semyonov
ce4b2f4446
pios_debug: use PIOS_INCLUDE_DEBUG_CONSOLE to DEBUG_PRINTF(level, ...)
...
Inconsistent use of debug macros in board definition files resulted in
BU compilation error. It was attempted to use PIOS_COM_SendFormattedStringNonBlocking()
directly even if PIOS_COM was not included (like for BootloaderUpdater).
So this function in pios_debug.c was replaced by DEBUG_PRINTF() macro.
The macro itself is defined in pios_debug.h file. Its definitions are
removed from board files. And to use it one has to define in pios_config.h:
#define PIOS_INCLUDE_DEBUG_CONSOLE
#define DEBUG_LEVEL <number>
in addition to PIOS_INCLUDE_COM with aux port.
Conflicts:
flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h
flight/PiOS/Boards/STM32F4xx_RevoMini.h
2013-03-24 13:05:51 +02:00
Oleg Semyonov
91f14768db
Makefile: fix mk files, now both CC and PipX are buildable using common defs
...
Conflicts:
make/apps-defs.mk
2013-03-24 13:05:50 +02:00
Oleg Semyonov
243c1a28ec
Remove duplicated global var and defines from board definition file
...
Was caught using just added linker options:
LDFLAGS += -Wl,--warn-common
LDFLAGS += -Wl,--fatal-warnings
2013-03-24 13:04:16 +02:00
Oleg Semyonov
f65ff0585f
Makefile: add make/common-defs.mk and use it to build bootloaders (STM32F10x)
...
Conflicts:
make/boot-defs.mk
2013-03-24 13:04:15 +02:00
Oleg Semyonov
0e6b2acb22
Makefile: add PiOS/STM32F10x/library.mk
...
Conflicts:
flight/PiOS/STM32F10x/library.mk
2013-03-24 13:04:14 +02:00
Oleg Semyonov
238692c3da
STM32F4xx/library.mk cleanup (formatting only)
...
Conflicts:
flight/PiOS/STM32F4xx/library.mk
2013-03-24 13:04:12 +02:00
Oleg Semyonov
db0cdc6a0c
Remove (almost) exact copy of dosfs from F1-specific directory
...
The difference was in dfs_sdcard.c, line 107:
-if((status = PIOS_SDCARD_SectorRead(sector, buffer)) < 0) {
+if((status = PIOS_SDCARD_SectorRead(sector, buffer)) != 0) {
Currenly unused, kept as is.
2013-03-24 13:04:11 +02:00
Oleg Semyonov
448a07fe57
pios_config.h: remove non-existent option PIOS_NO_GPS
2013-03-24 13:04:10 +02:00
Oleg Semyonov
27822d0cd4
Makefile and pios_config.h cleanup for PipXtreme
...
Now PipXtreme uses the same apps-defs.mk file as CopterControl.
Next steps are F4 boards.
Conflicts:
flight/targets/PipXtreme/Makefile
flight/targets/PipXtreme/System/inc/pios_config.h
2013-03-24 13:04:08 +02:00
Oleg Semyonov
30128517b5
Makefile: remove unused USE_I2C option from makefiles
2013-03-24 13:04:07 +02:00
Oleg Semyonov
7e4596ff35
Makefile: fix some MODULE_Name_BUILTIN checks and Makefile
...
These names are automatically generated by make using the list
of mandatory (always started) modules. Wrong names mean they can
be disabled, fixed now.
Conflicts:
flight/Modules/Radio/radio.c
2013-03-24 13:04:06 +02:00
Oleg Semyonov
8b4a547d69
rscode: add a library make config file, library.mk
2013-03-24 13:04:05 +02:00
Oleg Semyonov
a1e17eccf3
pios: fix packet handler #ifdef guards and Makefile
...
Conflicts:
flight/Libraries/packet_handler.c
flight/targets/CopterControl/System/inc/pios_config.h
2013-03-24 13:04:04 +02:00
Oleg Semyonov
f7bdcdb782
Makefile: firmware makefiles cleanup (CC)
...
Conflicts:
flight/targets/CopterControl/Makefile
2013-03-24 13:04:03 +02:00
Oleg Semyonov
75ef685c6e
Makefile: bootloader makefiles cleanup
...
Conflicts:
flight/targets/Bootloaders/CopterControl/Makefile
flight/targets/Bootloaders/OSD/Makefile
flight/targets/Bootloaders/PipXtreme/Makefile
flight/targets/Bootloaders/RevoMini/Makefile
flight/targets/Bootloaders/Revolution/Makefile
2013-03-24 13:04:01 +02:00
Oleg Semyonov
8a98920f3d
Makefile: use exported variables in firmware-defs.mk
...
Note that $(QUOTE) variable is uppercased. Windows make does not
export lowercased variables with export keyword (even if must do).
Conflicts:
make/firmware-defs.mk
2013-03-24 13:04:00 +02:00
Oleg Semyonov
00a0ef430d
pios: fix pios_config.h (now PIOS_INCLUDE_COM_MSG requires PIOS_INCLUDE_COM)
2013-03-24 13:03:57 +02:00
Oleg Semyonov
e80890e164
pios: STM32F4xx PIOS #ifdef guards
2013-03-24 13:03:56 +02:00
Oleg Semyonov
b73ddffbf0
pios: STM32F10x PIOS #ifdef guards
2013-03-24 13:03:55 +02:00
Oleg Semyonov
285cad290b
pios: common PIOS #ifdef guards
...
Conflicts:
flight/PiOS/Common/pios_com.c
flight/PiOS/Common/pios_mpu6000.c
2013-03-24 13:03:54 +02:00
Oleg Semyonov
e96f717b94
pios: common PIOS header guards
2013-03-24 13:03:53 +02:00
Oleg Semyonov
fc6024d23e
pios: pios_config.h cleanup (CopterControl)
...
Conflicts:
flight/targets/CopterControl/System/inc/pios_config.h
2013-03-24 13:03:52 +02:00
Oleg Semyonov
39363d9efa
pios: main pios.h header cleanup
...
Conflicts:
flight/PiOS/pios.h
2013-03-24 13:03:51 +02:00
Oleg Semyonov
304f366338
Remove discontinued AHRS files
2013-03-24 13:03:50 +02:00
Alessio Morale
8d6ef5cfe9
OP-747 Shortened an unneded very long delay in MPU6000
2013-03-24 11:42:41 +01:00
Alessio Morale
1a38b7eb46
Merge remote-tracking branch 'origin/amorale/02_os-stac_logfs-unittests' into next
...
Conflicts:
flight/targets/RevoMini/Makefile
flight/targets/Revolution/Makefile
2013-03-23 15:13:05 +01:00
Alessio Morale
e06ab7f706
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
...
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
2013-03-23 14:37:19 +01:00
Alessio Morale
7161d276f7
Merge remote-tracking branch 'origin/amorale/OP-866_rm_flexi-io_configurations' into next
2013-03-23 11:47:46 +01:00
Alessio Morale
643f62e175
Added configuration for F1+ SWD/StlinkV2
...
use it with ./tools/openocd/bin/openocd -f ./flight/Project/OpenOCD/stlink-v2.cfg -f ./flight/Project/OpenOCD/stm32f1x.stlink.cfg
2013-03-23 10:58:57 +01:00
Alessio Morale
eff2cf20fd
OP-878 change led used for heartbeat as OPLink has not any USB led
2013-03-23 10:56:21 +01:00
Alessio Morale
94aaa1bf10
Merge remote-tracking branch 'origin/amorale/OP-820_bu_showerror' into next
2013-03-11 20:09:57 +01:00
Alessio Morale
d327f199e8
Bootloader error visualization: Fixed indentation/spaces/2
...
+review OPReview-400
2013-03-10 23:41:34 +01:00
Alessio Morale
fcbfb53a87
Bootloader error visualization: Fixed indentation/spaces
...
+review OPReview-400
2013-03-10 21:03:40 +01:00
Alessio Morale
4f270cf13d
OP-866 Flexi-IO: adding PPM+OUTPUT, PPM+PWM and OUTPUT mode.
...
+review OpenPilot
2013-03-10 20:43:52 +01:00
Alessio Morale
ffbb0a5a8e
Merge remote-tracking branch 'origin/amorale/op-848_mpu6000_configurability' into next
2013-03-08 00:08:15 +01:00