瀏覽代碼

添加can协议,同时有uart和can通讯

CN\houcf5 7 月之前
父節點
當前提交
f497edffbb

+ 1 - 0
.ccsproject

@@ -17,4 +17,5 @@
 	<sourceLookupPath value="${COM_TI_MSPM0_SDK_INSTALL_DIR}/source/ti/driverlib"/>
 	<filesToOpen value="empty.syscfg,README.md"/>
 	<isTargetManual value="false"/>
+	<origin value="E:/yejin/empty_LP_MSPM0G3507_APP_Normal_1230"/>
 </projectOptions>

+ 25 - 0
.gitignore

@@ -0,0 +1,25 @@
+# IAR settings
+settings/**
+
+# IAR debug files
+DEBUG/**
+
+Release/**
+
+# IAR project files
+/*.dep
+/*.ewd
+/*.ewt
+/~*
+
+# VS code settings
+.vscode/**
+.vs/
+
+# Xmake cache
+.xmake/
+build/
+
+# Generated Fingerprint File
+fp.def
+/Debug/

文件差異過大導致無法顯示
+ 17 - 0
.launches/empty_LP_MSPM0G3507_APP_Normal_20250107.launch


+ 1 - 1
.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>empty_LP_MSPM0G3507_APP_Normal_1230</name>
+	<name>empty_LP_MSPM0G3507_APP_Normal_20250107</name>
 	<comment></comment>
 	<projects>
 	</projects>

+ 0 - 2
.settings/org.eclipse.core.resources.prefs

@@ -44,9 +44,7 @@ encoding//Debug/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/subdir_vars.mk=U
 encoding//Debug/JSCOPE/subdir_rules.mk=UTF-8
 encoding//Debug/JSCOPE/subdir_vars.mk=UTF-8
 encoding//Debug/makefile=UTF-8
-encoding//Debug/objects.mk=UTF-8
 encoding//Debug/sources.mk=UTF-8
 encoding//Debug/subdir_rules.mk=UTF-8
 encoding//Debug/subdir_vars.mk=UTF-8
 encoding/<project>=UTF-8
-encoding/at32f421_int.c=UTF-8

+ 2 - 1
1.FrameLayer/Source/app.c

@@ -12,6 +12,7 @@
 #include "FSM_1st.h"
 #include "FSM_2nd.h"
 #include "usart.h"
+#include "can.h"
 #include "cmdgennew.h"
 #include "canAppl.h"
 #include "flash_master.h"
@@ -105,7 +106,7 @@ void AppLoop()
     {
         sysfsm_stFlg.blCtrlMdVarClcOvrFlg = TRUE;
     }
-    //CanRx_Process();
+    CanRx_Process();
     //ReadFrame_Poll2();
   //  uart_voMainDec();
     UsartRx_Process(&UART_RxBuff_Struct_OBC, &UART_TxBuff_Struct_OBC, &stUSART_FrameBuf_OBC);

+ 3 - 0
1.FrameLayer/Source/main.c

@@ -242,6 +242,9 @@ int  main(void)
     NVIC_ClearPendingIRQ(UART_HMI_INST_INT_IRQN);
     NVIC_EnableIRQ(UART_HMI_INST_INT_IRQN);
 
+    NVIC_ClearPendingIRQ(MCAN0_INST_INT_IRQN);
+    NVIC_EnableIRQ(MCAN0_INST_INT_IRQN);
+
     ENABLE_IRQ;
 //    DL_GPIO_setPins(LED_PORT, LED_LED1_PIN);
 //    DL_GPIO_setPins(LED_PORT, LED_LED2_PIN);

+ 184 - 0
3.BasicFunction/Include/can.h

@@ -0,0 +1,184 @@
+/************************************************************************
+ Project:             Washing Machine Drive
+ Filename:            classB.h
+ Partner Filename:    N/A
+ Description:         Partner file of main.c
+ Complier:            IAR Embedded Workbench for ARM 7.80, IAR Systems.
+ CPU TYPE :           ST32F0xx
+*************************************************************************
+ Copyright (c) 2017 Welling Motor Technology(Shanghai) Co. Ltd.
+ All rights reserved.
+*************************************************************************
+*************************************************************************
+Revising History (ECL of this file):
+WLBDM_M0_SR_20170814-new FSM1.1, by cyf, create this file;
+************************************************************************/
+
+/************************************************************************
+ Beginning of File, do not put anything above here except notes
+ Compiler Directives:
+*************************************************************************/
+#ifndef CAN_H
+#define CAN_H
+/************************************************************************
+ Compiler Directives (N/A)
+*************************************************************************/
+#ifdef _CAN_C_
+#define CAN_EXT
+#else
+#define CAN_EXT extern
+#endif
+
+#include "typedefine.h"
+#include "ti_msp_dl_config.h"
+
+/************************************************************************
+ Definitions & Macros
+*************************************************************************/
+
+#define CAN_MC_ALARMCODE_DEFAULT \
+    {                            \
+        0x00000000               \
+    }
+
+// 天腾
+#define ID_MC_BC     0x710
+#define ID_MC_TO_BMS 0x712
+#define ID_MC_TO_PBU 0x713
+#define ID_MC_TO_HMI 0x714
+#define ID_MC_TO_CDL 0x715
+
+#define ID_BMS_BC     0x720
+#define ID_BMS_TO_MC  0x721
+#define ID_BMS_TO_PBU 0x723
+#define ID_BMS_TO_HMI 0x724
+#define ID_BMS_TO_CDL 0x725
+
+#define ID_PBU_BC     0x730
+#define ID_PBU_TO_MC  0x731
+#define ID_PBU_TO_BMS 0x732
+#define ID_PBU_TO_CDL 0x735
+
+#define ID_HMI_BC     0x740
+#define ID_HMI_TO_MC  0x741
+#define ID_HMI_TO_BMS 0x742
+#define ID_HMI_TO_PBU 0x743
+#define ID_HMI_TO_CDL 0x745
+
+#define ID_CDL_BC     0x750
+#define ID_CDL_TO_MC  0x751
+#define ID_CDL_TO_BMS 0x752
+#define ID_CDL_TO_PBU 0x753
+#define ID_CDL_TO_HMI 0x754
+
+#define ID_TO_MC_FILTER (UWORD)0x701
+#define ID_TO_MC_MASK   (UWORD)0x70F
+
+#define ID_BC_FILTER (UWORD)0x700
+#define ID_BC_MASK   (UWORD)0x70F
+
+#define FRAME_BEGIN1 0x55
+#define FRAME_BEGIN2 0xAA
+#define FRAME_END    0xF0
+
+#define MODE_READ   0x11
+#define MODE_WRITE  0x16
+#define MODE_REPORT 0x0C
+
+#define ID_MODE_STANDARD (0x0U)
+#define ID_MODE_EXTENDED (0x1U)
+
+/************************************************************************
+ TypeDefs & Structure defines (N/A)
+*************************************************************************/
+// 天腾
+typedef struct
+{
+    ULONG  ulBufID;       // ID
+    UBYTE  ucBufSize;     //缓冲区数组:缓冲区大小
+    UBYTE  ucBufWrInde;   //缓冲区数组:写索引
+    UBYTE  ucBufRdInde;   //缓冲区数组:读索引
+    UBYTE  ucBufCnt;      //缓冲区数组:数据计数
+    UBYTE  ucBufOvf;      //缓冲区数组:溢出标志,注意清零
+    UBYTE *pcBufAddr;     //缓冲区数组:首地址指针变量
+    ULONG DelayTimeCnt;  //超时计时
+    BOOL     IsWaitRX_Flag; //超时等待数据标志
+} CAN_Buf_TypeDef;
+
+/************************************************************************
+ Exported Variables
+*************************************************************************/
+#ifdef _CAN_C_
+
+CAN_EXT DL_MCAN_RxBufElement stRxMessage1;
+CAN_EXT DL_MCAN_RxBufElement *pRxMsg = &stRxMessage1;
+CAN_EXT DL_MCAN_TxBufElement  stTxMessage1;
+CAN_EXT DL_MCAN_TxBufElement *pTxMsg = &stTxMessage1;
+CAN_EXT UBYTE           can_ubMbox;
+CAN_EXT uint8_t         CAN_RxBuf_PBU[255]; //用于接收PBU广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_PBU = {0, 255, 0, 0, 0, 0, CAN_RxBuf_PBU, 0, FALSE};
+CAN_EXT uint8_t         CAN_RxBuf_BMS[255]; //用于接收BMS广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_BMS = {0, 255, 0, 0, 0, 0, CAN_RxBuf_BMS, 0, FALSE};
+CAN_EXT uint8_t         CAN_RxBuf_HMI[255]; //用于接收HMI广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_HMI = {0, 255, 0, 0, 0, 0, CAN_RxBuf_HMI, 0, FALSE};
+CAN_EXT uint8_t         CAN_RxBuf_CDL[255]; //用于接收CDL广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_CDL = {0, 255, 0, 0, 0, 0, CAN_RxBuf_CDL, 0, FALSE};
+
+#else
+
+CAN_EXT DL_MCAN_RxBufElement stRxMessage1;
+CAN_EXT DL_MCAN_RxBufElement *pRxMsg;
+CAN_EXT DL_MCAN_TxBufElement  stTxMessage1;
+CAN_EXT DL_MCAN_TxBufElement *pTxMsg;
+CAN_EXT UBYTE           can_ubMbox;
+CAN_EXT uint8_t         CAN_RxBuf_PBU[255]; //用于接收PBU广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_PBU;
+CAN_EXT uint8_t         CAN_RxBuf_BMS[255]; //用于接收BMS广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_BMS;
+CAN_EXT uint8_t         CAN_RxBuf_HMI[255]; //用于接收HMI广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_HMI;
+CAN_EXT uint8_t         CAN_RxBuf_CDL[255]; //用于接收CDL广播和发送给MC的数据
+CAN_EXT CAN_Buf_TypeDef CAN_RxBuf_Struct_CDL;
+
+#endif
+/************************************************************************
+ RAM ALLOCATION (N/A)
+*************************************************************************/
+
+/************************************************************************
+ Exported Function Call Prototypes
+*************************************************************************/
+#ifdef _CAN_C_
+
+CAN_EXT void     CAN_Rx_ISR(CAN_Buf_TypeDef *ptCANRx, uint8_t ucLength);
+CAN_EXT void     CAN_SendData(uint32_t ID, uint32_t ID_mode, uint8_t *Data, uint16_t Length);
+CAN_EXT uint8_t  CAN_ReadChar(CAN_Buf_TypeDef *ptCANRx, uint8_t ucNum);
+CAN_EXT void     CAN_DelChar(CAN_Buf_TypeDef *ptCANRx, uint8_t ucNum);
+CAN_EXT void     CAN_RxData_Process(CAN_Buf_TypeDef *ptCANRx, uint16_t TimeOutCnt);
+CAN_EXT void     CanRx_Process(void);
+CAN_EXT uint32_t CRC32_Calculate(uint8_t *pData, uint16_t Length);
+
+#else
+
+CAN_EXT void     CAN_Rx_ISR(CAN_Buf_TypeDef *ptCANRx, uint8_t ucLength);
+CAN_EXT void     CAN_SendData(uint32_t ID, uint32_t ID_mode, uint8_t *Data, uint16_t Length);
+CAN_EXT uint8_t  CAN_ReadChar(CAN_Buf_TypeDef *ptCANRx, uint8_t ucNum);
+CAN_EXT void     CAN_DelChar(CAN_Buf_TypeDef *ptCANRx, uint8_t ucNum);
+CAN_EXT void     CAN_RxData_Process(CAN_Buf_TypeDef *ptCANRx, uint16_t TimeOutCnt);
+CAN_EXT void     CanRx_Process(void);
+CAN_EXT uint32_t CRC32_Calculate(uint8_t *pData, uint16_t Length);
+#endif
+void Can_voInitMC_Run();
+
+/************************************************************************
+ Flag Define (N/A)
+*************************************************************************/
+#endif
+
+/************************************************************************
+ Copyright (c) 2017 Welling Motor Technology(Shanghai) Co. Ltd.
+ All rights reserved.
+*************************************************************************
+ End of this File (EOF)!
+ Do not put anything after this part!
+*************************************************************************/

