Permalink
Browse files

Fixed blinking pattern

  • Loading branch information...
1 parent ae4071a commit 9015db0e7dd985ee51d814ec751147b6ca2289b4 @pichenettes committed Apr 11, 2012
Showing with 11 additions and 5 deletions.
  1. +1 −1 shruthi/makefile
  2. +1 −1 shruthi/parameter_definitions.cc
  3. +8 −2 shruthi/synthesis_engine.cc
  4. +1 −1 shruthi1.size
View
@@ -11,7 +11,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-VERSION = 0.96preview
+VERSION = 0.96
MCU_NAME = 644
TARGET = shruthi1
PACKAGES = avrlib avrlib/i2c avrlib/devices shruthi
@@ -313,7 +313,7 @@ static const prog_char raw_parameter_definition[
STR_RES_SNAP, STR_RES_SNAP,
PRM_SYS_EXPANSION_FILTER_BOARD,
- FILTER_BOARD_LPF, FILTER_BOARD_LAST - 2,
+ FILTER_BOARD_LPF, FILTER_BOARD_LAST - 1,
UNIT_FILTER_BOARD,
STR_RES_FILTER, STR_RES_FILTER,
@@ -555,12 +555,18 @@ const prog_uint8_t filter_modes[15] PROGMEM = {
uint8_t SynthesisEngine::four_pole_routing_byte() {
uint8_t byte = pgm_read_byte(filter_modes + patch_.filter_1_mode_);
byte |= U8ShiftLeft4(patch_.filter_2_mode_);
- if (modulation_source(0, MOD_SRC_WHEEL) > 224) {
+ if (controller_.active() &&
+ sequencer_settings_.seq_mode >= SEQUENCER_MODE_ARP_LATCH &&
+ sequencer_settings_.seq_mode <= SEQUENCER_MODE_RPS_LATCH) {
+ if (!(controller_.step() & 3)) {
+ byte |= 0xc0;
+ }
+ } else if (modulation_source(0, MOD_SRC_WHEEL) > 224) {
uint8_t i = kModulationMatrixSize - 1;
uint8_t wheel_mod = patch_.modulation_matrix.modulation[i].source;
wheel_mod = voice_.modulation_source(wheel_mod);
byte |= (wheel_mod > 0xc0 ? 0x80 : 0x00);
- byte |= (wheel_mod > 0x40 ? 0x40 : 0x00);
+ byte |= (wheel_mod < 0x40 ? 0x40 : 0x00);
} else if (patch_.filter_resonance > 56) {
byte |= 0xc0;
}
View
@@ -1,2 +1,2 @@
text data bss dec hex filename
- 61534 544 3368 65446 ffa6 build/shruthi1/shruthi1.elf
+ 61586 544 3368 65498 ffda build/shruthi1/shruthi1.elf

0 comments on commit 9015db0

Please sign in to comment.