2.0rc5

Gissio · May 28, 2024 · 62abdbd · 62abdbd
1 parent 2789a99
commit 62abdbd
Show file tree

Hide file tree

Showing 26 changed files with 495 additions and 260 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,10 +24,11 @@ add_definitions(-D SIMULATOR)
 add_definitions(-D SIMULATE_PULSES)
 add_definitions(-D BATTERY_REMOVABLE)
 add_definitions(-D KEYBOARD_5KEYS)
+# add_definitions(-D DISPLAY_PANEL)
 add_definitions(-D PULSE_LED)
 # add_definitions(-D ALERT_LED)
 add_definitions(-D VIBRATOR)
-add_definitions(-D DATA_MODE)
+# add_definitions(-D DATA_MODE)
 add_definitions(-D GAME)
 add_definitions(-D MCURENDERER_SDL)
 add_definitions(-D _CRT_SECURE_NO_WARNINGS)

diff --git a/RELEASES.md b/RELEASES.md
@@ -3,6 +3,7 @@
 ## 2.0rc5 The final countdown
 
 * Added Bosean FS-5000 support.
+* Added display panels menu for calibrating the display on the GC-01.
 * Added secondary dose view in average measurement mode.
 * Extended conversion factor range to 25-1600 cpm/µSv/h.
 * Added 1 second datalog interval options and removed 30 seconds and 30 minutes datalog interval options.

diff --git a/docs/devices/Bosean FS-5000/display.md b/docs/devices/Bosean FS-5000/display.md
@@ -1,80 +1,43 @@
-# Bosean FS-50000 240x320 LCD display (ST7789V)
+# LCD Displays
 
-* 0x11 SLPOUT: Wait 10 ms
-* 0x36 MADCTL: 0x00
-* 0x3a COLMOD: 0x55
-* 0xb2 PORCTRL: 0x0c 0x0c 0x00 0x33 0x33
-* 0xb7 GCTRL: 0x35
-* 0xbb VCOMS: 0x28
-* 0xc0 LCMCTRL: 0x2c
-* 0xc2 VDVVRHEN: 0x01
-* 0xc3 VRHS: 0x22
-* 0xc4 VDVS: 0x20
-* 0xc6 FRCTRL2: 0x0f
-* 0xd0 PWCTRL1: 0xa4 0xa1
-* 0xe0 PVGAMCTRL: 0xd0 0x04 0x10 0x13 0x14 0x2c 0x41 0x54 0x4e 0x18 0x0c 0x0a 0x21 0x25
-* 0xe1 NVGAMCTRL: 0xd0 0x04 0x0f 0x13 0x15 0x2c 0x40 0x44 0x52 0x2d 0x1d 0x1e 0x21 0x24
-* 0x2a CASET: 0x00 0x00 0x00 0xef
-* 0x2b RASET: 0x00 0x00 0x01 0x3f
+## FPC-H24C159-01W Initialization sequence
 
-## Initialization sequence
-
-* display_send_command(0x11);   // SLPOUT: Sleep out
-* sleep(10)
-* display_send_command(0x36);   // MADCTL: Memory access control
-* display_send_data(0x00);
-* display_send_command(0x3a);   // COLMOD: Interface pixel format
-* display_send_data(0x55);      // Set: 0x55 (16-bit interface format, 16 bit control format)
-* display_send_command(0xb2);   // PORCTRL: Porch setting
-* display_send_data(0x0c);      // Default value
-* display_send_data(0x0c);
-* display_send_data(0x00);
-* display_send_data(0x33);
-* display_send_data(0x33);
-* display_send_command(0xb7);   // GCTRL: Gate control
-* display_send_data(0x35);      // Default value
-* display_send_command(0xbb);   // VCOMS: VCOMS setting
-* display_send_data(0x28);      // Set: 1.1 V (default 0.9 V)
-* display_send_command(0xc0);   // LCMCTRL: LCM control
-* display_send_data(0x2c);      // Default value
-* display_send_command(0xc2);   // VDVVRHEN: VDV and VRH command enable
-* display_send_data(0x1);       // Default value
-* display_send_command(0xc3);   // VRHS: VRH set
-* display_send_data(0x22);      // -5.25+(vcom+vcom offset-vdv)
-* display_send_command(0xc4);   // VDVS: VDV set
-* display_send_data(0x20);      // Default value
-* display_send_command(0xc6);   // FRCTRL2: Frame rate control in normal mode
-* display_send_data(0x0f);      // Default value
-* display_send_command(0xd0);   // PWCTRL1: Power control 1
-* display_send_data(0xa4);      // Set: AVDD 6.8 V, AVCL -4.8 V, VDDS 2.3 V
-* display_send_data(0xa1);
-* display_send_command(0xe0);   // PVGAMCTRL: Positive voltage gamma control
-* display_send_data(0xd0);      // Set
-* display_send_data(0x04);
-* display_send_data(0x10);
-* display_send_data(0x13);
-* display_send_data(0x14);
-* display_send_data(0x2c);
-* display_send_data(0x41);
-* display_send_data(0x54);
-* display_send_data(0x4e);
-* display_send_data(0x18);
-* display_send_data(0x0c);
-* display_send_data(0x0a);
-* display_send_data(0x21);
-* display_send_data(0x25);
-* display_send_command(0xe1);   // NVGAMCTRL: Negative voltage gamma control
-* display_send_data(0xd0);      // Set
-* display_send_data(0x04);
-* display_send_data(0x0f);
-* display_send_data(0x13);
-* display_send_data(0x15);
-* display_send_data(0x2c);
-* display_send_data(0x40);
-* display_send_data(0x44);
-* display_send_data(0x52);
-* display_send_data(0x2d);
-* display_send_data(0x1d);
-* display_send_data(0x1e);
-* display_send_data(0x21);
-* display_send_data(0x24);
+    display_send_command(0x3a);     // COLMOD (should be 0x55)
+    display_send_data(0x06);
+    display_send_command(0xbb);     // VCOMS (default: 0x20)
+    display_send_data(0x2b);
+    display_send_command(0xc3);     // VRHS (default: 0xb)
+    display_send_data(0x11);
+    display_send_command(0xd0);     // PWCTRL1 (default: 0xa4, 0x81)
+    display_send_data(0xa4);
+    display_send_data(0xa1);
+    display_send_command(0xe0);     // PVGAMCTRL
+    display_send_data(0xd0);
+    display_send_data(0x00);
+    display_send_data(0x05);
+    display_send_data(0x0e);
+    display_send_data(0x15);
+    display_send_data(0x0d);
+    display_send_data(0x37);
+    display_send_data(0x43);
+    display_send_data(0x47);
+    display_send_data(0x09);
+    display_send_data(0x15);
+    display_send_data(0x12);
+    display_send_data(0x16);
+    display_send_data(0x19);
+    display_send_command(0xe1);     // NVGAMCTRL
+    display_send_data(0xd0);
+    display_send_data(0x00);
+    display_send_data(0x05);
+    display_send_data(0x0d);
+    display_send_data(0x0c);
+    display_send_data(0x06);
+    display_send_data(0x2d);
+    display_send_data(0x44);
+    display_send_data(0x40);
+    display_send_data(0x0e);
+    display_send_data(0x1c);
+    display_send_data(0x18);
+    display_send_data(0x16);
+    display_send_data(0x19);
diff --git a/docs/devices/Bosean FS-5000/install.md b/docs/devices/Bosean FS-5000/install.md
@@ -18,7 +18,7 @@ To start installing Rad Pro, turn off the device, remove the screws holding the
 
 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.
 
-If your board looks different and Rad Pro does not work, create an issue on https://github.com/Gissio/radpro/issues.
+If your board looks different and Rad Pro does not work, create an [issue](https://github.com/Gissio/radpro/issues).
 
 ## Step 2: Connect the programmer
 
@@ -49,6 +49,8 @@ The installation will automatically create a backup of the original firmware in
 
 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.
 
+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).
+
 ## Step 4: Configure your device
 
 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.

diff --git a/docs/devices/Bosean FS-600, FS-1000/display.md b/docs/devices/Bosean FS-600, FS-1000/display.md
@@ -2,23 +2,23 @@
 
 ## Initialization sequence
 
-* display_clear_en();
-* sleep(20);
-* display_set_en();
-* sleep(20);
-* display_send_command(0xe2); // Software reset
-* display_send_command(0xa4); // Display all points: normal display
-* display_send_command(0xe6); // Sets the LCD display normal/reverse: normal
-* display_send_command(0xa2); // Set LCD bias: 1/9 bias
-* display_send_command(0xf8); // Set internal booster...
-* display_send_command(0x00); // ... to 4x
-* display_send_command(0xa0); // Set SEG output direction: normal
-* display_send_command(0xc8); // COM output scan direction: reverse direction
-* display_send_command(0x2c); // Power control: 100, enable internal voltage booster
-* display_send_command(0x2e); // Power control: 110, enable internal voltage regulator
-* display_send_command(0x2f); // Power control: 111, enable internal voltage follower
-* display_send_command(0x24); // Select internal resistor ratio(Rb/Ra) mode (0 to 7) [4]
-* display_send_command(0x81); // Set contrast
-* display_send_command(0x20); // Set contrast value: 00-3f contrast
-* display_send_command(0x40); // Specify DDRAM line x for COM0 [0]
-* display_send_command(0xae); // Turn LCD display: off
+    display_clear_en();
+    sleep(20);
+    display_set_en();
+    sleep(20);
+    display_send_command(0xe2); // Software reset
+    display_send_command(0xa4); // Display all points: normal display
+    display_send_command(0xe6); // Sets the LCD display normal/reverse: normal
+    display_send_command(0xa2); // Set LCD bias: 1/9 bias
+    display_send_command(0xf8); // Set internal booster...
+    display_send_command(0x00); // ... to 4x
+    display_send_command(0xa0); // Set SEG output direction: normal
+    display_send_command(0xc8); // COM output scan direction: reverse direction
+    display_send_command(0x2c); // Power control: 100, enable internal voltage booster
+    display_send_command(0x2e); // Power control: 110, enable internal voltage regulator
+    display_send_command(0x2f); // Power control: 111, enable internal voltage follower
+    display_send_command(0x24); // Select internal resistor ratio(Rb/Ra) mode (0 to 7) [4]
+    display_send_command(0x81); // Set contrast
+    display_send_command(0x20); // Set contrast value: 00-3f contrast
+    display_send_command(0x40); // Specify DDRAM line x for COM0 [0]
+    display_send_command(0xae); // Turn LCD display: off
diff --git a/docs/devices/Bosean FS-600, FS-1000/install.md b/docs/devices/Bosean FS-600, FS-1000/install.md
@@ -22,7 +22,7 @@ Follow these steps to start installing Rad Pro:
 
 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.
 
