rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Code Issues Releases Activity
9,342 Commits 5 Branches 8 Tags 266 MiB
221cc6557a
Commit Graph

2621 Commits

Author SHA1 Message Date
Glenn Campigli
558a47dc7c Corrected channel index when calibrating swashplate 2013-05-31 16:23:42 +10:00
Mathieu Rondonneau
d0b0cb77d4 OP-958: only enumerate openpilot devices in udev. 
(not sure the reason of not doing that)
 2013-05-30 19:08:22 -07:00
Philippe Renon
e3fb75b356 OP-979 additional fixes in Settings dialog: 
- Make Environment/General node auto expandable (i.e. always expanded when
the dialog is opened)
- Reorganize persistent settings (move to own node in XML file + renaming)
- Simplify persistent splitter position handling (persist location instead
of 2 sizes)
 2013-05-29 23:10:58 +02:00
Mathieu Rondonneau
988baa2764 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-29 06:02:19 -07:00
Mathieu Rondonneau
afeeed6f65 OP-958: WINDOWS HACK: do not filter out the bl. 2013-05-29 05:57:46 -07:00
Richard Flay (Hyper)
7f90692a24 Merge branch 'next' into filnet/OP-843_settings_dialog_show_language_selection_at_top 2013-05-29 18:28:17 +09:30
Mathieu Rondonneau
660a175a53 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-28 21:39:49 -07:00
Mathieu Rondonneau
6a838417fb OP-958: WINDOWS HACK ONLY: This is to filter out gamepadcontroller HID device during reconnect. 
This is temporary until multiple HID are supported (if needed).
 2013-05-28 21:36:10 -07:00
Mathieu Rondonneau
74cc1315b4 OP-958: only report the number of device we actually open successfully. 
Limitation: only one (1) or zero (0) for now.
 2013-05-28 12:59:46 -07:00
Oleg Semyonov
0faa77b3fb Uncrustify sources 2013-05-28 16:57:03 +02:00
Philippe Renon
6b7080d958 OP-843 setting dialog reordering: plugin options pages (top part) are now sorted on their untranslated name 
this solve the issue of the order changing per language
The bottom part of the tree (gadget options pages) is still sorted by translated name as before.
Additional fixes:
- Moved GCS page to Environment node + renamed to Workspaces
- Renamed Notigy Plugin node to Notification
- Moved the two Telemetry nodes together
- Split plane size is now persistent (in addition to size and selected node)
 2013-05-28 15:32:27 +02:00
Oleg Semyonov
d8ec41fcaa Merge remote-tracking branch 'origin/thread/OP-906_Default_Wizard_Stab_Settings_And_Flight_Modes' into next 2013-05-28 15:22:50 +02:00
Oleg Semyonov
a61b2fb13e Merge remote-tracking branch 'origin/os/OP-770_version_info_stuff' into next 2013-05-28 14:55:29 +02:00
Alessio Morale
f16844537f Merge remote-tracking branch 'origin/amorale/OP-968_hitl_button_size' into next 2013-05-28 12:01:13 +02:00
Alessio Morale
e521bf03e9 Merge remote-tracking branch 'origin/amorale/OP-761_uav_position_for_cc' into next 2013-05-28 12:00:10 +02:00
Mathieu Rondonneau
854d976a7d OP-958: Go through the list of enumerated devices, and try to open the device until end of the list. 
Leave if we open one with success.
 2013-05-27 18:52:27 -07:00
Oleg Semyonov
0512ca79ef OP-770: export GCS branch dirty state and short UAVO hash 2013-05-28 04:14:54 +03:00
Oleg Semyonov
208278a7cb OP-770: use VersionInfo::uavoHash() instead of dynamic string 2013-05-28 02:42:24 +02:00
Fredrik Arvidsson
316afefff7 OP-906 Changed defaults for Stabilization settings and Flight modes. 2013-05-27 22:25:17 +02:00
Fredrik Arvidsson
cc14dac819 Merge remote-tracking branch 'origin/next' into thread/OP-770_UAV_Export_Version_Info_Fix 2013-05-27 21:11:30 +02:00
Fredrik Arvidsson
94d38a4b48 OP-770 Updates version info code used in AUV settings export file. 2013-05-27 20:42:56 +02:00
Alessio Morale
1e4262b309 OP-926 Fix huge tab height on kde due to wrong telemetrymonitorwidget size. 
Patch from Noxs, more details here: http://git.openpilot.org/cru/OPReview-486

