|
@@ -118,7 +118,8 @@ public class Config extends AppCompatActivity
|
|
|
private TextView tvVenderID;
|
|
|
|
|
|
//View Sample 定义
|
|
|
- private CheckBox cbAllDrivingEn,cbDualFreq;
|
|
|
+ private EditText edtConfigVersion,edtTouchNumber;
|
|
|
+ private CheckBox cbAllDriving,cbDualFreq;
|
|
|
private EditText edtFreqAFactor,edtFreqBFactor;
|
|
|
private EditText edtPannelBitFreq,edtDuration; //2 bytes
|
|
|
private EditText edtFreqA,edtFreqB;
|
|
@@ -142,7 +143,6 @@ public class Config extends AppCompatActivity
|
|
|
private CheckBox cbINTWakeup;
|
|
|
|
|
|
//View Normal Setting 定义
|
|
|
- private EditText edtConfigVersion,edtTouchNumber;
|
|
|
private EditText edtShakeCnt;
|
|
|
private EditText edtFirstFilter,edtNormalFilter;
|
|
|
private EditText edtNoiseReduction;
|
|
@@ -179,15 +179,6 @@ public class Config extends AppCompatActivity
|
|
|
private Button btnDriverRev,btnAllDriverChannels;
|
|
|
private byte bSensorNumber,bDriverNumber;
|
|
|
|
|
|
- //View Pen Setting 定义
|
|
|
- private CheckBox cbPenEn,cbOnlyFingerEn;
|
|
|
- private EditText edtPenLowSize,edtPenHighSize;
|
|
|
- private EditText edtRectsumPLowL,edtRectsumPHighL;
|
|
|
- private EditText edtRectsumFLowL;
|
|
|
- private EditText edtPRectMaxDiffLimit,edtPRectAreaLimit;
|
|
|
- private EditText edtFLeavelevel,edtPTouchHighlevel;
|
|
|
- private Spinner spinFingerRestrainPen;
|
|
|
-
|
|
|
//View Plam Restrain 定义
|
|
|
private CheckBox cbAllPlamRestrain;
|
|
|
private EditText edtLargeTouch;
|
|
@@ -292,8 +283,6 @@ public class Config extends AppCompatActivity
|
|
|
private TextView tvModuleSwitch;
|
|
|
private TextView tvOther;
|
|
|
private TextView tvSelfSetting;
|
|
|
- private TextView tvKeySetting;
|
|
|
- private TextView tvLowSignalSetting;
|
|
|
private TextView tvExConfig;
|
|
|
private TextView tvCfgRam;
|
|
|
|
|
@@ -441,11 +430,10 @@ public class Config extends AppCompatActivity
|
|
|
private void init() {
|
|
|
initView();
|
|
|
initViewPager();
|
|
|
- //initSampleSpin();
|
|
|
+ initNormalSpin();
|
|
|
//initModuleSwitchSpin();
|
|
|
//initNormalSettingSpin();
|
|
|
//initChannelSettingSpin();
|
|
|
- //initPenSettingSpin();
|
|
|
//initPlamRestrainSpin();
|
|
|
//initHoppingSettingSpin();
|
|
|
initCfgShow();
|
|
@@ -565,9 +553,14 @@ public class Config extends AppCompatActivity
|
|
|
}
|
|
|
|
|
|
//===============================各view中的元素初始化开始===============================================//
|
|
|
+ private void initNormalSpin() {
|
|
|
+ edtConfigVersion = viewnormal.findViewById(R.id.configversion);
|
|
|
+
|
|
|
+ cbAllDriving = viewnormal.findViewById(R.id.alldriving);
|
|
|
+ }
|
|
|
/*
|
|
|
private void initSampleSpin() {
|
|
|
- cbAllDrivingEn = viewnormal.findViewById(R.id.alldrivingen);
|
|
|
+
|
|
|
cbDualFreq = viewnormal.findViewById(R.id.dualfreq);
|
|
|
edtFreqAFactor = viewnormal.findViewById(R.id.freqafactor);
|
|
|
edtFreqBFactor = viewnormal.findViewById(R.id.freqbfactor);
|
|
@@ -811,7 +804,7 @@ public class Config extends AppCompatActivity
|
|
|
}
|
|
|
/*
|
|
|
private void initNormalSettingSpin(){
|
|
|
- edtConfigVersion = viewmoduleswitch.findViewById(R.id.configversion);
|
|
|
+
|
|
|
edtTouchNumber = viewmoduleswitch.findViewById(R.id.touchnumber);
|
|
|
edtShakeCnt = viewmoduleswitch.findViewById(R.id.shakecnt);
|
|
|
edtFirstFilter = viewmoduleswitch.findViewById(R.id.firstfilter);
|
|
@@ -940,15 +933,7 @@ public class Config extends AppCompatActivity
|
|
|
}
|
|
|
*/
|
|
|
private void initPlamRestrainSpin(){
|
|
|
- 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(){
|
|
@@ -1828,14 +1813,375 @@ public class Config extends AppCompatActivity
|
|
|
showid++;
|
|
|
mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
+ mBytes[showid] = (byte) Integer.parseInt(stringCfgArr[showid], 16);
|
|
|
+ showid++;
|
|
|
|
|
|
- ReadCfgSample(mBytes);
|
|
|
- ReadCfgModuleSwitch(mBytes);
|
|
|
- ReadCfgNormalSetting(mBytes);
|
|
|
- ReadCfgChannelSetting(mBytes);
|
|
|
- ReadCfgPenSetting(mBytes);
|
|
|
- ReadCfgPlamRestrain(mBytes);
|
|
|
- ReadCfgHoppingSetting(mBytes);
|
|
|
+ ReadCfgNormal(mBytes);
|
|
|
+ //ReadCfgModuleSwitch(mBytes);
|
|
|
+ //ReadCfgNormalSetting(mBytes);
|
|
|
+ //ReadCfgChannelSetting(mBytes);
|
|
|
+ //ReadCfgPlamRestrain(mBytes);
|
|
|
+ //ReadCfgHoppingSetting(mBytes);
|
|
|
ReadCfgRam(stringCfgArr);
|
|
|
} catch (IOException e) {
|
|
|
//editdetail.setText("文件不存在!");
|
|
@@ -2049,12 +2395,16 @@ public class Config extends AppCompatActivity
|
|
|
|
|
|
|
|
|
//=====================================读取CFG到各个View开始===================================//
|
|
|
+ public void ReadCfgNormal(byte[] mBytes){
|
|
|
+ edtConfigVersion.setText(Integer.toString(mBytes[0] & 0xFF));
|
|
|
+ }
|
|
|
+
|
|
|
public void ReadCfgSample(byte[] mBytes){
|
|
|
int temp;
|
|
|
|
|
|
- cbAllDrivingEn.setChecked(false);
|
|
|
+ cbAllDriving.setChecked(false);
|
|
|
if ((mBytes[27] & 0x80) == 0x80){
|
|
|
- cbAllDrivingEn.setChecked(true);
|
|
|
+ cbAllDriving.setChecked(true);
|
|
|
}
|
|
|
cbDualFreq.setChecked(false);
|
|
|
if ((mBytes[28] & 0x20) == 0x20){
|
|
@@ -2145,7 +2495,7 @@ public class Config extends AppCompatActivity
|
|
|
|
|
|
public void ReadCfgNormalSetting(byte[] mBytes){
|
|
|
String hv;
|
|
|
- edtConfigVersion.setText(Integer.toString(mBytes[0] & 0xFF));
|
|
|
+
|
|
|
edtTouchNumber.setText(Integer.toString(mBytes[5] & 0x0F));
|
|
|
|
|
|
hv = Integer.toHexString(mBytes[8] & 0xFF);
|
|
@@ -2285,27 +2635,6 @@ public class Config extends AppCompatActivity
|
|
|
edtDriverCH41.setText(Integer.toString(mBytes[183] & 0xFF));
|
|
|
}
|
|
|
|
|
|
- public void ReadCfgPenSetting(byte[] mBytes){
|
|
|
- cbPenEn.setChecked(false);
|
|
|
- if ((mBytes[7] & 0x02) == 2){
|
|
|
- cbPenEn.setChecked(true);
|
|
|
- }
|
|
|
- cbOnlyFingerEn.setChecked(false);
|
|
|
- if ((mBytes[7] & 0x08) == 8){
|
|
|
- cbOnlyFingerEn.setChecked(true);
|
|
|
- }
|
|
|
- edtPenLowSize.setText(Integer.toString(mBytes[40] & 0xFF));
|
|
|
- edtPenHighSize.setText(Integer.toString(mBytes[41] & 0xFF));
|
|
|
- edtRectsumPLowL.setText(Integer.toString(mBytes[42] & 0xFF));
|
|
|
- edtRectsumPHighL.setText(Integer.toString(mBytes[43] & 0xFF));
|
|
|
- edtRectsumFLowL.setText(Integer.toString(mBytes[44] & 0xFF));
|
|
|
- edtPRectMaxDiffLimit.setText(Integer.toString(mBytes[45] & 0xFF));
|
|
|
- edtPRectAreaLimit.setText(Integer.toString(mBytes[46] & 0xFF));
|
|
|
- spinFingerRestrainPen.setSelection((mBytes[104] & 0xC0) >> 6);
|
|
|
- edtFLeavelevel.setText(Integer.toString(mBytes[108] & 0xFF));
|
|
|
- edtPTouchHighlevel.setText(Integer.toString(mBytes[111] & 0xFF));
|
|
|
- }
|
|
|
-
|
|
|
public void ReadCfgPlamRestrain(byte[] mBytes){
|
|
|
cbAllPlamRestrain.setChecked(false);
|
|
|
if ((mBytes[6] & 0x40) == 0x40){
|
|
@@ -2792,15 +3121,11 @@ public class Config extends AppCompatActivity
|
|
|
}
|
|
|
|
|
|
|
|
|
- if (cbPenEn.isChecked()){
|
|
|
- mBytes[7] += 2;
|
|
|
- }
|
|
|
+
|
|
|
if (cbDiffDivideBy2or4.isChecked()){
|
|
|
mBytes[7] += 4;
|
|
|
}
|
|
|
- if (cbOnlyFingerEn.isChecked()){
|
|
|
- mBytes[7] += 8;
|
|
|
- }
|
|
|
+
|
|
|
if (cbFirstFilterDis.isChecked()){
|
|
|
mBytes[7] += 32;
|
|
|
}
|
|
@@ -2829,7 +3154,7 @@ public class Config extends AppCompatActivity
|
|
|
mBytes[26] = (byte)Integer.parseInt(edtStretchRM.getText().toString(),10);
|
|
|
//mBytes[27]
|
|
|
mBytes[27] = (byte)Integer.parseInt(edtDrvGroupAnumber.getText().toString(),10);
|
|
|
- if (cbAllDrivingEn.isChecked()){
|
|
|
+ if (cbAllDriving.isChecked()){
|
|
|
mBytes[27] += 128;
|
|
|
}
|
|
|
//mBytes[28]
|
|
@@ -2855,13 +3180,6 @@ public class Config extends AppCompatActivity
|
|
|
spinPGAC.getSelectedItemPosition() * 128);
|
|
|
mBytes[38] = (byte)(Integer.parseInt(edtDumpShift.getText().toString(),10) & 0x0f);
|
|
|
mBytes[39] = (byte)(Integer.parseInt(edtSubFrameDrvNum.getText().toString(),10) << 2);
|
|
|
- mBytes[40] = (byte)Integer.parseInt(edtPenLowSize.getText().toString(),10);
|
|
|
- mBytes[41] = (byte)Integer.parseInt(edtPenHighSize.getText().toString(),10);
|
|
|
- mBytes[42] = (byte)Integer.parseInt(edtRectsumPLowL.getText().toString(),10);
|
|
|
- mBytes[43] = (byte)Integer.parseInt(edtRectsumPHighL.getText().toString(),10);
|
|
|
- mBytes[44] = (byte)Integer.parseInt(edtRectsumFLowL.getText().toString(),10);
|
|
|
- mBytes[45] = (byte)Integer.parseInt(edtPRectMaxDiffLimit.getText().toString(),10);
|
|
|
- mBytes[46] = (byte)Integer.parseInt(edtPRectAreaLimit.getText().toString(),10);
|
|
|
mBytes[47] = (byte)Integer.parseInt(edtSingleRectTopSignNum.getText().toString(),10);
|
|
|
mBytes[48] = (byte)Integer.parseInt(edtAllRectTopSignSum.getText().toString(),10);
|
|
|
mBytes[49] = (byte)Integer.parseInt(edtChargingLevelUp.getText().toString(),10);
|
|
@@ -2956,15 +3274,14 @@ public class Config extends AppCompatActivity
|
|
|
if (cbINTWakeup.isChecked()){
|
|
|
mBytes[104] += 32;
|
|
|
}
|
|
|
- mBytes[104] += (byte)(spinFingerRestrainPen.getSelectedItemPosition() * 64);
|
|
|
mBytes[105] = (byte)(Integer.parseInt(edtShapeContrl.getText().toString(),10) +
|
|
|
Integer.parseInt(edtHopDetectTimes.getText().toString(),10) * 32);
|
|
|
mBytes[106] = (byte)(Integer.parseInt(edtCombineDis.getText().toString(),16) & 0x0f);
|
|
|
mBytes[107] = (byte)Integer.parseInt(edtSplitSet.getText().toString(),16);
|
|
|
- mBytes[108] = (byte)Integer.parseInt(edtFLeavelevel.getText().toString(),10);
|
|
|
+
|
|
|
//mBytes[109]
|
|
|
mBytes[110] = (byte)Integer.parseInt(edtSitoDiffRefLevel.getText().toString(),10);
|
|
|
- mBytes[111] = (byte)Integer.parseInt(edtPTouchHighlevel.getText().toString(),10);
|
|
|
+
|
|
|
mBytes[112] = (byte)Integer.parseInt(edtSensorCH0.getText().toString(),10);
|
|
|
mBytes[113] = (byte)Integer.parseInt(edtSensorCH1.getText().toString(),10);
|
|
|
mBytes[114] = (byte)Integer.parseInt(edtSensorCH2.getText().toString(),10);
|
|
@@ -3320,7 +3637,7 @@ public class Config extends AppCompatActivity
|
|
|
case R.id.sendcfg: //send cfg
|
|
|
bottonMode = 1;
|
|
|
|
|
|
- if (iChooseVPager == 8) {
|
|
|
+ if (iChooseVPager == 6) {
|
|
|
configBuilder.append(mCfg8050.getText().toString() + ",");
|
|
|
configBuilder.append(mCfg8051.getText().toString() + ",");
|
|
|
configBuilder.append(mCfg8052.getText().toString() + ",");
|
|
@@ -3845,7 +4162,7 @@ public class Config extends AppCompatActivity
|
|
|
mShow.setText("Recall check success,Send cfg success");
|
|
|
}
|
|
|
|
|
|
- if (iChooseVPager == 8) {
|
|
|
+ if (iChooseVPager == 6) {
|
|
|
|
|
|
ReadCfgRam(mConfigShow);
|
|
|
|
|
@@ -3942,11 +4259,10 @@ public class Config extends AppCompatActivity
|
|
|
mShow.setText("Cfg Checksum is error!");
|
|
|
}
|
|
|
|
|
|
- //ReadCfgSample(mBytes);
|
|
|
+ ReadCfgNormal(mBytes);
|
|
|
//ReadCfgModuleSwitch(mBytes);
|
|
|
//ReadCfgNormalSetting(mBytes);
|
|
|
//ReadCfgChannelSetting(mBytes);
|
|
|
- //ReadCfgPenSetting(mBytes);
|
|
|
//ReadCfgPlamRestrain(mBytes);
|
|
|
//ReadCfgKeySetting(mBytes);
|
|
|
//ReadCfgHoppingSetting(mBytes);
|
|
@@ -4364,7 +4680,7 @@ public class Config extends AppCompatActivity
|
|
|
|
|
|
StringBuilder configBuilder = new StringBuilder("");
|
|
|
|
|
|
- if (iChooseVPager == 8){ //在ram cfg界面
|
|
|
+ if (iChooseVPager == 6){ //在ram cfg界面
|
|
|
configBuilder.append("0x"+mCfg8050.getText().toString()+",");
|
|
|
configBuilder.append("0x"+mCfg8051.getText().toString()+",");
|
|
|
configBuilder.append("0x"+mCfg8052.getText().toString()+",");
|