James Cotton
8bec19f4a5
Merge branch 'bugfix-flight'
2011-06-05 09:48:43 -05:00
James Cotton
624baeda5c
Merge branch 'OP-423_Mathieu_GetSet_Uavobjects' into bugfix-flight
2011-06-05 09:48:22 -05:00
James Cotton
56faad594e
OP-423: Make sure to unlock semaphore before returning from error condition
2011-06-05 08:41:21 -05:00
Stacey Sheldon
ebfed9f733
typo: fix spelling of Dale's name
2011-06-04 18:15:10 -04:00
dankers
3013a092d9
Merge branch 'OP-519_Mathieu_Upgrade_FreeRTOS' into bugfix-flight
2011-06-04 16:42:15 +10:00
Mathieu Rondonneau
7b8d09371b
fixing minor compiler error/warnings when compiling OP with DEBUG=NO
2011-06-03 21:47:43 -07:00
dankers
42b9929521
Update milestones with the next heli challenge
2011-06-04 09:35:55 +10:00
Mathieu Rondonneau
31a06a5ae7
OP-423 add set/get uavobjects functions to access objects fields separately.
2011-06-02 21:18:34 -07:00
Mathieu Rondonneau
6e64a546df
Remove un-used code
2011-06-02 20:21:26 -07:00
Mathieu Rondonneau
446b0004da
Merge branch 'master' into OP-519_Mathieu_Upgrade_FreeRTOS
2011-06-02 19:36:49 -07:00
dankers
5957612870
Remove old ini file, add a modelview item for the new CC model to ModelView
2011-06-03 12:18:37 +10:00
dankers
d3ae9113d9
Update file names
2011-06-03 10:31:45 +10:00
dankers
62c172f280
Add Nuno's wonderful CC model
2011-06-03 09:46:59 +10:00
Mathieu Rondonneau
071a684248
OP-519 upgrade to FreeRTOS-7.0.1
...
- only affect flight/PiOS (no change for posix and win32)
- tested on recent master (some runtime on CC with GCS)
- the new timer feature is not compiled-in since we don't use it yet.
- NO TEST FLIGHT
2011-06-01 21:46:28 -07:00
James Cotton
f8b945401d
Merge branch 'bugfix-ground' of ssh://git.openpilot.org/OpenPilot into bugfix-ground
2011-06-01 14:20:54 -05:00
James Cotton
2f6fe11924
Fix for OSX packaging with PlugIns
2011-06-01 14:02:59 -05:00
James Cotton
8f808df113
Fix for Utils trying to not include the debug library on OSX and Mac
2011-06-01 13:59:10 -05:00
James Cotton
45244e3df5
On OSX make the plugins in .app/Contents/Plugins instead of PlugIns
2011-06-01 13:58:49 -05:00
elafargue
7217f1eb81
Merge branch 'OP-512-PTDreamer' into bugfix-ground
2011-06-01 20:41:49 +02:00
zedamota
ad65dee643
Added auto select
2011-06-01 18:40:04 +01:00
elafargue
419fe2d375
Merge branch 'master' into bugfix-ground
2011-06-01 17:37:29 +02:00
zedamota
fce8038cf4
Create new setting "autoselect"
2011-06-01 16:08:14 +01:00
zedamota
844bc79f45
Merge remote-tracking branch 'remotes/origin/bugfix-ground' into OP-512-PTDreamer
...
Conflicts:
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
2011-06-01 14:02:55 +01:00
elafargue
cacf03ae7b
OP-515 Uploader Gadget UI improvements. Not implemented Firmware pre-check yet.
2011-06-01 14:49:22 +02:00
Oleg Semyonov
f770870af7
Merge branch 'bugfix-flight'
2011-06-01 14:53:31 +03:00
Oleg Semyonov
b46c5dbff9
Merge branch 'packaging' into bugfix-ground
2011-06-01 13:08:48 +03:00
Oleg Semyonov
038eadb97a
Merge branch 'master' into packaging
2011-06-01 12:53:39 +03:00
elafargue
a953974dfa
Merge branch 'master' into bugfix-ground
2011-06-01 11:29:10 +02:00
David Buzz Carlson
2691b80576
Fix segfault on close. Fix _terrible_ variable naming. Fix excessive qDebug messages.
2011-05-31 23:31:40 -07:00
Oleg Semyonov
6e418735cf
OP-509: fix for ld symbol reference (also fixes build with 4.5.2 gcc)
2011-06-01 00:31:27 +03:00
elafargue
4569446a7b
Merge branch 'bugfix-ground'
2011-05-31 22:57:21 +02:00
elafargue
bd35d9bff4
Forgot the configinputwidget.cpp file in previous commit.
2011-05-31 22:56:33 +02:00
elafargue
90024d69e4
Improve inline help icons, place them next to request/apply/save buttons where the eye logically goes when surveying the UI. Open for comments of course.
2011-05-31 21:20:38 +02:00
zedamota
fc7e7df863
OP-512 Remove some qDebug's
2011-05-31 15:41:05 +01:00
zedamota
1ffc0e3d56
Ground/OP-512- Autoconnect option, configured trough the options menu. Default is ON.
2011-05-31 15:29:53 +01:00
David Carlson
614fd138e4
Change the help button setup from in-line help to one per page. Will no longer open an HTML window, but will open the relevant section on the wiki using the OS default browser.
2011-05-31 00:16:01 -07:00
Oleg Semyonov
03ed76cf14
Merge branch 'bugfix-ground' into packaging
2011-05-30 16:56:37 +03:00
elafargue
887a23a3cf
OP-510 Issue with patch in source file, sorry.
2011-05-30 07:38:37 +02:00
elafargue
46824dea4e
OP-510: wider fix for Yaw channel servo fix which should improve the 'mixer not saving' issue too, as well as retrieving settings from the board for Yaw mode.
2011-05-30 07:29:26 +02:00
elafargue
93dd254c77
Merge branch 'bugfix-ground' of git.openpilot.org:OpenPilot into bugfix-ground
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configairframewidget.cpp
2011-05-30 07:26:44 +02:00
David Carlson
eb337c6e5c
Fix for tri yaw channel being reset.
2011-05-29 21:07:22 -07:00
zedamota
144ca219a5
Cosmetic changes to Uploader Gadget Rescue mode
2011-05-30 03:08:24 +03:00
Oleg Semyonov
91f5fd2318
Merge branch 'os_gcs-version-info' into packaging
2011-05-30 02:56:11 +03:00
Oleg Semyonov
0305dc1094
package: replace 'spektrum' by 'dsm2sat' in the binary name
2011-05-30 02:52:01 +03:00
James Cotton
efe50012cb
Merge branch 'spektrum_rtc_supervisor'
2011-05-29 17:19:48 -05:00
James Cotton
34c527e0f6
Merge branch 'bugfix-flight'
2011-05-29 17:19:40 -05:00
James Cotton
df69bbb950
Merge commit '07a48573ea828685f0465786e16dd13db68a850f'
2011-05-29 17:08:17 -05:00
PeterG
d18a229a76
Change default settings format from ini to xml
2011-05-29 14:02:10 +02:00
sambas
17fb31a7fa
Spektrum rtc supervisor working, tested on CC and all outputs are activated. Needs review and testing before merge.
2011-05-29 14:52:22 +03:00
zedamota
d591d509ed
Merge remote-tracking branch 'remotes/origin/PT-bugfix-ground' into bugfix-ground
2011-05-29 10:57:57 +01:00
