more SAMD fixes

This commit is contained in:
Pawel Spychalski
2018-05-16 15:23:22 +02:00
parent fc6fc95e1e
commit 1c2bd0055e
2 changed files with 6 additions and 6 deletions

View File

@@ -50,15 +50,15 @@ uint32_t RadioNode::getChannelEntryMillis(void) {
return _channelEntryMillis; return _channelEntryMillis;
} }
static uint32_t RadioNode::getFrequencyForChannel(uint8_t channel) { uint32_t RadioNode::getFrequencyForChannel(uint8_t channel) {
return RADIO_FREQUENCY_MIN + (RADIO_CHANNEL_WIDTH * channel); return RADIO_FREQUENCY_MIN + (RADIO_CHANNEL_WIDTH * channel);
} }
static uint8_t RadioNode::getNextChannel(uint8_t channel) { uint8_t RadioNode::getNextChannel(uint8_t channel) {
return (channel + RADIO_HOP_OFFSET) % RADIO_CHANNEL_COUNT; return (channel + RADIO_HOP_OFFSET) % RADIO_CHANNEL_COUNT;
} }
static uint8_t RadioNode::getPrevChannel(uint8_t channel) { uint8_t RadioNode::getPrevChannel(uint8_t channel) {
return (RADIO_CHANNEL_COUNT + channel - RADIO_HOP_OFFSET) % RADIO_CHANNEL_COUNT; return (RADIO_CHANNEL_COUNT + channel - RADIO_HOP_OFFSET) % RADIO_CHANNEL_COUNT;
} }

View File

@@ -21,9 +21,9 @@ class RadioNode {
void init(uint8_t ss, uint8_t rst, uint8_t di0, void(*callback)(int)); void init(uint8_t ss, uint8_t rst, uint8_t di0, void(*callback)(int));
void readRssi(void); void readRssi(void);
void readSnr(void); void readSnr(void);
static uint32_t getFrequencyForChannel(uint8_t channel); uint32_t getFrequencyForChannel(uint8_t channel);
static uint8_t getNextChannel(uint8_t channel); uint8_t getNextChannel(uint8_t channel);
static uint8_t getPrevChannel(uint8_t channel); uint8_t getPrevChannel(uint8_t channel);
void hopFrequency(bool forward, uint8_t fromChannel, uint32_t timestamp); void hopFrequency(bool forward, uint8_t fromChannel, uint32_t timestamp);
void readAndDecode( void readAndDecode(
QspConfiguration_t *qsp, QspConfiguration_t *qsp,