Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00
Code Issues Wiki Activity

Cleanup rc_modes.c

Browse source 
- Replace usages of 25 as a magic number with CHANNEL_RANGE_STEP_WIDTH
- Remove constrain() call from isRangeActive(), since it's not needed

Should slightly improve performance and saves 24 bytes of flash.
This commit is contained in:
Alberto García Hierro 2018-06-25 16:08:20 +01:00
parent 6a9cf337e2
commit 59eac2b046
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/fc/rc_modes.c
View file

@ -99,9 +99,12 @@ bool isRangeActive(uint8_t auxChannelIndex, const channelRange_t *range)
return false; return false;
} }
uint16_t channelValue = constrain(rcData[auxChannelIndex + NON_AUX_CHANNEL_COUNT], CHANNEL_RANGE_MIN, CHANNEL_RANGE_MAX - 1); // No need to constrain() here, since we're testing for a closed range defined
return (channelValue >= 900 + (range->startStep * 25) && // by the channelRange_t. If channelValue has an invalid value, the test will
channelValue < 900 + (range->endStep * 25)); // be false anyway.
uint16_t channelValue = rcData[auxChannelIndex + NON_AUX_CHANNEL_COUNT];
return (channelValue >= CHANNEL_RANGE_MIN + (range->startStep * CHANNEL_RANGE_STEP_WIDTH) &&
channelValue < CHANNEL_RANGE_MIN + (range->endStep * CHANNEL_RANGE_STEP_WIDTH));
} }
void updateActivatedModes(void) void updateActivatedModes(void)

8
src/main/fc/rc_modes.h
View file

@ -71,11 +71,13 @@ typedef struct boxBitmask_s { BITARRAY_DECLARE(bits, CHECKBOX_ITEM_COUNT); } box
#define CHANNEL_RANGE_MIN 900 #define CHANNEL_RANGE_MIN 900
#define CHANNEL_RANGE_MAX 2100 #define CHANNEL_RANGE_MAX 2100
#define MODE_STEP_TO_CHANNEL_VALUE(step) (CHANNEL_RANGE_MIN + 25 * step) #define CHANNEL_RANGE_STEP_WIDTH 25
#define CHANNEL_VALUE_TO_STEP(channelValue) ((constrain(channelValue, CHANNEL_RANGE_MIN, CHANNEL_RANGE_MAX) - CHANNEL_RANGE_MIN) / 25)
#define MODE_STEP_TO_CHANNEL_VALUE(step) (CHANNEL_RANGE_MIN + CHANNEL_RANGE_STEP_WIDTH * step)
#define CHANNEL_VALUE_TO_STEP(channelValue) ((constrain(channelValue, CHANNEL_RANGE_MIN, CHANNEL_RANGE_MAX) - CHANNEL_RANGE_MIN) / CHANNEL_RANGE_STEP_WIDTH)
#define MIN_MODE_RANGE_STEP 0 #define MIN_MODE_RANGE_STEP 0
#define MAX_MODE_RANGE_STEP ((CHANNEL_RANGE_MAX - CHANNEL_RANGE_MIN) / 25) #define MAX_MODE_RANGE_STEP ((CHANNEL_RANGE_MAX - CHANNEL_RANGE_MIN) / CHANNEL_RANGE_STEP_WIDTH)
#define IS_RANGE_USABLE(range) ((range)->startStep < (range)->endStep) #define IS_RANGE_USABLE(range) ((range)->startStep < (range)->endStep)