dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

More compile fixes

This commit is contained in:
Lorenz Meier 2013-07-16 09:08:05 +02:00
parent ce8e2fd726
commit 2f76c81147
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -24,4 +24,10 @@ Firmware.sublime-workspace
Images/*.bin
Images/*.px4
mavlink/include/mavlink/v0.9/
NuttX
NuttX
nuttx-configs/px4io-v2/src/.depend
nuttx-configs/px4io-v2/src/Make.dep
nuttx-configs/px4io-v2/src/libboard.a
nuttx-configs/px4io-v1/src/.depend
nuttx-configs/px4io-v1/src/Make.dep
nuttx-configs/px4io-v1/src/libboard.a

3
makefiles/config_px4fmu-v2_default.mk
View File

@ -26,7 +26,8 @@ MODULES += drivers/ms5611
MODULES += drivers/mb12xx
MODULES += drivers/gps
MODULES += drivers/hil
MODULES += drivers/hott_telemetry
MODULES += drivers/hott/hott_telemetry
MODULES += drivers/hott/hott_sensors
MODULES += drivers/blinkm
MODULES += modules/sensors

10
src/modules/gpio_led/gpio_led.c
View File

@ -109,19 +109,19 @@ int gpio_led_main(int argc, char *argv[])
} else if (!strcmp(argv[3], "a1")) {
use_io = true;
pin = PX4IO_ACC1;
pin = PX4IO_P_SETUP_RELAYS_ACC1;
} else if (!strcmp(argv[3], "a2")) {
use_io = true;
pin = PX4IO_ACC2;
pin = PX4IO_P_SETUP_RELAYS_ACC2;
} else if (!strcmp(argv[3], "r1")) {
use_io = true;
pin = PX4IO_RELAY1;
pin = PX4IO_P_SETUP_RELAYS_POWER1;
} else if (!strcmp(argv[3], "r2")) {
use_io = true;
pin = PX4IO_RELAY2;
pin = PX4IO_P_SETUP_RELAYS_POWER2;
} else {
errx(1, "unsupported pin: %s", argv[3]);
@ -142,7 +142,7 @@ int gpio_led_main(int argc, char *argv[])
char pin_name[24];
if (use_io) {
if (pin & (PX4IO_ACC1 | PX4IO_ACC2)) {
if (pin & (PX4IO_P_SETUP_RELAYS_ACC1 | PX4IO_P_SETUP_RELAYS_ACC2)) {
sprintf(pin_name, "PX4IO ACC%i", (pin >> 3));
} else {

5
src/modules/px4iofirmware/dsm.c
View File

@ -110,6 +110,10 @@ dsm_bind(uint16_t cmd, int pulses)
if (dsm_fd < 0)
return;
#ifdef CONFIG_ARCH_BOARD_PX4IO_V2
// XXX implement
#warning DSM BIND NOT IMPLEMENTED ON PX4IO V2
#else
switch (cmd) {
case dsm_bind_power_down:
// power down DSM satellite
@ -135,6 +139,7 @@ dsm_bind(uint16_t cmd, int pulses)
stm32_configgpio(GPIO_USART1_RX);
break;
}
#endif
}
bool