Update Flex with v1.1 hardware

Author: nseidle

Firmware/RTK_Everywhere/Begin.ino

@@ -780,7 +780,7 @@ void beginBoard()
         present.charger_mp2762a = true;
 
         present.button_powerLow = true; // Button is pressed when high
-        // present.button_mode = true;  //TODO remove comment. This won't be available until v1.1 of hardware
+        present.button_mode = true;
         present.beeper = true;
         present.gnss_to_uart = true;
 
@@ -795,14 +795,18 @@ void beginBoard()
         present.displayInverted = true;
         present.tiltPossible = true;
 
+        present.fastPowerOff = true;
+        present.invertedFastPowerOff = true; // Drive POWER_KILL high to cause powerdown
+
         pin_I2C0_SDA = 15;
         pin_I2C0_SCL = 4;
 
         pin_GnssUart_RX = 26;
         pin_GnssUart_TX = 27;
 
         pin_powerSenseAndControl = 34;
-        // pin_modeButton = 25; //TODO remove comment. This won't be available until v1.1 of hardware
+        pin_powerFastOff = 23;
+        pin_modeButton = 25;
 
         pin_IMU_RX = 14; // ESP32 UART2
         pin_IMU_TX = 17;
@@ -823,6 +827,9 @@ void beginBoard()
         pin_gpioExpanderInterrupt =
             2; // TODO remove on v1.1 hardware. Not used since all GPIO expanded pins are outputs
 
+        digitalWrite(pin_powerFastOff, LOW); // Low = Stay on. High = turn off.
+        pinMode(pin_powerFastOff, OUTPUT);
+
         DMW_if systemPrintf("pin_bluetoothStatusLED: %d\r\n", pin_bluetoothStatusLED);
         pinMode(pin_bluetoothStatusLED, OUTPUT);
 
@@ -866,13 +873,12 @@ void beginBoard()
         present.gnss_lg290p = true;
         present.antennaPhaseCenter_mm = 116.5; // Default to Torch helical APC, average of L1/L2
         present.fuelgauge_bq40z50 = true;
-        present.charger_mp2762a = true;
         present.button_powerLow = true; // Button is pressed when low
         present.beeper = true;
         present.gnss_to_uart = true;
         present.needsExternalPpl = true; // Uses the PointPerfect Library
         present.fastPowerOff = true;
-        present.invertedFastPowerOff = true; // Driving PWRKILL high will cause powerdown
+        present.invertedFastPowerOff = true; // Drive PWRKILL high to cause powerdown
 
         // We can't enable GNSS features here because we don't know if lg290pFirmwareVersion is >= v05
         // present.minElevation = true;

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -292,7 +292,7 @@ const int gpioExpanderSwitch_S4 = 3; // Controls U19 switch 4: connect GNSS UART
 const int gpioExpanderSwitch_LoraEnable = 4;   // LoRa_EN
 const int gpioExpanderSwitch_GNSS_Reset = 5;   // RST_GNSS
 const int gpioExpanderSwitch_LoraBoot = 6;     // LoRa_BOOT0 - Used for bootloading the STM32 radio IC
-const int gpioExpanderSwitch_PowerFastOff = 7; // PWRKILL
+const int gpioExpanderSwitch_S5 = 7; // Controls U61 switch 5: connect GNSS UART1 to Port A of CH342
 const int gpioExpanderNumSwitches = 8;
 
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

Firmware/RTK_Everywhere/System.ino

@@ -920,11 +920,10 @@ void beginGpioExpanderSwitches()
 
         // SW1 is on pin 0. Driving it high will disconnect the ESP32 from USB
         // GNSS_RST is on pin 5. Driving it low when an LG290P is connected will kill the I2C bus.
-        // PWRKILL is on pin 7. Driving it low will turn off the system
         for (int i = 0; i < gpioExpanderNumSwitches; i++)
         {
-            // Set all pins to low except GNSS RESET and PWRKILL
-            if (i == gpioExpanderSwitch_GNSS_Reset || i == gpioExpanderSwitch_PowerFastOff)
+            // Set all pins to low except GNSS RESET
+            if (i == gpioExpanderSwitch_GNSS_Reset)
                 gpioExpanderSwitches->digitalWrite(i, HIGH);
             else
                 gpioExpanderSwitches->digitalWrite(i, LOW);