auto_poweroff

This commit is contained in:
gcw_4spBpAfv
2026-03-11 18:19:17 +08:00
parent ff629e596d
commit 75def0ff38
7 changed files with 94 additions and 16 deletions

View File

@@ -1,6 +1,6 @@
id: t11 id: t11
name: t11 name: t11
version: 1.2.7 version: 1.2.9
author: t11 author: t11
icon: '' icon: ''
desc: t11 desc: t11

View File

@@ -51,6 +51,7 @@ DISTANCE_SERIAL_BAUDRATE = 9600
# 无WiFi模块I2C_BUS_NUM = 1引脚P18(I2C1_SCL), P21(I2C1_SDA) # 无WiFi模块I2C_BUS_NUM = 1引脚P18(I2C1_SCL), P21(I2C1_SDA)
# 有WiFi模块I2C_BUS_NUM = 5引脚A15(I2C5_SCL), A27(I2C5_SDA) # 有WiFi模块I2C_BUS_NUM = 5引脚A15(I2C5_SCL), A27(I2C5_SDA)
I2C_BUS_NUM = 5 if HAS_WIFI_MODULE else 1 I2C_BUS_NUM = 5 if HAS_WIFI_MODULE else 1
INA226_ADDR = 0x40 INA226_ADDR = 0x40
REG_CONFIGURATION = 0x00 REG_CONFIGURATION = 0x00
REG_BUS_VOLTAGE = 0x02 REG_BUS_VOLTAGE = 0x02
@@ -59,9 +60,9 @@ REG_CALIBRATION = 0x05
CALIBRATION_VALUE = 0x1400 CALIBRATION_VALUE = 0x1400
# ==================== 空气传感器配置 ==================== # ==================== 空气传感器配置 ====================
ADC_TRIGGER_THRESHOLD = 2500 # TODO:只是用于测试,最终需要改为正常值 ADC_TRIGGER_THRESHOLD = 2700 # TODO:4096只是用于测试,因为最大值是4095这个值是永远不会触发的最终需要改为正常值
AIR_PRESSURE_lOG = False # TODO: 在正式环境中关闭 AIR_PRESSURE_lOG = False # TODO: 在正式环境中关闭
AIR_PRESSURE_HARDWARE_MAX = 40
# ADC配置 # ADC配置
ADC_CHANNEL = 0 ADC_CHANNEL = 0
ADC_LASER_THRESHOLD = 3000 ADC_LASER_THRESHOLD = 3000
@@ -116,7 +117,7 @@ SAVE_IMAGE_ENABLED = True # 是否保存图像True=保存False=不保存
PHOTO_DIR = "/root/phot" # 照片存储目录 PHOTO_DIR = "/root/phot" # 照片存储目录
MAX_IMAGES = 1000 MAX_IMAGES = 1000
SHOW_CAMERA_PHOTO_WHILE_SHOOTING = False # 是否在拍摄时显示摄像头图像True=显示False=不显示建议在连着USB测试过程中打开 SHOW_CAMERA_PHOTO_WHILE_SHOOTING = True # 是否在拍摄时显示摄像头图像True=显示False=不显示建议在连着USB测试过程中打开
# ==================== OTA配置 ==================== # ==================== OTA配置 ====================
MAX_BACKUPS = 5 MAX_BACKUPS = 5
@@ -142,7 +143,12 @@ PIN_MAPPINGS_WITH_WIFI = {
"A28": "UART2_TX", "A28": "UART2_TX",
"A15": "I2C5_SCL", "A15": "I2C5_SCL",
"A27": "I2C5_SDA", "A27": "I2C5_SDA",
"A24": "GPIOA24", # 电源板的引脚
} }
# 根据WiFi模块开关选择引脚映射 # 根据WiFi模块开关选择引脚映射
PIN_MAPPINGS = PIN_MAPPINGS_WITH_WIFI if HAS_WIFI_MODULE else PIN_MAPPINGS_NO_WIFI PIN_MAPPINGS = PIN_MAPPINGS_WITH_WIFI if HAS_WIFI_MODULE else PIN_MAPPINGS_NO_WIFI
# ==================== 电源配置 ====================
AUTO_POWER_OFF_IN_SECONDS = 10 * 60 # 自动关机时间0表示不自动关机

