DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #191 from cyberman54/development

Browse Source 
international settings improved
This commit is contained in:
Verkehrsrot 2018-10-23 09:01:17 +02:00 committed by GitHub
commit 0523ecb8b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/lorawan.cpp
View File

@ -253,23 +253,13 @@ void onEvent(ev_t ev) {
strcpy_P(buff, PSTR("TX START")); strcpy_P(buff, PSTR("TX START"));
break; break;
/* case EV_SCAN_FOUND:
|| This event is defined but not used in the code. No strcpy_P(buff, PSTR("SCAN_FOUND"));
|| point in wasting codespace on it. break;
||
|| case EV_SCAN_FOUND:
|| Serial.println(F("EV_SCAN_FOUND"));
|| break;
*/
/* case EV_RFU1:
|| This event is defined but not used in the code. No strcpy_P(buff, PSTR("RFU1"));
|| point in wasting codespace on it. break;
||
|| case EV_RFU1:
|| Serial.println(F("EV_RFU1"));
|| break;
*/
default: default:
sprintf_P(buff, PSTR("UNKNOWN EVENT %d"), ev); sprintf_P(buff, PSTR("UNKNOWN EVENT %d"), ev);
@ -306,22 +296,22 @@ void switch_lora(uint8_t sf, uint8_t tx) {
cfg.lorasf = sf; cfg.lorasf = sf;
break; break;
case 11: case 11:
#if defined(CFG_eu868) #if defined(CFG_us915)
LMIC_setDrTxpow(DR_SF11, tx); LMIC_setDrTxpow(DR_SF11CR, tx);
cfg.lorasf = sf; cfg.lorasf = sf;
break; break;
#elif defined(CFG_us915) #else
LMIC_setDrTxpow(DR_SF11CR, tx); LMIC_setDrTxpow(DR_SF11, tx);
cfg.lorasf = sf; cfg.lorasf = sf;
break; break;
#endif #endif
case 12: case 12:
#if defined(CFG_eu868) #if defined(CFG_us915)
LMIC_setDrTxpow(DR_SF12, tx); LMIC_setDrTxpow(DR_SF12CR, tx);
cfg.lorasf = sf; cfg.lorasf = sf;
break; break;
#elif defined(CFG_us915) #else
LMIC_setDrTxpow(DR_SF12CR, tx); LMIC_setDrTxpow(DR_SF12, tx);
cfg.lorasf = sf; cfg.lorasf = sf;
break; break;
#endif #endif

8
src/main.cpp
View File

@ -167,13 +167,17 @@ void setup() {
os_init(); // initialize lmic run-time environment on core 1 os_init(); // initialize lmic run-time environment on core 1
LMIC_reset(); // initialize lmic MAC LMIC_reset(); // initialize lmic MAC
LMIC_setLinkCheckMode(0); LMIC_setLinkCheckMode(0);
// This tells LMIC to make the receive windows bigger, in case your clock is
// faster or slower. This causes the transceiver to be earlier switched on,
// so consuming more power. You may sharpen (reduce) CLOCK_ERROR_PERCENTAGE
// in src/lmic_config.h if you are limited on battery.
LMIC_setClockError(MAX_CLOCK_ERROR * CLOCK_ERROR_PROCENTAGE / 100); LMIC_setClockError(MAX_CLOCK_ERROR * CLOCK_ERROR_PROCENTAGE / 100);
#ifdef CFG_US915
// Set the data rate to Spreading Factor 7. This is the fastest supported // Set the data rate to Spreading Factor 7. This is the fastest supported
// rate for 125 kHz channels, and it minimizes air time and battery power. Set // rate for 125 kHz channels, and it minimizes air time and battery power. Set
// the transmission power to 14 dBi (25 mW). // the transmission power to 14 dBi (25 mW).
LMIC_setDrTxpow(DR_SF7, 14); LMIC_setDrTxpow(DR_SF7, 14);
#if defined(CFG_US915) || defined(CFG_au921)
// in the US, with TTN, it saves join time if we start on subband 1 (channels // in the US, with TTN, it saves join time if we start on subband 1 (channels
// 8-15). This will get overridden after the join by parameters from the // 8-15). This will get overridden after the join by parameters from the
// network. If working with other networks or in other regions, this will need // network. If working with other networks or in other regions, this will need