rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-04 12:24:11 +01:00
Code Issues Releases Activity
8,033 Commits 5 Branches 8 Tags 266 MiB
7c85fa5885
Commit Graph

3514 Commits

Author SHA1 Message Date
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
715fb65df7 OSX Simulation: Start populating the board and fw information 
This will allow testing the tablet to know what type of UAVOs to
expect.

Conflicts:

	flight/Revolution/Makefile.osx
 2012-10-10 08:29:20 -05:00
James Cotton
aad1c3bd32 FreeRTOS: Make F1 targets use the FreeRTOS common code from PiOS/Common 2012-10-09 10:08:06 -05:00
James Cotton
17f3c4d4e0 Re-add our code for accessing the run time information in freertos. 2012-10-09 09:57:57 -05:00
James Cotton
72c84fc49c Upgrade to FreeRTOS 7.2.0 2012-10-09 09:48:02 -05:00
Laura Sebesta
c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
 2012-10-08 15:30:27 +02:00
James Cotton
4b35cdf0ef OSX Simulation: Start populating the board and fw information 
This will allow testing the tablet to know what type of UAVOs to
expect.
 2012-10-07 13:53:19 -05:00
Stacey Sheldon
157aeac9fc Merge remote-tracking branch 'origin/stac/ppm-and-pwm-inputs' into next 2012-10-06 23:04:49 -04:00
sambas
9212bbeb20 DSMx bindmode delay was too long, satellite binding works again. 2012-10-07 12:09:42 +11: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
9ea572f4f7 RFM22B: Fixed the signedness of the return value of the RSSI function. 2012-10-04 21:23:44 -07: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
James Cotton
c8d9f89ea3 Default DIAG_TASK was on for PipX 2012-10-03 15:11:15 -05:00
James Cotton
5eed0db61b Hardcode rates to 64kbps 2012-10-03 15:10:12 -05: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
Brian Webb
2d4e0b397a RFM22B: Removed setting register 0x58 in the rfm22_setDatarate call, which was breaking all data rates < 100000 bps. Also temporatily fixed the datarate at 64kbps. 2012-10-03 11:32:33 -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
3cdb9df05f RFM22B: Removed setting register 0x58 in the rfm22_setDatarate call, which was breaking all data rates < 100000 bps. Also temporatily fixed the datarate at 64kbps. 2012-10-02 20:59:43 -07: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
897b07da02 Merge remote-tracking branch 'origin/kenz/diag_stack_split' into next 2012-10-02 14:20:08 -05:00
James Cotton
0c8c148b51 PipX HW Def: Use PIOS_BOARD_HW_DEFS_GetRfm22Cfg since the radio module initializes the modem 
and doesn't know teh difference between RM2 and PipX
 2012-10-02 10:07:50 -05: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
a*morale
c2910d0ce0 Receiver input working for both PPM/PWM mode for rm2 2012-09-30 20:54:10 +02:00
a*morale
227aa98ebc Added TIM12 to PIOS_TIM 2012-09-30 20:32:03 +02:00
a*morale
be752b8075 Fixed some declaration to Exti functions to make it compile. 2012-09-30 17:04:36 +02:00
a*morale
504d691487 Fixed declaration of PIOS_L3GD20_IRQHandler. 2012-09-30 15:44:31 +02:00
Stacey Sheldon
2f4b1e69dd rcvr: Support PPM and PWM at the same time on CC 
Adds a new mode for the receiver port (PPM+PWM) which
will allow simultaneous use of 1 pin for PPM and the
rest of the pins for PWM inputs.
 2012-09-29 19:11:48 -04:00
James Cotton
b0d8487e27 PIOS_RFM22: Make the irq return false for the exti changes 2012-09-28 02:14:15 -05:00
James Cotton
61f1140645 Merge branch 'revo' into rm2 2012-09-28 01:01:35 -05:00
James Cotton
5c13c31c08 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
 2012-09-28 01:00:10 -05:00
