修改安装输出默认值

a00f625a · 潘栩锋 · 164f7bc1 · a00f625a · a00f625a · 164f7bc1
Commit a00f625a authored Apr 16, 2022 by 潘栩锋 🚴
24 changed files
--- a/脚本/hemeiInstallZipVersionInfo.json
+++ b/脚本/hemeiInstallZipVersionInfo.json
 {
  "InstallZipVersion":"7.0.1",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.0.1_20220412.7z"
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.0.1_20220415.7z"
 }
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/blowingdetect.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/blowingdetect.json
 {
-  "RAngle": 355.0,
+  "RAngle": 355,
-  "DefaultRPeriod": "00:06:24",
+  "DefaultRPeriod": "00:08:00",
  "IsSign0Double": false,
  "IsSign1Double": false,
  "SignType": 0,
-  "LimitSignTime": "00:00:01.2180000",
+  "FilmLength": 26.0,
-  "FilmLength": 26.2000000000002,
  "RollPerimeter": 314.0,
  "IsSignFilter": false,
  "IsLackSignMode": false,
-  "Is3D": false
+  "Is3D": false,
+  "IsRPosMode": false,
+  "RPosOfR": 2430582,
+  "InNo_Limit0": 8,
+  "InNo_Limit1": 9,
+  "InNo_Roll": 10,
+  "IsInNoCustomized": false
 }
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/blowingdetect.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/blowingdetect.xml
-<?xml version="1.0" encoding="utf-8"?>
-<BlowingDetect RAngle="355" AccDecTime="00:00:00.1000000" LimitSignTime="00:00:01.2180000" FilmLength="26.2000000000002" RollPerimeter="314" DefaultRPeriod="00:06:24" IsSign0Double="False" IsSign1Double="False" SignType="Short" IsSignFilter="False" IsLackSignMode="False" Is3D="False" />
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/bordersearch.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/bordersearch.json
+{
+  "Enable": true,
+  "IsOneMaterial": true,
+  "IsBreakDetect": true,
+  "Valid": {
+    "Begin": 1200,
+    "End": 7400
+  },
+  "TempADBySet": false,
+  "TempAD": -1,
+  "TempRange": 500,
+  "IsTempRangeByPercent": true,
+  "TempRangePercent": 0.03,
+  "N": 32,
+  "SensorWidth": 300,
+  "N2": 400,
+  "N3": 1000
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/bulk.csv
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/bulk.csv
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/curve.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/curve.json
+{
+  "Curves": [
+    {
+      "Value": 0.0,
+      "AD": 50300
+    },
+    {
+      "Value": 19.0,
+      "AD": 46505
+    },
+    {
+      "Value": 38.0,
+      "AD": 42999
+    },
+    {
+      "Value": 58.0,
+      "AD": 39698
+    },
+    {
+      "Value": 78.0,
+      "AD": 36646
+    },
+    {
+      "Value": 98.0,
+      "AD": 33894
+    },
+    {
+      "Value": 118.0,
+      "AD": 31229
+    },
+    {
+      "Value": 137.0,
+      "AD": 28934
+    },
+    {
+      "Value": 156.0,
+      "AD": 26818
+    },
+    {
+      "Value": 175.0,
+      "AD": 24908
+    },
+    {
+      "Value": 194.0,
+      "AD": 23220
+    },
+    {
+      "Value": 213.0,
+      "AD": 21558
+    },
+    {
+      "Value": 232.0,
+      "AD": 20057
+    },
+    {
+      "Value": 251.0,
+      "AD": 18606
+    },
+    {
+      "Value": 271.0,
+      "AD": 17283
+    },
+    {
+      "Value": 290.0,
+      "AD": 16035
+    }
+  ],
+  "CorrectWay": 0,
+  "Flag": 0
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/curve.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/curve.xml
-<?xml version="1.0" encoding="utf-8"?>
-<CurveCollection CorrectWay="OnePointIsScale" Flag="E">
-  <Curves>
-    <CurveCell Value="0" AD="50300" />
-    <CurveCell Value="1900" AD="46502" />
-    <CurveCell Value="3800" AD="42996" />
-    <CurveCell Value="5800" AD="39695" />
-    <CurveCell Value="7800" AD="36643" />
-    <CurveCell Value="9800" AD="33891" />
-    <CurveCell Value="11800" AD="31226" />
-    <CurveCell Value="13700" AD="28931" />
-    <CurveCell Value="15600" AD="26815" />
-    <CurveCell Value="17500" AD="24905" />
-    <CurveCell Value="19400" AD="23217" />
-    <CurveCell Value="21300" AD="21555" />
-    <CurveCell Value="23200" AD="20054" />
-    <CurveCell Value="25100" AD="18603" />
-    <CurveCell Value="27100" AD="17280" />
-    <CurveCell Value="29000" AD="16032" />
-  </Curves>
-</CurveCollection>
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/curve_10k.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/curve_10k.xml
-<?xml version="1.0" encoding="utf-8"?>
-<CurveCollection>
-  <Curves>
-    <CurveCell Value="0" AD="50300" />
-    <CurveCell Value="1900" AD="46505" />
-    <CurveCell Value="3800" AD="42999" />
-    <CurveCell Value="5800" AD="39698" />
-    <CurveCell Value="7800" AD="36646" />
-    <CurveCell Value="9800" AD="33894" />
-    <CurveCell Value="11800" AD="31229" />
-    <CurveCell Value="13700" AD="28934" />
-    <CurveCell Value="15600" AD="26818" />
-    <CurveCell Value="17500" AD="24908" />
-    <CurveCell Value="19400" AD="23220" />
-    <CurveCell Value="21300" AD="21558" />
-    <CurveCell Value="23200" AD="20057" />
-    <CurveCell Value="25100" AD="18606" />
-    <CurveCell Value="27100" AD="17283" />
-    <CurveCell Value="29000" AD="16035" />
-  </Curves>
-</CurveCollection>
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/dist.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/dist.json
-[
-  {
-    "Key": "password",
-    "Time": "2020-03-19T10:18:32.9657738+08:00",
-    "Value": {
-      "UiLvs": [
-        {
-          "UiName": "PwManager",
-          "Description": "密码管理",
-          "Level": 10
-        },
-        {
-          "UiName": "Blowing",
-          "Description": "吹膜测厚",
-          "Level": 1
-        },
-        {
-          "UiName": "Curve",
-          "Description": "曲线标定",
-          "Level": 1
-        },
-        {
-          "UiName": "Weighter",
-          "Description": "称重",
-          "Level": 1
-        },
-        {
-          "UiName": "AirRing",
-          "Description": "风环",
-          "Level": 1
-        },
-        {
-          "UiName": "IBC",
-          "Description": "IBC",
-          "Level": 1
-        },
-        {
-          "UiName": "Winder",
-          "Description": "收卷",
-          "Level": 1
-        },
-        {
-          "UiName": "Integrated",
-          "Description": "综合IBC",
-          "Level": 1
-        },
-        {
-          "UiName": "Address",
-          "Description": "地址管理",
-          "Level": 1
-        },
-        {
-          "UiName": "BorderSearch",
-          "Description": "边界查找",
-          "Level": 1
-        },
-        {
-          "UiName": "GageInfo",
-          "Description": "机架信息",
-          "Level": 1
-        },
-        {
-          "UiName": "GetSample",
-          "Description": "样品标定",
-          "Level": 1
-        },
-        {
-          "UiName": "InitParam",
-          "Description": "系统参数",
-          "Level": 1
-        },
-        {
-          "UiName": "Reject",
-          "Description": "剔除",
-          "Level": 1
-        },
-        {
-          "UiName": "ScanWarning",
-          "Description": "扫描报警",
-          "Level": 1
-        },
-        {
-          "UiName": "FlyAd",
-          "Description": "AD盒控制器",
-          "Level": 10
-        }
-      ],
-      "Pws": [
-        {
-          "Password": "flymeasure",
-          "Level": 10
-        },
-        {
-          "Password": "1",
-          "Level": 1
-        }
-      ]
-    }
-  }
-]
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/flyad.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/flyad.json
-{"LocalEP":"192.168.251.10:20006","HasCRC":false,"GridSmooth":0,"IsCalSpeed":true}
+{
\ No newline at end of file
+    "LocalEP":"192.168.251.10:20006",
+    "HasCRC":false,
+    "GridSmooth":0
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/initparam.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/initparam.json
+{
+    "PosLength":15500,
+    "PosOfGrid":16,
+    "IsTimeGridAdvEnabled":false,
+    "ADLag":0,
+    "AutoOrgInterval":10,
+    "FilmVSrc":1,
+    "FilmVThreshold":5,
+    "Encoder2_mmpp":0.1,
+    "Encoder2_comp":1.0,
+    "MmOfR":314.0,
+    "Encoder1_mmpp":0.0943,
+    "Speed1Scale":1.0,
+    "VScan":3000,
+    "VJOG":3000,
+    "VAccuracy":3000,
+    "SVelocity":50,
+    "ATime":200,
+    "DTime":300,
+    "HVelocity1":3000,
+    "HVelocity2":500,
+    "DataValidSrc":4,
+    "AutoF1F3":false,
+    "ReStartDelay":5,
+    "HasProfileSample":false,
+    "HasHold":false,
+    "DBKeepMonth":6,
+    "DbPath":"D:\\flydata\\history.sqlite3"
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/initparam.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/initparam.xml
-<?xml version="1.0" encoding="utf-8"?>
-<InitParam PosLength="8900" AutoOrgInterval="10" VScan="8000" VJOG="5000" VAccuracy="3000" SVelocity="500" ATime="200" DTime="200" HVelocity1="5000" HVelocity2="1000" Encoder1_mmpp="0.1" FilmVSrc="ROUND" FilmVThreshold="5" Encoder2_mmpp="0.1" Encoder2_comp="1" MmOfR="376.8" DataValidSrc="VALID" AutoF1F3="False" ReStartDelay="5" HasProfileSample="False" HasHold="True" DBKeepMonth="6" />
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/pichistory.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/pichistory.xml
-<?xml version="1.0" encoding="utf-8"?>
-<PicHistory KeepDay="180" YRangePercent="3" ChartType="Column" RootPath="D:\blowingdata\pic_history" Enable="True" />
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/profile.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/profile.json
 {
-  "CurrentPName": "pname3",
+  "CurrentPName": "pname",
  "ParamList": [
    {
-      "PName": "pname2",
+      "PName": "pname",
      "OrderNo": "00000001",
      "Number": "1",
      "Target": 100.0,
-      "TolerancePercent": 0.03,
-      "K": 1.0,
-      "MMode": 0,
-      "FilmWidth": 1180,
-      "FilmPosH": 70
-    },
-    {
-      "PName": "pname3",
-      "OrderNo": "00000001",
-      "Number": "1",
-      "Target": 36.0,
      "TolerancePercent": 0.05,
-      "K": 0.54291833269994794,
+      "K": 0.67385444743935308,
      "MMode": 0,
      "FilmWidth": 1180,
      "FilmPosH": 70

--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/scanwarning.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/scanwarning.xml
-<?xml version="1.0" encoding="utf-8"?>
-<ScanWarning Enable="False" IsAutoTarget="True" AlarmCnt_Tolerance="10" />
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/sysparam.json
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/sysparam.json
+{
+  "Addr": "0.0.0.0:20006"
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/sysparam.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/sysparam.xml
-<?xml version="1.0" encoding="utf-8"?>
-<SysParam LocalEP="0.0.0.0:20006" FLYAD7EP="127.168.251.10:20008" FLYAD7_HasCRC="False" FLYAD7_GridSmooth="0" FLYAD7_IsCalSpeed="True" />
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/warningsystem.xml
+++ b/脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Server/Gage1/warningsystem.xml
-<?xml version="1.0" encoding="utf-8"?>
-<WarningSystem OutIdxOfWarning="4" Duration="10" Enable="False" EnSave="False">
-  <WhiteList />
-  <BlackList />
-</WarningSystem>
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/blowingdetect.json
+++ b/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/blowingdetect.json
 {
-  "RAngle": 355.0,
+  "RAngle": 355,
-  "DefaultRPeriod": "00:08:24",
+  "DefaultRPeriod": "00:08:00",
  "IsSign0Double": false,
  "IsSign1Double": false,
  "SignType": 0,
-  "LimitSignTime": "00:00:04",
  "FilmLength": 26.0,
  "RollPerimeter": 314.0,
  "IsSignFilter": false,
  "IsLackSignMode": false,
-  "Is3D": false
+  "Is3D": false,
+  "IsRPosMode": false,
+  "RPosOfR": 2430582,
+  "InNo_Limit0": 8,
+  "InNo_Limit1": 9,
+  "InNo_Roll": 10,
+  "IsInNoCustomized": false
 }
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/bordersearch.json
+++ b/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/bordersearch.json
+{
+  "Enable": true,
+  "IsOneMaterial": true,
+  "IsBreakDetect": true,
+  "Valid": {
+    "Begin": 1200,
+    "End": 7400
+  },
+  "TempADBySet": false,
+  "TempAD": -1,
+  "TempRange": 500,
+  "IsTempRangeByPercent": true,
+  "TempRangePercent": 0.03,
+  "N": 32,
+  "SensorWidth": 300,
+  "N2": 400,
+  "N3": 1000
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/curve.json
+++ b/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/curve.json
+{
+  "Curves": [
+    {
+      "Value": 0.0,
+      "AD": 50300
+    },
+    {
+      "Value": 19.0,
+      "AD": 46505
+    },
+    {
+      "Value": 38.0,
+      "AD": 42999
+    },
+    {
+      "Value": 58.0,
+      "AD": 39698
+    },
+    {
+      "Value": 78.0,
+      "AD": 36646
+    },
+    {
+      "Value": 98.0,
+      "AD": 33894
+    },
+    {
+      "Value": 118.0,
+      "AD": 31229
+    },
+    {
+      "Value": 137.0,
+      "AD": 28934
+    },
+    {
+      "Value": 156.0,
+      "AD": 26818
+    },
+    {
+      "Value": 175.0,
+      "AD": 24908
+    },
+    {
+      "Value": 194.0,
+      "AD": 23220
+    },
+    {
+      "Value": 213.0,
+      "AD": 21558
+    },
+    {
+      "Value": 232.0,
+      "AD": 20057
+    },
+    {
+      "Value": 251.0,
+      "AD": 18606
+    },
+    {
+      "Value": 271.0,
+      "AD": 17283
+    },
+    {
+      "Value": 290.0,
+      "AD": 16035
+    }
+  ],
+  "CorrectWay": 0,
+  "Flag": 0
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/flyad.json
+++ b/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/flyad.json
-{"LocalEP":"192.168.251.10:20006","HasCRC":false,"GridSmooth":0,"IsCalSpeed":true}
+{
\ No newline at end of file
+    "LocalEP":"192.168.251.10:20006",
+    "HasCRC":false,
+    "GridSmooth":0
+}
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/initparam.json
+++ b/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/initparam.json
 {
-    "PosLength": 28000,
+    "PosLength":15500,
-    "PosOfGrid": 29,
+    "PosOfGrid":16,
-    "IsTimeGridAdvEnabled": false,
+    "IsTimeGridAdvEnabled":false,
-    "ADLag": 0,
+    "ADLag":0,
-    "AutoOrgInterval": 10,
+    "AutoOrgInterval":10,
-    "FilmVSrc": 1,
+    "FilmVSrc":1,
-    "FilmVThreshold": 5,
+    "FilmVThreshold":5,
-    "Encoder2_mmpp": 0.1,
+    "Encoder2_mmpp":0.1,
-    "Encoder2_comp": 1.0,
+    "Encoder2_comp":1.0,
-    "MmOfR": 314.0,
+    "MmOfR":314.0,
-    "Encoder1_mmpp": 0.0943,
+    "Encoder1_mmpp":0.0943,
-    "Speed1Scale": 1.0,
+    "Speed1Scale":1.0,
-    "VScan": 3000,
+    "VScan":3000,
-    "VJOG": 3000,
+    "VJOG":3000,
-    "VAccuracy": 3000,
+    "VAccuracy":3000,
-    "SVelocity": 50,
+    "SVelocity":50,
-    "ATime": 200,
+    "ATime":200,
-    "DTime": 300,
+    "DTime":300,
-    "HVelocity1": 3000,
+    "HVelocity1":3000,
-    "HVelocity2": 500,
+    "HVelocity2":500,
-    "DataValidSrc": 4,
+    "DataValidSrc":4,
-    "AutoF1F3": false,
+    "AutoF1F3":false,
-    "ReStartDelay": 5,
+    "ReStartDelay":5,
-    "HasProfileSample": false,
+    "HasProfileSample":false,
-    "HasHold": false,
+    "HasHold":false,
-    "DBKeepMonth": 6,
+    "DBKeepMonth":6,
-    "DbPath": "D:\\flydata\\history.sqlite3"
+    "DbPath":"D:\\flydata\\history.sqlite3"
 }
\ No newline at end of file
--- a/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/sysparam.json
+++ b/脚本/release_conf/FLY.Thick.BlowingScan.UI.Server/Gage1/sysparam.json
+{
+  "Addr": "0.0.0.0:20006"
+}
\ No newline at end of file