Ignore SOP' messages

Author: manuelbl

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "functional": "cpp"
+    }
+}

library.json

@@ -22,13 +22,13 @@
     "examples": [
         {
             "name": "Protocol Analyzer",
-            "base": "pio-examples/ProtocolAnalyzer",
-            "files": [ "platformio.ini", "main.cpp" ]
+            "base": "examples/ProtocolAnalyzer",
+            "files": [ "ProtocolAnalyzer.ino" ]
         },
         {
             "name": "Trigger Board",
-            "base": "pio-examples/TriggerBoard",
-            "files": [ "platformio.ini", "main.cpp" ]
+            "base": "examples/TriggerBoard",
+            "files": [ "TriggerBoard.ino" ]
         }
     ]
   }

src/PDController.cpp

@@ -151,6 +151,7 @@ void PDController::onNoGoodCrcReceived() {
 void PDController::onMessageReceived(PDMessage* message) {
     int messageId = message->messageId();
     PDMessageType type = message->type();
+    PDSOPSequence sopSeq = message->sopSequence;
     bool reportTransmissionFailed = false;
 
     log(PDLogEntryType::messageReceived, message);
@@ -164,7 +165,7 @@ void PDController::onMessageReceived(PDMessage* message) {
 
     if (isTransmitting()) {
         // a GoodCRC message is expected
-        if (type != PDMessageType::controlGoodCrc || messageId != txMessageId) {
+        if (type != PDMessageType::controlGoodCrc || sopSeq != PDSOPSequence::sop || messageId != txMessageId) {
             log(PDLogEntryType::transmissionFailed);
             reportTransmissionFailed = true;
         }
@@ -174,7 +175,7 @@ void PDController::onMessageReceived(PDMessage* message) {
         lastMessage = nullptr;
     }
 
-    if (type != PDMessageType::controlGoodCrc && !isMonitorOnly) {
+    if (type != PDMessageType::controlGoodCrc && sopSeq == PDSOPSequence::sop && !isMonitorOnly) {
 
         // if the message has the same message ID like the previous one,
         // 'lastMessage' is not set to prevent notifying the event handler twice

src/ProtoclAnalyzer.cpp

@@ -105,9 +105,22 @@ static const char* getSOPSequenceName(PDSOPSequence sequence) {
     return SOPSequenceNames[index];
 }
 
+static const char* getSender(const PDMessage* message) {
+    auto seq = message->sopSequence;
+    if (seq == PDSOPSequence::sop) {
+        return (message->header & 0x0100) != 0 ? "Source" : "Sink";
+    } else if (seq == PDSOPSequence::sop1 || seq == PDSOPSequence::sop2) {
+        return (message->header & 0x0100) != 0 ? "Cable" : "Port";
+    }
+
+    return "";
+}
+
 static void printMessage(const PDMessage* message) {
-    Serial.printf("CC%d %-5s %-20s %d  %04x", message->cc, getSOPSequenceName(message->sopSequence),
-            getMessageName(message->type()), message->messageId(), message->header);
+    Serial.printf("CC%d %-5s %-7s %-20s %d  %04x",
+            message->cc, getSOPSequenceName(message->sopSequence),
+            getSender(message),getMessageName(message->type()),
+            message->messageId(), message->header);
     int numObjects = message->numObjects();
     for (int i = 0; i < numObjects; i++)
         Serial.printf(" %08x", message->objects[i]);

test/ListCapabilities/.gitignore

@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

test/ListCapabilities/.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

test/ListCapabilities/platformio.ini

@@ -0,0 +1,40 @@
+[env]
+platform = ststm32
+framework = arduino
+lib_deps =
+    USB-Power-Delivery=symlink://../..
+
+[common]
+build_flags =
+   -D USBPD_DEBUG_PIN
+
+[env:nucleo_l432kc]
+board = nucleo_l432kc
+
+[env:bluepill_f103c8]
+board = bluepill_f103c8
+build_flags =
+   -D ${common.build_flags}
+   -D PIO_FRAMEWORK_ARDUINO_ENABLE_CDC
+   -D USBCON
+   -D HAL_PCD_MODULE_ENABLED
+   -D USBD_VID=0xCAFE
+   -D USBD_PID=0xDEAD
+   -D USB_MANUFACTURER_STRING="\"Codecrete\""
+   -D USB_PRODUCT_STRING="\"USB PD Capabilities\""
+
+[env:blackpill_f401cc]
+board = blackpill_f401cc
+debug_tool = stlink
+build_flags =
+   -D ${common.build_flags}
+   -D PIO_FRAMEWORK_ARDUINO_ENABLE_CDC
+   -D USBCON
+   -D HAL_PCD_MODULE_ENABLED
+   -D USBD_VID=0xCAFE
+   -D USBD_PID=0xDEAD
+   -D USB_MANUFACTURER_STRING="\"Codecrete\""
+   -D USB_PRODUCT_STRING="\"USB PD Capabilities\""
+
+[env:nucleo_g431kb]
+board = nucleo_g431kb

test/ListCapabilities/src/main.cpp

@@ -0,0 +1,61 @@
+//
+// USB Power Delivery for Arduino
+// Copyright (c) 2023 Manuel Bleichenbacher
+//
+// Licensed under MIT License
+// https://opensource.org/licenses/MIT
+//
+
+//
+// --- List the capabilities of the connected power supply
+//
+
+#include <Arduino.h>
+#include "PowerDelivery.h"
+
+static void handleEvent(PDSinkEventType eventType);
+static void listCapabilities();
+static const char* getSupplyTypeName(PDSupplyType type);
+
+void setup() {
+    Serial.begin(115200);
+    PowerSink.start(handleEvent);
+}
+
+void loop() {
+    PowerSink.poll();
+}
+
+void handleEvent(PDSinkEventType eventType) {
+    if (eventType == PDSinkEventType::sourceCapabilitiesChanged && PowerSink.isConnected())
+        listCapabilities();
+}
+
+void listCapabilities() {
+    Serial.println("USB PD capabilities:");
+    Serial.println("__Type_________Vmin____Vmax____Imax");
+
+    for (int i = 0; i < PowerSink.numSourceCapabilities; i += 1) {
+        auto cap = PowerSink.sourceCapabilities[i];
+        Serial.printf("  %-9s  %6d  %6d  %6d", getSupplyTypeName(cap.supplyType), cap.minVoltage, cap.maxVoltage, cap.maxCurrent);
+        Serial.println();
+    }
+
+    Serial.println("(voltage in mV, current in mA)");
+    Serial.println();
+}
+
+static const char* const SupplyTypeNames[] = {
+    [(int)PDSupplyType::fixed] = "Fixed",
+    [(int)PDSupplyType::battery] = "Battery",
+    [(int)PDSupplyType::variable] = "Variable",
+    [(int)PDSupplyType::pps] = "PPS",
+};
+
+const char* getSupplyTypeName(PDSupplyType type) {
+    unsigned int arraySize = sizeof(SupplyTypeNames) / sizeof(SupplyTypeNames[0]);
+    if ((unsigned int)type < arraySize)
+        return SupplyTypeNames[(unsigned int)type];
+    else
+        return "<unknown>";
+}

test/VoltageChange/src/main.cpp

@@ -11,10 +11,7 @@
 //
 
 #include <Arduino.h>
-#include "TaskScheduler.h"
-#include "ProtocolAnalyzer.h"
 #include "PowerDelivery.h"
-#include "CRC32.h"
 
 static void handleEvent(PDSinkEventType eventType);
 static void switchVoltage();