+ 3 - 2
3.BasicFunction/Include/usart.h

@@ -176,6 +176,7 @@ extern OBC_RunInfo_Struct_t stOBC_RunInfo;
 //extern MC2OBC_RunInfo_Struct_t stMC2OBC_RRunInfo;
 
 extern UBYTE ucUartAnalyseID;
+extern UBYTE ucCommType;
 
 extern BIKECRUISE_COF bikeCruise;
 /*Private function declare---------------------------------------------------*/
@@ -184,9 +185,9 @@ void UART_DelChar(USART_Buf_TypeDef * ptRx, UBYTE ucNum);
 void UART_PutChar(USART_Buf_TypeDef * ptTx, UBYTE ucData);
 void UsartRx_Process(USART_Buf_TypeDef *USARTx_RxBuf_Struct, USART_Buf_TypeDef *USARTx_TxBuf_Struct, USART_FrameBuf_TypeDef *USART_RxFrameBuf_Struct);
 void SendData(USART_Buf_TypeDef* ptUartTx, UWORD ID, UBYTE Mode, UWORD Command, UBYTE *Data);
-void KM5S_RxData_Process(USART_Buf_TypeDef* ptUartTx, UBYTE* buf, UWORD dataCount);
+void KM5S_USART_RxData_Process(USART_Buf_TypeDef* ptUartTx, UBYTE* buf, UWORD dataCount);
 void KM5S_USART_DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD Addr, UBYTE Mode, UBYTE Length, UBYTE* Data);
-void KM5S_DataProcess_CDL(USART_Buf_TypeDef* ptUartTx, UWORD ID, UWORD Cmd, UBYTE *Data);
+void DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD ID, UBYTE Mode, UWORD Cmd, UBYTE *Data);
 void KM5S_SendData_OBC(USART_Buf_TypeDef* ptUartTx, UBYTE Mode, UBYTE Length, UBYTE checknum);
 void USARTx_Rx_IRQ(USART_Buf_TypeDef *USARTx_RxBuf_Struct, USART_FrameBuf_TypeDef *USART_RxFrameBuf_Struct);
 void USARTx_Tx_IRQ(USART_Buf_TypeDef *USARTx_TxBuf_Struct);

+ 1 - 2
3.BasicFunction/Source/CadAssist.c

@@ -106,7 +106,6 @@ void ass_voSpdPidInit(CADASS_PID *spdpid)
     spdpid->slPidErr = 0;
     spdpid->slPidP = 0;
     spdpid->swPidOut = 0;
-
 }
 
 /**
@@ -477,7 +476,7 @@ static SWORD ass_voCadCmdDeal(void)
     UWORD tmp_uwCadMaxpu = 0;
     
     //tmp_uwCadMaxpu = ((ULONG)ass_stCadAssCoef.uwMaxCadRpm * 3495 >> 20) << 14;// 3495>>20 = 1/(5*60)
-    /*小飞最高车速对应踏频(rpm)= 车速*1000/60/(周长/100)/前飞齿数*后飞齿数           车速单位:km/h 周长单位:cm*/
+    /*小飞最高车速对应踏频(rpm)= 车速*1000/60/(周长/100)/前飞齿数*后飞齿数           车速单位:km/h 周长单位:cm*/ 
     tmp_uwCadMaxpu = (UWORD)(((ULONG)ass_stCadAssCoef.uwMaxCadRpm * 3495) >> 6); //Q14 BASE 5HZ    
     
     if(ass_stCadAssParaIn.uwCadancePer <= 0)

+ 360 - 0
3.BasicFunction/Source/can.c

