Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/class/ajaxSystem.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ public static function templateWidget() {
'test' => array(
array('operation' => '#value# == "ARMED"', 'state_light' => '<i class="fas fa-lock"></i>'),
array('operation' => '#value# == "DISARMED"', 'state_light' => '<i class="fas fa-lock-open"></i>'),
array('operation' => '#value# == "ARMED_NIGHT_MODE_OFF"', 'state_light' => '<i class="fas fa-lock"></i>'),
array('operation' => '#value# == "DISARMED_NIGHT_MODE_ON"', 'state_light' => '<i class="fas fa-moon"></i>'),
array('operation' => '#value# == "DISARMED_NIGHT_MODE_OFF"', 'state_light' => '<i class="fas fa-lock-open"></i>'),
array('operation' => '#value# == "NIGHT_MODE"', 'state_light' => '<i class="fas fa-moon"></i>'),
array('operation' => '#value# == "ARMED_NIGHT_MODE_ON"', 'state_light' => '<i class="fas fa-lock"></i>'),
array('operation' => '#value# == "PANIC"', 'state_light' => '<i class="fas fa-exclamation-circle"></i>')
)
);
Expand Down
77 changes: 77 additions & 0 deletions core/config/devices/FireProtect2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"name" : "Détecteur de fumée 2",
"commands" : [
{
"name": "Etat",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "state"
},
{
"name": "Source evenement",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "sourceObjectName"
},
{
"name": "Evenement",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "event"
},
{
"name": "Code evenement",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "eventCode"
},
{
"name": "Température",
"type": "info",
"subtype": "numeric",
"isVisible": 1,
"isHistorized": 1,
"logicalId": "temperature",
"generic_type": "TEMPERATURE",
"unite" : "°C"
},
{
"name": "Trafiqué",
"type": "info",
"subtype": "binary",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "tampered",
"configuration": {
"repeatEventManagement": "always"
}
},
{
"name": "En ligne",
"type": "info",
"subtype": "binary",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "online",
"configuration": {
"repeatEventManagement": "always"
}
},
{
"name": "Signal",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "signalLevel"
}
]
}
Binary file added core/config/devices/FireProtect2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 77 additions & 0 deletions core/config/devices/FireProtect2Plus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"name" : "Détecteur de fumée 2 plus",
"commands" : [
{
"name": "Etat",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "state"
},
{
"name": "Source evenement",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "sourceObjectName"
},
{
"name": "Evenement",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "event"
},
{
"name": "Code evenement",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "eventCode"
},
{
"name": "Température",
"type": "info",
"subtype": "numeric",
"isVisible": 1,
"isHistorized": 1,
"logicalId": "temperature",
"generic_type": "TEMPERATURE",
"unite" : "°C"
},
{
"name": "Trafiqué",
"type": "info",
"subtype": "binary",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "tampered",
"configuration": {
"repeatEventManagement": "always"
}
},
{
"name": "En ligne",
"type": "info",
"subtype": "binary",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "online",
"configuration": {
"repeatEventManagement": "always"
}
},
{
"name": "Signal",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "signalLevel"
}
]
}
Binary file added core/config/devices/FireProtect2Plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/config/devices/FireProtect2Plus_black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/config/devices/FireProtect2Plus_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/config/devices/FireProtect2_black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/config/devices/FireProtect2_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 58 additions & 5 deletions core/config/devices/LifeQuality.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,59 @@
{
"name" : "Life Quality",
"commands" : [

]
}
"name": "Life Quality",
"commands": [
{
"name": "Temperature",
"type": "info",
"subtype": "numeric",
"isVisible": 1,
"isHistorized": 1,
"unite": "°C",
"generic_type": "TEMPERATURE",
"logicalId": "actualTemperature",
"configuration": {
"calculValueOffset": "#value# / 10"
}
},
{
"name": "Humidity",
"type": "info",
"subtype": "numeric",
"isVisible": 1,
"isHistorized": 1,
"unite": "%",
"generic_type": "HUMIDITY",
"logicalId": "actualHumidity",
"configuration": {
"calculValueOffset": "#value# / 10"
}
},
{
"name": "CO2",
"type": "info",
"subtype": "numeric",
"isVisible": 1,
"isHistorized": 1,
"unite": "ppm",
"generic_type": "CO2",
"logicalId": "actualCO2"
},
{
"name": "Battery",
"type": "info",
"subtype": "numeric",
"isVisible": 1,
"isHistorized": 0,
"unite": "%",
"generic_type": "BATTERY",
"logicalId": "batteryChargeLevelPercentage"
},
{
"name": "Signal",
"type": "info",
"subtype": "string",
"isVisible": 0,
"isHistorized": 0,
"logicalId": "signalLevel"
}
]
}
6 changes: 5 additions & 1 deletion docs/de_DE/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
>
>Zur Erinnerung: Wenn keine Informationen zur Aktualisierung vorliegen, liegt dies daran, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt

-
-

- )
# 02/07/2025

- Ajout du hub Superior Hub Hybrid (4G)

# 17/06/2025

Expand Down
6 changes: 5 additions & 1 deletion docs/en_US/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
>
>As a reminder, if there is no information on the update, it is because it concerns only the update of documentation, translation or text

