diff --git a/INT63DC_2C/Forms/FormMain.cs b/INT63DC_2C/Forms/FormMain.cs index c407205..3b7607d 100644 --- a/INT63DC_2C/Forms/FormMain.cs +++ b/INT63DC_2C/Forms/FormMain.cs @@ -8679,7 +8679,7 @@ namespace INT63DC_2C.Forms this.Current40000ModbusData._40018_UnderRange = int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); - if (this.Current40000ModbusData._40018_UnderRange >= 0 && this.Current40000ModbusData._40018_UnderRange < int.Parse(this.CurrentProductItem.PassRange)) + if (this.Current40000ModbusData._40018_UnderRange >= 0 && this.Current40000ModbusData._40018_UnderRange <= int.Parse(this.CurrentProductItem.PassRange)) { try { @@ -8723,8 +8723,8 @@ namespace INT63DC_2C.Forms this.Current40000ModbusData._40021_PassRange = int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); - if (this.Current40000ModbusData._40021_PassRange > int.Parse(this.CurrentProductItem.UnderRange) - && this.Current40000ModbusData._40021_PassRange < int.Parse(this.CurrentProductItem.OverRange)) + if (this.Current40000ModbusData._40021_PassRange >= int.Parse(this.CurrentProductItem.UnderRange) + && this.Current40000ModbusData._40021_PassRange <= int.Parse(this.CurrentProductItem.OverRange)) { try { @@ -8767,7 +8767,8 @@ namespace INT63DC_2C.Forms this.Current40000ModbusData._40024_OverRange = int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); - if (this.Current40000ModbusData._40024_OverRange > int.Parse(this.CurrentProductItem.PassRange) && this.Current40000ModbusData._40024_OverRange <= 99999) + if (this.Current40000ModbusData._40024_OverRange >= int.Parse(this.CurrentProductItem.PassRange) + && this.Current40000ModbusData._40024_OverRange <= 99999) { try { diff --git a/INT63DC_2C/INT63DC_2C.csproj b/INT63DC_2C/INT63DC_2C.csproj index e9f992b..7cb4d79 100644 --- a/INT63DC_2C/INT63DC_2C.csproj +++ b/INT63DC_2C/INT63DC_2C.csproj @@ -45,7 +45,7 @@ Off - + diff --git a/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormNumKeyPad.resources b/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormNumKeyPad.resources deleted file mode 100644 index adad55c..0000000 Binary files a/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormNumKeyPad.resources and /dev/null differ diff --git a/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormPasswordKeyPad.resources b/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormPasswordKeyPad.resources deleted file mode 100644 index b741a00..0000000 Binary files a/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormPasswordKeyPad.resources and /dev/null differ diff --git a/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormYesNo.resources b/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormYesNo.resources deleted file mode 100644 index 33e0a43..0000000 Binary files a/INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormYesNo.resources and /dev/null differ