Integrated version
Diff: BaseMachineUIController.h
- Revision:
- 1:ecae97c65943
- Parent:
- 0:5bc618f6d862
- Child:
- 2:238127b00dd3
--- a/BaseMachineUIController.h Sun Nov 06 22:13:43 2016 +0000 +++ b/BaseMachineUIController.h Sun Nov 06 23:03:01 2016 +0000 @@ -228,19 +228,21 @@ switch (UImode) { case 0: if (isDirty) { - sequencerDisplay->update(SequencerDisplay::stop, editingStep, playingStep); + if (isRunning) { + sequencerDisplay->update(SequencerDisplay::run, editingStep, playingStep); + } else { + sequencerDisplay->update(SequencerDisplay::stop, editingStep, playingStep); + } + isDirty = false; } break; case 1: - if (isDirty) { - dumpToLCD00(); - } + dumpToLCD00(); break; case 2: dumpToLCD01(); break; } - isDirty = false; } private: @@ -411,56 +413,56 @@ if (pulseWidth != oscillatorParam.pulseWidth) { oscillatorParam.pulseWidth = pulseWidth; errPulseWidth++; - isDirty = true; + //isDirty = true; } uint8_t cutoff = AinCutOff->read_u16() >> (16 - POT_RESOLUTION); if (cutoff != filterParam.cutoff) { filterParam.cutoff = cutoff; errCutoff++; - isDirty = true; + //isDirty = true; } uint8_t resonance = AinResonance->read_u16() >> (16 - POT_RESOLUTION); if (resonance != filterParam.resonance) { filterParam.resonance = resonance; errResonance++; - isDirty = true; + //isDirty = true; } uint8_t level = AinLevel->read_u16() >> (16 - POT_RESOLUTION); if (level != envelopeParam.level) { errLevel++; envelopeParam.level = level; - isDirty = true; + //isDirty = true; } uint8_t duration = AinDuration->read_u16() >> (16 - POT_RESOLUTION); if (duration != envelopeParam.duration) { errDuration++; envelopeParam.duration = duration; - isDirty = true; + //isDirty = true; } uint8_t decay = AinDecay->read_u16() >> (16 - POT_RESOLUTION); if (decay != envelopeParam.decay) { errDecay++; envelopeParam.decay = decay; - isDirty = true; + //isDirty = true; } uint8_t sustain = AinSustain->read_u16() >> (16 - POT_RESOLUTION); if (sustain != envelopeParam.sustain) { errSustain++; envelopeParam.sustain = sustain; - isDirty = true; + //isDirty = true; } uint8_t _accentLevel = AinAccentLevel->read_u16() >> (16 - POT_RESOLUTION); if (_accentLevel != accentLevel) { errAccentLevel++; accentLevel = _accentLevel; - isDirty = true; + //isDirty = true; } } @@ -484,13 +486,13 @@ sprintf(buff, "Wsp:%d Mod:%d pStp:%d", oscillatorParam.waveShape, UImode, playingStep); gLCD->drawstring(0, col++, buff); - sprintf(buff, "PW :%4d CO :%4d", oscillatorParam.pulseWidth, filterParam.cutoff); - gLCD->drawstring(0, col++, buff); - sprintf(buff, "RSO:%4d ACL:%4d", filterParam.resonance, accentLevel); + sprintf(buff, "RSO:%4d CO :%4d", filterParam.resonance, filterParam.cutoff); gLCD->drawstring(0, col++, buff); sprintf(buff, "LVL:%4d DUR:%4d", envelopeParam.level, envelopeParam.duration); gLCD->drawstring(0, col++, buff); - sprintf(buff, "DCY:%4d SUS:%4d", envelopeParam.decay, envelopeParam.sustain); + sprintf(buff, "PW :%4d DCY:%4d", oscillatorParam.pulseWidth, envelopeParam.decay); + gLCD->drawstring(0, col++, buff); + sprintf(buff, "ACL:%4d SUS:%4d", accentLevel, envelopeParam.sustain); gLCD->drawstring(0, col++, buff); gLCD->display();