Merge pull request #28 from konnected-io/drop-beta

Drop beta tag
konnected-io · Jul 14, 2017 · 1d6a3e1 · 1d6a3e1
2 parents bceb925 + 279e2fd
commit 1d6a3e1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/firmware/1.5.4.1/app/include/user_version.h b/firmware/1.5.4.1/app/include/user_version.h
@@ -6,9 +6,9 @@
 #define NODE_VERSION_REVISION	4U
 #define NODE_VERSION_INTERNAL   1U
 
-#define NODE_VERSION	"NodeMCU 1.5.4.1\r\nKonnected Security 2.0.beta1\r\n"
+#define NODE_VERSION	"NodeMCU 1.5.4.1\r\nKonnected Security 2.0\r\n"
 #ifndef BUILD_DATE
-#define BUILD_DATE	  "20170708"
+#define BUILD_DATE	  "20170712"
 #endif
 
 extern char SDK_VERSION[];

diff --git a/firmware/AlarmPanel_20170622.bin b/firmware/AlarmPanel_20170622.bin
diff --git a/firmware/AlarmPanel_20170628.bin → firmware/konnected-security-2-0.bin b/firmware/AlarmPanel_20170628.bin → firmware/konnected-security-2-0.bin
diff --git a/scripts/flash b/scripts/flash
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE_NAME=konnected-security-2-0-beta1
+IMAGE_NAME=konnected-security-2-0
 PORT=/dev/cu.wchusbserial1410
 
 esptool.py --port=${PORT} write_flash --flash_mode dio 0x00000 firmware/${IMAGE_NAME}.bin

diff --git a/smartapps/konnected-io/konnected-security-connect.src/konnected-security-connect.groovy b/smartapps/konnected-io/konnected-security-connect.src/konnected-security-connect.groovy
@@ -19,9 +19,9 @@ definition(
   author:      "konnected.io",
   description: "Convert your wired home alarm system into a SmartThings smart alarm",
   category:    "Safety & Security",
-  iconUrl:     "https://raw.githubusercontent.com/konnected-io/SmartThings/master/images/icons/KonnectedAlarmPanel.png",
-  iconX2Url:   "https://raw.githubusercontent.com/konnected-io/SmartThings/master/images/icons/KonnectedAlarmPanel@2x.png",
-  iconX3Url:   "https://raw.githubusercontent.com/konnected-io/SmartThings/master/images/icons/KonnectedAlarmPanel@3x.png",
+  iconUrl:     "https://raw.githubusercontent.com/konnected-io/docs/master/assets/images/KonnectedSecurity.png",
+  iconX2Url:   "https://raw.githubusercontent.com/konnected-io/docs/master/assets/images/KonnectedSecurity@2x.png",
+  iconX3Url:   "https://raw.githubusercontent.com/konnected-io/docs/master/assets/images/KonnectedSecurity@3x.png",
   singleInstance: true
 )
 
@@ -90,8 +90,8 @@ def pageWelcome() {
         title:       "Instructions & Documentation",
         description: "Tap to view the online documentation, or view on your computer at http://docs.konnected.io",
         required:    false,
-        image:       "https://raw.githubusercontent.com/konnected-io/SmartThings/master/images/icons/Manual.png",
-        url:         "http://docs.konnected.io/"
+        image:       "https://raw.githubusercontent.com/konnected-io/docs/master/assets/images/manual-icon.png",
+        url:         "http://docs.konnected.io/security-alarm-system/"
       )
     }
     section("") {
@@ -100,8 +100,8 @@ def pageWelcome() {
         title:       "Donate to Konnected!",
         description: "Konnected Alarm is an open source project. Your donations help fund future enhancements and products.",
         required:    false,
-        image:       "https://raw.githubusercontent.com/konnected-io/SmartThings/master/images/icons/Donate.png",
-        url:         "https://store.konnected.io/products/donate-to-this-project"
+        image:       "https://raw.githubusercontent.com/konnected-io/docs/master/assets/images/donate-icon.png",
+        url:         "http://docs.konnected.io/donate/"
       )
     }
 
@@ -113,7 +113,7 @@ def pageWelcome() {
             title:       "konnected-security-" + it.mac[-6..-1],
             description: "Tap to view device status",
             required:    false,
-            image:       "https://raw.githubusercontent.com/konnected-io/SmartThings/master/images/icons/Device.png",
+            image:       "https://raw.githubusercontent.com/konnected-io/docs/master/assets/images/device-icon.png",
             url:         "http://" + getDeviceIpAndPort(it)
           )
         }

diff --git a/source-code/device.lua b/source-code/device.lua
@@ -1,6 +1,6 @@
 local me = {
   name = "Security",
-  hwVersion = "2.0.beta1",
-  swVersion = "2.0.beta1"
+  hwVersion = "2.0.0-beta2",
+  swVersion = "2.0.0-beta2"
 }
 return me
diff --git a/source-code/enduser_setup.html.gz b/source-code/enduser_setup.html.gz
diff --git a/source-code/http_index.html.gz b/source-code/http_index.html.gz