diff --git a/kineintercom/intercom.py b/kineintercom/intercom.py index 25e8128..ae6f945 100644 --- a/kineintercom/intercom.py +++ b/kineintercom/intercom.py @@ -142,7 +142,7 @@ def send_at_cmd(cmd='', timeout=0.0, serObj=None, logger=None): while serObj.in_waiting > 0: # remove \r and \n chars from out string out += serObj.read_until().decode('utf-8', 'replace').replace('\r','').replace('\n','') - if out != '': + if out != '' and not out.startswith('NORMAL POWER DOWN'): outlst.append(out) out = '' time.sleep(timeout) @@ -206,6 +206,7 @@ def set_sim_pin(serObj=None, pin_actif=False, code_pin="", logger=None): return False elif ret == 1: logger.warning("Timeout avec la commande AT: {}".format('AT+CPIN?')) + return False else: for item in rsp: if item.startswith('+CPIN:'): @@ -226,6 +227,7 @@ def set_sim_pin(serObj=None, pin_actif=False, code_pin="", logger=None): return False elif ret == 1: logger.warning("Timeout avec la commande AT: {}".format('AT+CPIN=')) + return False else: logger.info("code PIN validé ...") elif item.split('+CPIN: ')[1] == 'READY': @@ -794,8 +796,8 @@ def main(): sys.exit(1) else: GSM_MODULE_STATE = True - # Attente de 10 secondes avant d'initier l'init GSM - time.sleep(10) + # Attente de 10 secondes avant d'initier l'init GSM + time.sleep(10) # Initialize GSM communication logger.info("Initialisation des commandes AT nécessaires ...") ret = init_gsm_com(serObj=ser, config=config, logger=logger) diff --git a/misc/kineintercom.service b/misc/kineintercom.service index 2502c5f..4ffb310 100644 --- a/misc/kineintercom.service +++ b/misc/kineintercom.service @@ -2,6 +2,7 @@ Description=Démarrage du processus KineIntercom StartLimitIntervalSec=300 StartLimitBurst=5 +After=getty.target [Service] Type=simple diff --git a/template/kineintercommisc.postinst b/template/kineintercommisc.postinst index 0dba3bd..c64c6ed 100644 --- a/template/kineintercommisc.postinst +++ b/template/kineintercommisc.postinst @@ -22,6 +22,7 @@ dirname="kineintercom" # create log directory /usr/bin/mkdir -p /var/log/$dirname /usr/bin/chown -R $user:$userpi /var/log/$dirname +/usr/bin/chmod -R 770 /var/log/$dirname # Restart service /usr/bin/systemctl enable kineintercom.service