From 90b5cc202650b0a015b84e9f28dff650005182ac Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 28 Aug 2024 11:26:58 +0800 Subject: [PATCH] v1 --- README.md | 36 +-------------------------------- app/src/acid_dispenser_ble_slave_main.c | 2 +- app/src/aproject_config/config.h | 6 +----- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index e1a01b0..e6e0a8d 100644 --- a/README.md +++ b/README.md @@ -6,43 +6,9 @@ build_app.bat build_bootloader.bat 编译bootloader flash_with_id.bat 烧录程序携带ID -############################################################################# -//休眠 -//不休眠 -//状态机 - 两个状态 - 休眠 - 不休眠 - -static bool sleep; -static bool work; -static int mode; -static bool pumpworkstate; -static connected; -active ble; - -一个状态 - updateState(); -离线休眠状态 - 关机不广播 - -离线广播状态 - 按下按键亮红灯,广播 +V1.0 -连接状态 - 低电量事件 - 触发警告灯 - 工作 - 非工作 - 模式1 - 模式2 - 未定义状态 - -连接状态休眠 - 关灯,不关广播 - -############################################################################### ``` diff --git a/app/src/acid_dispenser_ble_slave_main.c b/app/src/acid_dispenser_ble_slave_main.c index d65bbc6..b38ba55 100644 --- a/app/src/acid_dispenser_ble_slave_main.c +++ b/app/src/acid_dispenser_ble_slave_main.c @@ -216,7 +216,7 @@ void pre_process_state(app_event_t* event, uint16_t event_size) { static int32_t cnt; if (eventType == kappevent_tmr_1s_scheduler_event) { - ZLOGI("scheduler....."); + // ZLOGI("scheduler....."); if (cnt % 10 == 0 && zble_module_is_connected()) { send_report_heart(battery_mgr_get_battery_level(), zapp_get_gstate()->reset_flag, 1); } diff --git a/app/src/aproject_config/config.h b/app/src/aproject_config/config.h index 16452c6..34ba393 100644 --- a/app/src/aproject_config/config.h +++ b/app/src/aproject_config/config.h @@ -1,15 +1,11 @@ #pragma once -/*********************************************************************************************************************** - * 璁惧淇℃伅閰嶇疆 * - ***********************************************************************************************************************/ - #define CATEGORY "AciDisp" // #define MANUFACTURER_NAME "iflytop" #define FIRMWARE_VERSION (1) #define BLESTACK_VERSION (1) #define BOOTLOADER_VERSION (1) -#define HARDWARE_VERSION (2) +#define HARDWARE_VERSION (1) #define APP_COMPANY_IDENTIFIER 0xFFFF