1、合并master与2021.1
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
[RING_LIGHT_RS232_SERIALCOMPORT]
|
||||
RingLightRS232SerialComport=1
|
||||
[DIGITAL_LUX_METER_RS232_SERIALCOMPORT]
|
||||
DigitalLuxMeterRS232Enable=1
|
||||
DigitalLuxMeterRS232ComNum=3
|
||||
DigitalLuxMeterRS232SleepTime=100
|
||||
DigitalLuxMeterCabStep=0.100000
|
||||
DigitalLuxMeterCabCompGap=25
|
||||
DigitalLuxMeterGetSingRingInitValue=1
|
||||
DigitalLuxMeterGetWhichRingForInitValue=2
|
||||
@@ -0,0 +1,101 @@
|
||||
0%Value,15.0,843,15.0,865,15.0,608,15.0,925,15.0,977,15.0,1023,
|
||||
1%Value,134.9,1096,94.9,1117,64.8,1095,56.8,1128,50.8,1166,44.8,1203,
|
||||
2%Value,254.7,1209,179.8,1241,114.7,1235,98.7,1252,86.7,1283,74.7,1315,
|
||||
3%Value,374.5,1298,264.7,1335,164.6,1339,140.6,1345,122.6,1375,104.6,1406,
|
||||
4%Value,494.4,1370,349.6,1415,214.4,1428,182.4,1424,158.4,1453,134.4,1483,
|
||||
5%Value,614.3,1435,434.5,1483,264.3,1500,224.3,1493,194.3,1523,164.3,1552,
|
||||
6%Value,734.1,1494,519.4,1545,314.1,1563,266.1,1556,230.1,1588,194.1,1615,
|
||||
7%Value,854.0,1548,604.3,1602,364.0,1626,308.0,1615,266.0,1644,223.9,1676,
|
||||
8%Value,973.8,1600,689.2,1657,413.8,1682,349.8,1669,301.8,1696,253.8,1731,
|
||||
9%Value,1093.7,1647,774.1,1707,463.6,1736,391.6,1719,337.6,1756,283.6,1781,
|
||||
10%Value,1213.5,1693,859.0,1757,513.5,1789,433.5,1767,373.5,1803,313.5,1833,
|
||||
11%Value,1333.3,1736,943.9,1803,563.3,1839,475.4,1813,409.4,1850,343.4,1880,
|
||||
12%Value,1453.2,1778,1028.8,1849,613.2,1887,517.2,1859,445.2,1898,373.2,1923,
|
||||
13%Value,1573.1,1820,1113.7,1892,663.0,1932,559.0,1902,481.0,1941,403.0,1966,
|
||||
14%Value,1692.9,1859,1198.6,1934,712.9,1975,600.9,1943,516.9,1986,432.9,2011,
|
||||
15%Value,1812.8,1898,1283.5,1974,762.8,2018,642.8,1984,552.8,2028,462.8,2055,
|
||||
16%Value,1932.6,1936,1368.4,2015,812.6,2060,684.6,2023,588.6,2067,492.6,2093,
|
||||
17%Value,2052.4,2000,1453.3,2054,862.5,2101,726.5,2062,624.5,2109,522.5,2134,
|
||||
18%Value,2172.3,2031,1538.2,2093,912.3,2141,768.3,2099,660.3,2148,552.3,2172,
|
||||
19%Value,2292.1,2072,1623.1,2130,962.2,2180,810.2,2135,696.2,2184,582.2,2212,
|
||||
20%Value,2412.0,2103,1708.0,2169,1012.0,2218,852.0,2173,732.0,2221,612.0,2248,
|
||||
21%Value,2531.9,2146,1792.9,2206,1061.8,2257,893.8,2210,767.8,2258,641.8,2284,
|
||||
22%Value,2651.7,2179,1877.8,2244,1111.7,2295,935.7,2244,803.7,2296,671.7,2319,
|
||||
23%Value,2771.6,2219,1962.7,2307,1161.6,2332,977.5,2281,839.5,2331,701.5,2356,
|
||||
24%Value,2891.4,2253,2047.6,2347,1211.4,2368,1019.4,2314,875.4,2367,731.4,2390,
|
||||
25%Value,3011.3,2289,2132.5,2386,1261.3,2405,1061.3,2350,911.3,2403,761.3,2426,
|
||||
26%Value,3131.1,2328,2217.4,2413,1311.1,2441,1103.1,2383,947.1,2437,791.1,2459,
|
||||
27%Value,3250.9,2363,2302.3,2457,1360.9,2477,1144.9,2416,983.0,2472,821.0,2493,
|
||||
28%Value,3370.8,2397,2387.2,2495,1410.8,2511,1186.8,2451,1018.8,2507,850.8,2528,
|
||||
29%Value,3490.6,2434,2472.1,2530,1460.7,2546,1228.7,2485,1054.7,2541,880.7,2561,
|
||||
30%Value,3610.5,2469,2557.0,2567,1510.5,2581,1270.5,2516,1090.5,2576,910.5,2594,
|
||||
31%Value,3730.4,2506,2641.9,2611,1560.3,2616,1312.3,2550,1126.3,2608,940.3,2627,
|
||||
32%Value,3850.2,2546,2726.8,2639,1610.2,2653,1354.2,2582,1162.2,2642,970.2,2661,
|
||||
33%Value,3970.1,2580,2811.7,2683,1660.1,2689,1396.1,2616,1198.1,2675,1000.0,2696,
|
||||
34%Value,4089.9,2611,2896.6,2722,1709.9,2724,1437.9,2649,1233.9,2708,1029.9,2728,
|
||||
35%Value,4209.8,2646,2981.5,2763,1759.8,2761,1479.8,2682,1269.8,2742,1059.8,2759,
|
||||
36%Value,4329.6,2681,3066.4,2790,1809.6,2796,1521.6,2715,1305.6,2775,1089.6,2792,
|
||||
37%Value,4449.5,2721,3151.3,2836,1859.4,2831,1563.4,2748,1341.4,2807,1119.4,2826,
|
||||
38%Value,4569.3,2752,3236.2,2877,1909.3,2867,1605.3,2780,1377.3,2840,1149.3,2859,
|
||||
39%Value,4689.1,2795,3321.1,2907,1959.2,2902,1647.2,2814,1413.2,2872,1179.2,2891,
|
||||
40%Value,4809.0,2830,3406.0,2937,2009.0,2940,1689.0,2847,1449.0,2906,1209.0,2925,
|
||||
41%Value,4928.9,2866,3490.9,2984,2058.9,2974,1730.8,2881,1484.8,2940,1238.8,2956,
|
||||
42%Value,5048.7,2902,3575.8,3014,2108.7,3059,1772.7,2914,1520.7,2972,1268.7,2987,
|
||||
43%Value,5168.5,2937,3660.7,3060,2158.6,3086,1814.6,2947,1556.6,3006,1298.6,3019,
|
||||
44%Value,5288.4,2974,3745.6,3097,2208.4,3136,1856.4,2980,1592.4,3038,1328.4,3051,
|
||||
45%Value,5408.3,3010,3830.5,3125,2258.3,3173,1898.3,3013,1628.3,3072,1358.3,3084,
|
||||
46%Value,5528.1,3049,3915.4,3173,2308.1,3206,1940.1,3046,1664.1,3103,1388.1,3116,
|
||||
47%Value,5648.0,3082,4000.3,3208,2357.9,3242,1981.9,3080,1699.9,3138,1417.9,3147,
|
||||
48%Value,5767.8,3118,4085.2,3243,2407.8,3278,2023.8,3119,1735.8,3170,1447.8,3180,
|
||||
49%Value,5887.6,3156,4170.1,3280,2457.6,3309,2065.6,3207,1771.7,3203,1477.7,3213,
|
||||
50%Value,6007.5,3189,4255.0,3322,2507.5,3361,2107.5,3242,1807.5,3237,1507.5,3245,
|
||||
51%Value,6127.4,3227,4339.9,3354,2557.4,3396,2149.4,3262,1843.3,3270,1537.3,3276,
|
||||
52%Value,6247.2,3261,4424.8,3397,2607.2,3422,2191.2,3300,1879.2,3301,1567.2,3309,
|
||||
53%Value,6367.0,3301,4509.7,3429,2657.1,3458,2233.1,3332,1915.1,3333,1597.1,3343,
|
||||
54%Value,6486.9,3332,4594.6,3464,2706.9,3496,2274.9,3367,1950.9,3367,1626.9,3374,
|
||||
55%Value,6606.8,3370,4679.5,3512,2756.8,3535,2316.8,3396,1986.8,3399,1656.8,3407,
|
||||
56%Value,6726.6,3407,4764.4,3547,2806.6,3566,2358.6,3425,2022.6,3435,1686.6,3441,
|
||||
57%Value,6846.5,3442,4849.3,3584,2856.4,3605,2400.4,3458,2058.4,3523,1716.4,3472,
|
||||
58%Value,6966.3,3479,4934.2,3622,2906.3,3641,2442.3,3501,2094.3,3560,1746.3,3506,
|
||||
59%Value,7086.1,3516,5019.1,3660,2956.1,3678,2484.1,3550,2130.1,3592,1776.2,3539,
|
||||
60%Value,7206.0,3555,5104.0,3701,3006.0,3710,2526.0,3575,2166.0,3624,1806.0,3571,
|
||||
61%Value,7325.9,3588,5188.9,3729,3055.9,3753,2567.9,3600,2201.9,3654,1835.8,3603,
|
||||
62%Value,7445.7,3629,5273.8,3776,3105.7,3794,2609.7,3637,2237.7,3698,1865.7,3636,
|
||||
63%Value,7565.5,3664,5358.7,3805,3155.6,3822,2651.6,3676,2273.6,3729,1895.6,3668,
|
||||
64%Value,7685.4,3698,5443.6,3851,3205.4,3859,2693.4,3708,2309.4,3764,1925.4,3699,
|
||||
65%Value,7805.3,3736,5528.5,3886,3255.3,3915,2735.3,3742,2345.3,3799,1955.3,3729,
|
||||
66%Value,7925.1,3773,5613.4,3922,3305.1,3946,2777.1,3780,2381.1,3838,1985.1,3763,
|
||||
67%Value,8045.0,3809,5698.3,3965,3354.9,3978,2818.9,3811,2416.9,3872,2014.9,3846,
|
||||
68%Value,8164.8,3845,5783.2,4004,3404.8,4007,2860.8,3850,2452.8,3895,2044.8,3895,
|
||||
69%Value,8284.7,3881,5868.1,4039,3454.6,4062,2902.6,3887,2488.6,3940,2074.6,3920,
|
||||
70%Value,8404.5,3919,5953.0,4072,3504.5,4089,2944.5,3924,2524.5,3962,2104.5,3967,
|
||||
71%Value,8524.3,3957,6037.9,4113,3554.4,4127,2986.4,3950,2560.4,3983,2134.4,3992,
|
||||
72%Value,8644.2,3992,6122.8,4151,3604.2,4155,3028.2,3980,2596.2,4038,2164.2,4033,
|
||||
73%Value,8764.0,4026,6207.7,4194,3654.1,4178,3070.1,4025,2632.1,4063,2194.1,4060,
|
||||
74%Value,8883.9,4064,6292.6,4226,3703.9,4244,3111.9,4060,2667.9,4104,2223.9,4104,
|
||||
75%Value,9003.8,4101,6377.5,4263,3753.8,4271,3153.8,4086,2703.8,4129,2253.8,4133,
|
||||
76%Value,9123.6,4138,6462.4,4305,3803.6,4308,3195.6,4121,2739.6,4166,2283.6,4178,
|
||||
77%Value,9243.5,4176,6547.3,4343,3853.4,4339,3237.4,4160,2775.4,4195,2313.4,4208,
|
||||
78%Value,9363.3,4216,6632.2,4376,3903.3,4386,3279.3,4199,2811.3,4224,2343.3,4239,
|
||||
79%Value,9483.2,4248,6717.1,4418,3953.1,4427,3321.1,4235,2847.1,4279,2373.1,4269,
|
||||
80%Value,9603.0,4290,6802.0,4459,4003.0,4464,3363.0,4260,2883.0,4314,2403.0,4299,
|
||||
81%Value,9722.8,4328,6886.9,4494,4052.9,4495,3404.9,4292,2918.9,4349,2432.9,4344,
|
||||
82%Value,9842.7,4364,6971.8,4532,4102.7,4531,3446.7,4324,2954.7,4370,2462.7,4368,
|
||||
83%Value,9962.5,4400,7056.7,4577,4152.5,4571,3488.6,4373,2990.6,4410,2492.6,4432,
|
||||
84%Value,10082.4,4438,7141.6,4613,4202.4,4606,3530.4,4395,3026.4,4450,2522.4,4453,
|
||||
85%Value,10202.3,4475,7226.5,4652,4252.3,4640,3572.3,4435,3062.3,4482,2552.3,4474,
|
||||
86%Value,10322.1,4514,7311.4,4688,4302.1,4680,3614.1,4465,3098.1,4516,2582.1,4518,
|
||||
87%Value,10442.0,4547,7396.3,4723,4352.0,4705,3655.9,4496,3133.9,4550,2611.9,4551,
|
||||
88%Value,10561.8,4585,7481.2,4765,4401.8,4757,3697.8,4539,3169.8,4583,2641.8,4575,
|
||||
89%Value,10681.7,4625,7566.1,4803,4451.6,4788,3739.6,4575,3205.6,4619,2671.6,4599,
|
||||
90%Value,10801.5,4659,7651.0,4842,4501.5,4819,3781.5,4594,3241.5,4659,2701.5,4638,
|
||||
91%Value,10921.3,4697,7735.9,4877,4551.4,4857,3823.4,4636,3277.4,4699,2731.4,4664,
|
||||
92%Value,11041.2,4733,7820.8,4917,4601.2,4892,3865.2,4668,3313.2,4733,2761.2,4734,
|
||||
93%Value,11161.0,4771,7905.7,4948,4651.0,4934,3907.1,4714,3349.1,4761,2791.1,4754,
|
||||
94%Value,11280.9,4807,7990.6,4955,4700.9,4943,3948.9,4749,3384.9,4795,2820.9,4774,
|
||||
95%Value,11400.8,4844,8075.5,4962,4750.8,4952,3990.8,4785,3420.8,4819,2850.8,4826,
|
||||
96%Value,11520.6,4880,8160.4,4969,4800.6,4961,4032.6,4810,3456.6,4863,2880.6,4858,
|
||||
97%Value,11640.5,4911,8245.3,4976,4850.5,4970,4074.4,4858,3492.4,4901,2910.4,4887,
|
||||
98%Value,11760.3,4946,8330.2,4983,4900.3,4979,4116.3,4885,3528.3,4935,2940.3,4916,
|
||||
99%Value,11880.2,4973,8415.1,4990,4950.1,4988,4158.1,4922,3564.1,4965,2970.1,4945,
|
||||
100%Value,12000.0,5000,8500.0,4997,5000.0,4997,4200.0,4956,3600.0,4976,3000.0,4974,
|
||||
|
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
BIN
Binary file not shown.
Reference in New Issue
Block a user