@@ -0,0 +1,360 @@
+/************************************************************************
+ Project:             Welling Motor Control Paltform
+ Filename:            asr.c
+ Partner Filename:    asr.h
+ Description:         Automatic speed regulator
+ Complier:            IAR Embedded Workbench for ARM 7.80, IAR Systems.
+ CPU TYPE :           STM32F30x
+*************************************************************************
+ Copyright (c) 2018 Welling Motor Technology(Shanghai) Co. Ltd.
+ All rights reserved.
+*************************************************************************
+*************************************************************************
+Revising History (ECL of this file):
+
+************************************************************************/
+
+/************************************************************************
+ Beginning of File, do not put anything above here except notes
+ Compiler Directives:
+*************************************************************************/
+#ifndef _CAN_C_
+#define _CAN_C_
+#endif
+/************************************************************************
+ Included File:
+*************************************************************************/
+#include "stdlib.h"
+#include "string.h"
+
+#include "torquesensor.h"
+#include "FuncLayerAPI.h"
+#include "can.h"
+#include "usart.h"
+#include "canAppl.h"
+#include "CodePara.h"
+#include "flash_master.h"
+#include "i2c_master.h"
+#include "power.h"
+#include "board_config.h"
+#include "MosResCalib.h"
+#include "UserGpio_Config.h"
+
+const uint32_t Crc32Table[256] = {
+    0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61,
+    0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD, 0x4C11DB70, 0x48D0C6C7, 0x4593E01E, 0x4152FDA9, 0x5F15ADAC, 0x5BD4B01B, 0x569796C2, 0x52568B75,
+    0x6A1936C8, 0x6ED82B7F, 0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, 0x709F7B7A, 0x745E66CD, 0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039,
+    0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5, 0xBE2B5B58, 0xBAEA46EF, 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033, 0xA4AD16EA, 0xA06C0B5D,
+    0xD4326D90, 0xD0F37027, 0xDDB056FE, 0xD9714B49, 0xC7361B4C, 0xC3F706FB, 0xCEB42022, 0xCA753D95, 0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1,
+    0xE13EF6F4, 0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D, 0x34867077, 0x30476DC0, 0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5, 0x2AC12072,
+    0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16, 0x018AEB13, 0x054BF6A4, 0x0808D07D, 0x0CC9CDCA, 0x7897AB07, 0x7C56B6B0, 0x71159069, 0x75D48DDE,
+    0x6B93DDDB, 0x6F52C06C, 0x6211E6B5, 0x66D0FB02, 0x5E9F46BF, 0x5A5E5B08, 0x571D7DD1, 0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA,
+    0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B, 0xBB60ADFC, 0xB6238B25, 0xB2E29692, 0x8AAD2B2F, 0x8E6C3698, 0x832F1041, 0x87EE0DF6,
+    0x99A95DF3, 0x9D684044, 0x902B669D, 0x94EA7B2A, 0xE0B41DE7, 0xE4750050, 0xE9362689, 0xEDF73B3E, 0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2,
+    0xC6BCF05F, 0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34, 0xDC3ABDED, 0xD8FBA05A, 0x690CE0EE, 0x6DCDFD59, 0x608EDB80, 0x644FC637,
+    0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB, 0x4F040D56, 0x4BC510E1, 0x46863638, 0x42472B8F, 0x5C007B8A, 0x58C1663D, 0x558240E4, 0x51435D53,
+    0x251D3B9E, 0x21DC2629, 0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, 0x3F9B762C, 0x3B5A6B9B, 0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF,
+    0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623, 0xF12F560E, 0xF5EE4BB9, 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65, 0xEBA91BBC, 0xEF68060B,
+    0xD727BBB6, 0xD3E6A601, 0xDEA580D8, 0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, 0xCDA1F604, 0xC960EBB3, 0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7,
+    0xAE3AFBA2, 0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B, 0x9B3660C6, 0x9FF77D71, 0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74, 0x857130C3,
+    0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640, 0x4E8EE645, 0x4A4FFBF2, 0x470CDD2B, 0x43CDC09C, 0x7B827D21, 0x7F436096, 0x7200464F, 0x76C15BF8,
+    0x68860BFD, 0x6C47164A, 0x61043093, 0x65C52D24, 0x119B4BE9, 0x155A565E, 0x18197087, 0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC,
+    0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D, 0x2056CD3A, 0x2D15EBE3, 0x29D4F654, 0xC5A92679, 0xC1683BCE, 0xCC2B1D17, 0xC8EA00A0,
+    0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB, 0xDBEE767C, 0xE3A1CBC1, 0xE760D676, 0xEA23F0AF, 0xEEE2ED18, 0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4,
+    0x89B8FD09, 0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662, 0x933EB0BB, 0x97FFAD0C, 0xAFB010B1, 0xAB710D06, 0xA6322BDF, 0xA2F33668,
+    0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4};
+
+
+//中断服务函数
+void CAN_Rx_ISR(CAN_Buf_TypeDef *ptCANRx, uint8_t ucLength)
+{
+    for (uint8_t i = 0; i < ucLength; i++)
+    {
+        *((*ptCANRx).pcBufAddr + (*ptCANRx).ucBufWrInde) = pRxMsg->data[i];
+        if (++(*ptCANRx).ucBufWrInde >= (*ptCANRx).ucBufSize)
+        {
+            (*ptCANRx).ucBufWrInde = 0;
+        }
+        if (++(*ptCANRx).ucBufCnt > (*ptCANRx).ucBufSize)
+        {
+            (*ptCANRx).ucBufCnt = (*ptCANRx).ucBufSize;
+            (*ptCANRx).ucBufOvf = 1;
+        }
+    }
+}
+
+uint16_t LastPacketLen, PacketNum;
+uint32_t OVtim;
+void CAN_SendData(uint32_t ID, uint32_t ID_mode, uint8_t *Data, uint16_t Length)
+{
+    uint8_t  i, j;
+    if (Length > 0)
+    {
+        //计算分包个数
+        LastPacketLen = Length % 8; //最后一个数据包长度
+        if (LastPacketLen == 0)
+        {
+            LastPacketLen = 8;
+            PacketNum = Length / 8;
+        }
+        else
+        {
+            PacketNum = Length / 8 + 1;
+        }
+        //开始发送数据
+        pTxMsg->rtr = 0;//0-data frame,1-remote frame
+        if(ID_mode == ID_MODE_STANDARD)
+        {
+            pTxMsg->id = ((ID & 0x7FF) << 18);
+        }
+        else
+        {
+            pTxMsg->id = ID & 0x1FFFFFFF;
+        }
+        pTxMsg->xtd = ID_mode;//0-11-bit standard identifier,1-29-bit extended identifier
+        pTxMsg->esi = 0;
+        pTxMsg->brs = 0;
+        pTxMsg->fdf = 0;//0-Classic CAN format,1-CAN FD format
+        pTxMsg->efc = 1;//1-Store Tx events
+        //pTxMsg->mm = 0xAA;
+
+        //发送前(PacketNum - 1)个数据包
+        for (i = 0; i < (PacketNum - 1); i++)
+        {
+            pTxMsg->dlc = 8;
+            for (j = 0; j < 8; j++)
+            {
+                pTxMsg->data[j] = Data[8 * i + j];
+            }
+            /* Write Tx Message to the Message RAM. */
+            DL_MCAN_writeMsgRam(MCAN0_INST, DL_MCAN_MEM_TYPE_BUF, i, pTxMsg);
+
+            /* Add request for transmission. */
+            DL_MCAN_TXBufAddReq(MCAN0_INST, i);
+
+            OVtim = 0;
+
+            while(((DL_MCAN_getTxBufTransmissionStatus(MCAN0_INST) & (1<<i)) == 0) && (OVtim < 0XFFF))
+            {
+                OVtim++;
+            } //等待发送结束
+
+            if (OVtim >= 0XFFF)
+            {
+                return;
+            }
+        }
+
+        //发送最后一个数据包
+        pTxMsg->dlc = LastPacketLen;
+        for (j = 0; j < LastPacketLen; j++)
+        {
+            pTxMsg->data[j] = Data[8 * i + j];
+        }
+        /* Write Tx Message to the Message RAM. */
+        DL_MCAN_writeMsgRam(MCAN0_INST, DL_MCAN_MEM_TYPE_BUF, i, pTxMsg);
+
+        /* Add request for transmission. */
+        DL_MCAN_TXBufAddReq(MCAN0_INST, i);
+
+        OVtim = 0;
+
+        while(((DL_MCAN_getTxBufTransmissionStatus(MCAN0_INST) & (1<<i)) == 0) && (OVtim < 0XFFF))
+        {
+            OVtim++;
+        }
+
+        if (OVtim >= 0XFFF)
+        {
+            return;
+        }
+    }
+}
+
+//从队列读取一个字节
+uint8_t CAN_ReadChar(CAN_Buf_TypeDef *ptCANRx, uint8_t ucNum)
+{
+    uint8_t  ucData;
+    uint16_t i;
+    i = ucNum;
+    if ((*ptCANRx).ucBufCnt >= ucNum)
+    {
+        i += (*ptCANRx).ucBufRdInde;
+        if (i >= (*ptCANRx).ucBufSize)
+        {
+            i -= ((*ptCANRx).ucBufSize);
+        }
+    }
+    else
+    {
+        i = 0;
+    }
+    ucData = *((*ptCANRx).pcBufAddr + i);
+    return ucData;
+}
+
+//从队列删除一个字节
+
+void CAN_DelChar(CAN_Buf_TypeDef *ptCANRx, uint8_t ucNum)
+{
+    uint16_t i;
+    if ((*ptCANRx).ucBufCnt >= ucNum)
+    {
+        DL_MCAN_enableIntr(MCAN0_INST, DL_MCAN_INTERRUPT_RF0N, 0U);//关接收中断
+
+        (*ptCANRx).ucBufCnt -= ucNum;
+
+        DL_MCAN_enableIntr(MCAN0_INST, DL_MCAN_INTERRUPT_RF0N, 1U);//开接收中断
+
+        i = ucNum;
+        i += (*ptCANRx).ucBufRdInde;
+        if (i >= (*ptCANRx).ucBufSize)
+        {
+            i -= (*ptCANRx).ucBufSize;
+        }
+        (*ptCANRx).ucBufRdInde = i;
+    }
+    else
+    {
+        DL_MCAN_enableIntr(MCAN0_INST, DL_MCAN_INTERRUPT_RF0N, 0U);//关接收中断
+
+        i = (*ptCANRx).ucBufCnt;
+        (*ptCANRx).ucBufCnt = 0;
+
+        DL_MCAN_enableIntr(MCAN0_INST, DL_MCAN_INTERRUPT_RF0N, 1U);//开接收中断
+
+        i += (*ptCANRx).ucBufRdInde;
+        if (i >= (*ptCANRx).ucBufSize)
+        {
+            i -= (*ptCANRx).ucBufSize;
+        }
+        (*ptCANRx).ucBufRdInde = i;
+    }
+}
+
+//解析队列数据,严格按照通信协议格式
+uint8_t CAN_RevData[255], CAN_RevData_CRC_Buf[255];
+void CAN_RxData_Process(CAN_Buf_TypeDef *ptCANRx, uint16_t TimeOutCnt)
+{
+    uint8_t  Mode, CmdLength, DataLength;
+    uint16_t Cmd, i;
+    uint32_t CrcResult, CrcData;
+    uint8_t  FrameBegin1, FrameBegin2;
+    if (ptCANRx->ucBufCnt >= 11)
+    {
+        //读取帧头
+        FrameBegin1 = CAN_ReadChar(ptCANRx, 0);
+        CAN_RevData_CRC_Buf[0] = FrameBegin1;
+        FrameBegin2 = CAN_ReadChar(ptCANRx, 1);
+        CAN_RevData_CRC_Buf[1] = FrameBegin2;
+        if ((FrameBegin1 == FRAME_BEGIN1) && (FrameBegin2 == FRAME_BEGIN2))
+        {
+            CAN_RevData_CRC_Buf[2] = (uint8_t)((ptCANRx->ulBufID >> 8) & 0xFF);
+            CAN_RevData_CRC_Buf[3] = (uint8_t)(ptCANRx->ulBufID & 0xFF);
+            //读取帧模式
+            Mode = CAN_ReadChar(ptCANRx, 2);
+            CAN_RevData_CRC_Buf[4] = Mode;
+            if ((Mode == MODE_READ) || (Mode == MODE_WRITE) || (Mode == MODE_REPORT))
+            {
+                //读取命令段长度和命令字
+                CmdLength = CAN_ReadChar(ptCANRx, 3);
+                CAN_RevData_CRC_Buf[5] = CmdLength;
+                Cmd = (CAN_ReadChar(ptCANRx, 4) << 8) + CAN_ReadChar(ptCANRx, 5);
+                CAN_RevData_CRC_Buf[6] = (uint8_t)((Cmd >> 8) & 0xFF);
+                CAN_RevData_CRC_Buf[7] = (uint8_t)(Cmd & 0xFF);
+                DataLength = CAN_ReadChar(ptCANRx, 5);
+                if ((CmdLength - DataLength) == 2)
+                {
+                    if (ptCANRx->ucBufCnt < (CmdLength + 9)) //帧头2bytes  + 模式1byte + 命令段长度1byte + 校验位4bytes + 帧尾1byte
+                    {
+                        if (ptCANRx->IsWaitRX_Flag == FALSE)
+                        {
+                            ptCANRx->DelayTimeCnt = cp_ulSystickCnt; // SysTick_GetCounter()
+                            ptCANRx->IsWaitRX_Flag = TRUE;
+                        }
+                        if ((cp_ulSystickCnt - ptCANRx->DelayTimeCnt) > TimeOutCnt) //超时,单位ms
+                        {
+                            CAN_DelChar(ptCANRx, ptCANRx->ucBufCnt);
+                            ptCANRx->IsWaitRX_Flag = FALSE;
+                        }
+                        return;
+                    }
+                    else
+                    {
+                        ptCANRx->IsWaitRX_Flag = FALSE;
+                        //接收到完整正确数据包
+                        for (i = 0; i < DataLength; i++) //读取数据段
+                        {
+                            CAN_RevData[i] = CAN_ReadChar(ptCANRx, 6 + i);
+                            CAN_RevData_CRC_Buf[8 + i] = CAN_RevData[i];
+                        }
+                        CrcData = (CAN_ReadChar(ptCANRx, 6 + DataLength) << 24) + (CAN_ReadChar(ptCANRx, 7 + DataLength) << 16) +
+                                  (CAN_ReadChar(ptCANRx, 8 + DataLength) << 8) + CAN_ReadChar(ptCANRx, 9 + DataLength);
+                        CrcResult = CRC32_Calculate(CAN_RevData_CRC_Buf, 8 + DataLength);
+                        if ((CrcData - CrcResult) == 0) // 比较校验
+                        {
+                            //数据处理
+                            ucCommType = 1;
+                            DataProcess(&UART_TxBuff_Struct_OBC, ptCANRx->ulBufID, Mode, Cmd, CAN_RevData); // Mode为帧模式,Cmd为命令字,Data为数据段
+                            CAN_DelChar(ptCANRx, CmdLength + 9);
+                            return;
+                        }
+                        CAN_DelChar(ptCANRx, 1);
+                    }
+                }
+                else
+                {
+                    CAN_DelChar(ptCANRx, 1);
+                }
+            }
+            else
+            {
+                CAN_DelChar(ptCANRx, 1);
+            }
+        }
+        else
+        {
+            CAN_DelChar(ptCANRx, 1);
+        }
+    }
+}
+
+// CAN数据解任务,定时执行
+void CanRx_Process(void)
+{
+    CAN_RxData_Process(&CAN_RxBuf_Struct_PBU, 500);
+    CAN_RxData_Process(&CAN_RxBuf_Struct_BMS, 500);
+    CAN_RxData_Process(&CAN_RxBuf_Struct_HMI, 500);
+    CAN_RxData_Process(&CAN_RxBuf_Struct_CDL, 500);
+}
+
+uint32_t CRC32_Calculate(uint8_t *pData, uint16_t Length)
+{
+    uint32_t nReg;
+    uint32_t nTemp = 0;
+    uint16_t i, n;
+
+    nReg = 0xFFFFFFFF;
+    for (n = 0; n < Length; n++)
+    {
+        nReg ^= (uint32_t)pData[n];
+        for (i = 0; i < 4; i++)
+        {
+            nTemp = Crc32Table[(uint8_t)((nReg >> 24) & 0xFF)];
+            nReg <<= 8;
+            nReg ^= nTemp;
+        }
+    }
+    return nReg;
+}
+/************************************************************************
+ Copyright (c) 2018 Welling Motor Technology(Shanghai) Co. Ltd.
+ All rights reserved.
+*************************************************************************/
+#ifdef _CAN_C_
+#undef _CAN_C_
+#endif
+/*************************************************************************
+ End of this File (EOF):
+ !!!!!!Do not put anything after this part!!!!!!!!!!!
+*************************************************************************/

