Erik Gustavsson
f9f58f22d8
Take the magnitude of the correct gravity vector
2012-11-12 17:16:28 +01:00
Erik Gustavsson
e38ba912cd
Clarify comment about gravity vector
2012-11-11 21:13:05 +01:00
Erik Gustavsson
04c194fa48
Coding style fixes
2012-11-11 21:10:52 +01:00
Corvus Corax
5862346d40
Merge remote-tracking branch 'baseorigin/corvuscorax/simposix_firmwareiap' into corvuscorax/sanity_additions
2012-11-11 18:06:16 +01:00
Corvus Corax
ec5f9d232f
Revert "do not do configuration check on SimPosix architecture, its not ported yet"
...
This reverts commit 112a3fe7e5
.
2012-11-11 18:05:46 +01:00
Corvus Corax
112a3fe7e5
do not do configuration check on SimPosix architecture, its not ported yet
2012-11-11 17:39:37 +01:00
Corvus Corax
d1447ca3f8
Rise Botfault error whenever hwsettings has been changed but no reboot took place yet
2012-11-11 17:23:07 +01:00
Stacey Sheldon
e2b019edd9
telemetry: stop registering periodic events for non-periodic UAVOs
...
Telemetry module was iterating over all UAVOs including
meta UAVOs and creating a periodic event item for each
object. These items cost us about 32 bytes for each list
item.
This is wasteful for two main reasons. First, meta UAVOs can't
meaningfully have periodic updates so excluding them entirely
makes sense. That halves the number of objects in this list since
there is one meta object for every data object. This is worth
about 500 bytes of RAM on CC.
Second, about half of the remaining UAVOs are not periodic by
default so they're wasting memory unless someone happens to want
to make them periodic at runtime. This is worth another 450 bytes
of RAM on CC.
So, objects that are configured as periodic during board init will
support all of the periodic config at runtime. Objects that are
*not* periodic during board init can only be made periodic on the
next boot.
Each object that you make periodic during init will cost you an
extra 32 bytes of RAM.
With erased settings, free RAM comparison for CC is:
Before: 2736 bytes free
After: 4048 bytes free
Total RAM savings with this update is 1312 bytes!
2012-11-10 18:04:16 -05:00
Richard Flay (Hyper)
54ebcb1ea8
Removed a spurious call to AccelsSet() that was causing garbage data to be transiently written to the Accels UAVO. Props to cyr for kicking off the discussion that led to the discovery of this bug.
2012-11-11 00:31:08 +02:00
Corvus Corax
064ed4087c
set AirspeedActual from attitude module, feed true airspeed estimation into EKF to allow more accurate INS
2012-11-08 11:30:58 +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
Erik Gustavsson
104c61a174
Move accel filter to separate function, for cleaner code and easier filter alteration.
...
Optimize for filter disabled case (AccelTau = 0.0).
2012-11-06 20:17:10 +01:00
Corvus Corax
5981d9acd6
removed surplus NEDposition uavobject
2012-11-06 10:13:09 +01:00
Corvus Corax
3c8ffa9773
Revert "When in indoor mode reset the baro offset to zero"
...
This reverts commit 9c512261e6
.
2012-11-06 09:42:14 +01:00
Corvus Corax
e8232ba825
Pathplanner: removed pathPlannersettings and preprogrammed (hardcoded) paths
2012-11-05 16:04:45 +01:00
Corvus Corax
cc8e56f170
OP699: changed update rate to use constant
2012-11-05 15:59:13 +01:00
Corvus Corax
ce595a06d9
Merge remote-tracking branch 'baseorigin/revo/corvuscorax/airspeed_fixes' into corvuscorax/airspeed_fixes
...
Conflicts:
flight/RevoMini/UAVObjects.inc
2012-11-05 15:16:03 +01:00
Corvus Corax
8f5b2954ac
Airspeed module: use stored calibration if available
2012-11-05 10:59:06 +01:00
Corvus Corax
5bf18780c1
do not calibrate if there is a pre-stored calibration value
2012-11-05 10:41:24 +01:00
Corvus Corax
4367bd62bf
OP-699 : removed unnecessary object queue in pathplanner
2012-11-05 10:34:44 +01:00
Corvus Corax
e5ab038a89
removed unnecessary comment
2012-11-05 10:33:51 +01:00
Corvus Corax
e2ca9cbb45
OP-699 - refacor ugly buzzer code actuaor module
2012-11-05 10:09:43 +01:00
Corvus Corax
3f248915cb
Merge remote-tracking branch 'origin/revo-next' into corvuscorax/airspeed_fixes
2012-11-03 20:03:18 +01:00
Erik Gustavsson
677f921b15
Take magnitude of filtered gravity vector into account.
2012-11-02 09:22:18 +01:00
Erik Gustavsson
f63db712d0
Disable accel smoothing during init/arming so it does not interfere
2012-11-02 09:12:24 +01:00
Erik Gustavsson
b7bdf9861d
Run rotated gravity vector through smoothing filter to match phase with filtered accelerometer data.
2012-11-01 12:14:33 +01:00
Richard Flay (Hyper)
10865221b9
Removed a spurious call to AccelsSet() that was causing garbage data to be transiently written to the Accels UAVO. Props to cyr for kicking off the discussion that led to the discovery of this bug.
2012-11-01 18:15:47 +10:30
Corvus Corax
ffaab02479
Use Correct Airspeed object in PathPlanner, (and use CalibratedAirspeed, since its more relevant)
2012-11-01 03:46:29 +01:00
Corvus Corax
3458aec53e
Merge branch 'revo-next' into corvuscorax/airspeed_fixes
2012-11-01 03:40:20 +01: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
Corvus Corax
f7dd5cc8ad
Refactored Airspeed and FixedWingPathFollowermodule to use AirspeedActual, which hitl writes to, too. Cleaned up both PathFollower and Airspeed a bit.
2012-10-28 17:45:40 +01:00
James Cotton
a5c743d738
Sanity Check: Cannot connect callback to TaskInfo now it isn't always used.
2012-10-27 14:00:57 -05:00
James Cotton
8864b545ae
Revert "Sanity Checking: Regardless of DIAG_TASK always populate TaskInfo.Running"
...
This reverts commit 0b6fa7fe6f
.
2012-10-27 13:43:59 -05:00
James Cotton
32bf63c436
Sanity Check: Perform the initial check then attach the callbacks to avoid
...
a case where two threads do the same thing.
2012-10-25 22:51:14 -05:00
James Cotton
b28cdba46d
SanityCheck: Trigger sanity check code on callbacks from the appropriate settings.
...
The only downside is that it needs to update on the TaskInfo object which means
since htat updates periodically this code runs more often that really needed since
the modules only start at first. However, leaving that connection out means it
misses the initial set of modules.
2012-10-25 21:49:53 -05:00
Stacey Sheldon
bc3a90c6a9
Merge branch 'one-way-telemetry' into next
2012-10-25 22:48:43 -04:00
James Cotton
b9ebeb2c2e
Sanity Check: For now force the sanity check to run once a second and always set an error
2012-10-25 12:43:56 -05:00
James Cotton
0b6fa7fe6f
Sanity Checking: Regardless of DIAG_TASK always populate TaskInfo.Running
...
so we can verify certain modules are running.
2012-10-25 10:01:24 -05: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
Corvus Corax
898292fcdb
added (fake) firmware version information to simposix
2012-10-20 15:22:54 +02:00
Stacey Sheldon
75170177df
console: example usage of the debug console
2012-10-11 00:22:07 -04:00
James Cotton
c0b9d9015d
Hack: The OSX sim includes modules slightly differently than the
...
main code so needs an implementation of FirmwareIAPStart() until
this is fixed.
2012-10-10 08:29:30 -05: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
Brian Webb
2541affd80
RFM22B: Added back configuration of the RF Power and RF Datarate. Also added setting of the destination ID in the rfm22b driver.
2012-10-04 16:39:07 -05:00
James Cotton
13cabd2ea4
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-04 16:38:08 -05:00
Brian Webb
9b9d0c0d1e
RFM22B: Added back configuration of the RF Power and RF Datarate. Also added setting of the destination ID in the rfm22b driver.
2012-10-03 20:03:35 -07:00
Brian Webb
36437f695f
RFM22B: Moved radio status reporting from the radio module into the rfm22b driver task.
2012-10-03 11:35:02 -05:00
James Cotton
a39cbdbcb1
RadioBridge: Send data from UAVTalk non blocking, otherwise it can lock up the packet handler.
2012-10-03 10:43:18 -05:00
Brian Webb
a8590045a8
RFM22B: Moved radio status reporting from the radio module into the rfm22b driver task.
2012-10-02 19:52:21 -07:00
James Cotton
879dfed288
RM2/RM1: Make the firmware and bootloader support the pin mappings between these two targets
...
for USB and radio
A side-effect of this is the pipxsettings are no longer populated into the rfm22b cfg structure
as that was made constant to be consistent with other drivers.
2012-10-02 09:31:15 -05:00
Laura Sebesta
8997df2438
Merge branch 'next' into kenz/diag_stack_split
...
Conflicts:
flight/Modules/Stabilization/stabilization.c
2012-09-27 19:29:23 +02:00
James Cotton
d2842169ee
Sensors: Need to support MPU6000 for revision 3
2012-09-26 04:04:48 -05:00
Brian Webb
a070e1cc3e
RFM22B: Added PIOS_RFM22B_Receive_Packet function and removed rx buffer.
2012-09-23 08:36:38 -07:00
Brian Webb
a46e3cdec3
RFM22B: All outgoing data to the radio is now going through the PIOS_RFM22B_Send_Packet call. Also removed all global variables with the exception of the rx buffer.
2012-09-22 20:13:11 -07:00
Brian Webb
057227726b
Radio: Make sure pios_packet_handler is set to 0 when radio module is not initialized.
2012-09-22 20:13:07 -07:00
Brian Webb
6623c55846
RFM22B: Moved ISR processing thread into the rfm22b driver.
2012-09-22 20:13:03 -07:00
Brian Webb
432a6dfd00
RM: Fixed crashing when radio module is disabled.
2012-09-22 20:13:02 -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
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
4717c376c0
Stabilization: For the inner loop call the setpoint shaping version so that
...
the derivative term can weight the sticks and gyros independently.
2012-09-11 13:21:53 -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
James Cotton
86422b8b9e
VtolPathFollower: Make sure to clear the alarm when running so it doesn't show as
...
uninintialized
2012-09-11 02:34:31 -05:00
James Cotton
88b483f37d
PIOS_MPU6000: Make the driver perform the rotation to bring it into the OP
...
coordinate system
Previously there were hacks spread throughout to deal with various ways of
positioning the chips. Now the driver structure specifies the rotation
of the chip relative to the board layout and the output X/Y/Z are already
in OP convention.
This flag seems to do the right thing for Revolution, CC3D, and RevoMini
2012-09-11 01:46:22 -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
aaaf23e64c
ManualControl: Cover the case for PathPlanner to avoid setting an alarm. No functional change.
2012-09-10 20:12:58 -05:00
James Cotton
5211176f15
ManualControl: Cover the case for PathPlanner to avoid setting an alarm. No functional change.
2012-09-10 20:12:23 -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
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
James Cotton
9763a70364
Merge remote-tracking branch 'origin/igor/pidt1' into relay_tuning
...
Conflicts:
flight/Modules/Stabilization/stabilization.c
2012-09-10 03:10:26 -05:00
Igor Van Airde
8ca99739ed
Changed rate controller from PID to PIDT1 to improve flight stability.
...
Low pass on D-Term makes the D-Term usable to improve flight stability.
Affects rate and stabilize mode.
2012-09-09 13:07:25 +02: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
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
4803dfe99c
Fix: yaw bias correction wasn't applied on CC3D.
2012-09-06 13:13:58 +02:00
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
113c3d3b76
RM Telem: Make sure it properly tracks the outgoing rate of bytes
2012-09-04 10:20:51 -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
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
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
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
Brian Webb
6b3934576a
Fixed configuration of PipX com port as UAVTalk.
2012-08-26 11:18:23 -05:00
James Cotton
042055b29a
RFM22b: Call the pendingISR routine from all the user space tasks. Got a valid connection with this.
2012-08-26 04:18:17 -05:00
James Cotton
477385ca25
RFM22b: Start to move the ISR into userspace
2012-08-26 02:41:19 -05:00
James Cotton
a7b5fcd77c
Monitor the radio threads
2012-08-25 18:48:30 -05:00
James Cotton
81ddbda972
Sensors: Scope some variables to suppress warnings
2012-08-25 17:30:04 -05:00
James Cotton
daad1d6f8f
Sensors: Scope some variables to suppress warnings
2012-08-25 17:12:37 -05:00
James Cotton
982750a58f
Merge remote-tracking branch 'revo/brian/revo_link' into revo-mini
...
Conflicts:
ground/openpilotgcs/src/plugins/plugins.pro
2012-08-25 15:05:47 -05:00
James Cotton
5c34412200
Merge remote-tracking branch 'revo/amorale/revolution_baro_fixes' into revo-mini
2012-08-25 14:55:10 -05:00
Brian Webb
b3dc617702
Fixed PPM output from updated RadioComBridge module.
2012-08-25 12:52:06 -07:00
James Cotton
c5fda8208b
TOFIX: For now hardcode a reversed orientation of MPU6000 for RevoMini
2012-08-25 14:41:03 -05: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