jan-henrik/eurorack
1
0
Fork 0
mirror of https://github.com/jhbruhn/eurorack.git synced 2025-03-14 18:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Initial code for stereo_mix module

Browse source
This commit is contained in:
Jan-Henrik 2019-12-04 00:00:54 +01:00
parent 45ca1ca347
commit 65b0fcfbb9
13 changed files with 549 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
.gitignore vendored
View file

@ -1,54 +1,60 @@
build/
# Ignore list for Eagle, a PCB layout tool
# Backup files
*.s#?
*.b#?
*.l#?
*.b$?
*.s$?
*.l$?
# Eagle project file
# It contains a serial number and references to the file structure
# on your computer.
# comment the following line if you want to have your project file included.
eagle.epf
# Autorouter files
*.pro
*.job
# CAM files
*.$$$
*.cmp
*.ly2
*.l15
*.sol
*.plc
*.stc
*.sts
*.crc
*.crs
*.dri
*.drl
*.gpi
*.pls
*.ger
*.gpi
*.xln
*.drd
*.drd.*
*.s#*
*.b#*
*.info
*.eps
# file locks introduced since 7.x
*.lck
build/
# Ignore list for Eagle, a PCB layout tool
# Backup files
*.s#?
*.b#?
*.l#?
*.b$?
*.s$?
*.l$?
# Eagle project file
# It contains a serial number and references to the file structure
# on your computer.
# comment the following line if you want to have your project file included.
eagle.epf
# Autorouter files
*.pro
*.job
# CAM files
*.$$$
*.cmp
*.ly2
*.l15
*.sol
*.plc
*.stc
*.sts
*.crc
*.crs
*.dri
*.drl
*.gpi
*.pls
*.ger
*.gpi
*.xln
*.drd
*.drd.*
*.s#*
*.b#*
*.info
*.eps
# file locks introduced since 7.x
*.lck
**/compile_commands.json
**/.clangd/
*.pyc
*.size

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "stmlib"]
path = stmlib
url = https://github.com/jhbruhn/stmlib.git
[submodule "avrlib"]
path = avrlib
url = https://github.com/pichenettes/avril.git

1
avrlib Submodule

@ -0,0 +1 @@
Subproject commit 276b2887e4110ca913294fcbb313163dfb28a448

0
stereo_mix/__init__.py Normal file
View file

43
stereo_mix/bootloader/bootloader.cc Executable file
View file

@ -0,0 +1,43 @@
// Copyright 2011 Emilie Gillet.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// -----------------------------------------------------------------------------
//
// Bootloader supporting MIDI SysEx update.
//
// Caveat: assumes the firmware flashing is always done from first to last
// block, in increasing order. Random access flashing is not supported!
#include <avr/boot.h>
#include <avr/pgmspace.h>
#include <avr/delay.h>
#include "avrlib/gpio.h"
#include "avrlib/serial.h"
#include "avrlib/watchdog_timer.h"
using namespace avrlib;
void (*main_entry_point)(void) = 0x0000;
inline void Init() {
cli();
}
int main(void) {
ResetWatchdog();
Init();
_delay_ms(40);
main_entry_point();
}

29
stereo_mix/bootloader/makefile Executable file
View file

@ -0,0 +1,29 @@
# Copyright 2011 Emilie Gillet.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# 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.1
MCU_NAME = 328
TARGET = stereo_mix_bootloader
PACKAGES = avrlib stereo_mix/bootloader avr_audio_bootloader/fsk
EXTRA_DEFINES = -funsigned-char -fno-inline-small-functions
EXTRA_LD_FLAGS = ,--section-start=.text=0x7000,--relax
PROGRAMMER = atmelice_isp
LFUSE = ff
HFUSE = d8
EFUSE = 05
LOCK = ff
include avrlib/makefile.mk
include $(DEP_FILE)

43
stereo_mix/makefile Normal file
View file

@ -0,0 +1,43 @@
# Copyright 2012 Emilie Gillet.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# 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.1
MCU_NAME = 328
TARGET = stereo_mix
PACKAGES = avrlib avrlib/devices stereo_mix
RESOURCES = stereo_mix/resources
PROGRAMMER = atmelice_isp
LFUSE = ff
HFUSE = d8
EFUSE = 05
LOCK = ff
include avrlib/makefile.mk
include $(DEP_FILE)
# Rule for building the firmware update file
wav: $(TARGET_BIN)
python avr_audio_bootloader/fsk/encoder.py \
-s 40000 -b 16 -n 8 -z 4 -p 128 -g 128 -k 10 \
$(TARGET_BIN)
bootstrap_all:
make -f stereo_mix/makefile
make -f stereo_mix/bootloader/makefile
make -f stereo_mix/bootloader/makefile fuses
$(AVRDUDE) -B 1 $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
-U flash:w:build/stereo_mix/stereo_mix.hex:i \
-U flash:w:build/stereo_mix_bootloader/stereo_mix_bootloader.hex:i \
-U lock:w:0xff:m

