From 48c1fc2c7a0ecef229c98345f111a34883027bc7 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 7 Nov 2023 22:15:08 +0800 Subject: [PATCH] update --- README.md | 11 +++++++++-- sdk | 2 +- usrc/main.cpp | 13 ++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1162182..a05a66c 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,20 @@ ref:https://iflytop1.feishu.cn/wiki/PbUHwG2o6ikWagkmsiqcTFwAnjp 加热片测试: 1. 板子输出信号: + 加热片1 PE9 -->TEC1_IN1-->R50 PE10-->TEC1_IN2-->R51 PB2 -->TEC1_SLEEP-->R53 - + 加热片2 PE13-->TEC2_IN1-->R80 PE14-->TEC2_IN2-->R81 PB13-->TEC2_SLEEP->R83 - 2. + 风扇1/2: + PA2->FAN_PWM1->R157/R159->J18-4/J19-4 + PC4->FAN_POWER1->R154/R155->J18-1/J19-1 + 风扇3/4: + PA3->FAN_PWM2->R169/R170->FAN2/3_PWM_OUT->J21-4 J20-4 + PC5->FAN_POWER2->R165/R166->J20-1/J21-1 + 水泵: ``` \ No newline at end of file diff --git a/sdk b/sdk index 95bf191..a41640a 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 95bf1917c6b821b815a92bdb5c3d983759c92453 +Subproject commit a41640afe9d4f8e990c13c769238e1a79940fc88 diff --git a/usrc/main.cpp b/usrc/main.cpp index 1420a49..94c0a14 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -79,12 +79,13 @@ void initmodule() { * 风扇配置 * *******************************************************************************/ PWMSpeedCtrlModule::config_t fan0cfg = { + .name = "fan0", .pwm_cfg = { .name = "fan0pwmtimer", .htim = &htim2, .freq = TIMER2_FREQ, - .polarity = true, + .polarity = false, }, .nfan = 2, .fan0Channel = {3, 0, 0, 0}, @@ -101,16 +102,17 @@ void initmodule() { .mirror = false, }, }, - .enablefbcheck = true, + .enablefbcheck = false, .enableTrace = true, }; PWMSpeedCtrlModule::config_t fan1cfg = { + .name = "fan1", .pwm_cfg = { .name = "fan1pwmtimer", .htim = &htim2, .freq = TIMER2_FREQ, - .polarity = true, + .polarity = false, }, .nfan = 2, .fan0Channel = {4, 0, 0, 0}, @@ -127,7 +129,7 @@ void initmodule() { .mirror = false, }, }, - .enablefbcheck = true, + .enablefbcheck = false, .enableTrace = true, }; @@ -135,12 +137,13 @@ void initmodule() { * 水泵配置 * *******************************************************************************/ PWMSpeedCtrlModule::config_t pumpcfg = { + .name = "pump", .pwm_cfg = { .name = "pumptime", .htim = &htim2, .freq = TIMER2_FREQ, - .polarity = true, + .polarity = false, .calltrace = true, }, .nfan = 1,