tidies up, reverts a0,a1 names

calliope-edu · Jan 10, 2024 · 9da8046 · 9da8046
1 parent 79033f9
commit 9da8046
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/model/MicroBitIO.cpp b/model/MicroBitIO.cpp
@@ -60,19 +60,19 @@ 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] change to A1RX (Grove right)
-    A1TX(ID_PIN_P17, P1_02, PIN_CAPABILITY_AD), //[Calliope] change to A1TX (Grove right), equals uBit P16
+    P16(ID_PIN_P16, P0_29, PIN_CAPABILITY_AD), //[Calliope] add (Grove right)
+    P17(ID_PIN_P17, P1_02, PIN_CAPABILITY_AD), //[Calliope] change to P17(Grove right), equals uBit P16
     P18(ID_PIN_P18, P0_31, PIN_CAPABILITY_AD), //[Calliope] change, equals uBit P3
-    A0SCL(ID_PIN_P19, P0_26, PIN_CAPABILITY_AD), //[Calliope] change, equals uBit P19
-    A0SDA(ID_PIN_P20, P1_00, PIN_CAPABILITY_AD), //[Calliope] change, equals uBit P20
+    P19(ID_PIN_P19, P0_26, PIN_CAPABILITY_AD),
+    P20(ID_PIN_P20, P1_00, 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
+    RGB(ID_PIN_RGB, P0_07, PIN_CAPABILITY_AD),//[Calliope] RGBLED       P0_07
+    M_A_IN1(ID_PIN_M_A_IN1, P1_01, PIN_CAPABILITY_AD),//[Calliope] Motor A IN1  P1_01
+    M_A_IN2(ID_PIN_M_A_IN2, P0_27, PIN_CAPABILITY_AD),//[Calliope] Motor A IN2  P0_27
+    M_B_IN1(ID_PIN_M_B_IN1, P1_07, PIN_CAPABILITY_AD),//[Calliope] Motor B IN1  P1_07
+    M_B_IN2(ID_PIN_M_B_IN2, P1_09, PIN_CAPABILITY_AD),//[Calliope] Motor B IN2  P1_09
+    M_MODE(ID_PIN_M_MODE, P1_06, PIN_CAPABILITY_AD),//[Calliope] Motor Mode   P1_06
 
     // Other exposed pins
     logo(ID_PIN_LOGO, P1_04, PIN_CAPABILITY_AD),

diff --git a/model/MicroBitIO.h b/model/MicroBitIO.h
@@ -410,15 +410,11 @@ namespace codal
             NRF52Pin          P13;          // P0_17
             NRF52Pin          P14;          // P0_01
             NRF52Pin          P15;          // P0_13
-            ///NRF52Pin          P16;          // P1_02 //[Calliope] connect Grove Analog PIN (P0_29) : DELETE COMMENT
-            NRF52Pin          A1RX;
-            ///NRF52Pin          P17;          // //[Calliope] P1_02
-            NRF52Pin          A1TX;
-            NRF52Pin          P18;          // P0_31
-            ///NRF52Pin          P19;          // P0_26
-            NRF52Pin          A0SCL;
-            ///NRF52Pin          P20;          // P1_00 //[Calliope] Place holder for micro:bit pin P3 (P0_31) : DELETE COMMENT
-            NRF52Pin          A0SDA;
+            NRF52Pin          P16;          // [Calliope] P0_29
+            NRF52Pin          P17;          // [Calliope] P1_02
+            NRF52Pin          P18;          // [Calliope] P0_31
+            NRF52Pin          P19;          // P0_26
+            NRF52Pin          P20;          // P1_00
 
 
             // Other exposed pins