gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-09 23:08:12 +00:00
Code Issues Projects Releases Wiki Activity

CABELL: code optimization

Browse Source
This commit is contained in:
Pascal Langer 2021-04-07 09:02:50 +02:00
parent 13add5b9f2
commit 9e0684b6cb
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Multiprotocol/CABELL_nrf224l01.ino
View File

@ -279,39 +279,44 @@ static void __attribute__((unused)) CABELL_send_packet(uint8_t bindMode)
static void __attribute__((unused)) CABELL_getChannelSequence (uint8_t outArray[], uint8_t numChannels, uint64_t permutation) static void __attribute__((unused)) CABELL_getChannelSequence (uint8_t outArray[], uint8_t numChannels, uint64_t permutation)
{ {
/* This procedure initializes an array with the sequence progression of channels. /* This procedure initializes an array with the sequence progression of channels.
* This is not the actual channels itself, but the sequence base to be used within bands of * This is not the actual channels itself, but the sequence base to be used within bands of
* channels. * channels.
* *
* There are numChannels! permutations for arranging the channels * There are numChannels! permutations for arranging the channels
* one of these permutations will be calculated based on the permutation input * one of these permutations will be calculated based on the permutation input
* permutation should be between 1 and numChannels! but the routine will constrain it * permutation should be between 1 and numChannels! but the routine will constrain it
* if these bounds are exceeded. Typically the radio's unique TX ID should be used. * if these bounds are exceeded. Typically the radio's unique TX ID should be used.
* *
* The maximum numChannels is 20. Anything larger than this will cause the uint64_t * The maximum numChannels is 20. Anything larger than this will cause the uint64_t
* variables to overflow, yielding unknown results (possibly infinite loop?). Therefor * variables to overflow, yielding unknown results (possibly infinite loop?). Therefor
* this routine constrains the value. * this routine constrains the value.
*/ */
uint8_t i; //iterator counts numChannels uint8_t i; //iterator counts numChannels
uint64_t indexOfNextSequenceValue; uint32_t indexOfNextSequenceValue;
uint64_t numChannelsFactorial=1; uint32_t numChannelsFactorial=1;
uint32_t perm32 ;
uint8_t sequenceValue; uint8_t sequenceValue;
numChannels = constrain(numChannels,1,20); numChannels = constrain(numChannels,1,9);
for (i = 1; i <= numChannels;i++) for (i = 1; i <= numChannels;i++)
{ {
numChannelsFactorial *= i; // Calculate n! numChannelsFactorial *= i; // Calculate n!
outArray[i-1] = i-1; // Initialize array with the sequence outArray[i-1] = i-1; // Initialize array with the sequence
} }
permutation = (permutation % numChannelsFactorial) + 1; // permutation must be between 1 and n! or this algorithm will infinite loop perm32 = permutation >> 8 ; // Shift 40 bit input to 32 bit
perm32 = (perm32 % numChannelsFactorial); // permutation must be between 1 and n! or this algorithm will infinite loop
perm32 <<= 8 ; // Shift back 8 bits
perm32 += permutation & 0x00FF ; // Tack on least 8 bits
perm32 = (perm32 % numChannelsFactorial) + 1; // permutation must be between 1 and n! or this algorithm will infinite loop
//Rearrange the array elements based on the permutation selected //Rearrange the array elements based on the permutation selected
for (i=0, permutation--; i<numChannels; i++ ) for (i=0, perm32--; i<numChannels; i++ )
{ {
numChannelsFactorial /= ((uint64_t)numChannels)-i; numChannelsFactorial /= numChannels-i;
indexOfNextSequenceValue = i+(permutation/numChannelsFactorial); indexOfNextSequenceValue = i+(perm32/numChannelsFactorial);
permutation %= numChannelsFactorial; perm32 %= numChannelsFactorial;
//Copy the value in the selected array position //Copy the value in the selected array position
sequenceValue = outArray[indexOfNextSequenceValue]; sequenceValue = outArray[indexOfNextSequenceValue];

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 2 #define VERSION_REVISION 2
#define VERSION_PATCH_LEVEL 71 #define VERSION_PATCH_LEVEL 72
#define MODE_SERIAL 0 #define MODE_SERIAL 0