Browse Source

【paint2.03】修改IV版本、安卓界面版本

master
parent
commit
d35d922d76
  1. 2
      Paint_UDPV2_03/Core/FSM/Src/fsm_state_control.c
  2. BIN
      PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin
  3. BIN
      PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock
  4. BIN
      PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin
  5. BIN
      PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock
  6. BIN
      PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin
  7. BIN
      PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock
  8. BIN
      PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin
  9. BIN
      PaintingappV2.03/.gradle/file-system.probe
  10. 2
      PaintingappV2.03/app/src/main/res/layout/activity_main.xml
  11. 4
      PaintingappV2.03/app/src/main/res/values/strings.xml

2
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.Left_Motor_Err = GV.LeftMotor.Motor_Fault;
IV.Right_Motor_Err = GV.RightMotor.Motor_Fault; IV.Right_Motor_Err = GV.RightMotor.Motor_Fault;
IV.TimeStamp = SystemTimeMiliCount; IV.TimeStamp = SystemTimeMiliCount;
IV.STM_Version = 202; IV.STM_Version = 203;
} }
/* 测试喷枪控制* */ /* 测试喷枪控制* */
void PaintGunControl() void PaintGunControl()

BIN
PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.bin

Binary file not shown.

BIN
PaintingappV2.03/.gradle/8.2/executionHistory/executionHistory.lock

Binary file not shown.

BIN
PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.bin

Binary file not shown.

BIN
PaintingappV2.03/.gradle/8.2/fileHashes/fileHashes.lock

Binary file not shown.

BIN
PaintingappV2.03/.gradle/8.2/fileHashes/resourceHashesCache.bin

Binary file not shown.

BIN
PaintingappV2.03/.gradle/buildOutputCleanup/buildOutputCleanup.lock

Binary file not shown.

BIN
PaintingappV2.03/.gradle/buildOutputCleanup/outputFiles.bin

Binary file not shown.

BIN
PaintingappV2.03/.gradle/file-system.probe

Binary file not shown.

2
PaintingappV2.03/app/src/main/res/layout/activity_main.xml

@ -59,7 +59,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
android:gravity="center" android:gravity="center"
android:text="2.02" android:text="@string/app_V"
android:textColor="@color/navy_blue" android:textColor="@color/navy_blue"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" /> android:textStyle="bold" />

4
PaintingappV2.03/app/src/main/res/values/strings.xml

@ -1,8 +1,10 @@
<resources> <resources>
<string name="app_name">喷漆v2.02</string> <string name="app_name">喷漆v2.03</string>
<string name="app_V">2.03</string>
<string name="信号状态">当前状态</string> <string name="信号状态">当前状态</string>
<string name="appversion">软件版本</string> <string name="appversion">软件版本</string>
<string name="stmversion">stm版本</string> <string name="stmversion">stm版本</string>
<string name="moveSpeed">目标速度</string> <string name="moveSpeed">目标速度</string>
<string name="currentSpeed">当前速度</string> <string name="currentSpeed">当前速度</string>

Loading…
Cancel
Save