+ 2 - 1
3.BasicFunction/Source/canAppl.c

@@ -14,6 +14,7 @@
 #include "adc.h"
 #include "alarm.h"
 #include "usart.h"
+#include "can.h"
 #include "flash_master.h"
 #include "glbcof.h"
 #include "spdctrmode.h"
@@ -239,7 +240,7 @@ void  Can_voInitMC_Run(void)
     strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
     
     // Firmware Special Info
-    char chFrimware[32]="NC2024X022-CA0148-V0r0.  ";
+    char chFrimware[32]="NC2025X000-MS0000-V0r0.  ";
 
 //    strncat(chFrimware,FINGER_PRINT,8); // Git Version
   //  strncat(chFrimware,(char *)"12345678",8); // Git Version

+ 172 - 133
3.BasicFunction/Source/usart.c

@@ -35,6 +35,7 @@
   */
 /* Includes ------------------------------------------------------------------*/
 #include "usart.h"
+#include "can.h"
 #include "string.h"
 #include "canAppl.h"
 #include "CodePara.h"
@@ -75,6 +76,7 @@ OBC_SetInfo_Struct_t stOBC_SetInfo;
 MC2OBC_RunInfo_Struct_t stMC2OBC_RRunInfo;
 
 UBYTE ucUartAnalyseID = 0;