James Cotton
8979c00fba Merge branch 'exti_end_switching_isr' into next 2012-09-28 00:41:08 -05:00
James Cotton
519e3e2e3a PIOS_EXTI: Make the line task macro now take in the xHigherTaskPriority variable name 2012-09-28 00:40:36 -05:00
Stacey Sheldon
9896a0d416 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 22:42:44 -04:00
James Cotton
f12d5c04fb Merge remote-tracking branch 'origin/lilvinz/mpu6000_masked_locals_fix' into next 2012-09-27 14:43:54 -05:00
James Cotton
1ba40ee9b0 PIOS_EXTI: Make sure to use pdTRUE instead of true where appropriate. 2012-09-27 14:41:38 -05:00
James Cotton
1721479a12 Fix for vinz' merge to pios_mpu6000 exti changes 2012-09-27 14:34:11 -05:00
James Cotton
a021659b75 Merge remote-tracking branch 'origin/lilvinz/exti_end_switching_isr' into next 2012-09-27 14:31:16 -05:00
James Cotton
303fe17969 Merge remote-tracking branch 'revo/brian/rfm22_refactor' into revo 2012-09-27 14:04:48 -05:00
James Cotton
6e114360f4 Merge branch 'next' into revo 
Conflicts:
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-27 14:04:44 -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
Laura Sebesta
4923655cd3 Added global flag for enabling all diagnostic tools. 2012-09-27 18:51:12 +02:00
James Cotton
d2842169ee Sensors: Need to support MPU6000 for revision 3 2012-09-26 04:04:48 -05:00
James Cotton
93c44f2a4e RM2 Temporary patch: Swap the GPIO pins and the VSense pins. This needs to be based on the hardware revision later. 2012-09-26 03:02:25 -05:00
James Cotton
333a96516c Merge remote-tracking branch 'revo/brian/rfm22_refactor' into rm2 2012-09-26 01:40:23 -05:00
James Cotton
dadc38d82d Revo Mini 2: Get basic LED working. Board revision is actually 3 since right now it masquerades as Revo. 2012-09-26 01:17:32 -05:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
Brian Webb
6972c29813 RFM22B: Added check for timeout wating for sync on receive. This virtually eliminates the number of timeouts. 2012-09-25 18:10:15 -07:00
Brian Webb
88be2ddf1e RFM22B: Added a message timeout event to the RFM22B state machine that will fire if a packet takes too long to transmit / receive. 2012-09-24 20:51:34 -07:00
Stacey Sheldon
215ff56fe8 usbcdc: fix handling of CDC SET_LINE_CODING request 
The SET_LINE_CODING request contains data and must be
handled as such.

Previously, the only requests that had data were IN
requests.  SET_LINE_CODING is an OUT request so it
required additional changes to support a new type of
data request.
 2012-09-24 00:56:25 -04:00
Stacey Sheldon
5e37448814 usb: correct enum for CDC SET_CONTROL_LINE_STATE request 2012-09-24 00:53:52 -04:00
Stacey Sheldon
c056ac5261 usbcdc: don't assert on calls when CDC is not initialized 
The CDC interface is always advertised in the FW USB
descriptors.  It is NOT always enabled/initialized at
runtime.  Specifically, it can be Disabled in HwSettings.

Previously, any CDC-related query that the host would send
resulted in an assert and a watchdog.

Now, a suitable return code indicating that the request is
unsupported is returned in this scenario.
 2012-09-24 00:53:12 -04: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
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
Brian Webb
80509d264e RFM22B: Start at cleaning up the processing interrupt handling, and starting to make it more of a state machine. Also removed the supervisor, which was causing unnecessary resets. The supervisor functionality is not in the the driver thread. 2012-09-22 20:13:08 -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
8ca2e85f4c RFM22B: Removed incorrect defaulting of tx power level. 2012-09-22 20:13:05 -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
James Cotton
497683e571 Fix OSX simulator 2012-09-18 13:29:11 -05:00
Stacey Sheldon
14123069be gdb: add gdb config file for CC BU image 2012-09-16 21:13:42 -04:00
Stacey Sheldon
566f9d760e simposix: fix suplicate .c files in previous merge 2012-09-16 19:34:47 -04:00
Stacey Sheldon
ffe88eec5e Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 17:14:20 -04:00
Stacey Sheldon
368d57bc92 Merge remote-tracking branch 'origin/lilvinz/OP-300' into next 2012-09-16 16:05:25 -04:00
lilvinz
a6a7ed8157 pios_exti: added returnvalues to exti handlers which allows to use portEND_SWITCHING_ISR 2012-09-16 21:44:09 +02:00
Stacey Sheldon
05483e2a74 simposix: adapt simposix to addition of relay tuning 2012-09-16 15:40:47 -04:00
lilvinz
524cff1c40 pios_mpu6000: fixed masked locals mistake 2012-09-16 21:25:06 +02:00
lilvinz
718062ed6e pios_led: added support for active_high connected leds 2012-09-16 18:19:27 +02: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
Stacey Sheldon
9a5ba841cf Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypointactive.xml
 2012-09-15 19:55:47 -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
