diff options
| author | px4dev <px4@purgatory.org> | 2013-07-14 13:04:44 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-07-14 13:04:44 -0700 |
| commit | dca9019f75ddf31a5477db935252eb009a0be655 (patch) | |
| tree | 6fd0661f9e2c7035097bf2b044b33e95ae352caf /src/modules/px4iofirmware/registers.c | |
| parent | 6cf120831289368015b7b4f51db4f99f418e7129 (diff) | |
| parent | 60ce9759d9d5a9b5f2e9fd218852fa595cc7bebd (diff) | |
| download | px4-firmware-dca9019f75ddf31a5477db935252eb009a0be655.tar.gz px4-firmware-dca9019f75ddf31a5477db935252eb009a0be655.tar.bz2 px4-firmware-dca9019f75ddf31a5477db935252eb009a0be655.zip | |
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'src/modules/px4iofirmware/registers.c')
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 873ee73f1..9606faa86 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -360,16 +360,16 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) value &= PX4IO_P_SETUP_RELAYS_VALID; r_setup_relays = value; #ifdef POWER_RELAY1 - POWER_RELAY1(value & (1 << 0) ? 1 : 0); + POWER_RELAY1((value & PX4IO_P_SETUP_RELAYS_POWER1) ? 1 : 0); #endif #ifdef POWER_RELAY2 - POWER_RELAY2(value & (1 << 1) ? 1 : 0); + POWER_RELAY2((value & PX4IO_P_SETUP_RELAYS_POWER2) ? 1 : 0); #endif #ifdef POWER_ACC1 - POWER_ACC1(value & (1 << 2) ? 1 : 0); + POWER_ACC1((value & PX4IO_P_SETUP_RELAYS_ACC1) ? 1 : 0); #endif #ifdef POWER_ACC2 - POWER_ACC2(value & (1 << 3) ? 1 : 0); + POWER_ACC2((value & PX4IO_P_SETUP_RELAYS_ACC2) ? 1 : 0); #endif break; @@ -382,6 +382,10 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) isr_debug(0, "set debug %u\n", (unsigned)r_page_setup[PX4IO_P_SETUP_SET_DEBUG]); break; + case PX4IO_P_SETUP_DSM: + dsm_bind(value & 0x0f, (value >> 4) & 7); + break; + default: return -1; } |