-
-

- )
# 02/07/2025

- Ajout du hub Superior Hub Hybrid (4G)

# 17/06/2025

Expand Down
6 changes: 5 additions & 1 deletion docs/es_ES/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
>
>Como recordatorio, si no hay información sobre la actualización es porque se trata solo de la actualización de la documentación, la traducción o el texto

-
-

- )
# 02/07/2025

- Ajout du hub Superior Hub Hybrid (4G)

# 17/06/2025

Expand Down
5 changes: 5 additions & 0 deletions docs/fr_FR/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
>
>Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte

# 25/11/2025

- Ajout du Fire Protect 2
- Ajout du Fire Protect 2 plus

# 02/07/2025

- Ajout du hub Superior Hub Hybrid (4G)
Expand Down
5 changes: 4 additions & 1 deletion docs/i18n/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"changelog.md": {
"Changelog Ajax Systems": "Änderungsprotokoll Ajax-Systeme",
"Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Zur Erinnerung: Wenn keine Informationen zur Aktualisierung vorliegen, liegt dies daran, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt",
"Ajout du hub Superior Hub Hybrid (4G": "",
"Ajout du Fire Protect 2": "",
"Ajout du Fire Protect 2 plus": "",
"02\/07\/2025": "02\/07\/2025",
"Ajout du hub Superior Hub Hybrid (4G": "Ajout du hub Superior Hub Hybrid (4G",
"17\/06\/2025": "17\/06\/2025",
"Ajout du waterstop": "Ajout du waterstop",
"Meilleur gestion des requetes au cloud": "Bessere Verwaltung von Cloud-Anfragen",
Expand Down
5 changes: 4 additions & 1 deletion docs/i18n/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"changelog.md": {
"Changelog Ajax Systems": "Changelog Ajax Systems",
"Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "As a reminder, if there is no information on the update, it is because it concerns only the update of documentation, translation or text",
"Ajout du hub Superior Hub Hybrid (4G": "",
"Ajout du Fire Protect 2": "",
"Ajout du Fire Protect 2 plus": "",
"02\/07\/2025": "02\/07\/2025",
"Ajout du hub Superior Hub Hybrid (4G": "Ajout du hub Superior Hub Hybrid (4G",
"17\/06\/2025": "17\/06\/2025",
"Ajout du waterstop": "Ajout du waterstop",
"Meilleur gestion des requetes au cloud": "Better cloud query management",
Expand Down
5 changes: 4 additions & 1 deletion docs/i18n/es_ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"changelog.md": {
"Changelog Ajax Systems": "Registro de cambios de sistemas Ajax",
"Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Como recordatorio, si no hay información sobre la actualización es porque se trata solo de la actualización de la documentación, la traducción o el texto",
"Ajout du hub Superior Hub Hybrid (4G": "",
"Ajout du Fire Protect 2": "",
"Ajout du Fire Protect 2 plus": "",
"02\/07\/2025": "02\/07\/2025",
"Ajout du hub Superior Hub Hybrid (4G": "Ajout du hub Superior Hub Hybrid (4G",
"17\/06\/2025": "17\/06\/2025",
"Ajout du waterstop": "Ajout du waterstop",
"Meilleur gestion des requetes au cloud": "Mejor gestión de las solicitudes en la nube",
Expand Down
3 changes: 3 additions & 0 deletions docs/i18n/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"Changelog Ajax Systems": "Changelog Ajax Systems",
"IMPORTANT": "IMPORTANT",
"Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte",
"Ajout du Fire Protect 2": "Ajout du Fire Protect 2",
"Ajout du Fire Protect 2 plus": "Ajout du Fire Protect 2 plus",
"02\/07\/2025": "02\/07\/2025",
"Ajout du hub Superior Hub Hybrid (4G": "Ajout du hub Superior Hub Hybrid (4G",
"17\/06\/2025": "17\/06\/2025",
"Ajout du waterstop": "Ajout du waterstop",
Expand Down
5 changes: 4 additions & 1 deletion docs/i18n/pt_PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"changelog.md": {
"Changelog Ajax Systems": "Sistemas Ajax de registro de mudanças",
"Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Recorde-se que, se não existe informação sobre a atualização, é porque se trata apenas de atualização de documentação, tradução ou texto",
"Ajout du hub Superior Hub Hybrid (4G": "",
"Ajout du Fire Protect 2": "",
"Ajout du Fire Protect 2 plus": "",
"02\/07\/2025": "02\/07\/2025",
"Ajout du hub Superior Hub Hybrid (4G": "Ajout du hub Superior Hub Hybrid (4G",
"17\/06\/2025": "17\/06\/2025",
"Ajout du waterstop": "Ajout du waterstop",
"Meilleur gestion des requetes au cloud": "Melhor gerenciamento de solicitações de nuvem",
Expand Down
6 changes: 5 additions & 1 deletion docs/pt_PT/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
>
>Recorde-se que, se não existe informação sobre a atualização, é porque se trata apenas de atualização de documentação, tradução ou texto

-
-

- )
# 02/07/2025

- Ajout du hub Superior Hub Hybrid (4G)

# 17/06/2025

Expand Down
Loading