@@ -29,7 +29,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
<component name="ProjectType">
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
@@ -195,14 +195,6 @@ public class Config extends AppCompatActivity
private EditText edtSingleRectTopSignNum,edtAllRectTopSignSum;
private CheckBox cbWaterLargeRestrainEn;
- //View Key Setting 定义
- private CheckBox cbTouchKey;
- private EditText edtKeyArea;
- private EditText edtKey1,edtKey2,edtKey3,edtKey4;
- private EditText edtKeyTouchLevel,edtKeyLeaveLevel;
- private EditText edtKeySens1and2,edtKeySens3and4;
- private EditText edtKeyRestrain,edtKeyRestrainTime;
-
//View Hopping Setting 定义
private CheckBox cbHoppingEn;
private CheckBox cbRangeExt;
@@ -305,17 +297,15 @@ public class Config extends AppCompatActivity
private TextView tvCfgRam;
private ArrayList<View> listViews;
- View viewsample;
+ View viewnormal;
+ View viewtxrx;
View viewmoduleswitch;
- View viewnormalsetting;
- View viewchannelsetting;
- View viewpensetting;
- View viewplamrestrain;
- View viewkeysetting;
- View viewhoppingsetting;
+ View viewother;
+ View viewselfsetting;
+ View viewexconfig;
View viewcfgram;
private int offset = 0;//移动条图片的偏移量
- private int currIndex = 8;//当前页面的编号
+ private int currIndex = 6;//当前页面的编号
private int bmpWidth;// 移动条图片的长度
private int one = 0; //移动条滑动一页的距离
private int two = 0; //滑动条移动两页的距离
@@ -324,8 +314,8 @@ public class Config extends AppCompatActivity
private int five = 0; //滑动条移动五页的距离
private int six = 0; //滑动条移动六页的距离
private int seven = 0; //滑动条移动七页的距离
- private int eight = 0; //滑动条移动八页的距离
- private int nine = 0; //滑动条移动九页的距离
+ //private int eight = 0; //滑动条移动八页的距离
+ //private int nine = 0; //滑动条移动九页的距离
private int iChooseVPager = 0; //当前停在哪个vpager
private byte mSendGetGt9ConfigData[]={
@@ -453,10 +443,9 @@ public class Config extends AppCompatActivity
initSampleSpin();
initModuleSwitchSpin();
initNormalSettingSpin();
- initChannelSettingSpin();
+ //initChannelSettingSpin();
initPenSettingSpin();
initPlamRestrainSpin();
- initKeySettingSpin();
initHoppingSettingSpin();
initCfgShow();
initListener();
@@ -505,8 +494,6 @@ public class Config extends AppCompatActivity
tvModuleSwitch = (TextView) findViewById(R.id.tvmoduleswitch);
tvOther = (TextView) findViewById(R.id.tvother);
tvSelfSetting = (TextView) findViewById(R.id.tvselfsetting);
- tvKeySetting = (TextView) findViewById(R.id.tvkeysetting);
- tvLowSignalSetting = (TextView) findViewById(R.id.tvlowsignalsetting);
tvExConfig = (TextView) findViewById(R.id.tvexconfig);
tvCfgRam = (TextView) findViewById(R.id.tvcfgram);
@@ -518,7 +505,7 @@ public class Config extends AppCompatActivity
getWindowManager().getDefaultDisplay().getMetrics(dm);
int screenW = dm.widthPixels;// 获取分辨率宽度
//offset = (screenW / 3 - bmpWidth) / 2;// 计算偏移量
- offset = (screenW / 9 - bmpWidth) / 2;// 计算偏移量
+ offset = (screenW / 7 - bmpWidth) / 2;// 计算偏移量
Matrix matrix = new Matrix();
matrix.postTranslate(offset, 0);
img_cursor.setImageMatrix(matrix);// 设置动画初始位置
@@ -530,11 +517,11 @@ public class Config extends AppCompatActivity
five = one * 5;// 移动两页的偏移量,比如1直接跳3
six = one * 6;// 移动两页的偏移量,比如1直接跳3
seven = one * 7;// 移动两页的偏移量,比如1直接跳3
- eight = one * 8;// 移动两页的偏移量,比如1直接跳3
- nine = one * 9;// 移动两页的偏移量,比如1直接跳3
+ //eight = one * 8;// 移动两页的偏移量,比如1直接跳3
+ //nine = one * 9;// 移动两页的偏移量,比如1直接跳3
Animation animation = null;
- animation = new TranslateAnimation(one * currIndex, eight, 0, 0); //currIndex初始化是8
+ animation = new TranslateAnimation(one * currIndex, six, 0, 0); //currIndex初始化是7
animation.setFillAfter(true);// true表示图片停在动画结束位置
animation.setDuration(300); //设置动画时间为300毫秒
img_cursor.startAnimation(animation);//开始动画
@@ -543,39 +530,33 @@ public class Config extends AppCompatActivity
listViews = new ArrayList<View>();
//LayoutInflater mInflater = getLayoutInflater();
- viewsample = View.inflate(this,R.layout.view_sample, null);
+ viewnormal = View.inflate(this,R.layout.view_normal, null);
+ viewtxrx = View.inflate(this,R.layout.view_txrx, null);
viewmoduleswitch = View.inflate(this,R.layout.view_module_switch, null);
- viewnormalsetting = View.inflate(this,R.layout.view_normal_setting, null);
- viewchannelsetting = View.inflate(this,R.layout.view_channel_setting, null);
- viewpensetting = View.inflate(this,R.layout.view_pen_setting, null);
- viewplamrestrain = View.inflate(this,R.layout.view_plam_restrain, null);
- viewkeysetting = View.inflate(this,R.layout.view_key_setting, null);
- viewhoppingsetting = View.inflate(this,R.layout.view_hopping_setting, null);
+ viewother = View.inflate(this,R.layout.view_other, null);
+ viewselfsetting = View.inflate(this,R.layout.view_self_setting, null);
+ viewexconfig = View.inflate(this,R.layout.view_ex_config, null);
viewcfgram = View.inflate(this,R.layout.view_cfg_ram, null);
//listViews.add(mInflater.inflate(R.layout.view_one, null, false));
//listViews.add(mInflater.inflate(R.layout.view_two, null, false));
//listViews.add(mInflater.inflate(R.layout.view_three, null, false));
- listViews.add(viewsample);
+ listViews.add(viewnormal);
+ listViews.add(viewtxrx);
listViews.add(viewmoduleswitch);
- listViews.add(viewnormalsetting);
- listViews.add(viewchannelsetting);
- listViews.add(viewpensetting);
- listViews.add(viewplamrestrain);
- listViews.add(viewkeysetting);
- listViews.add(viewhoppingsetting);
+ listViews.add(viewother);
+ listViews.add(viewselfsetting);
+ listViews.add(viewexconfig);
listViews.add(viewcfgram);
vpagerCfg.setAdapter(new MyPagerAdapter(listViews));
- vpagerCfg.setCurrentItem(8); //设置ViewPager当前页,从8开始算,跳到最后ram页
+ vpagerCfg.setCurrentItem(6); //设置ViewPager当前页,从8开始算,跳到最后ram页
tvNormal.setOnClickListener(this);
tvTxRX.setOnClickListener(this);
tvModuleSwitch.setOnClickListener(this);
tvOther.setOnClickListener(this);
tvSelfSetting.setOnClickListener(this);
- tvKeySetting.setOnClickListener(this);
- tvLowSignalSetting.setOnClickListener(this);
tvExConfig.setOnClickListener(this);
tvCfgRam.setOnClickListener(this);
@@ -584,14 +565,14 @@ public class Config extends AppCompatActivity
//===============================各view中的元素初始化开始===============================================//
private void initSampleSpin() {
- cbAllDrivingEn = viewsample.findViewById(R.id.alldrivingen);
- cbDualFreq = viewsample.findViewById(R.id.dualfreq);
- edtFreqAFactor = viewsample.findViewById(R.id.freqafactor);
- edtFreqBFactor = viewsample.findViewById(R.id.freqbfactor);
- edtPannelBitFreq = viewsample.findViewById(R.id.bitfreq);
- edtDuration = viewsample.findViewById(R.id.duration);
- edtFreqA = viewsample.findViewById(R.id.freqa);
- edtFreqB = viewsample.findViewById(R.id.freqb);
+ cbAllDrivingEn = viewnormal.findViewById(R.id.alldrivingen);
+ cbDualFreq = viewnormal.findViewById(R.id.dualfreq);
+ edtFreqAFactor = viewnormal.findViewById(R.id.freqafactor);
+ edtFreqBFactor = viewnormal.findViewById(R.id.freqbfactor);
+ edtPannelBitFreq = viewnormal.findViewById(R.id.bitfreq);
+ edtDuration = viewnormal.findViewById(R.id.duration);
+ edtFreqA = viewnormal.findViewById(R.id.freqa);
+ edtFreqB = viewnormal.findViewById(R.id.freqb);
twBitFreq = new TextWatcher(){
int ibitfreq = 0;
float fduration = 0;
@@ -889,236 +870,221 @@ public class Config extends AppCompatActivity
edtFreqBFactor.addTextChangedListener(twFreqBFactor);
//edtFreqB.addTextChangedListener(twFreqB);
- edtDumpShift = viewsample.findViewById(R.id.dumpshift);
- edtSubFrameDrvNum = viewsample.findViewById(R.id.subframedrvnum);
- spinDrvOutputR = viewsample.findViewById(R.id.drvoutputr);
- spinDACGain = viewsample.findViewById(R.id.dacgain);
- spinPGAC = viewsample.findViewById(R.id.pgac);
- spinPGAR = viewsample.findViewById(R.id.pgar);
- spinRxVcmi = viewsample.findViewById(R.id.rxvcmi);
- spinPGAGain = viewsample.findViewById(R.id.pgagainspin);
+ edtDumpShift = viewnormal.findViewById(R.id.dumpshift);
+ edtSubFrameDrvNum = viewnormal.findViewById(R.id.subframedrvnum);
+ spinDrvOutputR = viewnormal.findViewById(R.id.drvoutputr);
+ spinDACGain = viewnormal.findViewById(R.id.dacgain);
+ spinPGAC = viewnormal.findViewById(R.id.pgac);
+ spinPGAR = viewnormal.findViewById(R.id.pgar);
+ spinRxVcmi = viewnormal.findViewById(R.id.rxvcmi);
+ spinPGAGain = viewnormal.findViewById(R.id.pgagainspin);
spinPGAGain.setOnItemSelectedListener(this);
- spinBoostTime = viewsample.findViewById(R.id.boosttime);
- spinVoltage = viewsample.findViewById(R.id.voltage);
- spinAlterCount = viewsample.findViewById(R.id.altercount);
- cbExtoscen = viewsample.findViewById(R.id.extoscen);
+ spinBoostTime = viewnormal.findViewById(R.id.boosttime);
+ spinVoltage = viewnormal.findViewById(R.id.voltage);
+ spinAlterCount = viewnormal.findViewById(R.id.altercount);
+ cbExtoscen = viewnormal.findViewById(R.id.extoscen);
}
private void initModuleSwitchSpin() {
- cbX2Y = viewmoduleswitch.findViewById(R.id.x2y);
- cbSito = viewmoduleswitch.findViewById(R.id.sito);
- spinStretchRank = viewmoduleswitch.findViewById(R.id.stretchrank);
- spinInterrupt = viewmoduleswitch.findViewById(R.id.interrupt);
- cbMonitorConsistencyConflictEn = viewmoduleswitch.findViewById(R.id.mccen);
- cbFirstFilterDis = viewmoduleswitch.findViewById(R.id.firstfilterdis);
- cbDiffDivideBy2or4 = viewmoduleswitch.findViewById(R.id.diffdivideby2or4);
- cbWaterSpeedLimitEn = viewmoduleswitch.findViewById(R.id.waterspeedlimiten);
- cbShapeEn = viewmoduleswitch.findViewById(R.id.shapeen);
- cbWaterProofDis = viewmoduleswitch.findViewById(R.id.waterproofdis);
- cbLcdPlusMinusEn = viewmoduleswitch.findViewById(R.id.lcdplusminusen);
- cbESDEn = viewmoduleswitch.findViewById(R.id.esden);
- cbX2X = viewmoduleswitch.findViewById(R.id.x2x);
- cbY2Y = viewmoduleswitch.findViewById(R.id.y2y);
- cbINTWakeup = viewmoduleswitch.findViewById(R.id.intwakeup);
+ cbX2Y = viewtxrx.findViewById(R.id.x2y);
+ cbSito = viewtxrx.findViewById(R.id.sito);
+ spinStretchRank = viewtxrx.findViewById(R.id.stretchrank);
+ spinInterrupt = viewtxrx.findViewById(R.id.interrupt);
+ cbMonitorConsistencyConflictEn = viewtxrx.findViewById(R.id.mccen);
+ cbFirstFilterDis = viewtxrx.findViewById(R.id.firstfilterdis);
+ cbDiffDivideBy2or4 = viewtxrx.findViewById(R.id.diffdivideby2or4);
+ cbWaterSpeedLimitEn = viewtxrx.findViewById(R.id.waterspeedlimiten);
+ cbShapeEn = viewtxrx.findViewById(R.id.shapeen);
+ cbWaterProofDis = viewtxrx.findViewById(R.id.waterproofdis);
+ cbLcdPlusMinusEn = viewtxrx.findViewById(R.id.lcdplusminusen);
+ cbESDEn = viewtxrx.findViewById(R.id.esden);
+ cbX2X = viewtxrx.findViewById(R.id.x2x);
+ cbY2Y = viewtxrx.findViewById(R.id.y2y);
+ cbINTWakeup = viewtxrx.findViewById(R.id.intwakeup);
private void initNormalSettingSpin(){
- edtConfigVersion = viewnormalsetting.findViewById(R.id.configversion);
- edtTouchNumber = viewnormalsetting.findViewById(R.id.touchnumber);
- edtShakeCnt = viewnormalsetting.findViewById(R.id.shakecnt);
- edtFirstFilter = viewnormalsetting.findViewById(R.id.firstfilter);
- edtNormalFilter = viewnormalsetting.findViewById(R.id.normalfilter);
- edtNoiseReduction = viewnormalsetting.findViewById(R.id.noisereduction);
- edtScreenTouchLv = viewnormalsetting.findViewById(R.id.touchlevel);
- edtScreenLeaveLv = viewnormalsetting.findViewById(R.id.leavelevel);
- edtLowPowerControl = viewnormalsetting.findViewById(R.id.lowpowercontrol);
- spinRefreshRate = viewnormalsetting.findViewById(R.id.refreshrate);
- edtXThreshold = viewnormalsetting.findViewById(R.id.xthreshold);
- edtYThreshold = viewnormalsetting.findViewById(R.id.ythreshold);
- edtSpaceUpDown = viewnormalsetting.findViewById(R.id.spaceupdown);
- edtSpaceLeftRight = viewnormalsetting.findViewById(R.id.spaceleftright);
- edtStretchR0 = viewnormalsetting.findViewById(R.id.stretchr0);
- edtStretchR1 = viewnormalsetting.findViewById(R.id.stretchr1);
- edtStretchR2 = viewnormalsetting.findViewById(R.id.stretchr2);
- edtStretchRM = viewnormalsetting.findViewById(R.id.stretchrm);
- edtMiniFilter = viewnormalsetting.findViewById(R.id.minifilter);
- edtChargingLevelUp = viewnormalsetting.findViewById(R.id.charginglevelup);
- edtLcdPlusMinusValue = viewnormalsetting.findViewById(R.id.lcdplusminusvalue);
- edtConThreshold = viewnormalsetting.findViewById(R.id.conthreshold);
- edtShapeRestrain = viewnormalsetting.findViewById(R.id.shaperestrain);
- edtShapeContrl = viewnormalsetting.findViewById(R.id.shapecontrl);
- edtWaterFrameTime = viewnormalsetting.findViewById(R.id.waterframetime);
- edtWaterUpdateTime = viewnormalsetting.findViewById(R.id.waterupdatetime);
- edtSlideInEdgeConfig = viewnormalsetting.findViewById(R.id.slideinedgeconfig);
- edtSlideOutEdgeConfig = viewnormalsetting.findViewById(R.id.slideoutedgeconfig);
- edtCombineDis = viewnormalsetting.findViewById(R.id.combinedis);
- edtSplitSet = viewnormalsetting.findViewById(R.id.splitset);
- edtSitoDiffRefLevel = viewnormalsetting.findViewById(R.id.sitodiffreflevel);
+ edtConfigVersion = viewmoduleswitch.findViewById(R.id.configversion);
+ edtTouchNumber = viewmoduleswitch.findViewById(R.id.touchnumber);
+ edtShakeCnt = viewmoduleswitch.findViewById(R.id.shakecnt);
+ edtFirstFilter = viewmoduleswitch.findViewById(R.id.firstfilter);
+ edtNormalFilter = viewmoduleswitch.findViewById(R.id.normalfilter);
+ edtNoiseReduction = viewmoduleswitch.findViewById(R.id.noisereduction);
+ edtScreenTouchLv = viewmoduleswitch.findViewById(R.id.touchlevel);
+ edtScreenLeaveLv = viewmoduleswitch.findViewById(R.id.leavelevel);
+ edtLowPowerControl = viewmoduleswitch.findViewById(R.id.lowpowercontrol);
+ spinRefreshRate = viewmoduleswitch.findViewById(R.id.refreshrate);
+ edtXThreshold = viewmoduleswitch.findViewById(R.id.xthreshold);
+ edtYThreshold = viewmoduleswitch.findViewById(R.id.ythreshold);
+ edtSpaceUpDown = viewmoduleswitch.findViewById(R.id.spaceupdown);
+ edtSpaceLeftRight = viewmoduleswitch.findViewById(R.id.spaceleftright);
+ edtStretchR0 = viewmoduleswitch.findViewById(R.id.stretchr0);
+ edtStretchR1 = viewmoduleswitch.findViewById(R.id.stretchr1);
+ edtStretchR2 = viewmoduleswitch.findViewById(R.id.stretchr2);
+ edtStretchRM = viewmoduleswitch.findViewById(R.id.stretchrm);
+ edtMiniFilter = viewmoduleswitch.findViewById(R.id.minifilter);
+ edtChargingLevelUp = viewmoduleswitch.findViewById(R.id.charginglevelup);
+ edtLcdPlusMinusValue = viewmoduleswitch.findViewById(R.id.lcdplusminusvalue);
+ edtConThreshold = viewmoduleswitch.findViewById(R.id.conthreshold);
+ edtShapeRestrain = viewmoduleswitch.findViewById(R.id.shaperestrain);
+ edtShapeContrl = viewmoduleswitch.findViewById(R.id.shapecontrl);
+ edtWaterFrameTime = viewmoduleswitch.findViewById(R.id.waterframetime);
+ edtWaterUpdateTime = viewmoduleswitch.findViewById(R.id.waterupdatetime);
+ edtSlideInEdgeConfig = viewmoduleswitch.findViewById(R.id.slideinedgeconfig);
+ edtSlideOutEdgeConfig = viewmoduleswitch.findViewById(R.id.slideoutedgeconfig);
+ edtCombineDis = viewmoduleswitch.findViewById(R.id.combinedis);
+ edtSplitSet = viewmoduleswitch.findViewById(R.id.splitset);
+ edtSitoDiffRefLevel = viewmoduleswitch.findViewById(R.id.sitodiffreflevel);
+ /*
private void initChannelSettingSpin(){
- edtXOutputMax = viewchannelsetting.findViewById(R.id.xoutputmax);
- edtYOutputMax = viewchannelsetting.findViewById(R.id.youtputmax);
- edtDrvGroupAnumber = viewchannelsetting.findViewById(R.id.drvgroupanum);
- edtDrvGroupBnumber = viewchannelsetting.findViewById(R.id.drvgroupbnum);
- edtSenGroupANumber = viewchannelsetting.findViewById(R.id.sengroupanum);
- edtSenGroupBNumber = viewchannelsetting.findViewById(R.id.sengroupbnum);
- edtSensorCH0 = viewchannelsetting.findViewById(R.id.sensorch0);
- edtSensorCH1 = viewchannelsetting.findViewById(R.id.sensorch1);
- edtSensorCH2 = viewchannelsetting.findViewById(R.id.sensorch2);
- edtSensorCH3 = viewchannelsetting.findViewById(R.id.sensorch3);
- edtSensorCH4 = viewchannelsetting.findViewById(R.id.sensorch4);
- edtSensorCH5 = viewchannelsetting.findViewById(R.id.sensorch5);
- edtSensorCH6 = viewchannelsetting.findViewById(R.id.sensorch6);
- edtSensorCH7 = viewchannelsetting.findViewById(R.id.sensorch7);
- edtSensorCH8 = viewchannelsetting.findViewById(R.id.sensorch8);
- edtSensorCH9 = viewchannelsetting.findViewById(R.id.sensorch9);
- edtSensorCH10 = viewchannelsetting.findViewById(R.id.sensorch10);
- edtSensorCH11 = viewchannelsetting.findViewById(R.id.sensorch11);
- edtSensorCH12 = viewchannelsetting.findViewById(R.id.sensorch12);
- edtSensorCH13 = viewchannelsetting.findViewById(R.id.sensorch13);
- edtSensorCH14 = viewchannelsetting.findViewById(R.id.sensorch14);
- edtSensorCH15 = viewchannelsetting.findViewById(R.id.sensorch15);
- edtSensorCH16 = viewchannelsetting.findViewById(R.id.sensorch16);
- edtSensorCH17 = viewchannelsetting.findViewById(R.id.sensorch17);
- edtSensorCH18 = viewchannelsetting.findViewById(R.id.sensorch18);
- edtSensorCH19 = viewchannelsetting.findViewById(R.id.sensorch19);
- edtSensorCH20 = viewchannelsetting.findViewById(R.id.sensorch20);
- edtSensorCH21 = viewchannelsetting.findViewById(R.id.sensorch21);
- edtSensorCH22 = viewchannelsetting.findViewById(R.id.sensorch22);
- edtSensorCH23 = viewchannelsetting.findViewById(R.id.sensorch23);
- edtSensorCH24 = viewchannelsetting.findViewById(R.id.sensorch24);
- edtSensorCH25 = viewchannelsetting.findViewById(R.id.sensorch25);
- edtSensorCH26 = viewchannelsetting.findViewById(R.id.sensorch26);
- edtSensorCH27 = viewchannelsetting.findViewById(R.id.sensorch27);
- edtSensorCH28 = viewchannelsetting.findViewById(R.id.sensorch28);
- edtSensorCH29 = viewchannelsetting.findViewById(R.id.sensorch29);
- edtSensorStart = viewchannelsetting.findViewById(R.id.sensorstart);
- edtSensorEnd = viewchannelsetting.findViewById(R.id.sensorend);
- btnSensorRev = viewchannelsetting.findViewById(R.id.btnsensorrev);
+ edtXOutputMax = viewtxrx.findViewById(R.id.xoutputmax);
+ edtYOutputMax = viewtxrx.findViewById(R.id.youtputmax);
+ edtDrvGroupAnumber = viewtxrx.findViewById(R.id.drvgroupanum);
+ edtDrvGroupBnumber = viewtxrx.findViewById(R.id.drvgroupbnum);
+ edtSenGroupANumber = viewtxrx.findViewById(R.id.sengroupanum);
+ edtSenGroupBNumber = viewtxrx.findViewById(R.id.sengroupbnum);
+ edtSensorCH0 = viewtxrx.findViewById(R.id.sensorch0);
+ edtSensorCH1 = viewtxrx.findViewById(R.id.sensorch1);
+ edtSensorCH2 = viewtxrx.findViewById(R.id.sensorch2);
+ edtSensorCH3 = viewtxrx.findViewById(R.id.sensorch3);
+ edtSensorCH4 = viewtxrx.findViewById(R.id.sensorch4);
+ edtSensorCH5 = viewtxrx.findViewById(R.id.sensorch5);
+ edtSensorCH6 = viewtxrx.findViewById(R.id.sensorch6);
+ edtSensorCH7 = viewtxrx.findViewById(R.id.sensorch7);
+ edtSensorCH8 = viewtxrx.findViewById(R.id.sensorch8);
+ edtSensorCH9 = viewtxrx.findViewById(R.id.sensorch9);
+ edtSensorCH10 = viewtxrx.findViewById(R.id.sensorch10);
+ edtSensorCH11 = viewtxrx.findViewById(R.id.sensorch11);
+ edtSensorCH12 = viewtxrx.findViewById(R.id.sensorch12);
+ edtSensorCH13 = viewtxrx.findViewById(R.id.sensorch13);
+ edtSensorCH14 = viewtxrx.findViewById(R.id.sensorch14);
+ edtSensorCH15 = viewtxrx.findViewById(R.id.sensorch15);
+ edtSensorCH16 = viewtxrx.findViewById(R.id.sensorch16);
+ edtSensorCH17 = viewtxrx.findViewById(R.id.sensorch17);
+ edtSensorCH18 = viewtxrx.findViewById(R.id.sensorch18);
+ edtSensorCH19 = viewtxrx.findViewById(R.id.sensorch19);
+ edtSensorCH20 = viewtxrx.findViewById(R.id.sensorch20);
+ edtSensorCH21 = viewtxrx.findViewById(R.id.sensorch21);
+ edtSensorCH22 = viewtxrx.findViewById(R.id.sensorch22);
+ edtSensorCH23 = viewtxrx.findViewById(R.id.sensorch23);
+ edtSensorCH24 = viewtxrx.findViewById(R.id.sensorch24);
+ edtSensorCH25 = viewtxrx.findViewById(R.id.sensorch25);
+ edtSensorCH26 = viewtxrx.findViewById(R.id.sensorch26);
+ edtSensorCH27 = viewtxrx.findViewById(R.id.sensorch27);
+ edtSensorCH28 = viewtxrx.findViewById(R.id.sensorch28);
+ edtSensorCH29 = viewtxrx.findViewById(R.id.sensorch29);
+ edtSensorStart = viewtxrx.findViewById(R.id.sensorstart);
+ edtSensorEnd = viewtxrx.findViewById(R.id.sensorend);
+ btnSensorRev = viewtxrx.findViewById(R.id.btnsensorrev);
btnSensorRev.setOnClickListener(this);
- btnAllSensorChannels = viewchannelsetting.findViewById(R.id.allsensorchannels);
+ btnAllSensorChannels = viewtxrx.findViewById(R.id.allsensorchannels);
btnAllSensorChannels.setOnClickListener(this);
- edtDriverCH0 = viewchannelsetting.findViewById(R.id.driverch0);
- edtDriverCH1 = viewchannelsetting.findViewById(R.id.driverch1);
- edtDriverCH2 = viewchannelsetting.findViewById(R.id.driverch2);
- edtDriverCH3 = viewchannelsetting.findViewById(R.id.driverch3);
- edtDriverCH4 = viewchannelsetting.findViewById(R.id.driverch4);
- edtDriverCH5 = viewchannelsetting.findViewById(R.id.driverch5);
- edtDriverCH6 = viewchannelsetting.findViewById(R.id.driverch6);
- edtDriverCH7 = viewchannelsetting.findViewById(R.id.driverch7);
- edtDriverCH8 = viewchannelsetting.findViewById(R.id.driverch8);
- edtDriverCH9 = viewchannelsetting.findViewById(R.id.driverch9);
- edtDriverCH10 = viewchannelsetting.findViewById(R.id.driverch10);
- edtDriverCH11 = viewchannelsetting.findViewById(R.id.driverch11);
- edtDriverCH12 = viewchannelsetting.findViewById(R.id.driverch12);
- edtDriverCH13 = viewchannelsetting.findViewById(R.id.driverch13);
- edtDriverCH14 = viewchannelsetting.findViewById(R.id.driverch14);
- edtDriverCH15 = viewchannelsetting.findViewById(R.id.driverch15);
- edtDriverCH16 = viewchannelsetting.findViewById(R.id.driverch16);
- edtDriverCH17 = viewchannelsetting.findViewById(R.id.driverch17);
- edtDriverCH18 = viewchannelsetting.findViewById(R.id.driverch18);
- edtDriverCH19 = viewchannelsetting.findViewById(R.id.driverch19);
- edtDriverCH20 = viewchannelsetting.findViewById(R.id.driverch20);
- edtDriverCH21 = viewchannelsetting.findViewById(R.id.driverch21);
- edtDriverCH22 = viewchannelsetting.findViewById(R.id.driverch22);
- edtDriverCH23 = viewchannelsetting.findViewById(R.id.driverch23);
- edtDriverCH24 = viewchannelsetting.findViewById(R.id.driverch24);
- edtDriverCH25 = viewchannelsetting.findViewById(R.id.driverch25);
- edtDriverCH26 = viewchannelsetting.findViewById(R.id.driverch26);
- edtDriverCH27 = viewchannelsetting.findViewById(R.id.driverch27);
- edtDriverCH28 = viewchannelsetting.findViewById(R.id.driverch28);
- edtDriverCH29 = viewchannelsetting.findViewById(R.id.driverch29);
- edtDriverCH30 = viewchannelsetting.findViewById(R.id.driverch30);
- edtDriverCH31 = viewchannelsetting.findViewById(R.id.driverch31);
- edtDriverCH32 = viewchannelsetting.findViewById(R.id.driverch32);
- edtDriverCH33 = viewchannelsetting.findViewById(R.id.driverch33);
- edtDriverCH34 = viewchannelsetting.findViewById(R.id.driverch34);
- edtDriverCH35 = viewchannelsetting.findViewById(R.id.driverch35);
- edtDriverCH36 = viewchannelsetting.findViewById(R.id.driverch36);
- edtDriverCH37 = viewchannelsetting.findViewById(R.id.driverch37);
- edtDriverCH38 = viewchannelsetting.findViewById(R.id.driverch38);
- edtDriverCH39 = viewchannelsetting.findViewById(R.id.driverch39);
- edtDriverCH40 = viewchannelsetting.findViewById(R.id.driverch40);
- edtDriverCH41 = viewchannelsetting.findViewById(R.id.driverch41);
- edtDriverStart = viewchannelsetting.findViewById(R.id.driverstart);
- edtDriverEnd = viewchannelsetting.findViewById(R.id.driverend);
- btnDriverRev = viewchannelsetting.findViewById(R.id.btndriverrev);
+ edtDriverCH0 = viewtxrx.findViewById(R.id.driverch0);
+ edtDriverCH1 = viewtxrx.findViewById(R.id.driverch1);
+ edtDriverCH2 = viewtxrx.findViewById(R.id.driverch2);
+ edtDriverCH3 = viewtxrx.findViewById(R.id.driverch3);
+ edtDriverCH4 = viewtxrx.findViewById(R.id.driverch4);
+ edtDriverCH5 = viewtxrx.findViewById(R.id.driverch5);
+ edtDriverCH6 = viewtxrx.findViewById(R.id.driverch6);
+ edtDriverCH7 = viewtxrx.findViewById(R.id.driverch7);
+ edtDriverCH8 = viewtxrx.findViewById(R.id.driverch8);
+ edtDriverCH9 = viewtxrx.findViewById(R.id.driverch9);
+ edtDriverCH10 = viewtxrx.findViewById(R.id.driverch10);
+ edtDriverCH11 = viewtxrx.findViewById(R.id.driverch11);
+ edtDriverCH12 = viewtxrx.findViewById(R.id.driverch12);
+ edtDriverCH13 = viewtxrx.findViewById(R.id.driverch13);
+ edtDriverCH14 = viewtxrx.findViewById(R.id.driverch14);
+ edtDriverCH15 = viewtxrx.findViewById(R.id.driverch15);
+ edtDriverCH16 = viewtxrx.findViewById(R.id.driverch16);
+ edtDriverCH17 = viewtxrx.findViewById(R.id.driverch17);
+ edtDriverCH18 = viewtxrx.findViewById(R.id.driverch18);
+ edtDriverCH19 = viewtxrx.findViewById(R.id.driverch19);
+ edtDriverCH20 = viewtxrx.findViewById(R.id.driverch20);
+ edtDriverCH21 = viewtxrx.findViewById(R.id.driverch21);
+ edtDriverCH22 = viewtxrx.findViewById(R.id.driverch22);
+ edtDriverCH23 = viewtxrx.findViewById(R.id.driverch23);
+ edtDriverCH24 = viewtxrx.findViewById(R.id.driverch24);
+ edtDriverCH25 = viewtxrx.findViewById(R.id.driverch25);
+ edtDriverCH26 = viewtxrx.findViewById(R.id.driverch26);
+ edtDriverCH27 = viewtxrx.findViewById(R.id.driverch27);
+ edtDriverCH28 = viewtxrx.findViewById(R.id.driverch28);
+ edtDriverCH29 = viewtxrx.findViewById(R.id.driverch29);
+ edtDriverCH30 = viewtxrx.findViewById(R.id.driverch30);
+ edtDriverCH31 = viewtxrx.findViewById(R.id.driverch31);
+ edtDriverCH32 = viewtxrx.findViewById(R.id.driverch32);
+ edtDriverCH33 = viewtxrx.findViewById(R.id.driverch33);
+ edtDriverCH34 = viewtxrx.findViewById(R.id.driverch34);
+ edtDriverCH35 = viewtxrx.findViewById(R.id.driverch35);
+ edtDriverCH36 = viewtxrx.findViewById(R.id.driverch36);
+ edtDriverCH37 = viewtxrx.findViewById(R.id.driverch37);
+ edtDriverCH38 = viewtxrx.findViewById(R.id.driverch38);
+ edtDriverCH39 = viewtxrx.findViewById(R.id.driverch39);
+ edtDriverCH40 = viewtxrx.findViewById(R.id.driverch40);
+ edtDriverCH41 = viewtxrx.findViewById(R.id.driverch41);
+ edtDriverStart = viewtxrx.findViewById(R.id.driverstart);
+ edtDriverEnd = viewtxrx.findViewById(R.id.driverend);
+ btnDriverRev = viewtxrx.findViewById(R.id.btndriverrev);
btnDriverRev.setOnClickListener(this);
- btnAllDriverChannels = viewchannelsetting.findViewById(R.id.alldriverchannels);
+ btnAllDriverChannels = viewtxrx.findViewById(R.id.alldriverchannels);
btnAllDriverChannels.setOnClickListener(this);
+ */
private void initPenSettingSpin(){
- cbPenEn = viewpensetting.findViewById(R.id.penen);
- cbOnlyFingerEn = viewpensetting.findViewById(R.id.onlyfingeren);
- edtPenLowSize = viewpensetting.findViewById(R.id.penlowsize);
- edtPenHighSize = viewpensetting.findViewById(R.id.penhighsize);
- edtRectsumPLowL = viewpensetting.findViewById(R.id.rectsumplowl);
- edtRectsumPHighL = viewpensetting.findViewById(R.id.rectsumphighl);
- edtRectsumFLowL = viewpensetting.findViewById(R.id.rectsumflowl);
- edtPRectMaxDiffLimit = viewpensetting.findViewById(R.id.prectmaxdifflimit);
- edtPRectAreaLimit = viewpensetting.findViewById(R.id.prectarealimit);
- edtFLeavelevel = viewpensetting.findViewById(R.id.fleavelevel);
- edtPTouchHighlevel = viewpensetting.findViewById(R.id.ptouchhighlevel);
- spinFingerRestrainPen = viewpensetting.findViewById(R.id.fingerrestrainpen);
+ cbPenEn = viewother.findViewById(R.id.penen);
+ cbOnlyFingerEn = viewother.findViewById(R.id.onlyfingeren);
+ edtPenLowSize = viewother.findViewById(R.id.penlowsize);
+ edtPenHighSize = viewother.findViewById(R.id.penhighsize);
+ edtRectsumPLowL = viewother.findViewById(R.id.rectsumplowl);
+ edtRectsumPHighL = viewother.findViewById(R.id.rectsumphighl);
+ edtRectsumFLowL = viewother.findViewById(R.id.rectsumflowl);
+ edtPRectMaxDiffLimit = viewother.findViewById(R.id.prectmaxdifflimit);
+ edtPRectAreaLimit = viewother.findViewById(R.id.prectarealimit);
+ edtFLeavelevel = viewother.findViewById(R.id.fleavelevel);
+ edtPTouchHighlevel = viewother.findViewById(R.id.ptouchhighlevel);
+ spinFingerRestrainPen = viewother.findViewById(R.id.fingerrestrainpen);
private void initPlamRestrainSpin(){
- cbAllPlamRestrain = viewplamrestrain.findViewById(R.id.allplamrestrain);
- edtLargeTouch = viewplamrestrain.findViewById(R.id.largetouch);
- edtExpanNumOutX = viewplamrestrain.findViewById(R.id.expannumoutx);
- edtExpanNumOutY = viewplamrestrain.findViewById(R.id.expannumouty);
- edtExpanNumInX = viewplamrestrain.findViewById(R.id.expannuminx);
- edtExpanNumInY = viewplamrestrain.findViewById(R.id.expannuminy);
- edtSingleRectTopSignNum = viewplamrestrain.findViewById(R.id.singlerecttopsignnum);
- edtAllRectTopSignSum = viewplamrestrain.findViewById(R.id.allrecttopsignsum);
- cbWaterLargeRestrainEn = viewplamrestrain.findViewById(R.id.waterlargerestrainen);
- }
- private void initKeySettingSpin(){
- cbTouchKey = viewkeysetting.findViewById(R.id.touchkey);
- edtKeyArea = viewkeysetting.findViewById(R.id.keyarea);
- edtKey1 = viewkeysetting.findViewById(R.id.key1);
- edtKey2 = viewkeysetting.findViewById(R.id.key2);
- edtKey3 = viewkeysetting.findViewById(R.id.key3);
- edtKey4 = viewkeysetting.findViewById(R.id.key4);
- edtKeyTouchLevel = viewkeysetting.findViewById(R.id.keytouchlevel);
- edtKeyLeaveLevel = viewkeysetting.findViewById(R.id.keyleavelevel);
- edtKeySens1and2 = viewkeysetting.findViewById(R.id.keysens1and2);
- edtKeySens3and4 = viewkeysetting.findViewById(R.id.keysens3and4);
- edtKeyRestrain = viewkeysetting.findViewById(R.id.keyrestrain);
- edtKeyRestrainTime = viewkeysetting.findViewById(R.id.keyrestraintime);
+ cbAllPlamRestrain = viewselfsetting.findViewById(R.id.allplamrestrain);
+ edtLargeTouch = viewselfsetting.findViewById(R.id.largetouch);
+ edtExpanNumOutX = viewselfsetting.findViewById(R.id.expannumoutx);
+ edtExpanNumOutY = viewselfsetting.findViewById(R.id.expannumouty);
+ edtExpanNumInX = viewselfsetting.findViewById(R.id.expannuminx);
+ edtExpanNumInY = viewselfsetting.findViewById(R.id.expannuminy);
+ edtSingleRectTopSignNum = viewselfsetting.findViewById(R.id.singlerecttopsignnum);
+ edtAllRectTopSignSum = viewselfsetting.findViewById(R.id.allrecttopsignsum);
+ cbWaterLargeRestrainEn = viewselfsetting.findViewById(R.id.waterlargerestrainen);
private void initHoppingSettingSpin(){
- cbHoppingEn = viewhoppingsetting.findViewById(R.id.hoppingen);
- cbRangeExt = viewhoppingsetting.findViewById(R.id.rangeext);
- edtFreqStart = viewhoppingsetting.findViewById(R.id.freqstart);
- edtFreqEnd = viewhoppingsetting.findViewById(R.id.freqend);
- edtDetectStayTimes = viewhoppingsetting.findViewById(R.id.detectstaytimes);
- edtDetectConfirmTimes = viewhoppingsetting.findViewById(R.id.detectconfirmtimes);
- cbDisForceRef = viewhoppingsetting.findViewById(R.id.disforceref);
- cbDelayHopping = viewhoppingsetting.findViewById(R.id.delayhopping);
- edtFastHopLimit = viewhoppingsetting.findViewById(R.id.fasthoplimit);
- edtHopThreshold = viewhoppingsetting.findViewById(R.id.hopthreshold);
- edtNoiseMinTh = viewhoppingsetting.findViewById(R.id.noiseminth);
- edtSensorGroup = viewhoppingsetting.findViewById(R.id.sensorgroup);
- edtSeg1Normalize = viewhoppingsetting.findViewById(R.id.seg1normalize);
- edtSeg1Factor = viewhoppingsetting.findViewById(R.id.seg1factor);
- edtMainClockAjdust = viewhoppingsetting.findViewById(R.id.mainclockajdust);
- edtSeg2Normalize = viewhoppingsetting.findViewById(R.id.seg2normalize);
- edtSeg2Factor = viewhoppingsetting.findViewById(R.id.seg2factor);
- edtSeg3Normalize = viewhoppingsetting.findViewById(R.id.seg3normalize);
- edtSeg3Factor = viewhoppingsetting.findViewById(R.id.seg3factor);
- edtSeg4Normalize = viewhoppingsetting.findViewById(R.id.seg4normalize);
- edtSeg4Factor = viewhoppingsetting.findViewById(R.id.seg4factor);
- edtSeg5Normalize = viewhoppingsetting.findViewById(R.id.seg5normalize);
- edtSeg5Factor = viewhoppingsetting.findViewById(R.id.seg5factor);
- edtSeg6Normalize = viewhoppingsetting.findViewById(R.id.seg6normalize);
- edtHopFreqAddr = viewhoppingsetting.findViewById(R.id.hopfreqaddr);
- edtHopDetectTimes = viewhoppingsetting.findViewById(R.id.hopdetecttimes);
+ cbHoppingEn = viewexconfig.findViewById(R.id.hoppingen);
+ cbRangeExt = viewexconfig.findViewById(R.id.rangeext);
+ edtFreqStart = viewexconfig.findViewById(R.id.freqstart);
+ edtFreqEnd = viewexconfig.findViewById(R.id.freqend);
+ edtDetectStayTimes = viewexconfig.findViewById(R.id.detectstaytimes);
+ edtDetectConfirmTimes = viewexconfig.findViewById(R.id.detectconfirmtimes);
+ cbDisForceRef = viewexconfig.findViewById(R.id.disforceref);
+ cbDelayHopping = viewexconfig.findViewById(R.id.delayhopping);
+ edtFastHopLimit = viewexconfig.findViewById(R.id.fasthoplimit);
+ edtHopThreshold = viewexconfig.findViewById(R.id.hopthreshold);
+ edtNoiseMinTh = viewexconfig.findViewById(R.id.noiseminth);
+ edtSensorGroup = viewexconfig.findViewById(R.id.sensorgroup);
+ edtSeg1Normalize = viewexconfig.findViewById(R.id.seg1normalize);
+ edtSeg1Factor = viewexconfig.findViewById(R.id.seg1factor);
+ edtMainClockAjdust = viewexconfig.findViewById(R.id.mainclockajdust);
+ edtSeg2Normalize = viewexconfig.findViewById(R.id.seg2normalize);
+ edtSeg2Factor = viewexconfig.findViewById(R.id.seg2factor);
+ edtSeg3Normalize = viewexconfig.findViewById(R.id.seg3normalize);
+ edtSeg3Factor = viewexconfig.findViewById(R.id.seg3factor);
+ edtSeg4Normalize = viewexconfig.findViewById(R.id.seg4normalize);
+ edtSeg4Factor = viewexconfig.findViewById(R.id.seg4factor);
+ edtSeg5Normalize = viewexconfig.findViewById(R.id.seg5normalize);
+ edtSeg5Factor = viewexconfig.findViewById(R.id.seg5factor);
+ edtSeg6Normalize = viewexconfig.findViewById(R.id.seg6normalize);
+ edtHopFreqAddr = viewexconfig.findViewById(R.id.hopfreqaddr);
+ edtHopDetectTimes = viewexconfig.findViewById(R.id.hopdetecttimes);
//Cfg Ram 定义
@@ -1976,7 +1942,6 @@ public class Config extends AppCompatActivity
ReadCfgChannelSetting(mBytes);
ReadCfgPenSetting(mBytes);
ReadCfgPlamRestrain(mBytes);
- ReadCfgKeySetting(mBytes);
ReadCfgHoppingSetting(mBytes);
ReadCfgRam(stringCfgArr);
} catch (IOException e) {
@@ -2014,7 +1979,7 @@ public class Config extends AppCompatActivity
- byte[] mGt9PScFileData = new byte[197 * 1024 + 512];
+ //byte[] mGt9PScFileData = new byte[197 * 1024 + 512];
private void initData() {
mContext = getApplicationContext();
mReadCfg.setEnabled(false); //
@@ -2028,7 +1993,7 @@ public class Config extends AppCompatActivity
mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
ActivityCompat.requestPermissions( Config.this, new String[]{android
.Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1); //申请权限,android6.0以上系统首次使用必须添加
@@ -2073,7 +2038,7 @@ public class Config extends AppCompatActivity
String strGt9PScFileData = new String(mGt9PScFileData);
int i = 0;
/**
@@ -2468,81 +2433,6 @@ public class Config extends AppCompatActivity
- public void ReadCfgKeySetting(byte[] mBytes){
- String hv;
- cbTouchKey.setChecked(false);
- if ((mBytes[7] & 0x01) == 1){
- cbTouchKey.setChecked(true);
- hv = Integer.toHexString(mBytes[80] & 0xFF);
- if (hv.length() < 2){
- hv = "0" + hv;
- edtKeyArea.setText(hv);
- hv = Integer.toHexString(mBytes[76] & 0xFF);
- edtKey1.setText(hv);
- hv = Integer.toHexString(mBytes[77] & 0xFF);
- edtKey2.setText(hv);
- hv = Integer.toHexString(mBytes[78] & 0xFF);
- edtKey3.setText(hv);
- hv = Integer.toHexString(mBytes[79] & 0xFF);
- edtKey4.setText(hv);
- hv = Integer.toHexString(mBytes[81] & 0xFF);
- edtKeyTouchLevel.setText(hv);
- hv = Integer.toHexString(mBytes[82] & 0xFF);
- edtKeyLeaveLevel.setText(hv);
- hv = Integer.toHexString(mBytes[83] & 0xFF);
- edtKeySens1and2.setText(hv);
- hv = Integer.toHexString(mBytes[84] & 0xFF);
- edtKeySens3and4.setText(hv);
- hv = Integer.toHexString(mBytes[85] & 0xFF);
- edtKeyRestrain.setText(hv);
- hv = Integer.toHexString(mBytes[86] & 0x0F);
- edtKeyRestrainTime.setText(hv);
public void ReadCfgHoppingSetting(byte[] mBytes){
edtFreqStart.setText(Integer.toString(mBytes[51] & 0xFF));
edtFreqEnd.setText(Integer.toString(mBytes[52] & 0xFF));
@@ -3007,10 +2897,8 @@ public class Config extends AppCompatActivity
if (cbAllPlamRestrain.isChecked()){
mBytes[6] += 64;
- //mBytes[7]
- if (cbTouchKey.isChecked()){
- mBytes[7] = 1;
+
if (cbPenEn.isChecked()){
mBytes[7] += 2;
@@ -3124,17 +3012,8 @@ public class Config extends AppCompatActivity
mBytes[73] = (byte)Integer.parseInt(edtSeg5Factor.getText().toString(),10);
//mBytes[74]
mBytes[75] = (byte)Integer.parseInt(edtSeg6Normalize.getText().toString(),10);
- mBytes[76] = (byte)Integer.parseInt(edtKey1.getText().toString(),16);
- mBytes[77] = (byte)Integer.parseInt(edtKey2.getText().toString(),16);
- mBytes[78] = (byte)Integer.parseInt(edtKey3.getText().toString(),16);
- mBytes[79] = (byte)Integer.parseInt(edtKey4.getText().toString(),16);
- mBytes[80] = (byte)Integer.parseInt(edtKeyArea.getText().toString(),16);
- mBytes[81] = (byte)Integer.parseInt(edtKeyTouchLevel.getText().toString(),16);
- mBytes[82] = (byte)Integer.parseInt(edtKeyLeaveLevel.getText().toString(),16);
- mBytes[83] = (byte)Integer.parseInt(edtKeySens1and2.getText().toString(),16);
- mBytes[84] = (byte)Integer.parseInt(edtKeySens3and4.getText().toString(),16);
- mBytes[85] = (byte)Integer.parseInt(edtKeyRestrain.getText().toString(),16);
- mBytes[86] = (byte)(Integer.parseInt(edtKeyRestrainTime.getText().toString(),16) & 0x0f);
mBytes[87] = (byte)(Integer.parseInt(edtShapeRestrain.getText().toString(),10) & 0x7f);
mBytes[88] = (byte)Integer.parseInt(edtConThreshold.getText().toString(),10);
mBytes[89] = (byte)Integer.parseInt(edtWaterFrameTime.getText().toString(),10);
@@ -3312,22 +3191,15 @@ public class Config extends AppCompatActivity
vpagerCfg.setCurrentItem(4);
iChooseVPager = 4;
break;
- case R.id.tvkeysetting:
+ case R.id.tvexconfig:
vpagerCfg.setCurrentItem(5);
iChooseVPager = 5;
- case R.id.tvlowsignalsetting:
+ case R.id.tvcfgram:
vpagerCfg.setCurrentItem(6);
iChooseVPager = 6;
- case R.id.tvexconfig:
- vpagerCfg.setCurrentItem(7);
- iChooseVPager = 7;
- break;
- case R.id.tvcfgram:
- vpagerCfg.setCurrentItem(8);
- iChooseVPager = 8;
case R.id.btnsensorrev:
configBuilder.append(edtSensorCH0.getText().toString()+",");
configBuilder.append(edtSensorCH1.getText().toString()+",");
@@ -3551,6 +3423,7 @@ public class Config extends AppCompatActivity
edtDriverCH35.setText("35");edtDriverCH36.setText("36");edtDriverCH37.setText("37");edtDriverCH38.setText("38");edtDriverCH39.setText("39");
edtDriverCH40.setText("40");edtDriverCH41.setText("41");
case R.id.sendcfg: //send cfg
bottonMode = 1;
@@ -4288,6 +4161,7 @@ public class Config extends AppCompatActivity
animation = new TranslateAnimation(one * currIndex, seven, 0, 0);
case 8:
if (currIndex == 0) {
animation = new TranslateAnimation(offset, eight, 0, 0);
@@ -4304,6 +4178,7 @@ public class Config extends AppCompatActivity
animation = new TranslateAnimation(one * currIndex, nine, 0, 0);
default:
@@ -113,24 +113,6 @@
android:text="@string/selfsetting"
android:textColor="#000000" />
- <TextView
- android:id="@+id/tvkeysetting"
- android:layout_width="match_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1.0"
- android:gravity="center"
- android:text="@string/keysetting"
- android:textColor="#000000" />
- android:id="@+id/tvlowsignalsetting"
- android:text="@string/lowsignalsetting"
<TextView
android:id="@+id/tvexconfig"
android:layout_width="match_parent"
@@ -1,2225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="match_parent"
- android:background="#FEF898"
- android:orientation="vertical">
- <ScrollView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:fillViewport="true">
- <LinearLayout
- android:id="@+id/LinearLayout"
- <GridLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/AllGridLayout"
- android:layout_gravity="center_vertical"
- android:columnCount="5"
- android:orientation="horizontal"
- android:rowCount="85">
- android:layout_gravity="right"
- android:layout_marginRight="1dp"
- android:text="X Output Max(D)"
- android:textColor="#000000"
- android:textSize="22dp"/>
- <EditText
- android:id="@+id/xoutputmax"
- android:layout_gravity="fill"
- android:background="@drawable/bg_frame_search"
- android:singleLine="true"
- android:text="00"
- android:textSize="22dp" />
- android:layout_row="0"
- android:layout_column="2"
- android:text=" " />
- android:text="Y Output Max(D)"
- android:id="@+id/youtputmax"
- android:layout_row="1"
- android:layout_column="0"
- android:layout_columnSpan="5"
- android:text="" />
- android:layout_row="2"
- android:layout_marginRight="5dp"
- android:text="DrvGroupAnumber(D)"
- android:id="@+id/drvgroupanum"
- android:textSize="22dp"
- android:textAlignment="center"/>
- android:layout_column="3"
- android:text="DrvGroupBnumber(D)"
- android:id="@+id/drvgroupbnum"
- android:layout_row="3"
- android:layout_row="4"
- android:text="SenGroupANumber(D)"
- android:id="@+id/sengroupanum"
- android:text="SenGroupBnumber(D)"
- android:id="@+id/sengroupbnum"
- android:layout_row="5"
- android:layout_row="6"
- android:text="Sensor_CH0(D)"
- android:id="@+id/sensorch0"
- android:text="Sensor_CH1(D)"
- android:id="@+id/sensorch1"
- android:layout_row="7"
- android:layout_row="8"
- android:text="Sensor_CH2(D)"
- android:id="@+id/sensorch2"
- android:text="Sensor_CH3(D)"
- android:id="@+id/sensorch3"
- android:layout_row="9"
- android:layout_row="10"
- android:text="Sensor_CH4(D)"
- android:id="@+id/sensorch4"
- android:text="Sensor_CH5(D)"
- android:id="@+id/sensorch5"
- android:layout_row="11"
- android:layout_row="12"
- android:text="Sensor_CH6(D)"
- android:id="@+id/sensorch6"
- android:text="Sensor_CH7(D)"
- android:id="@+id/sensorch7"
- android:layout_row="13"
- android:layout_row="14"
- android:text="Sensor_CH8(D)"
- android:id="@+id/sensorch8"
- android:text="Sensor_CH9(D)"
- android:id="@+id/sensorch9"
- android:layout_row="15"
- android:layout_row="16"
- android:text="Sensor_CH10(D)"
- android:id="@+id/sensorch10"
- android:text="Sensor_CH11(D)"
- android:id="@+id/sensorch11"
- android:layout_row="17"
- android:layout_row="18"
- android:text="Sensor_CH12(D)"
- android:id="@+id/sensorch12"
- android:text="Sensor_CH13(D)"
- android:id="@+id/sensorch13"
- android:layout_row="19"
- android:layout_row="20"
- android:text="Sensor_CH14(D)"
- android:id="@+id/sensorch14"
- android:text="Sensor_CH15(D)"
- android:id="@+id/sensorch15"
- android:layout_row="21"
- android:layout_row="22"
- android:text="Sensor_CH16(D)"
- android:id="@+id/sensorch16"
- android:text="Sensor_CH17(D)"
- android:id="@+id/sensorch17"
- android:layout_row="23"
- android:layout_row="24"
- android:text="Sensor_CH18(D)"
- android:id="@+id/sensorch18"
- android:text="Sensor_CH19(D)"
- android:id="@+id/sensorch19"
- android:layout_row="25"
- android:layout_row="26"
- android:text="Sensor_CH20(D)"
- android:id="@+id/sensorch20"
- android:text="Sensor_CH21(D)"
- android:id="@+id/sensorch21"
- android:layout_row="27"
- android:layout_row="28"
- android:text="Sensor_CH22(D)"
- android:id="@+id/sensorch22"
- android:text="Sensor_CH23(D)"
- android:id="@+id/sensorch23"
- android:layout_row="29"
- android:layout_row="30"
- android:text="Sensor_CH24(D)"
- android:id="@+id/sensorch24"
- android:text="Sensor_CH25(D)"
- android:id="@+id/sensorch25"
- android:layout_row="31"
- android:layout_row="32"
- android:text="Sensor_CH26(D)"
- android:id="@+id/sensorch26"
- android:text="Sensor_CH27(D)"
- android:id="@+id/sensorch27"
- android:layout_row="33"
- android:layout_row="34"
- android:text="Sensor_CH28(D)"
- android:id="@+id/sensorch28"
- android:text="Sensor_CH29(D)"
- android:id="@+id/sensorch29"
- android:layout_row="35"
- android:layout_row="36"
- android:text="Sensor_Start(D)"
- android:id="@+id/sensorstart"
- android:text="Sensor_End(D)"
- android:id="@+id/sensorend"
- android:layout_row="37"
- <Button
- android:id="@+id/btnsensorrev"
- android:layout_row="38"
- android:layout_columnSpan="2"
- android:layout_gravity="center"
- android:text="Btn_Sensor_Rev"
- android:textAllCaps="false"
- android:id="@+id/allsensorchannels"
- android:text="All_Sensor_Channels"
- android:layout_row="39"
- android:layout_row="40"
- android:text="Driver_CH0(D)"
- android:id="@+id/driverch0"
- android:text="Driver_CH1(D)"
- android:id="@+id/driverch1"
- android:layout_row="41"
- android:layout_row="42"
- android:text="Driver_CH2(D)"
- android:id="@+id/driverch2"
- android:text="Driver_CH3(D)"
- android:id="@+id/driverch3"
- android:layout_row="43"
- android:layout_row="44"
- android:text="Driver_CH4(D)"
- android:id="@+id/driverch4"
- android:text="Driver_CH5(D)"
- android:id="@+id/driverch5"
- android:layout_row="45"
- android:layout_row="46"
- android:text="Driver_CH6(D)"
- android:id="@+id/driverch6"
- android:text="Driver_CH7(D)"
- android:id="@+id/driverch7"
- android:layout_row="47"
- android:layout_row="48"
- android:text="Driver_CH8(D)"
- android:id="@+id/driverch8"
- android:text="Driver_CH9(D)"
- android:id="@+id/driverch9"
- android:layout_row="49"
- android:layout_row="50"
- android:text="Driver_CH10(D)"
- android:id="@+id/driverch10"
- android:text="Driver_CH11(D)"
- android:id="@+id/driverch11"
- android:layout_row="51"
- android:layout_row="52"
- android:text="Driver_CH12(D)"
- android:id="@+id/driverch12"
- android:text="Driver_CH13(D)"
- android:id="@+id/driverch13"
- android:layout_row="53"
- android:layout_row="54"
- android:text="Driver_CH14(D)"
- android:id="@+id/driverch14"
- android:text="Driver_CH15(D)"
- android:id="@+id/driverch15"
- android:layout_row="55"
- android:layout_row="56"
- android:text="Driver_CH16(D)"
- android:id="@+id/driverch16"
- android:text="Driver_CH17(D)"
- android:id="@+id/driverch17"
- android:layout_row="57"
- android:layout_row="58"
- android:text="Driver_CH18(D)"
- android:id="@+id/driverch18"
- android:text="Driver_CH19(D)"
- android:id="@+id/driverch19"
- android:layout_row="59"
- android:layout_row="60"
- android:text="Driver_CH20(D)"
- android:id="@+id/driverch20"
- android:text="Driver_CH21(D)"
- android:id="@+id/driverch21"
- android:layout_row="61"
- android:layout_row="62"
- android:text="Driver_CH22(D)"
- android:id="@+id/driverch22"
- android:text="Driver_CH23(D)"
- android:id="@+id/driverch23"
- android:layout_row="63"
- android:layout_row="64"
- android:text="Driver_CH24(D)"
- android:id="@+id/driverch24"
- android:text="Driver_CH25(D)"
- android:id="@+id/driverch25"
- android:layout_row="65"
- android:layout_row="66"
- android:text="Driver_CH26(D)"
- android:id="@+id/driverch26"
- android:text="Driver_CH27(D)"
- android:id="@+id/driverch27"
- android:layout_row="67"
- android:layout_row="68"
- android:text="Driver_CH28(D)"
- android:id="@+id/driverch28"
- android:text="Driver_CH29(D)"
- android:id="@+id/driverch29"
- android:layout_row="69"
- android:layout_row="70"
- android:text="Driver_CH30(D)"
- android:id="@+id/driverch30"
- android:text="Driver_CH31(D)"
- android:id="@+id/driverch31"
- android:layout_row="71"
- android:layout_row="72"
- android:text="Driver_CH32(D)"
- android:id="@+id/driverch32"
- android:text="Driver_CH33(D)"
- android:id="@+id/driverch33"
- android:layout_row="73"
- android:layout_row="74"
- android:text="Driver_CH34(D)"
- android:id="@+id/driverch34"
- android:text="Driver_CH35(D)"
- android:id="@+id/driverch35"
- android:layout_row="75"
- android:layout_row="76"
- android:text="Driver_CH36(D)"
- android:id="@+id/driverch36"
- android:text="Driver_CH37(D)"
- android:id="@+id/driverch37"
- android:layout_row="77"
- android:layout_row="78"
- android:text="Driver_CH38(D)"
- android:id="@+id/driverch38"
- android:text="Driver_CH39(D)"
- android:id="@+id/driverch39"
- android:layout_row="79"
- android:layout_row="80"
- android:text="Driver_CH40(D)"
- android:id="@+id/driverch40"
- android:text="Driver_CH41(D)"
- android:id="@+id/driverch41"
- android:layout_row="81"
- android:layout_row="82"
- android:text="Driver_Start(D)"
- android:id="@+id/driverstart"
- android:text="Driver_End(D)"
- android:id="@+id/driverend"
- android:layout_row="83"
- android:id="@+id/btndriverrev"
- android:layout_row="84"
- android:text="Btn_Driver_Rev"
- android:id="@+id/alldriverchannels"
- android:text="All_Driver_Channels"
- </GridLayout>
- </LinearLayout>
- </ScrollView>
-</LinearLayout>
@@ -1,313 +0,0 @@
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginBottom="8dp"
- android:rowCount="11">
- <CheckBox
- android:id="@+id/touchkey"
- android:text="Touch_Key"
- android:text="Key_Area(H)"
- android:id="@+id/keyarea"
- android:text="Key 1(H)"
- android:id="@+id/key1"
- android:text="Key 2(H)"
- android:id="@+id/key2"
- android:text="Key 3(H)"
- android:id="@+id/key3"
- android:text="Key 4(H)"
- android:id="@+id/key4"
- android:text="Key_Touch_Level(H)"
- android:id="@+id/keytouchlevel"
- android:text="Key_Leave_Level(H)"
- android:id="@+id/keyleavelevel"
- android:text="Key_Sens1~2(H)"
- android:id="@+id/keysens1and2"
- android:text="Key_Sens3~4(H)"
- android:id="@+id/keysens3and4"
- android:text="Key_Restrain(H)"
- android:id="@+id/keyrestrain"
- android:text="Key_Restrain_Time(H)"
- android:id="@+id/keyrestraintime"
@@ -17,13 +17,25 @@
android:layout_marginBottom="8dp"
android:columnCount="5"
android:orientation="horizontal"
- android:rowCount="15">
+ android:rowCount="31">
- android:id="@+id/x2y"
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="right"
- android:text="X2Y"
+ android:layout_marginRight="1dp"
+ android:text="Config_Version(D)"
+ android:textColor="#000000"
+ android:textSize="22dp"/>
+ <EditText
+ android:id="@+id/configversion"
+ android:layout_gravity="fill"
+ android:background="@drawable/bg_frame_search"
+ android:singleLine="true"
+ android:text="00"
android:textSize="22dp" />
@@ -35,13 +47,23 @@
android:layout_marginRight="1dp"
android:text=" " />
- android:id="@+id/sito"
- android:text="SITO"
+ android:text="Touch Number(D)"
+ android:id="@+id/touchnumber"
@@ -55,21 +77,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Stretch_Rank"
+ android:text="Shake_Cnt(H)"
android:textColor="#000000"
android:textSize="22dp"/>
- <Spinner
- android:id="@+id/stretchrank"
+ android:id="@+id/shakecnt"
android:layout_gravity="fill"
- android:entries="@array/stretch_rank"
- android:background="@color/frame_search"/>
+ android:textSize="22dp" />
@@ -77,18 +99,20 @@
android:layout_row="2"
android:layout_column="3"
- android:text="INT触发方式"
+ android:text="First_Filter(D)"
- android:id="@+id/interrupt"
+ android:id="@+id/firstfilter"
- android:entries="@array/INT触发方式"
android:layout_row="3"
@@ -98,22 +122,46 @@
android:text="" />
- android:id="@+id/mccen"
android:layout_row="4"
android:layout_column="0"
- android:text="MonitorConsistencyConflictEn"
+ android:text="Normal_Filter(D)"
+ android:id="@+id/normalfilter"
- android:id="@+id/firstfilterdis"
- android:text="FirstFilterDis"
+ android:text="Noise_Reduction(D)"
+ android:id="@+id/noisereduction"
@@ -124,22 +172,46 @@
- android:id="@+id/diffdivideby2or4"
android:layout_row="6"
- android:text="DiffDivideBy2or4"
+ android:text="Screen_Touch_Lv(D)"
+ android:id="@+id/touchlevel"
- android:id="@+id/waterspeedlimiten"
- android:text="WaterSpeedLimitEn"
+ android:text="Screen_Leave_Lv(D)"
+ android:id="@+id/leavelevel"
@@ -150,23 +222,45 @@
- android:id="@+id/shapeen"
android:layout_row="8"
- android:text="Shape_En"
+ android:text="LowPowerControl(D)"
- android:id="@+id/waterproofdis"
+ android:id="@+id/lowpowercontrol"
- android:text="Water_Proof_Dis"
+ android:layout_marginRight="5dp"
+ android:text="Refresh_Rate"
+ <Spinner
+ android:id="@+id/refreshrate"
+ android:entries="@array/refresh_rate"
+ android:background="@color/frame_search"/>
android:layout_row="9"
@@ -176,22 +270,46 @@
- android:id="@+id/lcdplusminusen"
android:layout_row="10"
- android:text="LcdPlusMinusEn"
+ android:text="X_Threshold(D)"
+ android:id="@+id/xthreshold"
- android:id="@+id/esden"
- android:text="ESD_En"
+ android:text="Y_Threshold(D)"
+ android:id="@+id/ythreshold"
@@ -202,22 +320,46 @@
- android:id="@+id/x2x"
android:layout_row="12"
- android:text="X2X"
+ android:text="Space_Up_Down(H)"
+ android:id="@+id/spaceupdown"
- android:id="@+id/y2y"
- android:text="Y2Y"
+ android:text="Space_Left_Right(H)"
+ android:id="@+id/spaceleftright"
@@ -228,13 +370,425 @@
- android:id="@+id/intwakeup"
android:layout_row="14"
- android:text="INT_Wakeup"
+ android:text="Stretch_R0(D)"
+ android:id="@+id/stretchr0"
+ android:layout_row="14"
+ android:layout_column="3"
+ android:layout_gravity="right"
+ android:text="Stretch_R1(D)"
+ android:id="@+id/stretchr1"
+ android:layout_row="15"
+ android:layout_column="0"
+ android:layout_columnSpan="5"
+ android:text="" />
+ android:layout_row="16"
+ android:text="Stretch_R2(D)"
+ android:id="@+id/stretchr2"
+ android:text="Stretch_RM(D)"
+ android:id="@+id/stretchrm"
+ android:layout_row="17"
+ android:layout_row="18"
+ android:text="Mini_Filter(D)"
+ android:id="@+id/minifilter"
+ android:text="Charging_Level_Up(D)"
+ android:id="@+id/charginglevelup"
+ android:layout_row="19"
+ android:layout_row="20"
+ android:text="LcdPlusMinusValue(D)"
+ android:id="@+id/lcdplusminusvalue"
+ android:text="Con_Threshold(D)"
+ android:id="@+id/conthreshold"
+ android:layout_row="21"
+ android:layout_row="22"
+ android:text="Shape_Restrain(D)"
+ android:id="@+id/shaperestrain"
+ android:text="Shape_Contrl(D)"
+ android:id="@+id/shapecontrl"
+ android:layout_row="23"
+ android:layout_row="24"
+ android:text="WaterFrameTime(D)"
+ android:id="@+id/waterframetime"
+ android:text="WaterUpdateTime(D)"
+ android:id="@+id/waterupdatetime"
+ android:layout_row="25"
+ android:layout_row="26"
+ android:text="SlideInEdgeConfig(D)"
+ android:id="@+id/slideinedgeconfig"
+ android:text="SlideOutEdgeConfig(D)"
+ android:id="@+id/slideoutedgeconfig"
+ android:layout_row="27"
+ android:layout_row="28"
+ android:text="Combine_Dis(H)"
+ android:id="@+id/combinedis"
+ android:text="Split_Set(H)"
+ android:id="@+id/splitset"
+ android:layout_row="29"
+ android:layout_row="30"
+ android:text="SitoDiffRefLevel(D)"
+ android:id="@+id/sitodiffreflevel"
</GridLayout>
@@ -1,796 +0,0 @@
- android:rowCount="31">
- android:text="Config_Version(D)"
- android:id="@+id/configversion"
- android:text="Touch Number(D)"
- android:id="@+id/touchnumber"
- android:text="Shake_Cnt(H)"
- android:id="@+id/shakecnt"
- android:text="First_Filter(D)"
- android:id="@+id/firstfilter"
- android:text="Normal_Filter(D)"
- android:id="@+id/normalfilter"
- android:text="Noise_Reduction(D)"
- android:id="@+id/noisereduction"
- android:text="Screen_Touch_Lv(D)"
- android:id="@+id/touchlevel"
- android:text="Screen_Leave_Lv(D)"
- android:id="@+id/leavelevel"
- android:text="LowPowerControl(D)"
- android:id="@+id/lowpowercontrol"
- android:text="Refresh_Rate"
- android:id="@+id/refreshrate"
- android:entries="@array/refresh_rate"
- android:text="X_Threshold(D)"
- android:id="@+id/xthreshold"
- android:text="Y_Threshold(D)"
- android:id="@+id/ythreshold"
- android:text="Space_Up_Down(H)"
- android:id="@+id/spaceupdown"
- android:text="Space_Left_Right(H)"
- android:id="@+id/spaceleftright"
- android:text="Stretch_R0(D)"
- android:id="@+id/stretchr0"
- android:text="Stretch_R1(D)"
- android:id="@+id/stretchr1"
- android:text="Stretch_R2(D)"
- android:id="@+id/stretchr2"
- android:text="Stretch_RM(D)"
- android:id="@+id/stretchrm"
- android:text="Mini_Filter(D)"
- android:id="@+id/minifilter"
- android:text="Charging_Level_Up(D)"
- android:id="@+id/charginglevelup"
- android:text="LcdPlusMinusValue(D)"
- android:id="@+id/lcdplusminusvalue"
- android:text="Con_Threshold(D)"
- android:id="@+id/conthreshold"
- android:text="Shape_Restrain(D)"
- android:id="@+id/shaperestrain"
- android:text="Shape_Contrl(D)"
- android:id="@+id/shapecontrl"
- android:text="WaterFrameTime(D)"
- android:id="@+id/waterframetime"
- android:text="WaterUpdateTime(D)"
- android:id="@+id/waterupdatetime"
- android:text="SlideInEdgeConfig(D)"
- android:id="@+id/slideinedgeconfig"
- android:text="SlideOutEdgeConfig(D)"
- android:id="@+id/slideoutedgeconfig"
- android:text="Combine_Dis(H)"
- android:id="@+id/combinedis"
- android:text="Split_Set(H)"
- android:id="@+id/splitset"
- android:text="SitoDiffRefLevel(D)"
- android:id="@+id/sitodiffreflevel"
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#FEF898"
+ android:gravity="center"
+ android:orientation="vertical">
+ <GridLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/AllGridLayout"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
+ android:columnCount="5"
+ android:orientation="horizontal"
+ android:rowCount="15">
+ <CheckBox
+ android:id="@+id/x2y"
+ android:layout_columnSpan="2"
+ android:text="X2Y"
+ android:layout_row="0"
+ android:layout_column="2"
+ android:text=" " />
+ android:id="@+id/sito"
+ android:text="SITO"
+ android:layout_row="1"
+ android:layout_row="2"
+ android:text="Stretch_Rank"
+ android:id="@+id/stretchrank"
+ android:entries="@array/stretch_rank"
+ android:text="INT触发方式"
+ android:id="@+id/interrupt"
+ android:entries="@array/INT触发方式"
+ android:layout_row="3"
+ android:id="@+id/mccen"
+ android:layout_row="4"
+ android:text="MonitorConsistencyConflictEn"
+ android:id="@+id/firstfilterdis"
+ android:text="FirstFilterDis"
+ android:layout_row="5"
+ android:id="@+id/diffdivideby2or4"
+ android:layout_row="6"
+ android:text="DiffDivideBy2or4"
+ android:id="@+id/waterspeedlimiten"
+ android:text="WaterSpeedLimitEn"
+ android:layout_row="7"
+ android:id="@+id/shapeen"
+ android:layout_row="8"
+ android:text="Shape_En"
+ android:id="@+id/waterproofdis"
+ android:text="Water_Proof_Dis"
+ android:layout_row="9"
+ android:id="@+id/lcdplusminusen"
+ android:layout_row="10"
+ android:text="LcdPlusMinusEn"
+ android:id="@+id/esden"
+ android:text="ESD_En"
+ android:layout_row="11"
+ android:id="@+id/x2x"
+ android:layout_row="12"
+ android:text="X2X"
+ android:id="@+id/y2y"
+ android:text="Y2Y"
+ android:layout_row="13"
+ android:id="@+id/intwakeup"
+ android:text="INT_Wakeup"
+ </GridLayout>
+</LinearLayout>
@@ -6,6 +6,11 @@
android:gravity="center"
android:orientation="vertical">
+ <ScrollView
+ android:fillViewport="true">
<GridLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/AllGridLayout"
@@ -17,13 +22,25 @@
+ android:text="X Output Max(D)"
+ android:id="@+id/xoutputmax"
+ android:text="0000"
@@ -35,13 +52,23 @@
+ android:text="Y Output Max(D)"
+ android:id="@+id/youtputmax"
@@ -55,21 +82,21 @@
@@ -77,18 +104,20 @@
@@ -98,22 +127,46 @@
@@ -124,22 +177,46 @@
@@ -150,23 +227,45 @@
@@ -176,22 +275,46 @@
@@ -202,22 +325,46 @@
@@ -228,15 +375,428 @@
+ </ScrollView>
</LinearLayout>
@@ -24,6 +24,62 @@
android:rowCount="19">
+ android:text="Config_Version"
+ android:textSize="22dp"
+ android:textAlignment="center"/>
+ android:text="Touch_Num"
+ android:id="@+id/touchnum"
<CheckBox
android:id="@+id/alldrivingen"
android:layout_columnSpan="2"
@@ -42,7 +98,7 @@
android:id="@+id/dualfreq"
@@ -1,802 +0,0 @@
@@ -0,0 +1,539 @@
+ android:rowCount="19">
+ android:id="@+id/alldrivingen"
+ android:text="All_Driving_En"
+ android:id="@+id/dualfreq"
+ android:text="Dual_Freq"
+ android:text="FreqA_factor(D)"
+ android:id="@+id/freqafactor"
+ android:text="FreqB_factor(D)"
+ android:id="@+id/freqbfactor"
+ android:text="Pannel_BitFreq(D)"
+ android:id="@+id/bitfreq"
+ android:text="Duration(D)"
+ android:id="@+id/duration"
+ android:text="FreqA(D)"
+ android:id="@+id/freqa"
+ android:text="FreqB(D)"
+ android:id="@+id/freqb"
+ android:text="Dump_Shift(D)"
+ android:id="@+id/dumpshift"
+ android:text="SubFrame_DrvNum(D)"
+ android:id="@+id/subframedrvnum"
+ android:text="Drv_Output_R"
+ android:id="@+id/drvoutputr"
+ android:entries="@array/drv_output_r"
+ android:text="DAC_Gain"
+ android:id="@+id/dacgain"
+ android:entries="@array/dac_gain"
+ android:text="PGA_C"
+ android:id="@+id/pgac"
+ android:entries="@array/pga_c"
+ android:text="PGA_R"
+ android:id="@+id/pgar"
+ android:entries="@array/pga_r"
+ android:text="Rx_Vcmi"
+ android:id="@+id/rxvcmi"
+ android:entries="@array/rx_vcmi"
+ android:text="PGA_Gain"
+ android:id="@+id/pgagainspin"
+ android:entries="@array/pga_gain"
+ android:text="boost_time"
+ android:id="@+id/boosttime"
+ android:entries="@array/boost_time"
+ android:text="Voltage"
+ android:id="@+id/voltage"
+ android:entries="@array/voltage"
+ android:text="Alter_Count"
+ android:id="@+id/altercount"
+ android:entries="@array/alter_count"
+ android:id="@+id/extoscen"
+ android:text="Extoscen"
@@ -1,483 +0,0 @@
- android:rowCount="19">
- android:id="@+id/alldrivingen"
- android:text="All_Driving_En"
- android:id="@+id/dualfreq"
- android:text="Dual_Freq"
- android:text="FreqA_factor(D)"
- android:id="@+id/freqafactor"
- android:text="FreqB_factor(D)"
- android:id="@+id/freqbfactor"
- android:text="Pannel_BitFreq(D)"
- android:id="@+id/bitfreq"
- android:text="Duration(D)"
- android:id="@+id/duration"
- android:text="FreqA(D)"
- android:id="@+id/freqa"
- android:text="FreqB(D)"
- android:id="@+id/freqb"
- android:text="Dump_Shift(D)"
- android:id="@+id/dumpshift"
- android:text="SubFrame_DrvNum(D)"
- android:id="@+id/subframedrvnum"
- android:text="Drv_Output_R"
- android:id="@+id/drvoutputr"
- android:entries="@array/drv_output_r"
- android:text="DAC_Gain"
- android:id="@+id/dacgain"
- android:entries="@array/dac_gain"
- android:text="PGA_C"
- android:id="@+id/pgac"
- android:entries="@array/pga_c"
- android:text="PGA_R"
- android:id="@+id/pgar"
- android:entries="@array/pga_r"
- android:text="Rx_Vcmi"
- android:id="@+id/rxvcmi"
- android:entries="@array/rx_vcmi"
- android:text="PGA_Gain"
- android:id="@+id/pgagainspin"
- android:entries="@array/pga_gain"
- android:text="boost_time"
- android:id="@+id/boosttime"
- android:entries="@array/boost_time"
- android:text="Voltage"
- android:id="@+id/voltage"
- android:entries="@array/voltage"
- android:text="Alter_Count"
- android:id="@+id/altercount"
- android:entries="@array/alter_count"
- android:id="@+id/extoscen"
- android:text="Extoscen"