Merge pull request #558 from cyberman54/development

New feature: LoRaWAN parameters display page

include/lorawan.h

@@ -49,7 +49,7 @@ void IRAM_ATTR myRxCallback(void *pUserData, uint8_t port,
 void IRAM_ATTR myTxCallback(void *pUserData, int fSuccess);
 void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, const mac_t table[],
                 const uint8_t tablesize);
-uint8_t getBattLevel(void);
+//u1_t os_getBattLevel(void);
 const char *getSfName(rps_t rps);
 const char *getBwName(rps_t rps);
 const char *getCrName(rps_t rps);

platformio.ini

@@ -45,15 +45,15 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 1.9.90
+release_version = 1.9.91
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
-debug_level = 2
+debug_level = 3
 extra_scripts = pre:build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@1.11.1
+platform_espressif32 = espressif32@1.11.2
 monitor_speed = 115200
 upload_speed = 115200
 lib_deps_lora =
@@ -76,7 +76,7 @@ lib_deps_sensors =
 lib_deps_basic =
     ArduinoJson@^5.13.1
     76@>=1.2.4 ; #76 Timezone by Jack Christensen
-    274@>=2.3.3 ; #274 RTC by Michael Miller
+    274@>=2.3.4 ; #274 RTC by Michael Miller
     SimpleButton
     AXP202X_Library@>=1.1.0 ; AXP202 PMU lib by Lewis He
     esp32-micro-sdcard

src/display.cpp

@@ -39,7 +39,7 @@ FONT_STRETCHED: 16x32px = 8 chars / line
 // local Tag for logging
 static const char TAG[] = __FILE__;
 
-#define DISPLAY_PAGES (6) // number of paxcounter display pages
+#define DISPLAY_PAGES (7) // number of paxcounter display pages
 
 // settings for oled display library
 #define USE_BACKBUFFER
@@ -224,7 +224,8 @@ start:
     // page 2: GPS
     // page 3: BME280/680
     // page 4: time
-    // page 5: blank screen
+    // page 5: lorawan parameters
+    // page 6: blank screen
 
     // page 0: parameters overview
   case 0:
@@ -362,8 +363,32 @@ start:
               second(t));
     break;
 
-    // page 5: blank screen
+  // page 5: lorawan parameters
   case 5:
+
+#if (HAS_LORA)
+    // 3|NtwkID:000000 TXpw:aa
+    // 4|DevAdd:00000000  DR:0
+    // 5|CHMsk:0000 Nonce:0000
+    // 6|CUp:000000 CDn:000000
+    // 7|SNR:-0000  RSSI:-0000
+    dp_printf(0, 3, FONT_SMALL, 0, "NetwID:%06X TXpw:%-2d",
+              LMIC.netid & 0x001FFFFF, LMIC.radio_txpow);
+    dp_printf(0, 4, FONT_SMALL, 0, "DevAdd:%08X DR:%1d", LMIC.devaddr,
+              LMIC.datarate);
+    dp_printf(0, 5, FONT_SMALL, 0, "ChMsk:%04X Nonce:%04X", LMIC.channelMap,
+              LMIC.devNonce);
+    dp_printf(0, 6, FONT_SMALL, 0, "CUp:%-6d CDn:%-6d", LMIC.seqnoUp,
+              LMIC.seqnoDn);
+    dp_printf(0, 7, FONT_SMALL, 0, "SNR:%-5d  RSSI:%-5d", LMIC.snr / 4,
+              LMIC.rssi);
+    break; // page5
+#else      // don't show blank page if we are unattended
+    DisplayPage++; // next page
+#endif     // HAS_LORA
+
+    // page 6: blank screen
+  case 6:
 #ifdef HAS_BUTTON
     oledFill(0, 1);
     break;

src/lorawan.cpp

@@ -1,13 +1,10 @@
 // Basic Config
 #if (HAS_LORA)
 #include "lorawan.h"
-#endif
 
 // Local logging Tag
 static const char TAG[] = "lora";
 
-#if (HAS_LORA)
-
 #if CLOCK_ERROR_PROCENTAGE > 7
 #warning CLOCK_ERROR_PROCENTAGE value in lmic_config.h is too high; values > 7 will cause side effects
 #endif