595083c982 PID: Fix small bug in setpoint weighting that had really ugly consequences 2012-09-12 00:07:17 -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
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
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
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
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
James Cotton
4cbaa6df88 Revolution: Misses some files for stabilization refactoring in Revolution 2012-09-11 01:44:40 -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
a*morale
316e02612e mapped LED1&2 ports to output 9&10 so that it is possible to use as accessory or pwm buzzer 2012-09-10 20:14:15 -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
fa9a616b4c PID: Add the 20 Hz low pass filter to the derivative term 2012-09-10 03:14:02 -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
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
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
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
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
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
Kenz Dale
e123a88262 Added UAVO for airspeeds. 2012-08-29 16:04:47 +02:00
Brian Webb
6b3934576a Fixed configuration of PipX com port as UAVTalk. 2012-08-26 11:18:23 -05:00
James Cotton
bdd50ce66b Reenable the flash system 2012-08-26 05:03:05 -05:00
James Cotton
b888a137f0 TOFIX: Temporarily remove the transaction lock from the settings as it was causing a deadlock with the radio coms. 2012-08-26 05:02:14 -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
f7cda1c0c4 RFM22b: No need to initialize the SPI. Done already. 2012-08-26 02:42:18 -05:00
James Cotton
477385ca25 RFM22b: Start to move the ISR into userspace 2012-08-26 02:41:19 -05:00
James Cotton
b1bd6d8583 PIOS_RFM22b: No need to set the SPI clock speed in the RFM22b module - it can be set by the driver configuration. 2012-08-26 00:00:39 -05:00
James Cotton
27c46c78b2 Increase the RFM22b/Flash rate to 10MHz which is within tolerance for both. 2012-08-25 23:17:53 -05:00
James Cotton
84d327c46a RFM22b: Claim the bus semaphore before reading and writing. 2012-08-25 23:17:52 -05:00
James Cotton
2bb4f860e1 Shuffle around the PACKET_HANDLER definition so we can more easily disable the Radio module. 2012-08-25 22:58:11 -05:00
James Cotton
06154836c6 Define the RADIO_BUILTIN in config file 2012-08-25 19:31:48 -05:00
James Cotton
4014445cc9 Fix the IRQ line for the RFM22b 2012-08-25 19:10:16 -05:00
James Cotton
3a3fc3d124 Make the radio module builtin 2012-08-25 18:48:41 -05:00
James Cotton
a7b5fcd77c Monitor the radio threads 2012-08-25 18:48:30 -05:00
James Cotton
9e25e887c2 Temporarily disable flash chip and configure SPI for modem. 2012-08-25 18:43:13 -05:00
James Cotton
ad7a9b9cc3 Switch the order of the SET_RC pins for flash and rfm22b 2012-08-25 17:49:15 -05:00
James Cotton
b95a78cde5 Roll back changes on the revo target 2012-08-25 17:33:14 -05:00
James Cotton
81ddbda972 Sensors: Scope some variables to suppress warnings 2012-08-25 17:30:04 -05:00
James Cotton
76bdb190d8 Link in the rfm module to the target 2012-08-25 17:27:17 -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
a9b48cf1ca Merge remote-tracking branch 'revo/amorale/revolution_baro_fixes' into revo 2012-08-25 14:55:23 -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
James Cotton
c3906cfe90 Reenable the other main modules 2012-08-25 14:22:06 -05:00
James Cotton
0decce582b Got all the sensors reading 2012-08-25 14:19:15 -05:00
Stacey Sheldon
e7bf1db165 Revert "Removed Revolution specific code" 
This reverts commit d4a401ce30.
 2012-08-25 14:57:16 -04:00
James Cotton
31ebb7bbd8 Remove the old BMA180 and L3GD20 code and fix the irq lines for the sensors. 2012-08-25 13:51:52 -05:00
James Cotton
2edc976168 Fix the VBUS sense pin 2012-08-25 13:46:55 -05: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
James Cotton
ce5ef7edf3 Update the serial ports and receiver and servo ports 2012-08-25 13:19:23 -05:00
James Cotton
b9050809cc Add a board info file for revo mini. However it was to remap the define MAINADAPTER for the HMC5883 driver which needs rewriting not to need this. 2012-08-25 12:57:50 -05:00
James Cotton
05e2e24bcb Reconfigure the SPI ports. 2012-08-25 12:38:44 -05:00
James Cotton
60160001c6 Copy the revo project to revo mini 2012-08-25 12:23:54 -05: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
James Cotton
59d1367d37 Autotuning: Make the output also follow the hysteresis output 2012-08-24 22:45:45 -05: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
James Cotton
a3f1894cd7 Autotuning: Make the estimator require the value to toggle above and below the hysteresis level. 2012-08-24 21:33:08 -05:00
James Cotton
8babe5d8a4 Autotuning: Increase the measurement time to 30 seconds. 2012-08-24 21:32:11 -05:00
Brian Webb
7ce0004c47 Added include of stdint.h to aes.c 2012-08-24 19:26:06 -07:00
Laura Sebesta
929bf73504 Missed adding a diagnostics refactor to the commit. 2012-08-24 12:04:55 +02:00
Laura Sebesta
f2ffd1fb99 Changed DIAGNOSTICS flag to be individual to each module instead of global. 
The upshot is the stack usage monitor can be turned on at a lower RAM threshold.
 2012-08-24 12:04:05 +02: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
a*morale
d8ea84cdf1 Fix output power selection from the configured value at startup 2012-08-21 18:51:45 +02:00
Stacey Sheldon
431863b0c2 sdcard: build fixes for revo due to sdcard removal 
Related to commit: 56647f5409
merged from op-public.
 2012-08-20 21:32:19 -04: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
Stacey Sheldon
2d0e4944d3 Merge remote-tracking branch 'origin/stac/actuator-task-cpu-optimization' into next 2012-08-20 19:13:39 -04: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
29ab1d8cf3 actuator: factor out settings updates from main loop 2012-08-11 19:46:00 -04:00
Stacey Sheldon
63c167c183 taskinfo: also track Event thread's stack usage and CPU utilization 
The event dispatcher thread is started differently than most other
threads so it was missed in the taskinfo tracking information.  Now
it's also included.
 2012-08-11 18:47:03 -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