+review OPReview-486
 2013-05-27 19:55:25 +02:00
Fredrik Arvidsson
d9d2b7d167 Merge remote-tracking branch 'origin/os/OP-770_version_info_stuff' into thread/OP-770_UAV_Export_Version_Info_Fix 2013-05-27 19:30:18 +02:00
Brian Webb
50162333d8 Merge remote-tracking branch 'origin/dankers/minor-modem-renames' into next 2013-05-27 09:44:17 -07:00
Alessio Morale
6df6ec20a4 OP-761 fix constants type+ 
+review OPReview-487
 2013-05-27 00:23:18 +02:00
Alessio Morale
6f32ff3f68 OP-968: HITL Simulation gadget has fixed size buttons and button text gets truncated in French translation 
+review OPReview
 2013-05-27 00:06:24 +02:00
Alessio Morale
6e277906e2 OP-761 Fix visualization of UAV GPS coordinates for CC/CC3D 
When positionActual is (0,0,0) uses GPS position as the UAV position

+review OPReview
 2013-05-26 19:43:28 +02:00
Brian Webb
e9f83bcc80 Fixes a bug in the rfm22b driver that was reading past the end of the bindings list when receiving a status message. Also adds some formatting changes that came about after doing a make uncrustify_all. 2013-05-26 08:36:38 -07:00
David Ankers
9f44e588f7 Rename USB Constants that map product to PID, changes PipX to OPLM 2013-05-26 16:37:33 +10:00
David Ankers
9cc314f7db Remove Rawhid folder, replaced by OPHid from Mathieu, Richard and Voha 2013-05-26 16:29:33 +10:00
Mathieu Rondonneau
f62391028a OP-958: Add function header doc and give credit to Richard (not mentionned in a previous commit). 
I gorgot to mention that the following commit was a patch from Richard.
Thanks to richard for suggesting this patch.

commit 45e18127a3
Author: Mathieu Rondonneau <Mathieu.Rondonneau@gmail.com>
Date:   Sat May 25 08:06:41 2013 -0700

    OP-958: adding patch for map to use proper lock mechanism.
 2013-05-25 19:08:53 -07:00