+UBYTE ucCommType = 0;//0-Both,1-CAN,2-UART
 /* Private variables ---------------------------------------------------------*/
 const UBYTE ucOBC_password[64]=
 {137,159,134,249,88,11,250,61,33,150,3,193,118,141,209,94,
@@ -116,7 +118,7 @@ void UsartRx_Process(USART_Buf_TypeDef *USARTx_RxBuf_Struct, USART_Buf_TypeDef *
         UART_DelChar(USARTx_RxBuf_Struct,datacount);
         //UART_PutChar(&UART_TxBuff_Struct_OBC,datacount);
         /*解析1*/
-        KM5S_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
+        KM5S_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
         /*解析2*/
 #if (UART_ID == 1)
         Lidian2_USART_RxData_Process(USARTx_TxBuf_Struct, data, datacount);
@@ -142,7 +144,7 @@ void UsartRx_Process(USART_Buf_TypeDef *USARTx_RxBuf_Struct, USART_Buf_TypeDef *
     }
 }
 
-void KM5S_RxData_Process(USART_Buf_TypeDef* ptUartTx, UBYTE* buf, UWORD dataCount)
+void KM5S_USART_RxData_Process(USART_Buf_TypeDef* ptUartTx, UBYTE* buf, UWORD dataCount)
 {
     UBYTE Mode, DataLength, Addr;
     static UBYTE Data[255];
@@ -208,7 +210,8 @@ void KM5S_USART_DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD Addr, UBYTE Mode,
             {
                 uwID = (UWORD)((Data[4]<<8) + Data[5]);
                 uwCmd = (UWORD)((Data[6]<<8) + Data[7]);
-                KM5S_DataProcess_CDL(ptUartTx, uwID,uwCmd,&Data[8]);
+                ucCommType = 2;
+                DataProcess(ptUartTx, uwID, Mode, uwCmd, &Data[8]);
             }
         }
     }
@@ -223,7 +226,6 @@ void KM5S_USART_DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD Addr, UBYTE Mode,
             stOBC_RunInfo.ucWalk = ((Data[5] & 0x10)>>4);//6km/h 推行功能
             stOBC_RunInfo.ucCruise = ((Data[5] & 0x04)>>2);//巡航
             stOBC_RunInfo.ucOverSpeed = (Data[5] & 0x01);//超速
-
             
             /*数据更新*/
             if(stOBC_RunInfo.ucWalk == 1)
@@ -272,7 +274,7 @@ void KM5S_USART_DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD Addr, UBYTE Mode,
         }
         else if((Mode == 0x53) && (Length == 0x07))         //参数设置
         {
-            KM5S_OBCSetPara(Data);
+//            KM5S_OBCSetPara(Data);
             KM5S_SendData_OBC(ptUartTx, Mode, 0x05, stOBC_SetInfo.ucShakingCode);
         }
     }
@@ -321,7 +323,7 @@ void KM5S_USART_DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD Addr, UBYTE Mode,
     }
 }
 
