0.70

Nall-chan · Jan 14, 2024 · da7010c · da7010c
1 parent 6bac2da
commit da7010c
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 31 deletions.
diff --git a/Bosch SmartHome Configurator/locale.json b/Bosch SmartHome Configurator/locale.json
@@ -7,7 +7,12 @@
             "Bosch SmartHome Automation Rules": "Bosch SmartHome Automationen",
             "Bosch SmartHome Scenarios": "Bosch SmartHome Szenarien",
             "Bosch SmartHome Water Alarm System": "Bosch SmartHome Wasseralarm System",
+            "Doors and Windows": "Fenster und Türen",
             "Messages": "Nachrichten",
+            "-VentilationService-": "-LüftungsService-",
+            "-PresenceSimulationService-": "-AnwesenheitssimulationsService-",
+            "-IntrusionDetectionSystem-": "-EinbruchmeldeSystem-",
+            "-SmokeDetectionSystem-": "-RauchmeldeSystem-",
             "This module is free for non-commercial use,\r\nDonations in support of the author are accepted here:": "Dieses Modul ist für die nicht kommerzielle Nutzung kostenlos,\r\nSchenkungen als Unterstützung für den Autor werden hier akzeptiert:"
         }
     }

diff --git a/Bosch SmartHome Configurator/module.php b/Bosch SmartHome Configurator/module.php
@@ -191,12 +191,13 @@ private function GetScenarios(): array
             $Values[] = [
                 'id'               => $ScenarioId,
                 'name'             => IPS_GetName($InstanceID),
-                'deviceModel'      => 'AutomationRule',
+                'deviceModel'      => 'Scenario',
                 'instanceID'       => $InstanceID,
             ];
         }
         return $Values;
     }
+
     private function GetWaterAlarm(): array
     {
         $WaterAlarmSystemState = $this->GetLists(\BoschSHC\ApiUrl::WaterAlarm);
@@ -236,6 +237,7 @@ private function GetWaterAlarm(): array
         }
         return $Values;
     }
+
     private function GetMessages(): array
     {
         $Create = [];
@@ -254,7 +256,7 @@ private function GetMessages(): array
                 [
                     'id'               => '',
                     'name'             => IPS_GetName($InstanceID),
-                    'deviceModel'      => 'Bosch SmartHome Messages',
+                    'deviceModel'      => 'Messages',
                     'instanceID'       => $InstanceID
                 ],
                 $Create
@@ -273,6 +275,7 @@ private function GetMessages(): array
         }
         return $Values;
     }
+
     private function GetDoorsWindows(): array
     {
         $Create = [];
@@ -310,6 +313,7 @@ private function GetDoorsWindows(): array
         }
         return $Values;
     }
+
     private function GetDevices(): array
     {
         $RoomList = $this->GetLists(\BoschSHC\ApiUrl::Rooms);
@@ -321,7 +325,7 @@ private function GetDevices(): array
             $InstanceID = array_search($Device['id'], $IPSDevices);
             $Values[] = [
                 'id'               => $Device['id'],
-                'name'             => ($InstanceID ? IPS_GetName($InstanceID) : $Device['name']),
+                'name'             => ($InstanceID ? IPS_GetName($InstanceID) : ($Device['name'][0] == '-' ? $this->Translate($Device['name']) : $Device['name'])),
                 'deviceModel'      => $Device['deviceModel'],
                 'instanceID'       => ($InstanceID ? $InstanceID : 0),
                 'create'           => [
@@ -340,7 +344,7 @@ private function GetDevices(): array
             $Values[] = [
                 'id'               => $DeviceId,
                 'name'             => IPS_GetName($InstanceID),
-                'deviceModel'      => '',
+                'deviceModel'      => 'unknown',
                 'instanceID'       => $InstanceID,
             ];
         }

diff --git a/Bosch SmartHome Device/locale.json b/Bosch SmartHome Device/locale.json
@@ -80,7 +80,12 @@
             "Temperature offset": "Temperaturoffset",
             "Terminal configuration": "Terminalkonfiguration",
             "Bypass": "Umgangen",
-            "Vibration sensor": "Vibrationssensor"
+            "Vibration sensor": "Vibrationssensor",
+            "Surveillance alarm status": "Alarmstatus",
+            "Control": "Steuerung",
+            "Active profile": "Aktives Profil",
+            "Activation delay time": "Aktivierungsverzögerungszeit",
+            "Alarm delay time": "Alarmverzögerungszeit"
         }
     }
 }
diff --git a/Bosch SmartHome IO/form.json b/Bosch SmartHome IO/form.json
@@ -61,7 +61,7 @@
                     {
                         "type": "PasswordTextBox",
                         "name": "Password",
-                        "caption": "Password"
+                        "caption": "System password"
                     }
                 ]
             }

diff --git a/Bosch SmartHome IO/locale.json b/Bosch SmartHome IO/locale.json
@@ -9,7 +9,7 @@
             "Show Controller II": "Zeige Controler II",
             "Please start paring with the Controller!": "Bitte starten Sie das Pairing mit dem Controller!",
             "Press the Bosch Smart Home Controller's front-side button number %d, until the LED begin flashing.\r\n\r\nEnter your Bosch Smart Home Controller system password into the Textbox below\r\n and then click the \"Pair\" button.": "Drücken Sie die Taste %d auf der Vorderseite des Bosch Smart Home Controllers, bis die LED zu blinken beginnt.\r\n\r\nGeben Sie Ihr Bosch Smart Home Controller Systempasswort in das Textfeld unten ein\r\n und klicken Sie dann auf die Schaltfläche \"Koppeln\".",
-            "Password": "Passwort",
+            "System password": "Systempasswort ",
             "Cannot connect to SHC": "Kann keine Verbindung zum SHC herstellen",
             "Unauthorized": "Nicht autorisiert",
             "Symcon is not paired with SHC": "Symcon ist nicht mit SHC gekoppelt",

diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ Einbinden von Bosch SmartHome Geräten und Dienstes über den Bosch SmartHome Co
 ### 2. Changelog
 
 ---  
-**Version 0.60:**  
+**Version 0.70:**  
 - Beta Release für Symcon 7.0  
 
 ----------

diff --git a/library.json b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "7.0"
     },
-    "version": "0.6",
-    "build": 60,
-    "date": 1704569112
+    "version": "0.7",
+    "build": 70,
+    "date": 1705266469
 }
diff --git a/libs/Services.php b/libs/Services.php
@@ -63,30 +63,14 @@ class Services
         public const Thermostat = 'Thermostat';
         public const Bypass = 'Bypass';
         public const VibrationSensor = 'VibrationSensor';
+        public const SurveillanceAlarm = 'SurveillanceAlarm';
+        public const IntrusionDetectionControl = 'IntrusionDetectionControl';
         //skipped Services
         public const ThermostatSupportedControlMode = 'ThermostatSupportedControlMode';
         public const TemperatureLevelConfiguration = 'TemperatureLevelConfiguration';
+
         //todo
