Merge branch 'openwch:main' into Interrupt-driven-Serial1

Author: maxint-rd

cores/arduino/Print.cpp

@@ -356,6 +356,12 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)
   uint8_t i = 0;
   uint8_t innerLoops = 0;
 
+  // Special case workaround https://github.com/arduino/ArduinoCore-API/issues/178
+  if (n64 == 0) {
+    write('0');
+    return 1;
+  }
+
   // prevent crash if called with base == 1
   if (base < 2) {
     base = 10;

libraries/USBPD_SINK/examples/usbpd_sink_request_voltage/usbpd_sink_request_voltage.ino

@@ -20,7 +20,10 @@ void loop() {
 
     if(usbpd_sink_get_ready())
     {
-        usbpd_sink_set_request_fixed_voltage(setVoltage);
+        if(usbpd_sink_set_request_fixed_voltage(setVoltage) == false)
+        {
+            Serial.printf("unsupported voltage\r\n");
+        }
     }
 
 // button, myIndex++

libraries/USBPD_SINK/src/usbpd_sink.c

@@ -38,7 +38,7 @@ void usbpd_sink_clear_ready(void)
     pdControl_g.cc_USBPD_READY = 0;
 }
 
-void usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage)
+bool usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage)
 {
     uint16_t targetVoltage;
     switch (requestVoltage)
@@ -73,11 +73,12 @@ void usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage)
         if(pdControl_g.cc_FixedSourceCap[i].Voltage == targetVoltage)
         { 
             pdControl_g.cc_SetPDONum = i+1;
-            return;
+            return true;
         }
     }
-    pdControl_g.cc_SetPDONum = (pdControl_g.cc_SourcePDONum - pdControl_g.cc_SourcePPSNum);
 
+    // unsupported voltage
+    return false;
 }
 
 void timer3_init(uint16_t arr, uint16_t psc)

libraries/USBPD_SINK/src/usbpd_sink.h

@@ -5,6 +5,7 @@
 extern "C" {
 #endif /* end of __cplusplus */
 
+#include <stdbool.h>
 #include "usbpd_def.h"
 
 // Register Bit Definition
@@ -201,7 +202,7 @@ void usbpd_sink_process(void);
 uint8_t usbpd_sink_get_ready(void);
 void usbpd_sink_clear_ready(void);
 
-void usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage);
+bool usbpd_sink_set_request_fixed_voltage(Request_voltage_t requestVoltage);
 
 
 #ifdef __cplusplus

variants/CH32V00x/CH32V003F4/PeripheralPins.c

@@ -34,8 +34,8 @@ WEAK const PinMap PinMap_ADC[] = {
   {PD_2,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 3)}, // ADC1_IN3
   {PD_3,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 4)}, // ADC1_IN4
   {PD_5,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC1_IN5
-  {PA_6,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 6)}, // ADC1_IN6
-  {PA_4,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 7)}, // ADC1_IN7
+  {PD_6,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 6)}, // ADC1_IN6
+  {PD_4,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 7)}, // ADC1_IN7
   {NC,        NP,   0}
 };
 #endif