-void KM5S_DataProcess_CDL(USART_Buf_TypeDef* ptUartTx, UWORD ID, UWORD Cmd, UBYTE *Data)
+void DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD ID, UBYTE Mode, UWORD Cmd, UBYTE *Data)
 {
     uint8_t DataLength;
     DataLength = (uint8_t)(Cmd & 0x00FF);
@@ -1166,122 +1168,159 @@ void UART_PutChar(USART_Buf_TypeDef * ptTx, UBYTE ucData)
 
 void SendData(USART_Buf_TypeDef* ptUartTx, UWORD ID, UBYTE Mode, UWORD Command, UBYTE *Data)
 {
-    UBYTE i = 0;
-    UBYTE len = 0;
-    UWORD checksum = 0;
-    UBYTE databuf[256] = {0};
-    
-    len = (UBYTE)((Command & 0xff) + 4);
-    if(len > 247)
+    if(ucCommType != 2)
     {
-        len = 247;
+        ULONG CRC_Result = 0x00000000U;
+        UBYTE  DataLength;
+        UBYTE CanSendData[255], CanSendData_CRC_Buf[255];
+
+        DataLength = (UBYTE)(Command & 0xFF);
+        CanSendData[0] = FRAME_BEGIN1;
+        CanSendData[1] = FRAME_BEGIN2;
+        CanSendData[2] = Mode;
+        CanSendData[3] = DataLength + 2;
+        CanSendData[4] = (UBYTE)((Command >> 8) & 0xFF);
+        CanSendData[5] = DataLength;
+        if((DataLength)> (255 - 6))
+        {
+            DataLength = 255 - 6;
+        }
+        memcpy(CanSendData + 6, Data, DataLength);
+        CanSendData_CRC_Buf[0] = FRAME_BEGIN1;
+        CanSendData_CRC_Buf[1] = FRAME_BEGIN2;
+        CanSendData_CRC_Buf[2] = (UBYTE)(ID >> 8);
+        CanSendData_CRC_Buf[3] = (UBYTE)(ID & 0xFF);
+        if((DataLength + 4 )> (255 - 4))
+        {
+            DataLength = 251 - 4 - 4;
+        }
+        memcpy(CanSendData_CRC_Buf + 4, CanSendData + 2, DataLength + 4);
+        CRC_Result = CRC32_Calculate(CanSendData_CRC_Buf, DataLength + 8); //帧头2bytes + ID 2bytes + 模式 1byte + 命令段长度 1byte + 命令字 2bytes
+        CanSendData[6 + DataLength] = (UBYTE)((CRC_Result >> 24) & 0xFF);
+        CanSendData[7 + DataLength] = (UBYTE)((CRC_Result >> 16) & 0xFF);
+        CanSendData[8 + DataLength] = (UBYTE)((CRC_Result >> 8) & 0xFF);
+        CanSendData[9 + DataLength] = (UBYTE)(CRC_Result & 0xFF);
+        CanSendData[10 + DataLength] = FRAME_END;
+        CAN_SendData(ID, ID_MODE_STANDARD, CanSendData, DataLength + 11);
     }
-    
-    databuf[0] = UARTFRAME_BEGIN;
-    databuf[1] = UARTADDR_CDL;
-    databuf[2] = Mode;
-    databuf[3] = len;
-    databuf[4] = (UBYTE)((ID >> 8) & 0xFF);
-    databuf[5] = (UBYTE)(ID & 0xFF);
-    databuf[6] = (UBYTE)((Command >> 8) & 0xFF);
-    databuf[7] = (UBYTE)(Command & 0xFF);
-    
-    for(i=0; i<(len-4); i++)
+
+    if(ucCommType != 1)
     {
-        databuf[8+i] = Data[i];
+        UBYTE i = 0;
+        UBYTE len = 0;
+        UWORD checksum = 0;
+        UBYTE databuf[256] = {0};
+
+        len = (UBYTE)((Command & 0xff) + 4);
+        if(len > 247)
+        {
+            len = 247;
+        }
+
+        databuf[0] = UARTFRAME_BEGIN;
+        databuf[1] = UARTADDR_CDL;
+        databuf[2] = Mode;
+        databuf[3] = len;
+        databuf[4] = (UBYTE)((ID >> 8) & 0xFF);
+        databuf[5] = (UBYTE)(ID & 0xFF);
+        databuf[6] = (UBYTE)((Command >> 8) & 0xFF);
+        databuf[7] = (UBYTE)(Command & 0xFF);
+
+        for(i=0; i<(len-4); i++)
+        {
+            databuf[8+i] = Data[i];
+        }
+
+        for(i=1; i<(len+4); i++)
+        {
+            checksum = (UWORD)(databuf[i] + checksum);
+        }
+
+        databuf[4+len] = (UBYTE)checksum;
+        databuf[5+len] = (UBYTE)(checksum>>8);
+        databuf[6+len] = UARTFRAME_END1;
+        databuf[7+len] = UARTFRAME_END2;
+
+        for(i=0; i<(len+8); i++)
+        {
+            UART_PutChar(ptUartTx, databuf[i]);
+        }
     }
+}
+
+void KM5S_OBCSetPara(UBYTE* Data)
+{
+    UWORD tmpdata;
     
-    for(i=1; i<(len+4); i++)
+    /*数据获取*/
+    if((Data[4] & 0x40) == 0x40)                           //助力方向
     {
-        checksum = (UWORD)(databuf[i] + checksum);
+        stOBC_SetInfo.AssistDir = Assist_Backward;
     }
-    
-    databuf[4+len] = (UBYTE)checksum;
-    databuf[5+len] = (UBYTE)(checksum>>8);
-    databuf[6+len] = UARTFRAME_END1;
-    databuf[7+len] = UARTFRAME_END2;
-    
-    for(i=0; i<(len+8); i++)
+    else
     {
-        UART_PutChar(ptUartTx, databuf[i]);
+        stOBC_SetInfo.AssistDir = Assist_Forward;
+    }
+    stOBC_SetInfo.ucAssistedMagnetSteel = (Data[4] & 0x3F);//助力过几个磁钢
+    stOBC_SetInfo.ucAssistRatio = Data[5];
+    stOBC_SetInfo.ucThrottleGt = ((Data[6] & 0x80)>>7);
+    stOBC_SetInfo.ucThrottleLimited = ((Data[6] & 0x40)>>6);
+    stOBC_SetInfo.ucSlowStartMode = ((Data[6] & 0x30)>>4);
+    stOBC_SetInfo.ucSpeedSensorPulses = (Data[6] & 0x0F);
+    if((Data[7] & 0x80) == 0x80)
+    {
+        stOBC_SetInfo.swUnderVoltageBias = (SWORD)(-1 * (Data[7] & 0x7F));//0.1V
+    }
+    else
+    {
+        stOBC_SetInfo.swUnderVoltageBias = (SWORD)(1 * (Data[7] & 0x7F));
     }
-}
 
-void KM5S_OBCSetPara(UBYTE* Data)
-{
-//    UWORD tmpdata;
-//
-//    /*数据获取*/
-//    if((Data[4] & 0x40) == 0x40)                           //助力方向
-//    {
-//        stOBC_SetInfo.AssistDir = Assist_Backward;
-//    }
-//    else
-//    {
-//        stOBC_SetInfo.AssistDir = Assist_Forward;
-//    }
-//    stOBC_SetInfo.ucAssistedMagnetSteel = (Data[4] & 0x3F);//助力过几个磁钢
-//    stOBC_SetInfo.ucAssistRatio = Data[5];
-//    stOBC_SetInfo.ucThrottleGt = ((Data[6] & 0x80)>>7);
-//    stOBC_SetInfo.ucThrottleLimited = ((Data[6] & 0x40)>>6);
-//    stOBC_SetInfo.ucSlowStartMode = ((Data[6] & 0x30)>>4);
-//    stOBC_SetInfo.ucSpeedSensorPulses = (Data[6] & 0x0F);
-//    if((Data[7] & 0x80) == 0x80)
-//    {
-//        stOBC_SetInfo.swUnderVoltageBias = (SWORD)(-1 * (Data[7] & 0x7F));//0.1V
-//    }
-//    else
-//    {
-//        stOBC_SetInfo.swUnderVoltageBias = (SWORD)(1 * (Data[7] & 0x7F));
-//    }
-//
-//    if((Data[8] & 0xC0) == 0xC0)
-//    {
-//        stOBC_SetInfo.uwUnderVoltageBase = 420;//0.1V
-//    }
-//    else if((Data[8] & 0xC0) == 0x40)
-//    {
-//        stOBC_SetInfo.uwUnderVoltageBase = 210;
-//    }
-//    else
-//    {
-//        stOBC_SetInfo.uwUnderVoltageBase = 315;
-//    }
-//    stOBC_SetInfo.ucCurrentLimiation = (Data[8] & 0x3F);//0.5A
-//    stOBC_SetInfo.ucShakingCode = Data[9];
+    if((Data[8] & 0xC0) == 0xC0)
+    {
+        stOBC_SetInfo.uwUnderVoltageBase = 420;//0.1V
+    }
+    else if((Data[8] & 0xC0) == 0x40)
+    {
+        stOBC_SetInfo.uwUnderVoltageBase = 210;
+    }
+    else
+    {
+        stOBC_SetInfo.uwUnderVoltageBase = 315;
+    }
+    stOBC_SetInfo.ucCurrentLimiation = (Data[8] & 0x3F);//0.5A
+    stOBC_SetInfo.ucShakingCode = Data[9];
     stOBC_SetInfo.ucSpeedLimiation = ((Data[10] & 0xF8)>>3) + 10;//km/h
-    if( stOBC_SetInfo.ucSpeedLimiation>32)
-        stOBC_SetInfo.ucSpeedLimiation=32;
-//    stOBC_SetInfo.ucWheelDiameterCode = (Data[10] & 0x07);
-//
-//    /*低压保护阈值更新*/
-//    if(MC_UpcInfo.stMContorlInfo.uwAlamUVolV != (UWORD)(stOBC_SetInfo.uwUnderVoltageBase + stOBC_SetInfo.swUnderVoltageBias))
-//    {
-//        MC_UpcInfo.stMContorlInfo.uwAlamUVolV = (UWORD)(stOBC_SetInfo.uwUnderVoltageBase + stOBC_SetInfo.swUnderVoltageBias);
-//        MC_UpcInfo.stMContorlInfo.uwSaveFlg = 1;
-//        cp_stFlg.ParaSaveEEFlg = TRUE;
-//        cp_stFlg.ParaUpdateFlg = TRUE;
-//        cp_stFlg.ParaMCInfoUpdateFlg = TRUE;
-//        cp_stFlg.ParaMotorDriveUpdateFinishFlg = TRUE;
-//    }
-//
-//    /*功率限幅阈值更新*/
-//    #if (IPM_VOLTAGE_SEL == IPM_VOLTAGE_48V)
-//        UWORD uwVolt = 480;
-//    #elif (IPM_VOLTAGE_SEL == IPM_VOLTAGE_36V)
-//        UWORD uwVolt = 360;
-//    #else
-//        UWORD uwVolt = 360;
-//    #endif
-//    if(MC_UpcInfo.stTestParaInfo.uwPwrLimit != ((stOBC_SetInfo.ucCurrentLimiation*uwVolt>>1) + 500))
-//    {
-//        MC_UpcInfo.stTestParaInfo.uwPwrLimit = (UWORD)((stOBC_SetInfo.ucCurrentLimiation*uwVolt>>1) + 500);
-//        MC_UpcInfo.stTestParaInfo.uwSaveFlg = 1;
-//        cp_stFlg.ParaSaveEEFlg = TRUE;
-//        cp_stFlg.ParaUpdateFlg = TRUE;
-//        cp_stFlg.TestParaInfoUpdateFlg = TRUE;
-//        cp_stFlg.ParaMotorDriveUpdateFinishFlg = TRUE;
-//    }
+    stOBC_SetInfo.ucWheelDiameterCode = (Data[10] & 0x07);
+
+    /*低压保护阈值更新*/
+    if(MC_UpcInfo.stMContorlInfo.uwAlamUVolV != (UWORD)(stOBC_SetInfo.uwUnderVoltageBase + stOBC_SetInfo.swUnderVoltageBias))
+    {
+        MC_UpcInfo.stMContorlInfo.uwAlamUVolV = (UWORD)(stOBC_SetInfo.uwUnderVoltageBase + stOBC_SetInfo.swUnderVoltageBias);
+        MC_UpcInfo.stMContorlInfo.uwSaveFlg = 1;
+        cp_stFlg.ParaSaveEEFlg = TRUE;
+        cp_stFlg.ParaUpdateFlg = TRUE;
+        cp_stFlg.ParaMCInfoUpdateFlg = TRUE;
+        cp_stFlg.ParaMotorDriveUpdateFinishFlg = TRUE;
+    }
+
+    /*功率限幅阈值更新*/
+    #if (IPM_VOLTAGE_SEL == IPM_VOLTAGE_48V)
+        UWORD uwVolt = 480;
+    #elif (IPM_VOLTAGE_SEL == IPM_VOLTAGE_36V)
+        UWORD uwVolt = 360;
+    #else
+        UWORD uwVolt = 360;
+    #endif
+    if(MC_UpcInfo.stTestParaInfo.uwPwrLimit != ((stOBC_SetInfo.ucCurrentLimiation*uwVolt>>1) + 500))
+    {
+        MC_UpcInfo.stTestParaInfo.uwPwrLimit = (UWORD)((stOBC_SetInfo.ucCurrentLimiation*uwVolt>>1) + 500);
+        MC_UpcInfo.stTestParaInfo.uwSaveFlg = 1;
+        cp_stFlg.ParaSaveEEFlg = TRUE;
+        cp_stFlg.ParaUpdateFlg = TRUE;
+        cp_stFlg.TestParaInfoUpdateFlg = TRUE;
+        cp_stFlg.ParaMotorDriveUpdateFinishFlg = TRUE;
+    }
 
     /*限速阈值更新*/
     if(MC_UpcInfo.stAssistInfo.uwAssistLimitBikeSpdStart != stOBC_SetInfo.ucSpeedLimiation)
@@ -1298,28 +1337,28 @@ void KM5S_OBCSetPara(UBYTE* Data)
         cp_stFlg.ParaAssistUpdateFinishFlg = TRUE;
     }
 
-//    /*轮径更新*/
-//    if(stOBC_SetInfo.ucWheelDiameterCode <= 5)
-//    {
-//        tmpdata = (stOBC_SetInfo.ucWheelDiameterCode*2 + 16) * 8;    //3.14*2.54=7.9756=8
-//    }
-//    else if(stOBC_SetInfo.ucWheelDiameterCode == 6)
-//    {
-//        tmpdata = 219;    //3.14*700mm=2198mm
-//    }
-//    else
-//    {
-//        tmpdata = 223;    //3.14*2.54*28
-//    }
-//    if(MC_UpcInfo.stBikeInfo.uwWheelPerimeter != tmpdata)
-//    {
-//        MC_UpcInfo.stBikeInfo.uwWheelPerimeter = tmpdata;
-//        MC_UpcInfo.stBikeInfo.uwSaveFlg = 1;
-//        cp_stFlg.ParaSaveEEFlg = TRUE;
-//        cp_stFlg.ParaUpdateFlg = TRUE;
-//        cp_stFlg.ParaBikeInfoUpdateFlg = TRUE;
-//        cp_stFlg.ParaAssistUpdateFinishFlg = TRUE;
-//    }
+    /*轮径更新*/
+    if(stOBC_SetInfo.ucWheelDiameterCode <= 5)
+    {
+        tmpdata = (stOBC_SetInfo.ucWheelDiameterCode*2 + 16) * 8;    //3.14*2.54=7.9756=8
+    }
+    else if(stOBC_SetInfo.ucWheelDiameterCode == 6)
+    {
+        tmpdata = 219;    //3.14*700mm=2198mm
+    }
+    else
+    {
+        tmpdata = 223;    //3.14*2.54*28
+    }
+    if(MC_UpcInfo.stBikeInfo.uwWheelPerimeter != tmpdata)
+    {
+        MC_UpcInfo.stBikeInfo.uwWheelPerimeter = tmpdata;
+        MC_UpcInfo.stBikeInfo.uwSaveFlg = 1;
+        cp_stFlg.ParaSaveEEFlg = TRUE;
+        cp_stFlg.ParaUpdateFlg = TRUE;
+        cp_stFlg.ParaBikeInfoUpdateFlg = TRUE;
+        cp_stFlg.ParaAssistUpdateFinishFlg = TRUE;
+    }
 }
 
 void KM5S_SendData_OBC(USART_Buf_TypeDef* ptUartTx, UBYTE Mode, UBYTE Length, UBYTE checknum)

