Selaa lähdekoodia

检测到5公里后, 立即报警, 自动关掉底阀后停止

guoqiang 1 vuosi sitten
vanhempi
commit
9c16ac8b17

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 45 - 45
Project/BVACS.uvguix.孙凯


+ 1 - 1
Project/BVACS.uvprojx

@@ -49,7 +49,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>BVACS_20240125</OutputName>
+          <OutputName>BVACS_20240130</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1710 - 1686
Project/JLinkLog.txt


+ 164 - 164
Project/Listings/BVACS_20240125.map

@@ -3727,71 +3727,71 @@ Image Symbol Table
     i.alg_Triggering                         0x000055b8   Section        0  process.o(i.alg_Triggering)
     i.alg_calibrate                          0x00005614   Section        0  process.o(i.alg_calibrate)
     i.alg_detect                             0x00005684   Section        0  process.o(i.alg_detect)
-    i.alg_filter                             0x00005928   Section        0  process.o(i.alg_filter)
-    i.alg_start                              0x000059dc   Section        0  process.o(i.alg_start)
-    i.cbuffer_popdata                        0x00005a18   Section        0  process.o(i.cbuffer_popdata)
-    i.cbuffer_pushdata                       0x00005a5c   Section        0  process.o(i.cbuffer_pushdata)
-    i.crc16                                  0x00005a9c   Section        0  crc16.o(i.crc16)
-    i.main                                   0x00005ac4   Section        0  main.o(i.main)
-    i.osif_UpdateTickConfig                  0x00005afc   Section        0  osif_baremetal.o(i.osif_UpdateTickConfig)
-    osif_UpdateTickConfig                    0x00005afd   Thumb Code    56  osif_baremetal.o(i.osif_UpdateTickConfig)
-    i.sv_close                               0x00005b38   Section        0  process.o(i.sv_close)
-    i.sv_open                                0x00005b48   Section        0  process.o(i.sv_open)
-    i.timer_callback                         0x00005b58   Section        0  process.o(i.timer_callback)
-    x$fpl$d2f                                0x00005bd8   Section       98  d2f.o(x$fpl$d2f)
-    $v0                                      0x00005bd8   Number         0  d2f.o(x$fpl$d2f)
-    x$fpl$dadd                               0x00005c3c   Section      336  daddsub_clz.o(x$fpl$dadd)
-    $v0                                      0x00005c3c   Number         0  daddsub_clz.o(x$fpl$dadd)
-    _dadd1                                   0x00005c4d   Thumb Code     0  daddsub_clz.o(x$fpl$dadd)
-    x$fpl$ddiv                               0x00005d8c   Section      688  ddiv.o(x$fpl$ddiv)
-    $v0                                      0x00005d8c   Number         0  ddiv.o(x$fpl$ddiv)
-    ddiv_entry                               0x00005d93   Thumb Code     0  ddiv.o(x$fpl$ddiv)
-    x$fpl$dflt                               0x0000603c   Section       46  dflt_clz.o(x$fpl$dflt)
-    $v0                                      0x0000603c   Number         0  dflt_clz.o(x$fpl$dflt)
-    x$fpl$dmul                               0x0000606c   Section      340  dmul.o(x$fpl$dmul)
-    $v0                                      0x0000606c   Number         0  dmul.o(x$fpl$dmul)
-    x$fpl$dnaninf                            0x000061c0   Section      156  dnaninf.o(x$fpl$dnaninf)
-    $v0                                      0x000061c0   Number         0  dnaninf.o(x$fpl$dnaninf)
-    x$fpl$dretinf                            0x0000625c   Section       12  dretinf.o(x$fpl$dretinf)
-    $v0                                      0x0000625c   Number         0  dretinf.o(x$fpl$dretinf)
-    x$fpl$dsub                               0x00006268   Section      468  daddsub_clz.o(x$fpl$dsub)
-    $v0                                      0x00006268   Number         0  daddsub_clz.o(x$fpl$dsub)
-    _dsub1                                   0x00006279   Thumb Code     0  daddsub_clz.o(x$fpl$dsub)
-    x$fpl$f2d                                0x0000643c   Section       86  f2d.o(x$fpl$f2d)
-    $v0                                      0x0000643c   Number         0  f2d.o(x$fpl$f2d)
-    x$fpl$fnaninf                            0x00006492   Section      140  fnaninf.o(x$fpl$fnaninf)
-    $v0                                      0x00006492   Number         0  fnaninf.o(x$fpl$fnaninf)
-    x$fpl$fpinit                             0x0000651e   Section       10  fpinit.o(x$fpl$fpinit)
-    $v0                                      0x0000651e   Number         0  fpinit.o(x$fpl$fpinit)
-    x$fpl$fretinf                            0x00006528   Section       10  fretinf.o(x$fpl$fretinf)
-    $v0                                      0x00006528   Number         0  fretinf.o(x$fpl$fretinf)
-    .constdata                               0x00006532   Section      512  crc16.o(.constdata)
-    x$fpl$usenofp                            0x00006532   Section        0  usenofp.o(x$fpl$usenofp)
-    CRCH                                     0x00006532   Data         256  crc16.o(.constdata)
-    CRCL                                     0x00006632   Data         256  crc16.o(.constdata)
-    .constdata                               0x00006734   Section       20  flash.o(.constdata)
-    .constdata                               0x00006748   Section       52  ckgen_drv.o(.constdata)
-    maxSysClksInRUN                          0x0000675c   Data          32  ckgen_drv.o(.constdata)
-    .constdata                               0x0000677c   Section       64  dma_drv.o(.constdata)
-    s_dmaChannelBase                         0x0000677c   Data          64  dma_drv.o(.constdata)
-    .constdata                               0x000067bc   Section       20  gpio_drv.o(.constdata)
-    s_gpioPortBase                           0x000067bc   Data          20  gpio_drv.o(.constdata)
-    .constdata                               0x000067d0   Section        6  spi_master_drv.o(.constdata)
-    s_spiClock                               0x000067d0   Data           6  spi_master_drv.o(.constdata)
-    .constdata                               0x000067d6   Section        6  timer_drv.o(.constdata)
-    s_timerClkNames                          0x000067d6   Data           2  timer_drv.o(.constdata)
-    s_timerIRQ                               0x000067d8   Data           4  timer_drv.o(.constdata)
-    .constdata                               0x000067dc   Section       28  uart_drv.o(.constdata)
-    s_uartIrqId                              0x000067dc   Data           4  uart_drv.o(.constdata)
-    s_uartClkNames                           0x000067e0   Data           8  uart_drv.o(.constdata)
-    s_uartBase                               0x000067e8   Data          16  uart_drv.o(.constdata)
-    .constdata                               0x000067f8   Section        8  uart_hw.o(.constdata)
-    s_uartBusClock                           0x000067f8   Data           4  uart_hw.o(.constdata)
-    s_uartSoftReset                          0x000067fc   Data           4  uart_hw.o(.constdata)
-    .constdata                               0x00006800   Section        8  wdg_drv.o(.constdata)
-    s_wdgIrqId                               0x00006800   Data           1  wdg_drv.o(.constdata)
-    s_wdgClkNames                            0x00006801   Data           1  wdg_drv.o(.constdata)
-    s_wdgBase                                0x00006804   Data           4  wdg_drv.o(.constdata)
+    i.alg_filter                             0x00005930   Section        0  process.o(i.alg_filter)
+    i.alg_start                              0x000059e4   Section        0  process.o(i.alg_start)
+    i.cbuffer_popdata                        0x00005a20   Section        0  process.o(i.cbuffer_popdata)
+    i.cbuffer_pushdata                       0x00005a64   Section        0  process.o(i.cbuffer_pushdata)
+    i.crc16                                  0x00005aa4   Section        0  crc16.o(i.crc16)
+    i.main                                   0x00005acc   Section        0  main.o(i.main)
+    i.osif_UpdateTickConfig                  0x00005b04   Section        0  osif_baremetal.o(i.osif_UpdateTickConfig)
+    osif_UpdateTickConfig                    0x00005b05   Thumb Code    56  osif_baremetal.o(i.osif_UpdateTickConfig)
+    i.sv_close                               0x00005b40   Section        0  process.o(i.sv_close)
+    i.sv_open                                0x00005b50   Section        0  process.o(i.sv_open)
+    i.timer_callback                         0x00005b60   Section        0  process.o(i.timer_callback)
+    x$fpl$d2f                                0x00005be0   Section       98  d2f.o(x$fpl$d2f)
+    $v0                                      0x00005be0   Number         0  d2f.o(x$fpl$d2f)
+    x$fpl$dadd                               0x00005c44   Section      336  daddsub_clz.o(x$fpl$dadd)
+    $v0                                      0x00005c44   Number         0  daddsub_clz.o(x$fpl$dadd)
+    _dadd1                                   0x00005c55   Thumb Code     0  daddsub_clz.o(x$fpl$dadd)
+    x$fpl$ddiv                               0x00005d94   Section      688  ddiv.o(x$fpl$ddiv)
+    $v0                                      0x00005d94   Number         0  ddiv.o(x$fpl$ddiv)
+    ddiv_entry                               0x00005d9b   Thumb Code     0  ddiv.o(x$fpl$ddiv)
+    x$fpl$dflt                               0x00006044   Section       46  dflt_clz.o(x$fpl$dflt)
+    $v0                                      0x00006044   Number         0  dflt_clz.o(x$fpl$dflt)
+    x$fpl$dmul                               0x00006074   Section      340  dmul.o(x$fpl$dmul)
+    $v0                                      0x00006074   Number         0  dmul.o(x$fpl$dmul)
+    x$fpl$dnaninf                            0x000061c8   Section      156  dnaninf.o(x$fpl$dnaninf)
+    $v0                                      0x000061c8   Number         0  dnaninf.o(x$fpl$dnaninf)
+    x$fpl$dretinf                            0x00006264   Section       12  dretinf.o(x$fpl$dretinf)
+    $v0                                      0x00006264   Number         0  dretinf.o(x$fpl$dretinf)
+    x$fpl$dsub                               0x00006270   Section      468  daddsub_clz.o(x$fpl$dsub)
+    $v0                                      0x00006270   Number         0  daddsub_clz.o(x$fpl$dsub)
+    _dsub1                                   0x00006281   Thumb Code     0  daddsub_clz.o(x$fpl$dsub)
+    x$fpl$f2d                                0x00006444   Section       86  f2d.o(x$fpl$f2d)
+    $v0                                      0x00006444   Number         0  f2d.o(x$fpl$f2d)
+    x$fpl$fnaninf                            0x0000649a   Section      140  fnaninf.o(x$fpl$fnaninf)
+    $v0                                      0x0000649a   Number         0  fnaninf.o(x$fpl$fnaninf)
+    x$fpl$fpinit                             0x00006526   Section       10  fpinit.o(x$fpl$fpinit)
+    $v0                                      0x00006526   Number         0  fpinit.o(x$fpl$fpinit)
+    x$fpl$fretinf                            0x00006530   Section       10  fretinf.o(x$fpl$fretinf)
+    $v0                                      0x00006530   Number         0  fretinf.o(x$fpl$fretinf)
+    .constdata                               0x0000653a   Section      512  crc16.o(.constdata)
+    x$fpl$usenofp                            0x0000653a   Section        0  usenofp.o(x$fpl$usenofp)
+    CRCH                                     0x0000653a   Data         256  crc16.o(.constdata)
+    CRCL                                     0x0000663a   Data         256  crc16.o(.constdata)
+    .constdata                               0x0000673c   Section       20  flash.o(.constdata)
+    .constdata                               0x00006750   Section       52  ckgen_drv.o(.constdata)
+    maxSysClksInRUN                          0x00006764   Data          32  ckgen_drv.o(.constdata)
+    .constdata                               0x00006784   Section       64  dma_drv.o(.constdata)
+    s_dmaChannelBase                         0x00006784   Data          64  dma_drv.o(.constdata)
+    .constdata                               0x000067c4   Section       20  gpio_drv.o(.constdata)
+    s_gpioPortBase                           0x000067c4   Data          20  gpio_drv.o(.constdata)
+    .constdata                               0x000067d8   Section        6  spi_master_drv.o(.constdata)
+    s_spiClock                               0x000067d8   Data           6  spi_master_drv.o(.constdata)
+    .constdata                               0x000067de   Section        6  timer_drv.o(.constdata)
+    s_timerClkNames                          0x000067de   Data           2  timer_drv.o(.constdata)
+    s_timerIRQ                               0x000067e0   Data           4  timer_drv.o(.constdata)
+    .constdata                               0x000067e4   Section       28  uart_drv.o(.constdata)
+    s_uartIrqId                              0x000067e4   Data           4  uart_drv.o(.constdata)
+    s_uartClkNames                           0x000067e8   Data           8  uart_drv.o(.constdata)
+    s_uartBase                               0x000067f0   Data          16  uart_drv.o(.constdata)
+    .constdata                               0x00006800   Section        8  uart_hw.o(.constdata)
+    s_uartBusClock                           0x00006800   Data           4  uart_hw.o(.constdata)
+    s_uartSoftReset                          0x00006804   Data           4  uart_hw.o(.constdata)
+    .constdata                               0x00006808   Section        8  wdg_drv.o(.constdata)
+    s_wdgIrqId                               0x00006808   Data           1  wdg_drv.o(.constdata)
+    s_wdgClkNames                            0x00006809   Data           1  wdg_drv.o(.constdata)
+    s_wdgBase                                0x0000680c   Data           4  wdg_drv.o(.constdata)
     .data                                    0x1fff0000   Section      138  clock_config.o(.data)
     .data                                    0x1fff008c   Section        4  clock_config.o(.data)
     .data                                    0x1fff0090   Section        4  cfg.o(.data)
