Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/centralnode.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
import serial
import logging


log = logging.getLogger('central')
ch = logging.NullHandler()
ch.setLevel(logging.DEBUG)
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
formatter = logging.Formatter(
'%(asctime)s - %(name)s - %(levelname)s - %(message)s')
ch.setFormatter(formatter)
log.addHandler(ch)


class ConfigError(Exception):
def __init__(self):
self.message = "Can not config"
Expand Down Expand Up @@ -91,8 +92,7 @@ def config_trama(self):

def init_lora(self):

expect = [
1, 0, 129, 12, 165, 165, 108, 64, 18, 7, 0, 0, 1, 1, 0, 3, 0]
expect = [1, 0, 129, 12, 165, 165, 108, 64, 18, 7, 0, 0, 1, 1, 0, 3, 0]
try:
expect[12] = self.networkid
check_sum = reduce(lambda x, y: x ^ y, expect)
Expand All @@ -111,11 +111,11 @@ def init_lora(self):
os._exit(0)
if list(response) != expect:
expect[3] = 13
expect[17] = expect[17]+1
expect[17] = expect[17] + 1
if list(response) == expect:
self.ser.close()
log.info("Lora Config Successfull")
return True
self.ser.close()
log.info("Lora Config Successfull")
return True
return False
self.ser.close()
log.info("Lora Config Successfull")
Expand All @@ -134,5 +134,3 @@ def quantity_poll(self):
if self.lastpollsize != 0:
n += 1
return n


7 changes: 4 additions & 3 deletions src/files_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import json
import logging


log = logging.getLogger('files')
ch = logging.NullHandler()
ch.setLevel(logging.DEBUG)
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
formatter = logging.Formatter(
'%(asctime)s - %(name)s - %(levelname)s - %(message)s')
ch.setFormatter(formatter)
log.addHandler(ch)

Expand Down Expand Up @@ -36,7 +36,8 @@ def update_energy_file(serial, data):
with open("output/energy.json", 'r+') as energy_file:
energy_dic = json.load(energy_file)
energy_dic[serial.hex()] = data
log.info("Updated %s: %s at %s", serial.hex(), str(data),str(datetime.datetime.now()) )
log.info("Updated %s: %s at %s", serial.hex(), str(data),
str(datetime.datetime.now()))
save2file(energy_file, energy_dic)


Expand Down
10 changes: 5 additions & 5 deletions src/logger.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import logging
import sys


dateformat = "%m/%d/%Y %H:%M:%S"
logformat = "%(asctime)s [%(levelname)-5.5s] [%(name)s] %(message)s"
consoleforma = "[%(levelname)-5.5s] [%(name)s] %(message)s"


def build_logger():

logFormatter = logging.Formatter(logformat,datefmt = dateformat)
consoleFormatter = logging.Formatter("[%(levelname)-5.5s] [%(name)s] %(message)s")

logFormatter = logging.Formatter(logformat, datefmt=dateformat)
consoleFormatter = logging.Formatter(
"[%(levelname)-5.5s] [%(name)s] %(message)s")
log = logging.getLogger()

fileHandler = logging.FileHandler("{0}/{1}.log".format(".","logs"))
fileHandler = logging.FileHandler("{0}/{1}.log".format(".", "logs"))
fileHandler.setFormatter(logFormatter)
fileHandler.setLevel(logging.WARNING)
log.addHandler(fileHandler)
Expand Down