2.1beta3

Author: Gissio

README.md

@@ -33,6 +33,6 @@ With Rad Pro, you can:
 
 ## Acknowledgements
 
-* Rad Pro's user interface is based on the [OpenBridge 5.0](https://www.openbridge.no/) design system.
+* Rad Pro's user interface is based on the industry-standard [OpenBridge 5.0](https://www.openbridge.no/) design system.
 * Thanks to `Alfred90`, `danielhahn76`, `felixsteghofer`, `DG0MG`, `murkle`, `cromagn`, `ivohar`,`mryndzionek`, `JantarX`,  `mizsha`, `Tig3rch3n`, `Arparela`, `w01fdev`, `martin-machacek`, `dsl71`, `Davegsm82`, `alfmck`, `jonwhite227`, `dc1rdb`, `ihrapsa` and many others who helped with device testing and suggestions.
 * Thanks to `pixitha` for the FS2011/GD32F150 board photos with a J305 Geiger tube, `felixsteghofer` for the FS2011/GD32F103 board photos, `DG0MG` for the Bosean FS-600 board photos, `murkle` for the Bosean FS-1000 board photos, `ivohar` for the FNIRSCI GC-01 schematics and `oOblik` for the Bosean FS-5000 board photos.

RELEASES.md

@@ -4,21 +4,23 @@
 
 Updates:
 
-* Added the ability to dismiss alarms using the reset measurement key.
 * Introduced an alarm enabled indicator.
-* Added options for higher rate and dose alarms.
+* Added configurable alarm options for audible, haptic and visual-only notifications.
+* Added the ability to dismiss alarms using the reset measurement key.
+* Added options for setting higher rate and dose alarms.
 * Extended the duration of alarm sounds.
 * Implemented a lock mode accesible from Settings.
-* Display of dose counts below 10000 now uses standard notation for clarity.
-* Enhanced the menu structure for improved navigation.
-* Updated the UI font to Open Sans to enhance readability.
+* Display of dose counts below 10000 now uses standard notation.
+* Enhanced the menu structure for more intuitive navigation.
+* Updated the UI font to Open Sans for enhanced readability.
 * Minor UI improvements.
 
 Fixes:
 
 * On color displays, fixed an issue causing an unsightly flash when waking from sleep mode.
-* On the FNIRSI GC-01, corrected random pixel issues during the splash screen.
+* On the FNIRSI GC-01, resolved random pixel issues during the splash screen.
 * Fixed alarms continuing to sound after device shutdown while connected to external power.
+* Corrected the display of secondary rate and count views after the average timer expired.
 * Resolved an issue where the device state wasn't reset after a quick power cycle.
 * Corrected a problem where 60-second instantaneous averaging at high radiation levels didn't average correctly over the full seconds.
 

docs/manual.md

@@ -3,22 +3,25 @@
 ## Features
 
 * Measurement view with large digits, ideal for field application.
+* Configurable pulse indication with optional thresholding: audible (off, clicks, beeps), pulse LED (on supported devices), display flashes (on display sleep) and haptic (on supported devices).
+* Configurable alarm notifications: audible, haptic and visual-only.
+* Ability to dismiss alarms.
+* Tube fault alarm.
+* Multiple measurement units: Sievert, rem, cpm (counts per minute), cps (counts per second).
 * Configurable instantaneous rate averaging (adaptive fast, adaptive precision, 60 seconds, 30 seconds and 10 seconds), 
 * Configurable averaging for performing surveys.
