Update __init__.py to handle short report lengths.#18
Open
Tobbinloggin wants to merge 2 commits intoluigifab:masterfrom
Open
Update __init__.py to handle short report lengths.#18Tobbinloggin wants to merge 2 commits intoluigifab:masterfrom
Tobbinloggin wants to merge 2 commits intoluigifab:masterfrom
Conversation
Added a check to readone that prevents a crash if the returned report is shorter than expected
Owner
|
can you try this version? diff --git a/src/radexreader/__init__.py b/src/radexreader/__init__.py
index 4238f6c238..6a42905cb2 100644
--- a/src/radexreader/__init__.py
+++ b/src/radexreader/__init__.py
@@ -278,30 +278,32 @@
self.hid_set_report((0x7b, 0xff, 0x20, 0, 0x06, 0, self.keyA, self.keyB, 0, 0, self.keyC, self.keyD, 0, 0x08, 0x0c, 0, 0xf3, 0xf7))
hexa = self.hid_get_report()
+ if hexa != b'' and len(hexa) >= 31:
+ # measure = 0.15 µSv/h = 15 / 0.15 µSv accumulated = 15 / 15 CPM = 15
+ measure = (hexa[20] + hexa[21] * 256 + hexa[22] * 256 * 256) / 100
+ measure_acc = (hexa[24] + hexa[25] * 256 + hexa[26] * 256 * 256) / 100
+ measure_cpm = hexa[28] + hexa[29] * 256 + hexa[30] * 256 * 256
+ # uncertainty of the result
+ percent = 15 + 6 / measure
+ measure_min = measure * (1 - percent / 100)
+ measure_max = measure * (1 + percent / 100)
+ if measure_min < 0:
+ measure_min = 0
+ if percent > 99.9:
+ percent = 99.9
+ # most recent measure
+ timestamp = int(time.time())
+ return { timestamp: {
+ 'pct': percent,
+ 'min': measure_min,
+ 'val': measure,
+ 'max': measure_max,
+ 'acc': measure_acc,
+ 'cpm': measure_cpm,
+ 'time': timestamp
+ } }
- # measure = 0.15 µSv/h = 15 / 0.15 µSv accumulated = 15 / 15 CPM = 15
- measure = (hexa[20] + hexa[21] * 256 + hexa[22] * 256 * 256) / 100
- measure_acc = (hexa[24] + hexa[25] * 256 + hexa[26] * 256 * 256) / 100
- measure_cpm = hexa[28] + hexa[29] * 256 + hexa[30] * 256 * 256
- # uncertainty of the result
- percent = 15 + 6 / measure
- measure_min = measure * (1 - percent / 100)
- measure_max = measure * (1 + percent / 100)
- if measure_min < 0:
- measure_min = 0
- if percent > 99.9:
- percent = 99.9
-
- timestamp = int(time.time())
- return { timestamp: {
- 'pct': percent,
- 'min': measure_min,
- 'val': measure,
- 'max': measure_max,
- 'acc': measure_acc,
- 'cpm': measure_cpm,
- 'time': timestamp
- } }
+ return {}
def erase(self):
if self.com == 'RD1212v2':
it's similar between RD1212 and One, and without print |
Author
|
It appears that applying that patch caused everything that's returned to be empty. When I reverted to the old code it started returning data again. I was testing why that was, but I didn't figure it out. |
Owner
|
loool, I suppose this line: |
Author
|
Okay, I'll try that instead. Interesting piece of information, I set up InfluxDB and Grafana with RadexReader and looking at the data from a zoomed out view it appears these periods of missing data are cyclic. |
Owner
|
Oh so nice! There is probably something wrong with the addresses used to read data from the Radex ONE.
But the address is not "simple": |
There was a problem hiding this comment.
Pull Request Overview
This PR adds a safeguard in readOne to prevent crashes when the HID report is shorter than expected.
- Introduces a length check for the received report and early return on incomplete data
- Emits a warning and returns an empty dict when the report is too short
Comments suppressed due to low confidence (1)
src/radexreader/init.py:282
- Add unit tests covering the new branch where
hexaisNoneor shorter than expected to validate this behavior and prevent regressions.
# Check if the returned report has the expected length
Owner
|
It look like that there are negative values with current code: with ChatGPT I tried some stupid things, and there is still something wrong, because his helper made never breaks: import csv
# the correct initial values
keyA = 0x04 - 0x04 # => 0x00
keyB = 0x00
keyC = 0x5a + 0x04 # => 0x5e
keyD = 0x00
seen = set()
rows = []
iteration = 1
while iteration <= 10000:
t = (keyA, keyB, keyC, keyD)
if t in seen:
break
seen.add(t)
rows.append([iteration, f"0x{keyA:02x}", f"0x{keyB:02x}", f"0x{keyC:02x}", f"0x{keyD:02x}"])
iteration += 1
keyA += 0x04
keyC -= 0x04
if keyA > 0xff:
keyA -= 0xfe
keyB += 0x01
if keyB > 0xff:
keyB = 0x00
keyC -= 0x01
elif keyC < 0x00:
keyC += 0xff
keyD -= 0x01
if keyD < 0x00:
keyD = 0xff
with open("radex_keys_cycle.csv", "w", newline="") as csvfile:
writer = csv.writer(csvfile, delimiter="\t")
writer.writerow(["iteration", "keyA", "keyB", "keyC", "keyD"])
writer.writerows(rows) |
Owner
|
It could be nice to know which address crash in your beautiful graph. I suppose that the beginning of the iteration is correct, we need to identify working addresses, and the first one that crash ( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I added a check to readone that prevents a crash if the returned report is shorter than expected.
I encountered an issue with my code crashing due to some of the reports being shorter than expected, this stop-gap addition prevents the code from crashing out.