Merge a5560ae4ea into c92bf89296

source/Core/BSP/Pinecilv2/BSP.cpp

@@ -10,7 +10,6 @@
 #include "TipThermoModel.h"
 #include "USBPD.h"
 #include "Utils.hpp"
-#include "bflb_platform.h"
 #include "bl702_adc.h"
 #include "configuration.h"
 #include "crc32.h"
@@ -283,3 +282,16 @@ void showBootLogo(void) {
 
   BootLogo::handleShowingLogo(scratch);
 }
+
+TemperatureType_t getCustomTipMaxInC() {
+  // have to lookup the max temp while being aware of the coe scaling value
+  float max_reading = ADC_MAX_READING - 1.0;
+
+  if (adcGainCoeffCal.adcGainCoeffEnable) {
+    max_reading /= adcGainCoeffCal.coe;
+  }
+
+  TemperatureType_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(max_reading);
+  maximumTipTemp += getHandleTemperature(0) / 10; // Add handle offset
+  return maximumTipTemp - 1;
+}

source/Core/BSP/Pinecilv2/configuration.h

@@ -162,6 +162,7 @@
 #define OLED_96x16 1
 #define TEMP_NTC
 #define ACCEL_BMA
+#define CUSTOM_MAX_TEMP_C 1 // Uses custom max temp lookup
 #define ACCEL_SC7
 #define HALL_SENSOR
 #define HALL_SI7210

source/Core/Drivers/USBPD.cpp

@@ -337,51 +337,68 @@ bool pdbs_dpm_evaluate_capability(const pd_msg *capabilities, pd_msg *request) {
   return true;
 }
 
-void add_v_record(pd_msg *cap, uint16_t voltage_mv, int numobj) {
-
-  uint16_t current = (voltage_mv) / getTipResistanceX10(); // In centi-amps
-
-  /* Add a PDO for the desired power. */
-  cap->obj[numobj] = PD_PDO_TYPE_FIXED | PD_PDO_SNK_FIXED_VOLTAGE_SET(PD_MV2PDV(voltage_mv)) | PD_PDO_SNK_FIXED_CURRENT_SET(current);
-}
 void pdbs_dpm_get_sink_capability(pd_msg *cap, const bool isPD3) {
   /* Keep track of how many PDOs we've added */
-  int numobj = 0;
+  // int numobj = 0;
 
-  /* If we have no configuration or want something other than 5 V, add a PDO
-   * for vSafe5V */
-  /* Minimum current, 5 V, and higher capability. */
-  cap->obj[numobj++] = PD_PDO_TYPE_FIXED | PD_PDO_SNK_FIXED_VOLTAGE_SET(PD_MV2PDV(5000)) | PD_PDO_SNK_FIXED_CURRENT_SET(DPM_MIN_CURRENT);
-  // Voltages must be in order of lowest -> highest
-#if USB_PD_VMAX >= 20
-  add_v_record(cap, 9000, numobj);
-  numobj++;
-  add_v_record(cap, 15000, numobj);
-  numobj++;
-  add_v_record(cap, 20000, numobj);
-  numobj++;
-#elif USB_PD_VMAX >= 15
-  add_v_record(cap, 9000, numobj);
-  numobj++;
-  add_v_record(cap, 12000, numobj);
-  numobj++;
-  add_v_record(cap, 15000, numobj);
-  numobj++;
-#elif USB_PD_VMAX >= 12
-  add_v_record(cap, 9000, numobj);
-  numobj++;
-  add_v_record(cap, 12000, numobj);
-  numobj++;
-#elif USB_PD_VMAX >= 9
-  add_v_record(cap, 9000, numobj);
-  numobj++;
-#endif
+  // /* If we have no configuration or want something other than 5 V, add a PDO
+  //  * for vSafe5V */
+  // /* Minimum current, 5 V, and higher capability. */
+  // cap->obj[numobj++] = PD_PDO_TYPE_FIXED | PD_PDO_SNK_FIXED_VOLTAGE_SET(PD_MV2PDV(5000)) | PD_PDO_SNK_FIXED_CURRENT_SET(DPM_MIN_CURRENT);
 
-  /* Set the USB communications capable flag. */
-  cap->obj[0] |= PD_PDO_SNK_FIXED_USB_COMMS;
+  // /* Get the current we want */
+  // uint16_t voltage = USB_PD_VMAX * 1000; // in mv
+  // if (requested_voltage_mv != 5000) {
+  //   voltage = requested_voltage_mv;
+  // }
+  // uint16_t current = (voltage) / getTipResistanceX10(); // In centi-amps
 
-  /* Set the Sink_Capabilities message header */
-  cap->hdr = PD_DATAROLE_UFP | PD_SPECREV_3_0 | PD_POWERROLE_SINK | PD_MSGTYPE_SINK_CAPABILITIES | PD_NUMOBJ(numobj);
+  // /* Add a PDO for the desired power. */
+  // cap->obj[numobj++] = PD_PDO_TYPE_FIXED | PD_PDO_SNK_FIXED_VOLTAGE_SET(PD_MV2PDV(voltage)) | PD_PDO_SNK_FIXED_CURRENT_SET(current);
+
+  // /* Get the PDO from the voltage range */
+  // int8_t i = dpm_get_range_fixed_pdo_index(cap);
+
+  // /* If it's vSafe5V, set our vSafe5V's current to what we want */
+  // if (i == 0) {
+  //   cap->obj[0] &= ~PD_PDO_SNK_FIXED_CURRENT;
+  //   cap->obj[0] |= PD_PDO_SNK_FIXED_CURRENT_SET(current);
+  // } else {
+  //   /* If we want more than 5 V, set the Higher Capability flag */
+  //   if (PD_MV2PDV(voltage) != PD_MV2PDV(5000)) {
+  //     cap->obj[0] |= PD_PDO_SNK_FIXED_HIGHER_CAP;
+  //   }
+
+  //   /* If the range PDO is a different voltage than the preferred
+  //    * voltage, add it to the array. */
+  //   if (i > 0 && PD_PDO_SRC_FIXED_VOLTAGE_GET(cap->obj[i]) != PD_MV2PDV(voltage)) {
+  //     cap->obj[numobj++] = PD_PDO_TYPE_FIXED | PD_PDO_SNK_FIXED_VOLTAGE_SET(PD_PDO_SRC_FIXED_VOLTAGE_GET(cap->obj[i])) | PD_PDO_SNK_FIXED_CURRENT_SET(PD_PDO_SRC_FIXED_CURRENT_GET(cap->obj[i]));
+  //   }
+
+  //   /* If we have three PDOs at this point, make sure the last two are
+  //    * sorted by voltage. */
+  //   if (numobj == 3 && (cap->obj[1] & PD_PDO_SNK_FIXED_VOLTAGE) > (cap->obj[2] & PD_PDO_SNK_FIXED_VOLTAGE)) {
+  //     cap->obj[1] ^= cap->obj[2];
+  //     cap->obj[2] ^= cap->obj[1];
+  //     cap->obj[1] ^= cap->obj[2];
+  //   }
+  //   /* If we're using PD 3.0, add a PPS APDO for our desired voltage */
+  //   if ((hdr_template & PD_HDR_SPECREV) >= PD_SPECREV_3_0) {
+  //     cap->obj[numobj++]
+  //         = PD_PDO_TYPE_AUGMENTED | PD_APDO_TYPE_PPS | PD_APDO_PPS_MAX_VOLTAGE_SET(PD_MV2PAV(voltage)) | PD_APDO_PPS_MIN_VOLTAGE_SET(PD_MV2PAV(voltage)) |
+  //         PD_APDO_PPS_CURRENT_SET(PD_CA2PAI(current));
+  //   }
+  // }
+
+  // /* Set the unconstrained power flag. */
+  // if (_unconstrained_power) {
+  //   cap->obj[0] |= PD_PDO_SNK_FIXED_UNCONSTRAINED;
+  // }
+  // /* Set the USB communications capable flag. */
+  // cap->obj[0] |= PD_PDO_SNK_FIXED_USB_COMMS;
+
+  // /* Set the Sink_Capabilities message header */
+  // cap->hdr = hdr_template | PD_MSGTYPE_SINK_CAPABILITIES | PD_NUMOBJ(numobj);
 }
 
 #endif

source/Middlewares/Third_Party/FreeRTOS/Source/queue.c

@@ -397,9 +397,6 @@ BaseType_t xQueueGenericReset( QueueHandle_t xQueue,
         /* Check for multiplication overflow. */
         configASSERT( ( uxItemSize == 0 ) || ( uxQueueLength == ( xQueueSizeInBytes / uxItemSize ) ) );
 
-        /* Check for addition overflow. */
-        configASSERT( ( sizeof( Queue_t ) + xQueueSizeInBytes ) >  xQueueSizeInBytes );
-        
         /* Allocate the queue and storage area.  Justification for MISRA
          * deviation as follows:  pvPortMalloc() always ensures returned memory
          * blocks are aligned per the requirements of the MCU stack.  In this case