Merge pull request #7 from mcauser/au915_dualplan

Add support for new AU915 dualplan regional settings

README.md

@@ -23,7 +23,7 @@ No, you do not.  I put this here because it seems to be the #1 FAQ.  You do not
 No, you do not.  It's the #2 FAQ.  The Mapper data and coverage maps are not involved in any POC challenges or used for gaming denylists.
 
 ## Supported Hardware
-I tested this software on (many) LilyGo [TTGO T-Beam v1.1](http://www.lilygo.cn/prod_view.aspx?TypeId=50060&Id=1317&FId=t3:50060:3) devices, all on **US915**.  Others have enjoyed success on **EU688** and other worldwide bands, with the matching device.  These are commonly avaialable as "Meshtastic" devices from AliExpress, Amazon, Banggood, eBay, etc, usually as a kit with an unsoldered OLED screen and SMA antenna for around USD $30.00.
+I tested this software on (many) LilyGo [TTGO T-Beam v1.1](http://www.lilygo.cn/prod_view.aspx?TypeId=50060&Id=1317&FId=t3:50060:3) devices, all on **US915**.  Others have enjoyed success on **EU688** and other worldwide bands, with the matching device.  These are commonly available as "Meshtastic" devices from AliExpress, Amazon, Banggood, eBay, etc, usually as a kit with an unsoldered OLED screen and SMA antenna for around USD $30.00.
 
 If you have an older v0.7 board or different region, adjust the configuration to match.  If you have a unique variant and find something not working, open an Issue and provide what information you can.
 
@@ -132,7 +132,7 @@ When moving, the Mapper will send out a packet every time GPS indicates it has m
 
 This is the normal operation of the Mapper in motion: every `MIN_DIST` meters, one Uplink is sent reporting position while the battery charges from USB.  If the speed of motion is fast, it may even result in back-to-back packet sends (at greater distance) limited by the bandwidth of your chosen Spreading Factor (Data Rate) and country restrictions.  (In the United States US915, at SF10, this is about two seconds maximum speed.  In Thailand, it can be 37 seconds or more.)
 
-When the Mapper comes to a stop, staying within `MIN_DIST` meters, it sends a hearbeat ping every `STATIONARY_TX_INTERVAL` seconds (default: 60).  This serves to keep it visible on the map and report battery voltage.  (Too often for you?  Dial up the `STATIONARY_TX_INTERVAL` to a longer interval.)
+When the Mapper comes to a stop, staying within `MIN_DIST` meters, it sends a heartbeat ping every `STATIONARY_TX_INTERVAL` seconds (default: 60).  This serves to keep it visible on the map and report battery voltage.  (Too often for you?  Dial up the `STATIONARY_TX_INTERVAL` to a longer interval.)
 
 After being stationary a long time (parked) with a decreasing battery voltage, we change to a slower pace of "not moving" updates.  This happens after `REST_WAIT` seconds (default: 30 minutes).  In the Rest state, the Mapper transmits every `REST_TX_INTERVAL` seconds (default: 5 minutes).
 
@@ -187,9 +187,9 @@ indicating that the system experienced a normal boot (instead of a timer wakeup
 Next are some important debugging messages printed at startup, indicating whether the OLED screen, AXP Power Management IC, and GPS were found and initialized.  If these are not found or connected quickly, then there could be a hardware failure, soldering error, or other board-level issue preventing the software from working correctly.
 
 You should see `AXP192 PMU` on the T-Beam, and `SSD1306 OLED display` if a display is installed.  If you see neither of these, the i2c port likely has problems.
-If you expected an OLED display, and none was found, then it may be misconnected.
+If you expected an OLED display, and none was found, then it may be disconnected.
 
-After this are serveral data messages about voltages and settings, largely uninteresting, until you get to..
+After this are several data messages about voltages and settings, largely uninteresting, until you get to..
 
 ### Settings and Credentials
 On startup, the USB Serial port will print the DevEUI, AppID, and AppKey values, suitable for cut & paste entry into the Helium Console for your Device.
@@ -210,12 +210,12 @@ The Mapper will flash the Blue LED at 4Hz and attempt to Join the Helium network
 1. Out of Range: The nearest Helium hotspot can't hear the device, or the device can't hear the response.
 2. Wrong RF configuration or Localization:  The frequency band and protocol must match the local Helium Network, as configured in `platformio.ini`.
 3. The Device keys are not correctly registered in the Helium Console.  Check all three.
-4. The Device was recently added to Console and is still "Pending" or waiting for XOR Filter update to propegate through the blockchain or network.  This can take 20 minutes or more.
+4. The Device was recently added to Console and is still "Pending" or waiting for XOR Filter update to propagate through the blockchain or network.  This can take 20 minutes or more.
 5. Helium network outage.  Any failure in the helium network that prevents Join will hang here, as was seen often in November 2021.
 6. RF or hardware issues.  Disconnected antenna, mismatched antenna frequency, etc.
 
 ### Or, Re-Join
-Once the Mapper joins the Helium network, it stores these Network Key credentials for future use.  Ideally, the Mapper does not have to send a Join request at the next startup, but fetches them from the nonvolatile "Preferences" memory.  To successfully continue with these same credentials, the Mapper needs to continue the Frame Count from prior transmissions, or the Helium network will reject Uplink packets as "Late" (for re-using old Frame Count values).
+Once the Mapper joins the Helium network, it stores these Network Key credentials for future use.  Ideally, the Mapper does not have to send a Join request at the next startup, but fetches them from the non-volatile "Preferences" memory.  To successfully continue with these same credentials, the Mapper needs to continue the Frame Count from prior transmissions, or the Helium network will reject Uplink packets as "Late" (for re-using old Frame Count values).
 
 When you see `(re-used join)` on the screen and serial log, this means no Join Request/Accept packets were sent, and the unit will attempt to use the same credentials.
 
@@ -241,9 +241,9 @@ If your device is new, unused for a long time, or shipped from elsewhere in the
 The Neo-6M has a dedicated GPS backup battery cell that recharges any time the Mapper is powered on.  This helps retain the GPS state for faster time to first fix.  If your device is new or unused for a long time, this battery is likely dead and will charge with some use.  There's nothing to do but use the Mapper, and you should see fast GPS connections in the future.
 
 #### GPS Bitrate and configuration
-On the Debug/Monitoring UART console, you should also see a message reporting `GPS connected`.   The first time you run this software on hardware that came with Mestastic or other builds, it will automatically try all common baud rates to find the Neo GPS module.  Eventually it will connect, then configure the GPS for the needed NMEA Messages at 115,200 bps, then save the configuration to flash so that subsequent boot is faster.  In any case, you should always see `GPS connected` at startup if you are watching the UART/Monitor serial data.
+On the Debug/Monitoring UART console, you should also see a message reporting `GPS connected`.   The first time you run this software on hardware that came with Meshtastic or other builds, it will automatically try all common baud rates to find the Neo GPS module.  Eventually it will connect, then configure the GPS for the needed NMEA Messages at 115,200 bps, then save the configuration to flash so that subsequent boot is faster.  In any case, you should always see `GPS connected` at startup if you are watching the UART/Monitor serial data.
 
-This means the Mapper is receving NMEA messages at the expected bitrate, but it may not yet have a 3D position fix from the GPS.
+This means the Mapper is receiving NMEA messages at the expected bitrate, but it may not yet have a 3D position fix from the GPS.
 
 Note that you never need to load or run special "GPS Reset" scripts to change the GPS settings.  This build will find and configure the GPS from any known state, including Meshtastic builds.
 
@@ -256,7 +256,7 @@ Check the antenna cable connection to the board.  The U.FL connector is fragile,
 
 Ensure the unit has good power, using a charged LiIon cell for power.  It needs to stay on for 15 minutes or more without interruption.
 
-If you see a blinking Red LED from the GPS, but the Mapper software does not have a fix, reporting `*** NO GPS ***`, then there is a software issue between the ESP32 and GPS.  You can debug this further by selecting `USB GPS` from the menu and inspecting the NMEA sentences from the GPS to the UART console.  You may also run Ublox tools this way, such as U-Center to study the GPS module behiavor.
+If you see a blinking Red LED from the GPS, but the Mapper software does not have a fix, reporting `*** NO GPS ***`, then there is a software issue between the ESP32 and GPS.  You can debug this further by selecting `USB GPS` from the menu and inspecting the NMEA sentences from the GPS to the UART console.  You may also run Ublox tools this way, such as U-Center to study the GPS module behavior.
 
 If `USB GPS` does not relay any NMEA sentences from the unit, then something is wrong in unusual ways.  Reset the board and ensure that "GPS Connected" is shown during boot.  It is not common for GPS modules to be defective, so keep trying different things and ask `#mappers` for ideas.
 
@@ -374,7 +374,7 @@ This build is a modification of work by many experts, with input from the [Heliu
 
 The Fork history here in Github shows the lineage and prior work, including  https://github.com/helium/longfi-arduino/tree/master/TTGO-TBeam-Tracker
 
-This code was originally developed for use on The Things Network (TTN) it has been editied/repurposed for use with the Helium Network.
+This code was originally developed for use on The Things Network (TTN) it has been edited/repurposed for use with the Helium Network.
 
 This version is based on a forked repo from github user [kizniche] https://github.com/kizniche/ttgo-tbeam-ttn-tracker. Which in turn is based on the code from [xoseperez/ttgo-beam-tracker](https://github.com/xoseperez/ttgo-beam-tracker), with excerpts from [dermatthias/Lora-TTNMapper-T-Beam](https://github.com/dermatthias/Lora-TTNMapper-T-Beam) to fix an issue with incorrect GPS data being transmitted to the network. Support was also added for the 915 MHz frequency (North and South America). [lewisxhe/TTGO-T-Beam](https://github.com/lewisxhe/TTGO-T-Beam) was referenced for enabling use on the newer T-Beam board (Rev1).
 
@@ -389,7 +389,7 @@ NOTE: There are now 2 versions of the TTGO T-BEAM, the first version (Rev0) and
 
 2. Add the PlattformIO extension within VS Code (https://platformio.org/install/ide?install=vscode)
 
-3. Check Device Manager if a serialdevice appear on conntecting the T-Beam. If nothing appears a driver for the USB to serial Adpater need to be installed.(https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers)
+3. Check Device Manager if a serial device appear on connecting the T-Beam. If nothing appears a driver for the USB to serial Adapter need to be installed.(https://www.silabs.com/developers/usb-to-uart-bridge-vcp-drivers)
 
 3. Check and edit platformio.ini to use the right bandplan for your region.
 

main/configuration.h

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Version
 // -----------------------------------------------------------------------------
 #define APP_NAME "MaxP Mapper"
-#define APP_VERSION "1.7.7"  // 2022-May-8
+#define APP_VERSION "1.7.8"  // 2022-Nov-18
 
 // -----------------------------------------------------------------------------
 // CONFIGURATION
@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // so we want to avoid it as much as possible. There is no other motion sensor, so if we make it too long,
 // we miss the first minutes of each motion while sleeping.
 // Note that USB Power will prevent this low-power sleep, and also wake us up from it.
-// A button press will also wake from sleep, but takes some time to initialise and re-aquire
+// A button press will also wake from sleep, but takes some time to initialise and re-acquire
 #define SLEEP_WAIT          (2 * 60 * 60)  // If we STILL haven't moved in this long, turn off the GPS to save power
 // For a vehicle application where USB Power appears BEFORE motion, this can be set very high without missing anything:
 #define SLEEP_TX_INTERVAL   (1 * 60 * 60)  // Wake up and check position every now and then to see if movement happened
@@ -115,11 +115,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SEND_GPSLOST_UPLINKS 0  // GPS Lost messages
 #endif
 #ifndef SEND_STATUS_UPLINKS
-#define SEND_STATUS_UPLINKS  0  // USB Connnect/disconnect messages
+#define SEND_STATUS_UPLINKS  0  // USB Connect/disconnect messages
 #endif
 
 // -----------------------------------------------------------------------------
-// Less common Configuration iteams
+// Less common Configuration items
 // -----------------------------------------------------------------------------
 
 // Select which T-Beam board is being used. Only uncomment one.

main/main.cpp

@@ -554,7 +554,7 @@ void scanI2Cdevice(void) {
         Serial.println("AXP192 PMU");
       }
     } else if (err == 4) {
-      Serial.print("Unknow i2c device at 0x");
+      Serial.print("Unknown i2c device at 0x");
       if (addr < 16)
         Serial.print("0");
       Serial.println(addr, HEX);
@@ -772,7 +772,7 @@ void setup() {
     screen_setup(oled_addr);
   is_screen_on = true;
 
-  // GPS power on, so it has time to setttle.
+  // GPS power on, so it has time to settle.
   axp.setPowerOutPut(AXP192_LDO3, AXP202_ON);
 
   // Show logo on first boot (as opposed to wake)

main/ttn.cpp

@@ -328,8 +328,11 @@ void ttn_join(void) {
 #elif defined(CFG_au915)
 
   // set sub band for AU915
+  // before 2022-11-17 Helium was using FSB2 CH 8-15 (916.8 - 918.2 MHz uplink)
   // https://github.com/TheThingsNetwork/gateway-conf/blob/master/AU-global_conf.json
-  LMIC_selectSubBand(1);
+  // LMIC_selectSubBand(1);
+  // after 2022-11-17 Helium switched to DualPlan using FSB6 CH 40-47 (923.2 - 924.6 MHz uplink)
+  LMIC_selectSubBand(5);
 
 #endif
 
@@ -460,7 +463,7 @@ static void ttn_set_cnt() {
   // We occasionally mirror our count to flash, to ensure that if we lose power we will at least start with a count that
   // is almost correct (otherwise the TNN network will discard packets until count once again reaches the value they've
   // seen).  We limit these writes to a max rate of one write every 5 minutes.  Which should let the FLASH last for 300
-  // years (given the ESP32 NVS algoritm)
+  // years (given the ESP32 NVS algorithm)
   static uint32_t lastWriteMsec = UINT32_MAX;  // Ensure we write at least once
   uint32_t now = millis();
   if (now < lastWriteMsec || (now - lastWriteMsec) > 5 * 60 * 1000L) {  // write if we roll over (50 days) or 5 mins

platformio.ini

@@ -19,7 +19,8 @@ build_flags = -Wall
 	-Wextra
 	-Wno-missing-field-initializers -O3
 	-D CFG_us915=1
-;	 -D CFG_eu868=1
+;	-D CFG_eu868=1
+;	-D CFG_au915=1
 	-D CFG_sx1276_radio=1
 	-D ARDUINO_LMIC_PROJECT_CONFIG_H_SUPPRESS
 	-D ARDUINO_TTGO_LoRa32_V1
@@ -32,6 +33,7 @@ lib_deps =
 
 monitor_speed = 115200
 ; monitor_port = COM17
+; upload_speed = 921600
 ; upload_port = COM17
 
 [env:release]