wangfq/DLD110SV4B
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

variation int16_t -> int32_t, BLE上报2字节->3字节，去掉±32767截断

Browse Source
This commit is contained in:
wangfq
2026-07-20 08:34:29 +08:00
parent e3a27af24f
commit 26fdfe7cd3
3 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BLE/DLD110S_Peripheral_28K/APP/include/storage.h
+20 -20
View File
@@ -39,20 +39,20 @@
typedef struct _Loop_Sample_CNG_
{
uint8_t flag;
uint16_t max_amplitude; // 最大幅值
uint16_t max_amplitude; // ����ֵ
}Loop_Sample_Cng;
typedef struct _Loop_Balance_Ori_CNG_
{
uint8_t flag;
uint16_t max_cnt ; // 最大补偿次数
}Loop_Balance_Ori_Cng; // 漂移补偿
uint16_t max_cnt ; // ��󲹳�����
}Loop_Balance_Ori_Cng; // Ư�Ʋ���
typedef struct _Loop_Release_Ori_PlanB_
{
uint8_t flag_weight;
uint16_t max_amplitude; //最大幅值
uint8_t timeout; // 单位：分钟
uint16_t max_amplitude; //����ֵ
uint8_t timeout; // �������
}Loop_Release_Ori_PlanB;
typedef struct _Loop_Release_Change_Rate_
@@ -77,13 +77,13 @@ extern Loop_Balance_PlanB g_loop_balance_planB;
typedef struct
{
uint8_t sensitvity; // 高四位表示灵敏度的数量，低四位表示当前灵敏度的序号（从0开始）
uint8_t sensitvity; // ����λ��ʾ�����ȵ�����������λ��ʾ��ǰ�����ȵ���ţ���0��ʼ��
uint8_t delay_time;
uint8_t output_mode;
uint8_t direction_mode; // 方向判别模式，0 触发模式， 非0 表示方向判别模式
uint8_t loopFreq_Level; // 高低频
uint8_t loopSafe_Timeout; // 线圈安全模式， 0表示关闭，非0表示开启，以10秒为单位
uint8_t exist_mode; // 0 永久存在，非0，表示有限存在的时间，单位为10秒
uint8_t direction_mode; // �����б�ģʽ��0 ����ģʽ�� ��0 ��ʾ�����б�ģʽ
uint8_t loopFreq_Level; // �ߵ�Ƶ
uint8_t loopSafe_Timeout; // ��Ȧ��ȫģʽ�� 0��ʾ�رգ���0��ʾ��������10��Ϊ��λ
uint8_t exist_mode; // 0 ���ô��ڣ���0����ʾ���޴��ڵ�ʱ�䣬��λΪ10��
}Loop_Cng_Unit;
extern Loop_Cng_Unit g_loop_cng_unit;
@@ -105,7 +105,7 @@ extern Loop_Sens_List g_loop_sens_list;
typedef struct _DBN_BLE_STATE_
{
uint8_t flag; // if need to report
uint8_t enable; // 是否使能
uint8_t enable; // �Ƿ�ʹ��
uint8_t send_flag;
uint8_t obj_amount;
uint8_t cmd;
@@ -126,18 +126,18 @@ extern DBN_BLE_State g_dbn_ble_state_acs_enable;
typedef enum
{
SENS_NONE = 0,
SENS_SUB_INFO = 1, // 传感器设备信息
SENS_OBJ_DYNAMIC = 2, // 动态目标类型
SENS_SOUTPUT_STATUS = 3, // 当前开关量输出的状态
SENS_DETAIL_CNG = 4, // 详细配置
SENS_LOOP_DYNAMIC = 5, // 线圈动态信息
SENS_SUB_INFO = 1, // �������豸��Ϣ
SENS_OBJ_DYNAMIC = 2, // ��̬Ŀ������
SENS_SOUTPUT_STATUS = 3, // ��ǰ�����������״̬
SENS_DETAIL_CNG = 4, // ��ϸ����
SENS_LOOP_DYNAMIC = 5, // ��Ȧ��̬��Ϣ
SENS_OBJ_BackGround = 6, //
SENS_OBJ_INSIDE = 7, //
SENS_LOOP_TREND,
SENS_OBJ_DYNAMIC_SIMPLE,
SENS_OBJ_STATIC_XuJing, //10, 0x0A
SENS_DOBULE_LOOP_ESTIMATE //0x0B, 线圈环境评估
} SUB_SENS_TYPE; // 传感数据类型
SENS_DOBULE_LOOP_ESTIMATE //0x0B, ��Ȧ��������
} SUB_SENS_TYPE; // ������������
@@ -163,7 +163,7 @@ typedef struct _LOOP_ACS_INFO
uint8_t flag_change;
uint32_t frequent;
uint32_t loop_capvd;
int16_t variation;
int32_t variation;
uint32_t event_counter;
uint32_t report_counter;
} Loop_ACS_Info;
@@ -174,7 +174,7 @@ extern Loop_ACS_Info g_loop_acs_info;
#define HOLD_TIME 5*1200
#define LC_HOLD_TIME 4*1200 //时间4分钟
#define LC_HOLD_TIME 4*1200 //ʱ��4����
#define IN_DELAY 10
#define OUT_DELAY 39
#define PLUSE_DELAY 10