Laurent Lalanne
5112d465ad
git merge next
2013-12-18 20:14:26 +01:00
Laurent Lalanne
b9136ef73e
Merge branch 'next' into translations_next
...
initial merge on local branch
2013-10-30 12:58:16 +01:00
Philippe Renon
d08445f0b5
[OP-1085][OP-1094] Turn on Progress for large SDK downloads / remove for MD5 files
...
This commit removes progress when downloading md5, adding progress for big
files was committed as part of OP-1085
2013-10-26 11:56:56 +02:00
Laurent Lalanne
9e3d464523
Merge branch 'master' into translations_next
...
Conflicts:
ground/openpilotgcs/copydata.pro
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
2013-10-25 11:27:28 +02:00
Philippe Renon
6bfef53b81
[OP-1085] Qt5.1.1 - made curl report progress by default (can be switched off by adding BATCH=1 on make command line)
2013-10-24 00:11:58 +02:00
Philippe Renon
0aad8afc90
[OP-1085] upgraded to Qt 5.1.1
2013-10-21 23:59:23 +02:00
Philippe Renon
2d3076e9b8
[OP-835] Upgrade toolchain system to Qt 5.1 (Windows only, use packages for Linux and OSX)
2013-09-15 23:24:13 +02:00
David
86a02d693e
Update copy data for ssl, readme is way out of date, changed one
...
line but on a read through, it's very out of date now as things
are easier now. Might be best to link to the Wiki...
2013-08-17 00:51:09 +10:00
Brian Webb
e246ecf536
Moves pios_led functionality to pios_gpio and makes pios_led a thin layer over pios_gpio. Supports configuring multiple sets of GPIOs.
2013-07-28 07:01:08 -07:00
Brian Webb
774a74884a
OP-932 Replaces the RFM22B PPM/receiver code with an OPLinkReceiver UAVObject. This object is generated on a coordinator OPLink, and is used by both the OPLink to generate PPM output, and the OPLinkReceiver on the Revo.
2013-06-26 17:57:11 -07:00
Brian Webb
08efc8d152
OP-932: Adds an oplink receiver device, which is based on the gcs receiver device, but uses the OPLinkReceiver UAVObject. The OPLinkReceiver packets are generated on the OPLink modem.
2013-06-26 17:56:20 -07:00
Oleg Semyonov
b6312b3faa
OP-910: update python path comment in make/tools.mk to keep in sync
2013-06-06 11:12:21 +03:00
Oleg Semyonov
b5711b8835
Change build-info.txt format from DOS to Unix
...
It is used by Bamboo server shell scripts, and being CRLF terminated,
this sometimes results in broken file names, for example, of Android
package.
2013-05-29 16:38:36 +03:00
Oleg Semyonov
444431579e
OP-770: add/rename some version-info.py template variables
2013-05-25 23:02:29 +02:00
Oleg Semyonov
0798d8e330
OP-891: move firmware_info template under flight directory
2013-05-20 01:12:45 +03:00
Oleg Semyonov
97b4433a36
Merge remote-tracking branch 'origin/thread/OP-955_Version_Info_Improvements' into next
2013-05-19 15:22:55 +02:00
Oleg Semyonov
4a93e739de
OP-955: remove old copy of moved file
2013-05-19 00:11:27 +03:00
Alessio Morale
c1f767b12d
Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next
...
Conflicts:
flight/pios/common/pios_flashfs_logfs.c
2013-05-18 15:53:25 +02:00
Alessio Morale
6ba15ebc53
OP-954 Fixes from review:
...
- CopterControl target fix
- tabs in Nakefiles
- Removed duplicate stale settings and clean empty lines in osd Makefile
+review OPReview-470
2013-05-15 23:18:50 +02:00
Richard Flay (Hyper)
ed68fbe68d
OP-951: Adds -Wshadow to flight CFLAGS and fixes resulting compilation breakage.
...
+review OPReview
2013-05-14 07:01:45 +09:30
Alessio Morale
d555bd0673
Uses Internal flash for system settings storage repourposing external flash for "User" storage
2013-05-11 22:06:30 +02:00
Richard Flay (Hyper)
cf14608ebe
Merge branch 'next' into hyper/OP-936_task-monitor-rework
2013-05-09 19:25:02 +09:30
Alessio Morale
93bad2e8c2
Merge branch 'amorale/OP-917_f4_bootloader_updater' into next
...
***** PLEASE NOTE ***** From this revision all F4 based boards (Revolution/OSD) needs bootloader version 5 to boot properly
Conflicts:
flight/pios/stm32f4xx/libraries/CMSIS2/Device/ST/STM32F4xx/Source/osd/system_stm32f4xx.c
flight/targets/boards/osd/board-info.mk
make/boot-defs.mk
make/common-defs.mk
2013-05-07 21:02:41 +02:00
Richard Flay (Hyper)
fbc8bc698f
OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,
...
and brings the callback scheduler into the fold.
+review OPReview-461
2013-05-06 19:11:14 +09:30
Richard Flay (Hyper)
a2d8544931
OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required
...
to make the flight code compile again. Needs careful review, particularly all the fixes for the
signed vs unsigned comparisons.
+review OPReview-459
2013-05-05 16:32:24 +09:30
Richard Flay (Hyper)
5b61466259
OP-931: Adds -Wdouble-promotion compiler option and fixes problems that the compiler then identifies.
...
+review OPReview-459
2013-05-04 19:24:01 +09:30
Richard Flay (Hyper)
87fcf9fa8b
Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary.
...
Hopefully properly fixes conflicts:
flight/modules/Attitude/attitude.c
flight/modules/ManualControl/manualcontrol.c
flight/modules/Osd/WavPlayer/wavplayer.c
flight/modules/Osd/osdgen/osdgen.c
flight/modules/System/systemmod.c
ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
2013-05-04 11:12:44 +09:30
Oleg Semyonov
137ddbf73a
Fix broken unit tests
2013-05-03 20:27:03 +02:00
Oleg Semyonov
ee1a149888
tools: add gtest_install and build_sdk_*
2013-05-03 20:26:44 +02:00
Sambas
4d19fd5989
Merge remote-tracking branch 'remotes/origin/sambas/diffnext' into next
2013-05-03 07:58:17 +03:00
Richard Flay (Hyper)
84e1a81f8b
OP-936: Moves the task monitor code out of the flight library and into PiOS.
...
This move and rework also breaks the dependency of the task monitor on the UAVO subsystem,
and pushes the responsibility for updating the TaskInfo UAVO into the System module.
+review OPReview
2013-05-03 07:01:14 +09:30
Oleg Semyonov
dd181904fc
Fix version-info.py utility to back off gracefully if no git in the PATH
2013-05-02 19:05:00 +02:00
Sambas
f7b9223827
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
2013-05-02 09:00:12 +03:00
Oleg Semyonov
a5d63eb452
tools: make nsis_install (Windows only)
2013-05-01 22:44:11 +03:00
Oleg Semyonov
b30385d4fa
uncrustify: use no spaces in empty for statements: for ( ; ;) -> for (;;)
...
It can be rolled back and a space after last semicolon could be added
if desired: for ( ; ; ). But it looks not nice in ~20 files where
this statement is used.
2013-05-01 12:01:51 +03:00
Oleg Semyonov
363e1705cf
uncrustify: update configuration (EOL comment and class indents, extra ';' removals)
2013-04-30 16:54:28 +02:00
Oleg Semyonov
0394a3511c
Rename template files to *.template to screen from uncrustify processing
2013-04-30 16:54:27 +02:00
Richard Flay (Hyper)
742058da8c
Merge branch 'next' into hyper/OP-931_extra_compiler_warnings
2013-04-30 20:44:49 +09:30
Richard Flay (Hyper)
7937ae6296
OP-931: Makes flight code compile with -Wfloat-equal and -Wunsuffixed-float-constants enabled.
...
Also fixes warnings (and bugs) in F4 STM32_USB_OTG_Driver code, allowing -Werror to be enabled for all flight code.
Fixes all other compiler warnings that would otherwise cause the flight code to not compile with -Werror enabled.
Along the way, this also adds some uses of isnan() to various places rather than questionable tests for x != x and
x == x to check for NaNs.
+review OPReview
2013-04-30 20:36:42 +09:30
Oleg Semyonov
55c406066d
tools: add doxygen_install and docs_* targets
2013-04-29 02:05:15 +02:00
sambas
9fec3f5567
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-27 13:39:58 +03:00
Alessio Morale
2e6835a2a3
Merge remote-tracking branch 'origin/next' into amorale/OP-917_f4_bootloader_updater
2013-04-27 12:25:54 +02:00
Richard Flay (Hyper)
fd1181959c
Merge branch 'hyper/OP-913-flight-uavo-alignment' into next
2013-04-27 18:19:01 +09:30
Alessio Morale
b21146b8e3
OP-917 bootloader updater for F4 targets. Initial commit
2013-04-27 00:56:47 +02:00
Oleg Semyonov
fa8c2f239c
Merge remote-tracking branch 'origin/amedee/OP-921' into next
2013-04-26 17:43:26 +03:00
Oleg Semyonov
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +03:00
sambas
abe3742217
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
2013-04-25 17:26:49 +03:00
Oleg Semyonov
25d0e8fcab
Rename PiOS/STM32F10x->PiOS/stm32f10x, PiOS/STM32F4xx->PiOS/stm32f4xx
2013-04-25 13:13:39 +03:00
Oleg Semyonov
f20f89da35
Rename PiOS/Common->PiOS/common
2013-04-25 13:13:39 +03:00
Oleg Semyonov
66db978244
Rename Libraries->libraries, Modules->modules
2013-04-25 13:13:36 +03:00