The little update: 2.0rc4

Author: Gissio

.gitignore

@@ -1 +1,2 @@
+.vscode
 build

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

@@ -63,6 +63,7 @@ Data logging can store up to 5060 data points. At normal radiation levels (20 cp
 The HV profile settings are:
 
 * Factory default: 9.207 kHz frequency and 75 % duty cycle.
+* Accuracy: 5 kHz frequency and 2 % duty cycle.
 * Energy-saving: 5 kHz frequency and 1.5 % duty cycle.
 
 ### FNIRSI GC-01 with a APM32F103R8 (Geehy) processor
@@ -74,4 +75,5 @@ Data logging can store up to 63756 data points. At normal radiation levels (20 c
 The HV profile settings are:
 
 * Factory default: 47.058 kHz frequency and 50 % duty cycle.
+* Accuracy: 5 kHz frequency and 2 % duty cycle.
 * Energy-saving: 5 kHz frequency and 1.5 % duty cycle.

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

@@ -1187,11 +1187,6 @@ __STATIC_INLINE void rtc_set_date_time(uint32_t dr,
     RTC->DR = dr;
 }
 
-__STATIC_INLINE bool rtc_is_read_safe(void)
-{
-    return (RTC->SSR < (255 * 990 / 1000));
-}
-
 #elif defined(STM32F1)
 
 __STATIC_INLINE void rtc_set_prescaler_factor(uint32_t value)
@@ -1204,24 +1199,28 @@ __STATIC_INLINE void rtc_set_prescaler_factor(uint32_t value)
 
 __STATIC_INLINE uint32_t rtc_get_count(void)
 {
-    return (RTC->CNTH << 16) | RTC->CNTL;
+    uint32_t countHigh1 = RTC->CNTH;
+    uint32_t count = RTC->CNTL;
+    uint32_t countHigh2 = RTC->CNTH;
+
+    if (countHigh1 == countHigh2)
+        return count | (countHigh1 << 16);
+    else
+    {
+        if (count & 0x8000)
+            return count | (countHigh1 << 16);
+        else
+            return count | (countHigh2 << 16);
+    }
 }
 
 __STATIC_INLINE void rtc_set_count(uint32_t value)
 {
+    RTC->CNTL = 0;
     RTC->CNTH = (value >> 16) & 0xffff;
     RTC->CNTL = value & 0xffff;
 }
 
-__STATIC_INLINE bool rtc_is_read_safe(void)
-{
-    return (RTC->DIVL < (32767 * 990 / 1000));
-}
-
-__STATIC_INLINE void rtc_sync(void)
-{
-}
-
 #endif
 
 // USART

platform.io/platformio.ini

@@ -11,7 +11,7 @@ build_flags =
 	-D DISPLAY_MONOCHROME
 	-D VIBRATOR
 	-D DATA_MODE
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 lib_ignore = libusb_stm32
@@ -29,7 +29,7 @@ build_flags =
 	-D DISPLAY_MONOCHROME
 	-D VIBRATOR
 	-D DATA_MODE
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 lib_ignore = libusb_stm32
@@ -47,7 +47,7 @@ build_flags =
 	-D DISPLAY_MONOCHROME
 	-D VIBRATOR
 	-D DATA_MODE
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 lib_ignore = libusb_stm32
@@ -65,7 +65,7 @@ build_flags =
 	-D DISPLAY_128X64
 	-D DISPLAY_MONOCHROME
 	-D PULSE_LED
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 lib_ignore = libusb_stm32
@@ -82,7 +82,7 @@ build_flags =
 	-D DISPLAY_128X64
 	-D DISPLAY_MONOCHROME
 	-D PULSE_LED
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 lib_ignore = libusb_stm32
@@ -94,14 +94,15 @@ framework = cmsis
 build_flags =
 	-D GC01
 	-D GC01_DISPLAY_SPI
-	; -D GC01_USART
 	-D KEYBOARD_5KEYS
 	-D DISPLAY_320X240
 	-D DISPLAY_COLOR
 	-D DISPLAY_FONT_2BPP
 	-D PULSE_LED
 	-D VIBRATOR
-debug_build_flags = 
+	; -D GC01_USART
+    -D USBD_ASM_DRIVER
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 board_build.ldscript = scripts/gc01.ld
@@ -121,7 +122,7 @@ build_flags =
 	-D VIBRATOR
     -D USBD_ASM_DRIVER
 	-D DATA_MODE
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 board_build.ldscript = scripts/gc01.ld
@@ -140,7 +141,7 @@ build_flags =
 	-D PULSE_LED
 	-D VIBRATOR
     -D USBD_ASM_DRIVER
-debug_build_flags = 
+debug_build_flags =
 	-Og -g2 -ggdb2
 	-D DEBUG
 board_build.ldscript = scripts/gc01.ld

platform.io/src/datalog.c

@@ -36,6 +36,8 @@ static struct
     uint8_t buffer[DATALOG_BUFFER_SIZE];
 
     uint8_t lock;
+
+    uint32_t lastTimeFast;
 } datalog;
 
 static const uint16_t datalogTimeIntervals[] = {
@@ -77,6 +79,8 @@ void initDatalog(void)
 
     while (decodeDatalogEntry(&datalog.writeState))
         ;
+
+    datalog.lastTimeFast = getDeviceTimeFast();
 }
 
 static void encodeDatalogValue(int32_t value,
@@ -142,6 +146,11 @@ static void writeDatalogEntry(bool isUpdate)
         return;
 
     // Update?
+    uint32_t timeFast = getDeviceTimeFast();
+    if (timeFast == datalog.lastTimeFast)
+        return;
+    datalog.lastTimeFast = timeFast;
+
     Dose dose;
     dose.time = getDeviceTime();
     dose.pulseCount = getTubePulseCount();
@@ -158,7 +167,7 @@ static void writeDatalogEntry(bool isUpdate)
 
     bool absoluteEntry = false;
 
-    if (!isUpdate || (timeInterval > (sampleInterval + 1)))
+    if (!isUpdate || (timeInterval > sampleInterval))
     {
         datalog.writeState.dose.time = dose.time;
         datalog.writeState.dose.pulseCount = dose.pulseCount;

platform.io/src/events.c

@@ -29,8 +29,8 @@
 #define PULSE_CLICK_LOUD_TICKS ((uint32_t)(0.015 * SYSTICK_FREQUENCY))
 #define PULSE_LED_TICKS ((uint32_t)(0.050 * SYSTICK_FREQUENCY))
 #define PULSE_FLASH_TICKS ((uint32_t)(0.050 * SYSTICK_FREQUENCY))
-#define PULSE_VIBRATION_WEAK_TICKS ((uint32_t)(0.001 * SYSTICK_FREQUENCY))
-#define PULSE_VIBRATION_STRONG_TICKS ((uint32_t)(0.015 * SYSTICK_FREQUENCY))
+#define PULSE_VIBRATION_WEAK_TICKS ((uint32_t)(0.020 * SYSTICK_FREQUENCY))
+#define PULSE_VIBRATION_STRONG_TICKS ((uint32_t)(0.050 * SYSTICK_FREQUENCY))
 #define ALARM_TICKS ((uint32_t)(0.100 * SYSTICK_FREQUENCY))
 #define ALARM_FLASH_TICKS ((uint32_t)(0.200 * SYSTICK_FREQUENCY))
 
@@ -258,14 +258,14 @@ void dispatchEvents(void)
     sleep(0);
 
     dispatchCommEvents();
+    updateDatalog();
 
     uint32_t periodUpdate = events.measurementPeriodUpdate;
     if (events.lastMeasurementPeriodUpdate != periodUpdate)
     {
         events.lastMeasurementPeriodUpdate = periodUpdate;
 
         updateMeasurements();
-        updateDatalog();
         updateADC();
         updateGame();
         updateView();