v2.43

- Fix bug import csv template with hex values
- Added feature to avoid sending commands selecting cells in the live edit

Author: fedeturco

ModBus_Client/Config/SettingsToSave.json

@@ -62,7 +62,8 @@
       "CheckBoxUseOnlyReadSingleRegistersForGroups": {},
       "CheckBoxPreviewimportWriteMultipleRegisters": {},
       "CheckBoxPreviewImportCloseWindowAfterWrite": {},
-      "CheckBoxPreviewImportAbortOnError": {}
+      "CheckBoxPreviewImportAbortOnError": {},
+      "CheckBoxSendCellEditOnlyOnChange": {}
     },
     "menuItems": {
       "viewTabCoilsOffset": {},

ModBus_Client/Lang/EN.json

@@ -124,7 +124,8 @@
     "CheckBoxUseOnlyReadSingleRegistersForGroups": "Use only \"ReadSingleRegister\" for group resources",
     "CheckBoxPreviewimportWriteMultipleRegisters": "Write multiple registers (FC15 / FC16)",
     "CheckBoxPreviewImportCloseWindowAfterWrite": "Close window after write",
-    "CheckBoxPreviewImportAbortOnError": "Abort write on error"
+    "CheckBoxPreviewImportAbortOnError": "Abort write on error",
+    "CheckBoxSendCellEditOnlyOnChange": "Send cell edits only on change"
   },
   "buttons": {
     "buttonUpdateSerialList": "Update",

ModBus_Client/Lang/IT.json

@@ -124,7 +124,8 @@
     "CheckBoxUseOnlyReadSingleRegistersForGroups": "Usa solo \"ReadSingleRegister\" per risorse di gruppo",
     "CheckBoxPreviewimportWriteMultipleRegisters": "Write multiple registers (FC15 / FC16)",
     "CheckBoxPreviewImportCloseWindowAfterWrite": "Chiudi finestra al termine",
-    "CheckBoxPreviewImportAbortOnError": "Interrompi in caso di errore"
+    "CheckBoxPreviewImportAbortOnError": "Interrompi in caso di errore",
+    "CheckBoxSendCellEditOnlyOnChange": "Invia modifiche celle solo su variazione"
   },
   "buttons": {
     "buttonUpdateSerialList": "Aggiorna",

ModBus_Client/ModBus_Client.xaml

@@ -1262,6 +1262,7 @@
                     <CheckBox x:Name="CheckBoxPreviewImportAbortOnError" Content="Abort write on error" HorizontalAlignment="Left" Margin="43,402,0,0" VerticalAlignment="Top"/>
                     <Label x:Name="labelSettings_7" Content="Nr. of registers multiple write:" HorizontalAlignment="Left" Margin="44,424,0,0" VerticalAlignment="Top"/>
                     <TextBox x:Name="textBoxReadTimeout_Copy" HorizontalAlignment="Left" Height="23" Margin="325,424,0,0" TextWrapping="Wrap" Text="123" VerticalAlignment="Top" Width="69" TextChanged="TextBoxReadTimeout_TextChanged"/>
+                    <CheckBox x:Name="CheckBoxSendCellEditOnlyOnChange" Content="Invia modifiche celle solo su variazione" HorizontalAlignment="Left" Margin="44,271,0,0" VerticalAlignment="Top" Checked="CheckBoxSendCellEditOnlyOnChange_Checked" Unchecked="CheckBoxSendCellEditOnlyOnChange_Checked"/>
                 </Grid>
             </TabItem>
         </TabControl>

ModBus_Client/ModBus_Client.xaml.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.42.*")]
+[assembly: AssemblyVersion("2.43.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

ModBus_Client/Properties/AssemblyInfo.cs

@@ -475,7 +475,7 @@ public void ExportCsvCoils()
 
             this.Dispatcher.Invoke((Action)delegate
             {
-                offset = comboBoxCoilsOffset.SelectedIndex == 1 ? "0x" : "" + textBoxCoilsOffset.Text;
+                offset = (comboBoxCoilsOffset.SelectedIndex == 1 ? "0x" : "") + textBoxCoilsOffset.Text;
                 registerHex = comboBoxCoilsRegistri.SelectedIndex == 1;
             });
 
@@ -512,7 +512,7 @@ public void ExportCsvInputs()
 
             this.Dispatcher.Invoke((Action)delegate
             {
-                offset = comboBoxInputOffset.SelectedIndex == 1 ? "0x" : "" + textBoxInputOffset.Text;
+                offset = (comboBoxInputOffset.SelectedIndex == 1 ? "0x" : "") + textBoxInputOffset.Text;
                 registerHex = comboBoxInputRegistri.SelectedIndex == 1;
             });
 
@@ -549,7 +549,7 @@ public void ExportCsvInputRegisters()
 
             this.Dispatcher.Invoke((Action)delegate
             {
-                offset = comboBoxInputRegOffset.SelectedIndex == 1 ? "0x" : "" + textBoxInputRegOffset.Text;
+                offset = (comboBoxInputRegOffset.SelectedIndex == 1 ? "0x" : "") + textBoxInputRegOffset.Text;
                 registerHex = comboBoxInputRegRegistri.SelectedIndex == 1;
             });
 
@@ -586,7 +586,7 @@ public void ExportCsvHoldingRegisters()
 
             this.Dispatcher.Invoke((Action)delegate
             {
-                offset = comboBoxHoldingOffset.SelectedIndex == 1 ? "0x" : "" + textBoxHoldingOffset.Text;
+                offset = (comboBoxHoldingOffset.SelectedIndex == 1 ? "0x" : "") + textBoxHoldingOffset.Text;
                 registerHex = comboBoxHoldingRegistri.SelectedIndex == 1;
             });
 
@@ -631,16 +631,20 @@ public void exportCsv(ObservableCollection<ModBus_Item> collection, String appen
                             content += offset + (registerHex ? ",0x" : ",") + item.Register + "," + item.Value + "," + item.Notes + "," + item.Mappings + "," + item.Group + "\n";
                             counter++;
 
-                            if (counter % (collection.Count / 100) == 0)
+                            try
                             {
-                                if (counter % (collection.Count / 100) == 0)
+                                if (collection.Count > 100)
                                 {
-                                    this.Dispatcher.Invoke((Action)delegate
+                                    if (counter % (collection.Count / 100) == 0)
                                     {
-                                        TaskbarItemInfo.ProgressValue = (double)(counter) / (double)(collection.Count);
-                                    });
+                                        this.Dispatcher.Invoke((Action)delegate
+                                        {
+                                            TaskbarItemInfo.ProgressValue = (double)(counter) / (double)(collection.Count);
+                                        });
+                                    }
                                 }
                             }
+                            catch { }
                         }
                     }
 
@@ -655,22 +659,17 @@ public void exportCsv(ObservableCollection<ModBus_Item> collection, String appen
             });
         }
 
