Fix MKRNB name and module init

Author: facchinm

boards.txt

@@ -222,32 +222,32 @@ mkrgsm1400.bootloader.file=mkrgsm1400/samd21_sam_ba_arduino_mkrgsm1400.bin
 
 # Arduino MKR NB-IoT 1450
 # --------------------
-mkrgsm1400.name=Arduino MKR NB-IoT 1450
-mkrgsm1400.vid.0=0x2341
-mkrgsm1400.pid.0=0x8054
-mkrgsm1400.vid.1=0x2341
-mkrgsm1400.pid.1=0x0054
+mkrnb1500.name=Arduino MKR NB 1500
+mkrnb1500.vid.0=0x2341
+mkrnb1500.pid.0=0x8055
+mkrnb1500.vid.1=0x2341
+mkrnb1500.pid.1=0x0055
 
-mkrgsm1400.upload.tool=bossac
-mkrgsm1400.upload.protocol=sam-ba
-mkrgsm1400.upload.maximum_size=262144
-mkrgsm1400.upload.use_1200bps_touch=true
-mkrgsm1400.upload.wait_for_upload_port=true
-mkrgsm1400.upload.native_usb=true
-mkrgsm1400.build.mcu=cortex-m0plus
-mkrgsm1400.build.f_cpu=48000000L
-mkrgsm1400.build.usb_product="Arduino MKR NB-IoT 1450"
-mkrgsm1400.build.usb_manufacturer="Arduino LLC"
-mkrgsm1400.build.board=SAMD_MKRGSM1400
-mkrgsm1400.build.core=arduino
-mkrgsm1400.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags} -DUSE_BQ24195L_PMIC -DNO_HW_FLOW_CONTROL
-mkrgsm1400.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-mkrgsm1400.build.openocdscript=openocd_scripts/arduino_zero.cfg
-mkrgsm1400.build.variant=mkrgsm1400
-mkrgsm1400.build.vid=0x2341
-mkrgsm1400.build.pid=0x8054
-mkrgsm1400.bootloader.tool=openocd
-mkrgsm1400.bootloader.file=mkrgsm1400/samd21_sam_ba_arduino_mkrgsm1400.bin
+mkrnb1500.upload.tool=bossac
+mkrnb1500.upload.protocol=sam-ba
+mkrnb1500.upload.maximum_size=262144
+mkrnb1500.upload.use_1200bps_touch=true
+mkrnb1500.upload.wait_for_upload_port=true
+mkrnb1500.upload.native_usb=true
+mkrnb1500.build.mcu=cortex-m0plus
+mkrnb1500.build.f_cpu=48000000L
+mkrnb1500.build.usb_product="Arduino MKR NB 1500"
+mkrnb1500.build.usb_manufacturer="Arduino LLC"
+mkrnb1500.build.board=SAMD_MKRNBIOT1450
+mkrnb1500.build.core=arduino
+mkrnb1500.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags} -DUSE_BQ24195L_PMIC -DNO_HW_FLOW_CONTROL
+mkrnb1500.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+mkrnb1500.build.openocdscript=openocd_scripts/arduino_zero.cfg
+mkrnb1500.build.variant=mkrgsm1400
+mkrnb1500.build.vid=0x2341
+mkrnb1500.build.pid=0x8055
+mkrnb1500.bootloader.tool=openocd
+mkrnb1500.bootloader.file=mkrnbiot1500/samd21_sam_ba_arduino_mkrnbiot1500.bin
 
 # Arduino MKR WAN 1300
 # --------------------

variants/mkrgsm1400/variant.cpp

@@ -230,14 +230,14 @@ void initVariant() {
   pinMode(GSM_RESETN, OUTPUT);
   digitalWrite(GSM_RESETN, HIGH);
 
-  // set GSM DTR to LOW on start
-  pinMode(GSM_DTR, OUTPUT);
-  digitalWrite(GSM_DTR, LOW);
+  pinMode(PIN_SERIAL2_DTR, OUTPUT);
 
 #ifdef NO_HW_FLOW_CONTROL
-  // set GSM DTR to LOW on start
-  pinMode(PIN_SERIAL2_RTS, OUTPUT);
-  digitalWrite(PIN_SERIAL2_RTS, LOW);
+  // set PWR pin to HIGH on NB-IoT
+  digitalWrite(PIN_SERIAL2_DTR, HIGH);
+#else
+    // set GSM DTR to LOW on start
+  digitalWrite(PIN_SERIAL2_DTR, LOW);
 #endif
 }
 

variants/mkrgsm1400/variant.h

@@ -67,7 +67,12 @@
 #define GSM_RTS    (28u)
 #define GSM_CTS    (29u)
 #define GSM_RESETN (31u)
+
+#ifndef NO_HW_FLOW_CONTROL
 #define GSM_DTR    (35u)
+#else
+#define GSM_DTR    (-1)
+#endif
 
 // LEDs
 // ----