+ 3 - 3
4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/syspar.h

@@ -49,17 +49,17 @@ Update Time
 #define BIKE_TYPE_R168          0x01
 #define BIKE_TYPE_R224          0x02
 #define BIKE_TYPE_R191          0x03
-#define BIKE_TYPE_SEL           BIKE_TYPE_R191
+#define BIKE_TYPE_SEL           BIKE_TYPE_R219
 
 #define BIKE_SPEED_LIMIT_25     0x0 
 #define BIKE_SPEED_LIMIT_32     0x1 
 #define BIKE_SPEED_LIMIT_45     0x2 
-#define BIKE_SPEED_LIMIT_SEL    BIKE_SPEED_LIMIT_25
+#define BIKE_SPEED_LIMIT_SEL    BIKE_SPEED_LIMIT_32
 
 #define BIKE_THROTTLE_SPEED_LIMIT_25  0x0 
 #define BIKE_THROTTLE_SPEED_LIMIT_32  0x1 
 #define BIKE_THROTTLE_SPEED_LIMIT_45  0x2 
-#define BIKE_THROTTLE_SPEED_LIMIT_SEL    BIKE_THROTTLE_SPEED_LIMIT_25
+#define BIKE_THROTTLE_SPEED_LIMIT_SEL    BIKE_THROTTLE_SPEED_LIMIT_32
 /*======================================================================*
     uart2关闭与打开
     0-打开UART2  1- 关闭uart2-Simulation

+ 84 - 0
at32f421_int.c → m0g3507_int.c

@@ -36,6 +36,7 @@
 //#include "at32f421_adc.h"
 //#include "at32f421_tmr.h"
 #include "usart.h"
+#include "can.h"
 //#include "SEGGER_RTT.h"
 #include "bikelight.h"
 #include "UserGpio_Config.h"
@@ -1391,6 +1392,89 @@ void UART0_IRQHandler(void)
 //    USARTx_Tx_IRQ(&UART_TxBuff_Struct_BMS);
 //}
 //
+ULONG id = 0;
+void MCAN0_INST_IRQHandler(void)
+{
+    volatile ULONG gInterruptLine1Status = 0;
+    DL_MCAN_RxFIFOStatus rxFS;
+
+    switch (DL_MCAN_getPendingInterrupt(MCAN0_INST)) {
+            case DL_MCAN_IIDX_LINE1:
+                /* Check MCAN interrupts fired during TX/RX of CAN package */
+                gInterruptLine1Status |= DL_MCAN_getIntrStatus(MCAN0_INST);
+                DL_MCAN_clearIntrStatus(MCAN0_INST, gInterruptLine1Status,DL_MCAN_INTR_SRC_MCAN_LINE_1);
+
+                if ((gInterruptLine1Status & MCAN_IR_RF0N_MASK) == MCAN_IR_RF0N_MASK)
+                {
+                    rxFS.fillLvl = 0;
+                    rxFS.num = DL_MCAN_RX_FIFO_NUM_0;
+                    while ((rxFS.fillLvl) == 0)
+                    {
+                        DL_MCAN_getRxFIFOStatus(MCAN0_INST, &rxFS);
+                    }
+
+                    DL_MCAN_readMsgRam(MCAN0_INST, DL_MCAN_MEM_TYPE_FIFO, 0U, rxFS.num, pRxMsg);
+
+                    DL_MCAN_writeRxFIFOAck(MCAN0_INST, rxFS.num, rxFS.getIdx);
+
+                    if(pRxMsg->xtd == 0)
+                    {
+                        id = ((pRxMsg->id) & 0x1FFC0000)>>18;
+                    }
+                    else
+                    {
+                        id = pRxMsg->id & 0x1FFFFFFF;
+                    }
+
+                    if(pRxMsg->xtd == ID_MODE_STANDARD)
+                    {
+                        //11-bit standard identifier
+                        switch (id)
+                        {
+                            case ID_PBU_BC:
+                            case ID_PBU_TO_MC: //接收PBU数据
+                            {
+                                CAN_RxBuf_Struct_PBU.ulBufID = id;
+                                CAN_Rx_ISR(&CAN_RxBuf_Struct_PBU, pRxMsg->dlc);
+                                break;
+                            }
+                            case ID_BMS_BC:
+                            case ID_BMS_TO_MC: //接收BMS数据
+                            {
+                                CAN_RxBuf_Struct_BMS.ulBufID = id;
+                                CAN_Rx_ISR(&CAN_RxBuf_Struct_BMS, pRxMsg->dlc);
+                                break;
+                            }
+                            case ID_HMI_BC:
+                            case ID_HMI_TO_MC: //接收HMI数据
+                            {
+                                CAN_RxBuf_Struct_HMI.ulBufID = id;
+                                CAN_Rx_ISR(&CAN_RxBuf_Struct_HMI, pRxMsg->dlc);
+                                break;
+                            }
+                            case ID_CDL_BC:
+                            case ID_CDL_TO_MC: // case ID_CDL_TO_MC_TE://接收CDL数据
+                            {
+                                CAN_RxBuf_Struct_CDL.ulBufID = id;
+                                CAN_Rx_ISR(&CAN_RxBuf_Struct_CDL, pRxMsg->dlc);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                    }
+                    else
+                    {
+                        //29-bit extended identifier
+                    }
+
+                    gInterruptLine1Status &= ~(MCAN_IR_RF0N_MASK);
+                }
+                break;
+            default:
+                break;
+        }
+}
 ///**
 //  * @brief  this function handles EXINT Line 1 & 0 handler.
 //  * @param  none

