#45 Fixes to compilation issues in usbc-pdsystem

susanw1 · Nov 28, 2023 · 1511759 · 1511759
1 parent 4267f9b
commit 1511759
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 7 deletions.
diff --git a/receivers/native/arm/peripherals/usbc-pd/all/pom.xml 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
@@ -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/...bc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdInternal.hpp b/...bc-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/...bc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdLowLevel.hpp b/...bc-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/...usbc-pd/usbc-pd-ll-stm32g/src/main/c++/usbc-pd-ll-stm32g/lowlevel/specific/UcpdParser.hpp b/...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/...peripherals/usbc-pd/usbc-pd-ll/src/main/c++/usbc-pd-ll/lowlevel/specific/UcpdInternal.hpp b/...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