Update Packages_Patches

khoih-prog · Jan 9, 2022 · 87ed7ec · 87ed7ec
1 parent f71ff20
commit 87ed7ec
Show file tree

Hide file tree

Showing 15 changed files with 2,121 additions and 74 deletions.
diff --git a/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B112_ublox/variant.cpp b/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B112_ublox/variant.cpp
@@ -17,46 +17,43 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-// Thanks to great work of [Miguel Alexandre Wisintainer](https://github.com/tcpipchip). 
-// See [u-blox nina b](https://github.com/khoih-prog/WiFiNINA_Generic/issues/1)
 
 #include "variant.h"
+
 #include "wiring_constants.h"
 #include "wiring_digital.h"
 #include "nrf.h"
 
-const uint32_t g_ADigitalPinMap[] = {
-  0, 
-  1, 
-  2, 
-  3, 
-  4, 
-  5, 
-  6, 
-  7, 
-  8, 
-  9, 
-  10,
-  11,
-  12,
-  13,
-  14,
-  15,
-  16, 
-  17, 
-  18, 
-  19, 
-  20, 
-  21, 
-  22, 
-  23, 
-  24, 
-  25, 
-  26,
-  27,
-  28,
-  29,
-  30,
-  31
-  };
+//https://www.u-blox.com/sites/default/files/NINA-B1_DataSheet_UBX-15019243.pdf
+//https://www.u-blox.com/sites/default/files/EVK-NINA-B1_UserGuide_%28UBX-15028120%29_C1-Public.pdf
 
+const uint32_t g_ADigitalPinMap[] = {
+   // D0 .. D13
+  5,   // D0  is P0.05 (UART RX)
+  6,   // D1  is P0.06 (UART TX) 
+  7,   // D2  is P0.07 
+  31,  // D3  is P0.31 
+  18,  // D4  is P0.18 (LED Blue)
+  99,  // D5  (NC)
+  9,   // D6  is P0.09 NFC1
+  10,  // D7  is P0.10 (Button) NFC2
+  99,  // D8  (NC)
+  8,   // D9  is P0.08
+  11,  // D10 is P0.11 CS
+  13,  // D11 is P0.13 MOSI
+  12,  // D12 is P0.12 MISO
+  14,  // D13 is P0.14 SCK
+  //I2C
+  2,  // D14 is P0.2 (SDA)
+  3,  // D15 is P0.3 (SCL)
+  // D16 .. D21 (aka A0 .. A5)
+  3,  // D16 is P0.03 (A0)
+  2,  // D17 is P0.02 (A1)
+  4,  // D18 is P0.04 (A2)
+  30, // D19 is P0.30 (A3) SW2
+  29, // D20 is P0.29 (A4)
+  28, // D21 is P0.28 (A5)
+  9,  // P0.09 NFC
+  10, // P0.10 NFC
+  16, // SW1 (LED Green)
+};
diff --git a/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B112_ublox/variant.h b/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B112_ublox/variant.h
@@ -16,6 +16,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+//https://www.u-blox.com/sites/default/files/NINA-B1_DataSheet_UBX-15019243.pdf
+//https://www.u-blox.com/sites/default/files/EVK-NINA-B1_UserGuide_%28UBX-15028120%29_C1-Public.pdf
+
 #ifndef _VARIANT_NINA_B112_UBLOX_
 #define _VARIANT_NINA_B112_UBLOX_
 
@@ -52,30 +55,29 @@ extern "C"
 #define LED_BUILTIN          PIN_LED
 
 //LEDs onboard
-#define LED1 (8)  // Red
-#define LED2 (16) // Green/SW1
-#define LED3 (18) // Blue
+#define LED1 (0)  // Red
+#define LED2 (24) // Green/SW1
+#define LED3 (4) // Blue
 
 #define LED_STATE_ON         1         // State when LED is litted
 
 //Switch
-
-#define SW1 (16)
-#define SW2 (30)
+#define SW1 (24)
+#define SW2 (19)
 
 // NFC
-#define PIN_NFC_1	(9)  // P0.9
-#define PIN_NFC_2	(10) // P0.10
+#define PIN_NFC_1	(6)  // P0.9
+#define PIN_NFC_2	(7)  // P0.10
 
 /*
  * Analog pins
  */