+ 32 - 2
mspm0g3507.syscfg

@@ -76,8 +76,8 @@ const mux8       = system.clockTree["HSCLKMUX"];
 mux8.inputSelect = "HSCLKMUX_SYSPLL2X";
 
 const pinFunction4       = system.clockTree["HFXT"];
-pinFunction4.inputFreq   = 16;
-pinFunction4.HFXTStartup = 16;
+pinFunction4.inputFreq   = 8;
+pinFunction4.HFXTStartup = 40;
 
 ADC121.$name                       = "ADC12_0";
 ADC121.trigSrc                     = "DL_ADC12_TRIG_SRC_EVENT";
@@ -238,6 +238,36 @@ MCAN1.desiredNomRate           = 250;
 MCAN1.fdMode                   = false;
 MCAN1.emulationEnable          = true;
 MCAN1.autoWkupEnable           = true;
+MCAN1.txpEnable                = true;
+MCAN1.wkupReqEnable            = true;
+MCAN1.lss                      = 0;
+MCAN1.flesa                    = 0;
+MCAN1.lse                      = 0;
+MCAN1.txStartAddr              = 0;
+MCAN1.txBufNum                 = 0;
+MCAN1.txFIFOSize               = 32;
+MCAN1.txBufElemSize            = "DL_MCAN_ELEM_SIZE_8BYTES";
+MCAN1.txEventFIFOStartAddr     = 0;
+MCAN1.txEventFIFOSize          = 32;
+MCAN1.txEventFIFOWaterMark     = 25;
+MCAN1.rxFIFO0startAddr         = 0;
+MCAN1.rxFIFO0size              = 32;
+MCAN1.rxFIFO0waterMark         = 25;
+MCAN1.rxFIFO1startAddr         = 0;
+MCAN1.rxFIFO1size              = 32;
+MCAN1.rxFIFO1waterMark         = 25;
+MCAN1.rxBufStartAddr           = 0;
+MCAN1.rxBufElemSize            = "DL_MCAN_ELEM_SIZE_8BYTES";
+MCAN1.rxFIFO0ElemSize          = "DL_MCAN_ELEM_SIZE_8BYTES";
+MCAN1.rxFIFO1ElemSize          = "DL_MCAN_ELEM_SIZE_8BYTES";
+MCAN1.additionalCoreConfig     = true;
+MCAN1.overrideRetention        = true;
+MCAN1.enableInterrupt          = true;
+MCAN1.interruptFlags           = ["DL_MCAN_INTERRUPT_RF0N","DL_MCAN_INTERRUPT_TC","DL_MCAN_INTERRUPT_TEFN"];
+MCAN1.interruptLine            = ["DL_MCAN_INTR_LINE_NUM_1"];
+MCAN1.interruptLine1Flag       = ["DL_MCAN_INTR_MASK_ALL"];
+MCAN1.m0interrupts             = ["DL_MCAN_MSP_INTERRUPT_LINE1"];
+MCAN1.tdcEnable                = true;
 MCAN1.peripheral.$assign       = "CANFD0";
 MCAN1.peripheral.rxPin.$assign = "PA13";
 MCAN1.peripheral.txPin.$assign = "PA12";

+ 51 - 26
targetConfigs/MSPM0G3507.ccxml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-                                            
+                                                
+    
     
     
     
@@ -11,7 +12,8 @@
     
     
     <configuration XML_version="1.2" id="configuration_0">
-                                                                                        
+                                                                                                
+        
         
         
         
@@ -22,7 +24,8 @@
         
         
         <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
-                                                                                        
+                                                                                                
+        
         
         
         
@@ -33,7 +36,8 @@
         
         
         <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe">
-                                                                                                                                    
+                                                                                                                                                
+            
             
             
             
@@ -44,7 +48,8 @@
             
             
             <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
-                                                                                                                                    
+                                                                                                                                                
+            
             
             
             
@@ -55,7 +60,8 @@
             
             
             <instance XML_version="1.2" href="drivers/tixds510cortexM0.xml" id="drivers" xml="tixds510cortexM0.xml" xmlpath="drivers"/>
-                                                                                                                                    
+                                                                                                                                                
+            
             
             
             
@@ -66,7 +72,8 @@
             
             
             <instance XML_version="1.2" href="drivers/tixds510sec_ap.xml" id="drivers" xml="tixds510sec_ap.xml" xmlpath="drivers"/>
-                                                                                                                                    
+                                                                                                                                                
+            
             
             
             
@@ -77,7 +84,8 @@
             
             
             <property Type="choicelist" Value="1" id="The JTAG TCLK Frequency (MHz)">
-                                                                                                                                                                                
+                                                                                                                                                                                                
+                
                 
                 
                 
@@ -88,7 +96,8 @@
                 
                 
                 <choice Name="Fixed with user specified value" value="SPECIFIC">
-                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                
+                    
                     
                     
                     
@@ -99,7 +108,8 @@
                     
                     
                     <property Type="stringfield" Value="1MHz" id="-- Enter a value from 100.0kHz to 2.5MHz"/>
-                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                            
+                
                 
                 
                 
@@ -110,7 +120,8 @@
                 
                 
                 </choice>
-                                                                                                                                                                            
+                                                                                                                                                                                            
+            
             
             
             
@@ -121,7 +132,8 @@
             
             
             </property>
-                                                                                                                                    
+                                                                                                                                                
+            
             
             
             
@@ -132,7 +144,8 @@
             
             
             <property Type="choicelist" Value="2" id="SWD Mode Settings">
-                                                                                                                                                                                
+                                                                                                                                                                                                
+                
                 
                 
                 
@@ -143,7 +156,8 @@
                 
                 
                 <choice Name="SWD Mode - Aux COM port is target TDO pin" value="nothing"/>
-                                                                                                                                                                            
+                                                                                                                                                                                            
+            
             
             
             
@@ -154,7 +168,8 @@
             
             
             </property>
-                                                                                                                                    
+                                                                                                                                                
+            
             
             
             
@@ -165,7 +180,8 @@
             
             
             <property Type="choicelist" Value="1" id="Debug Probe Selection">
-                                                                                                                                                                
+                                                                                                                                                                                
+                
                 
                 
                 
@@ -175,7 +191,8 @@
                 
                 
                 <choice Name="Select by serial number" value="0">
-                                                                                                                                                                                                        
+                                                                                                                                                                                                                            
+                    
                     
                     
                     
@@ -184,8 +201,9 @@
                     
                     
                     
-                    <property Type="stringfield" Value="LS4102GZ" id="-- Enter the serial number"/>
-                                                                                                                                                                                                    
+                    <property Type="stringfield" Value="LS4100IY" id="-- Enter the serial number"/>
+                                                                                                                                                                                                                        
+                
                 
                 
                 
@@ -195,7 +213,8 @@
                 
                 
                 </choice>
-                                                                                                                                                            
+                                                                                                                                                                            
+            
             
             
             
@@ -205,7 +224,8 @@
             
             
             </property>
-                                                                                                                        
+                                                                                                                                    
+            
             
             
             
@@ -215,7 +235,8 @@
             
             
             <platform XML_version="1.2" id="platform_0">
-                                                                                                                                                                                
+                                                                                                                                                                                                
+                
                 
                 
                 
@@ -226,7 +247,8 @@
                 
                 
                 <instance XML_version="1.2" desc="MSPM0G3507" href="devices/MSPM0G3507.xml" id="MSPM0G3507" xml="MSPM0G3507.xml" xmlpath="devices"/>
-                                                                                                                                                                            
+                                                                                                                                                                                            
+            
             
             
             
@@ -237,7 +259,8 @@
             
             
             </platform>
-                                                                                                                                
+                                                                                                                                            
+        
         
         
         
@@ -248,7 +271,8 @@
         
         
         </connection>
-                                                                                    
+                                                                                            
+    
     
     
     
@@ -259,7 +283,8 @@
     
     
     </configuration>
-                                        
+                                            
+
 
 
 

部分文件因文件數量過多而無法顯示