diff options
| author | Julian Oes <julian@oes.ch> | 2013-08-15 14:04:46 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-08-15 14:04:46 +0200 |
| commit | 56575eb068879beb68b3730ca6d3bb3755d6960a (patch) | |
| tree | 1b7b4c028c2b936db81310e82a8ef84adc125e3d /src/modules/px4iofirmware/px4io.h | |
| parent | 50cf1c01b701fced6437dfe574fd09cd312b9f15 (diff) | |
| parent | 561ec495b7df5b3ff4536d16d1389d1f02affd06 (diff) | |
| download | px4-firmware-56575eb068879beb68b3730ca6d3bb3755d6960a.tar.gz px4-firmware-56575eb068879beb68b3730ca6d3bb3755d6960a.tar.bz2 px4-firmware-56575eb068879beb68b3730ca6d3bb3755d6960a.zip | |
Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
Conflicts:
src/drivers/blinkm/blinkm.cpp
src/drivers/px4io/px4io.cpp
src/modules/commander/state_machine_helper.c
src/modules/px4iofirmware/protocol.h
src/modules/px4iofirmware/registers.c
src/modules/systemlib/systemlib.h
src/systemcmds/reboot/reboot.c
Diffstat (limited to 'src/modules/px4iofirmware/px4io.h')
| -rw-r--r-- | src/modules/px4iofirmware/px4io.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/px4iofirmware/px4io.h b/src/modules/px4iofirmware/px4io.h index 9eb092a63..d6cf22b21 100644 --- a/src/modules/px4iofirmware/px4io.h +++ b/src/modules/px4iofirmware/px4io.h @@ -78,6 +78,9 @@ extern volatile uint16_t r_page_setup[]; /* PX4IO_PAGE_SETUP */ extern volatile uint16_t r_page_controls[]; /* PX4IO_PAGE_CONTROLS */ extern uint16_t r_page_rc_input_config[]; /* PX4IO_PAGE_RC_INPUT_CONFIG */ extern uint16_t r_page_servo_failsafe[]; /* PX4IO_PAGE_FAILSAFE_PWM */ +extern uint16_t r_page_servo_control_min[]; /* PX4IO_PAGE_CONTROL_MIN_PWM */ +extern uint16_t r_page_servo_control_max[]; /* PX4IO_PAGE_CONTROL_MAX_PWM */ +extern uint16_t r_page_servo_idle[]; /* PX4IO_PAGE_IDLE_PWM */ /* * Register aliases. |