From 00a5188d053f2eab0308b41e2c38e07cb41203cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Tue, 19 Jan 2016 08:30:00 +0100
Subject: [PATCH] fix unit change systemd service file

---
 data/systemd/guhd.service                              | 2 +-
 plugins/deviceplugins/awattar/devicepluginawattar.cpp  | 1 -
 plugins/deviceplugins/awattar/devicepluginawattar.json | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/data/systemd/guhd.service b/data/systemd/guhd.service
index 2fb4a2b3..2d4179f2 100644
--- a/data/systemd/guhd.service
+++ b/data/systemd/guhd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=guhd - IoT server
 Documentation=https://github.com/guh/guh/wiki
-After=network.target syslog.target
+After=ifup-wait-all-auto.service syslog.target
 
 [Service]
 ExecStart=/usr/bin/guhd --print-all
diff --git a/plugins/deviceplugins/awattar/devicepluginawattar.cpp b/plugins/deviceplugins/awattar/devicepluginawattar.cpp
index e87f72fc..39c7a8d2 100644
--- a/plugins/deviceplugins/awattar/devicepluginawattar.cpp
+++ b/plugins/deviceplugins/awattar/devicepluginawattar.cpp
@@ -234,7 +234,6 @@ DeviceManager::DeviceError DevicePluginAwattar::executeAction(Device *device, co
         }
     }
 
-
     return DeviceManager::DeviceErrorNoError;
 }
 
diff --git a/plugins/deviceplugins/awattar/devicepluginawattar.json b/plugins/deviceplugins/awattar/devicepluginawattar.json
index cf482403..a7f7536f 100644
--- a/plugins/deviceplugins/awattar/devicepluginawattar.json
+++ b/plugins/deviceplugins/awattar/devicepluginawattar.json
@@ -50,7 +50,7 @@
                             "idName": "currentMarketPrice",
                             "name": "current market price",
                             "type": "double",
-                            "unit": "UnitEuroCentPerKiloWattHour",
+                            "unit": "EuroCentPerKiloWattHour",
                             "defaultValue": 0
                         },
                         {
@@ -74,7 +74,7 @@
                             "idName": "averagePrice",
                             "name": "average market price [± 12 h]",
                             "type": "double",
-                            "unit": "UnitEuroCentPerKiloWattHour",
+                            "unit": "EuroCentPerKiloWattHour",
                             "defaultValue": 0
                         },
                         {
@@ -82,7 +82,7 @@
                             "idName": "lowestPrice",
                             "name": "lowest market price [± 12 h]",
                             "type": "double",
-                            "unit": "UnitEuroCentPerKiloWattHour",
+                            "unit": "EuroCentPerKiloWattHour",
                             "defaultValue": 0
                         },
                         {
@@ -90,7 +90,7 @@
                             "idName": "highestPrice",
                             "name": "highest market price [± 12 h]",
                             "type": "double",
-                            "unit": "UnitEuroCentPerKiloWattHour",
+                            "unit": "EuroCentPerKiloWattHour",
                             "defaultValue": 0
                         },
                         {