Skip to content

Commit ac7adcf

Browse files
committed
Revert "Enable the option to combine each two registeres to hold IEEE-754 float representations"
This reverts commit dbdd8d3.
1 parent 49986e4 commit ac7adcf

File tree

7 files changed

+68
-131504
lines changed

7 files changed

+68
-131504
lines changed

CommonControls/BaseForm.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ public partial class BaseForm : Form
1616
private DisplayFormat _displayFormat = DisplayFormat.Integer;
1717
private CommunicationMode _communicationMode = CommunicationMode.TCP;
1818
protected Socket _socket;
19-
protected readonly ushort[] _registerData;
19+
protected readonly UInt16[] _registerData;
2020
private bool _logPaused = false;
2121

2222
#region Form
2323

2424
public BaseForm()
2525
{
2626
InitializeComponent();
27-
_registerData = new ushort[65600];
27+
_registerData = new UInt16[65600];
2828
}
2929

3030
private void BaseFormLoading(object sender, EventArgs e)
@@ -678,14 +678,14 @@ private void tabControl1_Selected(object sender, TabControlEventArgs e)
678678
if (tab.Text.Equals("...") && tabControl1.TabPages.Count < 20)
679679
{
680680
DataTab dataTab = new DataTab();
681-
dataTab.DataLength = 256;
681+
dataTab.DataLength = ((ushort)(256));
682682
dataTab.DisplayFormat = DisplayFormat.Integer;
683683
dataTab.Location = new Point(3, 3);
684684
dataTab.Name = "dataTab" + (tabControl1.TabPages.Count+1);
685685
dataTab.RegisterData = _registerData;
686686
dataTab.ShowDataLength = ShowDataLength;
687687
dataTab.Size = new Size(839, 406);
688-
dataTab.StartAddress = 0;
688+
dataTab.StartAddress = ((ushort)(0));
689689
dataTab.TabIndex = 0;
690690
dataTab.OnApply += dataTab_OnApply;
691691
TabPage tabPage = new TabPage();

CommonControls/BaseForm.designer.cs

Lines changed: 26 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CommonControls/DataTab.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)