From 1511759ce8a02910fc725b4c9d38c1b1e3d30760 Mon Sep 17 00:00:00 2001
From: Robert <robert.witts.rmw@gmail.com>
Date: Fri, 23 Dec 2022 19:16:13 +0000
Subject: [PATCH] #45 Fixes to compilation issues in usbc-pdsystem

---
 .../arm/peripherals/usbc-pd/all/pom.xml       | 34 +++++++++++++++++++
 .../native/arm/peripherals/usbc-pd/pom.xml    |  2 ++
 .../lowlevel/specific/UcpdInternal.hpp        |  4 +--
 .../lowlevel/specific/UcpdLowLevel.hpp        |  4 +--
 .../lowlevel/specific/UcpdParser.hpp          |  4 +--
 .../lowlevel/specific/UcpdInternal.hpp        |  2 +-
 6 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 receivers/native/arm/peripherals/usbc-pd/all/pom.xml

diff --git a/receivers/native/arm/peripherals/usbc-pd/all/pom.xml b/receivers/native/arm/peripherals/usbc-pd/all/pom.xml
new file mode 100644
index 000000000..b22fdc176
--- /dev/null
+++ b/receivers/native/arm/peripherals/usbc-pd/all/pom.xml
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.zcode</groupId>
+        <artifactId>zcode-receivers-usbc-pd</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>zcode-receivers-usbc-pd-all</artifactId>
+    <packaging>nar</packaging>
+    <name>Zcode full peripheral set</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.zcode</groupId>
+            <artifactId>zcode-receivers-usbc-pd-core</artifactId>
+            <version>${project.version}</version>
+            <type>nar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.zcode</groupId>
+            <artifactId>zcode-receivers-usbc-pd-ll</artifactId>
+            <version>${project.version}</version>
+            <type>nar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.zcode</groupId>
+            <artifactId>zcode-receivers-usbc-pd-ll-stm32g</artifactId>
+            <version>${project.version}</version>
+            <type>nar</type>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/receivers/native/arm/peripherals/usbc-pd/pom.xml b/receivers/native/arm/peripherals/usbc-pd/pom.xml
index a29c69c70..3816c0150 100644
--- a/receivers/native/arm/peripherals/usbc-pd/pom.xml
+++ b/receivers/native/arm/peripherals/usbc-pd/pom.xml
@@ -11,6 +11,8 @@
     <packaging>pom</packaging>
     <name>Zcode USB C Power Delivery</name>
     <modules>
+        <module>all</module>
+        <module>usbc-pd-core</module>
         <module>usbc-pd-ll</module>
         <module>usbc-pd-ll-stm32g</module>
     </modules>
diff --git a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdInternal.hpp b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdInternal.hpp
index 769808f7b..3ef661866 100644
--- a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdInternal.hpp
+++ b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdInternal.hpp
@@ -10,8 +10,8 @@
 
 #include <llIncludes.hpp>
 #include <dma-ll/DmaManager.hpp>
-#include "../../../../../../../../clock/src/main/c++/clock-ll/ClockManager.hpp"
-#include "../../../../../../../../clock/src/main/c++/clock-ll/SystemMilliClock.hpp"
+#include <clock-ll/ClockManager.hpp>
+#include <clock-ll/SystemMilliClock.hpp>
 #include "UcpdParser.hpp"
 
 enum PowerStatus {
diff --git a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdLowLevel.hpp b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdLowLevel.hpp
index 2849bd432..9ea1ed5f8 100644
--- a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdLowLevel.hpp
+++ b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdLowLevel.hpp
@@ -11,8 +11,8 @@
 #include <llIncludes.hpp>
 #include <dma-ll/DmaManager.hpp>
 #include <interrupt-ll/InterruptManager.hpp>
-#include "../../../../../../../../clock-ll/src/main/c++/clock-ll/ClockManager.hpp"
-#include "../../../../../../../../clock-ll/src/main/c++/clock-ll/SystemMilliClock.hpp"
+#include <clock-ll/ClockManager.hpp>
+#include <clock-ll/SystemMilliClock.hpp>
 
 enum UcpdTxTerminationStatus {
     UcpdTxAborted, UcpdTxMessageDiscarded, UcpdTxDmaFail, UcpdMessageSent
diff --git a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdParser.hpp b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdParser.hpp
index 099b35b64..596f26474 100644
--- a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdParser.hpp
+++ b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdParser.hpp
@@ -9,8 +9,8 @@
 #define SRC_MAIN_CPP_ARM_NO_OS_STM32G4_USBC_PD_MODULE_LOWLEVEL_SPECIFIC_UCPDPARSER_HPP_
 
 #include <llIncludes.hpp>
-#include "../../../../../../../../clock-ll/src/main/c++/clock-ll/ClockManager.hpp"
-#include "../../../../../../../../clock-ll/src/main/c++/clock-ll/SystemMilliClock.hpp"
+#include <clock-ll/ClockManager.hpp>
+#include <clock-ll/SystemMilliClock.hpp>
 #include "UcpdLowLevel.hpp"
 #include "UcpdMessages.hpp"
 
diff --git a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll/src/main/c++/usbc-pd-ll/lowlevel/specific/UcpdInternal.hpp b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll/src/main/c++/usbc-pd-ll/lowlevel/specific/UcpdInternal.hpp
index a9c7467f2..3b641b1c3 100644
--- a/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll/src/main/c++/usbc-pd-ll/lowlevel/specific/UcpdInternal.hpp
+++ b/receivers/native/arm/peripherals/usbc-pd/usbc-pd-ll/src/main/c++/usbc-pd-ll/lowlevel/specific/UcpdInternal.hpp
@@ -7,7 +7,7 @@
 
 #include <usbc-pd-ll/UsbcPdLLInterfaceInclude.hpp>
 
-#if defined(USBC_PD_LL_STM32G)
+#if defined(USBC_PD_LL_STM32_Ver_ucpd_v1_0)
 #include <usbc-pd-ll-stm32g/lowlevel/specific/UcpdInternal.hpp>
 #else
 #error Please select a supported device family