@@ -4252,41 +4252,41 @@ Image Symbol Table
     alg_PreProcess                           0x00005585   Thumb Code    42  process.o(i.alg_PreProcess)
     alg_Triggering                           0x000055b9   Thumb Code    82  process.o(i.alg_Triggering)
     alg_calibrate                            0x00005615   Thumb Code   102  process.o(i.alg_calibrate)
-    alg_detect                               0x00005685   Thumb Code   632  process.o(i.alg_detect)
-    alg_filter                               0x00005929   Thumb Code   168  process.o(i.alg_filter)
-    alg_start                                0x000059dd   Thumb Code    50  process.o(i.alg_start)
-    cbuffer_popdata                          0x00005a19   Thumb Code    62  process.o(i.cbuffer_popdata)
-    cbuffer_pushdata                         0x00005a5d   Thumb Code    58  process.o(i.cbuffer_pushdata)
-    crc16                                    0x00005a9d   Thumb Code    36  crc16.o(i.crc16)
-    main                                     0x00005ac5   Thumb Code    54  main.o(i.main)
-    sv_close                                 0x00005b39   Thumb Code    10  process.o(i.sv_close)
-    sv_open                                  0x00005b49   Thumb Code    10  process.o(i.sv_open)
-    timer_callback                           0x00005b59   Thumb Code   116  process.o(i.timer_callback)
-    __aeabi_d2f                              0x00005bd9   Thumb Code     0  d2f.o(x$fpl$d2f)
-    _d2f                                     0x00005bd9   Thumb Code    98  d2f.o(x$fpl$d2f)
-    __aeabi_dadd                             0x00005c3d   Thumb Code     0  daddsub_clz.o(x$fpl$dadd)
-    _dadd                                    0x00005c3d   Thumb Code   332  daddsub_clz.o(x$fpl$dadd)
-    __aeabi_ddiv                             0x00005d8d   Thumb Code     0  ddiv.o(x$fpl$ddiv)
-    _ddiv                                    0x00005d8d   Thumb Code   552  ddiv.o(x$fpl$ddiv)
-    __aeabi_i2d                              0x0000603d   Thumb Code     0  dflt_clz.o(x$fpl$dflt)
-    _dflt                                    0x0000603d   Thumb Code    46  dflt_clz.o(x$fpl$dflt)
-    __aeabi_dmul                             0x0000606d   Thumb Code     0  dmul.o(x$fpl$dmul)
-    _dmul                                    0x0000606d   Thumb Code   332  dmul.o(x$fpl$dmul)
-    __fpl_dnaninf                            0x000061c1   Thumb Code   156  dnaninf.o(x$fpl$dnaninf)
-    __fpl_dretinf                            0x0000625d   Thumb Code    12  dretinf.o(x$fpl$dretinf)
-    __aeabi_dsub                             0x00006269   Thumb Code     0  daddsub_clz.o(x$fpl$dsub)
-    _dsub                                    0x00006269   Thumb Code   464  daddsub_clz.o(x$fpl$dsub)
-    __aeabi_f2d                              0x0000643d   Thumb Code     0  f2d.o(x$fpl$f2d)
-    _f2d                                     0x0000643d   Thumb Code    86  f2d.o(x$fpl$f2d)
-    __fpl_fnaninf                            0x00006493   Thumb Code   140  fnaninf.o(x$fpl$fnaninf)
-    _fp_init                                 0x0000651f   Thumb Code    10  fpinit.o(x$fpl$fpinit)
-    __fplib_config_fpu_vfp                   0x00006527   Thumb Code     0  fpinit.o(x$fpl$fpinit)
-    __fplib_config_pureend_doubles           0x00006527   Thumb Code     0  fpinit.o(x$fpl$fpinit)
-    __fpl_fretinf                            0x00006529   Thumb Code    10  fretinf.o(x$fpl$fretinf)
-    __I$use$fp                               0x00006532   Number         0  usenofp.o(x$fpl$usenofp)
-    Flash_InitConfig                         0x00006734   Data          20  flash.o(.constdata)
-    Region$$Table$$Base                      0x00006808   Number         0  anon$$obj.o(Region$$Table)
-    Region$$Table$$Limit                     0x00006848   Number         0  anon$$obj.o(Region$$Table)
+    alg_detect                               0x00005685   Thumb Code   640  process.o(i.alg_detect)
+    alg_filter                               0x00005931   Thumb Code   168  process.o(i.alg_filter)
+    alg_start                                0x000059e5   Thumb Code    50  process.o(i.alg_start)
+    cbuffer_popdata                          0x00005a21   Thumb Code    62  process.o(i.cbuffer_popdata)
+    cbuffer_pushdata                         0x00005a65   Thumb Code    58  process.o(i.cbuffer_pushdata)
+    crc16                                    0x00005aa5   Thumb Code    36  crc16.o(i.crc16)
+    main                                     0x00005acd   Thumb Code    54  main.o(i.main)
+    sv_close                                 0x00005b41   Thumb Code    10  process.o(i.sv_close)
+    sv_open                                  0x00005b51   Thumb Code    10  process.o(i.sv_open)
+    timer_callback                           0x00005b61   Thumb Code   116  process.o(i.timer_callback)
+    __aeabi_d2f                              0x00005be1   Thumb Code     0  d2f.o(x$fpl$d2f)
+    _d2f                                     0x00005be1   Thumb Code    98  d2f.o(x$fpl$d2f)
+    __aeabi_dadd                             0x00005c45   Thumb Code     0  daddsub_clz.o(x$fpl$dadd)
+    _dadd                                    0x00005c45   Thumb Code   332  daddsub_clz.o(x$fpl$dadd)
+    __aeabi_ddiv                             0x00005d95   Thumb Code     0  ddiv.o(x$fpl$ddiv)
+    _ddiv                                    0x00005d95   Thumb Code   552  ddiv.o(x$fpl$ddiv)
+    __aeabi_i2d                              0x00006045   Thumb Code     0  dflt_clz.o(x$fpl$dflt)
+    _dflt                                    0x00006045   Thumb Code    46  dflt_clz.o(x$fpl$dflt)
+    __aeabi_dmul                             0x00006075   Thumb Code     0  dmul.o(x$fpl$dmul)
+    _dmul                                    0x00006075   Thumb Code   332  dmul.o(x$fpl$dmul)
+    __fpl_dnaninf                            0x000061c9   Thumb Code   156  dnaninf.o(x$fpl$dnaninf)
+    __fpl_dretinf                            0x00006265   Thumb Code    12  dretinf.o(x$fpl$dretinf)
+    __aeabi_dsub                             0x00006271   Thumb Code     0  daddsub_clz.o(x$fpl$dsub)
+    _dsub                                    0x00006271   Thumb Code   464  daddsub_clz.o(x$fpl$dsub)
+    __aeabi_f2d                              0x00006445   Thumb Code     0  f2d.o(x$fpl$f2d)
+    _f2d                                     0x00006445   Thumb Code    86  f2d.o(x$fpl$f2d)
+    __fpl_fnaninf                            0x0000649b   Thumb Code   140  fnaninf.o(x$fpl$fnaninf)
+    _fp_init                                 0x00006527   Thumb Code    10  fpinit.o(x$fpl$fpinit)
+    __fplib_config_fpu_vfp                   0x0000652f   Thumb Code     0  fpinit.o(x$fpl$fpinit)
+    __fplib_config_pureend_doubles           0x0000652f   Thumb Code     0  fpinit.o(x$fpl$fpinit)
+    __fpl_fretinf                            0x00006531   Thumb Code    10  fretinf.o(x$fpl$fretinf)
+    __I$use$fp                               0x0000653a   Number         0  usenofp.o(x$fpl$usenofp)
+    Flash_InitConfig                         0x0000673c   Data          20  flash.o(.constdata)
+    Region$$Table$$Base                      0x00006810   Number         0  anon$$obj.o(Region$$Table)
+    Region$$Table$$Limit                     0x00006850   Number         0  anon$$obj.o(Region$$Table)
     peripheralClockConfig0                   0x1fff0000   Data         138  clock_config.o(.data)
     g_clockManConfigsArr                     0x1fff008c   Data           4  clock_config.o(.data)
     config                                   0x1fff0090   Data           4  cfg.o(.data)
