From 8528186b39886a3b032da0d42687b7db262ed49a Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Wed, 2 Aug 2023 20:45:46 +0200 Subject: Change prob/condition sorting to be more logical --- src/patterns.c | 136 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'src/patterns.c') diff --git a/src/patterns.c b/src/patterns.c index ed0f114..621eb14 100644 --- a/src/patterns.c +++ b/src/patterns.c @@ -90,22 +90,22 @@ const ChannelSquare default_ch1 = { {true, NOTE_A_SHARP_4}, }, .params = { - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, }, .active = true, }; @@ -130,22 +130,22 @@ const ChannelSquare default_ch2 = { {true, NOTE_C_3}, }, .params = { - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, - {8, 4, 0, 2, 0, 0, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, + {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}, }, .active = true, }; @@ -170,22 +170,22 @@ const ChannelWave default_ch3 = { {true, NOTE_G_5}, }, .params = { - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, - {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, + {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}, }, .active = true, }; @@ -210,22 +210,22 @@ const ChannelNoise default_ch4 = { {false, NOTE_E_6}, }, .params = { - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, - {0xF, 0x2, 0, 0, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, + {0xF, 0x2, 0, 0, PROB_100, 0}, }, .active = true, }; @@ -243,7 +243,7 @@ static Pattern patterns[8] = { {default_ch1, default_ch2, default_ch3, default_ch4, default_bpm, 0}, }; -static ChannelSquareParams ch1_params = {8, 4, 0, 2, 0, 0, 0, 0, 0}; -static ChannelSquareParams ch2_params = {8, 4, 0, 2, 0, 0, 0, 0, 0}; -static ChannelWaveParams ch3_params = {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0, 0}; -static ChannelNoiseParams ch4_params = {0xF, 0x2, 0, 0, 0, 0}; +static ChannelSquareParams ch1_params = {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}; +static ChannelSquareParams ch2_params = {8, 4, 0, 2, 0, 0, 0, PROB_100, 0}; +static ChannelWaveParams ch3_params = {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, PROB_100, 0}; +static ChannelNoiseParams ch4_params = {0xF, 0x2, 0, 0, PROB_100, 0}; -- cgit v1.2.1