176
stereo_mix/resources.cc Normal file
View file

@ -0,0 +1,176 @@
// Copyright 2019 Jan-Henrik Bruhn.
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// -----------------------------------------------------------------------------
//
// Resources definitions.
//
// Automatically generated with:
// make resources
#include "stereo_mix/resources.h"
namespace stereo_mix {
static const prog_char str_res_dummy[] PROGMEM = "dummy";
const prog_char* const string_table[] = {
str_res_dummy,
};
const prog_uint16_t lut_res_linear_to_exp[] PROGMEM = {
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63,
64, 65, 66, 67, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79,
80, 81, 82, 83, 84, 85, 86, 87,
88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 100, 101, 102, 103,
104, 105, 106, 107, 108, 109, 110, 111,
112, 113, 114, 115, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127,
128, 129, 130, 131, 132, 133, 134, 135,
136, 137, 138, 139, 140, 141, 142, 143,
144, 145, 146, 147, 148, 149, 150, 151,
152, 153, 154, 155, 156, 157, 158, 159,
160, 161, 162, 163, 164, 165, 166, 167,
168, 169, 170, 171, 172, 173, 174, 175,
176, 177, 178, 179, 180, 181, 182, 183,
184, 185, 186, 187, 188, 189, 190, 191,
192, 193, 194, 195, 196, 197, 198, 199,
200, 201, 202, 203, 204, 205, 206, 207,
208, 209, 210, 211, 212, 213, 214, 215,
216, 217, 218, 219, 220, 221, 222, 223,
224, 225, 226, 227, 228, 229, 230, 231,
232, 233, 234, 235, 236, 237, 238, 239,
240, 241, 242, 243, 244, 245, 246, 247,
248, 249, 250, 251, 252, 253, 254, 255,
256, 257, 258, 259, 260, 261, 262, 263,
264, 265, 266, 267, 268, 269, 270, 271,
272, 273, 274, 275, 276, 277, 278, 279,
280, 281, 282, 283, 284, 285, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, 300, 301, 302, 303,
304, 305, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319,
320, 321, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 332, 333, 334, 335,
336, 337, 338, 339, 340, 341, 342, 343,
344, 345, 346, 347, 348, 349, 350, 351,
352, 353, 354, 355, 356, 357, 358, 359,
360, 361, 362, 363, 364, 365, 366, 367,
368, 369, 370, 371, 372, 373, 374, 375,
376, 377, 378, 379, 380, 381, 382, 383,
384, 385, 386, 387, 388, 389, 390, 391,
392, 393, 394, 395, 396, 397, 398, 399,
400, 401, 402, 403, 404, 405, 406, 407,
408, 409, 410, 411, 412, 413, 414, 415,
416, 417, 418, 419, 420, 421, 422, 423,
424, 425, 426, 427, 428, 429, 430, 431,
432, 433, 434, 435, 436, 437, 438, 439,
440, 441, 442, 443, 444, 445, 446, 447,
448, 449, 450, 451, 452, 453, 454, 455,
456, 457, 458, 459, 460, 461, 462, 463,
464, 465, 466, 467, 468, 469, 470, 471,
472, 473, 474, 475, 476, 477, 478, 479,
480, 481, 482, 483, 484, 485, 486, 487,
488, 489, 490, 491, 492, 493, 494, 495,
496, 497, 498, 499, 500, 501, 502, 503,
504, 505, 506, 507, 508, 509, 510, 511,
512, 513, 514, 515, 516, 517, 518, 519,
520, 521, 522, 523, 524, 525, 526, 527,
528, 529, 530, 531, 532, 533, 534, 535,
536, 537, 538, 539, 540, 541, 542, 543,
544, 545, 546, 547, 548, 549, 550, 551,
552, 553, 554, 555, 556, 557, 558, 559,
560, 561, 562, 563, 564, 565, 566, 567,
568, 569, 570, 571, 572, 573, 574, 575,
576, 577, 578, 579, 580, 581, 582, 583,
584, 585, 586, 587, 588, 589, 590, 591,
592, 593, 594, 595, 596, 597, 598, 599,
600, 601, 602, 603, 604, 605, 606, 607,
608, 609, 610, 611, 612, 613, 614, 615,
616, 617, 618, 619, 620, 621, 622, 623,
624, 625, 626, 627, 628, 629, 630, 631,
632, 633, 634, 635, 636, 637, 638, 639,
640, 641, 642, 643, 644, 645, 646, 647,
648, 649, 650, 651, 652, 653, 654, 655,
656, 657, 658, 659, 660, 661, 662, 663,
664, 665, 666, 667, 668, 669, 670, 671,
672, 673, 674, 675, 676, 677, 678, 679,
680, 681, 682, 683, 684, 685, 686, 687,
688, 689, 690, 691, 692, 693, 694, 695,
696, 697, 698, 699, 700, 701, 702, 703,
704, 705, 706, 707, 708, 709, 710, 711,
712, 713, 714, 715, 716, 717, 718, 719,
720, 721, 722, 723, 724, 725, 726, 727,
728, 729, 730, 731, 732, 733, 734, 735,
736, 737, 738, 739, 740, 741, 742, 743,
744, 745, 746, 747, 748, 749, 750, 751,
752, 753, 754, 755, 756, 757, 758, 759,
760, 761, 762, 763, 764, 765, 766, 767,
768, 769, 770, 771, 772, 773, 774, 775,
776, 777, 778, 779, 780, 781, 782, 783,
784, 785, 786, 787, 788, 789, 790, 791,
792, 793, 794, 795, 796, 797, 798, 799,
800, 801, 802, 803, 804, 805, 806, 807,
808, 809, 810, 811, 812, 813, 814, 815,
816, 817, 818, 819, 820, 821, 822, 823,
824, 825, 826, 827, 828, 829, 830, 831,
832, 833, 834, 835, 836, 837, 838, 839,
840, 841, 842, 843, 844, 845, 846, 847,
848, 849, 850, 851, 852, 853, 854, 855,
856, 857, 858, 859, 860, 861, 862, 863,
864, 865, 866, 867, 868, 869, 870, 871,
872, 873, 874, 875, 876, 877, 878, 879,
880, 881, 882, 883, 884, 885, 886, 887,
888, 889, 890, 891, 892, 893, 894, 895,
896, 897, 898, 899, 900, 901, 902, 903,
904, 905, 906, 907, 908, 909, 910, 911,
912, 913, 914, 915, 916, 917, 918, 919,
920, 921, 922, 923, 924, 925, 926, 927,
928, 929, 930, 931, 932, 933, 934, 935,
936, 937, 938, 939, 940, 941, 942, 943,
944, 945, 946, 947, 948, 949, 950, 951,
952, 953, 954, 955, 956, 957, 958, 959,
960, 961, 962, 963, 964, 965, 966, 967,
968, 969, 970, 971, 972, 973, 974, 975,
976, 977, 978, 979, 980, 981, 982, 983,
984, 985, 986, 987, 988, 989, 990, 991,
992, 993, 994, 995, 996, 997, 998, 999,
1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007,
1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015,
1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
};
const prog_uint16_t* const lookup_table_table[] = {
lut_res_linear_to_exp,
};
const prog_uint32_t* const lookup_table_32_table[] = {
};
} // namespace stereo_mix