@@ -4334,9 +4334,9 @@ Memory Map of the image
 
   Image Entry point : 0x000001b5
 
-  Load Region LR_IROM1 (Base: 0x00000000, Size: 0x00006ab8, Max: 0x00028000, ABSOLUTE, COMPRESSED[0x000069d4])
+  Load Region LR_IROM1 (Base: 0x00000000, Size: 0x00006ac0, Max: 0x00028000, ABSOLUTE, COMPRESSED[0x000069dc])
 
-    Execution Region ER_IROM1 (Exec base: 0x00000000, Load base: 0x00000000, Size: 0x00006848, Max: 0x00028000, ABSOLUTE)
+    Execution Region ER_IROM1 (Exec base: 0x00000000, Load base: 0x00000000, Size: 0x00006850, Max: 0x00028000, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
@@ -4694,48 +4694,48 @@ Memory Map of the image
     0x00005584   0x00005584   0x00000034   Code   RO          384    i.alg_PreProcess    process.o
     0x000055b8   0x000055b8   0x0000005c   Code   RO          385    i.alg_Triggering    process.o
     0x00005614   0x00005614   0x00000070   Code   RO          386    i.alg_calibrate     process.o
-    0x00005684   0x00005684   0x000002a4   Code   RO          387    i.alg_detect        process.o
-    0x00005928   0x00005928   0x000000b4   Code   RO          388    i.alg_filter        process.o
-    0x000059dc   0x000059dc   0x0000003c   Code   RO          389    i.alg_start         process.o
-    0x00005a18   0x00005a18   0x00000044   Code   RO          390    i.cbuffer_popdata   process.o
-    0x00005a5c   0x00005a5c   0x00000040   Code   RO          391    i.cbuffer_pushdata  process.o
-    0x00005a9c   0x00005a9c   0x00000028   Code   RO          614    i.crc16             crc16.o
-    0x00005ac4   0x00005ac4   0x00000036   Code   RO           80    i.main              main.o
-    0x00005afa   0x00005afa   0x00000002   PAD
-    0x00005afc   0x00005afc   0x0000003c   Code   RO         8884    i.osif_UpdateTickConfig  osif_baremetal.o
-    0x00005b38   0x00005b38   0x00000010   Code   RO          392    i.sv_close          process.o
-    0x00005b48   0x00005b48   0x00000010   Code   RO          393    i.sv_open           process.o
-    0x00005b58   0x00005b58   0x00000080   Code   RO          394    i.timer_callback    process.o
-    0x00005bd8   0x00005bd8   0x00000062   Code   RO         9081    x$fpl$d2f           fz_wm.l(d2f.o)
-    0x00005c3a   0x00005c3a   0x00000002   PAD
-    0x00005c3c   0x00005c3c   0x00000150   Code   RO         9083    x$fpl$dadd          fz_wm.l(daddsub_clz.o)
-    0x00005d8c   0x00005d8c   0x000002b0   Code   RO         9090    x$fpl$ddiv          fz_wm.l(ddiv.o)
-    0x0000603c   0x0000603c   0x0000002e   Code   RO         9096    x$fpl$dflt          fz_wm.l(dflt_clz.o)
-    0x0000606a   0x0000606a   0x00000002   PAD
-    0x0000606c   0x0000606c   0x00000154   Code   RO         9103    x$fpl$dmul          fz_wm.l(dmul.o)
-    0x000061c0   0x000061c0   0x0000009c   Code   RO         9220    x$fpl$dnaninf       fz_wm.l(dnaninf.o)
-    0x0000625c   0x0000625c   0x0000000c   Code   RO         9222    x$fpl$dretinf       fz_wm.l(dretinf.o)
-    0x00006268   0x00006268   0x000001d4   Code   RO         9085    x$fpl$dsub          fz_wm.l(daddsub_clz.o)
-    0x0000643c   0x0000643c   0x00000056   Code   RO         9107    x$fpl$f2d           fz_wm.l(f2d.o)
-    0x00006492   0x00006492   0x0000008c   Code   RO         9226    x$fpl$fnaninf       fz_wm.l(fnaninf.o)
-    0x0000651e   0x0000651e   0x0000000a   Code   RO         9371    x$fpl$fpinit        fz_wm.l(fpinit.o)
-    0x00006528   0x00006528   0x0000000a   Code   RO         9228    x$fpl$fretinf       fz_wm.l(fretinf.o)
-    0x00006532   0x00006532   0x00000000   Code   RO         9232    x$fpl$usenofp       fz_wm.l(usenofp.o)
-    0x00006532   0x00006532   0x00000200   Data   RO          615    .constdata          crc16.o
-    0x00006732   0x00006732   0x00000002   PAD
-    0x00006734   0x00006734   0x00000014   Data   RO          931    .constdata          flash.o
-    0x00006748   0x00006748   0x00000034   Data   RO         6119    .constdata          ckgen_drv.o
-    0x0000677c   0x0000677c   0x00000040   Data   RO         6517    .constdata          dma_drv.o
-    0x000067bc   0x000067bc   0x00000014   Data   RO         7189    .constdata          gpio_drv.o
-    0x000067d0   0x000067d0   0x00000006   Data   RO         7641    .constdata          spi_master_drv.o
-    0x000067d6   0x000067d6   0x00000006   Data   RO         8049    .constdata          timer_drv.o
-    0x000067dc   0x000067dc   0x0000001c   Data   RO         8266    .constdata          uart_drv.o
-    0x000067f8   0x000067f8   0x00000008   Data   RO         8487    .constdata          uart_hw.o
-    0x00006800   0x00006800   0x00000008   Data   RO         8672    .constdata          wdg_drv.o
-    0x00006808   0x00006808   0x00000040   Data   RO         9427    Region$$Table       anon$$obj.o
+    0x00005684   0x00005684   0x000002ac   Code   RO          387    i.alg_detect        process.o
+    0x00005930   0x00005930   0x000000b4   Code   RO          388    i.alg_filter        process.o
+    0x000059e4   0x000059e4   0x0000003c   Code   RO          389    i.alg_start         process.o
+    0x00005a20   0x00005a20   0x00000044   Code   RO          390    i.cbuffer_popdata   process.o
+    0x00005a64   0x00005a64   0x00000040   Code   RO          391    i.cbuffer_pushdata  process.o
+    0x00005aa4   0x00005aa4   0x00000028   Code   RO          614    i.crc16             crc16.o
+    0x00005acc   0x00005acc   0x00000036   Code   RO           80    i.main              main.o
+    0x00005b02   0x00005b02   0x00000002   PAD
+    0x00005b04   0x00005b04   0x0000003c   Code   RO         8884    i.osif_UpdateTickConfig  osif_baremetal.o
+    0x00005b40   0x00005b40   0x00000010   Code   RO          392    i.sv_close          process.o
+    0x00005b50   0x00005b50   0x00000010   Code   RO          393    i.sv_open           process.o
+    0x00005b60   0x00005b60   0x00000080   Code   RO          394    i.timer_callback    process.o
+    0x00005be0   0x00005be0   0x00000062   Code   RO         9081    x$fpl$d2f           fz_wm.l(d2f.o)
+    0x00005c42   0x00005c42   0x00000002   PAD
+    0x00005c44   0x00005c44   0x00000150   Code   RO         9083    x$fpl$dadd          fz_wm.l(daddsub_clz.o)
+    0x00005d94   0x00005d94   0x000002b0   Code   RO         9090    x$fpl$ddiv          fz_wm.l(ddiv.o)
+    0x00006044   0x00006044   0x0000002e   Code   RO         9096    x$fpl$dflt          fz_wm.l(dflt_clz.o)
+    0x00006072   0x00006072   0x00000002   PAD
+    0x00006074   0x00006074   0x00000154   Code   RO         9103    x$fpl$dmul          fz_wm.l(dmul.o)
+    0x000061c8   0x000061c8   0x0000009c   Code   RO         9220    x$fpl$dnaninf       fz_wm.l(dnaninf.o)
+    0x00006264   0x00006264   0x0000000c   Code   RO         9222    x$fpl$dretinf       fz_wm.l(dretinf.o)
+    0x00006270   0x00006270   0x000001d4   Code   RO         9085    x$fpl$dsub          fz_wm.l(daddsub_clz.o)
+    0x00006444   0x00006444   0x00000056   Code   RO         9107    x$fpl$f2d           fz_wm.l(f2d.o)
+    0x0000649a   0x0000649a   0x0000008c   Code   RO         9226    x$fpl$fnaninf       fz_wm.l(fnaninf.o)
+    0x00006526   0x00006526   0x0000000a   Code   RO         9371    x$fpl$fpinit        fz_wm.l(fpinit.o)
+    0x00006530   0x00006530   0x0000000a   Code   RO         9228    x$fpl$fretinf       fz_wm.l(fretinf.o)
+    0x0000653a   0x0000653a   0x00000000   Code   RO         9232    x$fpl$usenofp       fz_wm.l(usenofp.o)
+    0x0000653a   0x0000653a   0x00000200   Data   RO          615    .constdata          crc16.o
+    0x0000673a   0x0000673a   0x00000002   PAD
+    0x0000673c   0x0000673c   0x00000014   Data   RO          931    .constdata          flash.o
+    0x00006750   0x00006750   0x00000034   Data   RO         6119    .constdata          ckgen_drv.o
+    0x00006784   0x00006784   0x00000040   Data   RO         6517    .constdata          dma_drv.o
+    0x000067c4   0x000067c4   0x00000014   Data   RO         7189    .constdata          gpio_drv.o
+    0x000067d8   0x000067d8   0x00000006   Data   RO         7641    .constdata          spi_master_drv.o
+    0x000067de   0x000067de   0x00000006   Data   RO         8049    .constdata          timer_drv.o
+    0x000067e4   0x000067e4   0x0000001c   Data   RO         8266    .constdata          uart_drv.o
+    0x00006800   0x00006800   0x00000008   Data   RO         8487    .constdata          uart_hw.o
+    0x00006808   0x00006808   0x00000008   Data   RO         8672    .constdata          wdg_drv.o
+    0x00006810   0x00006810   0x00000040   Data   RO         9427    Region$$Table       anon$$obj.o
 
 
-    Execution Region RW_IRAM1 (Exec base: 0x1fff0000, Load base: 0x00006848, Size: 0x00001ca8, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x000000a0])
+    Execution Region RW_IRAM1 (Exec base: 0x1fff0000, Load base: 0x00006850, Size: 0x00001ca8, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x000000a0])
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
@@ -4763,29 +4763,29 @@ Memory Map of the image
     0x1fff18a8        -       0x00000400   Zero   RW         8961    STACK               startup_ac7840x.o
 
 
