Browse Source

解决仪表显示转把限速为0问题

Ye Jin 1 năm trước cách đây
mục cha
commit
643e738334

+ 1 - 1
User project/3.BasicFunction/Source/can.c

@@ -448,7 +448,7 @@ void DataProcess(UWORD ID, UBYTE Mode, UWORD Cmd, UBYTE Data[]) /* parasoft-supp
         {
             OBC_SetCustomPara.uwWheelPerimeter = (UBYTE)ass_stParaCong.uwWheelPerimeter;
             OBC_SetCustomPara.StartUpMod = (UBYTE)ass_stParaCong.uwStartMode;
-            OBC_SetCustomPara.BikeSpeedLimit = (UBYTE)ass_stParaCong.uwAssistMaxSpdKmH;
+            OBC_SetCustomPara.BikeSpeedLimit = (UBYTE)ass_stParaSet.uwAssistLimitBikeSpdStart;
             OBC_SetCustomPara.DeltDiameter =(SBYTE) ass_stParaCong.swDeltPerimeter;
             OBC_SetCustomPara.AssistMod = (UBYTE)ass_stParaSet.uwAsssistSelectNum;
             OBC_SetCustomPara.AutoPowerOffTime = (UBYTE)ass_stParaCong.uwAutoPowerOffTime;

+ 2 - 2
User project/3.BasicFunction/Source/canAppl.c

@@ -206,7 +206,7 @@ void Can_voUpdateMC_UpcInfo(void)
 
     OBC_SetCustomPara.uwWheelPerimeter = (UBYTE)ass_stParaCong.uwWheelPerimeter;
     OBC_SetCustomPara.StartUpMod =  (UBYTE)ass_stParaCong.uwStartMode;
-    OBC_SetCustomPara.BikeSpeedLimit =  (UBYTE)ass_stParaCong.uwAssistMaxSpdKmH;
+    OBC_SetCustomPara.BikeSpeedLimit =  (UBYTE)ass_stParaSet.uwAssistLimitBikeSpdStart;
     OBC_SetCustomPara.DeltDiameter =  (SBYTE)ass_stParaCong.swDeltPerimeter;
     OBC_SetCustomPara.AssistMod =  (UBYTE)ass_stParaSet.uwAsssistSelectNum;
     OBC_SetCustomPara.AutoPowerOffTime =  (UBYTE)ass_stParaCong.uwAutoPowerOffTime;
@@ -238,7 +238,7 @@ void Can_voInitMC_Run(void)
     memcpy((uint8_t*)(MC_VerInfo.HW_Version + 12), (uint8_t*)(&MCU_ID_CRC32), 4);
     
     // Software version
-    char chFwVersion[16]="V1r0r2_";
+    char chFwVersion[16]="V1r0r3_";
     strncat(chFwVersion,COMMIT_TIME,9);
     strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
     

+ 3 - 2
User project/3.BasicFunction/Source/flash_master.c

@@ -49,7 +49,8 @@ void FLASH_voReadMoreData(ULONG startAddress, UWORD readData[], UWORD countToRea
 #include "gd32f30x.h"
 #include "queue.h"
 #include "string.h"
-#include "AssistCurve.h"  
+#include "AssistCurve.h"
+#include "user.h"
 /*************************************************************************
  Exported Functions (N/A)
 *************************************************************************/
@@ -127,7 +128,7 @@ void flash_voParaInit(void)
     strncpy(flash_stPara.ubMotorVersion, (char *)"MIGIC_T1", 8);
     strncpy(flash_stPara.ubProdInfo.MacBrand, (char *)"MM_MT1", 6);
 #elif ((MOTOR_ID_SEL == MOTOR_WELLING_CITY_36V) || (MOTOR_ID_SEL == MOTOR_WELLING_CITY_48V))
-    strncpy(MC_VerInfo.HW_Version, (char *)"MIGIC_C1", 8);
+    strncpy(flash_stPara.ubMotorVersion, (char *)"MIGIC_C1", 8);
     strncpy(flash_stPara.ubProdInfo.MacBrand, (char *)"MM_MC1", 6);
 #endif
     strncpy(flash_stPara.ubProdInfo.Manufacturer, (char *)"TTIUM", 5);