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
71e1a14e93
GCS Uploader: Add a backward compatibility condition for RM1 using RM2 firmware
2012-10-02 09:37:55 -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
James Cotton
1dae196274
Merge remote-tracking branch 'revo/amorale/rm2' into rm2
...
Conflicts:
flight/PiOS/inc/pios_hmc5883.h
2012-10-02 09:11:37 -05:00
James Cotton
05ea584341
Merge branch 'revo' into rm2
2012-10-02 02:50:34 -05:00
Fredrik Arvidsson
13f10949e8
OP-39 Removed an unnecessary struct declaration. Changed some texts. Removed some empty lines.
2012-10-01 21:50:00 +02:00
PT_Dreamer
8744e3dc93
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-01 13:42:59 +01:00
Kenz Dale
b740fefa56
Fixed bug by which aerosimrc plugin was not compiled.
2012-10-01 12:03:30 +02: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
Fredrik Arvidsson
138848453f
OP-39 Changed the Radio Setup Wizard to go to the Arming Settings screen after the last step in the wizard. Changed the info text in a dialog.
2012-09-30 17:27:20 +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
Fredrik Arvidsson
eed564a3c4
OP-39 Adding label to indicate when leveling is done in a more clear way.
2012-09-30 14:41:58 +02:00
Fredrik Arvidsson
ede0c2ebf9
OP-39 Small adjustment.
2012-09-30 14:24:54 +02:00
Fredrik Arvidsson
949569fdec
OP-39 Added handling of switching to correct tab in input configuration section when starting Radio Setup Wizard.
2012-09-30 14:19:31 +02:00
Fredrik Arvidsson
3fa2d504bb
Merge branch 'next' into thread/OP-39
2012-09-30 13:37:24 +02:00
Fredrik Arvidsson
19875fb70b
OP-39 Fixed controller identification bug. Now using telemetry manager to receive notifications about connect/disconnect.
...
Changed text on last page in wizard.
2012-09-30 13:35:35 +02:00
Stacey Sheldon
ed24d93ab1
gcs gamepad: teach GCS that an accel is not a gamepad
...
The gcscontrolgadget expects all gamepad devices to have
at least 4 axes of control. The SDL layer (on Linux anyway)
will detect the accelerometer that's built into some laptops
as a gamepad with 3 axes.
This change prevents the accel from being selected and
subsequently flooding the console with errors from
gcscontrolgadget every 10ms.
2012-09-29 21:47:26 -04: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
PT_Dreamer
4edf78d1cd
GCS-No more hidden settings.
2012-09-29 22:44:52 +01:00
Fredrik Arvidsson
fdec9ce149
OP-39 Fixed a lot of textual stuff.
...
Changed layout on some pages to make room for longer texts.
Changed default neutral value for output from 1080 to 1000.
Renamed 'Hexacopter H' to 'Hexacopter X'
2012-09-29 11:47:16 +02:00
Fredrik Arvidsson
3b9e50ad51
Merge branch 'next' into thread/OP-39
2012-09-29 09:43:50 +02:00
PT_Dreamer
b637bfaca9
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
.
2012-09-28 19:36:46 +01:00
PT_Dreamer
399fc7fe85
Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next
2012-09-28 11:55:33 +01:00
PT_Dreamer
dfa60f16b3
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
.
Change voted against by 2 lead devs on the review.
2012-09-28 11:53:19 +01: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
e4faece356
Merge remote-tracking branch 'origin/cp/extraGUIchanges' into next
2012-09-28 01:12:46 -05:00
James Cotton
6add7cc4d2
Fix HMC5883 driver after Vinz' changes to PIOS_EXTI
2012-09-28 01:10:46 -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
chris pember
e2389af30d
fixed the stylesheets vertical sliders. pushing to correct branch
2012-09-27 21:06:19 -07:00
chris pember
c6c8ff9487
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-27 20:41:33 -07:00
chris pember
5306b2cb71
fixed the stylesheets so the vertical sliders arent broken looking anymore
2012-09-27 20:41:01 -07: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
29a970564f
Merge remote-tracking branch 'origin/kenz/uavo_util_fixes' into next
2012-09-27 14:07:47 -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
James Cotton
684620dce6
Merge remote-tracking branch 'origin/hyper/uavobjectparser-tweaks' into next
...
Conflicts:
shared/uavobjectdefinition/taskinfo.xml
2012-09-27 13:49:34 -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
a899c87c56
Remove superflous UAVO update call.
...
Add documentation.
Remove commented code.
2012-09-27 19:21:00 +02:00
James Cotton
5326d26487
Merge remote-tracking branch 'origin/stac/usb-cdc-fixes' into next
2012-09-27 12:16:16 -05:00
Laura Sebesta
4923655cd3
Added global flag for enabling all diagnostic tools.
2012-09-27 18:51:12 +02:00
Laura Sebesta
09b8980881
Fixed copy-pasta error.
2012-09-27 18:06:48 +02:00