View File

@@ -74,3 +74,10 @@
* 快照 app.log* 到 /tmp staging * 快照 app.log* 到 /tmp staging
* 打包成 tar.gz默认或 zip * 打包成 tar.gz默认或 zip
* 以 multipart/form-data 的 file 字段 POST 到 url * 以 multipart/form-data 的 file 字段 POST 到 url
8. 自动关机:
hardware中设定了开停表然后再增加了获取idle的时间。
自动关机的时机: 超过配置的idle时长
禁止自动关机的情况1.校准中2.OTA中
重启计时的时机1.校准完成2.命令触发射箭3.真实触发射箭4.初始化完成
9.

View File

@@ -4,7 +4,7 @@
硬件管理器模块 硬件管理器模块
提供硬件对象的统一管理和访问 提供硬件对象的统一管理和访问
""" """
import threading from maix import time
import config import config
from at_client import ATClient from at_client import ATClient
@@ -28,8 +28,13 @@ class HardwareManager:
self._bus = None # I2C总线 self._bus = None # I2C总线
self._adc_obj = None # ADC对象 self._adc_obj = None # ADC对象
self._at_client = None # AT客户端 self._at_client = None # AT客户端
self._last_active_time = 0 # 用于记录用户的最后一次活跃的时间
self._stop_timer = False # 用于停止定时器的标志
self._initialized = True self._initialized = True
# ==================== 硬件访问(只读属性)==================== # ==================== 硬件访问(只读属性)====================
@@ -93,6 +98,34 @@ class HardwareManager:
self._at_client.start() self._at_client.start()
return self._at_client return self._at_client
def power_off(self):
"""关闭电源板"""
try:
# 物理引脚是 A24对应 GPIO 功能是 GPIOA24
# 注意:这里需要先在 config.PIN_MAPPINGS 中配置好 "A24": "GPIOA24"
from maix import gpio
# 输出高电平关闭
gpio.GPIO("GPIOA24", gpio.Mode.OUT).value(1)
except Exception as e:
print(f"关机失败: {e}")
def start_idle_timer(self):
self._stop_timer = False
self._last_active_time = time.time()
def stop_idle_timer(self):
self._stop_timer = True
def get_idle_time_in_sec(self):
if self._stop_timer:
return 0
diff = time.time() - self._last_active_time
if diff < 0:
# 时间可能被重置了,重新计时
self._last_active_time = time.time()
return 0
return diff
# 创建全局单例实例 # 创建全局单例实例
hardware_manager = HardwareManager() hardware_manager = HardwareManager()

37
main.py
View File