49
stereo_mix/resources.h Normal file
View file

@ -0,0 +1,49 @@
// Copyright 2019 Jan-Henrik Bruhn.
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// -----------------------------------------------------------------------------
//
// Resources definitions.
//
// Automatically generated with:
// make resources
#ifndef STEREO_MIX_RESOURCES_H_
#define STEREO_MIX_RESOURCES_H_
#include "avrlib/avrlib.h"
#include <avr/pgmspace.h>
namespace stereo_mix {
typedef uint8_t ResourceId;
extern const prog_char* const string_table[];
extern const prog_uint16_t* const lookup_table_table[];
extern const prog_uint32_t* const lookup_table_32_table[];
extern const prog_uint16_t lut_res_linear_to_exp[] PROGMEM;
#define STR_RES_DUMMY 0 // dummy
#define LUT_RES_LINEAR_TO_EXP 0
#define LUT_RES_LINEAR_TO_EXP_SIZE 1024
} // namespace stereo_mix
#endif // STEREO_MIX_RESOURCES_H_

0
stereo_mix/resources/__init__.py Normal file
View file

16
stereo_mix/resources/lookup_tables.py Normal file
View file

@ -0,0 +1,16 @@
import numpy
lookup_tables = []
lookup_tables_32 = []
# linear to exponential conversion
values = []
size = 1024.0
for x in range(int(size)):
if x == 0:
values.append(0)
else:
values.append((x ** 2) / x)
lookup_tables.append(('linear_to_exp', values))

