diff --git a/Form1.vb b/Form1.vb index 1572c5c..a0372f3 100644 --- a/Form1.vb +++ b/Form1.vb @@ -2833,9 +2833,9 @@ Public Class Form1 dic("校准最大值_LEV_10") = CombineTwoBytesToDecimal(buff(44), buff(45)) dic("校准最小值_差值") = CombineTwoBytesToDecimal(buff(46), buff(47)) dic("校准最大值_差值") = CombineTwoBytesToDecimal(buff(48), buff(49)) - dic("自定义LEV_10_对应的ADC") = CombineTwoBytesToDecimal(buff(50), buff(51)) - dic("自定义LEV_0_对应的ADC") = CombineTwoBytesToDecimal(buff(52), buff(53)) - dic("泄露恢复正常_条件2") = CombineTwoBytesToDecimal(buff(54), buff(55)) + dic("泄露恢复正常_条件1") = CombineTwoBytesToDecimal(buff(50), buff(51)) + dic("泄露恢复正常_条件2") = CombineTwoBytesToDecimal(buff(52), buff(53)) + dic("泄露恢复正常_条件1消抖时间_秒") = CombineTwoBytesToDecimal(buff(54), buff(55)) dic("泄露恢复正常_条件2消抖时间_分") = CombineTwoBytesToDecimal(buff(56), buff(57)) dic("设备生产时间") = CombineFourBytesToLong(buff(61), buff(60), buff(59), buff(58)) @@ -2863,14 +2863,15 @@ Public Class Form1 dic("校准最大值_LEV_10") = CombineTwoBytesToDecimal(buff(44), buff(45)) dic("校准最小值_差值") = CombineTwoBytesToDecimal(buff(46), buff(47)) dic("校准最大值_差值") = CombineTwoBytesToDecimal(buff(48), buff(49)) - dic("自定义LEV_10_对应的ADC") = CombineTwoBytesToDecimal(buff(50), buff(51)) - dic("自定义LEV_0_对应的ADC") = CombineTwoBytesToDecimal(buff(52), buff(53)) - dic("泄露恢复正常_条件2") = CombineTwoBytesToDecimal(buff(54), buff(55)) + dic("泄露恢复正常_条件1") = CombineTwoBytesToDecimal(buff(50), buff(51)) + dic("泄露恢复正常_条件2") = CombineTwoBytesToDecimal(buff(52), buff(53)) + dic("泄露恢复正常_条件1消抖时间_秒") = CombineTwoBytesToDecimal(buff(54), buff(55)) dic("泄露恢复正常_条件2消抖时间_分") = CombineTwoBytesToDecimal(buff(56), buff(57)) dic("设备生产时间") = CombineFourBytesToLong(buff(61), buff(60), buff(59), buff(58)) End If + Case 3 '读取软件版本号 '04 软件版本号 '03 硬件板本号 diff --git a/NT318.vbproj b/NT318.vbproj index 02292cb..752350f 100644 --- a/NT318.vbproj +++ b/NT318.vbproj @@ -141,15 +141,9 @@ packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll - + False - ..\..\..\..\6374322614351286414968093\System.Data.SQLite.dll - - - packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll - - - packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll + ..\..\Sync\NT2406_Tool_V02_20241001\NT2406_Tool_V02_20241001\NT318V_Tool_V02_20241001\System.Data.SQLite.dll @@ -262,6 +256,8 @@ + + MyApplicationCodeGenerator @@ -275,10 +271,454 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -296,7 +736,18 @@ - + + + + + + + + + + + +