Clean up defines in p.io build

Author: earlephilhower

lib/rp2040/platform_def.txt

@@ -9,3 +9,7 @@
 -DPICO_RP2040_B0_SUPPORTED=1
 -DPICO_RP2040_B1_SUPPORTED=1
 -DPICO_RP2040_B2_SUPPORTED=1
+-DARM_MATH_CM0_FAMILY
+-DARM_MATH_CM0_PLUS
+-DTARGET_RP2040
+

lib/rp2350-riscv/platform_def.txt

@@ -6,3 +6,5 @@
 -DPICO_PLATFORM=rp2350-riscv
 -DPICO_RISCV=1
 -DPICO_RP2350=1
+
+-DTARGET_RP2350

lib/rp2350/platform_def.txt

@@ -4,3 +4,5 @@
 
 -DPICO_PLATFORM=rp2350-arm-s
 -DPICO_RP2350=1
+
+-DTARGET_RP2350

tools/platformio-build.py

@@ -107,43 +107,26 @@ def add_defines_from_platform_def(file):
         line = line.strip()
         if line.startswith("-D"):
             defn = line[2:].split('=')
-            env.Append( CPPDEFINES=[ (defn[0], defn[1]) ] )
+            if len(defn) == 2:
+                env.Append( CPPDEFINES=[ (defn[0], defn[1]) ] )
+            else:
+                env.Append( CPPDEFINES=[ defn[0] ] )
 
 add_defines_from_platform_def(os.path.join(FRAMEWORK_DIR, "lib", "platform_def.txt"))
 add_defines_from_platform_def(os.path.join(FRAMEWORK_DIR, "lib", chip, "platform_def.txt"))
+
 env.Append(
     CPPDEFINES=[
         ("ARDUINO", 10810),
         "ARDUINO_ARCH_RP2040",
         ("F_CPU", "$BOARD_F_CPU"),
         ("BOARD_NAME", '\\"%s\\"' % env.subst("$BOARD")),
+        # at this point, the main.py builder script hasn't updated upload.maximum_size yet,
+        # so it's the original value for the full flash.
+        ("PICO_FLASH_SIZE_BYTES", board.get("upload.maximum_size"))
     ]
 )
 
-if chip == "rp2040":
-    env.Append(
-        CPPDEFINES=[
-            "ARM_MATH_CM0_FAMILY",
-            "ARM_MATH_CM0_PLUS",
-            "TARGET_RP2040",
-            ("PICO_RP2040", "1"),
-            # at this point, the main.py builder script hasn't updated upload.maximum_size yet,
-            # so it's the original value for the full flash.
-            ("PICO_FLASH_SIZE_BYTES", board.get("upload.maximum_size"))
-        ]
-    )
-elif (chip == "rp2350") or (chip == "rp2350-riscv"):
-    env.Append(
-        CPPDEFINES=[
-            ("PICO_RP2350", "1"),
-            "TARGET_RP2350",
-            ("PICO_RP2350", "1"),
-            # at this point, the main.py builder script hasn't updated upload.maximum_size yet,
-            # so it's the original value for the full flash.
-            ("PICO_FLASH_SIZE_BYTES", board.get("upload.maximum_size"))
-        ]
-    )
-
 if chip == "rp2040":
     toolopts = ["-march=armv6-m", "-mcpu=cortex-m0plus", "-mthumb"]
 elif chip == "rp2350":