Skip to content

Commit 51bcd0c

Browse files
committed
2.0.1beta3
1 parent 2e3af33 commit 51bcd0c

23 files changed

+582
-430
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ With Rad Pro, you can:
1313
* Measure cumulative dose.
1414
* Set up user-adjustable rate and dose alarms.
1515
* Plot radiation rate history (10 minutes, 1 hour and 24 hours).
16-
* Log data to the built-in flash memory or live on a computer, optionally sending the data to the [gmcmap.com](https://gmcmap.com), [radmon.org](https://radmon.org) and [safecast.org](https://map.safecast.org) radiation monitoring websites.
16+
* Log data to the built-in flash memory or live to a computer, optionally sending the data to the [gmcmap.com](https://gmcmap.com), [radmon.org](https://radmon.org) and [safecast.org](https://map.safecast.org) radiation monitoring websites.
1717
* Generate true random data: secure passwords (alphanumeric, full ASCII), random hexadecimal and decimal numbers, dice throws (4-sided, 6-sided, 8-sided, 12-sided and 20-sided) and coin flips.
1818

1919
## Installation

RELEASES.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
## 2.0.1
44

5-
* Fixes errors in custom HV profile settings.
5+
* Added data log reset.
6+
* Resolved issues with custom HV profiles.
7+
* Resolved issues with the "SET tubeHVFrequency" and "SET tubeHVDutyCycle" data communication requests.
8+
* Resolved issues with new history data log download.
9+
* Minor refinements.
610

711
## 2.0
812

@@ -18,7 +22,7 @@
1822
* Added display panel menu for selecting the display panel (on supported devices).
1923
* Added secondary dose view in average measurement mode.
2024
* Extended conversion factor range to 25-1600 cpm/µSv/h.
21-
* Added 1 second datalog interval options and removed 30 seconds and 30 minutes datalog interval options.
25+
* Added 1 second data log interval options and removed 30 seconds and 30 minutes data log interval options.
2226
* Added "SET tubeHVFrequency" and "SET tubeHVDutyCycle" data communication commands.
2327
* Added 12-hour time format.
2428
* Devices with data mode allow using the device while data mode is active; data mode state is also preserved after powering off.
@@ -35,7 +39,7 @@
3539
* Improved haptic pulse strengths.
3640
* Improved FNIRSI GC-01 quiet pulse clicks.
3741
* Improved selected menu item contrast.
38-
* Improved datalogging time precision.
42+
* Improved data logging time precision.
3943
* Fixed History (24 h) bug.
4044

4145
## 2.0rc3 The "BIG" update
@@ -49,7 +53,7 @@
4953
* Haptic pulses on the FNIRSI GC-01 (off, weak or strong).
5054
* Pulse thresholding (disables pulse indication if instantaneous rate is below a certain value).
5155
* Fault alarm on HV/tube failure (lack of pulses) or tube saturation (tube shorted).
52-
* Added 30 second and 10 second datalog interval options.
56+
* Added 30 second and 10 second data log interval options.
5357
* Added 10 second display sleep option.
5458
* Added `radpro-flashtool`.
5559
* Removed measurement hold.

docs/comm.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Returns the data log stored in the device's flash memory. `[time]` is an optiona
242242
* `time`: The record's UNIX timestamp (number of seconds since 1/1/1970), provided in decimal format.
243243
* `tubePulseCount`: The tube's life pulse count, provided in decimal format.
244244

245-
During datalog download, data is not logged.
245+
During data log download, data is not logged.
246246

247247
Example:
248248

docs/developers.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ To build the software, follow these steps:
1212

1313
## Internal storage format
1414

15-
Data is stored internally using a compressed storage format. Integer values are stored in big-endian byte order.
15+
Data is stored internally using a compressed storage format. Integer values are represented in big-endian byte order.
1616

17-
Encoding:
17+
### Data encodings
1818

1919
0b0sxxxxxx
2020

docs/users.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Measurement view with large digits, ideal for field application.
66
* Multiple measurement units: Sievert, rem, cpm (counts per minute), cps (counts per second).
77
* Configurable averaging for performing surveys.
8-
* Live and offline data logging with data compression.
8+
* Offline and live data logging with data compression.
99
* Compatibility with the [GeigerLog](https://github.com/Gissio/geigerlog-radpro) data logging software.
1010
* Configurable pulse indication with optional thresholding: pulse clicks (off, quiet, loud), pulse LED (on supported devices), display flashes (on display sleep) and haptic pulses (on supported devices).
1111
* Dead-time measurement.
@@ -84,11 +84,11 @@ You can also set a custom conversion factor by going to the settings, selecting
8484

8585
Rad Pro lets you log cumulative dose count, from which both rate and dose can be derived.
8686

87-
To start logging, simply select a data logging interval in the settings. Data is automatically logged in the background. When memory gets full, old data is overwritten. In order to avoid flash memory wear, data cannot be manually erased.
87+
To start logging, ensure that the time zone, date and time of your device are correctly set, and enable data logging in the settings. Data is automatically logged in the background. When the memory becomes full, older data is overwritten.
8888

89-
To live log data on a computer or download the datalogs, use the [GeigerLog](https://github.com/Gissio/geigerlog-radpro) data logging software. “CPS” data is the low-level counts per second value. To average the data, use the “MvAvg” function.
89+
To download the data logs or log data live to a computer, use the [GeigerLog](https://github.com/Gissio/geigerlog-radpro) data logging software. “CPS” data is the low-level counts per second value. To average the data, use the “MvAvg” function.
9090

91-
During datalog download, data is not logged.
91+
Please note that data is not logged during the download process.
9292

9393
## Instantaneous rate averaging
9494

@@ -112,15 +112,15 @@ $$n = \frac{m}{1 - m \tau}$$
112112

113113
where $m$ is the rate in counts per seconds, and $\tau$ is the tube's dead time in seconds. To prevent overflow, the compensation factor is limited to a maximum value of 10.
114114

115-
Dead-time compensation is applied to instantaneous rate, average rate, cumulative dose and history. It is not applied to tube life pulse count nor datalogging.
115+
Dead-time compensation is applied to instantaneous rate, average rate, cumulative dose and history. It is not applied to tube life pulse count nor data logs.
116116

117117
## Background compensation
118118

119119
Geiger-Müller tubes, being composed of matter, inherently contain atoms prone to radioactive decay. Consequently, the tubes themselves emit radiation. This intrinsic radiation will depend on factors such as tube type, size, and production batch.
120120

121121
Rad Pro lets you remove these extra counts by applying background compensation.
122122

123-
Background compensation is applied to instantaneous rate, average rate, cumulative dose and history. It is not applied to tube life pulse count nor datalogging.
123+
Background compensation is applied to instantaneous rate, average rate, cumulative dose and history. It is not applied to tube life pulse count nor data logs.
124124

125125
## HV profiles
126126

@@ -152,7 +152,7 @@ For faster bit generation, use a radioactive source.
152152

153153
## radpro-tool
154154

155-
`radpro-tool` gives you low-level access to your device from a computer, allowing you to live log data, download datalogs, submit live data to radiation monitoring websites, get device information and sync the device's clock.
155+
`radpro-tool` gives you low-level access to your device from a computer, allowing you to download data logs, log data live, submit data live to radiation monitoring websites, get device information and sync the device's clock.
156156

157157
To use `radpro-tool`, install [Python](https://www.python.org), [PIP](https://pip.pypa.io/en/stable/). You must also install the necessary requirements by running the following command in a terminal:
158158

@@ -166,15 +166,15 @@ To sync the clock of a Rad Pro device connected to COM13:
166166

167167
python tools/radpro-tool.py --port COM13
168168

169-
To live log data to the file `live.csv` every 60 seconds:
169+
To download the data log to the file `datalog.csv`:
170170

171-
python tools/radpro-tool.py --port COM13 --live-datalog live.csv --live-datalog-period 60
171+
python tools/radpro-tool.py --port COM13 --download-datalog datalog.csv
172172

173-
To download the datalog to the file `datalog.csv`:
173+
To log pulse data live to the file `live.csv` every 60 seconds:
174174

175-
python tools/radpro-tool.py --port COM13 --download-datalog datalog.csv
175+
python tools/radpro-tool.py --port COM13 --log-pulsedata live.csv --period 60
176176

177-
To live submit the level of radiation to the https://gmcmap.com website:
177+
To submit data live to the https://gmcmap.com website:
178178

179179
python tools/radpro-tool.py --port COM13 --submit-gmcmap [USER_ACCOUNT_ID] [GEIGER_COUNTER_ID]
180180

platform.io/src/comm.c

+8-3
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,11 @@ void dispatchCommEvents(void)
262262
{
263263
strclr(comm.buffer);
264264

265-
uint32_t i = 0;
266-
while (i < 2)
265+
uint32_t sentEntriesNum = 0;
266+
uint32_t checkedEntriesNum = 0;
267+
268+
while ((sentEntriesNum < 2) &&
269+
(checkedEntriesNum < 1000))
267270
{
268271
Dose dose;
269272

@@ -281,8 +284,10 @@ void dispatchCommEvents(void)
281284
strcatChar(comm.buffer, ';');
282285
strcatDatalogEntry(comm.buffer, &dose);
283286

284-
i++;
287+
sentEntriesNum++;
285288
}
289+
290+
checkedEntriesNum++;
286291
}
287292

288293
transmitComm();

0 commit comments

Comments
 (0)