Skip to content

Commit a058fae

Browse files
committed
-
1 parent 1129c91 commit a058fae

File tree

3 files changed

+3435
-13
lines changed

3 files changed

+3435
-13
lines changed

EthernetCommLibrary.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def frequency_read(self, allow_msg, ip_address):
265265
tn.close()
266266
tempdata = str(tempdata)
267267
tempdata = tempdata.split(',')
268-
print(tempdata)
268+
logger.debug(tempdata)
269269
Frequency = float(tempdata[3])
270270
logger.debug(Frequency)
271271
return True, Frequency

StartupNew.py

+19-12
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ def __init__(self):
164164

165165
# do all initializtion
166166
self.lblStatus.setText('')
167-
#self.populate_defaults()
167+
self.populate_defaults()
168168

169169
logger.debug('TFP3 relay pin ' + str(sl.supportLibrary.gpio_tfp3relay_pin))
170170

171171
# check serial event thread
172172
#self.check_serial_event()
173173

174174
# run one second timer
175-
self.one_second_timer()
175+
self.five_second_timer()
176176

177177
# ****************************************************************************************************
178178
def configure_logging():
@@ -252,16 +252,23 @@ def enable_disable_all_buttons(self, state):
252252
self.pbRescanSerialPorts.disconnect()
253253

254254
# ****************************************************************************************************
255-
def one_second_timer(self):
256-
logger.debug('Running one second timer...')
257-
one_second_thread = threading.Timer(1, self.one_second_timer)
255+
def five_second_timer(self):
256+
257+
logger.debug('Running five second timer...')
258+
five_second_thread = threading.Timer(5, self.five_second_timer)
258259
try:
259-
one_second_thread.start()
260-
logger.debug('Running one second thread...')
260+
five_second_thread.start()
261+
logger.debug('Running five second thread...')
261262
ret = el.EthComLib.frequency_read(self, False, ip_address)
262-
print('Returned value->' + str(ret[1]))
263-
self.lcdFreq.display((ret[1]))
263+
logger.debug('Returned value->' + str(ret[1]))
264+
if ret[0]:
265+
self.lcdFreq.display((ret[1]))
266+
else:
267+
self.lcdFreq.display(999.99)
268+
264269

270+
except TimeoutError as err:
271+
logger.debug('One second thread not running due to ' + str(err))
265272
except OSError as err:
266273
logger.debug('One second thread not running due to ' + str(err))
267274
except ValueError as err:
@@ -271,7 +278,7 @@ def one_second_timer(self):
271278
except NameError as err:
272279
logger.debug('One second thread not running due to ' + str(err))
273280

274-
# ****************************************************************************************************
281+
# ****************************************************************************************************
275282
def check_serial_event(self):
276283
logger.debug('Starting serial receive thread')
277284
self.lblStatus.setText('Starting serial receive thread')
@@ -1040,8 +1047,8 @@ def main():
10401047
app = QApplication(sys.argv)
10411048
form = MainWindow()
10421049
form.show()
1043-
gui_thread = threading.Thread(None,form.populate_defaults)
1044-
gui_thread.start()
1050+
#gui_thread = threading.Thread(None,form.populate_defaults)
1051+
#gui_thread.start()
10451052
form.lblStatus.setText('Ready...')
10461053
sys.exit(app.exec_())
10471054

0 commit comments

Comments
 (0)