Merge pull request #48 from RapidScada/develop

Merge Develop to Master
RapidScada · Apr 2, 2023 · 9c64af6 · 9c64af6
2 parents 7987b50 + 04443ec
commit 9c64af6
Show file tree

Hide file tree

Showing 44 changed files with 684 additions and 595 deletions.
diff --git a/Projects/WirenBoardDemo/Instances/Default/ScadaComm/Config/DrvTelegram_031.xml b/Projects/WirenBoardDemo/Instances/Default/ScadaComm/Config/DrvTelegram_031.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TelegramDeviceConfig>
-  <BotToken>xxx</BotToken>
+  <BotToken>BE9876390BA068A080E28AC328C935CD</BotToken>
   <Subscriptions>
     <Subscription chatID="-701200758" name="RS_WB_Demo_Group" />
   </Subscriptions>

diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.Designer.cs b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.Designer.cs
diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.cs b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.cs
@@ -38,7 +38,7 @@ private void SetColumnNames()
             colOptionName.Name = nameof(colOptionName);
             colOptionValue.Name = nameof(colOptionValue);
         }
-        
+
         /// <summary>
         /// Enables or disables the controls.
         /// </summary>