Corrections for Qwiic bus speed (100kHz and 400kHz). Ensure interrupt directions are set correctly.

Author: PaulZC

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -13,7 +13,9 @@
 
   The Board should be set to SparkFun Apollo3 \ RedBoard Artemis ATP.
 
-  Please note: this version of the firmware compiles on v2.1.0+ of the Apollo3 boards.
+  Please note: this version of the firmware compiles on v2.1.0 of the Apollo3 boards.
+  
+  (At the time of writing, data logging with the the u-blox ZED-F9P is problematic when using v2.1.1 of the core.)
 
   v1.0 Power Consumption:
    Sleep between reads, RTC fully charged, no Qwiic, SD, no USB, no Power LED: 260uA
@@ -95,7 +97,7 @@
   
   (in progress) Update to Apollo3 v2.1.1 - FIRMWARE_VERSION_MAJOR = 2.
   (done) Implement printf float (OLA uses printf float in _so_ many places...): https://github.com/sparkfun/Arduino_Apollo3/issues/278
-  (worked around) Figure out why attachInterrupt(PIN_POWER_LOSS, powerDownOLA, FALLING); causes badness
+  (worked around) attachInterrupt(PIN_POWER_LOSS, powerDownOLA, FALLING); causes badness - https://github.com/sparkfun/Arduino_Apollo3/issues/416
   (done) Add a setQwiicPullups function
   (done) Check if we need ap3_set_pin_to_analog when coming out of sleep
   (done) Investigate why code does not wake from deep sleep correctly
@@ -326,7 +328,7 @@ void setup() {
   delay(1); // Let PIN_POWER_LOSS stabilize
 
   if (digitalRead(PIN_POWER_LOSS) == LOW) powerDownOLA(); //Check PIN_POWER_LOSS just in case we missed the falling edge
-  //attachInterrupt(PIN_POWER_LOSS, powerDownOLA, FALLING); // TO DO: figure out why this no longer works on v2.1.0
+  //attachInterrupt(PIN_POWER_LOSS, powerDownOLA, FALLING); // We can't do this with v2.1.0 as attachInterrupt causes a spontaneous interrupt
   attachInterrupt(PIN_POWER_LOSS, powerLossISR, FALLING);
   powerLossSeen = false; // Make sure the flag is clear
 
@@ -387,25 +389,30 @@ void setup() {
     pinMode(PIN_STOP_LOGGING, INPUT_PULLUP);
     delay(1); // Let the pin stabilize
     attachInterrupt(PIN_STOP_LOGGING, stopLoggingISR, FALLING); // Enable the interrupt
-    pin_config(PinName(PIN_STOP_LOGGING), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+    am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
+    intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
+    pin_config(PinName(PIN_STOP_LOGGING), intPinConfig); // Make sure the pull-up does actually stay enabled
     stopLoggingSeen = false; // Make sure the flag is clear
   }
 
   if (settings.useGPIO11ForTrigger == true)
   {
     pinMode(PIN_TRIGGER, INPUT_PULLUP);
     delay(1); // Let the pin stabilize
+    am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
     if (settings.fallingEdgeTrigger == true)
     {
       SerialPrintln(F("Falling-edge triggering is enabled. Sensor data will be logged on a falling edge on GPIO pin 11."));
       attachInterrupt(PIN_TRIGGER, triggerPinISR, FALLING); // Enable the interrupt
+      intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
     }
     else
     {
       SerialPrintln(F("Rising-edge triggering is enabled. Sensor data will be logged on a rising edge on GPIO pin 11."));
       attachInterrupt(PIN_TRIGGER, triggerPinISR, RISING); // Enable the interrupt
+      intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_LO2HI;
     }
-    pin_config(PinName(PIN_TRIGGER), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+    pin_config(PinName(PIN_TRIGGER), intPinConfig); // Make sure the pull-up does actually stay enabled
     triggerEdgeSeen = false; // Make sure the flag is clear
   }
 

Firmware/OpenLog_Artemis/Sensors.ino

@@ -1568,20 +1568,32 @@ void setMaxI2CSpeed()
       //Check if i2cSpeed is lowered
       struct_uBlox *sensor = (struct_uBlox*)temp->configPtr;
       if (sensor->i2cSpeed == 100000)
+      {
+        //printDebug("setMaxI2CSpeed: sensor->i2cSpeed is 100000. Reducing maxSpeed to 100kHz\r\n");
         maxSpeed = 100000;
+      }
     }
 
     temp = temp->next;
   }
 
   //If user wants to limit the I2C bus speed, do it here
   if (maxSpeed > settings.qwiicBusMaxSpeed)
+  {
+    //printDebug("setMaxI2CSpeed: maxSpeed is > settings.qwiicBusMaxSpeed. Reducing maxSpeed to " + (String)settings.qwiicBusMaxSpeed + "Hz\r\n");
     maxSpeed = settings.qwiicBusMaxSpeed;
+  }
 
   if (maxSpeed > 200000)
+  {
+    printDebug("setMaxI2CSpeed: setting qwiic clock speed to " + (String)AM_HAL_IOM_400KHZ + "Hz\r\n");
     qwiic.setClock(AM_HAL_IOM_400KHZ);
+  }
   else
+  {
+    printDebug("setMaxI2CSpeed: setting qwiic clock speed to " + (String)AM_HAL_IOM_100KHZ + "Hz\r\n");
     qwiic.setClock(AM_HAL_IOM_100KHZ);
+  }
   for (int i = 0; i < 100; i++) //Allow time for the speed to change
   {
     checkBattery();

Firmware/OpenLog_Artemis/autoDetect.ino

@@ -855,6 +855,10 @@ void configureQwiicDevices()
     configureDevice(temp);
     temp = temp->next;
   }
+
+  //Now that the settings are loaded and the devices are configured,
+  //try for 400kHz but reduce to 100kHz if certain devices are attached
+  setMaxI2CSpeed();
 }
 
 //Returns a pointer to the menu function that configures this particular device type

