Skip to content

Commit 62abdbd

Browse files
GissioGissio
committed
2.0rc5
1 parent 2789a99 commit 62abdbd

26 files changed

+495
-260
lines changed

‎CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ add_definitions(-D SIMULATOR)
2424
add_definitions(-D SIMULATE_PULSES)
2525
add_definitions(-D BATTERY_REMOVABLE)
2626
add_definitions(-D KEYBOARD_5KEYS)
27+
# add_definitions(-D DISPLAY_PANEL)
2728
add_definitions(-D PULSE_LED)
2829
# add_definitions(-D ALERT_LED)
2930
add_definitions(-D VIBRATOR)
30-
add_definitions(-D DATA_MODE)
31+
# add_definitions(-D DATA_MODE)
3132
add_definitions(-D GAME)
3233
add_definitions(-D MCURENDERER_SDL)
3334
add_definitions(-D _CRT_SECURE_NO_WARNINGS)

‎RELEASES.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 2.0rc5 The final countdown
44

55
* Added Bosean FS-5000 support.
6+
* Added display panels menu for calibrating the display on the GC-01.
67
* Added secondary dose view in average measurement mode.
78
* Extended conversion factor range to 25-1600 cpm/µSv/h.
89
* Added 1 second datalog interval options and removed 30 seconds and 30 minutes datalog interval options.

‎docs/devices/Bosean FS-5000/display.md

+41-78
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,43 @@
1-
# Bosean FS-50000 240x320 LCD display (ST7789V)
1+
# LCD Displays
22

3-
* 0x11 SLPOUT: Wait 10 ms
4-
* 0x36 MADCTL: 0x00
5-
* 0x3a COLMOD: 0x55
6-
* 0xb2 PORCTRL: 0x0c 0x0c 0x00 0x33 0x33
7-
* 0xb7 GCTRL: 0x35
8-
* 0xbb VCOMS: 0x28
9-
* 0xc0 LCMCTRL: 0x2c
10-
* 0xc2 VDVVRHEN: 0x01
11-
* 0xc3 VRHS: 0x22
12-
* 0xc4 VDVS: 0x20
13-
* 0xc6 FRCTRL2: 0x0f
14-
* 0xd0 PWCTRL1: 0xa4 0xa1
15-
* 0xe0 PVGAMCTRL: 0xd0 0x04 0x10 0x13 0x14 0x2c 0x41 0x54 0x4e 0x18 0x0c 0x0a 0x21 0x25
16-
* 0xe1 NVGAMCTRL: 0xd0 0x04 0x0f 0x13 0x15 0x2c 0x40 0x44 0x52 0x2d 0x1d 0x1e 0x21 0x24
17-
* 0x2a CASET: 0x00 0x00 0x00 0xef
18-
* 0x2b RASET: 0x00 0x00 0x01 0x3f
3+
## FPC-H24C159-01W Initialization sequence
194

