Oleg Semyonov
72a2d1a50e
style: use 2 spaces and full stop for UAVO comments (as used in other objects)
...
+review OPReview-430
2013-04-19 18:47:56 +03:00
sambas
6989468d17
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
.gitignore
2013-04-14 10:13:51 +03:00
Corvus Corax
87ed9a8be2
reimplemented delayed callback scheduler to allow dispatching from ISR's and multiple schedulers with different task priorities
2013-04-14 04:16:34 +02:00
Corvus Corax
bbb83752f7
rebased delayed callback scheduler
2013-04-13 21:50:47 +02:00
Brian Webb
28bfc2725c
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-11 14:42:49 +01:00
Oleg Semyonov
2d9a2ef712
OP-897: fix formatting +review OPReview-438
2013-04-09 01:11:02 +03:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03:00
Oleg Semyonov
f260b2f568
OP-897: remove non-user-selectable modes from GCS dropdown lists
...
Now all unsupported options are disabled. They will be reenabled when
ready for end users. Still developers can set them using UAVObjBrowser.
As a side effect, a bit changed UAVO XML definitions. The "limits"
option now uses comma to separate rules, semicolon to separate elements.
Was vice versa.
OP-897 #resolve #comment Pushed for review
+review OPReview
2013-04-06 19:01:12 +03:00
Brian Webb
948038f655
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28
Added setting of min/max frequencies on OPLink coordinator.
2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7
OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
...
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:
git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Oleg Semyonov
cd155dd349
FlightBatteryState.xml: add missing space
2013-04-05 12:44:05 +03:00
Alessio Morale
45b0e787a4
OP-886 Improvements to sanitychecks
...
Added an Extensions to Alarm for detailed status/substatus reporting.
Extended Alarms are the first in the Alarm structure and have corresponding fields in Status and Substatus structures.
Also added a filter to the HWsettings update to prevent to block arming when actual settings have not changed.
+review OPReview
2013-03-30 19:57:16 +01:00
sambas
5ded8c6dfc
VTOL path fixes
...
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
2013-03-28 18:29:26 +02:00
sambas
77cae9ffc3
MagBaro Extension board module
...
OSD update
OSD output module for FC
Sonar update
Flight mode fixes + poi
2013-03-28 18:20:50 +02:00
Brian Webb
1979e8b57f
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 16:57:59 +01:00
Brian Webb
2b6345850b
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 00:58: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
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
be8e5d159b
OP-872 handle all outputs for CC/CC3D and Revolution
2013-03-14 20:13:02 +01:00
David Ankers
dbdb42f2f4
Updated for Silk
2013-03-10 06:09:31 +11:00
Brian Webb
e70f0f2c21
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-09 01:43:46 +00:00
Alessio Morale
ffbb0a5a8e
Merge remote-tracking branch 'origin/amorale/op-848_mpu6000_configurability' into next
2013-03-08 00:08:15 +01:00
Brian Webb
c796b564b3
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-02-26 18:29:49 -07:00
David Willis
7a4fcba285
Merge branch 'next' into dwillis/OP-792
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
Merge next
2013-02-26 23:57:06 +00:00
Brian Webb
d9baa372c7
Added frequency hopping to the RFM22B driver. Currently it defaults to 128 channels between 430 and 440 MHz.
2013-02-24 23:05:51 +00:00
David Willis
d4ef4fb43f
OP-792 Add autotune to list of excluded items for flight mode position
2013-02-19 23:43:03 +00:00
Brian Webb
cf7c929030
Added the ability to store bindings and configuration paramaters for multiple (up to 8) modems from an OPLink controller modem.
2013-02-18 01:49:13 +00:00
Alessio Morale
81d056d0d5
OP-848 Added a note for the user on uavo tooltip to remember that it need board reboot for the setting to takes effect
2013-02-17 12:32:44 +01:00
Brian Webb
46baec52ef
Merge remote-tracking branch 'origin/next' into brian/rfm22_multibind
2013-02-17 01:21:12 +00:00
Alessio Morale
e27a07631e
op-848 MPU6000 support user configurabe accel/gyro scales and filter bandwidth.
...
board definitions can override any of this settings for special applications.
Also include cleanup from "magic numbers" and fix for inverted ranges
2013-02-17 02:02:12 +01:00
Oleg Semyonov
c8ce31f7a9
Merge remote-tracking branch 'origin/next' into theothercliff/elevon_cam_stab
2013-02-11 01:03:33 +02:00
Brian Webb
57b4d8c720
RFM22: Added support for binding to multiple remove OPLinks.
2013-02-08 01:56:22 +00:00
Brian Webb
6de2252c23
OP-814: Added PPM input on the FlexiPort for CC/CC3D.
2013-02-08 01:06:41 +00:00
Cliff Geerdes
6d4e8e4657
OP-824 Feedforward fix, 0.0f, coding style, and var name changes.
2013-02-07 18:27:59 -05:00
Brian Webb
e50e645e7b
Merge remote-tracking branch 'origin/next' into brian/oplink_ppm_out
2013-02-07 13:39:21 +00:00
Cliff Geerdes
8104ae25dd
OP-824 Add CameraStab Elevon-type mixing. Redo servo reversing.
2013-02-03 19:02:34 -05:00
Corvus Corax
7642f44cad
Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity
...
Conflicts:
flight/Modules/FirmwareIAP/firmwareiap.c
flight/Modules/ManualControl/manualcontrol.c
flight/targets/SimPosix/Makefile
shared/uavobjectdefinition/systemalarms.xml
2013-02-03 14:57:54 +01:00
Brian Webb
a4faa22c4b
Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2013-01-31 13:40:32 +00:00
Cliff Geerdes
6806e895cc
First version. Passes simple tests.
2013-01-30 18:57:32 -05:00
Alessio Morale
f293298118
Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
make/scripts/version-info.py
package/Makefile.linux
2013-01-19 20:23:48 +01:00
Brian Webb
be444db7f8
Added PPM output to OPLink firmware
2013-01-04 06:51:27 -07:00
Brian Webb
9f3d7a24f8
Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf
...
Conflicts:
flight/RevoMini/Makefile
2012-12-30 07:59:09 -07:00
Corvus Corax
37df2bcbf4
OP-742: Merge branch 'corvuscorax/airspeed_fixes' into revo-fixes
...
Conflicts:
flight/RevoMini/Makefile
2012-12-29 12:09:58 +01:00
Brian Webb
3a1803b7a1
Added RFM22B (OPLink) receiver.
2012-12-13 21:07:19 -07:00
Brian Webb
6ffe518509
RFM22B: Improved link stability, and added tracking of error encountered in the processes of transmitting and receiving.
2012-12-11 17:44:15 -07:00
Brian Webb
6ed9b63da9
RFM22B: Changing configuration parameters over-the-air working. Added tracking of Tx/Rx sequence number. Still seeing too many resent packets.
2012-12-11 17:44:11 -07:00
Brian Webb
7aaa02268f
RFM22B: Added TX Resent to OPLink status. Also removed the need for the packet queue.
2012-12-11 17:44:08 -07:00
Brian Webb
bd42083376
RFM22B: Changed the way the frequencies and power settings are set for the rfm22b device.
2012-12-11 17:43:55 -07:00
Brian Webb
dae382564a
RFM22B/RM: Added rfm22b com device, moved remaining functionality in the radio module to the rfm22 driver, and simplified configuration of the PipX/OPLink. The radio device now presents itself completely as a com device, both in RadioComBridge (OPLink devices) and Telemetry (RM). Also change the PipXStatus and PipXSettings UAVOs to OPLinkStatus/OPLinkSettings.
2012-12-11 17:43:53 -07:00
Brian Webb
4b90f81f6f
RFM22B: Modified the method of tracking RX errors, and now reporting Good, Corrected, Error, and Missed packets to the GCS. Also removed some less useful fields from the PipXStatus.
2012-12-11 17:43:49 -07:00
Oleg Semyonov
41d56b282e
[OP-724] Remove LPF from throttle input channel (not necessary)
2012-12-02 13:50:03 +02:00
Oleg Semyonov
cc98962c36
[OP-724] Provide generic gimbal type
2012-11-29 18:03:05 +02:00
Oleg Semyonov
8adc2abd77
[OP-724] Now most camera options can be set independently per each axis.
2012-11-29 17:39:10 +02:00
Oleg Semyonov
5784ea8b36
[OP-724] Provide Actuator option to disable selected channels and use it for 7s camera boot delay
...
Actuator did not provide an option to completely shutdown selected channels
(set PWM pulse = 0). It is useful for camera stabilization boot delay (we
want few seconds of gimbal servo inactivity to calibrate gyros). It also
might be useful for failsafe on some channels. This option is now available.
It is used to disable camera outputs during fixed 7s delay after boot
instead of setting them to minimum position.
As a side effect, few bugs are fixed (ticks should be multiplied by
portTICK_RATE_MS, not divided, to get time in ms). And few floating point
operations were optimized out as well.
ActuatorCommand.UpdateTime was promoted to uint16 because it is not unusual
to have it 20000ms during flash updates (was seen on the CC after UAV
settings import). So it should be 16bit as well.
2012-11-29 17:39:09 +02:00
Oleg Semyonov
8f5fb5aeb0
[OP-724] Add camera gimbal filtering and feed forward options
...
This is a partial rework of Cossacs' camera gimbal software.
This patch adds LPF to airframe attitude used for camera stabilisation
and feed forward for camera actuators. Either of options can be
disabled on the compilation level to save flash and RAM if not
required.
Original Cossacs' code was optimized and code flow shortcuts were
added where applicable.
2012-11-29 17:39:08 +02:00
Oleg Semyonov
ee333f1569
[OP-724] Add manual control input filtering (useful for camera gimbal)
...
This is a partial rework of Cossacs' camera gimbal software.
This patch adds LPF to some of manual control inputs. Mostly
useful are accessory channels (for camera gimbal control) and
yaw channel (for smooth filming). The code may be used for
stand-alone CC[3D]-based gimbal software, but also should work
for complete FC+camera system.
2012-11-29 17:39:07 +02:00
Oleg Semyonov
ea1199603b
Merge remote-tracking branch 'origin/rel-12.10.2' into next
...
Conflicts:
MILESTONES.txt
2012-11-29 17:31:50 +02:00
Erik Gustavsson
5e14f5352f
Minor codestyle/whitespace cleanup
2012-11-29 00:03:38 +02:00
Erik Gustavsson
dc5394dcf3
Add setting to suppress axis output from Stabilization module until armed and throttle is applied. Useful to keep the tail prop out of the grass while arming a tri.
2012-11-29 00:03:37 +02:00
Corvus Corax
7059d4f032
changed some details as to dschin's suggestions
2012-11-22 13:26:45 +01:00
Corvus Corax
264f631df6
Merge branch 'corvuscorax/baro_fixes' into revo-fixes
2012-11-22 11:51:36 +01:00
Corvus Corax
2e9ec6810b
OP-699 fix buggy default in fixedwingpathfollowersettings - is being refactored anyway
2012-11-22 11:33:01 +01:00
Corvus Corax
4f601eafe7
OP-736 remove unsupported failsafe type from manualcontrolsettings. should only be readded once supported for safety reasons!
2012-11-22 11:22:07 +01:00
Corvus Corax
34210ef9ae
Merge branch 'corvuscorax/OP699' into revo-fixes
2012-11-22 10:57:11 +01:00
Corvus Corax
39154e083d
OP-734 - fix update mode in PathStatus
2012-11-22 10:47:20 +01:00
Oleg Semyonov
79f95983da
Merge remote-tracking branch 'origin/rel-12.10.2' into next
2012-11-14 17:26:18 +02:00
Erik Gustavsson
e186101fe7
Change default AccelTau value to zero (filter disabled)
2012-11-11 21:16:48 +01:00
Corvus Corax
e9da78406a
Merge branch 'corvuscorax/baro_fixes' into corvuscorax/airspeed_fixes
2012-11-08 09:48:01 +01:00
Corvus Corax
b09027afe5
Completely refactored airspeed module, now a pure sensor input module without any complex sensor fusion features -- changed driver for mpxv analog airspeed to be more versatile
2012-11-08 01:31:21 +01:00
Corvus Corax
5981d9acd6
removed surplus NEDposition uavobject
2012-11-06 10:13:09 +01:00
Corvus Corax
e8232ba825
Pathplanner: removed pathPlannersettings and preprogrammed (hardcoded) paths
2012-11-05 16:04:45 +01:00
Corvus Corax
3f248915cb
Merge remote-tracking branch 'origin/revo-next' into corvuscorax/airspeed_fixes
2012-11-03 20:03:18 +01:00
Stacey Sheldon
9d1825f8a8
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-11-01 23:23:33 -04:00
Sambas
949b17baae
this made GCS tx rate go over 3000
2012-10-31 20:59:40 -04:00
Sambas
32e3f2e631
this made GCS tx rate go over 3000
2012-10-31 21:15:39 +02:00
Erik Gustavsson
c207afbfef
Implement smoothing filter for accelerometer data.
2012-10-31 19:05:59 +01:00
Stacey Sheldon
5aa3777078
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/Telemetry/telemetry.c
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-30 00:41:35 -04:00
Stacey Sheldon
2119067722
Merge remote-tracking branch 'op-revo/james/revo' into revo-next
...
Conflicts:
Makefile
flight/Modules/Attitude/revolution/attitude.c
flight/Modules/Battery/battery.c
flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/OveroSync/overosync.c
flight/Modules/PathPlanner/inc/pathplanner.h
flight/Modules/PathPlanner/pathplanner.c
flight/Modules/Sensors/sensors.c
flight/Modules/VtolPathFollower/vtolpathfollower.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Boards/pios_board.h
flight/PiOS/STM32F4xx/library.mk
flight/PiOS/inc/pios_hmc5883.h
flight/PiOS/inc/pios_l3gd20.h
flight/PiOS/inc/pios_rfm22b_priv.h
flight/Revolution/Makefile
flight/Revolution/Makefile.osx
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
package/Makefile
shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/pathdesired.xml
shared/uavobjectdefinition/vtolpathfollowersettings.xml
shared/uavobjectdefinition/waypoint.xml
2012-10-30 00:08:43 -04:00
Corvus Corax
6409dfb2df
Further cleanup in PathFollower. Should now be safe to fly again
2012-10-28 21:49:22 +01:00
Stacey Sheldon
bc3a90c6a9
Merge branch 'one-way-telemetry' into next
2012-10-25 22:48:43 -04:00
James Cotton
68ae9f52c9
SystemAlarms: Convert to the newer way of listing elements to help merges and added SystemConfiguration
2012-10-25 12:31:26 -05:00
Laura Sebesta
5e785d4524
Added body-frame acceleration to ground truth UAVO and to flight simulator output.
...
Conflicts:
shared/uavobjectdefinition/groundtruth.xml
2012-10-23 11:50:00 +02:00
Laura Sebesta
433d723251
Added groundtruth simulation support.
...
This new UAVO serves principally to log data for future comparison with
onboard estimation techniques.
Conflicts:
ground/openpilotgcs/src/plugins/hitl/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitl/simulator.h
2012-10-23 11:47:58 +02:00
Kenz Dale
1ab1ea5899
Save ~150 bytes by moving GPSDataProtocol to SystemSettings.
...
All credit to Anstron.
2012-10-22 16:47:22 +02:00
Stacey Sheldon
4892fdb33d
telemetry: allow telemetry to flow when not connected to GCS
...
Previously, when unconnected, only the flighttelemetrystats
UAVO was Tx'd. All other UAVOs were inhibited. This led to
zero telemetry data when the connection to the GCS was gone.
This precluded getting useful telemetry from a receive-only
station.
This commit changes two main areas.
First, UAVO updates are now allowed regardless of the "connected"
state between the GCS/FC.
Second, it makes both the flighttelemetrystats and gcstelemetrystats
UAVOs un-acked. This prevents these objects from blocking all
other UAVOs while they wait for their ack. This is OK since the
real "connection" negotiation happens via the states exchanged in
the Status field of these UAVOs.
2012-10-21 22:51:17 -04:00
Stacey Sheldon
127ca1e7e1
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-20 13:56:18 -04:00
James Cotton
96afe7cffd
Merge remote-tracking branch 'origin/stac/add-debug-consoles' into next
2012-10-12 08:07:44 -05:00
Stacey Sheldon
f0e0c2e79e
console: add debug console via USB CDC/VCP interface
...
The USB VCP Port has a new DebugConsole setting that
routes all output destined for PIOS_COM_DEBUG to the
emulated serial port.
To enable this in your build, you'll have to build like:
- make fw_coptercontrol_clean
- make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
You can then output formatted text to the console
like this:
#if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
PIOS_COM_SendFormattedString(PIOS_COM_DEBUG,
"foo is %u\r\n",
foo);
#endif /* PIOS_INCLUDE_DEBUG_CONSOLE */
Please ensure that all of your debug output is
wrapped with these macros so that your debug
code doesn't bloat the firmware image.
2012-10-11 00:51:09 -04:00
Stacey Sheldon
6088c05946
console: add support for serial debug consoles
...
Serial ports now have a new HW setting called DebugConsole
which can be used to dump internal state to a serial port
for debug.
To enable this feature, you need to:
- make fw_coptercontrol_clean
- make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
- configure one of the serial ports as DebugConsole in the GCS
- save settings
- power-cycle your board
Things to note:
- The console is at 57600,8N1.
- This is not currently configurable via the GCS.
- You can only have a single console enabled at a time.
2012-10-11 00:22:07 -04:00
Laura Sebesta
c2b49b6ef3
Merge branch 'kenz/cc_hitl_merge' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
2012-10-08 15:30:27 +02:00
James Cotton
2191befe17
Merge remote-tracking branch 'revo/brian/rfm22_rf2' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-05 08:20:35 -05:00
Brian Webb
5724fa083c
RFM22B: Added link quality calculation based on number of dropped packets. Also added packet error correction, which apparently wasn't being done before.
2012-10-04 21:11:40 -07:00
James Cotton
193fdcd9a2
Make the default PipX RF power 1.25 mW to avoid damanging anything when there is no antenna
2012-10-04 16:41:02 -05:00
Stacey Sheldon
2f4b1e69dd
rcvr: Support PPM and PWM at the same time on CC
...
Adds a new mode for the receiver port (PPM+PWM) which
will allow simultaneous use of 1 pin for PPM and the
rest of the pins for PWM inputs.
2012-09-29 19:11:48 -04:00
Stacey Sheldon
9896a0d416
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 22:42:44 -04:00
James Cotton
6e114360f4
Merge branch 'next' into revo
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 14:04:44 -05:00
James Cotton
684620dce6
Merge remote-tracking branch 'origin/hyper/uavobjectparser-tweaks' into next
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 13:49:34 -05:00
James Cotton
0fa4b062a4
Merge branch 'next' into revo
2012-09-26 00:43:02 -05:00
PT_Dreamer
43f85d9617
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-25 10:44:32 +01:00
PT_Dreamer
3d5381893b
GCS-Changed relaytuning uavo to gcs readOnly
2012-09-24 22:47:18 +01:00
PT_Dreamer
fb073059ad
GCS-Use uavo definition hash to check for compatability
...
Unfortunately had to change the iap object.
2012-09-17 17:08:15 +01:00
Stacey Sheldon
754f58c33a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Revolution/Makefile.osx
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04:00
Stacey Sheldon
c5fda86e96
Merge branch 'next-merge' into revo-next
2012-09-15 21:47:32 -04:00
Stacey Sheldon
9a5ba841cf
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/pathaction.xml
shared/uavobjectdefinition/waypointactive.xml
2012-09-15 19:55:47 -04:00
a*morale
af9a3baffd
Added the 5&6th banks on ChannelUpdateFreq
2012-09-15 00:38:38 +02:00
James Cotton
13e7733e5f
Merge branch 'revo-mini' into revo
2012-09-12 02:30:10 -05:00
James Cotton
223a3473c2
Merge branch 'next' into revo-mini
2012-09-12 02:03:39 -05:00
James Cotton
11b099b1ef
Stabilization: Add configuration terms for the derivative calculation to the UAVO and pass
...
them in to the PID system.
2012-09-11 12:29:38 -05:00
a*morale
cf7aea6499
Support for Led Outputs as actuator channels 9&10.
...
Added the ARMING LED and INFO LED option for actuator channel
2012-09-10 20:14:24 -05:00
James Cotton
38e9d105aa
Merge branch 'pidt1' into test2
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-10 14:37:52 -05:00
James Cotton
4d87af38b6
Make sure the orders of the UAVOs match
2012-09-10 10:52:05 -05:00
Richard Flay (Hyper)
53e2db3b24
Added a backwards-compatible way to specify UAVO field element names and options as lists of child elements of the field element. Added the ability to specify that a field is a clone of another field, just with a different name
2012-09-08 14:41:55 +09:30
James Cotton
2f65fc1e8e
Merge branch 'next' into relay_tuning
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-04 10:43:04 -05:00
James Cotton
c9f66f5145
Merge branch 'revo' into revo-mini
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
flight/PipXtreme/System/pios_board.c
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-09-01 16:57:27 -05:00
James Cotton
6bfb2a5e45
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/coordinateconversions.h
ground/openpilotgcs/src/plugins/opmap/opmap.pro
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
James Cotton
f3327e3993
RM: Enabled optional modules and got the battery module working again.
...
Changed the hardcoded (ick) battery lines for RM. Also removed the reference
to PIOS_ADC_GetPin(4) as that pin is no longer available. Finally
changed the default FlightBatterySettings to work out of the box
for the standard recommended sensors.
2012-09-01 11:03:32 -05:00
Kenz Dale
e123a88262
Added UAVO for airspeeds.
2012-08-29 16:04:47 +02:00
James Cotton
b08775666b
Disable the telemetry port by default
2012-08-25 22:12:41 -05:00
David Ankers
69cd7235d3
Change Default GPS protocol to UBX
2012-08-25 19:16:16 -05:00
James Cotton
a7b5fcd77c
Monitor the radio threads
2012-08-25 18:48:30 -05:00
Brian Webb
415b86879c
Added the RFM22B driver to the Revo to support an RFM22B radio on the external SPI port.
2012-08-25 11:45:43 -07:00
James Cotton
8d70a632fe
Autotune: Increase the default step size for autotuning.
2012-08-24 23:06:41 -05:00
Brian Webb
b1c88628f6
Merge branch 'james/revo' of ssh://git.openpilot.org/revo into brian/revo_link
2012-08-24 19:35:40 -07:00
James Cotton
a3f1894cd7
Autotuning: Make the estimator require the value to toggle above and below the hysteresis level.
2012-08-24 21:33:08 -05:00
Brian Webb
76907fe8f1
Changed PipXStatus UAVO to update 1 / second.
2012-08-23 07:02:51 -07:00
David Ankers
2f168323d2
Default to telem on main port, no reasons against this unless I am being
...
stupid (very possible).
2012-08-22 07:12:47 +10:00
David Ankers
8d5c1e4253
Change Default GPS protocol to UBX
2012-08-22 05:11:28 +10:00
PT_Dreamer
fa465c54a8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
2012-08-21 14:46:16 +01:00
Stacey Sheldon
1f1b240b2a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-08-20 21:22:02 -04:00
James Cotton
44dc01126e
Merge branch 'next' into revo
2012-08-12 16:12:54 -05:00
James Cotton
5e61f66fc0
Messed up merge on manualcontrol settings
2012-08-12 14:44:54 -05:00
James Cotton
75db0fcb35
Merge branch 'next' into revo
...
Conflicts:
flight/Modules/GPS/GPS.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/systemalarms.xml
2012-08-12 14:38:38 -05:00
Stacey Sheldon
63c167c183
taskinfo: also track Event thread's stack usage and CPU utilization
...
The event dispatcher thread is started differently than most other
threads so it was missed in the taskinfo tracking information. Now
it's also included.
2012-08-11 18:47:03 -04:00
Stacey Sheldon
b505602c15
Merge remote-tracking branch 'origin/stac/rc-tx-joystick-emulation' into next
2012-08-11 11:21:18 -04:00
James Cotton
7cca5696a2
Merge remote-tracking branch 'origin/pt/boardbased_ui_limits' into next
2012-08-08 14:11:24 -05:00
James Cotton
06a6e367b0
Merge remote-tracking branch 'origin/hyper/OP-661' into next
2012-08-08 13:49:48 -05:00
Stacey Sheldon
ef0c12b1b6
hid joystick: emulate a USB HID joystick using RC Transmitter
...
Adds a new RCTransmitter setting for the USB HID interface which
emulates a USB HID joystick. The scaled RC receiver channels
from any RCVR protocol are passed through to the various emulated
joystick controls.
The main use for this feature is to allow you to use your own RC
transmitter with any RC simulator on a PC.
This is known to work with CRRCsim but should work with any simulator
that supports joystick input.
2012-08-05 21:45:27 -04:00
PT_Dreamer
df61d33f66
GCS- Added the ability to have more than 1 ui limit per index
2012-08-03 18:57:24 +01:00
James Cotton
ccbbda1b51
Make default tuning mode Attitude to make it easier on people like me :)
2012-08-03 12:41:00 -05:00
PT_Dreamer
4d19062059
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits
2012-08-03 18:14:51 +01:00
James Cotton
652647fc87
Make autotuning module optional
2012-08-03 09:37:46 -05:00
James Cotton
2ccd6605a4
Now the stabilization refactor is in we can make swapping between tuning the
...
system in rate or attitude mode software configurable.
2012-08-03 09:37:45 -05:00
James Cotton
28539a80d1
Change default tuning settings
2012-08-03 09:37:45 -05:00
James Cotton
7ea14ecc22
Track the output gain instead of amplitude so the measured values are
...
consistent if the settings are changed afterwards.
2012-08-03 09:37:45 -05:00
James Cotton
5c00451c9e
Remove unused value field from the relaytuning object
2012-08-03 09:37:45 -05:00
James Cotton
52ffec0be4
Increase the initial tuning amplitude to 0.15
2012-08-03 09:37:45 -05:00
James Cotton
dfd1aceb06
More work on autotune from GCS
2012-08-03 09:37:45 -05:00