Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FreqTest improvements #262

Merged
merged 4 commits into from Apr 25, 2021
Merged

FreqTest improvements #262

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f866d0
FreqTest: read & show previous frequency
stan23 Apr 15, 2021
0b1c80b
FreqTest: flush serial before sleep
stan23 Apr 15, 2021
3e87357
FreqTest: don't calculate old freq if not valid
stan23 Apr 16, 2021
fec5da5
FreqTest: use only direkt telegrams if ACTIVE_PING is used
stan23 Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 27 additions & 3 deletions examples/FreqTest/FreqTest.ino
View file
Open in desktop
Expand Up @@ -154,10 +154,15 @@ public:
// store frequency
DPRINT("Store into config area: ");DHEX((uint8_t)(freq>>8));DHEX((uint8_t)(freq&0xff));
StorageConfig sc = getConfigArea();

#if defined ARDUINO_ARCH_STM32F1
Wire.begin();
DPRINT(".");
#endif
// read old frequency
uint8_t oldF1 = sc.getByte(CONFIG_FREQ1);
uint8_t oldF2 = sc.getByte(CONFIG_FREQ2);

sc.clear();
DPRINT(".");
sc.setByte(CONFIG_FREQ1, freq>>8);
Expand All @@ -167,10 +172,18 @@ public:
sc.validate();

DPRINTLN("stored!");

if ((oldF1 >= 0x60) && (oldF1 <= 0x6A)) {
DPRINT("\nOld Config Freq was: 0x21");DHEX(oldF1);DHEX(oldF2);
printFreq(0x210000 + oldF1*256 + oldF2);
}

#if defined ARDUINO_ARCH_STM32F1
// measurement is done, loop here forever
while(1);
#else
DPRINTLN("Going to sleep...");
Serial.flush();
activity().savePower<Sleep<> >(this->getHal());
#endif
}
Expand All @@ -180,9 +193,14 @@ public:
virtual bool process(Message& msg) {
msg.from().dump(); DPRINT(".");
rssi = max(rssi,radio().rssi());
received++;
if( received > 0 ) {
trigger(sysclock);
#ifdef ACTIVE_PING
if (msg.from() == PING_TO)
#endif
{
received++;
if( received > 0 ) {
trigger(sysclock);
}
}
return true;
}
Expand All @@ -192,6 +210,12 @@ public:
this->getDeviceID(id);
hal.init(id);

#ifdef ACTIVE_PING
DPRINT("Active ping is enabled, looking for telegrams only from ");
PING_TO.dump(); DPRINTLN("!");
#else
DPRINTLN("Active ping is NOT enabled, looking for any telegram");
#endif
DPRINTLN("Start searching ...");
setFreq(STARTFREQ);
return false;
Expand Down