From: snickersun Date: Wed, 3 Jun 2026 10:17:34 +0000 (+0800) Subject: 更新充放电曲线,优化充电曲线和充电满逻辑。 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7d265a43c776b9415aec1208835e96da0adb1cb5;p=mirrors%2FASR1603_G5.git 更新充放电曲线,优化充电曲线和充电满逻辑。 --- diff --git "a/1.doc/K8_diaozhui/502631-510(\345\205\205\346\224\276\347\224\265\346\225\260\346\215\256).xlsx" "b/1.doc/K8_diaozhui/502631-510(\345\205\205\346\224\276\347\224\265\346\225\260\346\215\256).xlsx" new file mode 100644 index 00000000..6bda5d5f Binary files /dev/null and "b/1.doc/K8_diaozhui/502631-510(\345\205\205\346\224\276\347\224\265\346\225\260\346\215\256).xlsx" differ diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py index 1980abe3..86d70307 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py @@ -97,17 +97,43 @@ BATTERY_LOW_WARN_INTERVAL_MS = 300000 # 低电语音间隔 5min BATTERY_EMPTY_FLASH_COUNT = 3 BATTERY_EMPTY_FLASH_PERIOD_MS = 500 # 空电红快闪约 2 次/秒 +# ============================================================================= +# 电池 SoC 曲线(502631-510,4.35V 体系) +# 数据来源:1.doc/K8_diaozhui/502631-510(充放电数据).xlsx Record 页(0.5C=255mA) +# - 放电表 BATTERY_OCV_MAP:cycle1 step3,0.5C 恒流放电端电压→SoC;放电逻辑沿用此表插值 +# - 充电表 BATTERY_CHARGE_OCV_MAP:cycle2 step5,0.5C CCCV 充电端电压→SoC +# * 仅当配置了充电表时,充电(插 USB)期间才按充电电压实时映射 SoC 上报;未配置则沿用“冻结插入前 SoC” +# * CV 恒压段(>~4300mV)电压饱和,高 SoC 段电压不可区分、估值偏高属正常;充满以 charging=full 灯态为准 +# 重新标定:同型电池做“满充→0.5C 放空→0.5C 充满”,按每 5% SoC 取端电压覆盖下表即可 +# ============================================================================= # 电压门限(mV):充满 / 低电 / 空电(与 get_battery、simple 模式共用) USE_SIMPLE_VBATT_THRESH = False # True 时忽略 BATTERY_OCV_MAP,仅用三档电压 -VBATT_CHARGE_FULL_MV = 4320 # 502631 ZCV 100% OCV≈4.322V;CV 4.35V -VBATT_LOW_MV = 3630 # 约对应 ZCV 20%(4G 带载下不宜再抬高) +VBATT_CHARGE_FULL_MV = 4320 # 充满判断电压门限(mV):进入 CV 平台约 85%→100% +VBATT_LOW_MV = 3630 # 0.5C 放电约 35%(带载门限,沿用旧值不动) VBATT_EMPTY_MV = 3400 # 未充电:滑动平均电压 < 此值 → 低电关机(唯一关机条件) - -# 502631-510 4.35V ZCV 放电 OCV 表(mV→SoC);0% 锚定 3400 而非实验室 3262 +# 充满判断:电压达阈值 + 平台稳定 + 最短充电时间(三条件同时满足才 latch full) +# 防止"原来就满/高电量插 USB"时电压立刻超阈就误报 full +VBATT_CHARGE_FULL_PLATEAU_MV = 15 # 平台窗口内电压波动 ≤ 此值(mV) +VBATT_CHARGE_FULL_PLATEAU_N = 18 # 平台窗口样本数(18×10s=3min) +VBATT_CHARGE_FULL_MIN_SEC = 600 # 插 USB 后最少充电时间(s)才允许判满;从高 SoC 充满约 10-20min + +# 放电 OCV 表(mV→SoC,降序):502631-510 0.5C 放电端电压实测 +# 0% 锚定 3400mV(设备关机点);3400mV 以下条目已去除(设备不会工作在此区间) BATTERY_OCV_MAP = { - 4322: 100, 4239: 95, 4177: 90, 4117: 85, 4059: 80, 4006: 75, 3942: 70, 3898: 65, - 3853: 60, 3814: 55, 3781: 50, 3755: 45, 3738: 40, 3724: 35, 3706: 30, 3678: 25, - 3634: 20, 3577: 15, 3522: 10, 3468: 5, 3400: 0, + 4299: 100, 4184: 95, 4118: 90, 4055: 85, 3993: 80, 3936: 75, 3874: 70, 3828: 65, + 3784: 60, 3744: 55, 3709: 50, 3680: 45, 3657: 40, 3634: 35, 3607: 30, 3571: 25, + 3529: 20, 3484: 15, 3430: 10, 3400: 0, +} + +# 充电曲线表(mV→SoC,降序):502631-510 0.5C CCCV 充电端电压实测 +# 0% 锚定 3640mV(由放电 3400mV + 低 SoC 段充放压差约 240mV 估算得到) +# 3640mV 以下条目已去除(设备关机后才开始充电,充电电压不会低于此值) +# CV 恒压段(>~4300mV)电压饱和,90%/95% 不可区分,以 charging=full 灯态为准 +# ç½® None/删除此变量则充电期间不实时更新 SoC,沿用插 USB 前冻结值 +BATTERY_CHARGE_OCV_MAP = { + 4353: 100, 4296: 85, 4235: 80, 4171: 75, 4108: 70, 4059: 65, 4016: 60, 3981: 55, + 3955: 50, 3935: 45, 3919: 40, 3904: 35, 3889: 30, 3869: 25, 3807: 20, 3726: 15, + 3660: 10, 3640: 0, } # 录音麦克增益:record.gain_set(codec_gain, dsp_gain) diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py index 1980abe3..86d70307 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py @@ -97,17 +97,43 @@ BATTERY_LOW_WARN_INTERVAL_MS = 300000 # 低电语音间隔 5min BATTERY_EMPTY_FLASH_COUNT = 3 BATTERY_EMPTY_FLASH_PERIOD_MS = 500 # 空电红快闪约 2 次/秒 +# ============================================================================= +# 电池 SoC 曲线(502631-510,4.35V 体系) +# 数据来源:1.doc/K8_diaozhui/502631-510(充放电数据).xlsx Record 页(0.5C=255mA) +# - 放电表 BATTERY_OCV_MAP:cycle1 step3,0.5C 恒流放电端电压→SoC;放电逻辑沿用此表插值 +# - 充电表 BATTERY_CHARGE_OCV_MAP:cycle2 step5,0.5C CCCV 充电端电压→SoC +# * 仅当配置了充电表时,充电(插 USB)期间才按充电电压实时映射 SoC 上报;未配置则沿用“冻结插入前 SoC” +# * CV 恒压段(>~4300mV)电压饱和,高 SoC 段电压不可区分、估值偏高属正常;充满以 charging=full 灯态为准 +# 重新标定:同型电池做“满充→0.5C 放空→0.5C 充满”,按每 5% SoC 取端电压覆盖下表即可 +# ============================================================================= # 电压门限(mV):充满 / 低电 / 空电(与 get_battery、simple 模式共用) USE_SIMPLE_VBATT_THRESH = False # True 时忽略 BATTERY_OCV_MAP,仅用三档电压 -VBATT_CHARGE_FULL_MV = 4320 # 502631 ZCV 100% OCV≈4.322V;CV 4.35V -VBATT_LOW_MV = 3630 # 约对应 ZCV 20%(4G 带载下不宜再抬高) +VBATT_CHARGE_FULL_MV = 4320 # 充满判断电压门限(mV):进入 CV 平台约 85%→100% +VBATT_LOW_MV = 3630 # 0.5C 放电约 35%(带载门限,沿用旧值不动) VBATT_EMPTY_MV = 3400 # 未充电:滑动平均电压 < 此值 → 低电关机(唯一关机条件) - -# 502631-510 4.35V ZCV 放电 OCV 表(mV→SoC);0% 锚定 3400 而非实验室 3262 +# 充满判断:电压达阈值 + 平台稳定 + 最短充电时间(三条件同时满足才 latch full) +# 防止"原来就满/高电量插 USB"时电压立刻超阈就误报 full +VBATT_CHARGE_FULL_PLATEAU_MV = 15 # 平台窗口内电压波动 ≤ 此值(mV) +VBATT_CHARGE_FULL_PLATEAU_N = 18 # 平台窗口样本数(18×10s=3min) +VBATT_CHARGE_FULL_MIN_SEC = 600 # 插 USB 后最少充电时间(s)才允许判满;从高 SoC 充满约 10-20min + +# 放电 OCV 表(mV→SoC,降序):502631-510 0.5C 放电端电压实测 +# 0% 锚定 3400mV(设备关机点);3400mV 以下条目已去除(设备不会工作在此区间) BATTERY_OCV_MAP = { - 4322: 100, 4239: 95, 4177: 90, 4117: 85, 4059: 80, 4006: 75, 3942: 70, 3898: 65, - 3853: 60, 3814: 55, 3781: 50, 3755: 45, 3738: 40, 3724: 35, 3706: 30, 3678: 25, - 3634: 20, 3577: 15, 3522: 10, 3468: 5, 3400: 0, + 4299: 100, 4184: 95, 4118: 90, 4055: 85, 3993: 80, 3936: 75, 3874: 70, 3828: 65, + 3784: 60, 3744: 55, 3709: 50, 3680: 45, 3657: 40, 3634: 35, 3607: 30, 3571: 25, + 3529: 20, 3484: 15, 3430: 10, 3400: 0, +} + +# 充电曲线表(mV→SoC,降序):502631-510 0.5C CCCV 充电端电压实测 +# 0% 锚定 3640mV(由放电 3400mV + 低 SoC 段充放压差约 240mV 估算得到) +# 3640mV 以下条目已去除(设备关机后才开始充电,充电电压不会低于此值) +# CV 恒压段(>~4300mV)电压饱和,90%/95% 不可区分,以 charging=full 灯态为准 +# ç½® None/删除此变量则充电期间不实时更新 SoC,沿用插 USB 前冻结值 +BATTERY_CHARGE_OCV_MAP = { + 4353: 100, 4296: 85, 4235: 80, 4171: 75, 4108: 70, 4059: 65, 4016: 60, 3981: 55, + 3955: 50, 3935: 45, 3919: 40, 3904: 35, 3889: 30, 3869: 25, 3807: 20, 3726: 15, + 3660: 10, 3640: 0, } # 录音麦克增益:record.gain_set(codec_gain, dsp_gain) diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_hw.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_hw.py index 1f53b789..62ede521 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_hw.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_hw.py @@ -15,11 +15,11 @@ from vc_common import dev_type from vc_utils import cfg_bool, cfg_int, cfg_attr def _default_battery_ocv_map(): - # 无 BATTERY_OCV_MAP 配置时的兜底(502631 ZCV;0% 锚定 3400mV,适配 4G 带载) + # 无 BATTERY_OCV_MAP 配置时的兜底(502631-510 0.5C 放电端电压实测;0% 锚定 3400mV) return { - 4322: 100, 4239: 95, 4177: 90, 4117: 85, 4059: 80, 4006: 75, 3942: 70, 3898: 65, - 3853: 60, 3814: 55, 3781: 50, 3755: 45, 3738: 40, 3724: 35, 3706: 30, 3678: 25, - 3634: 20, 3577: 15, 3522: 10, 3468: 5, 3400: 0, + 4299: 100, 4184: 95, 4118: 90, 4055: 85, 3993: 80, 3936: 75, 3874: 70, 3828: 65, + 3784: 60, 3744: 55, 3709: 50, 3680: 45, 3657: 40, 3634: 35, 3607: 30, 3571: 25, + 3529: 20, 3484: 15, 3430: 10, 3400: 0, } @@ -92,6 +92,9 @@ class _BatteryCfg(object): def __init__(self): self.ocv_map = _default_battery_ocv_map() self.ocv_volts = sorted(self.ocv_map.keys(), reverse=True) + self.charge_ocv_map = None # 充电曲线表(mV→SoC);None 时充电沿用冻结 SoC + self.charge_ocv_volts = None + self._chg_soc_peak = None # 充电期间 SoC 峰值,保证充电中单调不降 self.charge_full_mv = 4290 self.low_mv = 3699 self.empty_mv = 3629 @@ -113,10 +116,20 @@ class _BatteryCfg(object): self.empty_soc = cfg_int("BATTERY_EMPTY_SOC_PERCENT", 5) self._vbat_avg_len = cfg_int("VBATT_AVG_LEN", 10) or 10 self._vbat_push_min_ms = cfg_int("VBATT_PUSH_MIN_MS", 9000) or 9000 + # 充满判断参数(平台检测 + 最短充电时间) + self._chg_full_plateau_mv = cfg_int("VBATT_CHARGE_FULL_PLATEAU_MV", 15) or 15 + self._chg_full_plateau_n = cfg_int("VBATT_CHARGE_FULL_PLATEAU_N", 18) or 18 # 18×10s=3min + self._chg_full_min_ms = (cfg_int("VBATT_CHARGE_FULL_MIN_SEC", 600) or 600) * 1000 + self._chg_start_ms = 0 # 插 USB 时刻 + self._chg_v_history = [] # 充电电压历史(用于平台检测) _ocv_cfg = _parse_battery_ocv_map(cfg_attr("BATTERY_OCV_MAP", None)) if _ocv_cfg: self.ocv_map = _ocv_cfg self.ocv_volts = sorted(self.ocv_map.keys(), reverse=True) + _chg_cfg = _parse_battery_ocv_map(cfg_attr("BATTERY_CHARGE_OCV_MAP", None)) + if _chg_cfg: + self.charge_ocv_map = _chg_cfg + self.charge_ocv_volts = sorted(_chg_cfg.keys(), reverse=True) if cfg_bool("USE_SIMPLE_VBATT_THRESH", False): self.vbatt_simple = (self.charge_full_mv, self.low_mv, self.empty_mv) @@ -166,6 +179,9 @@ class _BatteryCfg(object): self._soc_frozen = max(0, min(100, int(s) if s is not None else 0)) elif self._soc_frozen is None: self._soc_frozen = 0 + self._chg_soc_peak = self._soc_frozen + self._chg_start_ms = utime.ticks_ms() + self._chg_v_history = [] self._vbat_buf = [] self._vbat_avg_mv = 0 self._vbat_last_push_ms = 0 @@ -174,6 +190,8 @@ class _BatteryCfg(object): self._vbat_avg_mv = 0 self._vbat_chg_last_mv = 0 self._vbat_last_push_ms = 0 + self._chg_soc_peak = None + self._chg_v_history = [] except Exception: pass @@ -219,9 +237,50 @@ class _BatteryCfg(object): def soc_from_vbatt(self, volt_mv): return _soc_from_vbatt_mv(volt_mv, self.ocv_map, self.ocv_volts, self.vbatt_simple) + def soc_from_vbatt_charge(self, volt_mv): + """充电曲线插值;未配置充电表返回 None。""" + if not self.charge_ocv_volts: + return None + return _soc_from_vbatt_mv(volt_mv, self.charge_ocv_map, self.charge_ocv_volts, None) + + def is_charge_full(self, v_chg): + """充满判断:电压达阈值 + 平台稳定(Δv n: + hist.pop(0) + # 最短充电时间门限 + elapsed = utime.ticks_diff(utime.ticks_ms(), int(self._chg_start_ms) or 0) + if elapsed < int(self._chg_full_min_ms): + return False + # 平台检测:窗口未满时不判满 + if len(hist) < n: + return False + plateau_mv = int(self._chg_full_plateau_mv) or 15 + return (max(hist) - min(hist)) <= plateau_mv + except Exception: + return False + def soc_now(self): - """放电:OCV 表 + 滑动平均;充电:冻结插 USB 前的 SoC,避免充电电压算成 100%。""" + """放电:OCV 表 + 滑动平均;充电:有充电表则按充电电压实时映射(单调不降),否则冻结插 USB 前 SoC。""" if self._usb_is_charging(): + if self.charge_ocv_volts: + sc = self.soc_from_vbatt_charge(self.get_vbatt_mv_charge()) + if sc is not None: + base = self._soc_frozen if self._soc_frozen is not None else 0 + peak = self._chg_soc_peak if self._chg_soc_peak is not None else base + cur = max(0, min(100, max(int(base), int(peak), int(sc)))) + self._chg_soc_peak = cur + return cur if self._soc_frozen is not None: return int(self._soc_frozen) return 100 @@ -338,10 +397,8 @@ class AI_hw_status(Abstract): self._usb = 1 if state == 1 else 0 if self._usb == 1 and prev != 1: self._charge_full_latched = 0 - self._charge_full_streak = 0 if self._usb == 0: self._charge_full_latched = 0 - self._charge_full_streak = 0 try: self._bcfg.on_usb_change(self._usb) except Exception: @@ -408,16 +465,10 @@ class AI_hw_status(Abstract): if getattr(self, "_charge_full_latched", 0) == 1: chg = "full" else: - if v_chg is not None and v_chg >= int(self._charge_full_mv): - self._charge_full_streak = int(getattr(self, "_charge_full_streak", 0)) + 1 - need = int(getattr(self, "_charge_full_streak_need", 2) or 2) - if self._charge_full_streak >= need: - self._charge_full_latched = 1 - chg = "full" - else: - chg = "charging" + if self._bcfg.is_charge_full(v_chg): + self._charge_full_latched = 1 + chg = "full" else: - self._charge_full_streak = 0 chg = "charging" soc = None try: