This commit is contained in:
2026-09-01 11:53:09 +08:00
parent ffeb82cf8f
commit 2cf223a9da
3 changed files with 8 additions and 11 deletions
-4
View File
@@ -20,10 +20,6 @@ files:
- main.py - main.py
- model_317828.cvimodel - model_317828.cvimodel
- model_317828.mud - model_317828.mud
- model_317211.cvimodel
- model_317211.mud
- model_270820.cvimodel
- model_270820.mud
- network.py - network.py
- ota_curl.sh - ota_curl.sh
- ota_manager.py - ota_manager.py
+7 -6
View File
@@ -136,6 +136,7 @@ def cmd_str():
sync_system_time_from_4g() sync_system_time_from_4g()
# 2.1 WiFi 热点配网兜底:仅当 STA 与 4G 均不可用时起 AP + HTTP;提交后删 /boot/wifi.ap、建 wifi.sta 并 reboot # 2.1 WiFi 热点配网兜底:仅当 STA 与 4G 均不可用时起 AP + HTTP;提交后删 /boot/wifi.ap、建 wifi.sta 并 reboot
_ota_pending_path = f"{config.APP_DIR}/ota_pending.json"
try: try:
from wifi_config_httpd import maybe_start_wifi_ap_fallback from wifi_config_httpd import maybe_start_wifi_ap_fallback
@@ -293,8 +294,8 @@ def cmd_str():
last_adc_trigger = 0 last_adc_trigger = 0
trigger_adc_val = 0 # 触发时的气压值,气压需降回此值以下才能再次触发 trigger_adc_val = 0 # 触发时的气压值,气压需降回此值以下才能再次触发
enable_check = True
# 读取一次ADC初始值,防止开机时传感器已有压力导致误触发 # 读取一次ADC初始值,防止开机时传感器已有压力导致误触发
enable_check = True
try: try:
last_adc_val = hardware_manager.adc_obj.read() last_adc_val = hardware_manager.adc_obj.read()
except Exception: except Exception:
@@ -388,15 +389,15 @@ def cmd_str():
pressure_max = adc_val pressure_max = adc_val
if len(pressure_buf) >= PRESSURE_BATCH_SIZE: if len(pressure_buf) >= PRESSURE_BATCH_SIZE:
_flush_pressure_buf("batch") _flush_pressure_buf("batch")
# 突变增量检测:压力增量大于500时触发 # 突变增量检测:压力增量大于300时触发
# 触发后需等气压降触发以下才重新允许下一次触发。 # 触发后需等气压降触发以下才重新检测增量
if adc_val < trigger_adc_val: if adc_val < trigger_adc_val :
enable_check = True enable_check = True
if (adc_val - last_adc_val) > 500 and enable_check: if (adc_val - last_adc_val) > 500 and enable_check:
hardware_manager.start_idle_timer() # 重新计时 hardware_manager.start_idle_timer() # 重新计时
last_adc_trigger = current_time last_adc_trigger = current_time
trigger_adc_val = adc_val # 记录触发 trigger_adc_val = adc_val # 记录触发时的气压值
last_adc_val = adc_val # 更新基准,防止连续增量重复触发 last_adc_val = adc_val # 更新基准,防止连续增量触发
enable_check = False enable_check = False
_flush_pressure_buf("before_trigger") _flush_pressure_buf("before_trigger")