Oleg Semyonov
444431579e OP-770: add/rename some version-info.py template variables 2013-05-25 23:02:29 +02:00
Oleg Semyonov
4f6c633815 OP-770: extend VersionInfo class to include most of the info available 2013-05-25 23:02:28 +02:00
Mathieu Rondonneau
4b46251ff1 Merge branch 'Mathieu/OP-958_HID_plugin_basic_cleanup' into next 2013-05-25 13:42:15 -07:00
Mathieu Rondonneau
45e18127a3 OP-958: adding patch for map to use proper lock mechanism. 2013-05-25 08:06:41 -07:00
Fredrik Arvidsson
917d3ebbd8 Merge branch 'thread/OP-970_Revo_Radio_Warning' into next 2013-05-25 12:05:31 +02:00
Fredrik Arvidsson
d492d3e14e OP-970 Fixes a problem with the Radio/Modem warning dialog showing up on board connection. 2013-05-25 12:04:50 +02:00
Richard Flay (Hyper)
911352d8a7 Merge branch 'next' into amorale/OP-960_systemhealt_warning 2013-05-25 17:19:58 +09:30
Richard Flay (Hyper)
e8f14b3718 Merge branch 'next' into amorale/OP-960_systemhealt_warning 2013-05-25 17:14:04 +09:30
Fredrik Arvidsson
3c55485d88 OP-970 Removes a comma. 2013-05-25 09:43:59 +02:00
Fredrik Arvidsson
03a2e82ba3 OP-970 Adds antenna warning dialog when activating built in modem for Revolution. 2013-05-25 09:42:26 +02:00
Mathieu Rondonneau
13beee32af OP-958: Fixing issue due to renaming. 2013-05-24 19:22:19 -07:00
a*morale
667c717e68 OP-958 Fixed a connection problem due to missing qRegisterMetaType for USBPortInfo 2013-05-25 03:10:23 +02:00
Oleg Semyonov
b00e25c393 OP-958: fix opHID file name case for linux 2013-05-25 03:50:24 +03:00
Oleg Semyonov
3757c8e391 OP-958: uncrustify sources 2013-05-25 02:52:33 +03:00
Oleg Semyonov
0f33a16ed8 OP-958: rename opHID plugin directory to lower case (same as all other plugins) 2013-05-25 02:51:50 +03:00
Oleg Semyonov
5ee36070e3 OP-958: usbmon.h: remove superfluous #ifdef 2013-05-25 02:51:40 +03:00
Oleg Semyonov
9474550351 OP-958: usbmon_mac: remove unused code 2013-05-25 02:51:31 +03:00
Oleg Semyonov
d1dd944bc3 OP-958: uncrustify sources 2013-05-25 02:51:20 +03:00
Oleg Semyonov
f6d2f152b9 OP-958: windows/hid.c: fix file mode (was executable) 2013-05-25 02:51:05 +03:00
Oleg Semyonov
c10932b457 OP-958: move hidapi.h under library root to stop uncrustification 2013-05-25 02:50:52 +03:00
Oleg Semyonov
f61340f30a OP-958: do not uncrustify hidapi library (add .no-auto-format file) 2013-05-25 02:50:28 +03:00
Voha
3b7c6eaa5f *[mac only] definition usb devices made ​​in an additional thread 2013-05-24 21:53:35 +03:00
Corvus Corax
1353be6cb0 Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 2013-05-24 19:33:27 +02:00
Mathieu Rondonneau
ccc7e4a0ab OP-958: fix cast. 
I am about to check-in something that I have not compiled :(
Will check build server to make sure it pass build and revert if needed.
 2013-05-23 19:33:54 -07:00
Alessio Morale
1d0c18ebcd Applied hidapi branch iokit_path from https://github.com/mrpippy/hidapi.git 2013-05-23 22:52:26 +02:00
Fredrik Arvidsson
cfaeead5b3 OP-935 Adds tool-tips for the majority of the settings in the Stabilization screen. 2013-05-23 21:26:43 +02:00
Corvus Corax
9b95af2006 refaktored GPS Sensor UAVObjects 2013-05-22 22:36:23 +02:00
Corvus Corax
b56de3b66b filterchain rework 2013-05-22 21:26:18 +02:00
Mathieu Rondonneau
bfcb608b82 OP-958: More cleanup and handle some corner cases: 
- retry discovery 5 times max before giving up.
   - open the last hid device in the list in case there are several hid device of the same vid.
   - remove structure and move handle to class.
 2013-05-21 21:04:44 -07:00
Mathieu Rondonneau
4b68c6da74 OP-958: adding clearer message regarding the requirement for libusb-1.0.0 dev package: 
- break the build nicely telling the user to install the dev library package.
 2013-05-21 20:10:37 -07:00
Mathieu Rondonneau
3ec742f540 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-21 19:09:20 -07:00
Mathieu Rondonneau
133a801dc5 OP-958: fix compiler error (showing on bambo) 2013-05-21 19:06:48 -07:00
Mathieu Rondonneau
c3033ece11 OP-958: add usb.h include only for linux 2013-05-21 09:00:50 -07:00
Mathieu Rondonneau
ec42669787 Merge branch 'amorale/OP-958_HID_plugin_basic_cleanup' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-21 08:22:33 -07:00
Alessio Morale
3b6ce9dbc3 OP-958 Fix compilation issues on Windows platform 2013-05-21 15:16:56 +02:00
Alessio Morale
2e3e5be053 OP-960 Fixed spacing 
+review OPReview-481
 2013-05-21 08:29:35 +02:00
Alessio Morale
81e10c9d1b OP-960 Prevent a warning to appear each time an alarm not in svg is received 
+review OPReview
 2013-05-21 00:47:22 +02:00
Fredrik Arvidsson
3d04238a00 OP-957 Removed I-Term settings for Attitude mode on Basic stabilizations tab. 2013-05-20 22:54:42 +02:00
Corvus Corax
0183996702 added missing uavobject in GCS 2013-05-20 18:51:52 +02:00
Mathieu Rondonneau
6e909f0dcf OP-958: HID plugin basic cleanup: 
- minor forgotten cleanup.
 2013-05-20 02:46:45 -07:00
Corvus Corax
1236bf3ed9 renamed Magneto to Mag 2013-05-20 10:33:02 +02:00
Corvus Corax
49b8e0d699 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-20 10:07:55 +02:00
Mathieu Rondonneau
d2244d83d1 OP-958: GCS HID plugin basic cleanup: 
- new plugin (opHID) to deprecate old one (rawhid).
- remove pjrc HID api implementation.
- add hidapi library taken from https://github.com/signal11/hidapi.git (copied files, the lib is not compiled from its git repo).
- history of those files is broken (cp instead of git mv) but the history is all in rawhid plugin.
- mac and windows not tested yet.
 2013-05-19 21:49:53 -07:00
Oleg Semyonov
a408d9748c Uncrustification 2013-05-20 00:02:34 +03:00
Fredrik Arvidsson
864300d975 OP-893 Added Auto Update functionality to the firmware page. 2013-05-19 23:00:44 +02:00
Corvus Corax
d97934cf86 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-19 22:05:48 +02:00
Sexy Pony
900f643bbd Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +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
Corvus Corax
f630351c75 Merge branch 'next' ... 2013-05-19 12:17:40 +02:00
Corvus Corax
daf329d8f5 uncrustification (again) 2013-05-19 11:38:18 +02:00
David Ankers
f6cedeaaf6 Add John Pike and Rick King to contributors, rename Authors Tab to Contributors, the GCS lists all people that have helped OP, not just GCS authors. 2013-05-19 15:31:59 +10:00
David Ankers
915b7857f6 Changed the word maiden to the word first, easier to read and makes more sense for people that use English as a second language 2013-05-19 14:58:57 +10:00
David Ankers
2abcef1071 Changed aircraft word to controller as per Pablo. 2013-05-19 14:57:40 +10:00
David Ankers
3d2f62f014 Removed the CopterControl wording from the bis calib screen om the wizard, this page will be used for the Revo also 2013-05-19 14:55:39 +10:00
Oleg Semyonov
5274a6c6fa OP-955: rename version_info related files an directories 2013-05-18 20:28:52 +02:00
Corvus Corax
5284195c29 Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState 2013-05-18 19:36:45 +02:00
Fredrik Arvidsson
62ee55fbb8 OP-955 Moved generated version info to its own lib. Updated code using version info in all referenced places. 2013-05-18 14:28:46 +02:00
Corvus Corax
80caceb984 make uncrustify_all;make uncrustify_all; 2013-05-18 14:17:26 +02:00
Oleg Semyonov
76be45242c OP-955: replace gcs_version_info.h by version_info.h and version_info.cpp 
This commit breaks the build. Other files should be updated accordingly.
 2013-05-17 21:44:11 +03:00
Fredrik Arvidsson
eedfb7081c Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-14 20:54:44 +02:00
Fredrik Arvidsson
c4adede7ac OP-952 Adds settings per scope-plot if to draw the plot anti-aliased. Default setting is true. Adds a fix to not render the plots when they are not visible. Saves CPU. 2013-05-13 21:24:19 +02:00
Fredrik Arvidsson
0bc589956b OP-935 Removed a chewing gum that was stuck under the about dialog ;) 2013-05-12 16:00:02 +02:00
Fredrik Arvidsson
49af941813 OP-935 Sets the correct background color of some configuration pages. 2013-05-12 15:44:15 +02:00
Fredrik Arvidsson
fee4e1009b OP-935 Removes gui for unimplemented temperature compensation calibration. 2013-05-12 11:53:21 +02:00
Fredrik Arvidsson
ddf2ccf720 OP-935 Fixes some gui issues. 2013-05-12 11:28:09 +02:00
Fredrik Arvidsson
3b7c274c78 OP-935 Renames 'Camera stab' to 'Gimbal'. Adds functionality to store-clear and recall board rotation during calibration. 2013-05-12 11:27:12 +02:00
Fredrik Arvidsson
7a727f5496 OP-935 Changes order of setting groups on Advanced tab in Stabilization settings page. 2013-05-07 20:56:02 +02:00
Fredrik Arvidsson
914724d8c8 OP-935 Adds limits to Responsiveness settings. 2013-05-07 20:39:58 +02:00
Fredrik Arvidsson
23bc774a03 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-06 22:48:57 +02:00
Corvus Corax
39fe6beb4b Merge branch 'corvuscorax/Attitude-fixes' into next 
Conflicts:
	flight/libraries/insgps13state.c
	flight/modules/Attitude/revolution/attitude.c
 2013-05-05 23:09:07 +02:00