@@ -97,9 +97,7 @@ def cmd_str():
# 3. 初始化 INA226 电量监测芯片 # 3. 初始化 INA226 电量监测芯片
init_ina226() init_ina226()
# 4. 初始化显示和相机 # 4. 初始化显示和相机
camera_manager.init_camera(640, 480) camera_manager.init_camera(640, 480)
camera_manager.init_display() camera_manager.init_display()
@@ -213,33 +211,41 @@ def cmd_str():
# 7. 加载激光点配置 # 7. 加载激光点配置
laser_manager.load_laser_point() laser_manager.load_laser_point()
# 8. 启动空闲计时
hardware_manager.start_idle_timer()
if logger: if logger:
logger.info("系统准备完成...") logger.info("系统准备完成...")
last_adc_trigger = 0 last_adc_trigger = 0
# 气压采样:减少日志频率(每 N 个点输出一条),避免 logger.debug 拖慢采样 # 气压采样:减少日志频率(每 N 个点输出一条),避免 logger.debug 拖慢采样
PRESSURE_BATCH_SIZE = 100 PRESSURE_BATCH_SIZE = 100
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):
if not config.AIR_PRESSURE_lOG: if not config.AIR_PRESSURE_lOG:
return return
nonlocal pressure_buf, pressure_sum, pressure_min, pressure_max, pressure_t0_ms, logger nonlocal pressure_buf, pressure_sum, pressure_min, pressure_max, pressure_t0_ms, logger, pressure_abs_sum, last_avg_abs
if not pressure_buf: if not pressure_buf:
return return
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} " f"min={pressure_min} max={pressure_max} avg={avg:.1f} avg_abs={avg_abs:.3f} "
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)
@@ -247,9 +253,11 @@ def cmd_str():
print(line) print(line)
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 = avg_abs
# 主循环:检测扳机触发 → 拍照 → 分析 → 上报 # 主循环:检测扳机触发 → 拍照 → 分析 → 上报
while not app.need_exit(): while not app.need_exit():
@@ -267,16 +275,29 @@ def cmd_str():
logger.error(f"[MAIN] OTA检查异常: {e}") logger.error(f"[MAIN] OTA检查异常: {e}")
time.sleep_ms(250) time.sleep_ms(250)
continue continue
# 不在 OTA 状态下,检测是否空闲足够长,自动关机
# print(f"[MAIN] 空闲时间: {hardware_manager.get_idle_time_in_sec() }秒")
# print(f"配置关机时间:{config.AUTO_POWER_OFF_IN_SECONDS} 秒")
if hardware_manager.get_idle_time_in_sec() > config.AUTO_POWER_OFF_IN_SECONDS:
logger.info("[MAIN] 超过设定时间未检测活动,自动关机")
network_manager.safe_enqueue({"poweroff": "超过设定时间未检测活动,自动关机"}, 2)
time.sleep_ms(100)
hardware_manager.power_off()
time.sleep_ms(2000) # 让关机指令生效
break
# 读取ADC值扳机检测 # 读取ADC值扳机检测
try: try:
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:
@@ -287,8 +308,9 @@ 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) pressure_buf.append((adc_val, adc_abs_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:
@@ -298,6 +320,7 @@ def cmd_str():
# if adc_val >= 2000: # if adc_val >= 2000:
# print(f"adc :{adc_val}") # print(f"adc :{adc_val}")
if adc_val >= config.ADC_TRIGGER_THRESHOLD: if adc_val >= config.ADC_TRIGGER_THRESHOLD:
hardware_manager.start_idle_timer() # 重新计时
diff_ms = current_time - last_adc_trigger diff_ms = current_time - last_adc_trigger
if diff_ms < 3000: if diff_ms < 3000:
continue continue
@@ -460,7 +483,7 @@ def cmd_str():
logger = logger_manager.logger logger = logger_manager.logger
if logger: if logger:
logger.error(f"[MAIN] 显示异常: {e}") logger.error(f"[MAIN] 显示异常: {e}")
time.sleep_ms(10) time.sleep_ms(5)
except Exception as e: except Exception as e:
# 主循环的顶层异常捕获,防止程序静默退出 # 主循环的顶层异常捕获,防止程序静默退出

View File

@@ -1258,6 +1258,7 @@ class NetworkManager:
if not laser_manager.calibration_active: if not laser_manager.calibration_active:
laser_manager.turn_on_laser() laser_manager.turn_on_laser()
time.sleep_ms(100) time.sleep_ms(100)
hardware_manager.stop_idle_timer() # 停表
if not config.HARDCODE_LASER_POINT: if not config.HARDCODE_LASER_POINT:
laser_manager.start_calibration() laser_manager.start_calibration()
self.safe_enqueue({"result": "calibrating"}, 2) self.safe_enqueue({"result": "calibrating"}, 2)
@@ -1268,6 +1269,7 @@ class NetworkManager:
from laser_manager import laser_manager from laser_manager import laser_manager
laser_manager.turn_off_laser() laser_manager.turn_off_laser()
laser_manager.stop_calibration() laser_manager.stop_calibration()
hardware_manager.start_idle_timer() # 开表
self.safe_enqueue({"result": "laser_off"}, 2) self.safe_enqueue({"result": "laser_off"}, 2)
elif inner_cmd == 4: # 上报电量 elif inner_cmd == 4: # 上报电量
voltage = get_bus_voltage() voltage = get_bus_voltage()
@@ -1303,6 +1305,8 @@ class NetworkManager:
mode = "4g" mode = "4g"
self.logger.info("ota auto-selected: 4g (WiFi not available or no credentials)") self.logger.info("ota auto-selected: 4g (WiFi not available or no credentials)")
hardware_manager.stop_idle_timer() # 停表注意OTA停表之后就没有再开表因为OTA后面会重启会重新开表
if mode == "4g": if mode == "4g":
ota_manager._set_ota_url(ota_url) # 记录 OTA URL供命令7使用 ota_manager._set_ota_url(ota_url) # 记录 OTA URL供命令7使用
ota_manager._start_update_thread() ota_manager._start_update_thread()
@@ -1348,6 +1352,7 @@ class NetworkManager:
self.logger.info("[TEST] 收到TCP射箭触发命令") self.logger.info("[TEST] 收到TCP射箭触发命令")
self._manual_trigger_flag = True self._manual_trigger_flag = True
self.safe_enqueue({"result": "trigger_ack"}, 2) self.safe_enqueue({"result": "trigger_ack"}, 2)
hardware_manager.start_idle_timer() # 重新计时
elif inner_cmd == 42: # 关机命令 elif inner_cmd == 42: # 关机命令
self.logger.info("[SHUTDOWN] 收到TCP关机命令准备关机...") self.logger.info("[SHUTDOWN] 收到TCP关机命令准备关机...")
self.safe_enqueue({"result": "shutdown_ack"}, 2) self.safe_enqueue({"result": "shutdown_ack"}, 2)
@@ -1362,7 +1367,8 @@ class NetworkManager:
time.sleep_ms(2000) time.sleep_ms(2000)
os.system("sync") # 刷新文件系统缓存到磁盘,防止数据丢失 os.system("sync") # 刷新文件系统缓存到磁盘,防止数据丢失
time.sleep_ms(500) time.sleep_ms(500)
os.system("poweroff") # os.system("poweroff")
hardware_manager.power_off()
return return
elif inner_cmd == 43: # 上传日志命令 elif inner_cmd == 43: # 上传日志命令
# 格式: {"cmd":43, "data":{"ssid":"xxx","password":"xxx","url":"xxx", ...}} # 格式: {"cmd":43, "data":{"ssid":"xxx","password":"xxx","url":"xxx", ...}}
@@ -1373,7 +1379,9 @@ class NetworkManager:
include_rotated = inner_data.get("include_rotated", True) include_rotated = inner_data.get("include_rotated", True)
max_files = inner_data.get("max_files") max_files = inner_data.get("max_files")
archive_format = inner_data.get("archive", "tgz") # tgz 或 zip archive_format = inner_data.get("archive", "tgz") # tgz 或 zip
hardware_manager.start_idle_timer() # 重新计时
if not upload_url: if not upload_url:
self.logger.error("[LOG_UPLOAD] 缺少 url 参数") self.logger.error("[LOG_UPLOAD] 缺少 url 参数")
self.safe_enqueue({"result": "log_upload_failed", "reason": "missing_url"}, 2) self.safe_enqueue({"result": "log_upload_failed", "reason": "missing_url"}, 2)

View File

@@ -4,7 +4,7 @@
应用版本号 应用版本号
每次 OTA 更新时,只需要更新这个文件中的版本号 每次 OTA 更新时,只需要更新这个文件中的版本号
""" """
VERSION = '1.2.7' VERSION = '1.2.9'
# 1.2.0 开始使用C++编译成.so替换部分代码 # 1.2.0 开始使用C++编译成.so替换部分代码
# 1.2.1 ota使用加密包 # 1.2.1 ota使用加密包
@@ -15,6 +15,7 @@ VERSION = '1.2.7'
# 1.2.6 在链接 wifi 前先判断 wifi 的可用性,假如不可用,则不落盘。增加日志批量压缩上传功能 # 1.2.6 在链接 wifi 前先判断 wifi 的可用性,假如不可用,则不落盘。增加日志批量压缩上传功能
# 1.2.7 修复OTA失败的bug, 空气压力传感器的阈值是2500 # 1.2.7 修复OTA失败的bug, 空气压力传感器的阈值是2500
# 1.2.8 1 加快 wifi 下数据传输的速度。2 调整射箭时处理的逻辑优先上报数据再存照片之类的操作。3假如是用户打开激光的射箭触发后不再关闭激光因为是调瞄阶段 # 1.2.8 1 加快 wifi 下数据传输的速度。2 调整射箭时处理的逻辑优先上报数据再存照片之类的操作。3假如是用户打开激光的射箭触发后不再关闭激光因为是调瞄阶段
# 1.2.9 增加电源板的控制和自动关机的功能