-        public void exportCsvThread()
-        {
-
-        }
-
         public void importCsv(ObservableCollection<ModBus_Item> collection, ComboBox comboBox, TextBox textBox, ComboBox comboBoxReg)
         {
-            collection.Clear();
-
             OpenFileDialog window = new OpenFileDialog();
 
             window.Filter = "csv Files | *.csv";
             window.DefaultExt = ".csv";
 
             if ((bool)window.ShowDialog())
             {
+                collection.Clear();
+
                 string content = File.ReadAllText(window.FileName);
                 string[] splitted = content.Split('\n');
 

ModBus_Client/TemplateEditor.xaml.cs

@@ -3,11 +3,11 @@ Client ModBus TCP/RTU per interrogare slave ModBus.
 
 ## Release
 
-### v2.42 New Version
-[ModBus_Client_v2.42 - Portable Zip](https://github.com/fedeturco/ModBus_Client/releases/download/2.42/ModBus_Client_v2.42.zip)
+### v2.43 New Version
+[ModBus_Client_v2.43 - Portable Zip](https://github.com/fedeturco/ModBus_Client/releases/download/2.43/ModBus_Client_v2.43.zip)
 
-### v2.40 Stable
-[ModBus_Client_v2.40 - Portable Zip](https://github.com/fedeturco/ModBus_Client/releases/download/2.40/ModBus_Client_v2.40.zip)
+### v2.42 Stable
+[ModBus_Client_v2.42 - Portable Zip](https://github.com/fedeturco/ModBus_Client/releases/download/2.42/ModBus_Client_v2.42.zip)
 
 ### Manual
 [Manual EN](https://github.com/fedeturco/ModBus_Client/blob/master/ModBus_Client/Manuals/ModBus_Client_EN.pdf)