Merge pull request #43 from mcci-catena/issue42

Release v2.2.0
mcci-catena · Feb 6, 2020 · e6eaba7 · e6eaba7
2 parents 42e1133 + d732148
commit e6eaba7
Show file tree

Hide file tree

Showing 5 changed files with 337 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ for MCCI Catena IoT devices.  It is based on the Arduino core
 for Atmel's SAMD21 processor (used on the Arduino/Genuino Zero, MKR1000 and MKRZero boards),
 as extended by Adafruit for their SAMD Boards such as the Feather M0, and further extended by MCCI to support its MCCI Catena LoRaWAN&reg; technology boards.
 
-[![GitHub release](https://img.shields.io/github/release/mcci-catena/ArduinoCore-samd.svg)](https://github.com/mcci-catena/ArduinoCore-samd/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/mcci-catena/ArduinoCore-samd/latest.svg)](https://github.com/mcci-catena/ArduinoCore-samd/compare/v2.1.0...master)
+[![GitHub release](https://img.shields.io/github/release/mcci-catena/ArduinoCore-samd.svg)](https://github.com/mcci-catena/ArduinoCore-samd/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/mcci-catena/ArduinoCore-samd/latest.svg)](https://github.com/mcci-catena/ArduinoCore-samd/compare/v2.2.0...master)
 
 **Contents:**
 <!-- markdownlint-disable MD033 -->
@@ -81,7 +81,9 @@ to avoid duplicates.
 
 ## Release History
 
-- [V2.1.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v2.1.0) added support for the LoRaWAN Region KR-920 (issue [#34](https://github.com/mcci-catena/ArduinoCore-samd/issues/34)). Rename AU921 region to AU915 (retaining `CFG_au921` redundant symbol for older LMICs) ([#37](https://github.com/mcci-catena/ArduinoCore-samd/issues/37), [#38](https://github.com/mcci-catena/ArduinoCore-samd/issues/38)). Add support for new IDE features for injecting precompiled objects ([#39](https://github.com/mcci-catena/ArduinoCore-samd/issues/39)).
+- [v2.2.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v2.2.0) adds support for UI selection of network and subband.
+
+- [v2.1.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v2.1.0) added support for the LoRaWAN Region KR-920 (issue [#34](https://github.com/mcci-catena/ArduinoCore-samd/issues/34)). Rename AU921 region to AU915 (retaining `CFG_au921` redundant symbol for older LMICs) ([#37](https://github.com/mcci-catena/ArduinoCore-samd/issues/37), [#38](https://github.com/mcci-catena/ArduinoCore-samd/issues/38)). Add support for new IDE features for injecting precompiled objects ([#39](https://github.com/mcci-catena/ArduinoCore-samd/issues/39)).
 
 - [v2.0.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v2.0.0) makes a major version jump primarily to avoid reusing versions that are used by tags in the repo for Adafruit BSPs. It also adds `_mcci_arduino_version` (issue [#28](https://github.com/mcci-catena/ArduinoCore-samd/issues/28)).
 

diff --git a/boards.template b/boards.template
@@ -5,7 +5,7 @@
 #	Input to generate_boards.bri, produces Arduino IDE boards.txt.
 #
 # Copyright:
-#	Copyright (c) 2018-2019 MCCI Corporation
+#	Copyright (c) 2018-2020 MCCI Corporation
 #
 #	This library is free software; you can redistribute it and/or
 #	modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@
 #	Define all the boards for this board support package to the Arduino IDE
 #
 # Copyright:
-#	Copyright (c) 2018-2019 MCCI Corporation
+#	Copyright (c) 2018-2020 MCCI Corporation
 #
 #	This library is free software; you can redistribute it and/or
 #	modify it under the terms of the GNU Lesser General Public
@@ -57,6 +57,8 @@
 
 # Additional menu items
 menu.lorawan_region=LoRaWAN Region
+menu.lorawan_network=LoRaWAN Network
+menu.lorawan_subband=LoRaWAN Subband
 
 %%-prefix
 
@@ -77,7 +79,7 @@ menu.lorawan_region=LoRaWAN Region
 {{board}}.build.usb_manufacturer="MCCI Corporation"
 {{board}}.build.board={{build_board}}
 {{board}}.build.core=arduino
-{{board}}.build.extra_flags=-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DMCCI_CATENA_{{modelnumber}} -D__SAMD21G18A__ {build.usb_flags} {build.lorawan_flags}
+{{board}}.build.extra_flags=-DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DMCCI_CATENA_{{modelnumber}} -D__SAMD21G18A__ {build.usb_flags} {build.lorawan_flags} {build.lorawan_network_flags} {build.lorawan_subband_flags}
 # {{board}}.build.c.Werror=
 # {{board}}.build.cpp.Werror=
 # {{board}}.build.S.Werror=
@@ -98,7 +100,7 @@ menu.lorawan_region=LoRaWAN Region
 {{board}}.menu.lorawan_region.as923jp=Japan 923 MHz
 {{board}}.menu.lorawan_region.kr920=Korea 920 MHz
 {{board}}.menu.lorawan_region.in866=India 866 MHz
-{{board}}.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
+{{board}}.menu.lorawan_region.projcfg=Use arduino-lmic/project_config/lmic_project_lmic_config_preconditions.h
 {{board}}.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
 {{board}}.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
 {{board}}.menu.lorawan_region.au915.build.lorawan_flags=-DCFG_au915=1 -DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
@@ -108,6 +110,58 @@ menu.lorawan_region=LoRaWAN Region
 {{board}}.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
 {{board}}.menu.lorawan_region.projcfg.build.lorawan_flags=
 
+#
+# menu.lorawan_network
+{{board}}.menu.lorawan_network.ttn=The Things Network
+{{board}}.menu.lorawan_network.ttn.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_TTN=1
+{{board}}.menu.lorawan_network.actility=Actility ThingsPark
+{{board}}.menu.lorawan_network.actility.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_ACTILITY=1
+{{board}}.menu.lorawan_network.helium=Helium
+{{board}}.menu.lorawan_network.helium.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_HELIUM=1
+{{board}}.menu.lorawan_network.machineq=machineQ
+{{board}}.menu.lorawan_network.machineq.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_MACHINEQ=1
+{{board}}.menu.lorawan_network.senet=Senet
+{{board}}.menu.lorawan_network.senet.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_SENET=1
+{{board}}.menu.lorawan_network.senra=Senra
+{{board}}.menu.lorawan_network.senra.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_SENRA=1
+{{board}}.menu.lorawan_network.swisscom=Swisscom
+{{board}}.menu.lorawan_network.swisscom.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_SWISSCOM=1
+{{board}}.menu.lorawan_network.chirpstack=ChirpStack
+{{board}}.menu.lorawan_network.chirpstack.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_CHIRPSTACK=1
+{{board}}.menu.lorawan_network.generic=Generic
+{{board}}.menu.lorawan_network.generic.build.lorawan_network_flags=-DARDUINO_LMIC_CFG_NETWORK_GENERIC=1
+{{board}}.menu.lorawan_network.projcfg=Use arduino-lmic/project_config/lmic_project_lmic_config_preconditions.h
+{{board}}.menu.lorawan_network.projcfg.build.lorawan_network_flags=
+
+#
+# menul.lorawan_subband
+{{board}}.menu.lorawan_subband.default=Default, works everywhere
+{{board}}.menu.lorawan_subband.default.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=-1
+{{board}}.menu.lorawan_subband.sb0=sb0, ch 0~7 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb0.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=0
+{{board}}.menu.lorawan_subband.sb1=sb1, ch 8~15 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb1.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=1
+{{board}}.menu.lorawan_subband.sb2=sb2, ch 16~23 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb2.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=2
+{{board}}.menu.lorawan_subband.sb3=sb3, ch 24~31 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb3.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=3
+{{board}}.menu.lorawan_subband.sb4=sb4, ch 32~39 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb4.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=4
+{{board}}.menu.lorawan_subband.sb5=sb5, ch 40~47 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb5.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=5
+{{board}}.menu.lorawan_subband.sb6=sb6, ch 48~55 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb6.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=6
+{{board}}.menu.lorawan_subband.sb7=sb7, ch 56~63 (US/AU/CN470)
+{{board}}.menu.lorawan_subband.sb7.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=7
+{{board}}.menu.lorawan_subband.sb8=sb8, ch 64~71 (CN470)
+{{board}}.menu.lorawan_subband.sb8.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=8
+{{board}}.menu.lorawan_subband.sb9=sb9, ch 72~79 (CN470)
+{{board}}.menu.lorawan_subband.sb9.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=9
+{{board}}.menu.lorawan_subband.sb10=sb10, ch 80~87 (CN470)
+{{board}}.menu.lorawan_subband.sb10.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=10
+{{board}}.menu.lorawan_subband.sb11=sb11, ch 88~95 (CN470)
+{{board}}.menu.lorawan_subband.sb11.build.lorawan_subband_flags=-DARDUINO_LMIC_CFG_SUBBAND=11
+
 #### end of configuration info for {{name}}
 
 %%-boards