Merge branch 'Pi4J:develop' into PWM_provider_cleanup

Pi4J · Apr 17, 2024 · e482673 · e482673
2 parents 2a8b7ae + 2da171d
commit e482673
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 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
@@ -169,7 +169,7 @@ public enum BoardModel {
     ZERO_PCB_1_2("Raspberry Pi Zero PCB V1.2", SINGLE_BOARD_COMPUTER,
             Arrays.asList("900092", "920092"),
             PiModel.ZERO,
-            HeaderVersion.TYPE_2,
+            HeaderVersion.TYPE_3,
             LocalDate.of(2015, 11, 1),
             Soc.BCM2835,
             Cpu.ARM1176JZF_S, 1,

diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/HeaderVersion.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/HeaderVersion.java
@@ -9,7 +9,7 @@ public enum HeaderVersion {
     PICO("Pico", "Used on the Pico microcontroller", new ArrayList<>()),
     TYPE_1("Type 1", "Used on original Model B", Collections.singletonList(HeaderPins.HEADER_26_TYPE_1)),
     TYPE_2("Type 2", "Used on Model A and Model B (revision 2)", Arrays.asList(HeaderPins.HEADER_26_TYPE_2, HeaderPins.HEADER_8)),
-    TYPE_3("Type 3", "Used on Model A+, B+, Pi Zero, Pi Zero W, Pi2B, Pi3B, Pi4B", Collections.singletonList(HeaderPins.HEADER_40)),
+    TYPE_3("Type 3", "Used on Model A+, B+, Pi Zero, Pi Zero W, Pi2B, Pi3B, Pi4B, Pi5B", Collections.singletonList(HeaderPins.HEADER_40)),
     COMPUTE("Compute Module", "54 GPIO", Arrays.asList(HeaderPins.COMPUTE_J5, HeaderPins.COMPUTE_J6)),
     UNKNOWN("Unknown", "", new ArrayList<>());
 

diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/PinType.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/definition/PinType.java
@@ -7,7 +7,7 @@ public enum PinType {
     POWER("Power", 0x990000),
     GROUND("Ground", 0x000000),
     DIGITAL("Digital", 0x009900),
-    DIGITAL_AND_PWM("Digital and PWM", 0xff7ff00),
+    DIGITAL_AND_PWM("Digital and PWM", 0xff7f00),
     DIGITAL_NO_PULL_DOWN("Digital without pulldown", 0x800080);
 
     private final String label;