Merge branch 'dev' into epr-pinecil-og

source/Core/BSP/Pinecil/configuration.h

@@ -136,7 +136,8 @@
 #define POWER_LIMIT_STEPS      5                         //
 #define OP_AMP_GAIN_STAGE      OP_AMP_GAIN_STAGE_PINECIL // Uses TS100 resistors
 #define TEMP_uV_LOOKUP_HAKKO                             // Use Hakko lookup table
-#define USB_PD_VMAX            20                        // Maximum voltage for PD to negotiate
+#define USB_PD_VMAX            24                        // Maximum voltage for PD to negotiate
+#define POW_EPR 1                                        // EPR mode is tentatively enabled
 #define PID_TIM_HZ             (8)                       // Tick rate of the PID loop
 #define MAX_TEMP_C             450                       // Max soldering temp selectable °C
 #define MAX_TEMP_F             850                       // Max soldering temp selectable °F

source/Core/Drivers/USBPD.cpp

@@ -286,7 +286,9 @@ bool pdbs_dpm_evaluate_capability(const pd_msg *capabilities, pd_msg *request) {
     // We dont do usb
     // request->obj[0] |= PD_RDO_USB_COMMS;
 #ifdef POW_EPR
-    request->obj[0] |= PD_RDO_EPR_CAPABLE;
+    if (USBPowerDelivery::isVBUSConnected() == false ) {
+      request->obj[0] |= PD_RDO_EPR_CAPABLE;
+    }
 #endif
 
     /* Update requested voltage */