diff --git a/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c b/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c index f96aad9..3083244 100644 --- a/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c +++ b/Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c @@ -428,7 +428,7 @@ void IV_control() IV.Left_Motor_Err = GV.LeftMotor.Motor_Fault; IV.Right_Motor_Err = GV.RightMotor.Motor_Fault; IV.TimeStamp = SystemTimeMiliCount; - IV.STM_Version = 202; + IV.STM_Version = 203; } /* 测试喷枪控制* */ void PaintGunControl() diff --git a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin index 24e5b50..dac87b1 100644 Binary files a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin and b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin differ diff --git a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock index 4db0d37..74b2b0b 100644 Binary files a/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock and b/PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock differ diff --git a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin index d515371..75d053c 100644 Binary files a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin and b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin differ diff --git a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock index 737e505..5b95b21 100644 Binary files a/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock and b/PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock differ diff --git a/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin b/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin index 6a9d827..079238b 100644 Binary files a/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin and b/PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin differ diff --git a/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a58bcbf..f1688cc 100644 Binary files a/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin b/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin index f0ec6bb..5a92dc7 100644 Binary files a/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin and b/PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/PaintingappV2.03/.gradle/file-system.probe b/PaintingappV2.03/.gradle/file-system.probe index 0a76558..1d298d2 100644 Binary files a/PaintingappV2.03/.gradle/file-system.probe and b/PaintingappV2.03/.gradle/file-system.probe differ diff --git a/PaintingappV2.03/app/src/main/res/layout/activity_main.xml b/PaintingappV2.03/app/src/main/res/layout/activity_main.xml index 38e4f8f..4ded5b0 100644 --- a/PaintingappV2.03/app/src/main/res/layout/activity_main.xml +++ b/PaintingappV2.03/app/src/main/res/layout/activity_main.xml @@ -59,7 +59,7 @@ android:layout_height="match_parent" android:layout_weight="2" android:gravity="center" - android:text="2.02" + android:text="@string/app_V" android:textColor="@color/navy_blue" android:textSize="20sp" android:textStyle="bold" /> diff --git a/PaintingappV2.03/app/src/main/res/values/strings.xml b/PaintingappV2.03/app/src/main/res/values/strings.xml index 98750ac..f068f89 100644 --- a/PaintingappV2.03/app/src/main/res/values/strings.xml +++ b/PaintingappV2.03/app/src/main/res/values/strings.xml @@ -1,8 +1,10 @@ - 喷漆v2.02 + 喷漆v2.03 + 2.03 当前状态 软件版本 stm版本 + 目标速度 当前速度