v2.42

- Fixed bug loading profile group
- Improved csv export speed
- Added context menu datagrids
- Added offset columns in registers datagrids

Author: fedeturco

ModBus_Client/Config/SettingsToSave.json

@@ -55,31 +55,37 @@
       "CheckBoxSendValuesOnEditCoillsTable": {},
       "CheckBoxSendValuesOnEditHoldingTable": {},
       "checkBoxUseOffsetInTextBox": {},
-      "checkBoxFollowModbusProtocol": {},
       "checkBoxCellColorMode": {},
       "checkBoxViewTableWithoutOffset": {},
       "CheckBoxDarkMode": {},
       "checkBoxModbusSecure": {},
-      "CheckBoxUseOnlyReadSingleRegistersForGroups": {}
+      "CheckBoxUseOnlyReadSingleRegistersForGroups": {},
+      "CheckBoxPreviewimportWriteMultipleRegisters": {},
+      "CheckBoxPreviewImportCloseWindowAfterWrite": {},
+      "CheckBoxPreviewImportAbortOnError": {}
     },
     "menuItems": {
+      "viewTabCoilsOffset": {},
       "viewTabCoilsRegisters": {},
       "viewTabCoilsValues": {},
       "viewTabCoilsConvertedValues": {},
       "viewTabCoilsNotes": {},
 
+      "viewTabInputsOffset": {},
       "viewTabInputsRegisters": {},
       "viewTabInputsValues": {},
       "viewTabInputsConvertedValues": {},
       "viewTabInputsNotes": {},
 
+      "viewTabInputRegistersOffset": {},
       "viewTabInputRegistersRegisters": {},
       "viewTabInputRegistersValues": {},
       "viewTabInputRegistersBinaryValues": {},
       "viewTabInputRegistersConvertedValues": {},
       "viewTabInputRegistersNotes": {},
       "viewTabInputRegistersMappings": {},
 
+      "viewTabHoldingRegistersOffset": {},
       "viewTabHoldingRegistersRegisters": {},
       "viewTabHoldingRegistersValues": {},
       "viewTabHoldingRegistersBinaryValues": {},

ModBus_Client/Doc/EN/04_settings.tex

@@ -19,13 +19,6 @@ \chapter{Settings}
     requested
     address 40002. Same for input registers (30001), discrete inputs (10001)
     or coils (00001).
-    \item \textbf{Limit modbus addresses to 9998:}
-    If checked, only address requests between 0 and 9998 (or corresponding address
-    modbus e.g.: 10001-19999/30001-39999/40001-49999) are allowed. Otherwise, the request is sent
-    whatever modbus address is entered. For example, some Beckhoff CPUs provide
-    the words MW0,MW1,... starting at holding register 0x3000 (dec 12288). 
-    By not checking the box
-    you can then also send requests to addresses beyond the value of 9998, up to 65535.
     \item \textbf{Color cells with value > 0 / Alternating color:}
     If checked, only table rows with a value > 0 are colored, otherwise rows
     are colored alternately.
@@ -66,4 +59,16 @@ \chapter{Settings}
     when the connection returns. With the second
     mode this does not happen because the socket is opened for each read 
     and closed immediately after so on a practical level this mode can come in very handy.
+\end{itemize}
+
+Preview import settings:
+\\\\
+The following settings allow you to set the default values
+of the preview import window.
+
+\begin{itemize}
+    \item \textbf{WRITE MULTIPLE REGISTERS (FC15 / FC16):} merge consecutive records into a single command where possible.
+    \item \textbf{CLOSE WINDOW AFTER WRITE:} closes the window automatically when the writing is finished.
+    \item \textbf{ABORT WRITE ON ERROR:} stops the entries in case of an error (otherwise ignores the error and continues with the next entries).
+    \item \textbf{NR. OF REGISTERS MULTIPLE WRITE:} maximum number of registers sent in a single command FC15 / FC16.
 \end{itemize}

ModBus_Client/Doc/EN/05_templates.tex

@@ -68,6 +68,7 @@ \section{Group definition}
 
 In the "Notes" tab of the template window, it is possible to define resource groups
 to be called up later in the main window. It is not necessary to enter the groups in order.
+The tab shows also a summary of the number of registers configured by the user.
 
 \begin{figure}[H]
 \centering

ModBus_Client/Doc/EN/06_preview_import.tex

@@ -0,0 +1,56 @@
+
+\chapter{Preview import}
+
+The preview import window allows
+to import a set of previously exported registers
+in order to send them in bulk to the modbus slave.
+The import window can be opened from the "import" menu, 
+via the import button at the bottom or by pressing the
+right button on the tables in the main window:
+
+\begin{figure}[H]
+\centering
+\includegraphics[width=0.35\textwidth]{../Img/Menu_Import.PNG}
+\caption{Preview import}
+\end{figure}
+
+\begin{figure}[H]
+\centering
+\includegraphics[width=0.35\textwidth]{../Img/PreviewImport_OpenButton.PNG}
+\caption{Preview import}
+\end{figure}
+
+\begin{figure}[H]
+\centering
+\includegraphics[width=0.50\textwidth]{../Img/PreviewImport_Open.PNG}
+\caption{Preview import}
+\end{figure}
+
+From the context menu you can either import a set of records
+copied from a spreadsheet ("paste") or import a file
+.csv/.json ("import"). The "copy" or "cut" commands allow you to copy 
+the table displayed on the clipboard and then paste them into a spreadsheet.
+
+\newpage
+The preview window appears as follows:
+
+\begin{figure}[H]
+\centering
+\includegraphics[width=0.85\textwidth]{../Img/PreviewImport_Main.PNG}
+\caption{Preview import main window}
+\end{figure}
+
+The data displayed in the preview can be copied or pasted
+in the window via the context menu:
+
+\begin{figure}[H]
+\centering
+\includegraphics[width=0.85\textwidth]{../Img/PreviewImport_ContextMenu.PNG}
+\caption{Preview import context menu}
+\end{figure}
+
+The "write single" and "write multiple" commands allow you to send
+the displayed registers as a group (FC15/FC16) or individually (FC05/FC06).
+
+
+

ModBus_Client/Doc/EN/08_dropdown.tex

@@ -52,6 +52,9 @@ \section{Import Menu}
 are consecutive you can choose whether to
 send them individually (write single coil/write single register) or in bulk 
 (write multiple coils/write multiple registers).
+It is possible to directly import a csv/json file or
+directly import cells copied (ctrl+c) from a spreadsheet
+(clipboard).
 
 \begin{figure}[H]
 \centering

ModBus_Client/Doc/EN/ModBus_Client_EN.pdf

@@ -61,10 +61,10 @@
 % -----------------------------------------------
 \newcommand{\docrevision}{\ddmmyyyydate\today}
 \newcommand{\projectname}{Modbus Client}
-\newcommand{\projectdescription}{Modbus Client Manual }
+\newcommand{\projectdescription}{Modbus Client Manual \version}
 
 \newcommand{\revision}{\docrevision}
-\newcommand{\version}{v2.38}
+\newcommand{\version}{v2.42}
 \renewcommand{\chaptermark}[1]{\markboth{#1}{#1}}   % Chapter name in alto a sx senza "Capitolo x " davanti
 
 \pagestyle{fancy}
@@ -153,6 +153,7 @@
 \input{03_packet_log.tex}
 \input{04_settings.tex}
 \input{05_templates.tex}
+\input{06_preview_import.tex}
 \input{06_tools_holding_registers.tex}
 \input{07_gestione_database.tex}
 \input{08_dropdown.tex}

ModBus_Client/Doc/EN/ModBus_Client_EN.synctex.gz

@@ -19,12 +19,6 @@ \chapter{Impostazioni}
     richiesto
     l'indirizzo 40002. Stessa cosa per gli input registers (30001), discrete inputs (10001)
     o coils (1).
-    \item \textbf{LIMITA GLI INDIRIZZI MODBUS A 9998:}
-    Se spuntata vengono inviate solo le richieste di indirizzi tra 0 e 9998 (o corrispondente indirizzo
-    Modbus es: 10001-19999/30001-39999/40001-49999). In caso contrario viene inviata la richiesta
-    modbus qualsiasi sia l'indirizzo inserito. Ad esempio alcune CPU Beckhoff mettono a disposizione
-    le word MW0,MW1,… partendo dall'holding register 0x3000 (dec 12288). Non spuntando la casella
-    si possono quindi inviare richieste anche a indirizzi oltre il valore di 9998, fino a 65535.
     \item \textbf{COLORE CELLE > 0 / COLORE CELLE ALTERNATE:}
     Se spuntata vengono colorate solo le righe delle tabelle con un valore > 0, altrimenti le righe
     vengono colorate in maniera alternata.
@@ -65,4 +59,16 @@ \chapter{Impostazioni}
     quando ritorna la connessione. Con la seconda
     modalità questo non accade perche la socket viene riaperta per ogni lettura 
     e chiusa subito dopo per cui a livello pratico questa modalità può tornare molto utile.
+\end{itemize}
+
+Preview import settings:
+\\\\
+Le impostazioni seguenti permettono di impostare i valori di default
+della finestra di import dei registri.
+
+\begin{itemize}
+    \item \textbf{WRITE MULTIPLE REGISTERS (FC15 / FC16):} accorpa registri consecutivi in un unico comando ove possibile.
+    \item \textbf{CLOSE WINDOW AFTER WRITE:} chiude la finestra automaticamente al termine delle scritture.
+    \item \textbf{ABORT WRITE ON ERROR:} interrompe le scritture in caso di errore (altrimenti ignora l'errore e prosegue con le successive).
+    \item \textbf{NR. OF REGISTERS MULTIPLE WRITE:} numero massimo di registri inviati in un singolo comando FC15 / FC16.
 \end{itemize}

ModBus_Client/Doc/EN/ModBus_Client_EN.tex

@@ -66,6 +66,7 @@ \section{Definizione gruppi}
 
 Nella tab "Notes" della finestra template è possibile definire i gruppi di risorse
 da richiamare poi nella finestra principale. Non è necessario inserire i gruppi in ordine.
+La stessa tab mostra anche un riepilogo sul numero di registri e gruppi inseriti nel profilo.
 
 \begin{figure}[H]
 \centering