James Cotton
db083aa0e9
Merge branch 'android' into next
2012-09-02 19:19:23 -05:00
James Cotton
311bbcb539
RFM22b: Block transfers for more large SPI transfers
...
Preallocated buffers with various preambles etc. Used SPI_TransferBlock for
anything over a few bytes instead of burstWrite. Also make more of the
communications wrappered in a large semaphore grab using a new rfm22_write_noclaim()
Still needs work - probably because most of the methods to repeated calls they should
all use the noclaim, or more specifically that function becomes rfm22_write/read.
2012-09-02 14:35:56 -05:00
James Cotton
588297806c
RFM22b: Use SPI block transfers for filling the RFM22b FIFO
...
Also removed the disable irq line since that was introducing
flight glitches.
2012-09-01 21:24:42 -05:00
James Cotton
997319ae80
RFM22b: Begin doing blocks of transfers when possible between semaphore claims
...
The abstraction should probably be improved but ideally we start using
the DMA SPI transfers for PipX and grabbing/releasing the semaphore less
frequently (e.g. not for each 1-2 bytes).
2012-09-01 21:07:38 -05:00
Brian Webb
27fedee3d3
Just return an initialization failure in the radio module when the RFM22B fails to initialize rather than asserting.
...
Signed-off-by: James Cotton <peabody124@gmail.com>
2012-09-01 19:15:13 -05:00
Brian Webb
fcbf01fa74
RFM22b: Added SPI initialization back into PipX pios_board.c.
...
Signed-off-by: James Cotton <peabody124@gmail.com>
2012-09-01 19:14:36 -05:00
James Cotton
d9ec6454c2
PipX: Since we are calling the PipX ISR from user space looks ensure the frequency stays correct.
...
Previously it was polling too fast and the PipXStatus was incorrect as a result. Now make
sure the stats loop only runs at 500 ms.
2012-09-01 19:13:11 -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
2c003d8b0b
PathCompiler: Link up the path compiler to the map again. Got broken in the merge.
2012-09-01 16:50:08 -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
878def305f
RM: Make radio an optional module
2012-09-01 11:11:52 -05:00
James Cotton
0d3b0d4e5b
Fixup: Disable binding on mainport for DSM
2012-09-01 11:11:28 -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
James Cotton
a33f415866
RM DSM: Get DSM working on the mainport
...
Because of the inverter this does not support binding on this port.
2012-08-31 11:08:43 -05:00
James Cotton
300cee44b4
RM SBUS: There is no pull down on the inverter direction so when not SBUS must explicitly set to off.
2012-08-31 11:01:34 -05:00
James Cotton
d333e24a43
RM: Swap to using the CC_ flags for the flexi port too.
2012-08-31 10:30:00 -05:00
James Cotton
73c7190077
RM GPS: Use the CC_MainPort instead of a RV flag and enable GPS support
2012-08-31 10:17:10 -05:00
James Cotton
42a11788f9
AndroidGCS Controller: Make the default value mode 2
...
Previously typed "Mode 2" but it wants the integer value for the
default setting. This stops a crash when no configuration.
2012-08-30 12:14:07 -05:00
James Cotton
6d16f4c0a9
AndroidGCS Map: Make sure to grab the correct uavLocation and homeLocation at startup
2012-08-30 12:14:03 -05:00
James Cotton
b34b806772
AndroidGCS Controller: Make the default value mode 2
...
Previously typed "Mode 2" but it wants the integer value for the
default setting. This stops a crash when no configuration.
2012-08-30 12:13:29 -05:00
James Cotton
2bf8423ed6
AndroidGCS Map: Make sure to grab the correct uavLocation and homeLocation at startup
2012-08-30 12:10:17 -05:00
James Cotton
69328edd0d
Merge branch 'android' 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
2012-08-30 12:10:12 -05:00
James Cotton
60051e88cc
Calibration: Fix both accels and gyros to 30 ms. Should be reasonably sustainable through USB.
2012-08-30 11:38:15 -05:00
James Cotton
0f29f6e403
AndroidGCS Controller: Use the controller mode preference to select mode1 versus mode2
2012-08-30 11:00:50 -05:00
James Cotton
3488f0d2a2
AndroidGCS Controllre: Add an option for mode 1 or mode 2
2012-08-30 10:36:46 -05:00
James Cotton
e85d959bf5
AndroidGCS Bluetooth: Fix crash when no paired devices
...
Previously tried to make it list "No devices" but this triggered other
crashes.
2012-08-30 09:45:12 -05:00
James Cotton
0f28f65be6
AndroidGCS PFD: Update the graphics for the PFD
2012-08-30 01:01:53 -05:00
James Cotton
2ca353992c
AndroidGCS PFD: Properly center image now so it works over multiple sizes.
...
However, it doesn't automatically fill the screen in normal PFD view yet. Specifying the width in pfd.xml directly does fix that but is incorrect.
2012-08-30 00:10:20 -05:00
James Cotton
cffeb6c65a
AndroidGCS Tuning: Improvements to the tablet layout.
2012-08-29 23:34:04 -05:00
James Cotton
e2fdc95540
AndroidGCS: Use a relative layout for the object browser view.
2012-08-29 22:59:10 -05:00
James Cotton
fbefba69e2
AndroidGCS: For now force the min width of the ScrollBarView to 300dp
...
Because I don't know how to make it automatically expand to fill the columns.
This makes it get close until multiple layout sizes.
2012-08-29 22:00:46 -05:00
James Cotton
12f0c18049
AndroidGCS: Check in some layouts for greater than 600px width
2012-08-29 21:59:53 -05:00
James Cotton
75db9f5941
OP-669: Gyros were not being sent at a rapid rate during calibration making the results quite noisy.
...
Now both accels and gyros require a minimum number of updates before calibration completes.
Thanks to ti.dyer for the report and fix.
2012-08-29 04:29:55 -05:00
James Cotton
e9effa593d
AndroidGCS Tuning: Finish the SmartSave utility
2012-08-29 03:21:42 -05:00
James Cotton
71d5f9d090
AndroidGCS Tuning: Fix the callbacks for the scroll and edit boxes so both can work.
...
Also added an attribute for the maximum value for the scroll range.
2012-08-29 03:19:49 -05:00
James Cotton
4a433d32f7
AndroidGCS Tuning: Connect the SmartSave button to the tuning page
2012-08-29 02:41:58 -05:00
James Cotton
5ed5e1170e
AndroidGCS SmartSave: Begin implement a smart save architecture
...
This SmartSave class only associates with one UAVO. However, you can instantiate multiple of these for the various objects. Use addControlMapping to create new mappings between controls and UAVO fields.
2012-08-29 02:41:21 -05:00
James Cotton
3e6f98b2e8
Update the OSX packaged icons to those from 3rdeyepro / dacat.
2012-08-28 18:32:49 -05:00
James Cotton
2a4adbda38
AndroidGCS Tuning: Add custom attributes so we can specify the name of the tuning bars from the layout file.
...
Hopefully we can programmatically link them to the StabilizationSettings and create a smart Apply/Save button similarly to the GCS implementation.
2012-08-28 16:06:52 -05:00
James Cotton
7c48b46adf
AndroidGCS Tuning: Create a view that includes a scroll bar and edit box coupled together.
2012-08-28 15:12:53 -05:00
James Cotton
2c21038d74
AndroidGCS AttitudeView: Fix the PFD display so it can be bigger.
...
The view on measure limits the size. It was previous set to 200. I made it bigger and made it respect the ON_MOST input. Need to see if setting a huge number works across screen types.
2012-08-28 14:14:50 -05:00
James Cotton
fed39f3893
AndroidGCS: Add launcher button for tuning.
2012-08-28 13:48:13 -05:00
James Cotton
7b716bab08
Merge branch 'android' into revo-mini
2012-08-28 11:42:55 -05:00
James Cotton
150af9eb60
Merge branch 'android-telem' into android
2012-08-28 11:32:08 -05:00
James Cotton
b9663ba666
AndroidGCS: Fix typo in telem debug messages
2012-08-28 11:29:50 -05:00
James Cotton
ee97390ade
AndroidGCS TelemetryTask: Make sure the telemetry task shuts down the reading thread on disconnect
2012-08-28 11:24:41 -05:00
James Cotton
846f488eb1
AndroidGCS: Suppress some warnings from Controller.java
2012-08-28 11:24:41 -05:00
James Cotton
120f9298b4
AndroidGCS: Suppress some warnings related to not implementing the STRING uavfield type properly.
2012-08-28 11:24:40 -05:00
James Cotton
f01edc5d72
AndroidGCS: Make sure the telemetry sevice checks there is a telemetry task AND it's connected before sending the OPConnected service. Otherwise the objMngr is undefined.
2012-08-28 11:24:40 -05:00
James Cotton
6cd9a9b0af
AndroidGCS Bluetooth: Make bluetooth use the new connection system.
2012-08-28 11:24:40 -05:00