-#define PIN_A0               (3) // P0.03
-#define PIN_A1               (2) // P0.02
-#define PIN_A2               (4) // P0.04
-#define PIN_A3               (30) // P0.30
-#define PIN_A4               (29) // P0.29
-#define PIN_A5               (28) // P0.28
+#define PIN_A0               (16) // P0.03
+#define PIN_A1               (17) // P0.02
+#define PIN_A2               (18) // P0.04
+#define PIN_A3               (19) // P0.30
+#define PIN_A4               (20) // P0.29
+#define PIN_A5               (21) // P0.28
 
 static const uint8_t A0  = PIN_A0 ;
 static const uint8_t A1  = PIN_A1 ;
@@ -86,14 +88,14 @@ static const uint8_t A5  = PIN_A5 ;
 
 #define ADC_RESOLUTION    14
 
-#define PIN_D0               (5) // P0.05
-#define PIN_D1               (6) // P0.06
-#define PIN_D2               (7) // P0.07
-#define PIN_D3               (31) // P0.31
-#define PIN_D4               (18) // P0.18
-#define PIN_D6               (9) // P0.09
-#define PIN_D7               (10) // P0.10
-#define PIN_D9               (8) // P0.8
+#define PIN_D0               (0) // P0.05
+#define PIN_D1               (1) // P0.06
+#define PIN_D2               (2) // P0.07
+#define PIN_D3               (4) // P0.31
+#define PIN_D4               (5) // P0.18
+#define PIN_D6               (6) // P0.09
+#define PIN_D7               (7) // P0.10
+#define PIN_D9               (9) // P0.08
 #define PIN_D10              (11) // P0.11
 #define PIN_D11              (13) // P0.13
 #define PIN_D12              (12) // P0.12
@@ -125,13 +127,10 @@ static const uint8_t D15  = PIN_D15 ;
 /*
  * Serial interfaces
  */
-//#define PIN_SERIAL_RX       (8)  //used for original Adafruit Bootloader
-//#define PIN_SERIAL_TX       (6)  //used for original Adafruit Bootloader
-
-#define PIN_SERIAL_RX       (5) // P0.05
-#define PIN_SERIAL_TX       (6) // P0.06
-#define PIN_SERIAL_CTS      (7) // P0.07
-#define PIN_SERIAL_RTS      (31) // P0.31
+#define PIN_SERIAL_RX       (0) // P0.05
+#define PIN_SERIAL_TX       (1) // P0.06
+#define PIN_SERIAL_CTS      (2) // P0.07
+#define PIN_SERIAL_RTS      (3) // P0.31
 #define PIN_SERIAL_DTR      (28) // P0.28
 #define PIN_SERIAL_DSR      (29) // P0.29
 
@@ -141,10 +140,10 @@ static const uint8_t D15  = PIN_D15 ;
 #define SPI_INTERFACES_COUNT 1
 
 #define PIN_SPI_MISO         (12) // P0.12
-#define PIN_SPI_MOSI         (13) // P0.13
-#define PIN_SPI_SCK          (14) // P0.14
+#define PIN_SPI_MOSI         (11) // P0.13
+#define PIN_SPI_SCK          (13) // P0.14
 
-static const uint8_t SS   = 11 ;  // P0.11
+static const uint8_t SS   = 10 ;  // P0.11
 static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
@@ -154,8 +153,8 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
  */
 #define WIRE_INTERFACES_COUNT 1
 
-#define PIN_WIRE_SDA         (2) // P0.02
-#define PIN_WIRE_SCL         (3) // P0.03
+#define PIN_WIRE_SDA         (14) // P0.02
+#define PIN_WIRE_SCL         (15) // P0.03
 
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;

diff --git a/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B302_ublox/variant.cpp b/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B302_ublox/variant.cpp
@@ -28,8 +28,8 @@
 const uint32_t g_ADigitalPinMap[] =
 {
    // D0 .. D13
-  29,  // D0  is P0.29 (UART TX)
-  45,  // D1  is P1.13 (UART RX 
+  29,  // D0  is P0.29 (UART RX)
+  45,  // D1  is P1.13 (UART TX) 
   44,  // D2  is P1.12 (NFC2)
   31,  // D3  is P0.31 (LED1)
   13,  // D4  is P0.13 (LED2)

diff --git a/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B302_ublox/variant.h b/Packages_Patches/adafruit/hardware/nrf52/1.1.0/variants/NINA_B302_ublox/variant.h
@@ -101,8 +101,8 @@ static const uint8_t A5  = PIN_A5 ;
 /*
  * Serial interfaces
  */
-#define PIN_SERIAL1_RX       (1)
-#define PIN_SERIAL1_TX       (0)
+#define PIN_SERIAL1_RX       (0)
+#define PIN_SERIAL1_TX       (1)
 
 /*
  * SPI Interfaces