Modification installation / Correction bug 2 compteurs

.editorconfig

@@ -28,3 +28,8 @@ indent_size = 4
 charset = utf-8
 indent_style = space
 indent_size = 4
+
+[*.sh]
+charset = utf-8
+indent_style = space
+indent_size = 4

ressources/install_apt.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+PROGRESS_FILE=/tmp/jeedom/teleinfo/dependance
+PROGRESS_FILE=$1
+touch ${PROGRESS_FILE}
+echo 0 > ${PROGRESS_FILE}
+function apt_install {
+  sudo apt-get -y install "$@"
+  if [ $? -ne 0 ]; then
+    echo "could not install $1 - abort"
+    rm ${PROGRESS_FILE}
+    exit 1
+  fi
+}
+
+function pip_install {
+  sudo pip install "$@"
+  if [ $? -ne 0 ]; then
+    echo "could not install $p - abort"
+    rm ${PROGRESS_FILE}
+    exit 1
+  fi
+}
+#echo "Prérequis python3"
+echo 10 > ${PROGRESS_FILE}
+#apt_install python3
+#apt_install python3-pip
+echo "Lancement de l'installation/mise à jour des dépendances Téléinfo"
+sudo apt-get update
+echo 20 > ${PROGRESS_FILE}
+sudo apt-get -y install python-ftdi
+sudo apt-get -y install python-ftdi1
+#pip_install pyftdi
+pip_install pylibftdi
+echo 30 > ${PROGRESS_FILE}
+#pip_install python-ftdi1
+echo 40 > ${PROGRESS_FILE}
+pip_install serial
+echo 50 > ${PROGRESS_FILE}
+if [ -e /dev/ttyAMA0 ];  then
+    sed -i 's/console=ttyAMA0,115200//; s/kgdboc=ttyAMA0,115200//' /boot/cmdline.txt
+    if [ -e /etc/inittab ]; then
+        sed -i 's|[^:]*:[^:]*:respawn:/sbin/getty[^:]*ttyAMA0[^:]*||' /etc/inittab
+    fi
+    sudo systemctl stop [email protected]
+    sudo systemctl disable [email protected]
+fi
+echo 100 > ${PROGRESS_FILE}
+echo "Everything is successfully installed!"
+rm ${PROGRESS_FILE}

ressources/teleinfo_2_cpt.py

@@ -238,9 +238,10 @@ class Teleinfo(object):
     def __init__(self, ftdi_):
         """
         """
+        self._log = MyLogger()
+        self._log.info("Initialisation de la teleinfo")
         if FTDI_TYPE == 0:
-            self._log = MyLogger()
-            self._log.info("Initialisation de la teleinfo")
+            self.context = ""
             super(Teleinfo, self).__init__()
             self.__ftdi = ftdi_
         else:
@@ -526,7 +527,7 @@ def main():
         ftdi_.init()
         teleinfo = Teleinfo(ftdi_)
     else:
-        teleinfo = Teleinfo()
+        teleinfo = Teleinfo("")
     pid = str(os.getpid())
     file("/tmp/teleinfo2cpt.pid", 'w').write("%s\n" % pid)
     signal.signal(signal.SIGTERM, teleinfo.exit_handler)