MKRWAN1310: start integration

Author: facchinm

boards.txt

@@ -284,6 +284,35 @@ mkrwan1300.build.pid=0x8053
 mkrwan1300.bootloader.tool=openocd
 mkrwan1300.bootloader.file=mkrwan1300/samd21_sam_ba_arduino_mkrwan1300.bin
 
+# Arduino MKR WAN 1310
+# --------------------
+mkrwan1310.name=Arduino MKR WAN 1310
+mkrwan1310.vid.0=0x2341
+mkrwan1310.pid.0=0x8059
+mkrwan1310.vid.1=0x2341
+mkrwan1310.pid.1=0x0059
+
+mkrwan1310.upload.tool=bossac
+mkrwan1310.upload.protocol=sam-ba
+mkrwan1310.upload.maximum_size=262144
+mkrwan1310.upload.use_1200bps_touch=true
+mkrwan1310.upload.wait_for_upload_port=true
+mkrwan1310.upload.native_usb=true
+mkrwan1310.build.mcu=cortex-m0plus
+mkrwan1310.build.f_cpu=48000000L
+mkrwan1310.build.usb_product="Arduino MKR WAN 1310"
+mkrwan1310.build.usb_manufacturer="Arduino LLC"
+mkrwan1310.build.board=SAMD_MKRWAN1310
+mkrwan1310.build.core=arduino
+mkrwan1310.build.extra_flags=-DUSE_ARDUINO_MKR_PIN_LAYOUT -D__SAMD21G18A__ {build.usb_flags} -DUSE_BQ24195L_PMIC
+mkrwan1310.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+mkrwan1310.build.openocdscript=openocd_scripts/arduino_zero.cfg
+mkrwan1310.build.variant=mkrwan1300
+mkrwan1310.build.vid=0x2341
+mkrwan1310.build.pid=0x8059
+mkrwan1310.bootloader.tool=openocd
+mkrwan1310.bootloader.file=mkrwan1300/samd21_sam_ba_arduino_mkrwan1310.bin
+
 # Arduino MKR GSM 1400
 # --------------------
 mkrgsm1400.name=Arduino MKR GSM 1400

bootloaders/zero/board_definitions.h

@@ -33,6 +33,8 @@
   #include "board_definitions_arduino_mkrgsm1400.h"
 #elif defined(BOARD_ID_arduino_mkrwan1300)
   #include "board_definitions_arduino_mkrwan1300.h"
+#elif defined(BOARD_ID_arduino_mkrwan1310)
+  #include "board_definitions_arduino_mkrwan1310.h"
 #elif defined(BOARD_ID_arduino_mkrwifi1010)
   #include "board_definitions_arduino_mkrwifi1010.h"
 #elif defined(BOARD_ID_arduino_mkrnb1500)

bootloaders/zero/board_definitions_arduino_mkrwan1310.h

@@ -0,0 +1,86 @@
+/*
+  Copyright (c) 2016 Arduino LLC.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _BOARD_DEFINITIONS_H_
+#define _BOARD_DEFINITIONS_H_
+
+/*
+ * USB device definitions
+ */
+#define STRING_PRODUCT "Arduino MKR WAN 1310"
+#define USB_VID_HIGH   0x23
+#define USB_VID_LOW    0x41
+#define USB_PID_HIGH   0x00
+#define USB_PID_LOW    0x59
+
+/*
+ * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
+ * quickly tapping two times on the reset button.
+ * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
+ * be touched from the loaded application.
+ */
+#define BOOT_DOUBLE_TAP_ADDRESS           (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
+
+/*
+ * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
+ * pin is tied LOW.
+ */
+//#define BOOT_LOAD_PIN                     PIN_PA21
+//#define BOOT_LOAD_PIN                     PIN_PA15
+
+#define BOOT_USART_MODULE                 SERCOM5
+#define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM5
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM5_CORE_Val
+#define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
+#define BOOT_USART_PAD3                   PINMUX_PB23D_SERCOM5_PAD3
+#define BOOT_USART_PAD2                   PINMUX_PB22D_SERCOM5_PAD2
+#define BOOT_USART_PAD1                   PINMUX_UNUSED
+#define BOOT_USART_PAD0                   PINMUX_UNUSED
+
+/* Master clock frequency */
+#define CPU_FREQUENCY                     (48000000ul)
+#define VARIANT_MCK                       CPU_FREQUENCY
+
+/* Frequency of the board main oscillator */
+#define VARIANT_MAINOSC                   (32768ul)
+
+/* Calibration values for DFLL48 pll */
+#define NVM_SW_CALIB_DFLL48M_COARSE_VAL   (58)
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (64)
+
+#define CONFIGURE_PMIC                    1
+#define PMIC_PIN_SCL                      12
+#define PMIC_PIN_SDA                      11
+#define PMIC_SERCOM                       SERCOM0                      
+
+/*
+ * LEDs definitions
+ */
+// PA20 (digital pin 6)
+#define BOARD_LED_PORT                    (0)
+#define BOARD_LED_PIN                     (20)
+
+// No RX/TX led
+//#define BOARD_LEDRX_PORT
+//#define BOARD_LEDRX_PIN
+
+//#define BOARD_LEDTX_PORT
+//#define BOARD_LEDTX_PIN
+
+#endif // _BOARD_DEFINITIONS_H_

