From 3dc8c3526a86d66e15e1138cd0b8a43aabcd88a8 Mon Sep 17 00:00:00 2001 From: greyes Date: Sun, 28 Dec 2025 18:33:44 +0100 Subject: [PATCH 1/6] Separated HALTarget into a common and a V1 HALs --- .../library.json | 2 +- .../src/Battery.cpp | 0 .../src/Battery.h | 0 .../src/FileHandler.cpp | 0 .../src/FileHandler.h | 0 lib/{HALTarget => HALTargetCommon}/src/Io.hpp | 0 .../src/LedBlue.cpp | 0 .../src/LedBlue.h | 0 .../src/LedGreen.cpp | 0 .../src/LedGreen.h | 0 .../src/LedRed.cpp | 0 .../src/LedRed.h | 0 .../src/MqttClient.cpp | 0 .../src/MqttClient.h | 0 .../src/Network.cpp | 0 .../src/Network.h | 0 .../src/Robot.cpp | 0 .../src/Robot.h | 0 lib/HALTargetV1/library.json | 20 +++++++++++++++++++ lib/{HALTarget => HALTargetV1}/src/Board.cpp | 0 lib/{HALTarget => HALTargetV1}/src/Board.h | 0 lib/{HALTarget => HALTargetV1}/src/Button.cpp | 0 lib/{HALTarget => HALTargetV1}/src/Button.h | 0 .../src/ButtonDrv.cpp | 0 .../src/ButtonDrv.h | 0 lib/{HALTarget => HALTargetV1}/src/GPIO.cpp | 0 lib/{HALTarget => HALTargetV1}/src/GPIO.h | 0 .../src/USBHost.cpp | 0 lib/{HALTarget => HALTargetV1}/src/USBHost.h | 1 + platformio.ini | 6 ++++-- 30 files changed, 26 insertions(+), 3 deletions(-) rename lib/{HALTarget => HALTargetCommon}/library.json (91%) rename lib/{HALTarget => HALTargetCommon}/src/Battery.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/Battery.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/FileHandler.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/FileHandler.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/Io.hpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/LedBlue.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/LedBlue.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/LedGreen.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/LedGreen.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/LedRed.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/LedRed.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/MqttClient.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/MqttClient.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/Network.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/Network.h (100%) rename lib/{HALTarget => HALTargetCommon}/src/Robot.cpp (100%) rename lib/{HALTarget => HALTargetCommon}/src/Robot.h (100%) create mode 100644 lib/HALTargetV1/library.json rename lib/{HALTarget => HALTargetV1}/src/Board.cpp (100%) rename lib/{HALTarget => HALTargetV1}/src/Board.h (100%) rename lib/{HALTarget => HALTargetV1}/src/Button.cpp (100%) rename lib/{HALTarget => HALTargetV1}/src/Button.h (100%) rename lib/{HALTarget => HALTargetV1}/src/ButtonDrv.cpp (100%) rename lib/{HALTarget => HALTargetV1}/src/ButtonDrv.h (100%) rename lib/{HALTarget => HALTargetV1}/src/GPIO.cpp (100%) rename lib/{HALTarget => HALTargetV1}/src/GPIO.h (100%) rename lib/{HALTarget => HALTargetV1}/src/USBHost.cpp (100%) rename lib/{HALTarget => HALTargetV1}/src/USBHost.h (99%) diff --git a/lib/HALTarget/library.json b/lib/HALTargetCommon/library.json similarity index 91% rename from lib/HALTarget/library.json rename to lib/HALTargetCommon/library.json index 5869713b..879b45bb 100644 --- a/lib/HALTarget/library.json +++ b/lib/HALTargetCommon/library.json @@ -1,5 +1,5 @@ { - "name": "HALTarget", + "name": "HALTargetCommon", "version": "0.1.0", "description": "...", "authors": [{ diff --git a/lib/HALTarget/src/Battery.cpp b/lib/HALTargetCommon/src/Battery.cpp similarity index 100% rename from lib/HALTarget/src/Battery.cpp rename to lib/HALTargetCommon/src/Battery.cpp diff --git a/lib/HALTarget/src/Battery.h b/lib/HALTargetCommon/src/Battery.h similarity index 100% rename from lib/HALTarget/src/Battery.h rename to lib/HALTargetCommon/src/Battery.h diff --git a/lib/HALTarget/src/FileHandler.cpp b/lib/HALTargetCommon/src/FileHandler.cpp similarity index 100% rename from lib/HALTarget/src/FileHandler.cpp rename to lib/HALTargetCommon/src/FileHandler.cpp diff --git a/lib/HALTarget/src/FileHandler.h b/lib/HALTargetCommon/src/FileHandler.h similarity index 100% rename from lib/HALTarget/src/FileHandler.h rename to lib/HALTargetCommon/src/FileHandler.h diff --git a/lib/HALTarget/src/Io.hpp b/lib/HALTargetCommon/src/Io.hpp similarity index 100% rename from lib/HALTarget/src/Io.hpp rename to lib/HALTargetCommon/src/Io.hpp diff --git a/lib/HALTarget/src/LedBlue.cpp b/lib/HALTargetCommon/src/LedBlue.cpp similarity index 100% rename from lib/HALTarget/src/LedBlue.cpp rename to lib/HALTargetCommon/src/LedBlue.cpp diff --git a/lib/HALTarget/src/LedBlue.h b/lib/HALTargetCommon/src/LedBlue.h similarity index 100% rename from lib/HALTarget/src/LedBlue.h rename to lib/HALTargetCommon/src/LedBlue.h diff --git a/lib/HALTarget/src/LedGreen.cpp b/lib/HALTargetCommon/src/LedGreen.cpp similarity index 100% rename from lib/HALTarget/src/LedGreen.cpp rename to lib/HALTargetCommon/src/LedGreen.cpp diff --git a/lib/HALTarget/src/LedGreen.h b/lib/HALTargetCommon/src/LedGreen.h similarity index 100% rename from lib/HALTarget/src/LedGreen.h rename to lib/HALTargetCommon/src/LedGreen.h diff --git a/lib/HALTarget/src/LedRed.cpp b/lib/HALTargetCommon/src/LedRed.cpp similarity index 100% rename from lib/HALTarget/src/LedRed.cpp rename to lib/HALTargetCommon/src/LedRed.cpp diff --git a/lib/HALTarget/src/LedRed.h b/lib/HALTargetCommon/src/LedRed.h similarity index 100% rename from lib/HALTarget/src/LedRed.h rename to lib/HALTargetCommon/src/LedRed.h diff --git a/lib/HALTarget/src/MqttClient.cpp b/lib/HALTargetCommon/src/MqttClient.cpp similarity index 100% rename from lib/HALTarget/src/MqttClient.cpp rename to lib/HALTargetCommon/src/MqttClient.cpp diff --git a/lib/HALTarget/src/MqttClient.h b/lib/HALTargetCommon/src/MqttClient.h similarity index 100% rename from lib/HALTarget/src/MqttClient.h rename to lib/HALTargetCommon/src/MqttClient.h diff --git a/lib/HALTarget/src/Network.cpp b/lib/HALTargetCommon/src/Network.cpp similarity index 100% rename from lib/HALTarget/src/Network.cpp rename to lib/HALTargetCommon/src/Network.cpp diff --git a/lib/HALTarget/src/Network.h b/lib/HALTargetCommon/src/Network.h similarity index 100% rename from lib/HALTarget/src/Network.h rename to lib/HALTargetCommon/src/Network.h diff --git a/lib/HALTarget/src/Robot.cpp b/lib/HALTargetCommon/src/Robot.cpp similarity index 100% rename from lib/HALTarget/src/Robot.cpp rename to lib/HALTargetCommon/src/Robot.cpp diff --git a/lib/HALTarget/src/Robot.h b/lib/HALTargetCommon/src/Robot.h similarity index 100% rename from lib/HALTarget/src/Robot.h rename to lib/HALTargetCommon/src/Robot.h diff --git a/lib/HALTargetV1/library.json b/lib/HALTargetV1/library.json new file mode 100644 index 00000000..905f5abf --- /dev/null +++ b/lib/HALTargetV1/library.json @@ -0,0 +1,20 @@ +{ + "name": "HALTargetV1", + "version": "0.1.0", + "description": "...", + "authors": [{ + "name": "Andreas Merkle", + "email": "web@blue-andi.de", + "url": "https://github.com/BlueAndi", + "maintainer": true + }], + "license": "MIT", + "dependencies": [{ + "name": "Os" + }, + { + "name": "HALTargetCommon" + }], + "frameworks": "arduino", + "platforms": "*" +} \ No newline at end of file diff --git a/lib/HALTarget/src/Board.cpp b/lib/HALTargetV1/src/Board.cpp similarity index 100% rename from lib/HALTarget/src/Board.cpp rename to lib/HALTargetV1/src/Board.cpp diff --git a/lib/HALTarget/src/Board.h b/lib/HALTargetV1/src/Board.h similarity index 100% rename from lib/HALTarget/src/Board.h rename to lib/HALTargetV1/src/Board.h diff --git a/lib/HALTarget/src/Button.cpp b/lib/HALTargetV1/src/Button.cpp similarity index 100% rename from lib/HALTarget/src/Button.cpp rename to lib/HALTargetV1/src/Button.cpp diff --git a/lib/HALTarget/src/Button.h b/lib/HALTargetV1/src/Button.h similarity index 100% rename from lib/HALTarget/src/Button.h rename to lib/HALTargetV1/src/Button.h diff --git a/lib/HALTarget/src/ButtonDrv.cpp b/lib/HALTargetV1/src/ButtonDrv.cpp similarity index 100% rename from lib/HALTarget/src/ButtonDrv.cpp rename to lib/HALTargetV1/src/ButtonDrv.cpp diff --git a/lib/HALTarget/src/ButtonDrv.h b/lib/HALTargetV1/src/ButtonDrv.h similarity index 100% rename from lib/HALTarget/src/ButtonDrv.h rename to lib/HALTargetV1/src/ButtonDrv.h diff --git a/lib/HALTarget/src/GPIO.cpp b/lib/HALTargetV1/src/GPIO.cpp similarity index 100% rename from lib/HALTarget/src/GPIO.cpp rename to lib/HALTargetV1/src/GPIO.cpp diff --git a/lib/HALTarget/src/GPIO.h b/lib/HALTargetV1/src/GPIO.h similarity index 100% rename from lib/HALTarget/src/GPIO.h rename to lib/HALTargetV1/src/GPIO.h diff --git a/lib/HALTarget/src/USBHost.cpp b/lib/HALTargetV1/src/USBHost.cpp similarity index 100% rename from lib/HALTarget/src/USBHost.cpp rename to lib/HALTargetV1/src/USBHost.cpp diff --git a/lib/HALTarget/src/USBHost.h b/lib/HALTargetV1/src/USBHost.h similarity index 99% rename from lib/HALTarget/src/USBHost.h rename to lib/HALTargetV1/src/USBHost.h index 8e852c51..7c2945b5 100644 --- a/lib/HALTarget/src/USBHost.h +++ b/lib/HALTargetV1/src/USBHost.h @@ -44,6 +44,7 @@ * Includes *****************************************************************************/ #include +#include #include /****************************************************************************** diff --git a/platformio.ini b/platformio.ini index 2fd34f84..b1256f99 100644 --- a/platformio.ini +++ b/platformio.ini @@ -68,7 +68,8 @@ build_flags = -D CONFIG_FILE_PATH="\"/config/config.json\"" lib_deps = HALInterfaces - HALTarget + HALTargetV1 + HALTargetCommon https://github.com/NewTec-GmbH/USB_Host_Shield_2.0.git#3_Endpoints_ACM knolleary/PubSubClient @ ~2.8 SPI @@ -114,7 +115,8 @@ lib_deps = Webots MainNative lib_ignore = - HALTarget + HALTargetCommon + HALTargetV1 HALTest MainTestNative extra_scripts = From 191578aad2b4dcd44f3562df3e4bef77c80cacdf Mon Sep 17 00:00:00 2001 From: greyes Date: Sun, 28 Dec 2025 18:44:31 +0100 Subject: [PATCH 2/6] Removed unnecessary include --- lib/HALTargetV1/src/USBHost.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/HALTargetV1/src/USBHost.h b/lib/HALTargetV1/src/USBHost.h index 7c2945b5..8e852c51 100644 --- a/lib/HALTargetV1/src/USBHost.h +++ b/lib/HALTargetV1/src/USBHost.h @@ -44,7 +44,6 @@ * Includes *****************************************************************************/ #include -#include #include /****************************************************************************** From 4dc72b52f6f1892079770ee96a874c197ee99e1c Mon Sep 17 00:00:00 2001 From: greyes Date: Sun, 28 Dec 2025 18:48:50 +0100 Subject: [PATCH 3/6] Fixed Doxygen search paths --- doc/doxygen/ConvoyFollowerTargetDoxyfile | 3 ++- doc/doxygen/ConvoyLeaderTargetDoxyfile | 3 ++- doc/doxygen/LineFollowerTargetDoxyfile | 3 ++- doc/doxygen/RemoteControlTargetDoxyfile | 3 ++- doc/doxygen/SensorFusionTargetDoxyfile | 3 ++- doc/doxygen/TurtleTargetDoxyfile | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/doxygen/ConvoyFollowerTargetDoxyfile b/doc/doxygen/ConvoyFollowerTargetDoxyfile index 70df7f6a..6eded197 100644 --- a/doc/doxygen/ConvoyFollowerTargetDoxyfile +++ b/doc/doxygen/ConvoyFollowerTargetDoxyfile @@ -993,7 +993,8 @@ WARN_LOGFILE = doxygen_warnings.txt INPUT = mainpage.dox \ ../../src \ - ../../lib/HALTarget \ + ../../lib/HALTargetCommon \ + ../../lib/HALTargetV1 \ ../../lib/HALInterfaces \ ../../lib/APPConvoyFollower \ ../../lib/Service \ diff --git a/doc/doxygen/ConvoyLeaderTargetDoxyfile b/doc/doxygen/ConvoyLeaderTargetDoxyfile index 4d899588..6fdb2b99 100644 --- a/doc/doxygen/ConvoyLeaderTargetDoxyfile +++ b/doc/doxygen/ConvoyLeaderTargetDoxyfile @@ -995,7 +995,8 @@ INPUT = mainpage.dox \ ../../src \ ../../lib/APPConvoyLeader \ ../../lib/HALInterfaces \ - ../../lib/HALTarget \ + ../../lib/HALTargetCommon \ + ../../lib/HALTargetV1 \ ../../lib/PlatoonService \ ../../lib/Service \ ../../lib/Utilities diff --git a/doc/doxygen/LineFollowerTargetDoxyfile b/doc/doxygen/LineFollowerTargetDoxyfile index cd9fc612..daed075d 100644 --- a/doc/doxygen/LineFollowerTargetDoxyfile +++ b/doc/doxygen/LineFollowerTargetDoxyfile @@ -993,7 +993,8 @@ WARN_LOGFILE = doxygen_warnings.txt INPUT = mainpage.dox \ ../../src \ - ../../lib/HALTarget \ + ../../lib/HALTargetCommon \ + ../../lib/HALTargetV1 \ ../../lib/HALInterfaces \ ../../lib/APPLineFollower \ ../../lib/Service \ diff --git a/doc/doxygen/RemoteControlTargetDoxyfile b/doc/doxygen/RemoteControlTargetDoxyfile index 43e9e754..2b0e138d 100644 --- a/doc/doxygen/RemoteControlTargetDoxyfile +++ b/doc/doxygen/RemoteControlTargetDoxyfile @@ -993,7 +993,8 @@ WARN_LOGFILE = doxygen_warnings.txt INPUT = mainpage.dox \ ../../src \ - ../../lib/HALTarget \ + ../../lib/HALTargetCommon \ + ../../lib/HALTargetV1 \ ../../lib/HALInterfaces \ ../../lib/APPRemoteControl \ ../../lib/Service \ diff --git a/doc/doxygen/SensorFusionTargetDoxyfile b/doc/doxygen/SensorFusionTargetDoxyfile index 87623eb3..16c64921 100644 --- a/doc/doxygen/SensorFusionTargetDoxyfile +++ b/doc/doxygen/SensorFusionTargetDoxyfile @@ -993,7 +993,8 @@ WARN_LOGFILE = doxygen_warnings.txt INPUT = mainpage.dox \ ../../src \ - ../../lib/HALTarget \ + ../../lib/HALTargetCommon \ + ../../lib/HALTargetV1 \ ../../lib/HALInterfaces \ ../../lib/APPSensorFusion \ ../../lib/Service \ diff --git a/doc/doxygen/TurtleTargetDoxyfile b/doc/doxygen/TurtleTargetDoxyfile index 3584a515..59524b2e 100644 --- a/doc/doxygen/TurtleTargetDoxyfile +++ b/doc/doxygen/TurtleTargetDoxyfile @@ -995,7 +995,8 @@ INPUT = mainpage.dox \ ../../src \ ../../lib/APPTurtle \ ../../lib/HALInterfaces \ - ../../lib/HALTarget \ + ../../lib/HALTargetCommon \ + ../../lib/HALTargetV1 \ ../../lib/Service \ ../../lib/Utilities From 88f44562452226595c2c1a9d561ed0d213b5f4e2 Mon Sep 17 00:00:00 2001 From: greyes Date: Sun, 28 Dec 2025 19:00:00 +0100 Subject: [PATCH 4/6] Updated documentation --- .../uml/LogicalView/HALTarget.plantuml | 95 ++++++++++--------- doc/configuration/uml/configuration.plantuml | 4 +- 2 files changed, 54 insertions(+), 45 deletions(-) diff --git a/doc/architecture/uml/LogicalView/HALTarget.plantuml b/doc/architecture/uml/LogicalView/HALTarget.plantuml index 09536ce8..9485f4f2 100644 --- a/doc/architecture/uml/LogicalView/HALTarget.plantuml +++ b/doc/architecture/uml/LogicalView/HALTarget.plantuml @@ -2,8 +2,41 @@ Title Target HAL Class Diagram -package "HALTarget" as hal { +package "Interfaces" as interfaces { + interface "IButton" as iButton { + + {abstract} isShortPressed() : bool + + {abstract} isLongPressed() : bool + + {abstract} waitForRelease() : void + } + + interface "IBattery" as iBattery { + + {abstract} getBatteryVoltage() : uint32_t + + {abstract} getChargeLevel() : uint8_t + } + + interface "IRobot" as iRobot { + + {abstract} init() : bool + + {abstract} process() : bool + + {abstract} getStream() : Stream + + {abstract} reset() : void + } + + interface "INetwork" as iNetwork { + + {abstract} init() : bool + + {abstract} process() : bool + + {abstract} getStream() : Stream + } + + interface "ILed" as iLed { + + {abstract} enable(enableIt : bool) : void + } + interface "IGps" as iGps { + + {abstract} getGpsData() : GpsData + } +} + +package "HALTargetV1" as halV1 { class Board << namespace >> { + getButton() : IButton& + getBattery() : IBattery& @@ -15,49 +48,16 @@ package "HALTarget" as hal { + getGps() : nullptr } - package "Interfaces" as interfaces { - interface "IButton" as iButton { - + {abstract} isShortPressed() : bool - + {abstract} isLongPressed() : bool - + {abstract} waitForRelease() : void - } - - interface "IBattery" as iBattery { - + {abstract} getBatteryVoltage() : uint32_t - + {abstract} getChargeLevel() : uint8_t - } - - interface "IRobot" as iRobot { - + {abstract} init() : bool - + {abstract} process() : bool - + {abstract} getStream() : Stream - + {abstract} reset() : void - } - - interface "INetwork" as iNetwork { - + {abstract} init() : bool - + {abstract} process() : bool - + {abstract} getStream() : Stream - } - - interface "ILed" as iLed { - + {abstract} enable(enableIt : bool) : void - } - - interface "IGps" as iGps { - + {abstract} getGpsData() : GpsData - } - } + class "USB-Host" as Robot +} - package "Target" as target { - class "Button" as Button - class "Battery" as Battery - class "USB-Host" as Robot - class "MQTT" as Network - class "LedRed" as LedRed - class "LedGreen" as LedGreen - class "LedBlue" as LedBlue - } +package "HALTargetCommon" as halCommon { + class "Button" as Button + class "Battery" as Battery + class "MQTT" as Network + class "LedRed" as LedRed + class "LedGreen" as LedGreen + class "LedBlue" as LedBlue iButton <|... Button : <> iBattery <|... Battery : <> @@ -66,7 +66,6 @@ package "HALTarget" as hal { iLed <|... LedRed : <> iLed <|... LedGreen : <> iLed <|... LedBlue : <> - } package "Libraries" as libs @@ -80,6 +79,14 @@ package "Libraries" as libs } } +Board *--> Button +Board *--> Battery +Board *--> Robot +Board *--> Network +Board *--> LedRed +Board *--> LedGreen +Board *--> LedBlue + Robot *--> RobotLib Network *--> NetworkLib diff --git a/doc/configuration/uml/configuration.plantuml b/doc/configuration/uml/configuration.plantuml index 0aa0a95f..9d8eed41 100644 --- a/doc/configuration/uml/configuration.plantuml +++ b/doc/configuration/uml/configuration.plantuml @@ -17,7 +17,8 @@ component "ConvoyFollower" <> as convoyFollower component "target:esp32" <> as targetEsp32 component "target:Sim" <> as targetSim -component "HALTarget" <> as halTarget +component "HALTargetCommon" <> as halTarget +component "HALTargetV1" <> as halTargetV1 component "HALSim" <> as halSim envConvoyLeader ..> appConvoyLeader @@ -36,6 +37,7 @@ appConvoyLeader ..> convoyLeader appConvoyFollower ..> convoyFollower targetEsp32 ..> halTarget +targetEsp32 ..> halTargetV1 targetSim ..> halSim @enduml \ No newline at end of file From ea0abd30aad5ee717b95649f0ed3fb9df3c78fc0 Mon Sep 17 00:00:00 2001 From: Gabryel Reyes Date: Mon, 29 Dec 2025 12:41:09 +0100 Subject: [PATCH 5/6] Renamed UsbHostDriver to prevent name collision under Windows --- lib/HALTargetCommon/src/Robot.h | 2 +- lib/HALTargetV1/src/{USBHost.cpp => USBHostDriver.cpp} | 2 +- lib/HALTargetV1/src/{USBHost.h => USBHostDriver.h} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename lib/HALTargetV1/src/{USBHost.cpp => USBHostDriver.cpp} (99%) rename lib/HALTargetV1/src/{USBHost.h => USBHostDriver.h} (98%) diff --git a/lib/HALTargetCommon/src/Robot.h b/lib/HALTargetCommon/src/Robot.h index f1a9e186..31d86516 100644 --- a/lib/HALTargetCommon/src/Robot.h +++ b/lib/HALTargetCommon/src/Robot.h @@ -44,7 +44,7 @@ * Includes *****************************************************************************/ #include "IRobot.h" -#include "USBHost.h" +#include "USBHostDriver.h" #include /****************************************************************************** diff --git a/lib/HALTargetV1/src/USBHost.cpp b/lib/HALTargetV1/src/USBHostDriver.cpp similarity index 99% rename from lib/HALTargetV1/src/USBHost.cpp rename to lib/HALTargetV1/src/USBHostDriver.cpp index cf54391f..42cfb034 100644 --- a/lib/HALTargetV1/src/USBHost.cpp +++ b/lib/HALTargetV1/src/USBHostDriver.cpp @@ -32,7 +32,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "USBHost.h" +#include "USBHostDriver.h" #include /****************************************************************************** diff --git a/lib/HALTargetV1/src/USBHost.h b/lib/HALTargetV1/src/USBHostDriver.h similarity index 98% rename from lib/HALTargetV1/src/USBHost.h rename to lib/HALTargetV1/src/USBHostDriver.h index 8e852c51..9d5bc4c5 100644 --- a/lib/HALTargetV1/src/USBHost.h +++ b/lib/HALTargetV1/src/USBHostDriver.h @@ -33,8 +33,8 @@ * @{ */ -#ifndef USBHOST_H -#define USBHOST_H +#ifndef USBHOSTDRIVER_H +#define USBHOSTDRIVER_H /****************************************************************************** * Compile Switches @@ -243,5 +243,5 @@ class USBHost : public Stream * Functions *****************************************************************************/ -#endif /* USBHOST_H */ +#endif /* USBHOSTDRIVER_H */ /** @} */ From f10775612cd6cd72a2eec3852b45bb4db9d9f3f8 Mon Sep 17 00:00:00 2001 From: greyes Date: Mon, 29 Dec 2025 21:17:38 +0100 Subject: [PATCH 6/6] Removed unnecessary library dependency --- lib/HALTargetV1/library.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/HALTargetV1/library.json b/lib/HALTargetV1/library.json index 905f5abf..d9dc5679 100644 --- a/lib/HALTargetV1/library.json +++ b/lib/HALTargetV1/library.json @@ -11,9 +11,6 @@ "license": "MIT", "dependencies": [{ "name": "Os" - }, - { - "name": "HALTargetCommon" }], "frameworks": "arduino", "platforms": "*"