From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
keil/include/drivers/mk_acmp.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/keil/include/drivers/mk_acmp.c b/keil/include/drivers/mk_acmp.c
index 30400ab..5a5d6b3 100644
--- a/keil/include/drivers/mk_acmp.c
+++ b/keil/include/drivers/mk_acmp.c
@@ -44,26 +44,26 @@
{
.irq = ACMP0_IRQn,
.config =
- {
- .channel_p = ACMP_EXTPIN5,
- .channel_n = ACMP_EXTPIN6,
- .int_en = true,
- .edge_int = ACMP_BOTHEDGE_INT,
- .hyst_en = true,
- .callback = NULL,
- },
+ {
+ .channel_p = ACMP_EXTPIN5,
+ .channel_n = ACMP_EXTPIN6,
+ .int_en = true,
+ .edge_int = ACMP_BOTHEDGE_INT,
+ .hyst_en = true,
+ .callback = NULL,
+ },
},
{
.irq = ACMP1_IRQn,
.config =
- {
- .channel_p = ACMP_EXTPIN5,
- .channel_n = ACMP_EXTPIN6,
- .int_en = true,
- .edge_int = ACMP_BOTHEDGE_INT,
- .hyst_en = true,
- .callback = NULL,
- },
+ {
+ .channel_p = ACMP_EXTPIN5,
+ .channel_n = ACMP_EXTPIN6,
+ .int_en = true,
+ .edge_int = ACMP_BOTHEDGE_INT,
+ .hyst_en = true,
+ .callback = NULL,
+ },
},
};
--
Gitblit v1.9.3