Skip to content

Commit 673c06d

Browse files
oliv3rericbuehl
andauthored
Deprecation and sanity improvements (#179)
* semonitor: Replace isSet with is_set The `isSet` is deprecated and an alias for `is_set`. Use that instead to avoid deprecation warnings. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> * se/msg: Be a little bit more carefull with the hardcoded path The path replacement function tries to remove `/se` from the full path. However, if the path already contains `/se`, such as for example in `/solaredge/semonitor/se/msg.py` the path gets completely messed up. Instead, by using python's `removesuffix`, we get what we wanted. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> --------- Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Co-authored-by: Eric Buehl <715650+ericbuehl@users.noreply.github.com>
1 parent 52b5256 commit 673c06d

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

se/msg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
sleepInterval = .1
1717

1818
# Hard coded last0503.msg file. os module used to find full path to calling msg.py file, then removes the se part so it's essentially the root of solaredge (where semonitor.py lives)
19-
LAST0503FILE = os.path.dirname(os.path.realpath(__file__)).replace('/'+ __name__.split(".")[0], '') + "/last0503.msg"
19+
LAST0503FILE = os.path.dirname(os.path.realpath(__file__)).removesuffix(__name__.split(".")[0]) + "last0503.msg"
2020

2121
class SECrypto:
2222
def __init__(self, key, msg0503):

semonitor.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def processMsg(msg, args, mode, state, dataFile, recFile, outFile, keyStr, updat
108108
(time.localtime().tm_hour - time.gmtime().tm_hour) * 60 * 60)
109109
elif function == se.commands.PROT_RESP_POLESTAR_MASTER_GRANT_ACK: # RS485 master release
110110
masterEvent.set()
111-
se.logutils.setState(state, "masterEvent", masterEvent.isSet())
111+
se.logutils.setState(state, "masterEvent", masterEvent.is_set())
112112
if replyFunction:
113113
msg = se.msg.formatMsg(msgSeq, toAddr, fromAddr, replyFunction, replyData)
114114
se.msg.sendMsg(dataFile, msg, recFile)
@@ -142,7 +142,7 @@ def masterGrant(state, dataFile, recFile, slaveAddr):
142142
def masterTimerExpire():
143143
logger.debug("RS485 master ack timeout")
144144
masterEvent.set()
145-
se.logutils.setState(state, "masterEvent", masterEvent.isSet())
145+
se.logutils.setState(state, "masterEvent", masterEvent.is_set())
146146
se.logutils.setState(state, "masterTimer", False)
147147

148148
# start a timeout to release the bus if the slave doesn't respond
@@ -151,9 +151,9 @@ def masterTimerExpire():
151151
se.logutils.setState(state, "masterTimer", True)
152152
# wait for slave to release the bus
153153
masterEvent.clear()
154-
se.logutils.setState(state, "masterEvent", masterEvent.isSet())
154+
se.logutils.setState(state, "masterEvent", masterEvent.is_set())
155155
masterEvent.wait()
156-
se.logutils.setState(state, "masterEvent", masterEvent.isSet())
156+
se.logutils.setState(state, "masterEvent", masterEvent.is_set())
157157
# cancel the timeout
158158
masterTimer.cancel()
159159
se.logutils.setState(state, "masterTimer", False)

0 commit comments

Comments
 (0)