Added Pico 2

Pi4J · Aug 27, 2024 · 49c8839 · 49c8839
1 parent d38786b
commit 49c8839
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/BoardModel.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/BoardModel.java
@@ -222,7 +222,7 @@ public enum BoardModel {
             LocalDate.of(2021, 1, 1),
             Soc.RP2040,
             Cpu.CORTEX_MO_PLUS, 1,
-            Collections.singletonList(1000),
+            Collections.singletonList(133),
             Collections.singletonList(264 + 2048)),
     PICO_W("Raspberry Pi Pico W", MICROCONTROLLER,
             new ArrayList<>(),
@@ -231,9 +231,27 @@ public enum BoardModel {
             LocalDate.of(2022, 6, 1),
             Soc.RP2040,
             Cpu.CORTEX_MO_PLUS, 1,
-            Collections.singletonList(1000),
+            Collections.singletonList(133),
             Collections.singletonList(264 + 2048),
             Collections.singletonList("Same form factor as PICO but with Wi-Fi")),
+    PICO_2("Raspberry Pi Pico 2", MICROCONTROLLER,
+            new ArrayList<>(),
+            PiModel.PICO,
+            HeaderVersion.PICO,
+            LocalDate.of(2024, 8, 8),
+            Soc.RP2350,
+            Cpu.CORTEX_M33, 1,
+            Collections.singletonList(150),
+            Collections.singletonList(520 + 4096)),
+    PICO_2_W("Raspberry Pi Pico 2 W", MICROCONTROLLER,
+            new ArrayList<>(),
+            PiModel.PICO,
+            HeaderVersion.PICO,
+            LocalDate.of(2024, 8, 8),
+            Soc.RP2350,
+            Cpu.CORTEX_M33, 1,
+            Collections.singletonList(150),
+            Collections.singletonList(520 + 4096)),
     UNKNOWN("Unknown", BoardType.UNKNOWN,
             new ArrayList<>(),
             PiModel.UNKNOWN,

diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/Cpu.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/Cpu.java
@@ -7,6 +7,7 @@ public enum Cpu {
     CORTEX_A72("Cortex-A72"),
     CORTEX_A76("Cortex-A76"),
     CORTEX_MO_PLUS("Cortex-M0+"),
+    CORTEX_M33("Cortex-M33"),
     UNKNOWN("Unknown"),
     ;
 

diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/Soc.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/Soc.java
@@ -10,6 +10,7 @@ public enum Soc {
     BCM2837(InstructionSet.ARM_V8),
     BCM2837B0(InstructionSet.ARM_V8),
     RP2040(InstructionSet.ARM_V6_M),
+    RP2350(InstructionSet.ARM_V6_M),
     UNKNOWN(InstructionSet.UNKNOWN);
 
     private final InstructionSet instructionSet;

diff --git a/pi4j-core/test/java/com/pi4j/boardinfo/definition/BoardModelTest.java b/pi4j-core/test/java/com/pi4j/boardinfo/definition/BoardModelTest.java
@@ -26,4 +26,12 @@ void testGetBoardModelByBoardName() {
             () -> assertEquals(BoardModel.MODEL_4_B, BoardModel.getByBoardName("Raspberry Pi 4 Model B Rev 1.1"))
         );
     }
+
+    @Test
+    void testInstructionSetPico() {
+        assertAll(
+            () -> assertEquals(InstructionSet.ARM_V6_M, BoardModel.PICO.getSoc().getInstructionSet()),
+            () -> assertEquals(InstructionSet.ARM_V6_M, BoardModel.PICO_2.getSoc().getInstructionSet())
+        );
+    }
 }