pyalamake 2.3.1__tar.gz → 2.3.2__tar.gz

{pyalamake-2.3.1/src/pyalamake.egg-info → pyalamake-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.3.1
+Version: 2.3.2
 Summary: python module to generate Makefiles for arduino, GTest, C/C++, etc.
 Author-email: "J. Arrizza" <cppgent0@gmail.com>
 Maintainer-email: "J. Arrizza" <cppgent0@gmail.com>

{pyalamake-2.3.1 → pyalamake-2.3.2}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
 
 # common values
 name = 'pyalamake'
-version = '2.3.1'
+version = '2.3.2'
 requires-python = '>=3.9'
 authors = [{ name = 'J. Arrizza', email = 'cppgent0@gmail.com' }]
 maintainers = [

{pyalamake-2.3.1 → pyalamake-2.3.2}/src/pyalamake/constants_version.py

@@ -6,4 +6,4 @@ from dataclasses import dataclass
 @dataclass
 class ConstantsVersion:
     ## current App version
-    version = '2.3.1'
+    version = '2.3.2'

{pyalamake-2.3.1 → pyalamake-2.3.2}/src/pyalamake/target_arduino.py

@@ -78,16 +78,99 @@ class TargetArduino(TargetBase):
     # @param lib  the library to add
     # @return None
     def add_library(self, lib):
-        if lib == 'Servo':
-            svc.log.line(f'adding arduino library: {lib}')
-            path = PathHandle(f'{self._shared.library_root}/Servo/src')
-            self._check_library_installed(path, lib)
-            self.add_sources(f'{path.fixed}/avr/Servo.cpp')  # pylint: disable=E1101
-            self.add_include_directories(path.fixed)  # pylint: disable=E1101
-            self.add_compile_options('-DARDUINO_ARCH_AVR')  # pylint: disable=E1101
-        else:
+        # TODO use these:
+        # libraries:  arduino-cli lib list "Adafruit Motor Shield V2 Library" --format json
+        # packages :  arduino-cli lib list "Wire" -b arduino:avr:uno --format json
+        # dependcies: arduino-cli lib deps "Adafruit Motor Shield V2 Library"
+
+        valid_libs = {
+            'Servo': self._add_lib_servo,
+            'AdafruitMotorShieldV2': self._add_lib_motorshield_v2,
+            'AdafruitBusIO': self._add_lib_busio,
+            # packages
+            'Wire': self._add_pkg_wire,
+            'SPI': self._add_pkg_spi,
+        }
+        if lib not in valid_libs:
             svc.abort(f'{self.target} target_arduino: unknown arduino library: {lib}')
 
+        svc.log.line(f'adding arduino library: {lib}')
+        valid_libs[lib](lib)
+
+        self.add_compile_options('-DARDUINO_ARCH_AVR')  # pylint: disable=E1101
+
+    # --------------------
+    ## add Servo files
+    # @param lib  the library to add
+    # @return None
+    def _add_lib_servo(self, lib):
+        path = PathHandle(f'{self._shared.library_root}/Servo/src')
+        self._check_library_installed(path, lib)
+        self.add_sources(f'{path.fixed}/avr/Servo.cpp')  # pylint: disable=E1101
+        self.add_include_directories(path.fixed)  # pylint: disable=E1101
+
+    # --------------------
+    ## add Adafruit Motor Shield V2 files
+    # @param lib  the library to add
+    # @return None
+    def _add_lib_motorshield_v2(self, lib):
+        path = PathHandle(f'{self._shared.library_root}/Adafruit_Motor_Shield_V2_Library')
+        self._check_library_installed(path, lib)
+        self.add_sources(
+            [
+                f'{path.fixed}/Adafruit_MotorShield.cpp',
+                f'{path.fixed}/utility/Adafruit_MS_PWMServoDriver.cpp',
+            ]
+        )  # pylint: disable=E1101
+        self.add_include_directories(
+            [
+                path.fixed,
+                f'{path.fixed}/utility',
+            ]
+        )  # pylint: disable=E1101
+
+    # --------------------
+    ## add Adafruit Bus IO files
+    # @param lib  the library to add
+    # @return None
+    def _add_lib_busio(self, lib):
+        path = PathHandle(f'{self._shared.library_root}/Adafruit_BusIO')
+        self._check_library_installed(path, lib)
+        self.add_sources(
+            [
+                f'{path.fixed}/Adafruit_BusIO_Register.cpp',
+                f'{path.fixed}/Adafruit_GenericDevice.cpp',
+                f'{path.fixed}/Adafruit_I2CDevice.cpp',
+                f'{path.fixed}/Adafruit_SPIDevice.cpp',
+            ]
+        )  # pylint: disable=E1101
+        self.add_include_directories(path.fixed)  # pylint: disable=E1101
+
+    # --------------------
+    ## add Wire package files
+    # @param _lib  unused
+    # @return None
+    def _add_pkg_wire(self, _lib):
+        path = PathHandle(f'{svc.osal.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/libraries/Wire/src')
+        # built-in package, no installation
+        self.add_sources(
+            [
+                f'{path.fixed}/Wire.cpp',
+                f'{path.fixed}/utility/twi.c',
+            ]
+        )
+        self.add_include_directories([path.fixed, f'{path.fixed}/utility'])  # pylint: disable=E1101
+
+    # --------------------
+    ## add SPI package files
+    # @param _lib  unused
+    # @return None
+    def _add_pkg_spi(self, _lib):
+        path = PathHandle(f'{svc.osal.arduino_root_dir()}/packages/arduino/hardware/avr/1.8.7/libraries/SPI/src')
+        # built-in package, no installation
+        self.add_sources(f'{path.fixed}/SPI.cpp')
+        self.add_include_directories(path.fixed)  # pylint: disable=E1101
+
     # --------------------
     ## check if an arduino library is installed
     #

{pyalamake-2.3.1 → pyalamake-2.3.2/src/pyalamake.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyalamake
-Version: 2.3.1
+Version: 2.3.2
 Summary: python module to generate Makefiles for arduino, GTest, C/C++, etc.
 Author-email: "J. Arrizza" <cppgent0@gmail.com>
 Maintainer-email: "J. Arrizza" <cppgent0@gmail.com>