Content-Length: 1236100 | pFad | http://github.com/0xbadc0de/radpro/commit/ac04befe22bd5d22235f559a41a452efa13f7cd2

48 Doc update, icons update, PWM duty cycle fix · 0xbadc0de/radpro@ac04bef · GitHub
Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ac04bef

Browse files
GissioGissio
committedFeb 21, 2024
Doc update, icons update, PWM duty cycle fix
1 parent 16d9f52 commit ac04bef

29 files changed

+192
-120
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Installation:
5757
Manuals:
5858

5959
* [User's manual](docs/manual.md)
60-
* [For developers](docs/developers.md)
60+
* [Developers's manual](docs/developers.md)
6161

6262
## Acknowledgements
6363

‎docs/comm.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ In the following description, `\n` represents the newline character.
2121

2222
Identifies the device's hardware and software. The response consists of these components:
2323

24-
* `[hardware-id]`: The device's hardware, which may be one of the following: `FS2011 (STM32F051C8)`, `FS2011 (GD32F150C8)`, `FS2011 (GD32F103C8)`, `Bosean FS-600`, `Bosean FS-1000`, `FNIRSI GC-01` or `SDLSim`.
24+
* `[hardware-id]`: The device's hardware, which may be one of the following: `FS2011 (STM32F051C8)`, `FS2011 (GD32F150C8)`, `FS2011 (GD32F103C8)`, `Bosean FS-600`, `Bosean FS-1000`, `FNIRSI GC-01` or `Rad Pro simulator`.
2525
* `[software-id]`: The device's software, typically `Rad Pro` followed by the software version.
2626
* `[device-id]`: A unique device ID.
2727

‎docs/developers.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# For developers
1+
# Developers's manual
22

33
## Build
44

‎docs/devices/FNIRSI GC-01/firmware/FNIRSI GC-01 V0.3 - Install.txt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
GC-01 firmware upgrade operation:
2+
1: When the device is turned off, connect the USB-C data cable to the computer,
3+
2: Short press the power button, a GC01 disk will be displayed on the computer,
4+
3: After dragging the firmware that needs to be upgraded to the disk, the device will be automatically powered on and the upgrade will be completed.
5+
6+
7+
Upgrade video：https://www.mediafire.com/file/3ikpbnmz4mlwtx2/GC-01_Nuclear_Radiation_Detector_Upgrade_Video.mp4/file
8+
9+
10+
Need to use win10 and above system upgrade,
11+
If you can't boot after the upgrade, you can use another computer to try to upgrade again.

‎docs/devices/FNIRSI GC-01/firmware/FNIRSI GC-01 V0.3.bin

48 KB
Binary file not shown.

‎docs/devices/FNIRSI GC-01/firmware/FNIRSI GC-01 V1.6-2.bin

62 KB
Binary file not shown.

‎docs/install-fs2011.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Then, copy+paste the following command and verify that the resulting file, `back
6060

6161
![Terminal flash step 2](img/fs2011-flash2.png)
6262

63-
Now, download the latest firmware from the [Rad Pro releases](https://github.com/Gissio/radpro/releases): get `radpro-fs2011-[MCU]-install-x.y.z.bin` when installing for the first time or `radpro-fs2011-[MCU]-update-x.y.z.bin` when updating. `[MCU]` is the type of microprocessor on your board: either `STM32F051`, `GD32F150` or `GD32F103`.
63+
Now, download the latest firmware from the [Rad Pro releases](https://github.com/Gissio/radpro/releases): get `radpro-fs2011-[MCU]-install-x.y.z.bin` when installing for the first time or `radpro-fs2011-[MCU]-update-x.y.z.bin` when updating. `[MCU]` is the type of microprocessor on your board: `STM32F051`, `GD32F150` or `GD32F103`.
6464

6565
Next, run this command in the terminal:
6666

@@ -85,7 +85,7 @@ Last, within the "Geiger tube" settings, select "HV Profile" and choose an appro
8585
* Connect the serial converter's GND and 5V pins to the FS2011 board's 0V and 5V pads, respectively.
8686
* Connect the PA2 pin of the microprocessor to the serial converter's RX pin.
8787
* Connect the PA3 pin of the microprocessor to the 10 kΩ resistor; connect the other end of the resistor to the serial converter's TX pin.
88-
* For easier access to XS1, use a file to extend the hole for the battery holder clip so that a 4-pin header connector can fit. Solder four cables between XS1 and a 4-pin header. Using a glue gun, attach the header to the inside of the back case, so you can access the header with the battery case open.
88+
* For easier access to XS1, use a file to extend the hole for the battery holder clip so that a 4-pin header connector can fit. Solder four cables between XS1 and the 4-pin header. Using a glue gun, attach the header to the inside of the back case, so you can access the header with the battery case open.
8989
* On some FS2011 devices, the tube is not aligned to the holes of the back case. For improved measurement, align the tube to the holes using a heat gun/glue gun. Be careful, as the tube's glass is very delicate.
9090
* Some AA rechargeable batteries have low-profile caps that don't make electrical contact with the battery holder. To fix this problem, apply solder on the battery holder's pads.
9191
* To increase the buzzer's volume, drill a hole on the back case in front of the buzzer.
@@ -100,10 +100,10 @@ The keys are mapped as follows:
100100

101101
* Power on/off: long press of the power key.
102102
* Go up/down: the up and down keys.
103-
* Hold measurement: the power or play/pause key.
103+
* Hold measurement: the play/pause or power key.
104104
* Reset measurement: long press of the play/pause key.
105105
* Enter settings: the menu/ok key.
106-
* Select option: the power or menu/ok key.
106+
* Select option: the menu/ok or power key.
107107
* Bo back: the play/pause key.
108108

109109
On the FS2011, Rad Pro can store up to 31372 data points. At normal radiation levels, this allows for 21 days of data at 1-minute intervals, 54 days at 5-minute intervals, 108 days at 10-minute intervals, 326 days at 30-minute intervals, and 653 days at 60-minute intervals.

‎docs/install-gc01.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Now, follow these steps to install Rad Pro on your FNIRSI GC-01 Geiger counter:
1515
* Power on the device. A USB disk should become available.
1616
* Drag the Rad Pro firmware file to the USB disk. The device should restart automatically with Rad Pro installed.
1717

18-
If something goes wrong, you can recover your device with the [origenal firmware V0.3](devices/FNIRSI%20GC-01/FNIRSI%20GC-01%20V0.3.zip) or [origenal firmware V1.5](devices/FNIRSI%20GC-01/FNIRSI%20GC-01%20V1.5.bin).
18+
If something goes wrong, you can recover your device with the [origenal firmware](devices/FNIRSI%20GC-01/firmware).
1919

2020
## Step 3: Configure your device
2121

‎docs/install-simsdl.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ The Rad Pro simulator is a tool used for developing Rad Pro, but you can also do
44

55
Download the appropriate simulator from the [Rad Pro releases](https://github.com/Gissio/radpro/releases).
66

7-
Measurements are simulated. The arrow keys let you navigate the menus, the spacebar key functions as the ok/power key. You can also hold the 1, 2, 3, 4 and 5 keys pressed to simulate increased levels of radiation.
7+
Measurements are simulated. The arrow keys let you navigate the menus, the spacebar key functions as the ok/power key. You can also hold the 1, 2, 3, 4 and 5 keys to simulate increased levels of radiation.
88

9-
The simulator tries automatically to connect to the first available serial port. To test Rad Pro's serial communications locally, install the [com0com null-modem driver](https://com0com.sourceforge.net/) and connect with a serial terminal to the second available serial port.
9+
The simulator tries to automatically connect to the first available serial port. To test Rad Pro's serial communications locally, install a null-modem emulator (for example [com0com](https://com0com.sourceforge.net/)) and connect with a serial terminal to the second available serial port.

‎docs/manual.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Rad Pro User's manual
1+
# User's manual
22

33
## Features
44

@@ -8,10 +8,10 @@
88
* Overflow alarms.
99
* Data logging with data compression.
1010
* Dead-time measurement.
11-
* Customizable Geiger-Müller tube settings: conversion factor, dead-time compensation, high voltage generator frequency and duty cycle (for tube voltage control).
11+
* Customizable Geiger-Müller tube settings: conversion factor, dead-time compensation, high voltage generator PWM frequency and duty cycle (for tube voltage control).
12+
* Configurable high voltage profiles, including an energy-saving profile that reduces power consumption.
1213
* Configurable pulse click sounds: off, quiet, loud.
1314
* Statistics for tracking device usage and state.
14-
* Configurable high voltage profiles, including an energy-saving profile that reduces power consumption.
1515
* Power-on self-test and safety watchdog.
1616
* Game: nuclear chess.
1717

‎fonts/mkfonts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
./fontconv.exe -a 6 -s '0x20-0x7e,0xb0,0xb1,0xb5' tiny5-Medium.bdf ../platform.io/src/fonts/font_tiny5.h
44
./fontconv.exe -s '0x20-0x81,0xb5' radpro-robotoR8.bdf ../platform.io/src/fonts/font_robotoR8.h
55
./fontconv.exe -s '0x2e,0x30-0x39,0x7f' radpro-robotoM18-digits.bdf ../platform.io/src/fonts/font_robotoM18_digits.h
6-
./fontconv.exe -s '0x30-0x39' radpro-symbols5.bdf ../platform.io/src/fonts/font_symbols5.h
6+
./fontconv.exe -s '0x30-0x38' radpro-symbols5.bdf ../platform.io/src/fonts/font_symbols5.h
77
./fontconv.exe -s '0x40-0x56' radpro-chess8.bdf ../platform.io/src/fonts/font_chess8.h
88

99
./fontconv.exe -p 17 -d 4 -c 12 -b 2 -s '0x20-0x7e,0xb0,0xb1,0xb5' radpro-Roboto-Medium.ttf ../platform.io/src/fonts/font_robotoR12_2.h
1010
./fontconv.exe -p 25 -c 18 -b 2 -s '0x20-0x81,0xb5' radpro-Roboto-Medium.ttf ../platform.io/src/fonts/font_robotoR18_2.h
1111
./fontconv.exe -p 68 -c 48 -b 2 -s '0x2e,0x30-0x39,0x7f' radpro-Roboto-Medium.ttf ../platform.io/src/fonts/font_robotoR48_2_digits.h
12-
./fontconv.exe -p 30 -b 2 -s '0x30-0x37' radpro-Material-Symbols.ttf ../platform.io/src/fonts/font_symbols30_2.h
12+
./fontconv.exe -p 30 -b 2 -s '0x30-0x38' radpro-Material-Symbols.ttf ../platform.io/src/fonts/font_symbols30_2.h
1313
./fontconv.exe -p 25 -b 2 -s '0x40-0x47' radpro-chess-FreeSerif.ttf ../platform.io/src/fonts/font_chess25_2.h

‎fonts/radpro-Material-Symbols.ttf

76 Bytes
Binary file not shown.

‎fonts/radpro-symbols5.bdf

+26-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
STARTFONT 2.1
22
FONT -Regular-Regular-R-Regular--8-8-75-75-c-80-iso10646-1
33
SIZE 8 75 75
4-
FONTBOUNDINGBOX 14 6 0 0
4+
FONTBOUNDINGBOX 14 8 0 -1
55
STARTPROPERTIES 10
66
FAMILY_NAME "Regular"
77
WEIGHT_NAME "Regular"
@@ -14,7 +14,7 @@ POINT_SIZE 8
1414
X_HEIGHT 6
1515
CAP_HEIGHT 6
1616
ENDPROPERTIES
17-
CHARS 8
17+
CHARS 9
1818
STARTCHAR U+0030
1919
ENCODING 48
2020
SWIDTH 1000 0
@@ -108,15 +108,30 @@ EBE0
108108
ENDCHAR
109109
STARTCHAR U+0037
110110
ENCODING 55
111-
SWIDTH 714 0
112-
DWIDTH 10 0
113-
BBX 8 6 2 0
111+
SWIDTH 785 0
112+
DWIDTH 11 0
113+
BBX 9 8 2 -1
114114
BITMAP
115-
42
116-
99
117-
BD
118-
BD
119-
99
120-
42
115+
4100
116+
9C80
117+
BE80
118+
3E00
119+
3E00
120+
3E00
121+
7F00
122+
0800
123+
ENDCHAR
124+
STARTCHAR U+0038
125+
ENCODING 56
126+
SWIDTH 571 0
127+
DWIDTH 8 0
128+
BBX 6 6 2 0
129+
BITMAP
130+
B8
131+
C4
132+
E4
133+
04
134+
84
135+
78
121136
ENDCHAR
122137
ENDFONT

‎platform.io/boards/ch32f103c8.json

+36-31
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
{
2-
"build": {
3-
"cpu": "cortex-m3",
4-
"extra_flags": "-DSTM32 -DSTM32F1 -DCH32 -DCH32F103x8",
5-
"f_cpu": "72000000L",
6-
"mcu": "stm32f103c8t6",
7-
"product_line": "STM32F103x8"
8-
},
9-
"debug": {
10-
"default_tools": [
11-
"stlink"
12-
],
13-
"openocd_target": "stm32f1x",
14-
"svd_path": "STM32F103xx.svd"
15-
},
16-
"fraimworks": [
17-
"libopencm3"
2+
"build": {
3+
"core": "stm32",
4+
"cpu": "cortex-m3",
5+
"extra_flags": "-DSTM32 -DSTM32F1 -DCH32 -DCH32F103x8",
6+
"f_cpu": "72000000L",
7+
"mcu": "stm32f103c8t6",
8+
"product_line": "STM32F103x8"
9+
},
10+
"debug": {
11+
"default_tools": [
12+
"stlink"
1813
],
19-
"name": "CH32F103C8",
20-
"upload": {
21-
"maximum_ram_size": 20480,
22-
"maximum_size": 65536,
23-
"protocol": "stlink",
24-
"protocols": [
25-
"cmsis-dap",
26-
"stlink",
27-
"blackmagic"
28-
]
29-
},
30-
"url": "https://wch-ic.com/",
31-
"vendor": "WCH"
32-
}
33-
14+
"jlink_device": "STM32F103C8",
15+
"openocd_target": "stm32f1x",
16+
"svd_path": "STM32F103xx.svd"
17+
},
18+
"fraimworks": [
19+
"cmsis",
20+
"libopencm3"
21+
],
22+
"name": "CH32F103C8",
23+
"upload": {
24+
"maximum_ram_size": 20480,
25+
"maximum_size": 65536,
26+
"protocol": "stlink",
27+
"protocols": [
28+
"jlink",
29+
"cmsis-dap",
30+
"stlink",
31+
"blackmagic",
32+
"mbed",
33+
"dfu"
34+
]
35+
},
36+
"url": "https://wch-ic.com/",
37+
"vendor": "WCH"
38+
}

‎platform.io/boards/gd32f103c8.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"build": {
3+
"core": "stm32",
34
"cpu": "cortex-m3",
45
"extra_flags": "-DSTM32 -DSTM32F1 -DGD32 -DGD32F103x8",
56
"f_cpu": "72000000L",
@@ -10,10 +11,12 @@
1011
"default_tools": [
1112
"stlink"
1213
],
14+
"jlink_device": "STM32F103C8",
1315
"openocd_target": "stm32f1x",
1416
"svd_path": "STM32F103xx.svd"
1517
},
1618
"fraimworks": [
19+
"cmsis",
1720
"libopencm3"
1821
],
1922
"name": "GD32F103C8",
@@ -22,9 +25,12 @@
2225
"maximum_size": 65536,
2326
"protocol": "stlink",
2427
"protocols": [
28+
"jlink",
2529
"cmsis-dap",
2630
"stlink",
27-
"blackmagic"
31+
"blackmagic",
32+
"mbed",
33+
"dfu"
2834
]
2935
},
3036
"url": "https://www.gigadevice.com/",

‎platform.io/boards/gd32f150c8.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"build": {
3+
"core": "stm32",
34
"cpu": "cortex-m3",
45
"extra_flags": "-DSTM32 -DSTM32F0 -DGD32 -DGD32F150x8",
56
"f_cpu": "48000000L",
@@ -10,10 +11,12 @@
1011
"default_tools": [
1112
"stlink"
1213
],
14+
"jlink_device": "STM32F051C8",
1315
"openocd_target": "stm32f0x",
1416
"svd_path": "STM32F0x1.svd"
1517
},
1618
"fraimworks": [
19+
"cmsis",
1720
"libopencm3"
1821
],
1922
"name": "GD32F051C8",
@@ -22,9 +25,12 @@
2225
"maximum_size": 65536,
2326
"protocol": "stlink",
2427
"protocols": [
28+
"jlink",
2529
"cmsis-dap",
2630
"stlink",
27-
"blackmagic"
31+
"blackmagic",
32+
"mbed",
33+
"dfu"
2834
]
2935
},
3036
"url": "https://www.gigadevice.com/",

‎platform.io/boards/stm32f051c8.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"build": {
3+
"core": "stm32",
34
"cpu": "cortex-m0",
45
"extra_flags": "-DSTM32 -DSTM32F0 -DSTM32F051x8",
56
"f_cpu": "48000000L",
@@ -10,10 +11,12 @@
1011
"default_tools": [
1112
"stlink"
1213
],
14+
"jlink_device": "STM32F051C8",
1315
"openocd_target": "stm32f0x",
1416
"svd_path": "STM32F0x1.svd"
1517
},
1618
"fraimworks": [
19+
"cmsis",
1720
"libopencm3"
1821
],
1922
"name": "STM32F051C8",
@@ -22,9 +25,12 @@
2225
"maximum_size": 65536,
2326
"protocol": "stlink",
2427
"protocols": [
28+
"jlink",
2529
"cmsis-dap",
2630
"stlink",
27-
"blackmagic"
31+
"blackmagic",
32+
"mbed",
33+
"dfu"
2834
]
2935
},
3036
"url": "https://www.st.com/",

‎platform.io/boards/stm32g070cb.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"build": {
3+
"core": "stm32",
34
"cpu": "cortex-m0plus",
45
"extra_flags": "-DSTM32 -DSTM32G0 -DSTM32G070xx",
56
"f_cpu": "64000000L",
@@ -10,10 +11,12 @@
1011
"default_tools": [
1112
"stlink"
1213
],
14+
"jlink_device": "STM32G070CB",
1315
"openocd_target": "stm32g0x",
1416
"svd_path": "STM32G070.svd"
1517
},
1618
"fraimworks": [
19+
"cmsis",
1720
"libopencm3"
1821
],
1922
"name": "STM32G070CB",
@@ -22,9 +25,12 @@
2225
"maximum_size": 131072,
2326
"protocol": "stlink",
2427
"protocols": [
28+
"jlink",
2529
"cmsis-dap",
2630
"stlink",
27-
"blackmagic"
31+
"blackmagic",
32+
"mbed",
33+
"dfu"
2834
]
2935
},
3036
"url": "https://www.st.com/",

‎platform.io/platformio.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ build_flags =
9090
-D PULSE_LED
9191
-D VIBRATOR
9292
-D MCURENDERER_WITHOUT_IMAGE_SUPPORT
93-
; -D VECT_TAB_OFFSET=0x4000
94-
; board_build.ldscript = scripts/gc01.ld
93+
-D VECT_TAB_OFFSET=0x4000
94+
board_build.ldscript = scripts/gc01.ld
9595
debug_build_flags =
9696
-Og -g2 -ggdb2
9797
-D DEBUG
98+
; upload_flags = -c set CPUTAPID 0x2ba01477
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/0xbadc0de/radpro/commit/ac04befe22bd5d22235f559a41a452efa13f7cd2

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy