#45 Changes to I2C to make it compile (WIP)

susanw1 · Dec 23, 2022 · 33d53dd · 33d53dd
1 parent 6f6ab31
commit 33d53dd
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 928 deletions.
diff --git a/...arm/peripherals/i2c/i2c-ll-stm32g/pom.xml → ...rs/native/arm/peripherals/i2c/all/pom.xml b/...arm/peripherals/i2c/i2c-ll-stm32g/pom.xml → ...rs/native/arm/peripherals/i2c/all/pom.xml
@@ -7,15 +7,28 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>zcode-receivers-i2c-ll-stm32g</artifactId>
+    <artifactId>zcode-receivers-i2c-all</artifactId>
     <packaging>nar</packaging>
-    <name>Zcode ll I2C for STM32G</name>
+    <name>Zcode full peripheral set</name>
+
     <dependencies>
+        <dependency>
+            <groupId>org.zcode</groupId>
+            <artifactId>zcode-receivers-i2c-core</artifactId>
+            <version>${project.version}</version>
+            <type>nar</type>
+        </dependency>
         <dependency>
             <groupId>org.zcode</groupId>
             <artifactId>zcode-receivers-i2c-ll</artifactId>
             <version>${project.version}</version>
             <type>nar</type>
         </dependency>
+        <dependency>
+            <groupId>org.zcode</groupId>
+            <artifactId>zcode-receivers-i2c-ll-stm32-2-1-1</artifactId>
+            <version>${project.version}</version>
+            <type>nar</type>
+        </dependency>
     </dependencies>
 </project>
diff --git a/receivers/native/arm/peripherals/i2c/i2c-core/src/main/c++/i2c/ZcodeI2cModule.hpp b/receivers/native/arm/peripherals/i2c/i2c-core/src/main/c++/i2c/ZcodeI2cModule.hpp
@@ -4,15 +4,10 @@
  *
  * SPDX-License-Identifier: MIT
  */
-
-#ifndef SRC_MAIN_CPP_I2C_MODULE_ZCODEI2CMODULE_HPP_
-#define SRC_MAIN_CPP_I2C_MODULE_ZCODEI2CMODULE_HPP_
-
 #if defined(I2C_LL)
 #include <i2c-ll/ZcodeI2cModule.hpp>
 
 #else
 #error No I2C system specified for usage
 #endif
 
-#endif /* SRC_MAIN_CPP_I2C_MODULE_ZCODEI2CMODULE_HPP_ */
diff --git a/...arm/peripherals/i2c/i2c-ll-stm32f/pom.xml → ...eripherals/i2c/i2c-ll-stm32-2-1-1/pom.xml b/...arm/peripherals/i2c/i2c-ll-stm32f/pom.xml → ...eripherals/i2c/i2c-ll-stm32-2-1-1/pom.xml
@@ -7,9 +7,9 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>zcode-receivers-i2c-ll-stm32f</artifactId>
+    <artifactId>zcode-receivers-i2c-ll-stm32-2-1-1</artifactId>
     <packaging>nar</packaging>
-    <name>Zcode ll I2C for STM32F</name>
+    <name>Zcode ll I2C 2 v1.1 for STM32</name>
     <dependencies>
         <dependency>
             <groupId>org.zcode</groupId>

diff --git a/...-stm32g/lowlevel/specific/I2cInternal.hpp → ...2-2-1-1/lowlevel/specific/I2cInternal.hpp b/...-stm32g/lowlevel/specific/I2cInternal.hpp → ...2-2-1-1/lowlevel/specific/I2cInternal.hpp
@@ -13,8 +13,8 @@
 #include <llIncludes.hpp>
 #include <pins-ll/lowlevel/Gpio.hpp>
 #include <pins-ll/lowlevel/GpioManager.hpp>
-#include "../../../../../../../../clock/src/main/c++/clock-ll/SystemMilliClock.hpp"
-#include "../../../../../../../../clock-ll/src/main/c++/clock-ll/ClockManager.hpp"
+#include <clock-ll/SystemMilliClock.hpp>
+#include <clock-ll/ClockManager.hpp>
 #include "I2cRegisters.hpp"
 
 struct I2cState {

diff --git a/...tm32g/lowlevel/specific/I2cManagercpp.hpp → ...2-1-1/lowlevel/specific/I2cManagercpp.hpp b/...tm32g/lowlevel/specific/I2cManagercpp.hpp → ...2-1-1/lowlevel/specific/I2cManagercpp.hpp
diff --git a/...stm32f/lowlevel/specific/I2cRegisters.hpp → ...-2-1-1/lowlevel/specific/I2cRegisters.hpp b/...stm32f/lowlevel/specific/I2cRegisters.hpp → ...-2-1-1/lowlevel/specific/I2cRegisters.hpp
diff --git a/...2c-ll-stm32g/lowlevel/specific/I2ccpp.hpp → ...-stm32-2-1-1/lowlevel/specific/I2ccpp.hpp b/...2c-ll-stm32g/lowlevel/specific/I2ccpp.hpp → ...-stm32-2-1-1/lowlevel/specific/I2ccpp.hpp