From 9a0241ac44a67c727f721f1e609b808d8f869da2 Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Thu, 19 Mar 2026 21:31:55 -0800 Subject: [PATCH] fix(rc_update): change RC*_REV params from float to int32 RC*_REV parameters are binary toggles (-1 or 1) immediately converted to bool. Using int32 allows reverting the module schema enum key type from number back to integer, keeping validation strict. --- src/modules/rc_update/params.yaml | 216 ++++++++++++++-------------- src/modules/rc_update/rc_update.cpp | 4 +- validation/module_schema.yaml | 2 +- 3 files changed, 111 insertions(+), 111 deletions(-) diff --git a/src/modules/rc_update/params.yaml b/src/modules/rc_update/params.yaml index 1022ffd216..3daa81d42d 100644 --- a/src/modules/rc_update/params.yaml +++ b/src/modules/rc_update/params.yaml @@ -33,13 +33,13 @@ parameters: description: short: RC channel 1 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC2_MIN: description: short: RC channel 2 minimum @@ -71,13 +71,13 @@ parameters: description: short: RC channel 2 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC3_MIN: description: short: RC channel 3 minimum @@ -109,13 +109,13 @@ parameters: description: short: RC channel 3 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC4_MIN: description: short: RC channel 4 minimum @@ -147,13 +147,13 @@ parameters: description: short: RC channel 4 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC5_MIN: description: short: RC channel 5 minimum @@ -185,13 +185,13 @@ parameters: description: short: RC channel 5 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC6_MIN: description: short: RC channel 6 minimum @@ -223,13 +223,13 @@ parameters: description: short: RC channel 6 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC7_MIN: description: short: RC channel 7 minimum @@ -261,13 +261,13 @@ parameters: description: short: RC channel 7 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC8_MIN: description: short: RC channel 8 minimum @@ -299,13 +299,13 @@ parameters: description: short: RC channel 8 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC9_MIN: description: short: RC channel 9 minimum @@ -337,13 +337,13 @@ parameters: description: short: RC channel 9 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC10_MIN: description: short: RC channel 10 minimum @@ -375,13 +375,13 @@ parameters: description: short: RC channel 10 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC11_MIN: description: short: RC channel 11 minimum @@ -413,13 +413,13 @@ parameters: description: short: RC channel 11 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC12_MIN: description: short: RC channel 12 minimum @@ -451,13 +451,13 @@ parameters: description: short: RC channel 12 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC13_MIN: description: short: RC channel 13 minimum @@ -489,13 +489,13 @@ parameters: description: short: RC channel 13 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC14_MIN: description: short: RC channel 14 minimum @@ -527,13 +527,13 @@ parameters: description: short: RC channel 14 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC15_MIN: description: short: RC channel 15 minimum @@ -565,13 +565,13 @@ parameters: description: short: RC channel 15 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC16_MIN: description: short: RC channel 16 minimum @@ -603,13 +603,13 @@ parameters: description: short: RC channel 16 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC17_MIN: description: short: RC channel 17 minimum @@ -641,13 +641,13 @@ parameters: description: short: RC channel 17 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC18_MIN: description: short: RC channel 18 minimum @@ -679,13 +679,13 @@ parameters: description: short: RC channel 18 reverse long: Set to -1 to reverse channel. - type: float + type: int32 values: - -1.0: Reverse - 1.0: Normal - default: 1.0 - min: -1.0 - max: 1.0 + -1: Reverse + 1: Normal + default: 1 + min: -1 + max: 1 RC_CHAN_CNT: description: short: RC channel count diff --git a/src/modules/rc_update/rc_update.cpp b/src/modules/rc_update/rc_update.cpp index 6faea550f7..3c2981b523 100644 --- a/src/modules/rc_update/rc_update.cpp +++ b/src/modules/rc_update/rc_update.cpp @@ -140,9 +140,9 @@ void RCUpdate::updateParams() param_get(_parameter_handles.max[i], &max); _parameters.max[i] = max; - float rev = 0.f; + int32_t rev = 0; param_get(_parameter_handles.rev[i], &rev); - _parameters.rev[i] = (rev < 0.f); + _parameters.rev[i] = (rev < 0); } for (int i = 0; i < rc_parameter_map_s::RC_PARAM_MAP_NCHAN; i++) { diff --git a/validation/module_schema.yaml b/validation/module_schema.yaml index 7af7253200..bead5c65a7 100644 --- a/validation/module_schema.yaml +++ b/validation/module_schema.yaml @@ -170,7 +170,7 @@ parameters: # enumeration of possible values for type enum type: dict keyschema: - type: number + type: integer valueschema: type: string