diff --git a/core/class/AbeilleCmdProcess.class.php b/core/class/AbeilleCmdProcess.class.php index 7e7c5faf82..465b2168c9 100755 --- a/core/class/AbeilleCmdProcess.class.php +++ b/core/class/AbeilleCmdProcess.class.php @@ -230,10 +230,12 @@ function formatAttribute($valIn, $type) { case '10': case '18': // map8 case '20': // uint8 + case '30': // enum8 $valOut = sprintf("%02X", $valIn); break; case 'uint16': case '21': + case '31': // enum16 $valOut = sprintf("%04X", $valIn); break; case 'uint24': diff --git a/core/config/devices/volet/volet.json b/core/config/devices/volet/volet.json index c33bbdfa35..dc3e4467f1 100755 --- a/core/config/devices/volet/volet.json +++ b/core/config/devices/volet/volet.json @@ -16,7 +16,8 @@ "commands": { "Identify": { "use": "act_zbCmdC-Identify", - "isVisible": 1 + "isVisible": 1, + "nextLine": "After" }, "Down": { "use": "act_zbCmdC-0008-DownClose", diff --git a/desktop/modal/AbeilleCompatibility.modal.php b/desktop/modal/AbeilleCompatibility.modal.php index 46f070e941..5ced7d444b 100644 --- a/desktop/modal/AbeilleCompatibility.modal.php +++ b/desktop/modal/AbeilleCompatibility.modal.php @@ -1,47 +1,58 @@ {{Equipements supportés}}"; echo "Les docs stockées de chaque équipement sont accessibles via un clic sur le champ 'ID Zigbee'. Si pas de doc, vous tomberez sur une page du type 'erreur 404'

"; echo ''; // echo ""; echo ''; + echo ''; echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; - echo ''; echo ''; - foreach ( $eqList as $eq ) { + foreach ($eqList as $eq) { echo ''; + echo ''; echo ''; echo ''; echo ''; - echo ''; - echo ''; + echo ''; echo ''."\n"; } echo "
Equipements supportés
IconeFabricantModèleNomModèleTypeID ZigbeeIcone
'.$eq['manufacturer'].''.$eq['model'].''.$eq['type'].''.$eq['jsonId'].''.$eq['modelSig'].'
"; //--------------------------------------------------------------------- - echo "

{{Equipements et fonctions associées}}

"; - echo "\n"; - echo "\n"; + // echo "

{{Equipements et fonctions associées}}

"; + // echo "
{{Nom}}{{Nom Zigbee}}{{Fonction}}
\n"; + // echo "\n"; - sort( $result ); - foreach ( $result as $line ) echo $line."\n"; - echo "
{{Nom}}{{Nom Zigbee}}{{Fonction}}
\n"; + // sort( $result ); + // foreach ( $result as $line ) echo $line."\n"; + // echo "\n"; //--------------------------------------------------------------------- - echo "

{{Fonctions utilisées}}

"; - $includeList = array_column( $resultRaw, 'fonction'); - $includeList = array_unique($includeList); - sort( $includeList ); - foreach ( $includeList as $value ) echo $value."
\n"; + // echo "

{{Fonctions utilisées}}

"; + // $includeList = array_column($resultRaw, 'fonction'); + // $includeList = array_unique($includeList); + // sort( $includeList ); + // foreach ( $includeList as $value ) echo $value."
\n"; } function equipementAdoc( $eqList, $resultRaw, $result) { @@ -88,7 +99,7 @@ function addToFile($fileName, $text, $append = true) { // addToFile(rstFile, "Dernière mise-à-jour le ".date('Y-m-d')."\n\n"); // foreach ( $eqList as $eq ) { - // echo "- ".$eq['jsonId']."\n"; + // echo "- ".$eq['modelName']."\n"; // if (isset($eq['manufacturer'])) // echo " manuf : ".$eq['manufacturer']."\n"; // if (isset($eq['model'])) @@ -109,33 +120,49 @@ function addToFile($fileName, $text, $append = true) { require_once __DIR__.'/../../core/class/AbeilleTools.class.php'; // Collecting list of supported devices (by their JSON) - $devList = AbeilleTools::getDevicesList('Abeille'); - foreach ($devList as $jsonId => $dev) { + $modelsList = AbeilleTools::getDevicesList('Abeille'); + // logDebug("modelsList=".json_encode($modelsList)); + $eqList = []; + $resultRaw = []; + $result = []; + foreach ($modelsList as $modelSig => $model) { + // logDebug("LA model=".json_encode($model)); + + $modelName = $model['modelName']; + $path = __DIR__.'/../../core/config/devices/'.$modelName.'/'.$modelName.'.json'; + if (!file_exists($path)) { + logDebug("ERROR: Path does not exists: ${path}"); + continue; + } + $contentJSON = file_get_contents($path); + $content = json_decode($contentJSON, true); + $content = $content[$modelName]; // Skip top 'modelName' key + // logDebug("LA2 content=".json_encode($content)); $eqList[] = array( - 'manufacturer' => $dev["manufacturer"], - 'model' => $dev["model"], - 'type' => $dev["type"], - 'jsonId' => $jsonId, - 'icon' => $dev["icon"] + 'modelSig' => $modelSig, + 'modelName' => $modelName, + 'manufacturer' => isset($content["manufacturer"]) ? $content["manufacturer"] : '', + 'model' => isset($content["model"]) ? $content["model"] : '', + 'type' => isset($content["type"]) ? $content["type"] : '', + 'icon' => isset($content["configuration"]["icon"]) ? $content["configuration"]["icon"] : '', ); // Collect all information related to Command used by the products - $path = __DIR__.'/../../core/config/devices/'.$jsonId.'/'.$jsonId.'.json'; - $contentJSON = file_get_contents($path); - $content = json_decode($contentJSON, true); - if (isset($content[$jsonId]['commands'])) { - $commands = $content[$jsonId]['commands']; - foreach ($commands as $include) { + if (isset($content['commands'])) { + $commands = $content['commands']; + // logDebug("LA commands=".json_encode($commands)); + foreach ($commands as $cmdName => $cmd) { $resultRaw[] = array( - 'jsonId' => $jsonId, - 'type' => $content[$jsonId]["type"], - 'fonction' => $include + 'modelName' => $modelName, + 'type' => $content["type"], + 'fonction' => $cmdName ); - $result[] = "".$content[$jsonId]["type"]."".$jsonId."".$include.""; + $result[] = "".$content["type"]."".$modelName."".$cmdName.""; } } } + // logDebug("eqList=".json_encode($eqList)); // Met en forme. if (isset($argv[1])) { diff --git a/docs/fr_FR/Changelog.rst b/docs/fr_FR/Changelog.rst index 3543ad91ae..a0f1107d5b 100644 --- a/docs/fr_FR/Changelog.rst +++ b/docs/fr_FR/Changelog.rst @@ -1,6 +1,9 @@ ChangeLog ========= +231128-BETA-1 +------------- + - Interne: Cmd: 'configureReporting2' completement revu. - Ikea Tradfri E27 LED2102G3: Correction image (2626). - Icones: Qq images renommées @@ -14,6 +17,8 @@ ChangeLog - 'TRADFRIbulbE27WSopal1000lm' => 'Ikea-BulbE27', - 'TRADFRIbulbE27WW806lm' => 'Ikea-BulbE27', - Interne: Cmd: Mise-à-jour formatAttribute(). +- Interne: Cmd: Correction formatAtrtibute() pour type 0x30/enum8. +- Page 'compatibilité' revue. 231127-BETA-3 ------------- diff --git a/plugin_info/Abeille.md5 b/plugin_info/Abeille.md5 index 1a2d02cb2c..c4415d45ce 100755 --- a/plugin_info/Abeille.md5 +++ b/plugin_info/Abeille.md5 @@ -1,5 +1,5 @@ # Auto-generated Abeille's MD5 file. DO NOT MODIFY ! -# VERSION="231127-BETA-3" +# VERSION="231128-BETA-1" xxxxxxxxx-md5-skipped-xxxxxxxxxx *.editorconfig xxxxxxxxx-md5-skipped-xxxxxxxxxx *.gitattributes xxxxxxxxx-md5-skipped-xxxxxxxxxx *.github/dependabot.yml @@ -46,7 +46,7 @@ f9431b00f8b647866324fd30909a66eb *core/class/Abeille.class.php 267abc4c20c585327955ad100799c391 *core/class/AbeilleCmd.class.php 0b2353f1120d43803789c7e32b4b9004 *core/class/AbeilleCmdPrepare.class.php e7bb32c31a98fb0d1ba1991ed1407030 *core/class/AbeilleCmdPrepareTest.class.php -a8718b23b630c3b0afaffa528c993fdc *core/class/AbeilleCmdProcess.class.php +062de0a3763fd4caf318973f93bab2b6 *core/class/AbeilleCmdProcess.class.php 2b7d22f142c9959cd00e3a9bebf476a1 *core/class/AbeilleCmdProcessTest.class.php 711c87c531ad163262df0a912275ee93 *core/class/AbeilleCmdQueue.class.php 78bf2bef603ddf7003465fb0a3a6b36a *core/class/AbeilleCmdTest.class.php @@ -798,7 +798,7 @@ c1a6f084241f82ed12bbe292149fdbc4 *core/config/devices/PAR1650TW/PAR1650TW.json 544d86316b5cf82874f93a4cc735d529 *core/config/devices/PIR323-PTH_OWON/discovery-PIR323-PTH_OWON.json 74ece216ff69890a8652fa1cfd462f18 *core/config/devices/PIRSensor-EF-3.0_HEIMAN/PIRSensor-EF-3.0_HEIMAN.json f9bac7896fc1205a90ed393845c27693 *core/config/devices/PIRSensor-EF-3.0_HEIMAN/discovery-PIRSensor-EF-3.0_HEIMAN.json -7b887ad308954b0988b2be81afb17136 *core/config/devices/PRZ/PRZ.json +3dafe521bff27bc3d0e837ff2afd12b6 *core/config/devices/PRZ/PRZ.json efdd860475dbea7efd12336b6b9c4b92 *core/config/devices/PSE03-v1.1.0/PSE03-v1.1.0.json be7c8a7a86fb26c7b4b07071bcd3efce *core/config/devices/PSE03-v1.1.0/notes.txt 5b4f6f41cf5fa2375fa0e395c9e19300 *core/config/devices/Plug01/Plug01.json @@ -864,25 +864,25 @@ a902fe9ac00ed5cee9d5aac03888be59 *core/config/devices/TRADFRISHORTCUTButton/TRAD e1afae4f5bb3ea7f7ef3f23ddf944064 *core/config/devices/TRADFRIbulbE14CWS470lm/TRADFRIbulbE14CWS470lm.json 1cfddf7d8ee43ad0e781344097766200 *core/config/devices/TRADFRIbulbE14CWS470lm/discovery.json 6101a7a8c87a8926e0601a4ec25ed379 *core/config/devices/TRADFRIbulbE14CWSopal600lm/TRADFRIbulbE14CWSopal600lm.json -52e2cfbed349de10c64cb20292c56da0 *core/config/devices/TRADFRIbulbE14WS470lm/TRADFRIbulbE14WS470lm.json -f10e95de0c72696f7d7120d72d8f2c15 *core/config/devices/TRADFRIbulbE14WScandleopal470lm/TRADFRIbulbE14WScandleopal470lm.json +661cb595a63dad7a0074b44a9f819bbe *core/config/devices/TRADFRIbulbE14WS470lm/TRADFRIbulbE14WS470lm.json +f1fe39f5993ab9b3bac4b9b507af9448 *core/config/devices/TRADFRIbulbE14WScandleopal470lm/TRADFRIbulbE14WScandleopal470lm.json 65db035bc3933336390794b6034ca722 *core/config/devices/TRADFRIbulbE14WScandleopal470lm/discovery.json dfebc9ca1b2b508f26a6957aa781e9f7 *core/config/devices/TRADFRIbulbE14WSglobe470lm/TRADFRIbulbE14WSglobe470lm.json 32f4b8e24485a1e9a1b3d35fa40aee83 *core/config/devices/TRADFRIbulbE14WSglobe470lm/discovery-TRADFRIbulbE14WSglobe470lm_IKEAofSweden.json -bc2a2d980528c611d8c2314d06be96d7 *core/config/devices/TRADFRIbulbE14WSopal400lm/TRADFRIbulbE14WSopal400lm.json +3e51d68d6e73914b3794601d53a08482 *core/config/devices/TRADFRIbulbE14WSopal400lm/TRADFRIbulbE14WSopal400lm.json 73521ce5c4308e459163b4eb648bc713 *core/config/devices/TRADFRIbulbE14WSopal600lm/TRADFRIbulbE14WSopal600lm.json -9d26f77fad291248514fe025703bc9ff *core/config/devices/TRADFRIbulbE14Wopch400lm/TRADFRIbulbE14Wopch400lm.json +1ac866407f54d24e12341005bf9bf9c6 *core/config/devices/TRADFRIbulbE14Wopch400lm/TRADFRIbulbE14Wopch400lm.json e4b62b6ac2f33585b6586eba0365d7b2 *core/config/devices/TRADFRIbulbE26WSclear950lm/TRADFRIbulbE26WSclear950lm.json bd27da5d31cc2488c2deca1bd622d392 *core/config/devices/TRADFRIbulbE27CWS806lm/TRADFRIbulbE27CWS806lm.json 2719f387f9aef1dddd1e8c25d73ceec4 *core/config/devices/TRADFRIbulbE27CWS806lm/discovery.json 1790fb2e8a22c36f5994545144cb1ff8 *core/config/devices/TRADFRIbulbE27CWSopal600lm/TRADFRIbulbE27CWSopal600lm.json 65a051c3fe7c66567390141ff606fb25 *core/config/devices/TRADFRIbulbE27WSclear806lm/TRADFRIbulbE27WSclear806lm.json 6a8760389517a98d8880725ad0a3e80f *core/config/devices/TRADFRIbulbE27WSclear950lm/TRADFRIbulbE27WSclear950lm.json -b8aefdadc4dd03f6dac0d4b6bb094213 *core/config/devices/TRADFRIbulbE27WSglobeopal1055lm/TRADFRIbulbE27WSglobeopal1055lm.json -278152b46e15f09184ce09a19aa4a067 *core/config/devices/TRADFRIbulbE27WSopal1000lm/TRADFRIbulbE27WSopal1000lm.json +804e526122d3b3690b31efc0bb848787 *core/config/devices/TRADFRIbulbE27WSglobeopal1055lm/TRADFRIbulbE27WSglobeopal1055lm.json +e5c3600857ba776d6c426170d55535e3 *core/config/devices/TRADFRIbulbE27WSopal1000lm/TRADFRIbulbE27WSopal1000lm.json 2631723a98ca6e28e030741a96584fc3 *core/config/devices/TRADFRIbulbE27WSopal980lm/TRADFRIbulbE27WSopal980lm.json -da91f8af0f5fc9fd94f3de3d7db20a88 *core/config/devices/TRADFRIbulbE27WW806lm/TRADFRIbulbE27WW806lm.json -9a1ec87e00fb47b5b6de43cc3926676b *core/config/devices/TRADFRIbulbE27WWG95CL470lm_IKEAofSweden/TRADFRIbulbE27WWG95CL470lm_IKEAofSweden.json +d26ddc4e658be44572ddebff8fdeafe7 *core/config/devices/TRADFRIbulbE27WW806lm/TRADFRIbulbE27WW806lm.json +7c13cea95f5af172ede06bf0f177d09b *core/config/devices/TRADFRIbulbE27WWG95CL470lm_IKEAofSweden/TRADFRIbulbE27WWG95CL470lm_IKEAofSweden.json b38c832e3d4171814953727a10924127 *core/config/devices/TRADFRIbulbE27WWG95CL470lm_IKEAofSweden/discovery-TRADFRIbulbE27WWG95CL470lm_IKEAofSweden.json f97962ad98e773e7ef6664093a65ae23 *core/config/devices/TRADFRIbulbE27WWclear250lm/TRADFRIbulbE27WWclear250lm.json f8a1adf51db7d8dcf5e9371b7260f5a6 *core/config/devices/TRADFRIbulbE27Wopal1000lm/TRADFRIbulbE27Wopal1000lm.json @@ -916,7 +916,7 @@ a7c546c562fe124aab48303648363e2a *core/config/devices/TS0001/TS0001.json 01bdd74f0b0860765c254510b2e3def4 *core/config/devices/TS0001__TZ3000_hktqahrq/TS0001__TZ3000_hktqahrq.json 3f971d0dc62ad2f0fcf261bf748049f4 *core/config/devices/TS0001__TZ3000_rmjr4ufz/TS0001__TZ3000_rmjr4ufz.json 9586f7bb797ee072f0e78802671824fc *core/config/devices/TS0001__TZ3000_rmjr4ufz/discovery.json -07c650d1c3cd7224b254a15fd4102ceb *core/config/devices/TS0001__TZ3000_tqlv4ug4/TS0001__TZ3000_tqlv4ug4.json +ce30590c30bba8b0c40ba0892d79e3ae *core/config/devices/TS0001__TZ3000_tqlv4ug4/TS0001__TZ3000_tqlv4ug4.json 7b8e1956de6e8c96052ecbd0500ca1af *core/config/devices/TS0001__TZ3000_tqlv4ug4/discovery-TS0001__TZ3000_tqlv4ug4.json 682ccce565d063bf4c818d92ac1b68ca *core/config/devices/TS0002/TS0002.json a2660f27753906228874f3ea194ca70e *core/config/devices/TS0003/TS0003.json @@ -1067,7 +1067,7 @@ e6b6a1ba2c981476a312e78725f5d5cf *core/config/devices/TS0601__TZE200_yvx5lh6k/TS cc3e843cf09714c5143ba954b85eaa00 *core/config/devices/TS0601__TZE204_cjbofhxw/discovery-TS0601__TZE204_cjbofhxw.json 5bf23be4041f64d4093290f9ab393802 *core/config/devices/TS110F__TYZB01_v8gtiaed/TS110F__TYZB01_v8gtiaed.json a518f913eca6255232f1de8ab57d29ad *core/config/devices/TS110F__TYZB01_v8gtiaed/discovery-TS110F__TYZB01_v8gtiaed.json -cc3680ec7aca3dc742e028b57a58d503 *core/config/devices/TS1201__TZ3290_ot6ewjvmejq5ekhl/TS1201__TZ3290_ot6ewjvmejq5ekhl.json +8c70e2fc707d5f571b23e9d52a8a5dec *core/config/devices/TS1201__TZ3290_ot6ewjvmejq5ekhl/TS1201__TZ3290_ot6ewjvmejq5ekhl.json 999cbdc4dea0b6f85ebe86d6ada284cd *core/config/devices/TS1201__TZ3290_ot6ewjvmejq5ekhl/discovery-TS1201__TZ3290_ot6ewjvmejq5ekhl.json ba324f9e0eb0a969e3132517d7124c17 *core/config/devices/TS130F__TZ3000_1dd0d5yi/TS130F__TZ3000_1dd0d5yi.json 0bbef1f26b77c36711b630350d5afba8 *core/config/devices/TS130F__TZ3000_1dd0d5yi/discovery.json @@ -1127,7 +1127,7 @@ c430eb12a0a7363025314cc70a0b33af *core/config/devices/defaultUnknown/defaultUnkn c9412bc1d3af8cd2cdfb0ad907ca82c7 *core/config/devices/diy-mains-fault/diy-mains-fault.json e9b83520e9096c8fe7ee898f7ea043c6 *core/config/devices/diy-routeur/diy-routeur.json 31fd63f2793515cff7188024cc26058b *core/config/devices/eTRV0100/discovery-eTRV0103_Danfoss.json -2653f04e06503e8c7aacbb1180bd5fc4 *core/config/devices/eTRV0100/eTRV0100.json +5880634ef9931b26dba6c4b1e5015023 *core/config/devices/eTRV0100/eTRV0100.json e8fece09da325a689a9633d127d09e97 *core/config/devices/fuel-tank-level/fuel-tank-level.json 561ef1acb0f17bd132be833716901594 *core/config/devices/light.aqcn02/light.aqcn02.json 3802d06d89c8c656e4f5f0747467e2f3 *core/config/devices/magnet.acn001/discovery.json @@ -1195,7 +1195,7 @@ b82b70aca2b8f524b50a7059a58784a7 *core/config/devices/switch.n2aeu1_LUMI/switch. 8976cc43c22b4ee4d83acf0d2560807c *core/config/devices/switch.n3acn3/switch.n3acn3.json 89dde32f535f39636bd144b5c56eabc6 *core/config/devices/vibration.aq1/vibration.aq1.json ef2a20b521eeafe97cd57f2b66aa7b39 *core/config/devices/volet/discovery.json -ab852395ab3f956a4a9e5bdc109da3f0 *core/config/devices/volet/volet.json +c255e586884bb07ad873788f0b71dbb3 *core/config/devices/volet/volet.json df46bdabe4a41a675f3edb30eaeab472 *core/config/devices/weather/weather.json d9cf940d09b4a04406353fe40cadf8d0 *core/config/devices/zigbeeColorDimmableLight/zigbeeColorDimmableLight.json b50a95da84be092fbc1f8dddbde30636 *core/config/devices/zigbeeColortemperaturelight/zigbeeColortemperaturelight.json @@ -1269,7 +1269,7 @@ f43f8f808ea001dff6f5f3a8677c09c8 *core/scripts/waitPortFree.sh ab2db92c2882de39f433722178b19cbd *desktop/js/Abeille.js 2d85a512807ffdc29f5fb6b1ff54b938 *desktop/js/AbeilleNetwork.js d0d1ca56ff2c7b9b33e3f9e1b392e3ba *desktop/modal/Abeille-OTA.modal.php -0620afd56b87a67e1f670dc45fd2da2d *desktop/modal/AbeilleCompatibility.modal.php +6b1220c68b553d5f5e9fb78041a70833 *desktop/modal/AbeilleCompatibility.modal.php 7ca26f7277c821d963f462509d7db7aa *desktop/modal/AbeilleConfigPage.modal.php fc4aeb6d4466598f0acdbd62b0ec22fb *desktop/modal/AbeilleHealth.modal.php 066eb590e69ec549df11007e773aaf63 *desktop/modal/AbeilleLoadJsonCmd.modal.php @@ -1285,10 +1285,10 @@ d473a259cb9defac634d93cd184438d6 *desktop/modal/setBeesTimeout.abeille.php 562de0800b09c34bb2842dc06c747b2a *desktop/php/Abeille-Bees.php 51680e87b6eda6554ccdcdaaa2a74c58 *desktop/php/Abeille-Eq-Advanced-Common.php d8685b3d4ea94fe1c1754c8b6efd68c8 *desktop/php/Abeille-Eq-Advanced-Device.php -349ef338bb2376917f3f5123a425295f *desktop/php/Abeille-Eq-Advanced-Interrogations.php +8963fc08b0dcddd7dd95d4793f54693a *desktop/php/Abeille-Eq-Advanced-Interrogations.php c0bf0b8095847231bba3b0affdaa30c9 *desktop/php/Abeille-Eq-Advanced-Specific.php 68f7bd27b3ba69085837b72e709e1eba *desktop/php/Abeille-Eq-Advanced-Zigate.php -d99036f1ad8a7d1f51ec12a9d21e19b9 *desktop/php/Abeille-Eq-Advanced.php +9145a587ce8467f194f08ecbfe58c526 *desktop/php/Abeille-Eq-Advanced.php bb4f1f9ed4a7865cf3f52f24d9d14186 *desktop/php/Abeille-Eq-Cmds.php 08c45bd8c667f80c2926c84cfa6e0e4e *desktop/php/Abeille-Eq-Main.php 8e594aac1362a68f0b110dbc1d50f058 *desktop/php/Abeille-Eq.php @@ -1306,7 +1306,7 @@ e0f8bf2a302f2fcd97a6cfcabbb847e7 *desktop/php/AbeilleFormAction.php 7d299553e4e5e4e0e368e8afa90a7ad2 *desktop/php/AbeilleMaintenance-Phantoms.php ce32db08df86d3ff94f08d80d463b7f2 *desktop/php/AbeilleMaintenance.php bc533a8c0d225502bb1eb12e4ecc0722 *desktop/php/AbeilleNetworkMap.php -a5e64d43565e9fa8df300fd934a2d49d *docs/fr_FR/Changelog.rst +c78df655d3fb4e2d7ace403c71434d42 *docs/fr_FR/Changelog.rst 2d7942db30537f6f58c830ae01a9958d *images/AbeilleNetworkMap-1200.png 50f49dd37c22f67d0df6cbf5f8499928 *images/AbeilleNetworkMap.png c5242209258a6a3fe0190fed4e97f623 *images/Abeille_icon.png @@ -1332,6 +1332,7 @@ b4d132e686b13c19f17eaa4d7ab042ae *images/node_CLA60RGBWOSRAM.png 244036f6e202aefd5dc0ef7b35027c77 *images/node_COSensor-EM.png 8acbf4ce108b2a50e3733de6d7814363 *images/node_Centralite-3450-Geu.png ad7a80a0332299c24f2d239268302333 *images/node_ColorsBloom.png +0a971ece45e4e1131e06c5f6e799fa45 *images/node_Danfoss-Ally-Thermostat.png 317de5023037203ed652441324ce40d4 *images/node_Delveco-SPLZB-132.png 8c74c7b79d1d65350ee2dca2e0c07fff *images/node_Dimmerswitchwoneutral.png 9c58d98f2a85a9ae552fd726609f1920 *images/node_FLOALTpanelWS60x60.png @@ -1372,8 +1373,9 @@ b0180cfb287fba6ac879ebf92f651523 *images/node_HueGo.png 4c9d6aa3e9bbba635cd46c25d402575d *images/node_Icasa-ICZB-DC11.png 8c86ca042500eca781dd2c1a1b749636 *images/node_Icasa-ICZB-IW11D.png 098a628b2db704c1b6202391aa7b3cc1 *images/node_Icasa-ICZB-IW11SW.png +00d56067f21a49ae7281549403f5f951 *images/node_Ikea-BulbE14-Candle.png 4ad454f465f5c1f1e7c41662a4cff1da *images/node_Ikea-BulbE14-Globe.png -00d56067f21a49ae7281549403f5f951 *images/node_Ikea-BulbE14CandleWhite.png +684325be614a81c684e2a72498ad81d1 *images/node_Ikea-BulbE27-Globe.png b353914359d596bba8a7175b5a1c859f *images/node_Ikea-BulbE27.png f9a8c83d05d66a5623fecb26b1b3a825 *images/node_Ikea-BulbGU10.png eb2b41927d722ea4c7ea819984872b5f *images/node_Ikea-OnOffSwitch.png @@ -1384,7 +1386,6 @@ b3d3a024b10286b98e4fe995be34e96e *images/node_Ikea-Transformer.png c0b2640f0c40ded390c58901b440c55b *images/node_Ikea-Tredansen-White.png 4c8769486ea42db5c939237394ee8c10 *images/node_IkeaTRADFRIbulbGU10WS400lm.png ade775530082512cdb2deee916fdcfc9 *images/node_IkeaTradfri2BtnCarre.png -7979749184f6fa5e40dd373f551e7f0c *images/node_IkeaTradfriBulbE14WSOpal400lm.png 42ff056c7d6c8decc64868d8b4306b84 *images/node_IkeaTradfriBulbGU10W400lm.png f9c5bdad3b63fec85dbcfe13ab0c0866 *images/node_Iluminize-511201.png 6d480171c5047eb93fcb3936f8b94e4d *images/node_Iluminize-511202.png @@ -1473,9 +1474,9 @@ b3147ce74c5cd569b5fbfcef1e094d98 *images/node_Philips-MotionSensor-2.png fd6aafce12b02f5711b15a28ebcbc23a *images/node_PhilipsSignify-Plug.png bfefbb66f4cbe6318e3d8dda5463186d *images/node_PhilipsSignify-RDM001.png ece3df103bb9d9278db499ecaa57fc6a *images/node_Profalux-BSO.png +2aeca60b95c615f6499bfd9fb7c08c6a *images/node_Profalux-LigthModule.png fc3ae24271000807c38a651442beea6e *images/node_Profalux-Remote.png 80447a6edb322ebc399b284e8ba60fe5 *images/node_Profalux-Shutter.png -2aeca60b95c615f6499bfd9fb7c08c6a *images/node_ProfaluxLigthModule.png 8e189d5b3391dcb4b38c3854eae0e084 *images/node_RB175W.png 42584fcb6b390ada2173e6e01a3f7f9d *images/node_RF263.png 535ffb4f6cb77147fe24170a56665d27 *images/node_RF265.png @@ -1509,14 +1510,10 @@ a60015fc47af1ce4f464ff2efc298291 *images/node_Sonoff-SNZB-02.png a729adc75d101964c4f7eaa5d9c0142e *images/node_TI0001.png e3b9b2ad20ef2b68e9c54bfde44cb036 *images/node_TRADFRISHORTCUTButton.png eaf0dcd61ccf0ad96954ac657712b8c7 *images/node_TRADFRIbulbE14CWSopal600lm.png -819a2d9aae2a2b144a710541a1052733 *images/node_TRADFRIbulbE14WS470lm.png a1c2ede99edae00ddbd920dfc2bfe86f *images/node_TRADFRIbulbE14WSopal600lm.png -d0384d7e1cc9aaa0561cb0892dd9d860 *images/node_TRADFRIbulbE14Wopch400lm.png 0cb6f9780eda71f8105763a84f322d84 *images/node_TRADFRIbulbE26WSclear950lm.png 9b259c4d376be66838396cd4c0a9cd9e *images/node_TRADFRIbulbE27CWSopal600lm.png 0cb6f9780eda71f8105763a84f322d84 *images/node_TRADFRIbulbE27WSclear950lm.png -f24f9e9592b7ceacc07c32748b0ea5f0 *images/node_TRADFRIbulbE27WSopal1000lm.png -f24f9e9592b7ceacc07c32748b0ea5f0 *images/node_TRADFRIbulbE27WW806lm.png 1625ab96481bacd317b966289fd8dc34 *images/node_TRADFRIbulbE27WWclear250lm.png 0946b8117957051b35c7634b23e97290 *images/node_TRADFRIbulbGU10WW400lm.png 18ce42a64eab1cb801db406b1519dbeb *images/node_TRADFRIcontroloutlet.png @@ -1623,7 +1620,6 @@ ef8591fe7d264fb22a0a3f5baa8eeacd *images/node_dOOwifi-DWF-0205ZB-PN.png 0d0b62423a2ace4d9421791d88e31b9e *images/node_diy-amp-router.png 99229bd9fc77d11253e512e24eaad188 *images/node_diy-mains-fault.png 0d0b62423a2ace4d9421791d88e31b9e *images/node_diy-routeur.png -0a971ece45e4e1131e06c5f6e799fa45 *images/node_eTRV0100.png 2e49ae0855c36364da8ed83df0dd11ed *images/node_iAlarm-Siren.png b8a68820e04e78733d97a3300f4e12a9 *images/node_light.aqcn02.png 2444cf55f20ef00bf2dd6ed43b866ed5 *images/node_ptvo.switch.png @@ -1645,11 +1641,11 @@ c7b21d7f825a1bf49ba4aea5d5dc7a52 *images/node_zigbeeWindowCoveringDevice.png 0d2a0e4b178ac89579af8d9b68dbc5d3 *mobile/html/Abeille.html 2517e8996a5d2d8bef4dc938d927181d *mobile/js/Abeille.js xxxxxxxxx-md5-skipped-xxxxxxxxxx *plugin_info/Abeille.md5 -6019b75c818ef9c5eda2a55554061256 *plugin_info/Abeille.version +dde8b072ff5c4b3bb8bf3f14473d9097 *plugin_info/Abeille.version c5242209258a6a3fe0190fed4e97f623 *plugin_info/Abeille_icon.png c16154784139bfd2264e4a6409fdc658 *plugin_info/configuration.php -9c0e7cc6b84dc295d2d6394cf5665a51 *plugin_info/info.json -e138d57c38900e275765b1677fc82bf1 *plugin_info/install.php +7392797c8990271f38e56565143715ab *plugin_info/info.json +7f65609a23b7898fdf496297ac9f45be *plugin_info/install.php 40778320ae85eae8aa76a50465ff37e4 *plugin_info/packages.json cbc04c02c72c949415f5d285181813e6 *plugin_info/pre_install.php 9dccf462d245f55ac3e0cdb0e5401f5b *resources/AbeilleDeamon/Debug/verification.php diff --git a/plugin_info/Abeille.version b/plugin_info/Abeille.version index f861b2cfe1..c3b7637fd5 100755 --- a/plugin_info/Abeille.version +++ b/plugin_info/Abeille.version @@ -1,2 +1,2 @@ # Auto-generated Abeille's version -231127-BETA-3 +231128-BETA-1 diff --git a/plugin_info/info.json b/plugin_info/info.json index 477cee4704..1a961afb50 100755 --- a/plugin_info/info.json +++ b/plugin_info/info.json @@ -8,9 +8,9 @@ "require": "4.0", "category": "automation protocol", "mobile": "Abeille", - "changelog": "https://kiwihc16.github.io/AbeilleDoc/Changelog.html#231127-BETA-3", + "changelog": "https://kiwihc16.github.io/AbeilleDoc/Changelog.html#231128-BETA-1", "documentation": "https://kiwihc16.github.io/AbeilleDoc/", - "changelog_beta": "https://kiwihc16.github.io/AbeilleDoc/Changelog.html#231127-BETA-3", + "changelog_beta": "https://kiwihc16.github.io/AbeilleDoc/Changelog.html#231128-BETA-1", "documentation_beta": "https://kiwihc16.github.io/AbeilleDoc/", "languages": ["fr_FR", "en_US"], "compatibility": ["docker", "rpi", "diy", "v4"],