20-
## Initialization sequence
21-
22-
* display_send_command(0x11); // SLPOUT: Sleep out
23-
* sleep(10)
24-
* display_send_command(0x36); // MADCTL: Memory access control
25-
* display_send_data(0x00);
26-
* display_send_command(0x3a); // COLMOD: Interface pixel format
27-
* display_send_data(0x55); // Set: 0x55 (16-bit interface format, 16 bit control format)
28-
* display_send_command(0xb2); // PORCTRL: Porch setting
29-
* display_send_data(0x0c); // Default value
30-
* display_send_data(0x0c);
31-
* display_send_data(0x00);
32-
* display_send_data(0x33);
33-
* display_send_data(0x33);
34-
* display_send_command(0xb7); // GCTRL: Gate control
35-
* display_send_data(0x35); // Default value
36-
* display_send_command(0xbb); // VCOMS: VCOMS setting
37-
* display_send_data(0x28); // Set: 1.1 V (default 0.9 V)
38-
* display_send_command(0xc0); // LCMCTRL: LCM control
39-
* display_send_data(0x2c); // Default value
40-
* display_send_command(0xc2); // VDVVRHEN: VDV and VRH command enable
41-
* display_send_data(0x1); // Default value
42-
* display_send_command(0xc3); // VRHS: VRH set
43-
* display_send_data(0x22); // -5.25+(vcom+vcom offset-vdv)
44-
* display_send_command(0xc4); // VDVS: VDV set
45-
* display_send_data(0x20); // Default value
46-
* display_send_command(0xc6); // FRCTRL2: Frame rate control in normal mode
47-
* display_send_data(0x0f); // Default value
48-
* display_send_command(0xd0); // PWCTRL1: Power control 1
49-
* display_send_data(0xa4); // Set: AVDD 6.8 V, AVCL -4.8 V, VDDS 2.3 V
50-
* display_send_data(0xa1);
51-
* display_send_command(0xe0); // PVGAMCTRL: Positive voltage gamma control
52-
* display_send_data(0xd0); // Set
53-
* display_send_data(0x04);
54-
* display_send_data(0x10);
55-
* display_send_data(0x13);
56-
* display_send_data(0x14);
57-
* display_send_data(0x2c);
58-
* display_send_data(0x41);
59-
* display_send_data(0x54);
60-
* display_send_data(0x4e);
61-
* display_send_data(0x18);
62-
* display_send_data(0x0c);
63-
* display_send_data(0x0a);
64-
* display_send_data(0x21);
65-
* display_send_data(0x25);
66-
* display_send_command(0xe1); // NVGAMCTRL: Negative voltage gamma control
67-
* display_send_data(0xd0); // Set
68-
* display_send_data(0x04);
69-
* display_send_data(0x0f);
70-
* display_send_data(0x13);
71-
* display_send_data(0x15);
72-
* display_send_data(0x2c);
73-
* display_send_data(0x40);
74-
* display_send_data(0x44);
75-
* display_send_data(0x52);
76-
* display_send_data(0x2d);
77-
* display_send_data(0x1d);
78-
* display_send_data(0x1e);
79-
* display_send_data(0x21);
80-
* display_send_data(0x24);
5+
display_send_command(0x3a); // COLMOD (should be 0x55)
6+
display_send_data(0x06);
7+
display_send_command(0xbb); // VCOMS (default: 0x20)
8+
display_send_data(0x2b);
9+
display_send_command(0xc3); // VRHS (default: 0xb)
10+
display_send_data(0x11);
11+
display_send_command(0xd0); // PWCTRL1 (default: 0xa4, 0x81)
12+
display_send_data(0xa4);
13+
display_send_data(0xa1);
14+
display_send_command(0xe0); // PVGAMCTRL
15+
display_send_data(0xd0);
16+
display_send_data(0x00);
17+
display_send_data(0x05);
18+
display_send_data(0x0e);
19+
display_send_data(0x15);
20+
display_send_data(0x0d);
21+
display_send_data(0x37);
22+
display_send_data(0x43);
23+
display_send_data(0x47);
24+
display_send_data(0x09);
25+
display_send_data(0x15);
26+
display_send_data(0x12);
27+
display_send_data(0x16);
28+
display_send_data(0x19);
29+
display_send_command(0xe1); // NVGAMCTRL
30+
display_send_data(0xd0);
31+
display_send_data(0x00);
32+
display_send_data(0x05);
33+
display_send_data(0x0d);
34+
display_send_data(0x0c);
35+
display_send_data(0x06);
36+
display_send_data(0x2d);
37+
display_send_data(0x44);
38+
display_send_data(0x40);
39+
display_send_data(0x0e);
40+
display_send_data(0x1c);
41+
display_send_data(0x18);
42+
display_send_data(0x16);
43+
display_send_data(0x19);

‎docs/devices/Bosean FS-5000/install.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To start installing Rad Pro, turn off the device, remove the screws holding the
1818

1919
The board should look like in the photo above. If it does not, you may have a different hardware revision. In this case, Rad Pro may not function properly.
2020