-If your board looks different and Rad Pro does not work, create an issue on https://github.com/Gissio/radpro/issues.
+If your board looks different and Rad Pro does not work, create an [issue](https://github.com/Gissio/radpro/issues).
 
 ## Step 2: Connect the programmer
 

diff --git a/docs/devices/FNIRSI GC-01/display.md b/docs/devices/FNIRSI GC-01/display.md
@@ -2,86 +2,86 @@
 
 ## Initialization sequence
 
-* display_set_reset();
-* sleep(10);
-* display_clear_reset();
-* sleep(20);
-* display_set_reset();
-* sleep(20);
+    display_set_reset();
+    sleep(10);
+    display_clear_reset();
+    sleep(20);
+    display_set_reset();
+    sleep(20);
 
-* display_send_command(0x11);   // SLPOUT: Sleep out
-* sleep(120)
-* display_send_command(0x36);   // MADCTL: Memory access control
-* display_send_data(0x0);
-* display_send_command(0x3a);   // COLMOD: Interface pixel format
-* display_send_data(0x5);       // Set: 0x5 (16 bit/pixel) (should be 0x55)
-* display_send_command(0xb2);   // PORCTRL: Porch setting
-* display_send_data(0xc);       // Default value
-* display_send_data(0xc);
-* display_send_data(0x0);
-* display_send_data(0x33);
-* display_send_data(0x33);
-* display_send_command(0xb7);   // GCTRL: Gate control
-* display_send_data(0x35);      // Default value
-* display_send_command(0xbb);   // VCOMS: VCOMS setting
-* display_send_data(0x28);      // Set: 1.1 V (default 0.9 V)
-* display_send_command(0xc0);   // LCMCTRL: LCM control
-* display_send_data(0x2c);      // Default value
-* display_send_command(0xc2);   // VDVVRHEN: VDV and VRH command enable
-* display_send_data(0x1);       // Default value
-* display_send_command(0xc3);   // VRHS: VRH set
-* display_send_data(0xb);       // Default value
-* display_send_command(0xc4);   // VDVS: VDV set
-* display_send_data(0x20);      // Default value
-* display_send_command(0xc6);   // FRCTRL2: Frame rate control in normal mode
-* display_send_data(0xf);       // Default value
-* display_send_command(0xd0);   // PWCTRL1: Power control 1
-* display_send_data(0xa4);      // Set: AVDD 6.8 V, AVCL -4.8 V, VDDS 2.3 V
-* display_send_data(0xa1);
-* display_send_command(0xe0);   // PVGAMCTRL: Positive voltage gamma control
-* display_send_data(0xd0);      // Set
-* display_send_data(0x1);
-* display_send_data(0x8);
-* display_send_data(0xf);
-* display_send_data(0x11);
-* display_send_data(0x2a);
-* display_send_data(0x36);
-* display_send_data(0x55);
-* display_send_data(0x44);
-* display_send_data(0x3a);
-* display_send_data(0xb);
-* display_send_data(0x6);
-* display_send_data(0x11);
-* display_send_data(0x20);
-* display_send_command(0xe1);   // NVGAMCTRL: Negative voltage gamma control
-* display_send_data(0xd0);      // Set
-* display_send_data(0x2);
-* display_send_data(0x7);
-* display_send_data(0xa);
-* display_send_data(0xb);
-* display_send_data(0x18);
-* display_send_data(0x34);
-* display_send_data(0x43);
-* display_send_data(0x4a);
-* display_send_data(0x2b);
-* display_send_data(0x1b);
-* display_send_data(0x1c);
-* display_send_data(0x22);
-* display_send_data(0x1f);
-* display_send_command(0x29);   // DISPON: Display on
-* display_send_command(0x2c);   // RAMWR: Memory write
+    display_send_command(0x11);   // SLPOUT: Sleep out
+    sleep(120)
+    display_send_command(0x36);   // MADCTL: Memory access control
+    display_send_data(0x0);
+    display_send_command(0x3a);   // COLMOD: Interface pixel format
+    display_send_data(0x5);       // Set: 0x5 (16 bit/pixel) (should be 0x55)
+    display_send_command(0xb2);   // PORCTRL: Porch setting
+    display_send_data(0xc);       // Default value
+    display_send_data(0xc);
+    display_send_data(0x0);
+    display_send_data(0x33);
+    display_send_data(0x33);
+    display_send_command(0xb7);   // GCTRL: Gate control
+    display_send_data(0x35);      // Default value
+    display_send_command(0xbb);   // VCOMS: VCOMS setting
+    display_send_data(0x28);      // Set: 1.1 V (default 0.9 V)
+    display_send_command(0xc0);   // LCMCTRL: LCM control
+    display_send_data(0x2c);      // Default value
+    display_send_command(0xc2);   // VDVVRHEN: VDV and VRH command enable
+    display_send_data(0x1);       // Default value
+    display_send_command(0xc3);   // VRHS: VRH set
+    display_send_data(0xb);       // Default value
+    display_send_command(0xc4);   // VDVS: VDV set
+    display_send_data(0x20);      // Default value
+    display_send_command(0xc6);   // FRCTRL2: Frame rate control in normal mode
+    display_send_data(0xf);       // Default value
+    display_send_command(0xd0);   // PWCTRL1: Power control 1
+    display_send_data(0xa4);      // Set: AVDD 6.8 V, AVCL -4.8 V, VDDS 2.3 V
+    display_send_data(0xa1);
+    display_send_command(0xe0);   // PVGAMCTRL: Positive voltage gamma control
+    display_send_data(0xd0);      // Set
+    display_send_data(0x1);
+    display_send_data(0x8);
+    display_send_data(0xf);
+    display_send_data(0x11);
+    display_send_data(0x2a);
+    display_send_data(0x36);
+    display_send_data(0x55);
+    display_send_data(0x44);
+    display_send_data(0x3a);
+    display_send_data(0xb);
+    display_send_data(0x6);
+    display_send_data(0x11);
+    display_send_data(0x20);
+    display_send_command(0xe1);   // NVGAMCTRL: Negative voltage gamma control
+    display_send_data(0xd0);      // Set
+    display_send_data(0x2);
+    display_send_data(0x7);
+    display_send_data(0xa);
+    display_send_data(0xb);
+    display_send_data(0x18);
+    display_send_data(0x34);
+    display_send_data(0x43);
+    display_send_data(0x4a);
+    display_send_data(0x2b);
+    display_send_data(0x1b);
+    display_send_data(0x1c);
+    display_send_data(0x22);
+    display_send_data(0x1f);
+    display_send_command(0x29);   // DISPON: Display on
+    display_send_command(0x2c);   // RAMWR: Memory write
 
 ## Data write
 
-* display_send_command(0x36);   // MADCTL: Memory access control
-* display_send_data(0xa0);
-* display_send_command(0x2a);   // CASET: Column address set
-* display_send_data(0x0);       // Default (start, end)
-* display_send_data(0x0);
-* display_send_data(0x1);
-* display_send_data(0x3f);
-* display_send_command(0x2b);   // RASET: Row address set
-* display_send_data(0x0);       // Default (start, end)
-* display_send_data(0x0);
-* display_send_data(0x0);
-* display_send_data(0xef);
+    display_send_command(0x36);   // MADCTL: Memory access control
+    display_send_data(0xa0);
+    display_send_command(0x2a);   // CASET: Column address set
+    display_send_data(0x0);       // Default (start, end)
+    display_send_data(0x0);
+    display_send_data(0x1);
+    display_send_data(0x3f);
+    display_send_command(0x2b);   // RASET: Row address set
+    display_send_data(0x0);       // Default (start, end)
+    display_send_data(0x0);
+    display_send_data(0x0);
+    display_send_data(0xef);
diff --git a/docs/devices/FNIRSI GC-01/install-stlink.md b/docs/devices/FNIRSI GC-01/install-stlink.md
@@ -28,7 +28,8 @@ Follow these steps to start installing Rad Pro:
 * Remove the screws holding the back case and open the device.
 * Disconnect the large battery.
 * Take note of the MCU (microprocessor) installed in your device: CH32F103R8T6 (WCH) or APM32F103RBT6 (Geehy). The picture above should help you identify the MCU.
-* 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.
+* 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.
+* 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).
 
 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.