From 3fd3b0430f13f1d594b74570cbe75b851568bfd6 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 24 Aug 2016 17:27:16 +0200
Subject: [PATCH] Updated plugin files and added Upgrade post work

---
 hal-default.db                          | Bin 16384 -> 16384 bytes
 src/se/hal/HalContext.java              |   6 ++++++
 src/se/hal/plugin/nutups/plugin.json    |   2 +-
 src/se/hal/plugin/raspberry/plugin.json |   4 ++--
 src/se/hal/plugin/tellstick/plugin.json |   4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 src/se/hal/plugin/raspberry/plugin.json

diff --git a/hal-default.db b/hal-default.db
index 44a7a8d48d66dad2d0f38bd8e9dbabd3c0a27953..ded32664b7aa4d2cbece6a541af0db69930f04c9 100755
GIT binary patch
delta 94
zcmZo@U~Fh$oFL7(Y@&=a<FbtjUBZm)lV1x<axpVMVPJm3{FC|9W<HSz%pB|-92~5i
ttPGpKiF2|rT5ghI5rC+91yuEGGoQ{=W?rBG0|NsWD>EY_C+8vq0RRXT7qS2V

delta 94
zcmZo@U~Fh$oFL7(bfSzi<I;@@UBZm4lV1x<axpPKVPJm3{FC|aW<HSz%p80i92^V`
s41AlviF2|rT5OVG5rC+91yuE9GoQ{=W?lhiW}p%-CMF=svdBOH0RP1obN~PV

diff --git a/src/se/hal/HalContext.java b/src/se/hal/HalContext.java
index 5e5b94e2..b4bc41e7 100755
--- a/src/se/hal/HalContext.java
+++ b/src/se/hal/HalContext.java
@@ -146,6 +146,12 @@ public class HalContext {
 						return null;
 					}
 				});
+                if (dbVersion < 9) { // tellstick code has changed package
+                    db.exec("UPDATE sensor SET type = 'se.hal.plugin.tellstick.device.Oregon0x1A2D' WHERE type = 'se.hal.plugin.tellstick.protocols.Oregon0x1A2D'");
+                    db.exec("UPDATE event SET type = 'se.hal.plugin.tellstick.device.NexaSelfLearning' WHERE type = 'se.hal.plugin.tellstick.protocols.NexaSelfLearning'");
+                }
+
+
                 // Check if there is a local user
                 User localUser = User.getLocalUser(db);
                 if (localUser == null){
diff --git a/src/se/hal/plugin/nutups/plugin.json b/src/se/hal/plugin/nutups/plugin.json
index 7b24fde6..7facf7d2 100755
--- a/src/se/hal/plugin/nutups/plugin.json
+++ b/src/se/hal/plugin/nutups/plugin.json
@@ -3,6 +3,6 @@
 	"name": "NutUps",
 	"interfaces": [
 		{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.nutups.NutUpsController"},
-		{"se.hal.intf.HalSensorData": "se.hal.plugin.nutups.NutUpsDevice"}
+		{"se.hal.intf.HalSensorConfig": "se.hal.plugin.nutups.NutUpsDevice"}
 	]
 }
\ No newline at end of file
diff --git a/src/se/hal/plugin/raspberry/plugin.json b/src/se/hal/plugin/raspberry/plugin.json
old mode 100644
new mode 100755
index 6285aa15..41210dc8
--- a/src/se/hal/plugin/raspberry/plugin.json
+++ b/src/se/hal/plugin/raspberry/plugin.json
@@ -2,7 +2,7 @@
 	"version": 1.1,
 	"name": "Raspberry Pi Sensors",
 	"interfaces": [
-		{"se.hal.intf.HalSensorData": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"},
-		{"se.hal.intf.HalSensorData": "se.hal.plugin.raspberry.RPiTemperatureSensor"}
+		{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"},
+		{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiTemperatureSensor"}
 	]
 }
\ No newline at end of file
diff --git a/src/se/hal/plugin/tellstick/plugin.json b/src/se/hal/plugin/tellstick/plugin.json
index 0d6ad43f..a4ddadbd 100755
--- a/src/se/hal/plugin/tellstick/plugin.json
+++ b/src/se/hal/plugin/tellstick/plugin.json
@@ -4,7 +4,7 @@
 	"interfaces": [
 		{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.tellstick.TellstickSerialComm"},
 
-		{"se.hal.intf.HalSensorData": "se.hal.plugin.tellstick.device.Oregon0x1A2D"},
-		{"se.hal.intf.HalEventData":  "se.hal.plugin.tellstick.device.NexaSelfLearning"}
+		{"se.hal.intf.HalSensorConfig": "se.hal.plugin.tellstick.device.Oregon0x1A2D"},
+		{"se.hal.intf.HalEventConfig":  "se.hal.plugin.tellstick.device.NexaSelfLearning"}
 	]
 }
\ No newline at end of file