Merge branch 'release/5.1.0'

CANDY-LINE · Jul 2, 2018 · 9e265c9 · 9e265c9
2 parents c7c242f + a30ba9f
commit 9e265c9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # 履歴
+* 5.1.0
+    - IIJモバイル/タイプD 高速通信プラン向けAPNを追加
+    - EnOceanポートの対応デバイスにUSB300Uなどを追加
+    - 本ソフトウェアをアンインストールした時にSmartMeshポート定義を削除するように変更
+
 * 5.0.1
     - インストーラー実行時に、CANDY REDがENOMEMでインストールされない問題を修正
     - SIMカードが存在しない時にもNTPを止めてモバイルネットワーク時刻調整を実行しようとする問題を修正

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ $ make PI_USER=linaro PI_HOST=tinkerboard.local
 ### 動作確認 (RPi/ATB)
 
 ```bash
-$ VERSION=5.0.1 && rm -fr tmp && mkdir tmp && cd tmp && \
+$ VERSION=5.1.0 && rm -fr tmp && mkdir tmp && cd tmp && \
   tar zxf ~/candy-pi-lite-service-${VERSION}.tgz
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 ./install.sh
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 CANDY_RED=0 BOOT_APN=soracom.io ./install.sh

diff --git a/etc/udev/rules.d/70-enocean-stick.rules b/etc/udev/rules.d/70-enocean-stick.rules
@@ -1 +1 @@
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{product}=="EnOcean USB [34]00J* ??", MODE="0666", SYMLINK+="enocean"
+SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{product}=="EnOcean USB [34]00* ??", MODE="0666", SYMLINK+="enocean"
diff --git a/install.sh b/install.sh
@@ -18,7 +18,7 @@ VENDOR_HOME=/opt/candy-line
 
 SERVICE_NAME=candy-pi-lite
 GITHUB_ID=CANDY-LINE/candy-pi-lite-service
-VERSION=5.0.1
+VERSION=5.1.0
 # Channel B
 UART_PORT="/dev/ttySC1"
 MODEM_BAUDRATE=${MODEM_BAUDRATE:-460800}

diff --git a/systemd/apn-list.json b/systemd/apn-list.json
@@ -13,6 +13,7 @@
   ,"iijmobile.biz-ipv4v6":{"user":"biz@iij","password":"iij","ops":true,"apn":"iijmobile.biz","pdp":"ipv4v6","ipv6dns1":"2001:240::13","ipv6dns2":"2001:240::14"}
   ,"iijmobile.biz-ipv6":{"user":"biz@iij","password":"iij","ops":true,"apn":"iijmobile.biz","pdp":"ipv6","ipv6dns1":"2001:240::13","ipv6dns2":"2001:240::14"}
   ,"internet4gd.gdsp":{"user":"web","password":"web","cs":true}
+  ,"sd.iijmobile.jp":{"user":"mobile@iij","password":"iij"}
   ,"m2m4biz.softbank":{"user":"m2mbiz","password":"m2mbiz","cs":true}
   ,"isp.docomoiot.net":{"user":"web","password":"web"}
   ,"4gn.jp":{"user":"sim@with","password":"sim"}

diff --git a/uninstall.sh b/uninstall.sh
@@ -89,6 +89,7 @@ function uninstall_service {
 
 function uninstall_udev_rules {
   rm -f /etc/udev/rules.d/70-enocean-stick.rules > /dev/null 2>&1
+  rm -f /etc/udev/rules.d/70-smartmesh.rules > /dev/null 2>&1
   rm -f /etc/udev/rules.d/76-rpi-ether-netnames.rules > /dev/null 2>&1
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]", ATTRS{product}=="EnOcean USB [34]00J ??", MODE="0666", SYMLINK+="enocean"
		SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]", ATTRS{product}=="EnOcean USB [34]00 ??", MODE="0666", SYMLINK+="enocean"