21-
If your board looks different and Rad Pro does not work, create an issue on https://github.com/Gissio/radpro/issues.
21+
If your board looks different and Rad Pro does not work, create an [issue](https://github.com/Gissio/radpro/issues).
2222

2323
## Step 2: Connect the programmer
2424

@@ -49,6 +49,8 @@ The installation will automatically create a backup of the original firmware in
4949

5050
Before closing the device, take note of the type of Geiger tube: the markings on the glass should be either J321, J305, M4011 or J614. If you have an unmarked tube measuring 55 or 65 mm long, you probably have a J614 or J613 tube, respectively.
5151

52+
Also take note of the type of LCD display: the marking on the ribbon cable should be “FPC1-H24C159-01W”. If it is not, please create an [issue](https://github.com/Gissio/radpro/issues).
53+
5254
## Step 4: Configure your device
5355

5456
Start your device and go to Rad Pro's settings, select “Geiger tube”, “Conversion factor”, and select the option that matches the Geiger-Müller tube installed in your device.

‎docs/devices/Bosean FS-600, FS-1000/display.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
## Initialization sequence
44

5-
* display_clear_en();
6-
* sleep(20);
7-
* display_set_en();
8-
* sleep(20);
9-
* display_send_command(0xe2); // Software reset
10-
* display_send_command(0xa4); // Display all points: normal display
11-
* display_send_command(0xe6); // Sets the LCD display normal/reverse: normal
12-
* display_send_command(0xa2); // Set LCD bias: 1/9 bias
13-
* display_send_command(0xf8); // Set internal booster...
14-
* display_send_command(0x00); // ... to 4x
15-
* display_send_command(0xa0); // Set SEG output direction: normal
16-
* display_send_command(0xc8); // COM output scan direction: reverse direction
17-
* display_send_command(0x2c); // Power control: 100, enable internal voltage booster
18-
* display_send_command(0x2e); // Power control: 110, enable internal voltage regulator
19-
* display_send_command(0x2f); // Power control: 111, enable internal voltage follower
20-
* display_send_command(0x24); // Select internal resistor ratio(Rb/Ra) mode (0 to 7) [4]
21-
* display_send_command(0x81); // Set contrast
22-
* display_send_command(0x20); // Set contrast value: 00-3f contrast
23-
* display_send_command(0x40); // Specify DDRAM line x for COM0 [0]
24-
* display_send_command(0xae); // Turn LCD display: off
5+
display_clear_en();
6+
sleep(20);
7+
display_set_en();
8+
sleep(20);
9+
display_send_command(0xe2); // Software reset
10+
display_send_command(0xa4); // Display all points: normal display
11+
display_send_command(0xe6); // Sets the LCD display normal/reverse: normal
12+
display_send_command(0xa2); // Set LCD bias: 1/9 bias
13+
display_send_command(0xf8); // Set internal booster...
14+
display_send_command(0x00); // ... to 4x
15+
display_send_command(0xa0); // Set SEG output direction: normal
16+
display_send_command(0xc8); // COM output scan direction: reverse direction
17+
display_send_command(0x2c); // Power control: 100, enable internal voltage booster
18+
display_send_command(0x2e); // Power control: 110, enable internal voltage regulator
19+
display_send_command(0x2f); // Power control: 111, enable internal voltage follower
20+
display_send_command(0x24); // Select internal resistor ratio(Rb/Ra) mode (0 to 7) [4]
21+
display_send_command(0x81); // Set contrast
22+
display_send_command(0x20); // Set contrast value: 00-3f contrast
23+
display_send_command(0x40); // Specify DDRAM line x for COM0 [0]
24+
display_send_command(0xae); // Turn LCD display: off

‎docs/devices/Bosean FS-600, FS-1000/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Follow these steps to start installing Rad Pro:
2222

2323
The board should look like in the photo above. If it does not, you may have a different hardware revision. In this case, Rad Pro may not function properly.
2424

25-
If your board looks different and Rad Pro does not work, create an issue on https://github.com/Gissio/radpro/issues.
25+
If your board looks different and Rad Pro does not work, create an [issue](https://github.com/Gissio/radpro/issues).
2626

2727
## Step 2: Connect the programmer
2828

‎docs/devices/FNIRSI GC-01/display.md

+79-79
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,86 @@
22

33
## Initialization sequence
44

5-
* display_set_reset();
6-
* sleep(10);
7-
* display_clear_reset();
8-
* sleep(20);
9-
* display_set_reset();
10-
* sleep(20);
5+
display_set_reset();
6+
sleep(10);
7+
display_clear_reset();
8+
sleep(20);
9+
display_set_reset();
10+
sleep(20);
1111

12-
* display_send_command(0x11); // SLPOUT: Sleep out
13-
* sleep(120)
14-
* display_send_command(0x36); // MADCTL: Memory access control
15-
* display_send_data(0x0);
16-
* display_send_command(0x3a); // COLMOD: Interface pixel format
17-
* display_send_data(0x5); // Set: 0x5 (16 bit/pixel) (should be 0x55)
18-
* display_send_command(0xb2); // PORCTRL: Porch setting
19-
* display_send_data(0xc); // Default value
20-
* display_send_data(0xc);
21-
* display_send_data(0x0);
22-
* display_send_data(0x33);
23-
* display_send_data(0x33);
24-
* display_send_command(0xb7); // GCTRL: Gate control
25-
* display_send_data(0x35); // Default value
26-
* display_send_command(0xbb); // VCOMS: VCOMS setting
27-
* display_send_data(0x28); // Set: 1.1 V (default 0.9 V)
28-
* display_send_command(0xc0); // LCMCTRL: LCM control
29-
* display_send_data(0x2c); // Default value
30-
* display_send_command(0xc2); // VDVVRHEN: VDV and VRH command enable
31-
* display_send_data(0x1); // Default value
32-
* display_send_command(0xc3); // VRHS: VRH set
33-
* display_send_data(0xb); // Default value
34-
* display_send_command(0xc4); // VDVS: VDV set
35-
* display_send_data(0x20); // Default value
36-
* display_send_command(0xc6); // FRCTRL2: Frame rate control in normal mode
37-
* display_send_data(0xf); // Default value
38-
* display_send_command(0xd0); // PWCTRL1: Power control 1
39-
* display_send_data(0xa4); // Set: AVDD 6.8 V, AVCL -4.8 V, VDDS 2.3 V
40-
* display_send_data(0xa1);
41-
* display_send_command(0xe0); // PVGAMCTRL: Positive voltage gamma control
42-
* display_send_data(0xd0); // Set
43-
* display_send_data(0x1);
44-
* display_send_data(0x8);
45-
* display_send_data(0xf);
46-
* display_send_data(0x11);
47-
* display_send_data(0x2a);
48-
* display_send_data(0x36);
49-
* display_send_data(0x55);
50-
* display_send_data(0x44);
51-
* display_send_data(0x3a);
52-
* display_send_data(0xb);
53-
* display_send_data(0x6);
54-
* display_send_data(0x11);
55-
* display_send_data(0x20);
56-
* display_send_command(0xe1); // NVGAMCTRL: Negative voltage gamma control
57-
* display_send_data(0xd0); // Set
58-
* display_send_data(0x2);
59-
* display_send_data(0x7);
60-
* display_send_data(0xa);
61-
* display_send_data(0xb);
62-
* display_send_data(0x18);
63-
* display_send_data(0x34);
64-
* display_send_data(0x43);
65-
* display_send_data(0x4a);
66-
* display_send_data(0x2b);
67-
* display_send_data(0x1b);
68-
* display_send_data(0x1c);
69-
* display_send_data(0x22);
70-
* display_send_data(0x1f);
71-
* display_send_command(0x29); // DISPON: Display on
72-
* display_send_command(0x2c); // RAMWR: Memory write
12+
display_send_command(0x11); // SLPOUT: Sleep out
13+
sleep(120)
14+
display_send_command(0x36); // MADCTL: Memory access control
15+
display_send_data(0x0);
16+
display_send_command(0x3a); // COLMOD: Interface pixel format
17+
display_send_data(0x5); // Set: 0x5 (16 bit/pixel) (should be 0x55)
18+
display_send_command(0xb2); // PORCTRL: Porch setting
19+
display_send_data(0xc); // Default value
20+
display_send_data(0xc);
21+
display_send_data(0x0);
22+
display_send_data(0x33);
23+
display_send_data(0x33);
24+
display_send_command(0xb7); // GCTRL: Gate control
25+
display_send_data(0x35); // Default value
26+
display_send_command(0xbb); // VCOMS: VCOMS setting
27+
display_send_data(0x28); // Set: 1.1 V (default 0.9 V)
28+
display_send_command(0xc0); // LCMCTRL: LCM control
29+
display_send_data(0x2c); // Default value
30+
display_send_command(0xc2); // VDVVRHEN: VDV and VRH command enable
31+
display_send_data(0x1); // Default value
32+
display_send_command(0xc3); // VRHS: VRH set
33+
display_send_data(0xb); // Default value
34+
display_send_command(0xc4); // VDVS: VDV set
35+
display_send_data(0x20); // Default value
36+
display_send_command(0xc6); // FRCTRL2: Frame rate control in normal mode
37+
display_send_data(0xf); // Default value
38+
display_send_command(0xd0); // PWCTRL1: Power control 1
39+
display_send_data(0xa4); // Set: AVDD 6.8 V, AVCL -4.8 V, VDDS 2.3 V
40+
display_send_data(0xa1);
41+
display_send_command(0xe0); // PVGAMCTRL: Positive voltage gamma control
42+
display_send_data(0xd0); // Set
43+
display_send_data(0x1);
44+
display_send_data(0x8);
45+
display_send_data(0xf);
46+
display_send_data(0x11);
47+
display_send_data(0x2a);
48+
display_send_data(0x36);
49+
display_send_data(0x55);
50+
display_send_data(0x44);
51+
display_send_data(0x3a);
52+
display_send_data(0xb);
53+
display_send_data(0x6);
54+
display_send_data(0x11);
55+
display_send_data(0x20);
56+
display_send_command(0xe1); // NVGAMCTRL: Negative voltage gamma control
57+
display_send_data(0xd0); // Set
58+
display_send_data(0x2);
59+
display_send_data(0x7);
60+
display_send_data(0xa);
61+
display_send_data(0xb);
62+
display_send_data(0x18);
63+
display_send_data(0x34);
64+
display_send_data(0x43);
65+
display_send_data(0x4a);
66+
display_send_data(0x2b);
67+
display_send_data(0x1b);
68+
display_send_data(0x1c);
69+
display_send_data(0x22);
70+
display_send_data(0x1f);
71+
display_send_command(0x29); // DISPON: Display on
72+
display_send_command(0x2c); // RAMWR: Memory write
7373

7474
## Data write
7575

76-
* display_send_command(0x36); // MADCTL: Memory access control
77-
* display_send_data(0xa0);
78-
* display_send_command(0x2a); // CASET: Column address set
79-
* display_send_data(0x0); // Default (start, end)
80-
* display_send_data(0x0);
81-
* display_send_data(0x1);
82-
* display_send_data(0x3f);
83-
* display_send_command(0x2b); // RASET: Row address set
84-
* display_send_data(0x0); // Default (start, end)
85-
* display_send_data(0x0);
86-
* display_send_data(0x0);
87-
* display_send_data(0xef);
76+
display_send_command(0x36); // MADCTL: Memory access control
77+
display_send_data(0xa0);
78+
display_send_command(0x2a); // CASET: Column address set
79+
display_send_data(0x0); // Default (start, end)
80+
display_send_data(0x0);
81+
display_send_data(0x1);
82+
display_send_data(0x3f);
83+
display_send_command(0x2b); // RASET: Row address set
84+
display_send_data(0x0); // Default (start, end)
85+
display_send_data(0x0);
86+
display_send_data(0x0);
87+
display_send_data(0xef);

‎docs/devices/FNIRSI GC-01/install-stlink.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Follow these steps to start installing Rad Pro:
2828
* Remove the screws holding the back case and open the device.
2929
* Disconnect the large battery.
3030
* Take note of the MCU (microprocessor) installed in your device: CH32F103R8T6 (WCH) or APM32F103RBT6 (Geehy). The picture above should help you identify the MCU.
31-
* Also, take note of the type of Geiger tube: the markings on the glass should be either J321 (as in the picture above), J305, M4011 or J614. If you have an unmarked tube measuring 55 or 65 mm long, you probably have a J614 or J613 tube, respectively.
31+
* Take note of the type of Geiger tube: the markings on the glass should be either J321 (as in the picture above), J305, M4011 or J614. If you have an unmarked tube measuring 55 or 65 mm long, you probably have a J614 or J613 tube, respectively.
32+
* Also, take note of the type of LCD display: the marking on the ribbon cable should be “CL24CG1045-40B”, “ENH-TV0240b026” or “GMT024-05 V2.0”. If it does not match any of these, please create an [issue](https://github.com/Gissio/radpro/issues).
3233

3334
The board should look like in the photo above. If it does not, you may have a different hardware revision. In this case, Rad Pro may not function properly.
3435

0 commit comments

Comments
 (0)