From: penglei <1624952103@qq.com> Date: Sat, 8 Nov 2025 08:37:09 +0000 (+0800) Subject: 修改272 ppg上电pin配置,优化hx3508表冠配置 X-Git-Tag: V1.0.9_20251128_194606_LN~99 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ced62e5303ab7ae27f0d1c9324cc189f946d7521;p=mirrors%2FFD230.git 修改272 ppg上电pin配置,优化hx3508表冠配置 --- diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 418c8a497..ad28455bc 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -1158,6 +1158,8 @@ target = { 'DISABLE_UART_LOG', 'CONFIG_GNSS_UART_WITH_FLOWCTRL', # 'DOWNLOAD_GNSS_SWITCH', + 'PPG_HX3695', + 'ROTARYENCODER_HX3508', ], #添加自定义应用 'ram_component': [ diff --git a/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c b/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c index 8fef223ac..b7a8c4faf 100644 --- a/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c +++ b/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-03-13 15:08:38 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-11-04 12:08:12 + * @LastEditTime: 2025-11-08 15:16:35 * @FilePath: /FD230/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hal.c * @Description: * @@ -46,9 +46,9 @@ #ifdef BOARD_FD272 // S_AGPIO_L26 心率复位 PPG reset -#define GPIO_PIN_PRG_RESET S_AGPIO_L26 +#define GPIO_PIN_PRG_RESET S_AGPIO_L19 // S_AGPIO_R0 PRG_LED_POWER ON 心率等电源控制脚 -#define GPIO_PIN_PRG_LED_ON S_AGPIO_L3 +#define GPIO_PIN_PRG_LED_ON S_AGPIO_L17 #else diff --git a/code/sdk/zhihui/drivers/rotary_encoder/CMakeLists.txt b/code/sdk/zhihui/drivers/rotary_encoder/CMakeLists.txt index 8fbccd694..d7f413f92 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/CMakeLists.txt +++ b/code/sdk/zhihui/drivers/rotary_encoder/CMakeLists.txt @@ -19,7 +19,7 @@ SUPPORT_AT_HX3507 elseif("ROTARYENCODER_HX3508" IN_LIST DEFINES) set(SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/hx3508/tyhx_OTS_hx3508_custom.c + ${CMAKE_CURRENT_SOURCE_DIR}/hx3508/hx3508.c ${CMAKE_CURRENT_SOURCE_DIR}/hx3508/hx3508_hal.c ${CMAKE_CURRENT_SOURCE_DIR}/hx3508/hx3508_at_cmd.c ) diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507.c index 18a0955d2..8c76337e1 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507.c +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507.c @@ -602,5 +602,41 @@ int16_t hx3507_get_crown_result(void) return resulttemp; } +void hx3507_get_chip_id(uint16_t *id) +{ + int i; + + uapi_gpio_set_dir(PIN_TYHX_SDIO,GPIO_DIRECTION_OUTPUT); + // uapi_pin_set_pull(PIN_TYHX_SDIO, (pin_pull_t)HAL_PIO_PULL_UP); + // uapi_pin_set_ie(PIN_TYHX_SDIO,HAL_PIO_IE_ENBALE); + uapi_gpio_set_val(PIN_TYHX_SDIO,GPIO_LEVEL_LOW); + + uapi_gpio_set_dir(PIN_TYHX_SCLK,GPIO_DIRECTION_OUTPUT); + // uapi_pin_set_ie(PIN_TYHX_SCLK,HAL_PIO_IE_DISABLE); + uapi_gpio_set_val(PIN_TYHX_SCLK,GPIO_LEVEL_LOW); + + LOS_Udelay(COM_DELAY); + crown_com_resync(); + for(i=0; i<10; i++) + { + if(crown_read_reg(HX3507_DID) == 0x30) + { + TYHX_LOG("read chip id is 0x30\r\n",i); + *id = 0x30; + break; + } + if(i<7)//读到ID不对, 复位通信 + { + crown_com_resync(); + } + } + if(i==10) + { + TYHX_LOG("HX3507 communication err, please check\r\n"); + return; + } +} + + // #endif diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507_hal.h b/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507_hal.h index 926b00662..552d28ce1 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507_hal.h +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3507/hx3507_hal.h @@ -22,7 +22,7 @@ extern "C" { void *rotary_encoder_get_hx3507_api(void); void *rotary_encoder_get_hx3507_peri_attr(void); - +void hx3507_get_chip_id(uint16_t *id); #ifdef __cplusplus #if __cplusplus } diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/tyhx_OTS_hx3508_custom.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c similarity index 90% rename from code/sdk/zhihui/drivers/rotary_encoder/hx3508/tyhx_OTS_hx3508_custom.c rename to code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c index e695aee35..fd422189e 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/tyhx_OTS_hx3508_custom.c +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c @@ -21,11 +21,12 @@ #include #include #include -#include "tyhx_OTS_hx3508_custom.h" +#include "hx3508.h" #include "cmsis_os2.h" #include "custom_utils.h" #include "hal_gpio.h" #include "pinctrl_porting.h" +#include "hx3508_hal.h" // #include "tyhx_hrs_custom.h" //平台头文件包含定义 #ifdef NORDIC_SDK @@ -45,6 +46,8 @@ //custom to do here #endif //NORDIC_SDK +#define HX3508_I2C_BUS I2C_BUS_2 + #define HAISI_SDK #ifdef CHIP_HX3508 @@ -54,6 +57,9 @@ void ots_timer_handler(void * p_context); #define REPORT_MIN 2 // 这个是最小上报角度, 按照平均值预估的值, 由客户定义, 看多大的数据上报给UI处理一次 + +#define POWER_3V3_PIN S_AGPIO_L17 + static int16_t ots_result = 0;//ots结果 static int16_t stand_still = 1; //静止标志 1 静止,0 转动 @@ -61,8 +67,24 @@ bool ots_timer_running = false; //ots定时器是否运行标志 static osTimerId_t g_hx3508_timer = NULL; +extern encoder_callback g_encoder_callback; + /*--------以下为定时函数相关定义 建立/启动/停止定时器//定时中断处理-----------*/ + + +static void report_zero_data_for_start_stop_flag(void) +{ + + ots_result = 0; + TYHX_LOG("report_zero_data_for_start_stop_flag crown_result = %d, \r\n",ots_result); + if (g_encoder_callback != NULL) + g_encoder_callback(); + else + TYHX_LOG("no call back crown_result = %d\r\n",ots_result); +} + + /** * OTS 定时器创建函数 * @param NULL @@ -427,8 +449,8 @@ uint8_t ots_read_reg(uint8_t regaddr) uint8_t data_buf = 0; //add by user, i2c read function // tyhx_read_regs(I2C_DEV_7ADDR,regaddr,&data_buf,1); - // custom_i2c_read_regs(I2C_DEV_7ADDR,regaddr,1,&data_buf,1,hx3508_I2C_BUS); - data_buf = crown_read_reg(I2C_DEV_7ADDR,regaddr); + custom_i2c_read_regs(I2C_DEV_7ADDR,regaddr,1,&data_buf,1,HX3508_I2C_BUS); + // data_buf = crown_read_reg(I2C_DEV_7ADDR,regaddr); return data_buf; //返回读到的寄存器值 } @@ -437,7 +459,8 @@ void ots_write_reg(uint8_t regaddr, uint8_t regvalue) { //add by user, i2c write function // tyhx_write_reg(I2C_DEV_7ADDR,regaddr,®value); - crown_write_reg(I2C_DEV_7ADDR,regaddr,regvalue); + // crown_write_reg(I2C_DEV_7ADDR,regaddr,regvalue); + custom_i2c_write_reg(I2C_DEV_7ADDR,regaddr,1,®value,1,HX3508_I2C_BUS); return; } @@ -457,13 +480,28 @@ void ots_data_handler(void *p_event_data, uint16_t event_size) deltax = ots_read_reg(RA_ACC_DELTA_X_LOW) |(ots_read_reg(RA_ACC_DELTA_X_HIG)<<8); deltay = ots_read_reg(RA_ACC_DELTA_Y_LOW) |(ots_read_reg(RA_ACC_DELTA_Y_HIG)<<8); TYHX_LOG("Deltay = %d \r\n",deltay);//djd0305 + + if (stand_still == 1) + { + //上次是静止,上报状态改变 + report_zero_data_for_start_stop_flag(); + } + stand_still = 0; + //用户添加程序, deltay 是表冠产生数据, 上报给UI, 如果需要数据变化, // 积攒到一定值再上报UI, 可以调用 ots_result_deal()函数处理. + ots_result_deal(deltax); } else - { - stand_still = 1; + { + if (stand_still == 0) + { + //上次是转动,上报状态改变 + report_zero_data_for_start_stop_flag(); + } + stand_still = 1; + //debug的时候, 可能用到, 看一下图像质量 TYHX_LOG("pic qulity =%d, agc num=%d\r\n",ots_read_reg(RA_DATA_2AGC),ots_read_reg(RA_EXP_NUM_SEL)&0x7F); } @@ -567,16 +605,24 @@ void crown_com_resync(void) void ots_init(void) { //此时要保证芯片已经正常上电 - uapi_gpio_set_dir(PIN_TYHX_SDIO,GPIO_DIRECTION_OUTPUT); + // uapi_gpio_set_dir(PIN_TYHX_SDIO,GPIO_DIRECTION_OUTPUT); - uapi_gpio_set_val(PIN_TYHX_SDIO,GPIO_LEVEL_LOW); + // uapi_gpio_set_val(PIN_TYHX_SDIO,GPIO_LEVEL_LOW); - uapi_gpio_set_dir(PIN_TYHX_SCLK,GPIO_DIRECTION_OUTPUT); + // uapi_gpio_set_dir(PIN_TYHX_SCLK,GPIO_DIRECTION_OUTPUT); - uapi_gpio_set_val(PIN_TYHX_SCLK,GPIO_LEVEL_LOW); + // uapi_gpio_set_val(PIN_TYHX_SCLK,GPIO_LEVEL_LOW); - uapi_tcxo_delay_us(COM_DELAY); + // uapi_tcxo_delay_us(COM_DELAY); // crown_com_resync(); + + custom_i2c_init(I2C_BUS_2); + + uapi_gpio_set_dir(POWER_3V3_PIN,GPIO_DIRECTION_OUTPUT); + uapi_gpio_set_val(POWER_3V3_PIN,GPIO_LEVEL_HIGH); + + LOS_Mdelay(20); + int i; for(i=0; i<10; i++)//重复读DEVICE ID 是否等于0X35 { @@ -787,11 +833,10 @@ void ots_result_deal(int16_t x) ots_result-=1; // } } - // if(abs(ots_result)>=REPORT_MIN)//最小的值由用户定义, 就是得到值大于一定的值, 再上报UI - // { - // //OTS结果上报UI, 因为这里是定时读取的函数, 可以把结果上报 - // ots_result = 0; - // } + + if (g_encoder_callback != NULL) + g_encoder_callback(); + } int16_t hx3508_get_stand_still(void) @@ -807,6 +852,34 @@ int16_t hx3508_get_crown_result(void) return resulttemp; } +void hx3508_get_chip_id(uint16_t *id) +{ + int i; + for(i=0; i<10; i++)//重复读DEVICE ID 是否等于0X35 + { + if(ots_read_reg(RA_DEFINE_PART_ID) == 0x35) + { + TYHX_LOG("read chip id is 0x35\r\n",i); + *id = 0x35; + break; + } + else + { + TYHX_LOG("read chip id is 0x%x\r\n",ots_read_reg(RA_DEFINE_PART_ID)); + } + // if(i<7)//读到ID不对, 复位通信 + // { + // crown_com_resync(); + // } + + } + if(i==10) + { + TYHX_LOG("hx3508 communication err, please check\r\n"); + return; + } +} + #else //其他平台,由用户自行添加上面对应的程序 //custom to do here diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/tyhx_OTS_hx3508_custom.h b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.h similarity index 99% rename from code/sdk/zhihui/drivers/rotary_encoder/hx3508/tyhx_OTS_hx3508_custom.h rename to code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.h index 2fed13dff..e91575dee 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/tyhx_OTS_hx3508_custom.h +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.h @@ -6,7 +6,7 @@ */ /*************************************************************************** - * @file TYHX_OTS_hx3508_CUSTOM.h + * @file hx3508.h * @author TYHX team * @product saker * @version V0.1 @@ -188,6 +188,6 @@ bool ots_factory_test(void); int16_t hx3508_get_crown_result(void); int16_t hx3508_get_stand_still(void); - +void hx3508_get_chip_id(uint16_t *id); #endif //_TYHX__OTS_hx3508_CUSTOM_H diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_at_cmd.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_at_cmd.c index 6fc395374..bc906c782 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_at_cmd.c +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_at_cmd.c @@ -13,7 +13,7 @@ #include "at_cmd_api.h" #include "pm_control.h" #include "debug_print.h" -#include "tyhx_OTS_hx3508_custom.h" +#include "hx3508.h" #include "custom_utils.h" diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.c index 3a909b7ad..76cf13198 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.c +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.c @@ -1,6 +1,6 @@ #include "at_cmd_api.h" #include "pm_control.h" -#include "tyhx_OTS_hx3508_custom.h" +#include "hx3508.h" #include "rotary_encoder_def.h" #include "i2c.h" #include "debug_print.h" diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.h b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.h index 740d4f325..cd96b71f8 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.h +++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.h @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-12-23 15:11:25 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-01-02 19:43:35 + * @LastEditTime: 2025-11-08 15:42:17 * @FilePath: /sdk615/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508_hal.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE; */ @@ -30,6 +30,7 @@ extern "C" { void *rotary_encoder_get_hx3508_api(void); void *rotary_encoder_get_hx3508_peri_attr(void); +void hx3508_get_chip_id(uint16_t *id); #ifdef __cplusplus #if __cplusplus diff --git a/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c b/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c index cabc675d8..1833759c5 100644 --- a/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c +++ b/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c @@ -17,6 +17,8 @@ #include "mixo_hal.h" #elif defined ROTARYENCODER_HX3507 #include "hx3507_hal.h" +#elif defined ROTARYENCODER_HX350 +#include "hx350_hal.h" #endif // #if defined(TPTYPE_TMA525B) @@ -423,6 +425,9 @@ uint32_t re_init(void) #elif defined ROTARYENCODER_MIXO g_encoder_drv.private_data = rotary_encoder_get_mixo_peri_attr(); g_encoder_drv.encoder_api = rotary_encoder_get_mixo_api(); +#elif ROTARYENCODER_HX3508 + g_encoder_drv.private_data = rotary_encoder_get_hx3508_peri_attr(); + g_encoder_drv.encoder_api = rotary_encoder_get_hx3508_api(); #endif g_encoder_drv.ops = &g_re_status_ops; redd = rotary_encoder_get_driver_data(); @@ -465,6 +470,8 @@ void rotary_encoder_suspend(void) encoder_ptr = rotary_encoder_get_hx3507_api(); #elif defined ROTARYENCODER_MIXO encoder_ptr = rotary_encoder_get_mixo_api(); +#elif defined ROTARYENCODER_HX3508 + encoder_ptr = rotary_encoder_get_hx3508_api(); #endif if(encoder_ptr == NULL) return; @@ -480,6 +487,8 @@ void rotary_encoder_resume(void) encoder_ptr = (encoder_peripheral_api*)rotary_encoder_get_hx3507_api(); #elif defined ROTARYENCODER_MIXO encoder_ptr = (encoder_peripheral_api*)rotary_encoder_get_mixo_api(); +#elif defined ROTARYENCODER_HX3508 + encoder_ptr = (encoder_peripheral_api*)rotary_encoder_get_hx3508_api(); #endif if(encoder_ptr == NULL) return; @@ -511,10 +520,10 @@ void rotary_encoder_restart(void) void rotary_get_chip_id(uint16_t *id) { #ifdef ROTARYENCODER_HX3507 -#if FD230_650_0723 //需要改 - crown_read_id(id); -#endif + hx3507_get_chip_id(id); #elif defined ROTARYENCODER_MIXO mixo_get_chip_id(id); +#elif defined ROTARYENCODER_HX3508 + hx3508_get_chip_id(id); #endif } \ No newline at end of file diff --git a/code/sdk/zhihui/utils/custom_utils_at_cmd.c b/code/sdk/zhihui/utils/custom_utils_at_cmd.c index ba5a9c793..3cb8ce0f3 100644 --- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c +++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c @@ -481,9 +481,11 @@ static uint32_t custom_battery_getpower(uint8_t *para, uint32_t paraLen, char *s UNUSED(strCommonCmd); #ifdef SUPPORT_BATTERY_SERVICE float vol = 0; + float temp = 0; uint8_t percent = battery_get_voltage(&vol); uint8_t charge = get_charge_stat(); - printf("fac:voltage : %.3f , percent %d , charge : %d\r\n",vol,percent,charge); + battery_get_battery_temp(&temp); + printf("fac:voltage : %.3f , percent %d , temp : %.3f, charge : %d\r\n",vol,percent,temp,charge); #endif return ERRCODE_SUCC;