Skip to content

Commit 5f81f90

Browse files
zoic21zoic21
authored
Merge pull request #35 from jeedom/beta
Stable
2 parents a3afe5f + 5a984f9 commit 5f81f90

18 files changed

Lines changed: 312 additions & 5 deletions

‎core/class/ajaxSystem.class.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@ public static function request($_path, $_data = null, $_type = 'GET') {
6767
if ($_type == 'PUT') {
6868
$request_http->setPut(json_encode($_data));
6969
}
70-
$return = json_decode($request_http->exec(30, 1), true);
70+
$return = json_decode($request_http->exec(60, 3), true);
7171
$return = is_json($return, $return);
72-
if (isset($return['error'])) {
73-
throw new \Exception(__('Erreur lors de la requete à Ajax System : ', __FILE__) . json_encode($return));
72+
if (isset($return['error']) || isset($return['errors'])) {
73+
sleep(rand(1,30));
74+
$return = json_decode($request_http->exec(60, 3), true);
75+
$return = is_json($return, $return);
7476
}
75-
if (isset($return['errors'])) {
77+
if (isset($return['error']) || isset($return['errors'])) {
7678
throw new \Exception(__('Erreur lors de la requete à Ajax System : ', __FILE__) . json_encode($return));
7779
}
7880
if (isset($return['body'])) {

‎core/config/devices/FireProtect2PlusSb.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"name" : "Détecteur de fumée et température 2",
3+
"commands" : [
4+
{
5+
"name": "Etat",
6+
"type": "info",
7+
"subtype": "string",
8+
"isVisible": 0,
9+
"isHistorized": 0,
10+
"logicalId": "state"
11+
},
12+
{
13+
"name": "Source evenement",
14+
"type": "info",
15+
"subtype": "string",
16+
"isVisible": 0,
17+
"isHistorized": 0,
18+
"logicalId": "sourceObjectName"
19+
},
20+
{
21+
"name": "Evenement",
22+
"type": "info",
23+
"subtype": "string",
24+
"isVisible": 0,
25+
"isHistorized": 0,
26+
"logicalId": "event"
27+
},
28+
{
29+
"name": "Code evenement",
30+
"type": "info",
31+
"subtype": "string",
32+
"isVisible": 0,
33+
"isHistorized": 0,
34+
"logicalId": "eventCode"
35+
},
36+
{
37+
"name": "Température",
38+
"type": "info",
39+
"subtype": "numeric",
40+
"isVisible": 1,
41+
"isHistorized": 1,
42+
"logicalId": "temperature",
43+
"generic_type": "TEMPERATURE",
44+
"unite" : "°C"
45+
},
46+
{
47+
"name": "Trafiqué",
48+
"type": "info",
49+
"subtype": "binary",
50+
"isVisible": 0,
51+
"isHistorized": 0,
52+
"logicalId": "tampered",
53+
"configuration": {
54+
"repeatEventManagement": "always"
55+
}
56+
},
57+
{
58+
"name": "En ligne",
59+
"type": "info",
60+
"subtype": "binary",
61+
"isVisible": 0,
62+
"isHistorized": 0,
63+
"logicalId": "online",
64+
"configuration": {
65+
"repeatEventManagement": "always"
66+
}
67+
},
68+
{
69+
"name": "Signal",
70+
"type": "info",
71+
"subtype": "string",
72+
"isVisible": 0,
73+
"isHistorized": 0,
74+
"logicalId": "signalLevel"
75+
}
76+
]
77+
}

‎core/config/devices/FireProtect2PlusSb.png‎

21.1 KB
Loading

‎core/config/devices/KeypadTouchscreen.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"name" : "Keypad Plus Touch screen",
3+
"commands" : [
4+
{
5+
"name": "Etat",
6+
"type": "info",
7+
"subtype": "string",
8+
"isVisible": 1,
9+
"isHistorized": 0,
10+
"logicalId": "state"
11+
},
12+
{
13+
"name": "Source evenement",
14+
"type": "info",
15+
"subtype": "string",
16+
"isVisible": 0,
17+
"isHistorized": 0,
18+
"logicalId": "sourceObjectName"
19+
},
20+
{
21+
"name": "Evenement",
22+
"type": "info",
23+
"subtype": "string",
24+
"isVisible": 0,
25+
"isHistorized": 0,
26+
"logicalId": "event"
27+
},
28+
{
29+
"name": "Code evenement",
30+
"type": "info",
31+
"subtype": "string",
32+
"isVisible": 0,
33+
"isHistorized": 0,
34+
"logicalId": "eventCode"
35+
},
36+
{
37+
"name": "Température",
38+
"type": "info",
39+
"subtype": "numeric",
40+
"isVisible": 1,
41+
"isHistorized": 1,
42+
"logicalId": "temperature",
43+
"generic_type": "TEMPERATURE",
44+
"unite" : "°C"
45+
},
46+
{
47+
"name": "Trafiqué",
48+
"type": "info",
49+
"subtype": "binary",
50+
"isVisible": 1,
51+
"isHistorized": 0,
52+
"logicalId": "tampered",
53+
"configuration": {
54+
"repeatEventManagement": "always"
55+
}
56+
},
57+
{
58+
"name": "En ligne",
59+
"type": "info",
60+
"subtype": "binary",
61+
"isVisible": 1,
62+
"isHistorized": 0,
63+
"logicalId": "online",
64+
"configuration": {
65+
"repeatEventManagement": "always"
66+
}
67+
},
68+
{
69+
"name": "Signal",
70+
"type": "info",
71+
"subtype": "string",
72+
"isVisible": 1,
73+
"isHistorized": 0,
74+
"logicalId": "signalLevel"
75+
}
76+
]
77+
}

‎core/config/devices/KeypadTouchscreen.png‎

13.9 KB
Loading

‎core/config/devices/SpaceControl.json‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,29 @@
44
"battery_type" : "1xCR2032A"
55
},
66
"commands" : [
7-
7+
{
8+
"name": "Source evenement",
9+
"type": "info",
10+
"subtype": "string",
11+
"isVisible": 0,
12+
"isHistorized": 0,
13+
"logicalId": "sourceObjectName"
14+
},
15+
{
16+
"name": "Evenement",
17+
"type": "info",
18+
"subtype": "string",
19+
"isVisible": 0,
20+
"isHistorized": 0,
21+
"logicalId": "event"
22+
},
23+
{
24+
"name": "Code evenement",
25+
"type": "info",
26+
"subtype": "string",
27+
"isVisible": 0,
28+
"isHistorized": 0,
29+
"logicalId": "eventCode"
30+
}
831
]
932
}

