File tree Expand file tree Collapse file tree 5 files changed +25
-25
lines changed
Expand file tree Collapse file tree 5 files changed +25
-25
lines changed Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ def __init__(
105105 """Full, received response."""
106106 self .error : GeoComReturnCode = (
107107 comcode
108- if comcode . value == 0
108+ if comcode
109109 else rpccode
110110 )
111111 """Parsed return code indicating the success/failure of the
Original file line number Diff line number Diff line change @@ -373,20 +373,20 @@ def request(
373373 except SerialTimeoutException :
374374 self ._logger .error (format_exc ())
375375 answer = (
376- f"%R1P,{ TPS1000RC .COM_TIMEDOUT . value :d} ,"
377- f"0:{ TPS1000RC .FATAL . value :d} "
376+ f"%R1P,{ TPS1000RC .COM_TIMEDOUT :d} ,"
377+ f"0:{ TPS1000RC .OK :d} "
378378 )
379379 except SerialException :
380380 self ._logger .error (format_exc ())
381381 answer = (
382- f"%R1P,{ TPS1000RC .COM_CANT_SEND . value :d} ,"
383- f"0:{ TPS1000RC .FATAL . value :d} "
382+ f"%R1P,{ TPS1000RC .COM_CANT_SEND :d} ,"
383+ f"0:{ TPS1000RC .OK :d} "
384384 )
385385 except Exception :
386386 self ._logger .error (format_exc ())
387387 answer = (
388- f"%R1P,{ TPS1000RC .FATAL . value :d} ,"
389- f"0:{ TPS1000RC .FATAL . value :d} "
388+ f"%R1P,{ TPS1000RC .COM_FAILED :d} ,"
389+ f"0:{ TPS1000RC .OK :d} "
390390 )
391391
392392 response = self .parse_response (
Original file line number Diff line number Diff line change @@ -379,20 +379,20 @@ def request(
379379 except SerialTimeoutException :
380380 self ._logger .error (format_exc ())
381381 answer = (
382- f"%R1P,{ TPS1100RC .COM_TIMEDOUT . value :d} ,"
383- f"0:{ TPS1100RC .FATAL . value :d} "
382+ f"%R1P,{ TPS1100RC .COM_TIMEDOUT :d} ,"
383+ f"0:{ TPS1100RC .OK :d} "
384384 )
385385 except SerialException :
386386 self ._logger .error (format_exc ())
387387 answer = (
388- f"%R1P,{ TPS1100RC .COM_CANT_SEND . value :d} ,"
389- f"0:{ TPS1100RC .FATAL . value :d} "
388+ f"%R1P,{ TPS1100RC .COM_CANT_SEND :d} ,"
389+ f"0:{ TPS1100RC .OK :d} "
390390 )
391391 except Exception :
392392 self ._logger .error (format_exc ())
393393 answer = (
394- f"%R1P,{ TPS1100RC .FATAL . value :d} ,"
395- f"0:{ TPS1100RC .FATAL . value :d} "
394+ f"%R1P,{ TPS1100RC .COM_FAILED :d} ,"
395+ f"0:{ TPS1100RC .OK :d} "
396396 )
397397
398398 response = self .parse_response (
Original file line number Diff line number Diff line change @@ -379,20 +379,20 @@ def request(
379379 except SerialTimeoutException :
380380 self ._logger .error (format_exc ())
381381 answer = (
382- f"%R1P,{ TPS1200PGRC .COM_TIMEDOUT . value :d} ,"
383- f"0:{ TPS1200PGRC .FATAL . value :d} "
382+ f"%R1P,{ TPS1200PGRC .COM_TIMEDOUT :d} ,"
383+ f"0:{ TPS1200PGRC .OK :d} "
384384 )
385385 except SerialException :
386386 self ._logger .error (format_exc ())
387387 answer = (
388- f"%R1P,{ TPS1200PGRC .COM_CANT_SEND . value :d} ,"
389- f"0:{ TPS1200PGRC .FATAL . value :d} "
388+ f"%R1P,{ TPS1200PGRC .COM_CANT_SEND :d} ,"
389+ f"0:{ TPS1200PGRC .OK :d} "
390390 )
391391 except Exception :
392392 self ._logger .error (format_exc ())
393393 answer = (
394- f"%R1P,{ TPS1200PGRC .FATAL . value :d} ,"
395- f"0:{ TPS1200PGRC .FATAL . value :d} "
394+ f"%R1P,{ TPS1200PGRC .COM_FAILED :d} ,"
395+ f"0:{ TPS1200PGRC .OK :d} "
396396 )
397397
398398 response = self .parse_response (
Original file line number Diff line number Diff line change @@ -397,20 +397,20 @@ def request(
397397 except SerialTimeoutException :
398398 self ._logger .error (format_exc ())
399399 answer = (
400- f"%R1P,{ VivaTPSGRC .COM_TIMEDOUT . value :d} ,"
401- f"0:{ VivaTPSGRC .FATAL . value :d} "
400+ f"%R1P,{ VivaTPSGRC .COM_TIMEDOUT :d} ,"
401+ f"0:{ VivaTPSGRC .OK :d} "
402402 )
403403 except SerialException :
404404 self ._logger .error (format_exc ())
405405 answer = (
406- f"%R1P,{ VivaTPSGRC .COM_CANT_SEND . value :d} ,"
407- f"0:{ VivaTPSGRC .FATAL . value :d} "
406+ f"%R1P,{ VivaTPSGRC .COM_CANT_SEND :d} ,"
407+ f"0:{ VivaTPSGRC .OK :d} "
408408 )
409409 except Exception :
410410 self ._logger .error (format_exc ())
411411 answer = (
412- f"%R1P,{ VivaTPSGRC .FATAL . value :d} ,"
413- f"0:{ VivaTPSGRC .FATAL . value :d} "
412+ f"%R1P,{ VivaTPSGRC .COM_FAILED :d} ,"
413+ f"0:{ VivaTPSGRC .OK :d} "
414414 )
415415
416416 response = self .parse_response (
You can’t perform that action at this time.
0 commit comments