Fredrik Arvidsson
18798470f8 OP-935 Adds a 'Instant Update' check box on Advanced tab of Stabilization configuration. 2013-05-05 22:20:48 +02:00
Fredrik Arvidsson
daee2de918 OP-935 Fixes Default settings button for Responsiveness on Basic page. 2013-05-05 21:28:34 +02:00
Fredrik Arvidsson
25fa8746e4 Merge remote-tracking branch 'origin/OP-596_GCSController_output_fix' into next 2013-05-05 18:59:49 +02:00
Fredrik Arvidsson
a334c49151 OP-935 Fixes the Instant Update functionality on the Stabilization settings pages in the configuration plugin. 2013-05-05 18:48:48 +02:00
Corvus Corax
946105cbe3 Merge branch 'next' into corvuscorax/Attitude-fixes 2013-05-05 17:44:59 +02:00
Fredrik Arvidsson
176bd3c4f7 OP-935 Adds Responsiveness sliders to basic stabilization screen. 2013-05-05 12:45:35 +02:00
Fredrik Arvidsson
4c0e5a39ca OP-935 Disables controls when no board is connected. Re-Factored the MixerCurve widget. 2013-05-04 00:13:15 +02:00
Fredrik Arvidsson
5c906802f1 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-03 08:01:14 +02:00
Corvus Corax
25c58ff074 Put all EKF initialisation values in a separate UAVObject EKFConfiguration, 
adapted insgps13state.c/.h,
modules/Attitude/revolution,
configrevowidget.cpp,
accordingly.
 2013-05-03 02:17:44 +02:00