‎core/config/devices/WaterStop.json‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"name" : "Water stop",
3+
"commands" : [
4+
{
5+
"name": "Source evenement",
6+
"type": "info",
7+
"subtype": "string",
8+
"isVisible": 0,
9+
"isHistorized": 0,
10+
"logicalId": "sourceObjectName"
11+
},
12+
{
13+
"name": "Evenement",
14+
"type": "info",
15+
"subtype": "string",
16+
"isVisible": 0,
17+
"isHistorized": 0,
18+
"logicalId": "event"
19+
},
20+
{
21+
"name": "Code evenement",
22+
"type": "info",
23+
"subtype": "string",
24+
"isVisible": 0,
25+
"isHistorized": 0,
26+
"logicalId": "eventCode"
27+
},
28+
{
29+
"name": "On",
30+
"type": "action",
31+
"subtype": "other",
32+
"isVisible": 1,
33+
"isHistorized": 0,
34+
"logicalId": "SWITCH_ON"
35+
},
36+
{
37+
"name": "Off",
38+
"type": "action",
39+
"subtype": "other",
40+
"isVisible": 1,
41+
"isHistorized": 0,
42+
"logicalId": "SWITCH_OFF"
43+
}
44+
]
45+
}

‎core/config/devices/WaterStop.png‎

15.4 KB
Loading

‎docs/de_DE/changelog.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
>
55
>Zur Erinnerung: Wenn keine Informationen zur Aktualisierung vorliegen, liegt dies daran, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt
66
7+
- Bessere Verwaltung von Cloud-Anfragen
8+
- Ereigniscodes zur Fernbedienung hinzugefügt (Raumsteuerung))
9+
- Ajout de FireProtect2PlusSb
10+
- Ajout de KeypadTouchscreen
11+
12+
# 07.09.2024
13+
14+
- Mindestversion von Core 4.4
15+
- Fehlerbehebung bei bestimmten Gerätekonfigurationen
16+
717
# 01.09.2024
818

919
- Bessere Reinigung von SIA-Bestellungen

‎docs/en_US/changelog.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
>
55
>As a reminder, if there is no information on the update, it is because it concerns only the update of documentation, translation or text
66
7+
- Better cloud query management
8+
- Adding event codes to the remote control (space control)
9+
- Ajout de FireProtect2PlusSb
10+
- Ajout de KeypadTouchscreen
11+
12+
# 07/09/2024
13+
14+
- Minimum core version 4.4
15+
- Bug fix on some equipment configuration
16+
717
# 01/09/2024
818

919
- Better cleaning of SIA controls

0 commit comments

Comments
 (0)