@@ -101,8 +98,10 @@ void lora_setupForNetwork(bool preJoin) {
     if (!cfg.adrmode)
       LMIC_setDrTxpow(assertDR(cfg.loradr), cfg.txpower);
     // show current devaddr
-    ESP_LOGI(TAG, "DEVaddr: %08X", LMIC.devaddr);
+    ESP_LOGI(TAG, "DEVaddr: 0x%08X | Network ID: 0x%06X | Network Type: %d",
-    ESP_LOGI(TAG, "Radio parameters: %s / %s / %s",
+             LMIC.devaddr, LMIC.netid & 0x001FFFFF, LMIC.netid & 0x00E00000);
+    ESP_LOGI(TAG, "RSSI: %d | SNR: %d", LMIC.rssi, LMIC.snr / 4);
+    ESP_LOGI(TAG, "Radio parameters: %s | %s | %s",
              getSfName(updr2rps(LMIC.datarate)),
              getBwName(updr2rps(LMIC.datarate)),
              getCrName(updr2rps(LMIC.datarate)));
@@ -372,7 +371,7 @@ void lora_queuereset(void) { xQueueReset(LoraSendQueue); }
 
 #if (TIME_SYNC_LORAWAN)
 void IRAM_ATTR user_request_network_time_callback(void *pVoidUserUTCTime,
-                                                         int flagSuccess) {
+                                                  int flagSuccess) {
   // Explicit conversion from void* to uint32_t* to avoid compiler errors
   time_t *pUserUTCTime = (time_t *)pVoidUserUTCTime;
 
@@ -503,7 +502,7 @@ void myEventCallback(void *pUserData, ev_t ev) {
 
 // receive message handler
 void myRxCallback(void *pUserData, uint8_t port, const uint8_t *pMsg,
-                         size_t nMsg) {
+                  size_t nMsg) {
 
   // display type of received data
   if (nMsg)
@@ -601,32 +600,6 @@ void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, const mac_t table[],
 
 } // mac_decode()
 
-uint8_t getBattLevel() {
-  /*
-  return values:
-  MCMD_DEVS_EXT_POWER   = 0x00, // external power supply
-  MCMD_DEVS_BATT_MIN    = 0x01, // min battery value
-  MCMD_DEVS_BATT_MAX    = 0xFE, // max battery value
-  MCMD_DEVS_BATT_NOINFO = 0xFF, // unknown battery level
-  */
-#if (defined HAS_PMU || defined BAT_MEASURE_ADC)
-  uint16_t voltage = read_voltage();
-
-  switch (voltage) {
-  case 0:
-    return MCMD_DEVS_BATT_NOINFO;
-  case 0xffff:
-    return MCMD_DEVS_EXT_POWER;
-  default:
-    return (voltage > OTA_MIN_BATT ? MCMD_DEVS_BATT_MAX : MCMD_DEVS_BATT_MIN);
-  }
-#else // we don't have any info on battery level
-  return MCMD_DEVS_BATT_NOINFO;
-#endif
-} // getBattLevel()
-
-// u1_t os_getBattLevel(void) { return getBattLevel(); };
-
 const char *getSfName(rps_t rps) {
   const char *const t[] = {"FSK",  "SF7",  "SF8",  "SF9",
                            "SF10", "SF11", "SF12", "SF?"};
@@ -643,4 +616,30 @@ const char *getCrName(rps_t rps) {
   return t[getCr(rps)];
 }
 
+/*
+u1_t os_getBattLevel() {
+  
+  //return values:
+  //MCMD_DEVS_EXT_POWER   = 0x00, // external power supply
+  //MCMD_DEVS_BATT_MIN    = 0x01, // min battery value
+  //MCMD_DEVS_BATT_MAX    = 0xFE, // max battery value
+  //MCMD_DEVS_BATT_NOINFO = 0xFF, // unknown battery level
+
+#if (defined HAS_PMU || defined BAT_MEASURE_ADC)
+  uint16_t voltage = read_voltage();
+
+  switch (voltage) {
+  case 0:
+    return MCMD_DEVS_BATT_NOINFO;
+  case 0xffff:
+    return MCMD_DEVS_EXT_POWER;
+  default:
+    return (voltage > OTA_MIN_BATT ? MCMD_DEVS_BATT_MAX : MCMD_DEVS_BATT_MIN);
+  }
+#else // we don't have any info on battery level
+  return MCMD_DEVS_BATT_NOINFO;
+#endif
+} // getBattLevel()
+*/
+
 #endif // HAS_LORA