Fredrik Arvidsson
1b1ed784c4 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-02 18:38:12 +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
Nuno Guedes
764412fd13 A few safety parameters added 
- added a small safety margin to keep the motors from spinning at 0% throttle
- added protection against weird values and values outside the margins
- some code style fixes added
 2013-05-01 23:22:41 +01:00
Corvus Corax
e7dc665c14 Reworked Variance Objects, Setting for initial EKF variance 2013-05-01 19:16:29 +02:00
Oleg Semyonov
9305ced139 Make uncrustify happy and prevent flip-flops 2013-05-01 20:07:07 +03:00
Fredrik Arvidsson
6d3407e4e4 OP-935 Adds shadow to the image on Revolution hardware page. 2013-05-01 18:18:30 +02:00
Corvus Corax
d77c690fe3 Merge branch 'next' into corvuscorax/Attitude-fixes 
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
 2013-05-01 17:51:05 +02:00
Fredrik Arvidsson
11cb89930a Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-01 16:16:16 +02:00
Fredrik Arvidsson
5cbf615566 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-01 13:39:32 +02:00
Oleg Semyonov
7032d2a9d6 Merge remote-tracking branch 'origin/next' into os/uncrustify-config 2013-05-01 13:31:38 +02:00
Fredrik Arvidsson
4e823874fb Merge remote-tracking branch 'origin/filnet/OP-907_gcs_vehicle_config_overhaul' into next 2013-05-01 13:01:55 +02:00
Fredrik Arvidsson
2d409188f8 OP-935 Adds checkbox for 'real time updates' to basic screen. Disables controls when no board is connected. 2013-05-01 12:59:07 +02:00
Oleg Semyonov
0394a3511c Rename template files to *.template to screen from uncrustify processing 2013-04-30 16:54:27 +02:00
Fredrik Arvidsson
a5f87bea62 Merge branch 'thread/OP-933_Config_Plugin_Tab_Selection' into next 2013-04-30 07:10:21 +02:00
Fredrik Arvidsson
7fd3b83b1c OP-933 Makes tab selection in Configuration plugin sticky between board connect - disconnect - connect. 2013-04-29 18:44:54 +02:00
Fredrik Arvidsson
360dd75d55 OP-816 Added Accel and Gyro bias calibration support for Revolution board. 2013-04-29 15:11:24 +02:00
Corvus Corax
6e2c9b3c46 New EKFStateVariance UAVObject with EKF state variance information 2013-04-28 19:38:37 +02:00
Corvus Corax
24af6b0d80 Handle Gyro bias the same way as other biases during calibration 2013-04-28 12:06:24 +02:00
sambas
38d9d5dde3 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	flight/modules/VtolPathFollower/vtolpathfollower.c
 2013-04-28 09:46:14 +03:00
