Changeset 26 for trunk/firmware/Debug125A/self_discharge_PP.c

Timestamp:

Sep 8, 2025, 6:57:30 PM (7 weeks ago)

Author:

f.jahn

Message:

• Bug in ADC Kalibrierung (STM32 ADC Strom) behoben
• DMA Buffer für ADC 1 und ADC wird vor Überschreibung während bearbeitung geschützt, indem Datenübertragung nur einmalig erfolgt und erst nach Auswertung wieder gestartet wird
• RS485Modbus: Timeout Zeit wird für Baudraten >19200 korrekt berechnet
• Hardware ID geändert
• Separates Register für "Batterie Empty detection mode" auf Adresse 92 angelegt

File:

• trunk/firmware/Debug125A/self_discharge_PP.c (modified) (8 diffs)

trunk/firmware/Debug125A/self_discharge_PP.c

@@ -1 @@
-# 1 "D:\\projekte\\ecs_smartSwitch\\trunk\\firmware\\Src\\self_discharge.c"
+# 1 "D:\\projekte\\ecsSmartPro\\trunk\\firmware\\Src\\self_discharge.c"
 # 1 "<built-in>" 1
 # 1 "<built-in>" 3
@@ -5 +5 @@
 # 1 "<command line>" 1
 # 1 "<built-in>" 2
-# 1 "D:\\projekte\\ecs_smartSwitch\\trunk\\firmware\\Src\\self_discharge.c" 2
-
-# 1 "D:/projekte/ecs_smartSwitch/trunk/firmware/Inc\\sysdata.h" 1
-# 15 "D:/projekte/ecs_smartSwitch/trunk/firmware/Inc\\sysdata.h"
-# 1 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdint.h" 1 3
-# 20 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdint.h" 3
+# 1 "D:\\projekte\\ecsSmartPro\\trunk\\firmware\\Src\\self_discharge.c" 2
+# 1 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdio.h" 1 3
+# 20 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdio.h" 3
 # 1 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\__SEGGER_RTL.h" 1 3
 # 17 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\__SEGGER_RTL.h" 3
@@ -666 +663 @@
 int __SEGGER_RTL_mb_cur_max (void);
 void __SEGGER_RTL_init_heap (void *__ptr, unsigned int __size);
-# 21 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdint.h" 2 3
+# 21 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdio.h" 2 3
+# 72 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdio.h" 3
+typedef unsigned int size_t;
+
+
+
+
+typedef long fpos_t;
+
+
+
+
+typedef struct __SEGGER_RTL_FILE_impl FILE;
+
+
+
+
+typedef struct __SEGGER_RTL_POSIX_locale_s *locale_t;
+# 97 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdio.h" 3
+extern FILE *stdin;
+extern FILE *stdout;
+extern FILE *stderr;
+# 108 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdio.h" 3
+int putchar (int __c);
+int getchar (void);
+int puts (const char *__s);
+char * gets (char *__s);
+int sprintf (char *__s, const char *__format, ...);
+int sprintf_l (char *__s, locale_t __loc, const char *__format, ...);
+int snprintf (char *__s, size_t __n, const char *__format, ...);
+int snprintf_l (char *__s, size_t __n, locale_t __loc, const char *__format, ...);
+int vsnprintf (char *__s, size_t __n, const char *__format, __builtin_va_list __arg);
+int vsnprintf_l (char *__s, size_t __n, locale_t __loc, const char *__format, __builtin_va_list __arg);
+int printf (const char *__format, ...);
+int printf_l (locale_t __loc, const char *__format, ...);
+int vprintf (const char *__format, __builtin_va_list __arg);
+int vprintf_l (locale_t __loc, const char *__format, __builtin_va_list __arg);
+int vsprintf (char *__s, const char *__format, __builtin_va_list __arg);
+int vsprintf_l (char *__s, locale_t __loc, const char *__format, __builtin_va_list __arg);
+int vasprintf (char **__strp, const char *__format, __builtin_va_list __ap);
+int vasprintf_l (char **__strp, locale_t __loc, const char *__format, __builtin_va_list __ap);
+int asprintf (char **__strp, const char *__format, ...);
+int asprintf_l (char **__strp, locale_t __loc, const char *__format, ...);
+
+int scanf (const char *__format, ...);
+int scanf_l (locale_t __loc, const char *__format, ...);
+int sscanf (const char *__s, const char *__format, ...);
+int sscanf_l (const char *__s, locale_t __loc, const char *__format, ...);
+int vscanf (const char *__format, __builtin_va_list __arg);
+int vscanf_l (locale_t __loc, const char *__format, __builtin_va_list __arg);
+int vsscanf (const char *__s, const char *__format, __builtin_va_list __arg);
+int vsscanf_l (const char *__s, locale_t __loc, const char *__format, __builtin_va_list __arg);
+
+void clearerr (FILE *);
+int fclose (FILE *);
+int feof (FILE *);
+int ferror (FILE *);
+int fflush (FILE *);
+int fgetc (FILE *);
+int fgetpos (FILE *, fpos_t *);
+char * fgets (char *, int, FILE *);
+int fileno (FILE *);
+FILE * fopen (const char *, const char *);
+int fprintf (FILE *, const char *, ...);
+int fprintf_l (FILE *, locale_t, const char *, ...);
+int vfprintf (FILE *__stream, const char *__format, __builtin_va_list __arg);
+int vfprintf_l (FILE *__stream, locale_t loc, const char *__format, __builtin_va_list __arg);
+int fputc (int, FILE *);
+int fputs (const char *, FILE *);
+size_t fread (void *, size_t, size_t, FILE *);
+FILE * freopen (const char *, const char *, FILE *);
+int fscanf (FILE *, const char *, ...);
+int fscanf_l (FILE *, locale_t, const char *, ...);
+int vfscanf (FILE *, const char *, __builtin_va_list);
+int vfscanf_l (FILE *, locale_t, const char *, __builtin_va_list);
+int fseek (FILE *, long, int);
+int fsetpos (FILE *, const fpos_t *);
+long ftell (FILE *);
+size_t fwrite (const void *, size_t, size_t, FILE *);
+int getc (FILE *);
+void perror (const char *);
+int putc (int, FILE *);
+int remove (const char *);
+int rename (const char *, const char *);
+void rewind (FILE *);
+void setbuf (FILE *, char *);
+int setvbuf (FILE *, char *, int, size_t);
+FILE * tmpfile (void);
+char * tmpnam (char *);
+int ungetc (int, FILE *);
+
+
+
+
+
+int dprintf (int, const char *, ...);
+int vdprintf (int, const char *, __builtin_va_list);
+FILE * fdopen (int, const char *);
+# 2 "D:\\projekte\\ecsSmartPro\\trunk\\firmware\\Src\\self_discharge.c" 2
+# 1 "D:/projekte/ecsSmartPro/trunk/firmware/Inc\\sysdata.h" 1
+# 15 "D:/projekte/ecsSmartPro/trunk/firmware/Inc\\sysdata.h"
+# 1 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdint.h" 1 3
 # 272 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\stdint.h" 3
 typedef signed char int8_t;
