From 7b0b1e4f084ae7000023de7ea1c48782dc571018 Mon Sep 17 00:00:00 2001 From: Jan-Henrik Bruhn Date: Tue, 18 Feb 2020 01:56:45 +0100 Subject: [PATCH] reduce size of stereo mix program (atmega88????), decrease lut resolution, improve volume curve --- stereo_mix/makefile | 2 +- stereo_mix/resources.cc | 564 +++++++++----------------- stereo_mix/resources.h | 6 +- stereo_mix/resources/lookup_tables.py | 23 +- stereo_mix/stereo_mix.cc | 40 +- 5 files changed, 218 insertions(+), 417 deletions(-) diff --git a/stereo_mix/makefile b/stereo_mix/makefile index 3bd7d6c..c24d625 100644 --- a/stereo_mix/makefile +++ b/stereo_mix/makefile @@ -18,7 +18,7 @@ PACKAGES = avrlib avrlib/devices stereo_mix RESOURCES = stereo_mix/resources PROGRAMMER = atmelice_isp -LFUSE = ff +LFUSE = ef HFUSE = d8 EFUSE = 05 LOCK = ff diff --git a/stereo_mix/resources.cc b/stereo_mix/resources.cc index b2e988d..80f760b 100644 --- a/stereo_mix/resources.cc +++ b/stereo_mix/resources.cc @@ -32,391 +32,199 @@ const prog_char* const string_table[] = { }; 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, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 3, + 3, 3, 3, 3, 3, 4, 4, 4, + 4, 4, 5, 5, 5, 5, 5, 6, + 6, 6, 6, 7, 7, 7, 7, 8, + 8, 8, 8, 9, 9, 9, 9, 10, + 10, 10, 10, 11, 11, 11, 12, 12, + 12, 13, 13, 13, 14, 14, 14, 15, + 15, 15, 16, 16, 16, 17, 17, 18, + 18, 18, 19, 19, 19, 20, 20, 21, + 21, 21, 22, 22, 23, 23, 24, 24, + 24, 25, 25, 26, 26, 27, 27, 28, + 28, 29, 29, 30, 30, 31, 31, 32, + 32, 33, 33, 34, 34, 35, 35, 36, + 36, 37, 37, 38, 38, 39, 39, 40, + 41, 41, 42, 42, 43, 43, 44, 45, + 45, 46, 46, 47, 48, 48, 49, 50, + 50, 51, 51, 52, 53, 53, 54, 55, + 55, 56, 57, 57, 58, 59, 59, 60, + 61, 61, 62, 63, 63, 64, 65, 66, + 66, 67, 68, 69, 69, 70, 71, 72, + 72, 73, 74, 75, 75, 76, 77, 78, + 78, 79, 80, 81, 82, 82, 83, 84, + 85, 86, 86, 87, 88, 89, 90, 91, + 91, 92, 93, 94, 95, 96, 97, 98, + 98, 99, 100, 101, 102, 103, 104, 105, + 106, 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, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 162, + 163, 164, 165, 166, 167, 168, 169, 171, + 172, 173, 174, 175, 176, 178, 179, 180, + 181, 182, 184, 185, 186, 187, 188, 190, + 191, 192, 193, 195, 196, 197, 198, 200, + 201, 202, 203, 205, 206, 207, 208, 210, + 211, 212, 213, 215, 216, 217, 219, 220, + 221, 223, 224, 225, 227, 228, 229, 231, + 232, 233, 235, 236, 237, 239, 240, 242, + 243, 244, 246, 247, 248, 250, 251, 253, + 254, 255, 257, 258, 260, 261, 263, 264, + 265, 267, 268, 270, 271, 273, 274, 276, + 277, 279, 280, 282, 283, 285, 286, 288, + 289, 291, 292, 294, 295, 297, 298, 300, + 301, 303, 304, 306, 307, 309, 310, 312, + 314, 315, 317, 318, 320, 321, 323, 325, + 326, 328, 329, 331, 333, 334, 336, 338, + 339, 341, 342, 344, 346, 347, 349, 351, + 352, 354, 356, 357, 359, 361, 362, 364, + 366, 367, 369, 371, 372, 374, 376, 378, + 379, 381, 383, 385, 386, 388, 390, 392, + 393, 395, 397, 399, 400, 402, 404, 406, + 407, 409, 411, 413, 415, 416, 418, 420, + 422, 424, 425, 427, 429, 431, 433, 435, + 436, 438, 440, 442, 444, 446, 448, 450, + 451, 453, 455, 457, 459, 461, 463, 465, + 467, 468, 470, 472, 474, 476, 478, 480, + 482, 484, 486, 488, 490, 492, 494, 496, + 498, 500, 502, 504, 506, 508, 510, 512, }; const prog_uint16_t lut_res_left_sin_pan[] PROGMEM = { 0, 2, 3, 5, 6, 8, 9, 11, 13, 14, 16, 17, 19, 20, 22, 24, 25, 27, 28, 30, 31, 33, 35, 36, - 38, 39, 41, 42, 44, 46, 47, 49, - 50, 52, 53, 55, 57, 58, 60, 61, - 63, 64, 66, 67, 69, 71, 72, 74, - 75, 77, 78, 80, 82, 83, 85, 86, - 88, 89, 91, 93, 94, 96, 97, 99, - 100, 102, 103, 105, 107, 108, 110, 111, - 113, 114, 116, 118, 119, 121, 122, 124, - 125, 127, 128, 130, 132, 133, 135, 136, - 138, 139, 141, 142, 144, 146, 147, 149, - 150, 152, 153, 155, 156, 158, 160, 161, - 163, 164, 166, 167, 169, 170, 172, 174, - 175, 177, 178, 180, 181, 183, 184, 186, - 187, 189, 191, 192, 194, 195, 197, 198, - 200, 201, 203, 204, 206, 207, 209, 211, - 212, 214, 215, 217, 218, 220, 221, 223, - 224, 226, 227, 229, 230, 232, 234, 235, - 237, 238, 240, 241, 243, 244, 246, 247, - 249, 250, 252, 253, 255, 256, 258, 259, - 261, 263, 264, 266, 267, 269, 270, 272, - 273, 275, 276, 278, 279, 281, 282, 284, - 285, 287, 288, 290, 291, 293, 294, 296, - 297, 299, 300, 302, 303, 305, 306, 308, - 309, 311, 312, 314, 315, 317, 318, 320, - 321, 323, 324, 326, 327, 329, 330, 332, - 333, 335, 336, 338, 339, 341, 342, 343, - 345, 346, 348, 349, 351, 352, 354, 355, - 357, 358, 360, 361, 363, 364, 366, 367, - 369, 370, 371, 373, 374, 376, 377, 379, - 380, 382, 383, 385, 386, 388, 389, 390, - 392, 393, 395, 396, 398, 399, 401, 402, - 403, 405, 406, 408, 409, 411, 412, 414, - 415, 416, 418, 419, 421, 422, 424, 425, - 426, 428, 429, 431, 432, 434, 435, 436, - 438, 439, 441, 442, 443, 445, 446, 448, - 449, 451, 452, 453, 455, 456, 458, 459, - 460, 462, 463, 465, 466, 467, 469, 470, - 472, 473, 474, 476, 477, 479, 480, 481, - 483, 484, 485, 487, 488, 490, 491, 492, - 494, 495, 497, 498, 499, 501, 502, 503, - 505, 506, 507, 509, 510, 512, 513, 514, - 516, 517, 518, 520, 521, 522, 524, 525, - 526, 528, 529, 530, 532, 533, 535, 536, - 537, 539, 540, 541, 543, 544, 545, 547, - 548, 549, 550, 552, 553, 554, 556, 557, - 558, 560, 561, 562, 564, 565, 566, 568, - 569, 570, 572, 573, 574, 575, 577, 578, - 579, 581, 582, 583, 584, 586, 587, 588, - 590, 591, 592, 593, 595, 596, 597, 599, - 600, 601, 602, 604, 605, 606, 607, 609, - 610, 611, 613, 614, 615, 616, 618, 619, - 620, 621, 623, 624, 625, 626, 628, 629, - 630, 631, 632, 634, 635, 636, 637, 639, - 640, 641, 642, 644, 645, 646, 647, 648, - 650, 651, 652, 653, 654, 656, 657, 658, - 659, 660, 662, 663, 664, 665, 666, 668, - 669, 670, 671, 672, 674, 675, 676, 677, - 678, 679, 681, 682, 683, 684, 685, 687, - 688, 689, 690, 691, 692, 693, 695, 696, - 697, 698, 699, 700, 702, 703, 704, 705, - 706, 707, 708, 709, 711, 712, 713, 714, - 715, 716, 717, 719, 720, 721, 722, 723, - 724, 725, 726, 727, 729, 730, 731, 732, - 733, 734, 735, 736, 737, 738, 739, 741, - 742, 743, 744, 745, 746, 747, 748, 749, - 750, 751, 752, 753, 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, 782, 783, - 784, 785, 786, 787, 788, 789, 790, 791, - 792, 793, 794, 795, 796, 797, 798, 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, - 822, 823, 824, 825, 826, 827, 828, 829, - 830, 831, 832, 833, 834, 834, 835, 836, - 837, 838, 839, 840, 841, 842, 843, 843, - 844, 845, 846, 847, 848, 849, 850, 851, - 851, 852, 853, 854, 855, 856, 857, 857, - 858, 859, 860, 861, 862, 863, 863, 864, - 865, 866, 867, 868, 868, 869, 870, 871, - 872, 873, 873, 874, 875, 876, 877, 878, - 878, 879, 880, 881, 882, 882, 883, 884, - 885, 885, 886, 887, 888, 889, 889, 890, - 891, 892, 893, 893, 894, 895, 896, 896, - 897, 898, 899, 899, 900, 901, 902, 902, - 903, 904, 905, 905, 906, 907, 907, 908, - 909, 910, 910, 911, 912, 913, 913, 914, - 915, 915, 916, 917, 917, 918, 919, 920, - 920, 921, 922, 922, 923, 924, 924, 925, - 926, 926, 927, 928, 928, 929, 930, 930, - 931, 932, 932, 933, 934, 934, 935, 936, - 936, 937, 937, 938, 939, 939, 940, 941, - 941, 942, 942, 943, 944, 944, 945, 945, - 946, 947, 947, 948, 948, 949, 950, 950, - 951, 951, 952, 953, 953, 954, 954, 955, - 955, 956, 957, 957, 958, 958, 959, 959, - 960, 960, 961, 961, 962, 963, 963, 964, - 964, 965, 965, 966, 966, 967, 967, 968, - 968, 969, 969, 970, 970, 971, 971, 972, - 972, 973, 973, 974, 974, 975, 975, 976, - 976, 977, 977, 978, 978, 979, 979, 979, - 980, 980, 981, 981, 982, 982, 983, 983, - 983, 984, 984, 985, 985, 986, 986, 986, - 987, 987, 988, 988, 989, 989, 989, 990, - 990, 991, 991, 991, 992, 992, 993, 993, - 993, 994, 994, 994, 995, 995, 996, 996, - 996, 997, 997, 997, 998, 998, 998, 999, - 999, 999, 1000, 1000, 1000, 1001, 1001, 1001, - 1002, 1002, 1002, 1003, 1003, 1003, 1004, 1004, - 1004, 1005, 1005, 1005, 1006, 1006, 1006, 1006, - 1007, 1007, 1007, 1008, 1008, 1008, 1008, 1009, - 1009, 1009, 1009, 1010, 1010, 1010, 1010, 1011, - 1011, 1011, 1011, 1012, 1012, 1012, 1012, 1013, - 1013, 1013, 1013, 1014, 1014, 1014, 1014, 1014, - 1015, 1015, 1015, 1015, 1016, 1016, 1016, 1016, - 1016, 1016, 1017, 1017, 1017, 1017, 1017, 1018, - 1018, 1018, 1018, 1018, 1018, 1019, 1019, 1019, - 1019, 1019, 1019, 1020, 1020, 1020, 1020, 1020, - 1020, 1020, 1020, 1021, 1021, 1021, 1021, 1021, - 1021, 1021, 1021, 1022, 1022, 1022, 1022, 1022, - 1022, 1022, 1022, 1022, 1022, 1023, 1023, 1023, - 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, - 1023, 1023, 1023, 1023, 1024, 1024, 1024, 1024, - 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, - 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, + 38, 39, 41, 42, 44, 45, 47, 49, + 50, 52, 53, 55, 56, 58, 60, 61, + 63, 64, 66, 67, 69, 70, 72, 74, + 75, 77, 78, 80, 81, 83, 84, 86, + 88, 89, 91, 92, 94, 95, 97, 98, + 100, 101, 103, 105, 106, 108, 109, 111, + 112, 114, 115, 117, 118, 120, 121, 123, + 124, 126, 127, 129, 130, 132, 134, 135, + 137, 138, 140, 141, 143, 144, 146, 147, + 149, 150, 152, 153, 155, 156, 158, 159, + 161, 162, 164, 165, 167, 168, 170, 171, + 172, 174, 175, 177, 178, 180, 181, 183, + 184, 186, 187, 189, 190, 192, 193, 194, + 196, 197, 199, 200, 202, 203, 205, 206, + 207, 209, 210, 212, 213, 215, 216, 217, + 219, 220, 222, 223, 225, 226, 227, 229, + 230, 232, 233, 234, 236, 237, 239, 240, + 241, 243, 244, 246, 247, 248, 250, 251, + 252, 254, 255, 256, 258, 259, 261, 262, + 263, 265, 266, 267, 269, 270, 271, 273, + 274, 275, 277, 278, 279, 281, 282, 283, + 284, 286, 287, 288, 290, 291, 292, 294, + 295, 296, 297, 299, 300, 301, 302, 304, + 305, 306, 308, 309, 310, 311, 313, 314, + 315, 316, 317, 319, 320, 321, 322, 324, + 325, 326, 327, 328, 330, 331, 332, 333, + 334, 336, 337, 338, 339, 340, 342, 343, + 344, 345, 346, 347, 348, 350, 351, 352, + 353, 354, 355, 356, 358, 359, 360, 361, + 362, 363, 364, 365, 366, 368, 369, 370, + 371, 372, 373, 374, 375, 376, 377, 378, + 379, 380, 381, 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, 407, 408, 409, 410, + 411, 412, 413, 414, 415, 416, 417, 418, + 419, 420, 420, 421, 422, 423, 424, 425, + 426, 427, 427, 428, 429, 430, 431, 432, + 433, 433, 434, 435, 436, 437, 438, 438, + 439, 440, 441, 442, 442, 443, 444, 445, + 445, 446, 447, 448, 449, 449, 450, 451, + 452, 452, 453, 454, 454, 455, 456, 457, + 457, 458, 459, 459, 460, 461, 461, 462, + 463, 464, 464, 465, 465, 466, 467, 467, + 468, 469, 469, 470, 471, 471, 472, 472, + 473, 474, 474, 475, 475, 476, 477, 477, + 478, 478, 479, 479, 480, 480, 481, 482, + 482, 483, 483, 484, 484, 485, 485, 486, + 486, 487, 487, 488, 488, 489, 489, 489, + 490, 490, 491, 491, 492, 492, 493, 493, + 493, 494, 494, 495, 495, 495, 496, 496, + 497, 497, 497, 498, 498, 499, 499, 499, + 500, 500, 500, 501, 501, 501, 502, 502, + 502, 502, 503, 503, 503, 504, 504, 504, + 504, 505, 505, 505, 505, 506, 506, 506, + 506, 507, 507, 507, 507, 508, 508, 508, + 508, 508, 509, 509, 509, 509, 509, 509, + 510, 510, 510, 510, 510, 510, 510, 510, + 511, 511, 511, 511, 511, 511, 511, 511, + 511, 511, 512, 512, 512, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, 512, }; const prog_uint16_t lut_res_right_cos_pan[] PROGMEM = { - 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, - 1024, 1024, 1024, 1024, 1024, 1024, 1024, 1024, - 1024, 1024, 1024, 1024, 1024, 1023, 1023, 1023, - 1023, 1023, 1023, 1023, 1023, 1023, 1023, 1023, - 1023, 1023, 1023, 1023, 1022, 1022, 1022, 1022, - 1022, 1022, 1022, 1022, 1022, 1022, 1021, 1021, - 1021, 1021, 1021, 1021, 1021, 1021, 1020, 1020, - 1020, 1020, 1020, 1020, 1020, 1020, 1019, 1019, - 1019, 1019, 1019, 1019, 1018, 1018, 1018, 1018, - 1018, 1018, 1017, 1017, 1017, 1017, 1017, 1016, - 1016, 1016, 1016, 1016, 1016, 1015, 1015, 1015, - 1015, 1014, 1014, 1014, 1014, 1014, 1013, 1013, - 1013, 1013, 1012, 1012, 1012, 1012, 1011, 1011, - 1011, 1011, 1010, 1010, 1010, 1010, 1009, 1009, - 1009, 1009, 1008, 1008, 1008, 1008, 1007, 1007, - 1007, 1006, 1006, 1006, 1006, 1005, 1005, 1005, - 1004, 1004, 1004, 1003, 1003, 1003, 1002, 1002, - 1002, 1001, 1001, 1001, 1000, 1000, 1000, 999, - 999, 999, 998, 998, 998, 997, 997, 997, - 996, 996, 996, 995, 995, 994, 994, 994, - 993, 993, 993, 992, 992, 991, 991, 991, - 990, 990, 989, 989, 989, 988, 988, 987, - 987, 986, 986, 986, 985, 985, 984, 984, - 983, 983, 983, 982, 982, 981, 981, 980, - 980, 979, 979, 979, 978, 978, 977, 977, - 976, 976, 975, 975, 974, 974, 973, 973, - 972, 972, 971, 971, 970, 970, 969, 969, - 968, 968, 967, 967, 966, 966, 965, 965, - 964, 964, 963, 963, 962, 961, 961, 960, - 960, 959, 959, 958, 958, 957, 957, 956, - 955, 955, 954, 954, 953, 953, 952, 951, - 951, 950, 950, 949, 948, 948, 947, 947, - 946, 945, 945, 944, 944, 943, 942, 942, - 941, 941, 940, 939, 939, 938, 937, 937, - 936, 936, 935, 934, 934, 933, 932, 932, - 931, 930, 930, 929, 928, 928, 927, 926, - 926, 925, 924, 924, 923, 922, 922, 921, - 920, 920, 919, 918, 917, 917, 916, 915, - 915, 914, 913, 913, 912, 911, 910, 910, - 909, 908, 907, 907, 906, 905, 905, 904, - 903, 902, 902, 901, 900, 899, 899, 898, - 897, 896, 896, 895, 894, 893, 893, 892, - 891, 890, 889, 889, 888, 887, 886, 885, - 885, 884, 883, 882, 882, 881, 880, 879, - 878, 878, 877, 876, 875, 874, 873, 873, - 872, 871, 870, 869, 868, 868, 867, 866, - 865, 864, 863, 863, 862, 861, 860, 859, - 858, 857, 857, 856, 855, 854, 853, 852, - 851, 851, 850, 849, 848, 847, 846, 845, - 844, 843, 843, 842, 841, 840, 839, 838, - 837, 836, 835, 834, 834, 833, 832, 831, - 830, 829, 828, 827, 826, 825, 824, 823, - 822, 822, 821, 820, 819, 818, 817, 816, - 815, 814, 813, 812, 811, 810, 809, 808, - 807, 806, 805, 804, 803, 802, 801, 800, - 799, 798, 798, 797, 796, 795, 794, 793, - 792, 791, 790, 789, 788, 787, 786, 785, - 784, 783, 782, 780, 779, 778, 777, 776, - 775, 774, 773, 772, 771, 770, 769, 768, - 767, 766, 765, 764, 763, 762, 761, 760, - 759, 758, 757, 756, 755, 753, 752, 751, - 750, 749, 748, 747, 746, 745, 744, 743, - 742, 741, 739, 738, 737, 736, 735, 734, - 733, 732, 731, 730, 729, 727, 726, 725, - 724, 723, 722, 721, 720, 719, 717, 716, - 715, 714, 713, 712, 711, 709, 708, 707, - 706, 705, 704, 703, 702, 700, 699, 698, - 697, 696, 695, 693, 692, 691, 690, 689, - 688, 687, 685, 684, 683, 682, 681, 679, - 678, 677, 676, 675, 674, 672, 671, 670, - 669, 668, 666, 665, 664, 663, 662, 660, - 659, 658, 657, 656, 654, 653, 652, 651, - 650, 648, 647, 646, 645, 644, 642, 641, - 640, 639, 637, 636, 635, 634, 632, 631, - 630, 629, 628, 626, 625, 624, 623, 621, - 620, 619, 618, 616, 615, 614, 613, 611, - 610, 609, 607, 606, 605, 604, 602, 601, - 600, 599, 597, 596, 595, 593, 592, 591, - 590, 588, 587, 586, 584, 583, 582, 581, - 579, 578, 577, 575, 574, 573, 572, 570, - 569, 568, 566, 565, 564, 562, 561, 560, - 558, 557, 556, 554, 553, 552, 550, 549, - 548, 547, 545, 544, 543, 541, 540, 539, - 537, 536, 535, 533, 532, 530, 529, 528, - 526, 525, 524, 522, 521, 520, 518, 517, - 516, 514, 513, 512, 510, 509, 507, 506, - 505, 503, 502, 501, 499, 498, 497, 495, - 494, 492, 491, 490, 488, 487, 485, 484, - 483, 481, 480, 479, 477, 476, 474, 473, - 472, 470, 469, 467, 466, 465, 463, 462, - 460, 459, 458, 456, 455, 453, 452, 451, - 449, 448, 446, 445, 443, 442, 441, 439, - 438, 436, 435, 434, 432, 431, 429, 428, - 426, 425, 424, 422, 421, 419, 418, 416, - 415, 414, 412, 411, 409, 408, 406, 405, - 403, 402, 401, 399, 398, 396, 395, 393, - 392, 390, 389, 388, 386, 385, 383, 382, - 380, 379, 377, 376, 374, 373, 371, 370, - 369, 367, 366, 364, 363, 361, 360, 358, - 357, 355, 354, 352, 351, 349, 348, 346, - 345, 343, 342, 341, 339, 338, 336, 335, - 333, 332, 330, 329, 327, 326, 324, 323, - 321, 320, 318, 317, 315, 314, 312, 311, - 309, 308, 306, 305, 303, 302, 300, 299, - 297, 296, 294, 293, 291, 290, 288, 287, - 285, 284, 282, 281, 279, 278, 276, 275, - 273, 272, 270, 269, 267, 266, 264, 263, - 261, 259, 258, 256, 255, 253, 252, 250, - 249, 247, 246, 244, 243, 241, 240, 238, - 237, 235, 234, 232, 230, 229, 227, 226, - 224, 223, 221, 220, 218, 217, 215, 214, - 212, 211, 209, 207, 206, 204, 203, 201, - 200, 198, 197, 195, 194, 192, 191, 189, - 187, 186, 184, 183, 181, 180, 178, 177, - 175, 174, 172, 170, 169, 167, 166, 164, - 163, 161, 160, 158, 156, 155, 153, 152, - 150, 149, 147, 146, 144, 142, 141, 139, - 138, 136, 135, 133, 132, 130, 128, 127, - 125, 124, 122, 121, 119, 118, 116, 114, - 113, 111, 110, 108, 107, 105, 103, 102, - 100, 99, 97, 96, 94, 93, 91, 89, - 88, 86, 85, 83, 82, 80, 78, 77, - 75, 74, 72, 71, 69, 67, 66, 64, - 63, 61, 60, 58, 57, 55, 53, 52, - 50, 49, 47, 46, 44, 42, 41, 39, + 512, 512, 512, 512, 512, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, 511, + 511, 511, 511, 511, 511, 511, 511, 511, + 511, 510, 510, 510, 510, 510, 510, 510, + 510, 509, 509, 509, 509, 509, 509, 508, + 508, 508, 508, 508, 507, 507, 507, 507, + 506, 506, 506, 506, 505, 505, 505, 505, + 504, 504, 504, 504, 503, 503, 503, 502, + 502, 502, 502, 501, 501, 501, 500, 500, + 500, 499, 499, 499, 498, 498, 497, 497, + 497, 496, 496, 495, 495, 495, 494, 494, + 493, 493, 493, 492, 492, 491, 491, 490, + 490, 489, 489, 489, 488, 488, 487, 487, + 486, 486, 485, 485, 484, 484, 483, 483, + 482, 482, 481, 480, 480, 479, 479, 478, + 478, 477, 477, 476, 475, 475, 474, 474, + 473, 472, 472, 471, 471, 470, 469, 469, + 468, 467, 467, 466, 465, 465, 464, 464, + 463, 462, 461, 461, 460, 459, 459, 458, + 457, 457, 456, 455, 454, 454, 453, 452, + 452, 451, 450, 449, 449, 448, 447, 446, + 445, 445, 444, 443, 442, 442, 441, 440, + 439, 438, 438, 437, 436, 435, 434, 433, + 433, 432, 431, 430, 429, 428, 427, 427, + 426, 425, 424, 423, 422, 421, 420, 420, + 419, 418, 417, 416, 415, 414, 413, 412, + 411, 410, 409, 408, 407, 407, 406, 405, + 404, 403, 402, 401, 400, 399, 398, 397, + 396, 395, 394, 393, 392, 391, 390, 389, + 388, 387, 386, 385, 384, 383, 381, 380, + 379, 378, 377, 376, 375, 374, 373, 372, + 371, 370, 369, 368, 366, 365, 364, 363, + 362, 361, 360, 359, 358, 356, 355, 354, + 353, 352, 351, 350, 348, 347, 346, 345, + 344, 343, 342, 340, 339, 338, 337, 336, + 334, 333, 332, 331, 330, 328, 327, 326, + 325, 324, 322, 321, 320, 319, 317, 316, + 315, 314, 313, 311, 310, 309, 308, 306, + 305, 304, 302, 301, 300, 299, 297, 296, + 295, 294, 292, 291, 290, 288, 287, 286, + 284, 283, 282, 281, 279, 278, 277, 275, + 274, 273, 271, 270, 269, 267, 266, 265, + 263, 262, 261, 259, 258, 256, 255, 254, + 252, 251, 250, 248, 247, 246, 244, 243, + 241, 240, 239, 237, 236, 234, 233, 232, + 230, 229, 227, 226, 225, 223, 222, 220, + 219, 217, 216, 215, 213, 212, 210, 209, + 207, 206, 205, 203, 202, 200, 199, 197, + 196, 194, 193, 192, 190, 189, 187, 186, + 184, 183, 181, 180, 178, 177, 175, 174, + 172, 171, 170, 168, 167, 165, 164, 162, + 161, 159, 158, 156, 155, 153, 152, 150, + 149, 147, 146, 144, 143, 141, 140, 138, + 137, 135, 134, 132, 130, 129, 127, 126, + 124, 123, 121, 120, 118, 117, 115, 114, + 112, 111, 109, 108, 106, 105, 103, 101, + 100, 98, 97, 95, 94, 92, 91, 89, + 88, 86, 84, 83, 81, 80, 78, 77, + 75, 74, 72, 70, 69, 67, 66, 64, + 63, 61, 60, 58, 56, 55, 53, 52, + 50, 49, 47, 45, 44, 42, 41, 39, 38, 36, 35, 33, 31, 30, 28, 27, 25, 24, 22, 20, 19, 17, 16, 14, 13, 11, 9, 8, 6, 5, 3, 0, diff --git a/stereo_mix/resources.h b/stereo_mix/resources.h index 12188b7..d232f21 100644 --- a/stereo_mix/resources.h +++ b/stereo_mix/resources.h @@ -44,11 +44,11 @@ extern const prog_uint16_t lut_res_left_sin_pan[] PROGMEM; extern const prog_uint16_t lut_res_right_cos_pan[] PROGMEM; #define STR_RES_DUMMY 0 // dummy #define LUT_RES_LINEAR_TO_EXP 0 -#define LUT_RES_LINEAR_TO_EXP_SIZE 1024 +#define LUT_RES_LINEAR_TO_EXP_SIZE 512 #define LUT_RES_LEFT_SIN_PAN 1 -#define LUT_RES_LEFT_SIN_PAN_SIZE 1024 +#define LUT_RES_LEFT_SIN_PAN_SIZE 512 #define LUT_RES_RIGHT_COS_PAN 2 -#define LUT_RES_RIGHT_COS_PAN_SIZE 1024 +#define LUT_RES_RIGHT_COS_PAN_SIZE 512 } // namespace stereo_mix diff --git a/stereo_mix/resources/lookup_tables.py b/stereo_mix/resources/lookup_tables.py index b4f9f9b..c34d94d 100644 --- a/stereo_mix/resources/lookup_tables.py +++ b/stereo_mix/resources/lookup_tables.py @@ -6,28 +6,25 @@ 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) +size = 512.0 +for x in range(1, int(size) + 1): + values.append(numpy.power(x / 512.0, 2) * size) lookup_tables.append(('linear_to_exp', values)) # Left pan Lookup table -l_pan = numpy.arange(0, 1024) -r_pan = numpy.arange(0, 1024) +l_pan = numpy.arange(0, 512) +r_pan = numpy.arange(0, 512) -l_pan = numpy.sin((l_pan / 1024.0) * (numpy.pi / 2.0)) -r_pan = numpy.cos((r_pan / 1024.0) * (numpy.pi / 2.0)) +l_pan = numpy.sin((l_pan / 512.0) * (numpy.pi / 2.0)) +r_pan = numpy.cos((r_pan / 512.0) * (numpy.pi / 2.0)) -l_pan = numpy.round(l_pan * 1024) -r_pan = numpy.round(r_pan * 1024) +l_pan = numpy.round(l_pan * 512) +r_pan = numpy.round(r_pan * 512) -r_pan[1023] = 0 # dirty fix +r_pan[511] = 0 # dirty fix lookup_tables.append(('left_sin_pan', l_pan)) lookup_tables.append(('right_cos_pan', r_pan)) diff --git a/stereo_mix/stereo_mix.cc b/stereo_mix/stereo_mix.cc index 10cfdd5..8d115e0 100644 --- a/stereo_mix/stereo_mix.cc +++ b/stereo_mix/stereo_mix.cc @@ -1,9 +1,6 @@ -#include - #include "avrlib/adc.h" #include "avrlib/avrlib.h" #include "avrlib/boot.h" -#include "avrlib/deprecated/devices/input_array.h" #include "avrlib/devices/mcp492x.h" #include "avrlib/gpio.h" #include "avrlib/spi.h" @@ -67,27 +64,26 @@ int main(void) while (true) { ResetWatchdog(); - for (int i = 0; i < NUM_CHANNELS; i++) { - volume[i] = pgm_read_word_near(lut_res_linear_to_exp + (AnalogInputs::Read(i))); - pan[i * NUM_CHANNELS] = pgm_read_word(lut_res_left_sin_pan + AnalogInputs::Read(i + NUM_CHANNELS)); - pan[i * NUM_CHANNELS + 1] = pgm_read_word(lut_res_right_cos_pan + AnalogInputs::Read(i + NUM_CHANNELS)); + int i = AnalogInputs::current_pin() % NUM_CHANNELS; + volume[i] = pgm_read_word_near(lut_res_linear_to_exp + (AnalogInputs::Read(i) >> 1)) << 1; + pan[i * NUM_CHANNELS] = pgm_read_word(lut_res_left_sin_pan + (AnalogInputs::Read(i + NUM_CHANNELS) >> 1)) << 1; + pan[i * NUM_CHANNELS + 1] = pgm_read_word(lut_res_right_cos_pan + (AnalogInputs::Read(i + NUM_CHANNELS) >> 1)) << 1; - switch (i) { - case 0: - WRITE(Dac1, oDac1, i); - break; - case 1: - WRITE(Dac2, oDac2, i); - break; - case 2: - WRITE(Dac3, oDac3, i); - break; - case 3: - WRITE(Dac4, oDac4, i); - break; - } - AnalogInputs::Scan(); + switch (i) { + case 0: + WRITE(Dac1, oDac1, i); + break; + case 1: + WRITE(Dac2, oDac2, i); + break; + case 2: + WRITE(Dac3, oDac3, i); + break; + case 3: + WRITE(Dac4, oDac4, i); + break; } + AnalogInputs::Scan(); } }