Fixes for I2C on Pinecil + USB-PD stack (#1099)

* Remove unused includes

* Adding in submodule

* Move fusb functions to the BSP

* Remove old code

* Creating IronOS PD integration wrapper

* Redirect to wrapper

* pd lib updates

* fix Docker build

* Finish linking across

* Cleanup

* Update Makefile

* Update push.yml

* Update push.yml

* PD -> Compensate for different tick rates

* Update codeql-analysis.yml

* Fix PD #define for @Firebie

* Check irq low at start

* Update BSP.h

* Update main.cpp

* Closer delay

* Update OLED.cpp

* Bugfix trying to start QC too early

* Missing fusb shouldnt hang qc

* Update FreeRTOSConfig.h

* Update the GD drivers

* Update Pinecil IRQ setup

* Redirect printf() to uart

* Update Power.cpp

* Adding extras to PD state

* Update USBPD.cpp

* Delay in printf

* Iterate once before delay on start

* Update usb-pd

* master usb-pd now

* Format gd libs

* Update gd32vf103_bkp.c

* Guard with PD timeout

* Remove CodeQL

* Slow for testing, fix runt pulses at start

* Fix runt pulse in read size 1

* Cleaner probing setup

* Testing delay during stop gen in read 1

* Update I2C driver

* Update gd32vf103_i2c.c

* Cleaning up i2c wrapper a little, given up on dma for rx

* Update preRTOS.cpp

* Update Setup.cpp

* Update MOVThread.cpp

* Slow down UART to work with new clock config

* Better ack setup for 2 byte read

* Cleanup POW_PD so cant be lost in #includes

* tipResistance -> TIP_RESISTANCE

* handle NOP race on len==2

* Update configuration.h

* Dont use neg timeout to mask anymore

* Not required for MHP

* Fix up source display Miniware

* Fix race on PD init

* Update POWThread.cpp

* Update formatting

* MHP format

* Update push.yml

* Faster TS80P I2C

* Bugfix for IRQ handlers

* Correctly handle I2C race on PD access

* Fix CI error (unused var) and MHP IRQ

* Test Pinecil alt ADC mode

source/Core/BSP/Miniware/IRQ.cpp

@@ -7,7 +7,7 @@
 
 #include "IRQ.h"
 #include "Pins.h"
-#include "int_n.h"
+#include "configuration.h"
 
 /*
  * Catch the IRQ that says that the conversion is done on the temperature
@@ -30,13 +30,23 @@ void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCal
 void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
 void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
 
+extern osThreadId POWTaskHandle;
+
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
   (void)GPIO_Pin;
-  InterruptHandler::irqCallback();
+  // Notify POW thread that an irq occured
+  if (POWTaskHandle != nullptr) {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    xTaskNotifyFromISR(POWTaskHandle, 1, eSetBits, &xHigherPriorityTaskWoken);
+    /* Force a context switch if xHigherPriorityTaskWoken is now set to pdTRUE.
+    The macro used to do this is dependent on the port and may be called
+    portEND_SWITCHING_ISR. */
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }
 }
 
 bool getFUS302IRQLow() {
-#ifdef POW_PD
+#if POW_PD
   // Return true if the IRQ line is still held low
   return HAL_GPIO_ReadPin(INT_PD_GPIO_Port, INT_PD_Pin) == GPIO_PIN_RESET;
 #else

source/Core/BSP/Miniware/Pins.h

@@ -78,8 +78,6 @@
 #define SCL2_GPIO_Port            GPIOA
 #define SDA2_Pin                  GPIO_PIN_1
 #define SDA2_GPIO_Port            GPIOA
-#define INT_PD_Pin                GPIO_PIN_9
-#define INT_PD_GPIO_Port          GPIOA
 
 #endif
 #ifdef MODEL_TS80P

source/Core/BSP/Miniware/Power.cpp

@@ -3,43 +3,23 @@
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
+#include "USBPD.h"
 #include "configuration.h"
-#include "fusb_user.h"
-#include "fusbpd.h"
-#include "int_n.h"
-#include "policy_engine.h"
-bool FUSB302_present = false;
-bool FUSB302_probed  = false;
 
 void power_check() {
-#ifdef POW_PD
-  if (FUSB302_present) {
-    PolicyEngine::PPSTimerCallback();
-    // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut(getSettingValue(SettingsOptions::PDNegTimeout)) == false) {
-      return;
-    }
-    if (PolicyEngine::pdHasNegotiated()) {
-      return;
-    }
+#if POW_PD
+  // Cant start QC until either PD works or fails
+  if (!USBPowerDelivery::negotiationComplete()) {
+    return;
+  }
+  if (USBPowerDelivery::negotiationHasWorked()) {
+    return; // We are using PD
   }
 #endif
 #ifdef POW_QC
   QC_resync();
 #endif
 }
-uint8_t usb_pd_detect() {
-#ifdef POW_PD
-  if (FUSB302_probed) {
-    return FUSB302_present;
-  } else {
-    FUSB302_present = fusb302_detect();
-    FUSB302_probed  = true;
-  }
-  return FUSB302_present;
-#endif
-  return false;
-}
 
 bool getIsPoweredByDCIN() {
 #ifdef MODEL_TS80

source/Core/BSP/Miniware/Software_I2C.h

@@ -20,11 +20,12 @@
 #define SOFT_SCL_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_I2C_DELAY()              \
   {                                   \
-    for (int xx = 0; xx < 40; xx++) { \
+    for (int xx = 0; xx < 15; xx++) { \
       asm("nop");                     \
     }                                 \
   }
 
 #endif
+// 40 ~= 100kHz; 15 gives around 250kHz or so which is fast _and_ stable
 
 #endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */

source/Core/BSP/Miniware/configuration.h

@@ -144,6 +144,7 @@
 #define MIN_BOOST_TEMP_F     480                     // The min settable temp for boost mode °F
 #define POW_DC
 #define ACCEL_MMA
+#define POW_PD 0
 #define ACCEL_LIS
 #define TEMP_TMP36
 #endif
@@ -168,6 +169,7 @@
 #define MIN_BOOST_TEMP_F    480                    // The min settable temp for boost mode °F
 #define ACCEL_LIS
 #define POW_QC
+#define POW_PD 0
 #define TEMP_TMP36
 #define LIS_ORI_FLIP
 #define OLED_FLIP
@@ -193,8 +195,8 @@
 #define MIN_BOOST_TEMP_F    480                    // The min settable temp for boost mode °F
 #define ACCEL_LIS
 #define ACCEL_MSA
-#define POW_PD
-#define POW_QC
+#define POW_PD 1
+#define POW_QC 1
 #define TEMP_NTC
 #define I2C_SOFT
 #define LIS_ORI_FLIP
@@ -204,18 +206,18 @@
 #ifdef MODEL_TS100
 #define HARDWARE_MAX_WATTAGE_X10 750
 #define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
-#define tipResistance            75 // x10 ohms, 7.5 typical for ts100 tips
+#define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for ts100 tips
 #endif
 
 #ifdef MODEL_TS80
 #define HARDWARE_MAX_WATTAGE_X10 180
 #define TIP_THERMAL_MASS         40
-#define tipResistance            45 // x10 ohms, 4.5 typical for ts80 tips
+#define TIP_RESISTANCE           45 // x10 ohms, 4.5 typical for ts80 tips
 #endif
 
 #ifdef MODEL_TS80P
 #define HARDWARE_MAX_WATTAGE_X10 300
 #define TIP_THERMAL_MASS         40
-#define tipResistance            45 // x10 ohms, 4.5 typical for ts80 tips
+#define TIP_RESISTANCE           45 // x10 ohms, 4.5 typical for ts80 tips
 #endif
 #endif

source/Core/BSP/Miniware/fusb_user.cpp

@@ -1,43 +1,20 @@
 #include "configuration.h"
-#ifdef POW_PD
+#if POW_PD
 #include "BSP.h"
 #include "I2CBB.hpp"
 #include "Setup.h"
-#include "fusb302b.h"
-#include "fusb_user.h"
 
-/*
- * Read multiple bytes from the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address from which to read
- * size: The number of bytes to read
- * buf: The buffer into which data will be read
- */
-bool fusb_read_buf(uint8_t addr, uint8_t size, uint8_t *buf) { return I2CBB::Mem_Read(FUSB302B_ADDR, addr, buf, size); }
+bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB::Mem_Read(deviceAddr, registerAdd, buf, size); }
 
-/*
- * Write multiple bytes to the FUSB302B
- *
- * cfg: The FUSB302B to communicate with
- * addr: The memory address to which we will write
- * size: The number of bytes to write
- * buf: The buffer to write
- */
-bool fusb_write_buf(uint8_t addr, uint8_t size, const uint8_t *buf) { return I2CBB::Mem_Write(FUSB302B_ADDR, addr, buf, size); }
-
-bool fusb302_detect() {
-  // Probe the I2C bus for its address
-  return I2CBB::probe(FUSB302B_ADDR);
-}
+bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB::Mem_Write(deviceAddr, registerAdd, buf, size); }
 
 void setupFUSBIRQ() {
   GPIO_InitTypeDef GPIO_InitStruct;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  GPIO_InitStruct.Pin   = GPIO_PIN_9;
+  GPIO_InitStruct.Pin   = INT_PD_Pin;
   GPIO_InitStruct.Mode  = GPIO_MODE_IT_FALLING;
   GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  HAL_GPIO_Init(INT_PD_GPIO_Port, &GPIO_InitStruct);
   HAL_NVIC_SetPriority(EXTI9_5_IRQn, 10, 0);
   HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
 }

source/Core/BSP/Miniware/postRTOS.cpp

@@ -1,14 +1,4 @@
 #include "BSP.h"
-#include "FreeRTOS.h"
-#include "I2C_Wrapper.hpp"
-#include "QC3.h"
-#include "Settings.h"
-#include "cmsis_os.h"
-#include "fusbpd.h"
-#include "main.hpp"
-#include "power.hpp"
-#include "stdlib.h"
-#include "task.h"
 
 // Initialisation to be performed with scheduler active
 void postRToSInit() {}

source/Core/BSP/Miniware/preRTOS.cpp

@@ -9,8 +9,6 @@
 #include "I2CBB.hpp"
 #include "Pins.h"
 #include "Setup.h"
-#include "configuration.h"
-#include "fusbpd.h"
 #include <I2C_Wrapper.hpp>
 
 void preRToSInit() {