2.0rc5

Author: Gissio

.github/workflows/build-all.yml

@@ -36,6 +36,6 @@ jobs:
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: radpro-firmware-snapshot
           overwrite: true
           path: tools/*.bin

RELEASES.md

@@ -4,10 +4,11 @@
 
 * Added Bosean FS-5000 support.
 * Added secondary dose view in average measurement mode.
+* Extended conversion factor range to 25-1600 cpm/µSv/h.
 * Added "SET tubeHVFrequency" and "SET tubeHVDutyCycle" data communication commands.
 * Added 1 second datalog interval options and removed 30 seconds and 30 minutes datalog interval options.
 * Added 12-hour time format.
-* Devices with data mode allow using the device wile data mode is active.
+* Devices with data mode allow using the device wile data mode is active; data mode state is also preserved after powering off.
 * Improved battery level indicator on the Bosean FS-600/FS-1000.
 * Improved keyboard control scheme of the Bosean FS-1000.
 * Changed data communications end of line to "\r\n".

platform.io/lib/stm32/stm32-ext.h

@@ -785,6 +785,22 @@ typedef struct
 
 #endif
 
+#if defined(STM32L4)
+
+__STATIC_INLINE void adc_enable_deep_power_down(ADC_TypeDef *base)
+{
+    set_bits(base->CR,
+             ADC_CR_DEEPPWD);
+}
+
+__STATIC_INLINE void adc_disable_deep_power_down(ADC_TypeDef *base)
+{
+    clear_bits(base->CR,
+               ADC_CR_DEEPPWD);
+}
+
+#endif
+
 #if defined(STM32G0) || defined(STM32L4)
 
 __STATIC_INLINE void adc_enable_vreg(ADC_TypeDef *base)

platform.io/src/comm.c

@@ -33,8 +33,11 @@ void initComm(void)
 #if !defined(DATA_MODE)
     startComm();
 #else
+    if (settings.dataMode)
+        startComm();
+
     selectMenuItem(&dataModeMenu,
-                   0,
+                   settings.dataMode,
                    2);
 #endif
 }
@@ -186,8 +189,8 @@ void dispatchCommEvents(void)
         else if (matchCommCommand("GET tubeHVFrequency"))
             sendCommOkWithFloat(getTubeHVFrequency(), 2);
         else if (matchCommCommandWithNumber("SET tubeHVFrequency",
-                                           &mantissa,
-                                           &factor))
+                                            &mantissa,
+                                            &factor))
         {
             setTubeHVFrequency((float)mantissa / (float)factor);
 
@@ -196,8 +199,8 @@ void dispatchCommEvents(void)
         else if (matchCommCommand("GET tubeHVDutyCycle"))
             sendCommOkWithFloat(getTubeHVDutyCycle(), 4);
         else if (matchCommCommandWithNumber("SET tubeHVDutyCycle",
-                                           &mantissa,
-                                           &factor))
+                                            &mantissa,
+                                            &factor))
         {
             setTubeHVDutyCycle((float)mantissa / (float)factor);
 

platform.io/src/settings.h

@@ -103,9 +103,9 @@ enum
 };
 
 #define TUBE_CONVERSIONFACTOR_VALUE_MIN 25.0F
-#define TUBE_CONVERSIONFACTOR_VALUE_MAX 800.01F
-#define TUBE_CONVERSIONFACTOR_VALUE_LOG_MAX_MIN 5.0F
-#define TUBE_CONVERSIONFACTOR_VALUE_NUM 81
+#define TUBE_CONVERSIONFACTOR_VALUE_MAX 1600.01F
+#define TUBE_CONVERSIONFACTOR_VALUE_LOG_MAX_MIN 6.0F
+#define TUBE_CONVERSIONFACTOR_VALUE_NUM 97
 #define TUBE_CONVERSIONFACTOR_NUM (TUBE_CONVERSIONFACTOR_PRESETS_NUM + TUBE_CONVERSIONFACTOR_VALUE_NUM)
 
 enum
@@ -359,7 +359,7 @@ typedef struct
     unsigned int tubeInstantaneousAveraging : 3;
     unsigned int tubeDeadTimeCompensation : 6;
     unsigned int tubeBackgroundCompensation : 4;
-#if defined(TUBE_HV_PWM)    
+#if defined(TUBE_HV_PWM)
     unsigned int tubeHVProfile : 3;
     unsigned int tubeHVFrequency : 3;
     unsigned int tubeHVDutyCycle : 9;
@@ -390,6 +390,10 @@ typedef struct
     unsigned int batteryType : 1;
 #endif
 
+#if defined(DATA_MODE)
+    unsigned int dataMode : 1;
+#endif
+
     unsigned int gameStrength : 3;
 } Settings
 #if defined(STM32G0) || defined(STM32L4)

platform.io/src/stm32/stm32_adc.c

@@ -42,6 +42,10 @@ void initADC(void)
 
     rcc_enable_adc(ADC1);
 
+#if defined(STM32L4)
+    adc_disable_deep_power_down(ADC1);
+#endif
+
 #if (defined(STM32F0) && defined(GD32)) || defined(STM32F1)
     adc_enable(ADC1);
     sleep(1);

platform.io/src/system.h

@@ -16,7 +16,7 @@
 
 #define FIRMWARE_AUTHOR "Gissio"
 #define FIRMWARE_NAME "Rad Pro"
-#define FIRMWARE_VERSION "2.0rc5-test13"
+#define FIRMWARE_VERSION "2.0rc5-test14"
 
 extern const View statisticsView;