Brian Webb
e3f7c1d138
Merge remote-tracking branch 'revo/james/revo' into brian/revo_link
...
Conflicts:
ground/openpilotgcs/src/plugins/plugins.pro
2012-08-25 13:03:44 -07:00
James Cotton
a9b48cf1ca
Merge remote-tracking branch 'revo/amorale/revolution_baro_fixes' into revo
2012-08-25 14:55:23 -05:00
Brian Webb
b3dc617702
Fixed PPM output from updated RadioComBridge module.
2012-08-25 12:52:06 -07:00
Brian Webb
e602b73a6f
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.
...
Conflicts:
flight/Modules/RadioComBridge/RadioComBridge.c
flight/PipXtreme/System/pios_board.c
Conflicts:
flight/Modules/RadioComBridge/RadioComBridge.c
2012-08-25 12:29:02 -07: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
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
a*morale
c696cccff8
Added an option to be able to change the interleave between Pressure and Temperature conversion for the MS5611
...
To enable this option define the PIOS_MS5611_SLOW_TEMP_RATE with the number of Pressure conversion for each Temperature conversion.
2012-08-25 13:04:41 +02:00
a*morale
257b00a400
Fixed a typo on I2C speed for the MS5611
2012-08-25 12:28:25 +02:00
a*morale
789746151a
Fixes the selection of the oversample settings from the pios_ms5611_cfg.oversapling configuration
2012-08-25 11:29:01 +02:00
Brian Webb
34b433e074
Added UAVTalkSendBuf function and added locking in UAVTalkSendAck and UAVTalkSendNack.
2012-08-24 19:42:10 -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
James Cotton
113a759cd9
Merge branch 'next' into revo
2012-08-19 21:22:02 -05:00
Brian Webb
171f91336c
Removed assert that was no longer needef form PipX pios_board.c
2012-08-18 08:40:19 -07:00
James Cotton
c4b82fa1fd
Disable transmitter updating PH location while using a tablet.
2012-08-12 17:51:52 -05:00
James Cotton
44dc01126e
Merge branch 'next' into revo
2012-08-12 16:12:54 -05:00
James Cotton
3d1a6cbcba
Attitude: Make sure the EKF can init if HomeLocation is not set but the
...
magnetic field is. Good for switching between indoor and outdoor mode.
2012-08-12 16:11:04 -05:00
James Cotton
880eb5eb11
Fix revo for the removal of SDCard supprot
2012-08-12 14:45:06 -05:00
James Cotton
18d63f7e9c
Merge commit 'b19a0947fb72dc069540561ffeb6983ee318fcb9' into revo
2012-08-12 14:39:30 -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
9f8d22961f
cc makefile: enable -ffunction-sections and -fdata-sections
...
These compiler options place each function and each global variable
into its own ELF section in each .o file. This, combined with the
linker option --gc-sections allows the linker to evict unused functions
and variables from the final ELF file.
On CC, the firmware flash bank is only 118784 bytes in total.
This commit reduces the .text segment from 114120 to 83536 and .data
from 572 bytes to 560 bytes. That frees up a grand total of 30596 bytes
of flash and 12 bytes of RAM.
2012-08-11 20:13:09 -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
Stacey Sheldon
49c153003c
hid joystick: use linearly scaled channels
...
Scales each channel only based on max and min calibrated values.
The neutral value is now ignored so the joystick sees a linear
range between min and max.
This is particularly useful to allow the full range of values for
throttle to be passed through to the joystick.
2012-08-10 23:36:06 -04:00
Stacey Sheldon
07fde38887
hid joystick: factor out min/max range from report items
2012-08-10 23:29:34 -04:00
James Cotton
f530702ce9
Merge branch 'android' into sim_android
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/layout/pfd.xml
androidgcs/res/layout/system_alarms.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/BluetoothDevicePreference.java
androidgcs/src/org/openpilot/androidgcs/CompassView.java
androidgcs/src/org/openpilot/androidgcs/Controller.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
androidgcs/src/org/openpilot/androidgcs/Logger.java
androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java
androidgcs/src/org/openpilot/androidgcs/ObjectEditor.java
androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
androidgcs/src/org/openpilot/androidgcs/Preferences.java
androidgcs/src/org/openpilot/androidgcs/SystemAlarmActivity.java
androidgcs/src/org/openpilot/androidgcs/TelemetryWidget.java
androidgcs/src/org/openpilot/androidgcs/UAVLocation.java
androidgcs/src/org/openpilot/uavtalk/Telemetry.java
androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java
androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java
androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java
androidgcs/src/org/openpilot/uavtalk/UAVObject.java
androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java
androidgcs/src/org/openpilot/uavtalk/UAVObjectManager.java
androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FirmwareIAPObj.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
flight/Modules/GPS/GPS.c
2012-08-08 15:50:28 -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
5902c19cc3
hid joystick: compress local usages since they're all in the same page
2012-08-08 10:38:43 -04:00
Stacey Sheldon
030d9e84f9
hid joystick: remove unnecessary usage page definitions
2012-08-08 10:15:08 -04:00
Stacey Sheldon
449c7aab7a
hid joystick: use 32-bits to represent max range
2012-08-08 00:50:03 -04:00
Stacey Sheldon
94f6344fc5
hid joystick: restructure joystick HID report to work on windows
2012-08-07 21:34:25 -04:00
James Cotton
097ae637bf
Remove the TCHAIN_PREFIX flag from the OSX Makefile. No clue how that got
...
merged in.
2012-08-06 16:54:55 -05:00
James Cotton
f247443d64
Clean up the logging somewhat
2012-08-06 16:54:52 -05:00
Stacey Sheldon
017d8c79c9
hid joystick: add missing .c file
...
This time for sure...
2012-08-06 11:49:03 -04:00
Stacey Sheldon
d44e24a150
hid joystick: add missing .h files
2012-08-06 11:42:44 -04: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
James Cotton
c1a0f176eb
Merge branch 'master' into next
2012-08-03 09:37:22 -05:00
James Cotton
dafc455bfa
Increase the manualcontrol stack size based on Stac's comments
2012-08-03 09:36:59 -05:00
James Cotton
6948f1dc41
Merge remote-tracking branch 'origin/master' into next
...
Conflicts:
package/winx86/translations/strings_de.nsh
2012-08-03 09:35:18 -05:00
James Cotton
beb75f22cf
Remove the TCHAIN_PREFIX flag from the OSX Makefile. No clue how that got
...
merged in.
2012-08-02 10:40:40 -05:00
James Cotton
5e2c2a0ec3
Clean up the logging somewhat
2012-08-02 10:40:38 -05:00
Richard Flay (Hyper)
6d34795494
Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module
2012-08-01 19:53:59 +09:30
Werner Backes
e32152386a
Increased stack for PIOS_SETS_HOMELOCATION case to avoid running into low stack warnings when settings the home location from GPS was actually used.
2012-07-31 11:10:23 +02:00
Richard Flay (Hyper)
56647f5409
Fix for OP-661: error messages in GCS log due to obsolete AHRSComms and SDCard related alarms. Change also disables obsolete SDCard support on the flight side of CC and PipX
2012-07-31 11:07:07 +09:30
Werner Backes
b8450d4a07
Fixed World Magnetic Model to accept altitude in meters instead of kilometers
2012-07-31 00:18:10 +02:00
James Cotton
dde9de080e
Need to increase the GPS stack size when I include the GPZDA message
2012-07-29 12:41:20 -05:00
James Cotton
24636eb5f4
Add a waypoint above home for the box pattern.
2012-07-28 22:55:59 -05:00
James Cotton
9bd49ded4f
OSX Simulator - get model type correctly
2012-07-28 13:35:31 -05:00
James Cotton
f02aacfeb6
Change the constant so LED flashing works properly on Revo
2012-07-28 11:22:24 -05:00
