Skip to content

Commit 4a1e68a

Browse files
authored
fix: made the phase buttons invisible for Analog Wave 1 and Digital Wave SQR1 (#2452)
1 parent 273ea54 commit 4a1e68a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ public void selectBtn(WaveConst btn_selected) {
687687
btnCtrlWave2.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
688688

689689
btnCtrlPhase.setEnabled(false); //disable phase for wave
690+
btnCtrlPhase.setVisibility(View.INVISIBLE);
690691
wavePhaseValue.setText("--");
691692

692693
selectWaveform(WaveGeneratorConstants.wave.get(waveBtnActive).get(WaveConst.WAVETYPE));
@@ -703,6 +704,7 @@ public void selectBtn(WaveConst btn_selected) {
703704
btnCtrlWave1.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
704705

705706
btnCtrlPhase.setEnabled(true); // enable phase for wave2
707+
btnCtrlPhase.setVisibility(View.VISIBLE);
706708

707709
selectWaveform(WaveGeneratorConstants.wave.get(waveBtnActive).get(WaveConst.WAVETYPE));
708710

@@ -718,6 +720,7 @@ public void selectBtn(WaveConst btn_selected) {
718720
btnPwmSq3.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
719721
btnPwmSq4.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
720722
pwmBtnPhase.setEnabled(false); //phase disabled for sq1
723+
pwmBtnPhase.setVisibility(View.INVISIBLE);
721724
pwmPhaseValue.setText("--");
722725
fetchPropertyValue(pwmBtnActive, WaveConst.FREQUENCY, getString(R.string.unit_hz), pwmFreqValue);
723726
fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
@@ -731,6 +734,7 @@ public void selectBtn(WaveConst btn_selected) {
731734
btnPwmSq3.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
732735
btnPwmSq4.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
733736
pwmBtnPhase.setEnabled(true);
737+
pwmBtnPhase.setVisibility(View.VISIBLE);
734738
fetchPropertyValue(pwmBtnActive, WaveConst.PHASE, getString(R.string.deg_text), pwmPhaseValue);
735739
fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
736740
break;
@@ -743,6 +747,7 @@ public void selectBtn(WaveConst btn_selected) {
743747
btnPwmSq3.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded, null));
744748
btnPwmSq4.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
745749
pwmBtnPhase.setEnabled(true);
750+
pwmBtnPhase.setVisibility(View.VISIBLE);
746751
fetchPropertyValue(pwmBtnActive, WaveConst.PHASE, getString(R.string.deg_text), pwmPhaseValue);
747752
fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
748753
break;
@@ -755,6 +760,7 @@ public void selectBtn(WaveConst btn_selected) {
755760
btnPwmSq3.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
756761
btnPwmSq4.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded, null));
757762
pwmBtnPhase.setEnabled(true);
763+
pwmBtnPhase.setVisibility(View.VISIBLE);
758764
fetchPropertyValue(pwmBtnActive, WaveConst.PHASE, getString(R.string.deg_text), pwmPhaseValue);
759765
fetchPropertyValue(pwmBtnActive, WaveConst.DUTY, getString(R.string.unit_percent), pwmDutyValue);
760766
break;
@@ -764,6 +770,7 @@ public void selectBtn(WaveConst btn_selected) {
764770
btnCtrlWave1.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded, null));
765771
btnCtrlWave2.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.btn_back_rounded_light, null));
766772
btnCtrlPhase.setEnabled(false); //disable phase for wave
773+
pwmBtnPhase.setVisibility(View.INVISIBLE);
767774
wavePhaseValue.setText("--");
768775
selectWaveform(WaveGeneratorConstants.wave.get(waveBtnActive).get(WaveConst.WAVETYPE));
769776
fetchPropertyValue(waveBtnActive, WaveConst.FREQUENCY, getString(R.string.deg_text), waveFreqValue);

0 commit comments

Comments
 (0)