Skip to content

Commit 41c8e37

Browse files
authored
Merge pull request #35 from mcci-catena/issue34
Fix #34: add KR920 support to menus
2 parents 58c5b25 + f378ad7 commit 41c8e37

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

README.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This repository contains the source code and configuration files of the Arduino Core
44
for MCCI Catena IoT devices. It is based on the Arduino core
55
for Atmel's SAMD21 processor (used on the Arduino/Genuino Zero, MKR1000 and MKRZero boards),
6-
as extended by Adafruit for their SAMD Boards such as the Feather M0, and further extended by MCCI to support its MCCI Catena® LoRaWAN® technology boards.
6+
as extended by Adafruit for their SAMD Boards such as the Feather M0, and further extended by MCCI to support its MCCI Catena LoRaWAN® technology boards.
77

88
[![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.0.0...master)
99

@@ -33,7 +33,7 @@ as extended by Adafruit for their SAMD Boards such as the Feather M0, and furthe
3333

3434
The easy approach is to install the package following the instructions given here:
3535

36-
[https://github.com/mcci-catena/arduino-boards/blob/master/README.md](https://github.com/mcci-catena/arduino-boards/blob/master/README.md)
36+
[`https://github.com/mcci-catena/arduino-boards/blob/master/README.md`](https://github.com/mcci-catena/arduino-boards/blob/master/README.md)
3737

3838
However, if you need to development, it's more complicated. See the following section.
3939

@@ -55,8 +55,8 @@ If you want to develop and test changes to this package, we suggest the followin
5555
| Linux | <code>~/.arduino15</code> |
5656

5757
7. From this location, change directory to `packages/mcci/samd`.
58-
8. Look at the direcory contents with `ls`. You'll see a directory named like a version number, for example `1.2.0`.
59-
9. Move the directory you just found away from the `samd` directory. It's convenient to have it around, so we sugest not delete it.
58+
8. Look at the directory contents with `ls`. You'll see a directory named like a version number, for example `1.2.0`.
59+
9. Move the directory you just found away from the `samd` directory. It's convenient to have it around, so we suggest that you not delete it.
6060
10. Create a symbolic link to the sandbox you created in step (3) above. On macOS and Linux, this is done using the `ln -s` command. On Windows 10, this is done with the `mklink /d` command. (On older versions of Windows, unless you're very experienced, you might want to use a Linux VM in VirtualBox -- we can't advise on the best way to do this.)
6161

6262
- On any system you can also simply move the old directory out of the way, and then move your sandbox in. The old directory cannot simply be renamed `packages/mcci/samd`, but it can be put (for example) in `packages/mcci/hide-samd-1.2.0` (or whatever version it was). After moving the old directory away, you can move the repo that you cloned in step 5, above, into the `packages/mcci/samd` directory using a suitable version number.
@@ -72,24 +72,26 @@ Remember to restart the IDE whenever you change `platform.txt`, `boards.txt` or
7272

7373
## Bugs or Issues
7474

75-
If you find a bug you can submit an issue here on github:
75+
If you find a bug you can submit an issue here on GitHub:
7676

77-
[github.com/mcci-catena/ArduinoCore-samd/issues](https://github.com/mcci-catena/ArduinoCore-samd/issues)
77+
[`github.com/mcci-catena/ArduinoCore-samd/issues`](https://github.com/mcci-catena/ArduinoCore-samd/issues)
7878

7979
Before posting a new issue, please check if the same problem has been already reported by someone else
8080
to avoid duplicates.
8181

8282
## Release History
8383

84+
- HEAD adds support for the LoRaWAN Region KR-920 (issue [#34](https://github.com/mcci-catena/ArduinoCore-samd/issues/34)).
85+
8486
- [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)).
8587

8688
- [v1.3.1](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v1.3.1) corrected the version in `platform.txt`, which was missed.
8789

8890
- [v1.3.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v1.3.0) increases the serial port ring-buffer size (issue [#26](https://github.com/mcci-catena/ArduinoCore-samd/issues/26))
8991

90-
- [v1.2.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v1.2.0) adds several features. It moves flags in the link script to accomodate the BME680 BSEC library. It adapts the JSON templating system from the [MCCI STM32 BSP](https://github.com/mcci-catena/Arduino_Core_STM32). The `millis()` routine was updated so that the clock value will advance even if interrupts are disabled (issue [#17](https://github.com/mcci-catena/ArduinoCore-samd/issues/16)). Properly define the country code for as923jp (issue [#13](https://github.com/mcci-catena/ArduinoCore-samd/issues/13)). Fix typo `au915` should have been `au921`(issue [#12](https://github.com/mcci-catena/ArduinoCore-samd/issues/12)).
92+
- [v1.2.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v1.2.0) adds several features. It moves flags in the link script to accommodate the BME680 BSEC library. It adapts the JSON templating system from the [MCCI STM32 BSP](https://github.com/mcci-catena/Arduino_Core_STM32). The `millis()` routine was updated so that the clock value will advance even if interrupts are disabled (issue [#17](https://github.com/mcci-catena/ArduinoCore-samd/issues/16)). Properly define the country code for as923jp (issue [#13](https://github.com/mcci-catena/ArduinoCore-samd/issues/13)). Fix typo `au915` should have been `au921`(issue [#12](https://github.com/mcci-catena/ArduinoCore-samd/issues/12)).
9193

92-
- [v1.1.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v1.1.0) adds support for the MCCI Catena 4420 and 4470. It also adds the ability to select the target LoRaWAN region from the IDE Tools menu (assuming that you're using the [MCCI Catena arduino-lmic](https://github.com/mcci-catena/arduino-lmic) library). It also fixes the USB product ID numbers to match the official numbers assigned by MCCI release engineering (issue [#9](https://github.com/mcci-catena/ArduinoCore-samd/issues/9)).
94+
- [v1.1.0](https://github.com/mcci-catena/ArduinoCore-samd/releases/tag/v1.1.0) adds support for the MCCI Catena 4420 and 4470. It also adds the ability to select the target LoRaWAN region from the IDE Tools menu (assuming that you're using the [MCCI Catena `arduino-lmic`](https://github.com/mcci-catena/arduino-lmic) library). It also fixes the USB product ID numbers to match the official numbers assigned by MCCI release engineering (issue [#9](https://github.com/mcci-catena/ArduinoCore-samd/issues/9)).
9395

9496
## License and credits
9597

boards.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,15 @@ menu.lorawan_region=LoRaWAN Region
9696
{{board}}.menu.lorawan_region.au921=Australia 921 MHz
9797
{{board}}.menu.lorawan_region.as923=Asia 923 MHz
9898
{{board}}.menu.lorawan_region.as923jp=Japan 923 MHz
99+
{{board}}.menu.lorawan_region.kr920=Korea 920 MHz
99100
{{board}}.menu.lorawan_region.in866=India 866 MHz
100101
{{board}}.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
101102
{{board}}.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
102103
{{board}}.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
103104
{{board}}.menu.lorawan_region.au921.build.lorawan_flags=-DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
104105
{{board}}.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
105106
{{board}}.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
107+
{{board}}.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
106108
{{board}}.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
107109
{{board}}.menu.lorawan_region.projcfg.build.lorawan_flags=
108110

boards.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ mcci_catena_4410.menu.lorawan_region.eu868=Europe 868 MHz
6666
mcci_catena_4410.menu.lorawan_region.au921=Australia 921 MHz
6767
mcci_catena_4410.menu.lorawan_region.as923=Asia 923 MHz
6868
mcci_catena_4410.menu.lorawan_region.as923jp=Japan 923 MHz
69+
mcci_catena_4410.menu.lorawan_region.kr920=Korea 920 MHz
6970
mcci_catena_4410.menu.lorawan_region.in866=India 866 MHz
7071
mcci_catena_4410.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
7172
mcci_catena_4410.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
7273
mcci_catena_4410.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
7374
mcci_catena_4410.menu.lorawan_region.au921.build.lorawan_flags=-DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
7475
mcci_catena_4410.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
7576
mcci_catena_4410.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
77+
mcci_catena_4410.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
7678
mcci_catena_4410.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
7779
mcci_catena_4410.menu.lorawan_region.projcfg.build.lorawan_flags=
7880

@@ -113,13 +115,15 @@ mcci_catena_4420.menu.lorawan_region.eu868=Europe 868 MHz
113115
mcci_catena_4420.menu.lorawan_region.au921=Australia 921 MHz
114116
mcci_catena_4420.menu.lorawan_region.as923=Asia 923 MHz
115117
mcci_catena_4420.menu.lorawan_region.as923jp=Japan 923 MHz
118+
mcci_catena_4420.menu.lorawan_region.kr920=Korea 920 MHz
116119
mcci_catena_4420.menu.lorawan_region.in866=India 866 MHz
117120
mcci_catena_4420.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
118121
mcci_catena_4420.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
119122
mcci_catena_4420.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
120123
mcci_catena_4420.menu.lorawan_region.au921.build.lorawan_flags=-DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
121124
mcci_catena_4420.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
122125
mcci_catena_4420.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
126+
mcci_catena_4420.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
123127
mcci_catena_4420.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
124128
mcci_catena_4420.menu.lorawan_region.projcfg.build.lorawan_flags=
125129

@@ -160,13 +164,15 @@ mcci_catena_4450.menu.lorawan_region.eu868=Europe 868 MHz
160164
mcci_catena_4450.menu.lorawan_region.au921=Australia 921 MHz
161165
mcci_catena_4450.menu.lorawan_region.as923=Asia 923 MHz
162166
mcci_catena_4450.menu.lorawan_region.as923jp=Japan 923 MHz
167+
mcci_catena_4450.menu.lorawan_region.kr920=Korea 920 MHz
163168
mcci_catena_4450.menu.lorawan_region.in866=India 866 MHz
164169
mcci_catena_4450.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
165170
mcci_catena_4450.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
166171
mcci_catena_4450.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
167172
mcci_catena_4450.menu.lorawan_region.au921.build.lorawan_flags=-DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
168173
mcci_catena_4450.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
169174
mcci_catena_4450.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
175+
mcci_catena_4450.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
170176
mcci_catena_4450.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
171177
mcci_catena_4450.menu.lorawan_region.projcfg.build.lorawan_flags=
172178

@@ -207,13 +213,15 @@ mcci_catena_4460.menu.lorawan_region.eu868=Europe 868 MHz
207213
mcci_catena_4460.menu.lorawan_region.au921=Australia 921 MHz
208214
mcci_catena_4460.menu.lorawan_region.as923=Asia 923 MHz
209215
mcci_catena_4460.menu.lorawan_region.as923jp=Japan 923 MHz
216+
mcci_catena_4460.menu.lorawan_region.kr920=Korea 920 MHz
210217
mcci_catena_4460.menu.lorawan_region.in866=India 866 MHz
211218
mcci_catena_4460.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
212219
mcci_catena_4460.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
213220
mcci_catena_4460.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
214221
mcci_catena_4460.menu.lorawan_region.au921.build.lorawan_flags=-DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
215222
mcci_catena_4460.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
216223
mcci_catena_4460.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
224+
mcci_catena_4460.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
217225
mcci_catena_4460.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
218226
mcci_catena_4460.menu.lorawan_region.projcfg.build.lorawan_flags=
219227

@@ -254,13 +262,15 @@ mcci_catena_4470.menu.lorawan_region.eu868=Europe 868 MHz
254262
mcci_catena_4470.menu.lorawan_region.au921=Australia 921 MHz
255263
mcci_catena_4470.menu.lorawan_region.as923=Asia 923 MHz
256264
mcci_catena_4470.menu.lorawan_region.as923jp=Japan 923 MHz
265+
mcci_catena_4470.menu.lorawan_region.kr920=Korea 920 MHz
257266
mcci_catena_4470.menu.lorawan_region.in866=India 866 MHz
258267
mcci_catena_4470.menu.lorawan_region.projcfg=Use arduino-lmic/project_confic/lmic_project_lmic_config_preconditions.h
259268
mcci_catena_4470.menu.lorawan_region.us915.build.lorawan_flags=-DCFG_us915=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
260269
mcci_catena_4470.menu.lorawan_region.eu868.build.lorawan_flags=-DCFG_eu868=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
261270
mcci_catena_4470.menu.lorawan_region.au921.build.lorawan_flags=-DCFG_au921=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
262271
mcci_catena_4470.menu.lorawan_region.as923.build.lorawan_flags=-DCFG_as923=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
263272
mcci_catena_4470.menu.lorawan_region.as923jp.build.lorawan_flags=-DCFG_as923=1 -DLMIC_COUNTRY_CODE=LMIC_COUNTRY_CODE_JP -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
273+
mcci_catena_4470.menu.lorawan_region.kr920.build.lorawan_flags=-DCFG_kr920=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
264274
mcci_catena_4470.menu.lorawan_region.in866.build.lorawan_flags=-DCFG_in866=1 -DCFG_sx1276_radio=1 -DARDUINO_LMIC_PROJECT_CONFIG_H=lmic_config_preconditions.h
265275
mcci_catena_4470.menu.lorawan_region.projcfg.build.lorawan_flags=
266276

0 commit comments

Comments
 (0)