4.8.2b

fusion des versions stable et béta
NextDom · Sep 9, 2023 · 46b1084 · 46b1084
2 parents 0b4c00a + 83e1481
commit 46b1084
Show file tree

Hide file tree

Showing 51 changed files with 3,320 additions and 2,016 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,16 @@
 *.ini
 *.zip
 *.old
+*.pyc
+
+core/class/teleinfo.class - copie.php
+
+ressources/teleinfo - Copie.py
+
+.coveralls.yml
+
+.editorconfig
+
+.project
+
+.travis.yml
diff --git a/.project b/.project
diff --git a/.travis.yml b/.travis.yml
diff --git a/core/ajax/teleinfo.ajax.php b/core/ajax/teleinfo.ajax.php
@@ -35,6 +35,14 @@
             teleinfo::deamon_start();
             ajax::success();
         break;
+        case 'startMqtt':
+            teleinfo::start_Mqtt('', init('socketport'), init('sockethost'), init('modem'), init('mqtt'), init('mqtt_broker'), init('mqtt_port'), init('mqtt_topic'), init('mqtt_username'), init('mqtt_password'));
+            ajax::success();
+        break;
+        case 'stopMqtt':
+            teleinfo::stop_Mqtt();
+            ajax::success();
+        break;
         case 'changeLogLive':
             ajax::success(teleinfo::changeLogLive(init('level')));
         break;
@@ -575,7 +583,7 @@
                 }
                 file_put_contents($monfichier, serialize('||EQLOGIC_END||'), FILE_APPEND | LOCK_EX);
             }
-            $return["files"] = log::getPathToLog('teleinfo'). " " . log::getPathToLog('teleinfo_deamon_conso'). " " . log::getPathToLog('teleinfo_update') . " " . dirname(__FILE__) . '/../../plugin_info/info.json'. " " . $diagnosticFile  . " " . $monfichier;
+            $return["files"] = log::getPathToLog('teleinfo'). " " . log::getPathToLog('teleinfo_deamon_conso') . log::getPathToLog('teleinfo_deamon_mqtt'). " " . log::getPathToLog('teleinfo_mqtt'). " " . log::getPathToLog('teleinfo_update') . " " . dirname(__FILE__) . '/../../plugin_info/info.json'. " " . $diagnosticFile  . " " . $monfichier;
             $return["path"] = jeedom::getTmpFolder("teleinfo") . '/teleinfolog.tar';
             exec('rm ' . jeedom::getTmpFolder("teleinfo") . '/teleinfolog.tar');
             $return["compress"] = exec('tar -cvf ' . jeedom::getTmpFolder("teleinfo") . '/teleinfolog.tar ' . $return["files"]);

diff --git a/core/api/teleinfo.api.php b/core/api/teleinfo.api.php
@@ -23,23 +23,23 @@
     throw new \Exception(__('JSONRPC object not defined', __FILE__), -32699);
 }
 $params = $jsonrpc->getParams();
-
-switch ($jsonrpc->getMethod()) {
-    case 'deamonRunning':
-        $jsonrpc->makeSuccess(teleinfo::deamonRunning());
-    break;
-    case 'stopDeamon':
-        $jsonrpc->makeSuccess(teleinfo::deamon_stop());
-    break;
-    case 'restartDeamon':
-    teleinfo::deamon_stop();
-    if (teleinfo::deamonRunning()) {
-        throw new \Exception(__('Impossible d\'arrêter le démon', __FILE__));
-    }
-    log::clear('teleinfocmd');
-    teleinfo::cron();
-    $jsonrpc->makeSuccess();
-    break;
-}
+
+switch ($jsonrpc->getMethod()) {
+    case 'deamonRunning':
+        $jsonrpc->makeSuccess(teleinfo::deamonRunning());
+    break;
+    case 'stopDeamon':
+        $jsonrpc->makeSuccess(teleinfo::deamon_stop());
+    break;
+    case 'restartDeamon':
+    teleinfo::deamon_stop();
+    if (teleinfo::deamonRunning()) {
+        throw new \Exception(__('Impossible d\'arrêter le démon', __FILE__));
+    }
+    log::clear('teleinfocmd');
+    teleinfo::cron();
+    $jsonrpc->makeSuccess();
+    break;
+}
 
 throw new \Exception(__('Aucune methode correspondante pour le plugin Teleinfo : ' . $jsonrpc->getMethod(), __FILE__));