Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 01:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sub: Add momentary relay button function

Browse Source
This commit is contained in:
Daniel Heideman 2017-11-22 13:01:06 -08:00 committed by Jacob Walser
parent 7ef1f4b177
commit 6a4aaea927
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ArduSub/Sub.h
View File

@ -646,6 +646,7 @@ private:
void init_joystick(); void init_joystick();
void transform_manual_control_to_rc_override(int16_t x, int16_t y, int16_t z, int16_t r, uint16_t buttons); void transform_manual_control_to_rc_override(int16_t x, int16_t y, int16_t z, int16_t r, uint16_t buttons);
void handle_jsbutton_press(uint8_t button,bool shift=false,bool held=false); void handle_jsbutton_press(uint8_t button,bool shift=false,bool held=false);
void handle_jsbutton_release(uint8_t button, bool shift);
JSButton* get_button(uint8_t index); JSButton* get_button(uint8_t index);
void default_js_buttons(void); void default_js_buttons(void);
void clear_input_hold(); void clear_input_hold();

42
ArduSub/joystick.cpp
View File

@ -76,6 +76,9 @@ void Sub::transform_manual_control_to_rc_override(int16_t x, int16_t y, int16_t
for (uint8_t i = 0 ; i < 16 ; i++) { for (uint8_t i = 0 ; i < 16 ; i++) {
if ((buttons & (1 << i))) { if ((buttons & (1 << i))) {
handle_jsbutton_press(i,shift,(buttons_prev & (1 << i))); handle_jsbutton_press(i,shift,(buttons_prev & (1 << i)));
// buttonDebounce = tnow_ms;
} else if (buttons_prev & (1 << i)) {
handle_jsbutton_release(i, shift);
} }
} }
@ -348,6 +351,11 @@ void Sub::handle_jsbutton_press(uint8_t button, bool shift, bool held)
relay.toggle(0); relay.toggle(0);
} }
break; break;
case JSButton::button_function_t::k_relay_1_momentary:
if (!held) {
relay.on(0);
}
break;
case JSButton::button_function_t::k_relay_2_on: case JSButton::button_function_t::k_relay_2_on:
relay.on(1); relay.on(1);
break; break;
@ -359,6 +367,11 @@ void Sub::handle_jsbutton_press(uint8_t button, bool shift, bool held)
relay.toggle(1); relay.toggle(1);
} }
break; break;
case JSButton::button_function_t::k_relay_2_momentary:
if (!held) {
relay.on(1);
}
break;
case JSButton::button_function_t::k_relay_3_on: case JSButton::button_function_t::k_relay_3_on:
relay.on(2); relay.on(2);
break; break;
@ -370,6 +383,11 @@ void Sub::handle_jsbutton_press(uint8_t button, bool shift, bool held)
relay.toggle(2); relay.toggle(2);
} }
break; break;
case JSButton::button_function_t::k_relay_3_momentary:
if (!held) {
relay.on(2);
}
break;
case JSButton::button_function_t::k_relay_4_on: case JSButton::button_function_t::k_relay_4_on:
relay.on(3); relay.on(3);
break; break;
@ -381,6 +399,11 @@ void Sub::handle_jsbutton_press(uint8_t button, bool shift, bool held)
relay.toggle(3); relay.toggle(3);
} }
break; break;
case JSButton::button_function_t::k_relay_4_momentary:
if (!held) {
relay.on(3);
}
break;
//////////////////////////////////////////////// ////////////////////////////////////////////////
// Servo functions // Servo functions
@ -517,6 +540,25 @@ void Sub::handle_jsbutton_press(uint8_t button, bool shift, bool held)
} }
} }
void Sub::handle_jsbutton_release(uint8_t button, bool shift) {
// Act based on the function assigned to this button
switch (get_button(button)->function(shift)) {
case JSButton::button_function_t::k_relay_1_momentary:
relay.off(0);
break;
case JSButton::button_function_t::k_relay_2_momentary:
relay.off(1);
break;
case JSButton::button_function_t::k_relay_3_momentary:
relay.off(2);
break;
case JSButton::button_function_t::k_relay_4_momentary:
relay.off(3);
break;
}
}
JSButton* Sub::get_button(uint8_t index) JSButton* Sub::get_button(uint8_t index)
{ {
// Help to access appropriate parameter // Help to access appropriate parameter