Fix SOP sequence decoding for devices with UCPD

Author: manuelbl

library.properties

@@ -1,5 +1,5 @@
 name=USBPowerDelivery
-version=1.0.2
+version=1.0.3
 author=Manuel Bl. <manuel.bleichenbacher@gmail.com>
 maintainer=Manuel Bl. <manuel.bleichenbacher@gmail.com>
 sentence=USB Power Delivery for Arduino.

src/PDPhySTM32UCPD.cpp

@@ -219,8 +219,7 @@ void PDPhySTM32UCPD::handleInterrupt() {
         LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_1);
         if ((status & UCPD_SR_RXERR) == 0) {
             uint32_t orderedSet = LL_UCPD_ReadRxOrderSet(UCPD1);
-            rxMessage->sopSequence = orderedSet <= LL_UCPD_ORDERED_SET_SOP2_DEBUG
-                ? static_cast<PDSOPSequence>(orderedSet) : PDSOPSequence::cableReset;
+            rxMessage->sopSequence = mapSOPSequence(orderedSet);
             rxMessage->cc = ccActive;
             PowerController.onMessageReceived(rxMessage);
 
@@ -251,4 +250,23 @@ void PDPhySTM32UCPD::handleInterrupt() {
     }
 }
 
+PDSOPSequence PDPhySTM32UCPD::mapSOPSequence(uint32_t orderedSet) {
+    switch (orderedSet) {
+    case LL_UCPD_RXORDSET_SOP:
+        return PDSOPSequence::sop;
+    case LL_UCPD_RXORDSET_SOP1:
+        return PDSOPSequence::sop1;
+    case LL_UCPD_RXORDSET_SOP2:
+        return PDSOPSequence::sop2;
+    case LL_UCPD_RXORDSET_SOP1_DEBUG:
+        return PDSOPSequence::sop1Debug;
+    case LL_UCPD_RXORDSET_SOP2_DEBUG:
+        return PDSOPSequence::sop2Debug;
+    case LL_UCPD_RXORDSET_CABLE_RESET:
+        return PDSOPSequence::cableReset;
+    default:
+        return PDSOPSequence::invalid;
+    }
+}
+
 #endif

src/PDPhySTM32UCPD.h

@@ -24,6 +24,7 @@ struct PDPhySTM32UCPD : PDPhy {
     static void enableCommunication(int cc);
     static void disableCommunication();
     static void enableRead();
+    static PDSOPSequence mapSOPSequence(uint32_t orderedSet);
 
     static void handleInterrupt();
 

test/VoltageChange/src/main.cpp

@@ -30,7 +30,7 @@ void setup() {
 
 void loop() {
     PowerSink.poll();
-    PDProtocolAnalyzer::poll();
+    PDProtocolAnalyzer.poll();
 
     if (isUSBPDSource && hasExpired(nextVoltageChangeTime))
         switchVoltage();