Forráskód Böngészése

feat(canAppl): 添加自动更新软件版本号,以及软件提交时间功能

CN\zhangkai71 2 éve
szülő
commit
87f09b5352

+ 3 - 3
User project/3.BasicFunction/Include/fp.def

@@ -1,5 +1,5 @@
-#define FINGER_PRINT "8bc56ac-d"
-#define COMMIT_TIME "2023-07-18 09:26:32"
+#define FINGER_PRINT "6e45bc2-d"
+#define COMMIT_TIME "20230718 11:28:41"
 #define COMMIT_AUTHOR "CN\zhangkai71"
-#define COMPLIE_TIME "2023-07-18 11:23:53"
+#define COMPLIE_TIME "20230718 11:32:43"
 #define COMPLIE_AUTHOR "CN\zhangkai71"

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

@@ -217,10 +217,14 @@ void Can_voInitMC_Run(void)
 #else
 	strncpy(MC_VerInfo.HW_Version, (char *)"TEST.           ", 16);
 #endif
+        
     // Software version
-    strncpy(MC_VerInfo.FW_Version, (char *)"V0r1r9_20230607.", 16);
+    char chFwVersion[16]="V0r1r9_";
+    strncat(chFwVersion,COMMIT_TIME,9);
+    strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
+    
     // Firmware Special Info
-    char chFrimware[32]="TC00000-MC00000-V0r0.";
+    char chFrimware[32]="TC00000-MC00000-V0r0.  ";
     strncat(chFrimware,FINGER_PRINT,9);
     strncpy(Firmware_Special, (char *)chFrimware, 32);
 //    strncpy(Firmware_Special, (char *)"TC00000-MC00000-V0r0.           ", 32);

+ 3 - 3
tools/fp.def

@@ -1,5 +1,5 @@
-#define FINGER_PRINT "8bc56ac-d"
-#define COMMIT_TIME "2023-07-18 09:26:32"
+#define FINGER_PRINT "6e45bc2-d"
+#define COMMIT_TIME "20230718 11:28:41"
 #define COMMIT_AUTHOR "CN\zhangkai71"
-#define COMPLIE_TIME "2023-07-18 11:23:53"
+#define COMPLIE_TIME "20230718 11:32:43"
 #define COMPLIE_AUTHOR "CN\zhangkai71"

+ 2 - 2
tools/gen_fingerprint.ps1

@@ -22,8 +22,8 @@ else
     $fp = $sha+"-c"
 }
 
-$commitTime = $dt.ToString("yyyy-MM-dd HH:mm:ss")
-$compleTime = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
+$commitTime = $dt.ToString("yyyyMMdd HH:mm:ss")
+$compleTime = Get-Date -Format "yyyyMMdd HH:mm:ss"
 $author = &"git" config user.name
 
 $fileName = $toolPath+"\fp.def"