clean up

platformio · Aug 28, 2023 · 090389e · 090389e
1 parent 226a81b
commit 090389e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/boards/clearcore.json b/boards/clearcore.json
@@ -1,13 +1,10 @@
 {
     "build": {
         "arduino": {
-            "ldscript": "flash_with_bootloader.ld",
-            "_ldscript_comment": "looks for {ldscript} in the core directory under variants/{variant}/linker_scripts/gcc/{ldscript}"
+            "ldscript": "flash_with_bootloader.ld"
         },
         "core": "clearcore",
-        "_core_comment": "looks for .platformio/packages/framework-arduino-samd-{core}",
         "cpu": "cortex-m4",
-        "_cpu_comment": "sets arm-none-eabi-g++ -mcpu target",
         "extra_flags": [
             "-D __SAME53N19A__",
             "-D __SAMD53__",
@@ -20,22 +17,16 @@
             "-D VARIANT_QSPI_BAUD_DEFAULT=50000000"
         ],
         "f_cpu": "120000000L",
-        "_f_cpu_comment": "indicates the clock frequency 120 MHz in this case. sets arm-none-eabi-g++ -DF_CPU {f_cpu}",
         "hwids": [
             [
                 "0x2890",
                 "0x0022"
             ]
         ],
-        "_hwi_comment": "matches devices with the given VID/PID shown using lsusb: Bus 003 Device 044: ID 2890:0022 Teknic, Inc ClearCore",
         "mcu": "same53n19a",
-        "_mcu_comment": "will prevent uploads if set incorrectly, not sure where it is explicitly used",
         "system": "samd",
-        "_system_comment": "looks for .platformio/platforms/atmelsam/builder/frameworks/arduino/arduino-{system}.py",
         "usb_product": "Teknic ClearCore",
-        "_usb_product_comment": "seems to have no effect",
-        "variant": "clearcore",
-        "_variant_comment": "looks for .platformio/packages/framework-arduino-samd-{core}/variants/{variant}"
+        "variant": "clearcore"
     },
     "debug": {
         "jlink_device": "ATSAME53N19A",
@@ -46,7 +37,6 @@
     "frameworks": [
         "arduino"
     ],
-    "_frameworks_comment": "declares which framework the device supports. not sure where it is explicitly used",
     "name": "ClearCore",
     "upload": {
         "disable_flushing": true,

diff --git a/builder/frameworks/arduino/arduino-samd.py b/builder/frameworks/arduino/arduino-samd.py
@@ -178,29 +178,25 @@
         ]
     )
 elif VENDOR_CORE == "clearcore":
-    CLEARCORE_BASE_DIR = platform.get_package_dir("framework-arduino-samd-clearcore")
-    CLEARCORE_LIB_DIR = os.path.join(CLEARCORE_BASE_DIR, "Teknic")
-
-
     env.Prepend(
         CPPPATH=[
-            os.path.join(CLEARCORE_BASE_DIR, "variants", "clearcore", "ThirdParty", "SAME53", "CMSIS", "Device", "Include"),
+            os.path.join(FRAMEWORK_DIR, "variants", "clearcore", "ThirdParty", "SAME53", "CMSIS", "Device", "Include"),
         ]
     )
 
     env.Append(
         CPPPATH=[
-            os.path.join(CLEARCORE_BASE_DIR, "cores", "arduino", "api"),
-            os.path.join(CLEARCORE_BASE_DIR, "cores", "arduino"),
-            os.path.join(CLEARCORE_BASE_DIR, "variants", "clearcore"),
-            os.path.join(CLEARCORE_LIB_DIR, "LwIP", "LwIP", "port", "include"),
-            os.path.join(CLEARCORE_LIB_DIR, "LwIP", "LwIP", "src", "include"),
-            os.path.join(CLEARCORE_LIB_DIR, "libClearCore", "inc")
+            os.path.join(FRAMEWORK_DIR, "cores", "arduino", "api"),
+            os.path.join(FRAMEWORK_DIR, "cores", "arduino"),
+            os.path.join(FRAMEWORK_DIR, "variants", "clearcore"),
+            os.path.join(FRAMEWORK_DIR, "Teknic", "LwIP", "LwIP", "port", "include"),
+            os.path.join(FRAMEWORK_DIR, "Teknic", "LwIP", "LwIP", "src", "include"),
+            os.path.join(FRAMEWORK_DIR, "Teknic", "libClearCore", "inc")
         ],
 
         LIBPATH=[
-            os.path.join(CLEARCORE_LIB_DIR, "libClearCore", "Release"),
-            os.path.join(CLEARCORE_LIB_DIR, "LwIP", "Release")
+            os.path.join(FRAMEWORK_DIR, "Teknic", "libClearCore", "Release"),
+            os.path.join(FRAMEWORK_DIR, "Teknic", "LwIP", "Release")
         ],
 
         LIBS=[