From 8f4c0881d6f4c8bacb3c947a0ec71f81df76a2c7 Mon Sep 17 00:00:00 2001
From: Lizongdi <1210855344@qq.com>
Date: Mon, 15 Jun 2026 10:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E5=BC=80CAN?=
 =?UTF-8?q?=E5=B0=B1=E5=8D=A1=E6=AD=BB=E9=97=AE=E9=A2=98=EF=BC=8C=E6=A0=B9?=
 =?UTF-8?q?=E5=9B=A0=E6=98=AF=E5=8F=91=E9=80=81=E9=95=BF=E5=BA=A6=E5=B7=A6?=
 =?UTF-8?q?=E7=A7=BB=E4=BA=8616=E4=BD=8D=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E8=B6=8A=E7=95=8C=EF=BC=9B=E5=B9=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9CAN=E6=B3=A2=E7=89=B9=E7=8E=87=E4=B8=BA500k?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 32g431.ioc        | 14 ++++++++++----
 CMakePresets.json |  1 +
 Core/Src/fdcan.c  |  6 +++---
 robot             |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/32g431.ioc b/32g431.ioc
index 0eaf9ef..7b83866 100644
--- a/32g431.ioc
+++ b/32g431.ioc
@@ -21,10 +21,16 @@ Dma.USART1_TX.0.SyncEnable=DISABLE
 Dma.USART1_TX.0.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
 Dma.USART1_TX.0.SyncRequestNumber=1
 Dma.USART1_TX.0.SyncSignalID=NONE
-FDCAN1.CalculateBaudRateNominal=2083333
-FDCAN1.CalculateTimeBitNominal=480
-FDCAN1.CalculateTimeQuantumNominal=160.0
-FDCAN1.IPParameters=CalculateTimeQuantumNominal,CalculateTimeBitNominal,CalculateBaudRateNominal
+FDCAN1.CalculateBaudRateNominal=500000
+FDCAN1.CalculateTimeBitNominal=2000
+FDCAN1.CalculateTimeQuantumNominal=100.0
+FDCAN1.DataTimeSeg1=1
+FDCAN1.DataTimeSeg2=1
+FDCAN1.IPParameters=CalculateTimeQuantumNominal,CalculateTimeBitNominal,CalculateBaudRateNominal,Mode,NominalPrescaler,NominalTimeSeg1,NominalTimeSeg2,DataTimeSeg1,DataTimeSeg2
+FDCAN1.Mode=FDCAN_MODE_NORMAL
+FDCAN1.NominalPrescaler=10
+FDCAN1.NominalTimeSeg1=15
+FDCAN1.NominalTimeSeg2=4
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
diff --git a/CMakePresets.json b/CMakePresets.json
index b782d73..201a630 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -31,6 +31,7 @@
         "BUILD_BSPMCU": "ON",
         "BUILD_SPOOLEND": "ON",
         "MEM_POOL_TOTAL_SIZE": "8*1024",
+        "CONFIG_CAN_NEW_VERSION": "1",
         "USE_UART": true,
         "USE_PRINT": true,
         "PRINT_ID": "1",
diff --git a/Core/Src/fdcan.c b/Core/Src/fdcan.c
index 1c1823c..bbd543f 100644
--- a/Core/Src/fdcan.c
+++ b/Core/Src/fdcan.c
@@ -44,10 +44,10 @@ void MX_FDCAN1_Init(void)
   hfdcan1.Init.AutoRetransmission = DISABLE;
   hfdcan1.Init.TransmitPause = DISABLE;
   hfdcan1.Init.ProtocolException = DISABLE;
-  hfdcan1.Init.NominalPrescaler = 16;
+  hfdcan1.Init.NominalPrescaler = 10;
   hfdcan1.Init.NominalSyncJumpWidth = 1;
-  hfdcan1.Init.NominalTimeSeg1 = 1;
-  hfdcan1.Init.NominalTimeSeg2 = 1;
+  hfdcan1.Init.NominalTimeSeg1 = 15;
+  hfdcan1.Init.NominalTimeSeg2 = 4;
   hfdcan1.Init.DataPrescaler = 1;
   hfdcan1.Init.DataSyncJumpWidth = 1;
   hfdcan1.Init.DataTimeSeg1 = 1;
diff --git a/robot b/robot
index 25ecd88..cb9e296 160000
--- a/robot
+++ b/robot
@@ -1 +1 @@
-Subproject commit 25ecd887967077edda62cdbf46c9b63eff5cf17a
+Subproject commit cb9e2962ff29da185602fa9baaaaae02bffc17d9