From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Common/R.cs | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 26caecc..90a0a72 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -510,7 +510,7 @@
/// </summary>
public const int SuctionAdjustment = 1025;
/// <summary>
- ///鍚稿姏1妗�
+ /// 鍚稿姏1妗�
/// </summary>
public const int SuctionOneGear = 1026;
/// <summary>
@@ -545,6 +545,67 @@
/// 鍘嗗彶璁板綍
/// </summary>
public const int HistoryLog = 1034;
+ /// <summary>
+ /// 鑷姩娓呮壂
+ /// </summary>
+ public const int AutoClean = 1035;
+ /// <summary>
+ /// 瀹氱偣娓呮壂
+ /// </summary>
+ public const int FixedPointClean = 1036;
+ /// <summary>
+ /// 娌垮娓呮壂
+ /// </summary>
+ public const int WallClean = 1037;
+ /// <summary>
+ /// 鍖哄煙娓呮壂
+ /// </summary>
+ public const int AreaClean = 1038;
+ /// <summary>
+ /// 鎬绘竻娲侀潰绉�
+ /// </summary>
+ public const int TotalCleanArea = 1039;
+ /// <summary>
+ /// 鎬绘竻娲佹椂闂�
+ /// </summary>
+ public const int TotalCleaningTime = 1040;
+ /// <summary>
+ /// 杈瑰埛鍓╀綑瀵垮懡
+ /// </summary>
+ public const int RemainingLifeOfSideBrush = 1041;
+ /// <summary>
+ /// 婊氬埛鍓╀綑瀵垮懡
+ /// </summary>
+ public const int RemainingLifeOfRollerBrush = 1042;
+ /// <summary>
+ /// 婊ょ綉鍓╀綑瀵垮懡
+ /// </summary>
+ public const int RemainingLifeOfFilterScreen = 1043;
+ /// <summary>
+ /// 閲嶇疆杈瑰埛
+ /// </summary>
+ public const int ResetSideBrush = 1044;
+ /// <summary>
+ /// 閲嶇疆婊氬埛
+ /// </summary>
+ public const int ResetRollerBrush = 1045;
+ /// <summary>
+ /// 閲嶇疆婊ょ綉
+ /// </summary>
+ public const int ResetFilterScreen = 1046;
+ /// <summary>
+ /// 鏄惁閲嶇疆杈瑰埛
+ /// </summary>
+ public const int ResetSideBrushMsg = 1047;
+ /// <summary>
+ /// 鏄惁閲嶇疆婊氬埛
+ /// </summary>
+ public const int ResetRollerBrushMsg = 1048;
+ /// <summary>
+ /// 鏄惁閲嶇疆婊ょ綉
+ /// </summary>
+ public const int ResetFilterScreenMsg = 1049;
+
public const int a31Music = 5000;
--
Gitblit v1.8.0