change code position of calliope internal pins

calliope-edu · Jun 26, 2024 · 6deaf7e · 6deaf7e
1 parent 5e2cb5c
commit 6deaf7e
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/model/MicroBitIO.cpp b/model/MicroBitIO.cpp
@@ -60,20 +60,11 @@ MicroBitIO::MicroBitIO(NRF52ADC &a, TouchSensor &s) :
     P13(ID_PIN_P13, P0_17, PIN_CAPABILITY_AD),
     P14(ID_PIN_P14, P0_01, PIN_CAPABILITY_AD),
     P15(ID_PIN_P15, P0_13, PIN_CAPABILITY_AD),
-    A1RX(ID_PIN_P16, P0_29, PIN_CAPABILITY_AD), //[Calliope] connect Grove Analog PIN (P0_29)  : DELETE
-    A1TX(ID_PIN_P17, P1_02, PIN_CAPABILITY_AD), //[Calliope] P17
-    P18(ID_PIN_P18, P0_31, PIN_CAPABILITY_AD), //[Calliope] P18
-    A0SCL(ID_PIN_P19, P0_26, PIN_CAPABILITY_AD),
-    A0SDA(ID_PIN_P20, P1_00, PIN_CAPABILITY_AD), //[Calliope] Place holder for micro:bit pin P3 (P0_31) : DELETE
-
-    // Calliope mini3
-    RGB(ID_PIN_RGB, P0_07, PIN_CAPABILITY_AD),// RGBLED       P0_07
-    M_A_IN1(ID_PIN_M_A_IN1, P1_01, PIN_CAPABILITY_AD),// Motor A IN1  P1_01
-    M_A_IN2(ID_PIN_M_A_IN2, P0_27, PIN_CAPABILITY_AD),// Motor A IN2  P0_27
-    M_B_IN1(ID_PIN_M_B_IN1, P1_07, PIN_CAPABILITY_AD),// Motor B IN1  P1_07
-    M_B_IN2(ID_PIN_M_B_IN2, P1_09, PIN_CAPABILITY_AD),// Motor B IN2  P1_09
-    M_MODE(ID_PIN_M_MODE, P1_06, PIN_CAPABILITY_AD),// Motor Mode   P1_06
-
+    A1RX(ID_PIN_P16, P0_29, PIN_CAPABILITY_AD), //[Calliope] C16 (new)
+    A1TX(ID_PIN_P17, P1_02, PIN_CAPABILITY_AD), //[Calliope] C17 = P16
+    P18(ID_PIN_P18, P0_31, PIN_CAPABILITY_AD), //[Calliope] C18
+    A0SCL(ID_PIN_P19, P0_26, PIN_CAPABILITY_AD), //[Calliope] renamed
+    A0SDA(ID_PIN_P20, P1_00, PIN_CAPABILITY_AD), //[Calliope] renamed
 
     // Other exposed pins
     logo(ID_PIN_LOGO, P1_04, PIN_CAPABILITY_AD),
@@ -93,6 +84,14 @@ MicroBitIO::MicroBitIO(NRF52ADC &a, TouchSensor &s) :
     usbRx(ID_PIN_USBRX, MICROBIT_PIN_UART_RX, PIN_CAPABILITY_DIGITAL),
     irq1(ID_PIN_IRQ1, P0_25, PIN_CAPABILITY_AD),
 
+    // Calliope mini3
+    RGB(ID_PIN_RGB, P0_07, PIN_CAPABILITY_AD),// RGBLED       P0_07
+    M_A_IN1(ID_PIN_M_A_IN1, P1_01, PIN_CAPABILITY_AD),// Motor A IN1  P1_01
+    M_A_IN2(ID_PIN_M_A_IN2, P0_27, PIN_CAPABILITY_AD),// Motor A IN2  P0_27
+    M_B_IN1(ID_PIN_M_B_IN1, P1_07, PIN_CAPABILITY_AD),// Motor B IN1  P1_07
+    M_B_IN2(ID_PIN_M_B_IN2, P1_09, PIN_CAPABILITY_AD),// Motor B IN2  P1_09
+    M_MODE(ID_PIN_M_MODE, P1_06, PIN_CAPABILITY_AD),// Motor Mode   P1_06
+
     // Aliases
     col1(P4),
     col2(P7),