bootloaders/zero/build_all_bootloaders.sh

@@ -22,6 +22,9 @@ mv -v samd21_sam_ba_arduino_mkrgsm1400.* ../mkrgsm1400/
 BOARD_ID=arduino_mkrwan1300 NAME=samd21_sam_ba_arduino_mkrwan1300 make clean all
 mv -v samd21_sam_ba_arduino_mkrwan1300.* ../mkrwan1300/
 
+BOARD_ID=arduino_mkrwan1310 NAME=samd21_sam_ba_arduino_mkrwan1310 make clean all
+mv -v samd21_sam_ba_arduino_mkrwan1310.* ../mkrwan1300/
+
 BOARD_ID=arduino_mkrwifi1010 NAME=samd21_sam_ba_arduino_mkrwifi1010 make clean all
 mv -v samd21_sam_ba_arduino_mkrwifi1010.* ../mkrwifi1010/
 

variants/mkrwan1300/variant.cpp

@@ -149,7 +149,7 @@ const PinDescription g_APinDescription[] = {
   { PORTA, 15, PIO_SERCOM_ALT,  (PIN_ATTR_NONE                               ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM4/PAD[3]
   { PORTA, 27, PIO_DIGITAL,     (PIN_ATTR_NONE                               ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
 
-  { PORTA, 28, PIO_DIGITAL,    (PIN_ATTR_NONE                                ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
+  { PORTA, 28, PIO_DIGITAL,    (PIN_ATTR_NONE                                ), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8    },
   { PORTB,  8, PIO_ANALOG,     (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG             ), ADC_Channel2,   NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
   { PORTB,  9, PIO_DIGITAL,    (PIN_ATTR_PWM|PIN_ATTR_TIMER                  ), ADC_Channel3,   PWM4_CH1,   TC4_CH1,      EXTERNAL_INT_9    },
 
@@ -163,6 +163,50 @@ const PinDescription g_APinDescription[] = {
 
 const void* g_apTCInstances[TCC_INST_NUM + TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 };
 
+
+#if defined(USE_BQ24195L_PMIC)
+#include "wiring_private.h"
+
+#define PMIC_ADDRESS  0x6B
+#define PMIC_REG01    0x01
+#define PMIC_REG07    0x07
+
+static inline void enable_battery_charging() {
+  PERIPH_WIRE.initMasterWIRE(100000);
+  PERIPH_WIRE.enableWIRE();
+  pinPeripheral(PIN_WIRE_SDA, g_APinDescription[PIN_WIRE_SDA].ulPinType);
+  pinPeripheral(PIN_WIRE_SCL, g_APinDescription[PIN_WIRE_SCL].ulPinType);
+
+  PERIPH_WIRE.startTransmissionWIRE( PMIC_ADDRESS, WIRE_WRITE_FLAG );
+  PERIPH_WIRE.sendDataMasterWIRE(PMIC_REG01);
+  PERIPH_WIRE.sendDataMasterWIRE(0x1B); // Charge Battery + Minimum System Voltage 3.5V
+  PERIPH_WIRE.prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);
+
+  PERIPH_WIRE.disableWIRE();
+}
+
+static inline void disable_battery_fet(bool disabled) {
+  PERIPH_WIRE.initMasterWIRE(100000);
+  PERIPH_WIRE.enableWIRE();
+  pinPeripheral(PIN_WIRE_SDA, g_APinDescription[PIN_WIRE_SDA].ulPinType);
+  pinPeripheral(PIN_WIRE_SCL, g_APinDescription[PIN_WIRE_SCL].ulPinType);
+
+  PERIPH_WIRE.startTransmissionWIRE( PMIC_ADDRESS, WIRE_WRITE_FLAG );
+  PERIPH_WIRE.sendDataMasterWIRE(PMIC_REG07);
+  // No D+/D– detection + Safety timer not slowed by 2X during input DPM or thermal regulation +
+  // BAT fet disabled/enabled + charge and bat fault INT
+  PERIPH_WIRE.sendDataMasterWIRE(0x0B | (disabled ? 0x20 : 0x00));
+  PERIPH_WIRE.prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);
+
+  PERIPH_WIRE.disableWIRE();
+}
+
+void initVariant() {
+  enable_battery_charging();
+  disable_battery_fet(false);
+}
+#endif
+
 // Multi-serial objects instantiation
 SERCOM sercom0(SERCOM0);
 SERCOM sercom1(SERCOM1);

variants/mkrwan1300/variant.h

@@ -201,3 +201,13 @@ extern Uart Serial2;
 
 // Alias SerialLoRA to Serial2
 #define SerialLoRa                  Serial2
+
+
+// MKRWAN1310 compatibility layer
+#if defined(USE_BQ24195L_PMIC)
+// ADC_BATTERY is not connected as an ADC but as the flash CS
+#define FLASH_CS      (ADC_BATTERY)
+#undef ADC_BATTERY
+// PA28 is connected to IRQ capable PIN
+#define LORA_IRQ      (31u)
+#endif