64
stereo_mix/resources/resources.py Normal file
View file

@ -0,0 +1,64 @@
#!/usr/bin/python2.5
#
# Copyright 2012 Emilie Gillet.
#
# Author: Emilie Gillet (emilie.o.gillet@gmail.com)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# -----------------------------------------------------------------------------
#
# Master resources file.
header = """// Copyright 2019 Jan-Henrik Bruhn.
//
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// -----------------------------------------------------------------------------
//
// Resources definitions.
//
// Automatically generated with:
// make resources
"""
namespace = 'stereo_mix'
target = 'stereo_mix'
modifier = 'PROGMEM'
types = ['uint8_t', 'uint16_t']
includes = """
#include "avrlib/avrlib.h"
#include <avr/pgmspace.h>
"""
import lookup_tables
create_specialized_manager = False
resources = [
('dummy', 'string', 'STR_RES', 'prog_char', str, True),
(lookup_tables.lookup_tables,
'lookup_table', 'LUT_RES', 'prog_uint16_t', int, True),
(lookup_tables.lookup_tables_32,
'lookup_table_32', 'LUT_RES', 'prog_uint32_t', int, True)
]

65
stereo_mix/stereo_mix.cc Normal file
View file

@ -0,0 +1,65 @@
#include <avr/pgmspace.h>
#include <math.h>
#include "avrlib/adc.h"
#include "avrlib/avrlib.h"
#include "avrlib/devices/mcp492x.h"
#include "avrlib/gpio.h"
#include "avrlib/spi.h"
#include "avrlib/watchdog_timer.h"
#include "stereo_mix/resources.h"
#define degToRad(angleInDegrees) ((angleInDegrees)*M_PI / 180.0)
using namespace avrlib;
using namespace stereo_mix;
typedef SpiMaster<NumberedGpio<0>, MSB_FIRST, 2> dac1Spi;
typedef Dac<dac1Spi, BUFFERED_REFERENCE, 1> Dac1;
typedef SpiMaster<NumberedGpio<1>, MSB_FIRST, 2> dac2Spi;
typedef Dac<dac2Spi, BUFFERED_REFERENCE, 1> Dac2;
typedef SpiMaster<NumberedGpio<2>, MSB_FIRST, 2> dac3Spi;
typedef Dac<dac3Spi, BUFFERED_REFERENCE, 1> Dac3;
typedef SpiMaster<NumberedGpio<3>, MSB_FIRST, 2> dac4Spi;
typedef Dac<dac4Spi, BUFFERED_REFERENCE, 1> Dac4;
typedef AdcInputScanner AnalogInputs;
#define NUM_CHANNELS 4
uint16_t volume[NUM_CHANNELS];
float pan[NUM_CHANNELS];
int main(void)
{
Dac1::Init();
Dac2::Init();
Dac3::Init();
Dac4::Init();
AnalogInputs::Init();
AnalogInputs::set_num_inputs(8);
while (true) {
ResetWatchdog();
AnalogInputs::Scan();
for (int i = 0; i < NUM_CHANNELS; i++) {
volume[i] = pgm_read_word_near(lut_res_linear_to_exp + AnalogInputs::Read(i));
if(volume[i] < 7) // some ADSRs dont seem to close completely, lets gate very low voltages...
volume[i] = 0;
int16_t panRead = AnalogInputs::Read(i + NUM_CHANNELS);
pan[i] = (panRead / 1024.0) * M_PI_2; // convert 0 to 90° to radians
}
Dac1::Write((uint16_t)((volume[0]) * sin(pan[0])) << 2, 0);
Dac1::Write((uint16_t)((volume[0]) * cos(pan[0])) << 2, 1);
Dac2::Write((uint16_t)((volume[1]) * sin(pan[1])) << 2, 0);
Dac2::Write((uint16_t)((volume[1]) * cos(pan[1])) << 2, 1);
Dac3::Write((uint16_t)((volume[2]) * sin(pan[2])) << 2, 0);
Dac3::Write((uint16_t)((volume[2]) * cos(pan[2])) << 2, 1);
Dac4::Write((uint16_t)((volume[3]) * sin(pan[3])) << 2, 0);
Dac4::Write((uint16_t)((volume[3]) * cos(pan[3])) << 2, 1);
}
}