@@ -700 +798 @@
 typedef long long int intmax_t;
 typedef long long unsigned int uintmax_t;
-# 16 "D:/projekte/ecs_smartSwitch/trunk/firmware/Inc\\sysdata.h" 2
-# 25 "D:/projekte/ecs_smartSwitch/trunk/firmware/Inc\\sysdata.h"
+# 16 "D:/projekte/ecsSmartPro/trunk/firmware/Inc\\sysdata.h" 2
+# 25 "D:/projekte/ecsSmartPro/trunk/firmware/Inc\\sysdata.h"
 typedef union
 {
@@ -918 +1016 @@
 
 void SYS_DATA_Init(void);
-# 3 "D:\\projekte\\ecs_smartSwitch\\trunk\\firmware\\Src\\self_discharge.c" 2
-# 1 "D:/projekte/ecs_smartSwitch/trunk/firmware/Inc\\self_discharge.h" 1
+# 3 "D:\\projekte\\ecsSmartPro\\trunk\\firmware\\Src\\self_discharge.c" 2
+# 1 "D:/projekte/ecsSmartPro/trunk/firmware/Inc\\self_discharge.h" 1
 # 1 "C:/Program Files/SEGGER/SEGGER Embedded Studio 8.22a/include\\inttypes.h" 1 3
-# 2 "D:/projekte/ecs_smartSwitch/trunk/firmware/Inc\\self_discharge.h" 2
+# 2 "D:/projekte/ecsSmartPro/trunk/firmware/Inc\\self_discharge.h" 2
 
 int16_t SELF_DISCHARGE_Exec(void);
-# 4 "D:\\projekte\\ecs_smartSwitch\\trunk\\firmware\\Src\\self_discharge.c" 2
+# 4 "D:\\projekte\\ecsSmartPro\\trunk\\firmware\\Src\\self_discharge.c" 2
 
 
@@ -933 +1031 @@
 
   const double batt_float_voltage_tol = 0.03;
-  const double batt_voltage_holding_tol = 10;
+  const int32_t batt_voltage_holding_tol = 10;
   int32_t max_u = sys_data.s.parameter.uBatFull * ( 1 + batt_float_voltage_tol);
   int32_t min_u = sys_data.s.parameter.uBatFull * ( 1 - batt_float_voltage_tol);
@@ -971 +1069 @@
     u_hold = 0;
     holding_counter = 0;
+
     return -2;
   }
@@ -979 +1078 @@
     u_hold = 0;
     holding_counter = 0;
+
     return -2;
   }
 
+
+  if (sys_data.s.values.batteryCurrent < sys_data.s.parameter.extraDischargeStrom_mA)
+  {
+
+    u_hold = 0;
+    holding_counter = 0;
+
+    return -3;
+  }
+
   holding_counter++;
-  if (holding_counter > ( 3 * 3600 ))
+  if (holding_counter > (10800 ))
   {
-    sys_data.s.values.selfDischarge = sys_data.s.values.batteryCurrent;
+    sys_data.s.values.selfDischarge = sys_data.s.values.batteryCurrent - sys_data.s.parameter.extraDischargeStrom_mA;
   }
 
 
 
-
-  static uint32_t last_days;
-  static unsigned long avgsum = 0;
-
-
-  uint32_t days = sys_data.s.values.onTime / (24U * 3600U);
-
-
-  if (days != last_days)
+  if (sys_data.s.values.selfDischarge > 0)
   {
-    last_days = days;
-
-    uint32_t avgval;
-
-    avgsum -= avgsum/64;
-    avgsum += sys_data.s.values.selfDischarge;
-    avgval = avgsum / 64;
-
-    sys_data.s.values.selfDischargeAvg = avgval;
+
+
+    static uint32_t last_days;
+    static unsigned long avgsum = 0;
+
+
+    uint32_t days = sys_data.s.values.onTime / (24U * 3600U);
+
+
+    if (days != last_days)
+    {
+      last_days = days;
+
+      uint32_t avgval;
+
+      avgsum -= avgsum/64;
+      avgsum += sys_data.s.values.selfDischarge;
+      avgval = avgsum / 64;
+
+      sys_data.s.values.selfDischargeAvg = avgval;
+    }
+
   }
 
 
 
-
-
   return 0;