-* Multiple measurement units: Sievert, rem, cpm (counts per minute), cps (counts per second).
-* Offline and live data logging with data compression.
-* Compatibility with the [GeigerLog](https://github.com/Gissio/geigerlog-radpro) data logging software.
-* Configurable pulse indication with optional thresholding: pulse clicks (off, clicks, beeps), pulse LED (on supported devices), display flashes (on display sleep) and haptic pulses (on supported devices).
-* Dead-time measurement.
 * Customizable Geiger-Müller tube settings: conversion factor, dead-time compensation, background compensation, high voltage generator PWM frequency and duty cycle (on supported devices).
 * Preconfigured high voltage profiles (on supported devices).
-* Tube fault alarm.
+* Offline and live data logging with data compression.
+* Compatibility with the [GeigerLog](https://github.com/Gissio/geigerlog-radpro) data logging software.
 * Statistics for tracking device usage and state.
-* User interface based on the [OpenBridge 5.0](https://www.openbridge.no/) design system.
+* Geiger tube dead-time measurement.
+* Game: nuclear chess (on supported devices).
+* Lock mode.
+* User interface based on the industry-standard [OpenBridge 5.0](https://www.openbridge.no/) design system.
 * Anti-aliased text rendering on color screens.
 * `radpro-tool` for low-level access to the device from a computer.
 * Power-on self-test and safety watchdog.
-* Game: nuclear chess (on supported devices).
 
 ## Measurements
 

platform.io/lib/mcu-renderer/mcu-renderer-ili9341.h

@@ -2,7 +2,7 @@
  * MCU renderer
  * ILI9341 driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */

platform.io/lib/mcu-renderer/mcu-renderer-sdl.c

@@ -2,7 +2,7 @@
  * MCU renderer
  * SDL driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */

platform.io/lib/mcu-renderer/mcu-renderer-sdl.h

@@ -2,7 +2,7 @@
  * MCU renderer
  * SDL driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */

platform.io/lib/mcu-renderer/mcu-renderer-st7565.c

@@ -2,7 +2,7 @@
  * MCU renderer
  * ST7565 driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */
@@ -82,28 +82,31 @@ void mr_st7565_set_display(mr_t *mr,
 
 void mr_st7565_refresh_display(mr_t *mr)
 {
+    mr_set_chipselect(mr, true);
+
     for (int16_t pageIndex = 0;
          pageIndex < (mr->display_height / 8);
          pageIndex++)
     {
         // Send page address
-
         mr_send_command(mr, MR_ST7565_PAGE_ADDRESS | pageIndex);
 
         // Send column address
-
         mr_send_command(mr, MR_ST7565_COLUMN_LSB | 0x00);
         mr_send_command(mr, MR_ST7565_COLUMN_MSB | 0x00);
 
         // Send data
-
         mr_set_command(mr, false);
         uint8_t *buffer = (uint8_t *)mr->buffer +
                           mr->display_width * pageIndex;
 
+        mr_send_callback_t send = mr->send_callback;
+
         for (int16_t i = 0;
              i < mr->display_width;
              i++)
-            mr_send(mr, buffer[i]);
+            send(buffer[i]);
     }
+
+    mr_set_chipselect(mr, false);
 }

platform.io/lib/mcu-renderer/mcu-renderer-st7565.h

@@ -2,7 +2,7 @@
  * MCU renderer
  * ST7565 driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */

platform.io/lib/mcu-renderer/mcu-renderer-st7789.c

@@ -2,7 +2,7 @@
  * MCU renderer
  * ST7789 driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */
@@ -105,13 +105,13 @@ void mr_st7789_init(mr_t *mr,
     mr->send16_callback = send16_callback;
 
     // Send initialization sequence
-
     mr_send_sequence(mr, mr_st7789_init_sequence);
 
     // Set rotation
-
+    mr_set_chipselect(mr, true);
     mr_send_command(mr, MR_ST7789_MADCTL);
     mr_send_data(mr, mr_st7789_madctl[rotation]);
+    mr_set_chipselect(mr, false);
 }
 
 void mr_st7789_set_display(mr_t *mr,
@@ -149,9 +149,14 @@ static void mr_st7789_send_addresses(mr_t *mr,
     mr_st7789_send_short(mr, end_address);
 }
 
-static void mr_st7789_set_rectangle(mr_t *mr,
-                                    const mr_rectangle_t *rectangle)
+static bool mr_st7789_setup_buffer(mr_t *mr,
+                                   const mr_rectangle_t *rectangle)
 {
+    if ((rectangle->width <= 0) || (rectangle->height <= 0))
+        return false;
+
+    mr_set_chipselect(mr, true);
+
     // Set column addresses
     mr_st7789_send_addresses(mr,
                              MR_ST7789_CASET,
@@ -166,48 +171,59 @@ static void mr_st7789_set_rectangle(mr_t *mr,
 
     // Write memory
     mr_send_command(mr, MR_ST7789_RAMWR);
+
+    // Prepare for data
     mr_set_command(mr, false);
+
+    return true;
 }
 
 static void mr_st7789_draw_rectangle(mr_t *mr,
                                      const mr_rectangle_t *rectangle)
 {
-    mr_st7789_set_rectangle(mr, rectangle);
+    if (mr_st7789_setup_buffer(mr, rectangle))
+    {
+        mr_send_callback_t send16 = mr->send16_callback;
 
-    for (uint32_t i = 0;
-         i < ((uint32_t)rectangle->width *
-              (uint32_t)rectangle->height);
-         i++)
-        mr_send16(mr, mr->fill_color);
+        for (uint32_t i = 0;
+             i < ((uint32_t)rectangle->width *
+                  (uint32_t)rectangle->height);
+             i++)
+            send16(mr->fill_color);
+
+        mr_set_chipselect(mr, false);
+    }
 }
 
 #if defined(MCURENDERER_BITMAP_SUPPORT)
 static void mr_st7789_draw_bitmap(mr_t *mr,
                                   const mr_rectangle_t *rectangle,
                                   const uint8_t *bitmap)
 {
-    mr_st7789_set_rectangle(mr, rectangle);
-
-    mr_point_t position;
-
-    for (position.y = rectangle->y;
-         position.y < rectangle->y + rectangle->height;
-         position.y++)
+    if (mr_st7789_setup_buffer(mr, rectangle))
     {
-        uint32_t source_index = 0;
+        mr_send_callback_t send16 = mr->send16_callback;
 
-        for (position.x = rectangle->x;
-             position.x < rectangle->x + rectangle->width;
-             position.x++)
+        mr_point_t position;
+        for (position.y = rectangle->y;
+             position.y < rectangle->y + rectangle->height;
+             position.y++)
         {
-            bool source_pixel = ((bitmap[source_index >> 3]) >> (source_index & 0b111)) & 0b1;
-            source_index++;
-            mr_color_t source_color = source_pixel ? mr->stroke_color : mr->fill_color;
-
-            mr_send16(mr, source_color);
+            uint32_t source_index = 0;
+
+            for (position.x = rectangle->x;
+                 position.x < rectangle->x + rectangle->width;
+                 position.x++)
+            {
+                bool source_pixel = ((bitmap[source_index >> 3]) >> (source_index & 0b111)) & 0b1;
+                source_index++;
+                send16(source_pixel ? mr->stroke_color : mr->fill_color);
+            }
+
+            bitmap += ((source_index + 7) >> 3);
         }
 
-        bitmap += ((source_index + 7) >> 3);
+        mr_set_chipselect(mr, false);
     }
 }
 #endif
@@ -217,16 +233,17 @@ static void mr_st7789_draw_image(mr_t *mr,
                                  const mr_rectangle_t *rectangle,
                                  const mr_color_t *image)
 {
-    mr_st7789_set_rectangle(mr, rectangle);
-
-    for (uint32_t i = 0;
-         i < ((uint32_t)rectangle->width *
-              (uint32_t)rectangle->height);
-         i++)
+    if (mr_st7789_setup_buffer(mr, rectangle))
     {
-        mr_color_t source_color = *image++;
+        mr_send_callback_t send16 = mr->send16_callback;
+
+        for (uint32_t i = 0;
+             i < ((uint32_t)rectangle->width *
+                  (uint32_t)rectangle->height);
+             i++)
+            send16(*image++);
 
-        mr_send16(mr, source_color);
+        mr_set_chipselect(mr, false);
     }
 }
 #endif
@@ -236,19 +253,23 @@ static void mr_st7789_draw_textbuffer(mr_t *mr,
                                       uint32_t buffer_pitch,
                                       mr_rectangle_t *rectangle)
 {
-    mr_st7789_set_rectangle(mr, rectangle);
+    if (mr_st7789_setup_buffer(mr, rectangle))
+    {
+        mr_send_callback_t send16 = mr->send16_callback;
 
-    mr_point_t position;
+        mr_point_t position;
+        for (position.y = 0;
+             position.y < rectangle->height;
+             position.y++)
+        {
+            for (position.x = 0;
+                 position.x < rectangle->width;
+                 position.x++)
+                send16(mr->blend_table[buffer[position.x]]);
 
-    for (position.y = 0;
-         position.y < rectangle->height;
-         position.y++)
-    {
-        for (position.x = 0;
-             position.x < rectangle->width;
-             position.x++)
-            mr_send16(mr, mr->blend_table[buffer[position.x]]);
+            buffer += buffer_pitch;
+        }
 
-        buffer += buffer_pitch;
+        mr_set_chipselect(mr, false);
     }
 }

platform.io/lib/mcu-renderer/mcu-renderer-st7789.h

@@ -2,7 +2,7 @@
  * MCU renderer
  * ST7789 driver
  *
- * (C) 2023-2024 Gissio
+ * (C) 2023-2025 Gissio
  *
  * License: MIT
  */