James Cotton
386a9d41ef
Merge branch 'next' into test2
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
2012-09-10 14:29:26 -05:00
PT_Dreamer
ba575edbbc
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
OPReview 248
2012-09-09 12:30:09 +01:00
James Cotton
f3f07682ac
RFM22b radio.c: Increase the stack side for the status task which runs the ISR
2012-09-08 12:43:01 -05:00
James Cotton
527edcbee9
RFM22b: Get rid of the burst read commands and do a block transfer
2012-09-08 12:39:14 -05:00
James Cotton
1f0004e9db
RFM22b: Abstract out the port into the driver initiation
...
Also use a separate function to claim the bus semaphore and
assert the CS line.
2012-09-08 12:38:54 -05:00
Werner Backes
2a4e135c81
Merge branch 'D-Lite/fix_CC3D_yawBias_correction' into next
2012-09-06 13:47:03 +02:00
Werner Backes
4803dfe99c
Fix: yaw bias correction wasn't applied on CC3D.
2012-09-06 13:13:58 +02:00
Stacey Sheldon
97882dbef9
pipx: ensure pipx BL image is padded to fill its bank
...
This padding is required in order to properly align all
of the sections in the EF images.
2012-09-05 22:17:04 -04:00
Stacey Sheldon
803e3c4d1e
ef: Add fwinfo to entireflash (EF) images
...
EF images were missing the firmware info blob that describes
which firmware is installed on the board. The EF image is now
padded out to fill the firmware bank and the info blob is
properly placed at the tail end of the firmware bank.
2012-09-05 21:45:59 -04:00
James Cotton
68fa464ccf
RM: Make the direction of the TX/RX lines come from the configuration file
2012-09-04 23:22:56 -05:00
James Cotton
844d14e2f5
RM (NOT FOR PIPX) Properly select the GPIO->RX/TX mapping
2012-09-04 10:22:04 -05:00
James Cotton
113c3d3b76
RM Telem: Make sure it properly tracks the outgoing rate of bytes
2012-09-04 10:20:51 -05:00
James Cotton
0b947b243d
Revert "RFM22b: More block claims for rfm22_txStart"
...
This reverts commit fa4ca426abf5671fc7d0b7206f85f14bcbf92c3d.
2012-09-02 22:44:58 -05:00
James Cotton
dce4f36328
RFM22b: More block claims for rfm22_txStart
...
Warning: This patch makes the modem work more poorly
2012-09-02 22:44:58 -05:00
James Cotton
61ff335eaa
RFM22: No need to poll the ISR from two tasks in radio.c
2012-09-02 22:44:58 -05:00
James Cotton
a3b75a3cc7
Merge remote-tracking branch 'origin/kenz/matlab_parser_vectorizing' into next
2012-09-02 19:23:18 -05:00
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