-    Execution Region RW_IRAM2 (Exec base: 0x20000000, Load base: 0x000068e8, Size: 0x00000ca8, Max: 0x0000f000, ABSOLUTE)
+    Execution Region RW_IRAM2 (Exec base: 0x20000000, Load base: 0x000068f0, Size: 0x00000ca8, Max: 0x0000f000, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
-    0x20000000   0x000068e8   0x00000050   Data   RW            5    .data               clock_config.o
-    0x20000050   0x00006938   0x00000004   Data   RW            7    .data               clock_config.o
-    0x20000054   0x0000693c   0x00000020   Data   RW          238    .data               iap.o
-    0x20000074   0x0000695c   0x00000028   Data   RW          396    .data               process.o
-    0x2000009c   0x00006984   0x00000010   Data   RW          513    .data               protocol.o
-    0x200000ac   0x00006994   0x0000000c   Data   RW         7759    .data               spi_shared_function.o
-    0x200000b8   0x000069a0   0x00000003   Data   RW         7761    .data               spi_shared_function.o
-    0x200000bb   0x000069a3   0x00000001   PAD
-    0x200000bc   0x000069a4   0x00000014   Data   RW         8050    .data               timer_drv.o
-    0x200000d0   0x000069b8   0x00000010   Data   RW         8609    .data               uart_irq.o
-    0x200000e0   0x000069c8   0x00000004   Data   RW         8673    .data               wdg_drv.o
-    0x200000e4   0x000069cc   0x00000008   Data   RW         8885    .data               osif_baremetal.o
-    0x200000ec   0x000069d4   0x00000004   PAD
+    0x20000000   0x000068f0   0x00000050   Data   RW            5    .data               clock_config.o
+    0x20000050   0x00006940   0x00000004   Data   RW            7    .data               clock_config.o
+    0x20000054   0x00006944   0x00000020   Data   RW          238    .data               iap.o
+    0x20000074   0x00006964   0x00000028   Data   RW          396    .data               process.o
+    0x2000009c   0x0000698c   0x00000010   Data   RW          513    .data               protocol.o
+    0x200000ac   0x0000699c   0x0000000c   Data   RW         7759    .data               spi_shared_function.o
+    0x200000b8   0x000069a8   0x00000003   Data   RW         7761    .data               spi_shared_function.o
+    0x200000bb   0x000069ab   0x00000001   PAD
+    0x200000bc   0x000069ac   0x00000014   Data   RW         8050    .data               timer_drv.o
+    0x200000d0   0x000069c0   0x00000010   Data   RW         8609    .data               uart_irq.o
+    0x200000e0   0x000069d0   0x00000004   Data   RW         8673    .data               wdg_drv.o
+    0x200000e4   0x000069d4   0x00000008   Data   RW         8885    .data               osif_baremetal.o
+    0x200000ec   0x000069dc   0x00000004   PAD
     0x200000f0        -       0x00000108   Zero   RW          175    .bss                cfg.o
     0x200001f8        -       0x00000810   Zero   RW          237    .bss                iap.o
     0x20000a08        -       0x0000002c   Zero   RW          692    .bss                adxl312.o
     0x20000a34        -       0x00000010   Zero   RW         8048    .bss                timer_drv.o
     0x20000a44        -       0x00000060   Zero   RW         9289    .bss                c_w.l(libspace.o)
-    0x20000aa4   0x000069d4   0x00000004   PAD
+    0x20000aa4   0x000069dc   0x00000004   PAD
     0x20000aa8        -       0x00000200   Zero   RW         8962    HEAP                startup_ac7840x.o
 
 
@@ -4818,7 +4818,7 @@ Image component sizes
       2072        266          0         64          0       6477   md5c.o
        236         26          0          8          0       5432   osif_baremetal.o
         18          0          0          0          0       1057   port_hw.o
-      1968        192          0         40       5344      11291   process.o
+      1976        192          0         40       5344      11295   process.o
        560         74          0         16          0      10076   protocol.o
        312         20          0          0          0       3403   rcm_drv.o
        186          0          0          0          0       3660   spi_hw.o
@@ -4842,7 +4842,7 @@ Image component sizes
          6          0          0          0          0        497   wdg_irq.o
 
     ----------------------------------------------------------------------
-     21992       1898       1226        624       9852     666401   Object Totals
+     22000       1898       1226        624       9852     666405   Object Totals
          0          0         64          0          0          0   (incl. Generated)
         30          0          2          7          4          0   (incl. Padding)
 
@@ -4909,15 +4909,15 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
 
-     25470       2094       1226        624       9952     639925   Grand Totals
-     25470       2094       1226        396       9952     639925   ELF Image Totals (compressed)
-     25470       2094       1226        396          0          0   ROM Totals
+     25478       2094       1226        624       9952     639929   Grand Totals
+     25478       2094       1226        396       9952     639929   ELF Image Totals (compressed)
+     25478       2094       1226        396          0          0   ROM Totals
 
 ==============================================================================
 
-    Total RO  Size (Code + RO Data)                26696 (  26.07kB)
+    Total RO  Size (Code + RO Data)                26704 (  26.08kB)
     Total RW  Size (RW Data + ZI Data)             10576 (  10.33kB)
-    Total ROM Size (Code + RO Data + RW Data)      27092 (  26.46kB)
+    Total ROM Size (Code + RO Data + RW Data)      27100 (  26.46kB)
 
 ==============================================================================
 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 4923 - 0
Project/Listings/BVACS_20240130.map


+ 4 - 2
User/process.c

@@ -253,7 +253,6 @@ void alg_PreProcess(void)
 								g_alg_context.state = ALG_Start;
 						}
 						
-						//g_VoiceOutTime = DEFAULT_VO_PERIOD-200;
 				}else{
 					  if(ALG_Triggering != g_alg_context.state){
 								g_alg_context.state = ALG_None;
@@ -424,7 +423,10 @@ void alg_detect(axis_info_t* paxis_info)
 				sv_open();  //´ò¿ªµç´Å·§£¬Ð¹Æø
 				g_alg_context.valveclose_times =0;
 				g_alg_context.valveclose_interval = CLOSEVALVE_INTERVAL;
-				g_vo_alarm = 0;
+			
+				g_VoiceOutTime = DEFAULT_VO_PERIOD-10;
+				g_vo_alarm = 1;
+			
 				x_keepcount = 0;
 				y_keepcount = 0;
 				z_keepcount = 0;

+ 1 - 1
User/protocol.c

@@ -5,7 +5,7 @@
 
 
 #ifdef IS_BOOTLOADER
-uint32_t Firmware_Version[4] = {1, 0, 1, 20240129};
+uint32_t Firmware_Version[4] = {1, 0, 1, 20240130};
 #else
 uint32_t Firmware_Version[4] = {1, 1, 5, 20240125};
 #endif