David Ankers
9914ab869d Fix minor spelling error in Revo calib screen 2013-04-28 16:06:36 +10:00
sambas
9fec3f5567 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-27 13:39:58 +03:00
Fredrik Arvidsson
e1e3183c6d OP-816 Adding Revolution illustration to the connection diagram. 2013-04-27 11:22:08 +02: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
Oleg Semyonov
4718e666ee Merge remote-tracking branch 'origin/thread/OP-816_Setup_Wizard_Revo_Support' into next 2013-04-26 15:18:01 +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
Philippe Renon
6ff2b1873d OP-907 fixed regression in vehicle config : "dirty" state management 
was broken (continued).
 2013-04-25 00:07:06 +02:00
Philippe Renon
99c052651c OP-907 fixed regression in vehicle config : "dirty" state management 
was broken.
+ added comments
 2013-04-24 23:24:23 +02:00
Philippe Renon
d7596a64ff OP-907 reverted airframe.ui border from 9 to 12 to make it more consistent 
with other config tabs
 2013-04-24 22:05:31 +02:00
Oleg Semyonov
33ed88e696 Merge remote-tracking branch 'origin/next' into os/OP-899_board-rename-and-config-rework 2013-04-24 21:28:33 +02:00
Oleg Semyonov
21e7e95f87 Merge remote-tracking branch 'origin/os/add-uncrustify' into next 2013-04-24 02:31:41 +02:00
Oleg Semyonov
f9f721a76a Reset executable bits from non-executable files (Windows legacy) 2013-04-24 01:18:46 +03:00
Oleg Semyonov
fb207bdaf7 OP-896: rename SensorTest to RevoProto 2013-04-24 00:57:33 +03:00
Oleg Semyonov
406339eb49 Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3 
Conflicts:
	flight/Libraries/inc/op_dfu.h
	flight/Libraries/op_dfu.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/OSD/op_dfu.c
	flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
	flight/targets/boards/coptercontrol/bootloader/op_dfu.c
	flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
	flight/targets/boards/oplinkmini/bootloader/op_dfu.c
	flight/targets/boards/osd/bootloader/inc/op_dfu.h
	flight/targets/boards/osd/bootloader/op_dfu.c
	flight/targets/boards/revolution/bootloader/inc/op_dfu.h
	flight/targets/boards/revolution/bootloader/op_dfu.c
	flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
	flight/targets/boards/sensortest/bootloader/op_dfu.c
	make/boot-defs.mk
 2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next 
Conflicts:
	flight/Libraries/op_dfu.c
	flight/PiOS/STM32F10x/pios_iap.c
	flight/PiOS/inc/pios_iap.h
	flight/targets/BootloaderUpdater/main.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/CopterControl/op_dfu.c
	flight/targets/Bootloaders/OSD/inc/op_dfu.h
	flight/targets/Bootloaders/PipXtreme/op_dfu.c
	flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
	flight/targets/Bootloaders/RevoMini/op_dfu.c
	flight/targets/Bootloaders/Revolution/inc/op_dfu.h
	flight/targets/Bootloaders/Revolution/op_dfu.c
	ground/openpilotgcs/src/plugins/uploader/uploader.ui
	make/apps-defs.mk
	make/boot-defs.mk
 2013-04-23 23:14:11 +02:00
Oleg Semyonov
399cafe7d7 OP-896: rename RevoMini to Revolution 2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb OP-896: rename Revo to SensorTest 2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056 OP-896: rename OPLink to OPLinkMini 2013-04-24 00:07:04 +03:00
Philippe Renon
4690949575 Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul 
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
 2013-04-22 22:56:06 +02:00
Oleg Semyonov
aa30f093a2 Merge remote-tracking branch 'origin/next' into os/add-uncrustify 2013-04-22 22:01:56 +02:00
Oleg Semyonov
8d1e1fdbc0 tools: make uncrustify_install target, script and base config file 
See also: OPIN-3
 2013-04-22 21:35:25 +02:00