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 |
|
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 |
|
Brian Webb
|
61200f01f5
|
RFM22B: Major refactoring of te RFM22B driver to implement a state machine for the driver. The state machine should now be complete, and the driver seems to be working pretty well on both the RM and the pipx.
|
2012-09-22 20:13:10 -07: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 |
|
James Cotton
|
223a3473c2
|
Merge branch 'next' into revo-mini
|
2012-09-12 02:03:39 -05:00 |
|
James Cotton
|
595083c982
|
PID: Fix small bug in setpoint weighting that had really ugly consequences
|
2012-09-12 00:07:17 -05:00 |
|
James Cotton
|
e4a167dca1
|
PID: Add a pid_apply_setpoint which takes in the setpoint and feedback term
This version allows performing setpoint weighting, currently on the derivative
component.
|
2012-09-11 13:21:19 -05:00 |
|
James Cotton
|
42bbd52d68
|
PID: Add a function to set the cutoff for the derivative term
Also contains a term for setting the deriative setpoint in the future
|
2012-09-11 12:27:41 -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
|
fa9a616b4c
|
PID: Add the 20 Hz low pass filter to the derivative term
|
2012-09-10 03:14:02 -05:00 |
|
Brian Webb
|
fad32dcc29
|
Split out the PipX radio interface from RadioComBridge module to a separate Radio module. Now the RadioComBridge module just routes messages between the com ports and handles sending/receiving the PipX UAVOs.
|
2012-08-25 11:41:32 -07: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 |
|
Brian Webb
|
7ce0004c47
|
Added include of stdint.h to aes.c
|
2012-08-24 19:26:06 -07:00 |
|
Brian Webb
|
88c8cba0ff
|
Reduced size of temporaries to the correct size in rs.c
|
2012-08-22 06:46:51 -07:00 |
|
Brian Webb
|
2cd0733f7d
|
Removed unecessary include of stm32f10x.h from aes.h
|
2012-08-22 06:45:44 -07: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
|
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 |
|
James Cotton
|
096f940fee
|
Reenable the flash version now Stac's fix is tested.
|
2012-08-04 12:03:41 -05:00 |
|
James Cotton
|
d6c485459f
|
Fix error Stac caught in sin_lookup
|
2012-08-04 00:33:20 -05:00 |
|
James Cotton
|
8eac518a9c
|
If the sin table is empty don't attempt to use it and return 0.
|
2012-08-03 12:43:50 -05:00 |
|
James Cotton
|
f3dc2dc2ad
|
Store 180 deg in flash now and even make the flash and ram version share a
lookup method. Still don't get the same results.
|
2012-08-03 12:31:15 -05:00 |
|
James Cotton
|
9f3c8dddd3
|
Add a version of the sin lookup table that is in ram instead of flash
|
2012-08-03 12:15:57 -05:00 |
|
James Cotton
|
50c7641162
|
Move the PID methods into a standalone library
|
2012-08-03 09:37:46 -05:00 |
|
James Cotton
|
aae0e562c6
|
Create a sine lookup table that is cached in flash and make relay tuning start
ot use this.
|
2012-08-03 09:37:46 -05:00 |
|
Werner Backes
|
b8450d4a07
|
Fixed World Magnetic Model to accept altitude in meters instead of kilometers
|
2012-07-31 00:18:10 +02:00 |
|
Stacey Sheldon
|
f5db83bd20
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
|
2012-07-22 23:39:37 -04:00 |
|
James Cotton
|
3e33bb49a2
|
EKF gyro bias into the object now working propely
|
2012-07-21 15:11:04 -05:00 |
|
Stacey Sheldon
|
eafd525323
|
Merge remote-tracking branch 'origin/D-Lite/ubx-parser-next' into next
|
2012-07-21 14:22:10 -04:00 |
|
James Cotton
|
6b101d71af
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
|
2012-07-15 12:32:35 -05:00 |
|
Brian Webb
|
a252b78fea
|
Fixed transparent comms on PipX.
|
2012-07-14 17:14:43 -07:00 |
|
Werner Backes
|
5776981436
|
Deleted obsolete Libraries/inc/NMEA.h that conflicts with Modules/GPS/inc/NMEA.h
|
2012-07-10 16:25:58 +02:00 |
|
Brian Webb
|
10e52b31c5
|
Added the ability on the PipX to specify if a comport is used to connect to the GCS (ground side), so it will receive status, etc, or UAVTalk (flight side). The data passing in RadioComBridge was also made more uniform, which allows for easier reconfiguration.
|
2012-06-30 10:06:28 -07:00 |
|
Stacey Sheldon
|
c73cffce59
|
Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
Makefile
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/Revolution/System/inc/pios_config.h
package/Makefile
Fixed CRLF line end clobbering in:
flight/Bootloaders/Revolution/inc/pios_config.h
flight/Modules/OveroSync/inc/overosync.h
flight/Modules/Sensors/inc/sensors.h
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Common/pios_usb_util.c
flight/PiOS/STM32F4xx/pios_iap.c
flight/PiOS/inc/pios_rfm22b_priv.h
flight/PiOS/inc/pios_usb_util.h
|
2012-06-10 19:01:11 -04:00 |
|
James Cotton
|
c689bcfb80
|
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo
|
2012-06-07 09:49:18 -05:00 |
|
Brian Webb
|
861bcc46fe
|
Fixed RSSI reporting on PipX.
|
2012-06-06 21:14:31 -07:00 |
|
Brian Webb
|
4e68f6543e
|
Added tracking of dropped packets to PipX and turned off visible text on signal strength meters.
|
2012-06-04 21:18:13 -07:00 |
|
Corvus Corax
|
298b6233ed
|
Merge branch 'revo-next' into corvuscorax/new_navigation
Conflicts:
flight/Libraries/paths.c
flight/Modules/ManualControl/manualcontrol.c
flight/Revolution/Makefile
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-30 00:51:52 +02:00 |
|
Corvus Corax
|
1ad2b19d28
|
PathPlanner: fixed a few failsafes, changed waypointID to int16 - negative jump ids have special meaning
|
2012-05-28 20:50:09 +02:00 |
|
James Cotton
|
8a6073fbaf
|
Merge remote-tracking branch 'revo/revo-next' into testing
Conflicts:
Makefile
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/Revolution/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
shared/uavobjectdefinition/taskinfo.xml
|
2012-05-28 09:13:26 -05:00 |
|
Corvus Corax
|
51a4e82642
|
bugfix to path library
|
2012-05-28 14:48:08 +02:00 |
|
Corvus Corax
|
e6f4a40d3e
|
path library: updated API and usage from pathfollowers, added new conditions and additional user feedback in pathstatus
|
2012-05-28 01:51:17 +02:00 |
|
Corvus Corax
|
ef8d7275a8
|
PathFollower and PathPlanner: fixes for fixed wing
|
2012-05-27 02:38:56 +02:00 |
|
Corvus Corax
|
922b3b7f1e
|
Merge branch 'basenext' into corvuscorax/new_navigation
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2012-05-27 01:41:51 +02:00 |
|
James Cotton
|
bd8125e41e
|
Catch from Corvus that the path error was being squared. However need to make
sure to take care of sign by removing one of those multiplcations.
|
2012-05-26 15:24:50 -05:00 |
|
Corvus Corax
|
9dfd34dd19
|
PathPlanner: added functions to allow circular paths and implement that feature in FixedWingPathFollower
|
2012-05-26 15:55:52 +02:00 |
|
Brian Webb
|
2f1a9e3e7d
|
Added PPM input to the PipXtreme. Also added configurable GCSReceiver timeout.
|
2012-05-20 18:30:37 -07:00 |
|
Brian Webb
|
6fbc3339d5
|
Fixed processing of UAVTalk packets when in transparent com mode.
|
2012-05-17 18:37:45 -07:00 |
|
Brian Webb
|
93ec7c11a6
|
Fixed race condition on getting packets.
|
2012-05-15 19:38:14 -07:00 |
|
Brian Webb
|
dd03b0b159
|
Added reporting of stats from the remote modem.
|
2012-05-13 09:34:21 -07:00 |
|
Brian Webb
|
480371a43e
|
Resolving merge with origin/next
|
2012-05-05 09:53:54 -07:00 |
|