ZZH000829/archery
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pref: 删除无引用方法调用

Browse Source
This commit is contained in:
linyimin
2026-08-11 13:52:53 +08:00
parent 6556cfcf74
commit e82941a161
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.py
+3 -12
View File
@@ -290,37 +290,31 @@ def cmd_str():
pressure_buf = [] pressure_buf = []
pressure_sum = 0 pressure_sum = 0
pressure_abs_sum = 0
pressure_min = 4095 pressure_min = 4095
pressure_max = 0 pressure_max = 0
pressure_t0_ms = None pressure_t0_ms = None
last_avg_abs = 0
def _flush_pressure_buf(reason: str): def _flush_pressure_buf(reason: str):
nonlocal pressure_buf, pressure_sum, pressure_min, pressure_max, pressure_t0_ms, logger, pressure_abs_sum, last_avg_abs nonlocal pressure_buf, pressure_sum, pressure_min, pressure_max, pressure_t0_ms, logger
if not pressure_buf: if not pressure_buf:
return return
if config.AIR_PRESSURE_lOG: if config.AIR_PRESSURE_lOG:
t1_ms = time.ticks_ms() t1_ms = time.ticks_ms()
n = len(pressure_buf) n = len(pressure_buf)
avg = (pressure_sum / n) if n else 0 avg = (pressure_sum / n) if n else 0
avg_abs = (pressure_abs_sum / n) if n else 0
line = ( line = (
f"[气压批量] reason={reason} " f"[气压批量] reason={reason} "
f"t0={pressure_t0_ms} t1={t1_ms} n={n} " f"t0={pressure_t0_ms} t1={t1_ms} n={n} "
f"min={pressure_min} max={pressure_max} avg={avg:.1f} avg_abs={avg_abs:.3f} " f"min={pressure_min} max={pressure_max} avg={avg:.1f} "
f"values={','.join(map(str, pressure_buf))}" f"values={','.join(map(str, pressure_buf))}"
f" convert value (kpa): {(max(pressure_buf, key=lambda x: x[1])[1] - last_avg_abs) / (5 - 2.5) * config.AIR_PRESSURE_HARDWARE_MAX:.1f}"
) )
if logger: if logger:
logger.debug(line) logger.debug(line)
else: else:
print(line) print(line)
last_avg_abs = avg_abs
# 无论是否记录日志，都必须清空 buffer，否则内存泄漏 # 无论是否记录日志，都必须清空 buffer，否则内存泄漏
pressure_buf = [] pressure_buf = []
pressure_sum = 0 pressure_sum = 0
pressure_abs_sum = 0
pressure_min = 4095 pressure_min = 4095
pressure_max = 0 pressure_max = 0
pressure_t0_ms = None pressure_t0_ms = None
@@ -358,12 +352,10 @@ def cmd_str():
if network_manager.manual_trigger_flag: if network_manager.manual_trigger_flag:
network_manager.clear_manual_trigger() network_manager.clear_manual_trigger()
adc_val = config.ADC_TRIGGER_THRESHOLD + 1 adc_val = config.ADC_TRIGGER_THRESHOLD + 1
adc_abs_val = 10
if logger: if logger:
logger.info("[TEST] TCP命令触发射箭") logger.info("[TEST] TCP命令触发射箭")
else: else:
adc_val = hardware_manager.adc_obj.read() adc_val = hardware_manager.adc_obj.read()
adc_abs_val = hardware_manager.adc_obj.read_vol()
except Exception as e: except Exception as e:
logger = logger_manager.logger logger = logger_manager.logger
if logger: if logger:
@@ -374,9 +366,8 @@ def cmd_str():
# ====== 气压采样缓存（每次循环都记录，批量输出日志）====== # ====== 气压采样缓存（每次循环都记录，批量输出日志）======
if pressure_t0_ms is None: if pressure_t0_ms is None:
pressure_t0_ms = current_time pressure_t0_ms = current_time
pressure_buf.append((adc_val, adc_abs_val)) pressure_buf.append(adc_val)
pressure_sum += adc_val pressure_sum += adc_val
pressure_abs_sum += adc_abs_val
if adc_val < pressure_min: if adc_val < pressure_min:
pressure_min = adc_val pressure_min = adc_val
if adc_val > pressure_max: if adc_val > pressure_max: