Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Relay: added relay output invert function

Browse Source
This commit is contained in:
Lanea Lucy S 2024-03-20 13:21:49 +01:00 committed by Peter Barker
parent 6f9967a8f7
commit 01b0e0c27c
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Relay/AP_Relay.cpp
View File

@ -408,6 +408,10 @@ void AP_Relay::set_pin_by_instance(uint8_t instance, bool value)
const bool initial_value = get_pin(pin); const bool initial_value = get_pin(pin);
if (_params[instance].inverted > 0) {
value = !value;
}
if (initial_value != value) { if (initial_value != value) {
set_pin(pin, value); set_pin(pin, value);
#if HAL_LOGGING_ENABLED #if HAL_LOGGING_ENABLED
@ -496,6 +500,10 @@ bool AP_Relay::get(uint8_t instance) const
return false; return false;
} }
if (_params[instance].inverted > 0) {
return !get_pin(_params[instance].pin.get());
}
return get_pin(_params[instance].pin.get()); return get_pin(_params[instance].pin.get());
} }

9
libraries/AP_Relay/AP_Relay_Params.cpp
View File

@ -60,11 +60,18 @@ const AP_Param::GroupInfo AP_Relay_Params::var_info[] = {
// @Param: DEFAULT // @Param: DEFAULT
// @DisplayName: Relay default state // @DisplayName: Relay default state
// @Description: Should the relay default to on or off, this only applies to RELAYx_FUNC "Relay" (1). All other uses will pick the appropriate default output state from within the controlling function's parameters. // @Description: Should the relay default to on or off, this only applies to RELAYx_FUNC "Relay" (1). All other uses will pick the appropriate default output state from within the controlling function's parameters. Note that if INVERTED is set then the default is inverted.
// @Values: 0: Off,1:On,2:NoChange // @Values: 0: Off,1:On,2:NoChange
// @User: Standard // @User: Standard
AP_GROUPINFO("DEFAULT", 3, AP_Relay_Params, default_state, (float)DefaultState::OFF), AP_GROUPINFO("DEFAULT", 3, AP_Relay_Params, default_state, (float)DefaultState::OFF),
// @Param: INVERTED
// @DisplayName: Relay invert output signal
// @Description: Should the relay output signal be inverted. If enabled, relay on would be pin low and relay off would be pin high. NOTE: this impact's DEFAULT.
// @Values: 0:Normal,1:Inverted
// @User: Standard
AP_GROUPINFO("INVERTED", 4, AP_Relay_Params, inverted, false),
AP_GROUPEND AP_GROUPEND
}; };

1
libraries/AP_Relay/AP_Relay_Params.h
View File

@ -70,4 +70,5 @@ public:
AP_Enum<FUNCTION> function; // relay function AP_Enum<FUNCTION> function; // relay function
AP_Int16 pin; // gpio pin number AP_Int16 pin; // gpio pin number
AP_Enum<DefaultState> default_state; // default state AP_Enum<DefaultState> default_state; // default state
AP_Int8 inverted; // inverted signal
}; };