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
60a7d7e454
Makefile: export important make variables from the top Makefile
2013-03-24 13:03:59 +02:00
Oleg Semyonov
23c605ffba
Makefile: indents, comments, spacing, $(CMDS) variables, etc.
...
How to invoke external command instead of shell builtin on Windows:
ECHO := /bin/echo
Conflicts:
Makefile
2013-03-24 13:03:58 +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
Oleg Semyonov
8c6f24afef
version-info.py: fix coding style
2013-03-24 13:03:49 +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
8d56b9347b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2013-03-23 15:33:18 +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
David Ankers
5d3cc203a2
Merge branch 'dankers/silk_add' into next
2013-03-24 00:16:51 +11:00
Alessio Morale
9244b511ac
Merge branch 'amorale/OP-872_OP-867_thread-Config_revo_support' into next
2013-03-23 13:12:43 +01:00
Alessio Morale
2f2499f8c4
OP-867 fixed intentation
2013-03-23 13:10:57 +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
5ca228ebce
Merge branch 'amorale/OP-872_HandleAllOutputs' into thread/OP-867_Config_Revo_Support
...
+review OPReview
2013-03-14 23:34:48 +01:00
Alessio Morale
dfb69e1b17
Merge remote-tracking branch 'origin/kevinv033/OP-791' into next
2013-03-14 21:36:44 +01:00
Alessio Morale
be8e5d159b
OP-872 handle all outputs for CC/CC3D and Revolution
2013-03-14 20:13:02 +01:00
Alessio Morale
86c525b2d3
Merge remote-tracking branch 'origin/thread/OP-856_Revolution_HW_Settings' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config.pro
2013-03-12 19:59:07 +01:00
Fredrik Arvidsson
b21517cd87
OP-867 Code cleanup. Added missing combo boxes to 'dirty pool'.
2013-03-12 07:35:20 +01:00
Fredrik Arvidsson
f27a69802d
OP-867 Added output rate settings for revolution.
2013-03-11 23:22:10 +01:00
Alessio Morale
6b6a3bcd9f
Merge remote-tracking branch 'origin/thread/OP-864_Remove_Configuration_Prompt' into next
2013-03-11 21:15:30 +01:00
Kevin Vertucio
22c966711d
added autogenerated version info file
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-11 15:35:08 -04: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
Fredrik Arvidsson
e0bd933baa
OP-856 Changed USB GUI. Changed the rules for validation of configurations.
2013-03-10 18:51:15 +01:00
Oleg Semyonov
f1214df633
OP-792: Remove unused yet GUI in addition to flight modes
...
This reverts commit 0e9d7137ff
.
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
OP-792 #comment Now this feature is removed from GUI too
2013-03-10 00:57:41 +02:00
David Ankers
dbdb42f2f4
Updated for Silk
2013-03-10 06:09:31 +11:00
Kevin Vertucio
98e12d192a
removed extraneous commented code
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-03-08 11:25:57 -05:00
Alessio Morale
ffbb0a5a8e
Merge remote-tracking branch 'origin/amorale/op-848_mpu6000_configurability' into next
2013-03-08 00:08:15 +01:00
Alessio Morale
c47ecd044e
Merge branch 'filnet/OP-803_gadget_config_set_twice_on_restore' into next
2013-03-08 00:07:34 +01:00
Oleg Semyonov
2537255372
OP-865 #resolve #comment "Merged ino next"
2013-03-07 15:42:49 +02:00
Alessio Morale
6a408e6a0a
Merge branch 'filnet/OP-682_fix_for_crash_on_firmware_uploader_gadget' into next
2013-03-07 00:14:08 +01:00
sambas
99096ff936
Servo Out 6 fix
2013-03-06 23:17:57 +02:00
Philippe Renon
1d9deae77d
OP-682 fixed regression that prevented uploading of valid fw + renamed
...
youdont check box to confirmCheckBox + minor cleanups
2013-03-06 22:01:05 +01:00
Oleg Semyonov
4b0b781469
Merge remote-tracking branch 'origin/amorale/pymite_makefile_rework' into next
2013-03-06 17:10:55 +02:00
Fredrik Arvidsson
b6746259c8
OP-864 Fixed some debug logging cosmetic problems.
2013-03-04 20:38:16 +01:00
Fredrik Arvidsson
82a89700e1
OP-864 Fixed sloppy errors (hopefully).
2013-03-04 18:36:23 +01:00