vincent/KineIntercom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correction de bugs + hierarchisation du lancement du service et correction des droits sur le dossier de logs

Browse Source
This commit is contained in:
Vincent BENOIT
2022-11-15 17:41:40 +01:00
parent a19e1264e9
commit 39aa430be8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kineintercom/intercom.py
View File

@@ -142,7 +142,7 @@ def send_at_cmd(cmd='', timeout=0.0, serObj=None, logger=None):
while serObj.in_waiting > 0: while serObj.in_waiting > 0:
# remove \r and \n chars from out string # remove \r and \n chars from out string
out += serObj.read_until().decode('utf-8', 'replace').replace('\r','').replace('\n','') 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) outlst.append(out)
out = '' out = ''
time.sleep(timeout) time.sleep(timeout)
@@ -206,6 +206,7 @@ def set_sim_pin(serObj=None, pin_actif=False, code_pin="", logger=None):
return False return False
elif ret == 1: elif ret == 1:
logger.warning("Timeout avec la commande AT: {}".format('AT+CPIN?')) logger.warning("Timeout avec la commande AT: {}".format('AT+CPIN?'))
return False
else: else:
for item in rsp: for item in rsp:
if item.startswith('+CPIN:'): if item.startswith('+CPIN:'):
@@ -226,6 +227,7 @@ def set_sim_pin(serObj=None, pin_actif=False, code_pin="", logger=None):
return False return False
elif ret == 1: elif ret == 1:
logger.warning("Timeout avec la commande AT: {}".format('AT+CPIN=<CODE_PIN>')) logger.warning("Timeout avec la commande AT: {}".format('AT+CPIN=<CODE_PIN>'))
return False
else: else:
logger.info("code PIN validé ...") logger.info("code PIN validé ...")
elif item.split('+CPIN: ')[1] == 'READY': elif item.split('+CPIN: ')[1] == 'READY':
@@ -794,8 +796,8 @@ def main():
sys.exit(1) sys.exit(1)
else: else:
GSM_MODULE_STATE = True GSM_MODULE_STATE = True
# Attente de 10 secondes avant d'initier l'init GSM # Attente de 10 secondes avant d'initier l'init GSM
time.sleep(10) time.sleep(10)
# Initialize GSM communication # Initialize GSM communication
logger.info("Initialisation des commandes AT nécessaires ...") logger.info("Initialisation des commandes AT nécessaires ...")
ret = init_gsm_com(serObj=ser, config=config, logger=logger) ret = init_gsm_com(serObj=ser, config=config, logger=logger)

1
misc/kineintercom.service
View File

@@ -2,6 +2,7 @@
Description=Démarrage du processus KineIntercom Description=Démarrage du processus KineIntercom
StartLimitIntervalSec=300 StartLimitIntervalSec=300
StartLimitBurst=5 StartLimitBurst=5
After=getty.target
[Service] [Service]
Type=simple Type=simple

1
template/kineintercommisc.postinst
View File

@@ -22,6 +22,7 @@ dirname="kineintercom"
# create log directory # create log directory
/usr/bin/mkdir -p /var/log/$dirname /usr/bin/mkdir -p /var/log/$dirname
/usr/bin/chown -R $user:$userpi /var/log/$dirname /usr/bin/chown -R $user:$userpi /var/log/$dirname
/usr/bin/chmod -R 770 /var/log/$dirname
# Restart service # Restart service
/usr/bin/systemctl enable kineintercom.service /usr/bin/systemctl enable kineintercom.service