Firmware/OpenLog_Artemis/lowerPower.ino

@@ -414,7 +414,7 @@ void wakeFromSleep()
 
   if (digitalRead(PIN_POWER_LOSS) == LOW) powerDownOLA(); //Check PIN_POWER_LOSS just in case we missed the falling edge
 
-  //attachInterrupt(PIN_POWER_LOSS, powerDownOLA, FALLING); // TO DO: figure out why this no longer works on v2.1.0
+  //attachInterrupt(PIN_POWER_LOSS, powerDownOLA, FALLING); // We can't do this with v2.1.0 as attachInterrupt causes a spontaneous interrupt
   attachInterrupt(PIN_POWER_LOSS, powerLossISR, FALLING);
   powerLossSeen = false; // Make sure the flag is clear
 
@@ -424,7 +424,9 @@ void wakeFromSleep()
     pin_config(PinName(PIN_STOP_LOGGING), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pin does actually get re-configured
     delay(1); // Let the pin stabilize
     attachInterrupt(PIN_STOP_LOGGING, stopLoggingISR, FALLING); // Enable the interrupt
-    pin_config(PinName(PIN_STOP_LOGGING), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+    am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
+    intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
+    pin_config(PinName(PIN_STOP_LOGGING), intPinConfig); // Make sure the pull-up does actually stay enabled
     stopLoggingSeen = false; // Make sure the flag is clear
   }
 
@@ -433,11 +435,20 @@ void wakeFromSleep()
     pinMode(PIN_TRIGGER, INPUT_PULLUP);
     pin_config(PinName(PIN_TRIGGER), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pin does actually get re-configured
     delay(1); // Let the pin stabilize
+    am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
     if (settings.fallingEdgeTrigger == true)
+    {
+      SerialPrintln(F("Falling-edge triggering is enabled. Sensor data will be logged on a falling edge on GPIO pin 11."));
       attachInterrupt(PIN_TRIGGER, triggerPinISR, FALLING); // Enable the interrupt
+      intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
+    }
     else
+    {
+      SerialPrintln(F("Rising-edge triggering is enabled. Sensor data will be logged on a rising edge on GPIO pin 11."));
       attachInterrupt(PIN_TRIGGER, triggerPinISR, RISING); // Enable the interrupt
-    pin_config(PinName(PIN_TRIGGER), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+      intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_LO2HI;
+    }
+    pin_config(PinName(PIN_TRIGGER), intPinConfig); // Make sure the pull-up does actually stay enabled
     triggerEdgeSeen = false; // Make sure the flag is clear
   }
 

Firmware/OpenLog_Artemis/menuAttachedDevices.ino

@@ -229,7 +229,8 @@ bool detectQwiicDevices()
   //*** Let's leave pull-ups set to 1k and only disable them when taking to a u-blox device ***
   //setQwiicPullups(0); //We've detected something on the bus so disable pullups.
 
-  setMaxI2CSpeed(); //Try for 400kHz but reduce to 100kHz or low if certain devices are attached
+  //We need to call setMaxI2CSpeed in configureQwiicDevices
+  //We cannot do it here as the device settings have not been loaded
 
   SerialPrintln(F("Autodetect complete"));
 

Firmware/OpenLog_Artemis/menuPower.ino

@@ -65,7 +65,9 @@ void menuPower()
           pin_config(PinName(PIN_STOP_LOGGING), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pin does actually get re-configured
           delay(1); // Let the pin stabilize
           attachInterrupt(PIN_STOP_LOGGING, stopLoggingISR, FALLING); // Enable the interrupt
-          pin_config(PinName(PIN_STOP_LOGGING), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+          am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
+          intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
+          pin_config(PinName(PIN_STOP_LOGGING), intPinConfig); // Make sure the pull-up does actually stay enabled
           stopLoggingSeen = false; // Make sure the flag is clear
           settings.logA32 = false; // Disable analog logging on pin 32
         }

Firmware/OpenLog_Artemis/menuTerminal.ino

@@ -298,11 +298,18 @@ void menuLogRate()
           pinMode(PIN_TRIGGER, INPUT_PULLUP);
           pin_config(PinName(PIN_TRIGGER), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pin does actually get re-configured
           delay(1); // Let the pin stabilize
+          am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
           if (settings.fallingEdgeTrigger == true)
+          {
             attachInterrupt(PIN_TRIGGER, triggerPinISR, FALLING); // Enable the interrupt
+            intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
+          }
           else
+          {
             attachInterrupt(PIN_TRIGGER, triggerPinISR, RISING); // Enable the interrupt
-          pin_config(PinName(PIN_TRIGGER), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+            intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_LO2HI;
+          }
+          pin_config(PinName(PIN_TRIGGER), intPinConfig); // Make sure the pull-up does actually stay enabled
           triggerEdgeSeen = false; // Make sure the flag is clear
           settings.logA11 = false; // Disable analog logging on pin 11
           settings.logMaxRate = false; // Disable max rate logging
@@ -325,11 +332,18 @@ void menuLogRate()
         {
           detachInterrupt(PIN_TRIGGER); // Disable the interrupt
           settings.fallingEdgeTrigger ^= 1; // Invert the flag
+          am_hal_gpio_pincfg_t intPinConfig = g_AM_HAL_GPIO_INPUT_PULLUP;
           if (settings.fallingEdgeTrigger == true)
+          {
             attachInterrupt(PIN_TRIGGER, triggerPinISR, FALLING); // Enable the interrupt
+            intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_HI2LO;
+          }
           else
+          {
             attachInterrupt(PIN_TRIGGER, triggerPinISR, RISING); // Enable the interrupt
-          pin_config(PinName(PIN_TRIGGER), g_AM_HAL_GPIO_INPUT_PULLUP); // Make sure the pull-up does actually stay enabled
+            intPinConfig.eIntDir = AM_HAL_GPIO_PIN_INTDIR_LO2HI;
+          }
+          pin_config(PinName(PIN_TRIGGER), intPinConfig); // Make sure the pull-up does actually stay enabled
           triggerEdgeSeen = false; // Make sure the flag is clear
         }
         else