From 16ff36c10bc7f631bbafadbd73be7712a07972ff Mon Sep 17 00:00:00 2001
From: stark1898y <1658608470@qq.com>
Date: Sun, 15 Dec 2024 15:34:51 +0800
Subject: [PATCH] =?UTF-8?q?float=E6=89=93=E5=8D=B0=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=EF=BC=8C=E5=8F=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.cproject | 6 +++---
.settings/org.eclipse.core.resources.prefs | 1 +
APP/peripheral_main.c | 16 +++++++++++-----
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/.cproject b/.cproject
index 328c437..74bb70a 100644
--- a/.cproject
+++ b/.cproject
@@ -45,7 +45,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -105,6 +105,7 @@
+
@@ -172,5 +173,4 @@
-
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 00dd478..6827126 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
+encoding//APP/peripheral_main.c=UTF-8
encoding//BSP/inc/bsp_valve.h=UTF-8
encoding//BSP/src/bsp_valve.c=UTF-8
encoding//common/letter-shell/extensions/log/log.h=UTF-8
diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c
index b70f54f..2e46b03 100644
--- a/APP/peripheral_main.c
+++ b/APP/peripheral_main.c
@@ -3,7 +3,7 @@
* Author : WCH
* Version : V1.1
* Date : 2020/08/06
- * Description : ӻӦϵͳʼ
+ * Description : 外设从机应用主函数及任务系统初始化
*********************************************************************************
* Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd.
* Attention: This software (modified or not) and binary are used for
@@ -11,7 +11,7 @@
*******************************************************************************/
/******************************************************************************/
-/* ͷļ */
+/* 头文件包含 */
#include "CONFIG.h"
#include "HAL.h"
#include "gattprofile.h"
@@ -41,7 +41,7 @@ const uint8_t MacAddr[6] = {0x84, 0xC2, 0xE4, 0x03, 0x02, 0x02};
/*********************************************************************
* @fn Main_Circulation
*
- * @brief ѭ
+ * @brief 主循环
*
* @return none
*/
@@ -122,7 +122,7 @@ __attribute__((noinline)) void Main_Circulation()
/*********************************************************************
* @fn main
*
- * @brief
+ * @brief 主函数
*
* @return none
*/
@@ -144,10 +144,11 @@ int main(void)
// UART1_DefInit();
- // ij1500000
+ // 改成1500000波特率了
BSP_UART1_Init(1500000);
// logDebug("Start @ChipID=%02X\n", R8_CHIP_ID);
logDebug("Start @ChipID=%02X\n", R8_CHIP_ID);
+ logError("中文测试 %2.2f", 123.456);
#endif
DelayMs(1000 * 3);
@@ -162,7 +163,12 @@ int main(void)
BSP_ADC_Init();
CH59x_BLEInit();
+
logDebug("%s\n", VER_LIB);
+ uint8_t MacAddr[6];
+ GetMACAddress(MacAddr);
+ logDebug("MacAddr: %02X:%02X:%02X:%02X:%02X:%02X", MacAddr[0], MacAddr[1], MacAddr[2], MacAddr[3], MacAddr[4], MacAddr[5]);
+
HAL_Init();
GAPRole_PeripheralInit();
Peripheral_Init();