-        public const IntrusionDetectionControl = 'IntrusionDetectionControl';
         /*
-            armingState: {
-        value: {
-            'SYSTEM_ARMING': 'SYSTEM_ARMING',
-            'SYSTEM_ARMED': 'SYSTEM_ARMED',
-            'SYSTEM_DISARMED': 'SYSTEM_DISARMED',
-            'MUTE_ALARM': 'MUTE_ALARM'
-        }*/
-        public const SurveillanceAlarm = 'SurveillanceAlarm';
-        /*
-            alarmState: {
-        value: {
-            'ALARM_ON': 'ALARM_ON',
-            'ALARM_OFF': 'ALARM_OFF',
-            'ALARM_MUTED': 'ALARM_MUTED',
-            'PRE_ALARM': 'PRE_ALARM',
-            'UNKNOWN': 'UNKNOWN'
-        }
-    },
         "@type": "systemState",
     "systemAvailability": {
         "@type": "systemAvailabilityState",
@@ -152,6 +136,8 @@ class Services
             self::VibrationSensor,
             self::ThermostatSupportedControlMode,
             self::TemperatureLevelConfiguration,
+            self::SurveillanceAlarm,
+            self::IntrusionDetectionControl
         ];
 
         public static function ServiceIsValid(string $Service): bool
@@ -1228,6 +1214,50 @@ class VibrationSensor extends ServiceBasics
             ]
         ];
     }
+    class SurveillanceAlarm extends ServiceBasics
+    {
+        protected static $properties = [
+            'value' => [
+                'type'       => 'string',
+                IPSProfile   => 'BSH.SurveillanceAlarm.value',
+                IPSVarType   => VARIABLETYPE_STRING,
+                IPSVarName   => 'Surveillance alarm status'
+            ]
+        ];
+    }
+    class IntrusionDetectionControl extends ServiceBasics
+    {
+        protected static $properties = [
+            'value' => [
+                'type'       => 'string',
+                IPSProfile   => 'BSH.IntrusionDetectionControl.value',
+                IPSVarType   => VARIABLETYPE_STRING,
+                IPSVarAction => true,
+                IPSVarName   => 'Control'
+            ],
+            'activeProfile'           => [
+                'type'       => 'number',
+                IPSProfile   => 'BSH.IntrusionDetectionControl.activeProfile',
+                IPSVarType   => VARIABLETYPE_INTEGER,
+                IPSVarAction => true,
+                IPSVarName   => 'Active profile'
+            ],
+            'armActivationDelayTime'  => [
+                'type'       => 'number',
+                IPSProfile   => 'BSH.IntrusionDetectionControl.DelayTime',
+                IPSVarType   => VARIABLETYPE_INTEGER,
+                IPSVarAction => true,
+                IPSVarName   => 'Activation delay time'
+            ],
+            'alarmActivationDelayTime'=> [
+                'type'       => 'number',
+                IPSProfile   => 'BSH.IntrusionDetectionControl.DelayTime',
+                IPSVarType   => VARIABLETYPE_INTEGER,
+                IPSVarAction => true,
+                IPSVarName   => 'Alarm delay time'
+            ]
+        ];
+    }
     /**
      * ThermostatSupportedControlMode
      *
@@ -1653,6 +1683,51 @@ protected function RegisterProfiles()
                     ['UPDATE_AVAILABLE', $this->TranslateProfile('update available'), '', -1],
                 ]
             );
+            $this->RegisterProfileStringEx(
+                \BoschSHC\Services\SurveillanceAlarm::getIPSProfile('value'),
+                '',
+                '',
+                '',
+                [
+                    ['ALARM_ON', $this->TranslateProfile('on'), '', 0xff0000],
+                    ['ALARM_OFF', $this->TranslateProfile('off'), '', 0x00ff00],
+                    ['ALARM_MUTED', $this->TranslateProfile('muted'), '', 0x0000ff],
+                    ['PRE_ALARM', $this->TranslateProfile('Pre-alarm'), '', 0x900000],
+                    ['UNKNOWN', $this->TranslateProfile('unknown'), '', -1],
+                ]
+            );
+            $this->RegisterProfileStringEx(
+                \BoschSHC\Services\IntrusionDetectionControl::getIPSProfile('value'),
+                '',
+                '',
+                '',
+                [
+                    ['SYSTEM_ARMING', $this->TranslateProfile('is arming'), '', 0x900000],
+                    ['SYSTEM_ARMED', $this->TranslateProfile('armed'), '', 0xff0000],
+                    ['SYSTEM_DISARMED', $this->TranslateProfile('disarmed'), '', 0x00ff00],
+                    ['MUTE_ALARM', $this->TranslateProfile('muted'), '', 0x0000ff]
+                ]
+            );
+            $this->RegisterProfileIntegerEx(
+                \BoschSHC\Services\IntrusionDetectionControl::getIPSProfile('activeProfile'),
+                '',
+                '',
+                '',
+                [
+                    [0, $this->TranslateProfile('full protection'), '', -1],
+                    [1, $this->TranslateProfile('partial protection'), '', -1],
+                    [2, $this->TranslateProfile('customized protection'), '', -1]
+                ]
+            );
+            $this->RegisterProfileInteger(
+                \BoschSHC\Services\IntrusionDetectionControl::getIPSProfile('DelayTime'),
+                'Clock',
+                '',
+                $this->TranslateProfile(' seconds'),
+                0,
+                600,
+                1
+            );
         }
         protected function UnregisterProfiles()
         {
@@ -1689,6 +1764,10 @@ protected function UnregisterProfiles()
             $this->UnregisterProfile(\BoschSHC\Services\TemperatureOffset::getIPSProfile('offset'));
             $this->UnregisterProfile(\BoschSHC\Services\TerminalConfiguration::getIPSProfile('type'));
             $this->UnregisterProfile(\BoschSHC\Services\SoftwareUpdate::getIPSProfile('swUpdateState'));
+            $this->UnregisterProfile(\BoschSHC\Services\SurveillanceAlarm::getIPSProfile('value'));
+            $this->UnregisterProfile(\BoschSHC\Services\IntrusionDetectionControl::getIPSProfile('value'));
+            $this->UnregisterProfile(\BoschSHC\Services\IntrusionDetectionControl::getIPSProfile('activeProfile'));
+            $this->UnregisterProfile(\BoschSHC\Services\IntrusionDetectionControl::getIPSProfile('DelayTime'));
         }
     }
 }
diff --git a/libs/locale_profile.json b/libs/locale_profile.json
@@ -58,7 +58,11 @@
             "not connected": "nicht verbunden",
             "no update available": "Kein Update verfügbar",
             "update in progress": "Update wird durchgeführt",
-            "update available": "Update Verfügbar"
+            "update available": "Update Verfügbar",
+            "Pre-alarm": "Voralarm",
+            "disarmed": "Unscharf",
+            "armed": "Scharf",
+            "is arming": "wird scharf"
         }
     }
 }