Skip to content

Commit 82979e1

Browse files
tomcombriattomcombriat
committed
Recomputed triangle tables for symetry
Rewrote tables with standardized script Added standard tables generating script
1 parent cb7abe4 commit 82979e1

25 files changed

+4295
-5258
lines changed

‎extras/python/make_standard_tables.py

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
#!/usr/bin/python3
2+
3+
"""
4+
* make_standard_tables.py
5+
*
6+
* This file is part of Mozzi.
7+
*
8+
* Copyright 2012-2024 Thomas Combriat and the Mozzi Team
9+
*
10+
* Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
11+
*
12+
* This file allows to regenerate the standard tables of Mozzi (sin, cos, cosphase, triangle and saw)
13+
"""
14+
15+
import numpy as np # numerics
16+
import textwrap
17+
import os as os
18+
#import math as math # math
19+
20+
folder = ".."+os.sep+".."+os.sep+"tables" + os.sep
21+
22+
def write_header(fout, samplerate,name):
23+
tablename = name.upper()+str(samplerate)+"_INT8"
24+
fout.write('#ifndef ' + tablename + '_H_' + '\n')
25+
fout.write('#define ' + tablename + '_H_' + '\n \n')
26+
fout.write("/**\n This table is part of Mozzi\n Generated with extras/python/make_standard_tables.py\n*/\n\n")
27+
fout.write('#include <Arduino.h>'+'\n')
28+
fout.write('#include "mozzi_pgmspace.h"'+'\n \n')
29+
fout.write('#define ' + tablename + '_NUM_CELLS '+ str(samplerate)+'\n')
30+
fout.write('#define ' + tablename + '_SAMPLERATE '+ str(samplerate)+'\n \n')
31+
fout.write('CONSTTABLE_STORAGE(int8_t) ' + tablename + '_DATA [] = {\n')
32+
33+
def write_footer(fout,samplerate,name):
34+
tablename = name.upper()+str(samplerate)+"_INT8"
35+
fout.write('\n }; \n \n #endif /* ' + tablename + '_H_ */\n')
36+
37+
38+
39+
40+
41+
#### SIN
42+
43+
SR = [256,512,1024,2048,4096,8192]
44+
name = "sin"
45+
46+
for s in SR:
47+
fout = open(folder+name+str(s)+"_int8.h","w")
48+
49+
write_header(fout,s,name)
50+
51+
t = np.linspace(0,2*np.pi,num=s,endpoint=False)
52+
outstring=""
53+
for i in range(s):
54+
outstring+=str(round(127*np.sin(t[i])))+", "
55+
56+
outstring = textwrap.fill(outstring,80)
57+
fout.write(outstring)
58+
write_footer(fout,s,name)
59+
fout.close()
60+
61+
print("Wrote:"+name.upper()+str(s)+"_INT8")
62+
63+
64+
#### COS
65+
# Note that this is actually a negative cos
66+
67+
SR = [256,512,1024,2048,4096,8192]
68+
name = "cos"
69+
70+
for s in SR:
71+
fout = open(folder+name+str(s)+"_int8.h","w")
72+
73+
write_header(fout,s,name)
74+
75+
t = np.linspace(0,2*np.pi,num=s,endpoint=False)
76+
outstring=""
77+
for i in range(s):
78+
outstring+=str(round(-127*np.cos(t[i])))+", "
79+
80+
outstring = textwrap.fill(outstring,80)
81+
fout.write(outstring)
82+
write_footer(fout,s,name)
83+
fout.close()
84+
85+
print("Wrote:"+name.upper()+str(s)+"_INT8")
86+
87+
88+
#### COSPHASE
89+
90+
SR = [256,2048,8192]
91+
name = "cosphase"
92+
93+
for s in SR:
94+
fout = open(folder+name+str(s)+"_int8.h","w")
95+
96+
write_header(fout,s,name)
97+
98+
t = np.linspace(0,2*np.pi,num=s,endpoint=False)
99+
outstring=""
100+
for i in range(s):
101+
outstring+=str(round(127*np.cos(t[i])))+", "
102+
103+
outstring = textwrap.fill(outstring,80)
104+
fout.write(outstring)
105+
write_footer(fout,s,name)
106+
fout.close()
107+
108+
print("Wrote:"+name.upper()+str(s)+"_INT8")
109+
110+
111+
112+
113+
#### TRIANGLE
114+
115+
SR = [512,1024,2048]
116+
name = "triangle"
117+
118+
for s in SR:
119+
fout = open(folder+name+str(s)+"_int8.h","w")
120+
121+
write_header(fout,s,name)
122+
123+
t = np.linspace(0,2*np.pi,num=s,endpoint=False)
124+
outstring=""
125+
for i in range(s):
126+
if (i<=s/4):
127+
outstring+=str(round(i*127./s*4))+", "
128+
elif (i<=s*3/4):
129+
outstring+=str(round(127-(i-s/4)*(127*2)/(s/2)))+", "
130+
else:
131+
outstring+=str(round(-127.+127.*(i-s*3/4)/s*4))+", "
132+
133+
outstring = textwrap.fill(outstring,80)
134+
fout.write(outstring)
135+
write_footer(fout,s,name)
136+
fout.close()
137+
138+
print("Wrote:"+name.upper()+str(s)+"_INT8")
139+
140+
141+
142+
143+
144+
#### SAW
145+
146+
SR = [256,512,1024,2048,4096,8192]
147+
name = "saw"
148+
149+
for s in SR:
150+
fout = open(folder+name+str(s)+"_int8.h","w")
151+
152+
write_header(fout,s,name)
153+
154+
t = np.linspace(0,2*np.pi,num=s,endpoint=False)
155+
outstring=""
156+
for i in range(s):
157+
outstring+=str(str(round(-127+127*2.*i/(s-1)))+", ")
158+
159+
outstring = textwrap.fill(outstring,80)
160+
fout.write(outstring)
161+
write_footer(fout,s,name)
162+
fout.close()
163+
164+
print("Wrote:"+name.upper()+str(s)+"_INT8")

‎tables/cos1024_int8.h

Lines changed: 78 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,81 @@
1-
#ifndef COS1024_H_
2-
#define COS1024_H_
1+
#ifndef COS1024_INT8_H_
2+
#define COS1024_INT8_H_
3+
4+
/**
5+
This table is part of Mozzi
6+
Generated with extras/python/make_standard_tables.py
7+
*/
38

49
#include <Arduino.h>
510
#include "mozzi_pgmspace.h"
6-
7-
#define COS1024_NUM_CELLS 1024
8-
#define COS1024_SAMPLERATE 1024
9-
10-
CONSTTABLE_STORAGE(int8_t) COS1024_DATA [] =
11-
{-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
12-
-127, -127, -127, -126, -126, -126, -126, -126, -126, -126, -126, -126,
13-
-126, -126, -125, -125, -125, -125, -125, -125, -125, -124, -124, -124,
14-
-124, -124, -124, -123, -123, -123, -123, -123, -122, -122, -122, -122,
15-
-122, -121, -121, -121, -121, -120, -120, -120, -120, -119, -119, -119,
16-
-118, -118, -118, -118, -117, -117, -117, -116, -116, -116, -115, -115,
17-
-115, -114, -114, -114, -113, -113, -113, -112, -112, -112, -111, -111,
18-
-111, -110, -110, -109, -109, -109, -108, -108, -107, -107, -106, -106,
19-
-106, -105, -105, -104, -104, -103, -103, -102, -102, -102, -101, -101,
20-
-100, -100, -99, -99, -98, -98, -97, -97, -96, -96, -95, -95,
21-
-94, -94, -93, -93, -92, -91, -91, -90, -90, -89, -89, -88,
22-
-88, -87, -86, -86, -85, -85, -84, -84, -83, -82, -82, -81,
23-
-81, -80, -79, -79, -78, -78, -77, -76, -76, -75, -74, -74,
24-
-73, -72, -72, -71, -71, -70, -69, -69, -68, -67, -67, -66,
25-
-65, -65, -64, -63, -63, -62, -61, -61, -60, -59, -58, -58,
26-
-57, -56, -56, -55, -54, -54, -53, -52, -51, -51, -50, -49,
27-
-49, -48, -47, -46, -46, -45, -44, -44, -43, -42, -41, -41,
28-
-40, -39, -38, -38, -37, -36, -35, -35, -34, -33, -32, -32,
29-
-31, -30, -29, -29, -28, -27, -26, -26, -25, -24, -23, -22,
30-
-22, -21, -20, -19, -19, -18, -17, -16, -16, -15, -14, -13,
31-
-12, -12, -11, -10, -9, -9, -8, -7, -6, -5, -5, -4,
32-
-3, -2, -2, -1, 0, 1, 2, 2, 3, 4, 5, 5,
33-
6, 7, 8, 9, 9, 10, 11, 12, 12, 13, 14, 15,
34-
16, 16, 17, 18, 19, 19, 20, 21, 22, 22, 23, 24,
35-
25, 26, 26, 27, 28, 29, 29, 30, 31, 32, 32, 33,
36-
34, 35, 35, 36, 37, 38, 38, 39, 40, 41, 41, 42,
37-
43, 44, 44, 45, 46, 46, 47, 48, 49, 49, 50, 51,
38-
51, 52, 53, 54, 54, 55, 56, 56, 57, 58, 58, 59,
39-
60, 61, 61, 62, 63, 63, 64, 65, 65, 66, 67, 67,
40-
68, 69, 69, 70, 71, 71, 72, 72, 73, 74, 74, 75,
41-
76, 76, 77, 78, 78, 79, 79, 80, 81, 81, 82, 82,
42-
83, 84, 84, 85, 85, 86, 86, 87, 88, 88, 89, 89,
43-
90, 90, 91, 91, 92, 93, 93, 94, 94, 95, 95, 96,
44-
96, 97, 97, 98, 98, 99, 99, 100, 100, 101, 101, 102,
45-
102, 102, 103, 103, 104, 104, 105, 105, 106, 106, 106, 107,
46-
107, 108, 108, 109, 109, 109, 110, 110, 111, 111, 111, 112,
47-
112, 112, 113, 113, 113, 114, 114, 114, 115, 115, 115, 116,
48-
116, 116, 117, 117, 117, 118, 118, 118, 118, 119, 119, 119,
49-
120, 120, 120, 120, 121, 121, 121, 121, 122, 122, 122, 122,
50-
122, 123, 123, 123, 123, 123, 124, 124, 124, 124, 124, 124,
51-
125, 125, 125, 125, 125, 125, 125, 126, 126, 126, 126, 126,
52-
126, 126, 126, 126, 126, 126, 127, 127, 127, 127, 127, 127,
53-
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
54-
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 126,
55-
126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 125, 125,
56-
125, 125, 125, 125, 125, 124, 124, 124, 124, 124, 124, 123,
57-
123, 123, 123, 123, 122, 122, 122, 122, 122, 121, 121, 121,
58-
121, 120, 120, 120, 120, 119, 119, 119, 118, 118, 118, 118,
59-
117, 117, 117, 116, 116, 116, 115, 115, 115, 114, 114, 114,
60-
113, 113, 113, 112, 112, 112, 111, 111, 111, 110, 110, 109,
61-
109, 109, 108, 108, 107, 107, 106, 106, 106, 105, 105, 104,
62-
104, 103, 103, 102, 102, 102, 101, 101, 100, 100, 99, 99,
63-
98, 98, 97, 97, 96, 96, 95, 95, 94, 94, 93, 93,
64-
92, 91, 91, 90, 90, 89, 89, 88, 88, 87, 86, 86,
65-
85, 85, 84, 84, 83, 82, 82, 81, 81, 80, 79, 79,
66-
78, 78, 77, 76, 76, 75, 74, 74, 73, 72, 72, 71,
67-
71, 70, 69, 69, 68, 67, 67, 66, 65, 65, 64, 63,
68-
63, 62, 61, 61, 60, 59, 58, 58, 57, 56, 56, 55,
69-
54, 54, 53, 52, 51, 51, 50, 49, 49, 48, 47, 46,
70-
46, 45, 44, 44, 43, 42, 41, 41, 40, 39, 38, 38,
71-
37, 36, 35, 35, 34, 33, 32, 32, 31, 30, 29, 29,
72-
28, 27, 26, 26, 25, 24, 23, 22, 22, 21, 20, 19,
73-
19, 18, 17, 16, 16, 15, 14, 13, 12, 12, 11, 10,
74-
9, 9, 8, 7, 6, 5, 5, 4, 3, 2, 2, 1,
75-
0, -1, -2, -2, -3, -4, -5, -5, -6, -7, -8, -9,
76-
-9, -10, -11, -12, -12, -13, -14, -15, -16, -16, -17, -18,
77-
-19, -19, -20, -21, -22, -22, -23, -24, -25, -26, -26, -27,
78-
-28, -29, -29, -30, -31, -32, -32, -33, -34, -35, -35, -36,
79-
-37, -38, -38, -39, -40, -41, -41, -42, -43, -44, -44, -45,
80-
-46, -46, -47, -48, -49, -49, -50, -51, -51, -52, -53, -54,
81-
-54, -55, -56, -56, -57, -58, -58, -59, -60, -61, -61, -62,
82-
-63, -63, -64, -65, -65, -66, -67, -67, -68, -69, -69, -70,
83-
-71, -71, -72, -72, -73, -74, -74, -75, -76, -76, -77, -78,
84-
-78, -79, -79, -80, -81, -81, -82, -82, -83, -84, -84, -85,
85-
-85, -86, -86, -87, -88, -88, -89, -89, -90, -90, -91, -91,
86-
-92, -93, -93, -94, -94, -95, -95, -96, -96, -97, -97, -98,
87-
-98, -99, -99, -100, -100, -101, -101, -102, -102, -102, -103, -103,
88-
-104, -104, -105, -105, -106, -106, -106, -107, -107, -108, -108, -109,
89-
-109, -109, -110, -110, -111, -111, -111, -112, -112, -112, -113, -113,
90-
-113, -114, -114, -114, -115, -115, -115, -116, -116, -116, -117, -117,
91-
-117, -118, -118, -118, -118, -119, -119, -119, -120, -120, -120, -120,
92-
-121, -121, -121, -121, -122, -122, -122, -122, -122, -123, -123, -123,
93-
-123, -123, -124, -124, -124, -124, -124, -124, -125, -125, -125, -125,
94-
-125, -125, -125, -126, -126, -126, -126, -126, -126, -126, -126, -126,
95-
-126, -126, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
96-
-127, -127, -127, -127,
97-
};
98-
99-
#endif /* COS1024_H_ */
11+
12+
#define COS1024_INT8_NUM_CELLS 1024
13+
#define COS1024_INT8_SAMPLERATE 1024
14+
15+
CONSTTABLE_STORAGE(int8_t) COS1024_INT8_DATA [] = {
16+
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
17+
-127, -127, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
18+
-125, -125, -125, -125, -125, -125, -125, -124, -124, -124, -124, -124, -124,
19+
-123, -123, -123, -123, -123, -122, -122, -122, -122, -122, -121, -121, -121,
20+
-121, -120, -120, -120, -120, -119, -119, -119, -118, -118, -118, -118, -117,
21+
-117, -117, -116, -116, -116, -115, -115, -115, -114, -114, -114, -113, -113,
22+
-113, -112, -112, -112, -111, -111, -111, -110, -110, -109, -109, -109, -108,
23+
-108, -107, -107, -106, -106, -106, -105, -105, -104, -104, -103, -103, -102,
24+
-102, -102, -101, -101, -100, -100, -99, -99, -98, -98, -97, -97, -96, -96, -95,
25+
-95, -94, -94, -93, -93, -92, -91, -91, -90, -90, -89, -89, -88, -88, -87, -86,
26+
-86, -85, -85, -84, -84, -83, -82, -82, -81, -81, -80, -79, -79, -78, -78, -77,
27+
-76, -76, -75, -74, -74, -73, -72, -72, -71, -71, -70, -69, -69, -68, -67, -67,
28+
-66, -65, -65, -64, -63, -63, -62, -61, -61, -60, -59, -58, -58, -57, -56, -56,
29+
-55, -54, -54, -53, -52, -51, -51, -50, -49, -49, -48, -47, -46, -46, -45, -44,
30+
-44, -43, -42, -41, -41, -40, -39, -38, -38, -37, -36, -35, -35, -34, -33, -32,
31+
-32, -31, -30, -29, -29, -28, -27, -26, -26, -25, -24, -23, -22, -22, -21, -20,
32+
-19, -19, -18, -17, -16, -16, -15, -14, -13, -12, -12, -11, -10, -9, -9, -8, -7,
33+
-6, -5, -5, -4, -3, -2, -2, -1, 0, 1, 2, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9, 10, 11,
34+
12, 12, 13, 14, 15, 16, 16, 17, 18, 19, 19, 20, 21, 22, 22, 23, 24, 25, 26, 26,
35+
27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, 37, 38, 38, 39, 40, 41, 41,
36+
42, 43, 44, 44, 45, 46, 46, 47, 48, 49, 49, 50, 51, 51, 52, 53, 54, 54, 55, 56,
37+
56, 57, 58, 58, 59, 60, 61, 61, 62, 63, 63, 64, 65, 65, 66, 67, 67, 68, 69, 69,
38+
70, 71, 71, 72, 72, 73, 74, 74, 75, 76, 76, 77, 78, 78, 79, 79, 80, 81, 81, 82,
39+
82, 83, 84, 84, 85, 85, 86, 86, 87, 88, 88, 89, 89, 90, 90, 91, 91, 92, 93, 93,
40+
94, 94, 95, 95, 96, 96, 97, 97, 98, 98, 99, 99, 100, 100, 101, 101, 102, 102,
41+
102, 103, 103, 104, 104, 105, 105, 106, 106, 106, 107, 107, 108, 108, 109, 109,
42+
109, 110, 110, 111, 111, 111, 112, 112, 112, 113, 113, 113, 114, 114, 114, 115,
43+
115, 115, 116, 116, 116, 117, 117, 117, 118, 118, 118, 118, 119, 119, 119, 120,
44+
120, 120, 120, 121, 121, 121, 121, 122, 122, 122, 122, 122, 123, 123, 123, 123,
45+
123, 124, 124, 124, 124, 124, 124, 125, 125, 125, 125, 125, 125, 125, 126, 126,
46+
126, 126, 126, 126, 126, 126, 126, 126, 126, 127, 127, 127, 127, 127, 127, 127,
47+
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
48+
127, 127, 127, 127, 127, 127, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
49+
126, 125, 125, 125, 125, 125, 125, 125, 124, 124, 124, 124, 124, 124, 123, 123,
50+
123, 123, 123, 122, 122, 122, 122, 122, 121, 121, 121, 121, 120, 120, 120, 120,
51+
119, 119, 119, 118, 118, 118, 118, 117, 117, 117, 116, 116, 116, 115, 115, 115,
52+
114, 114, 114, 113, 113, 113, 112, 112, 112, 111, 111, 111, 110, 110, 109, 109,
53+
109, 108, 108, 107, 107, 106, 106, 106, 105, 105, 104, 104, 103, 103, 102, 102,
54+
102, 101, 101, 100, 100, 99, 99, 98, 98, 97, 97, 96, 96, 95, 95, 94, 94, 93, 93,
55+
92, 91, 91, 90, 90, 89, 89, 88, 88, 87, 86, 86, 85, 85, 84, 84, 83, 82, 82, 81,
56+
81, 80, 79, 79, 78, 78, 77, 76, 76, 75, 74, 74, 73, 72, 72, 71, 71, 70, 69, 69,
57+
68, 67, 67, 66, 65, 65, 64, 63, 63, 62, 61, 61, 60, 59, 58, 58, 57, 56, 56, 55,
58+
54, 54, 53, 52, 51, 51, 50, 49, 49, 48, 47, 46, 46, 45, 44, 44, 43, 42, 41, 41,
59+
40, 39, 38, 38, 37, 36, 35, 35, 34, 33, 32, 32, 31, 30, 29, 29, 28, 27, 26, 26,
60+
25, 24, 23, 22, 22, 21, 20, 19, 19, 18, 17, 16, 16, 15, 14, 13, 12, 12, 11, 10,
61+
9, 9, 8, 7, 6, 5, 5, 4, 3, 2, 2, 1, 0, -1, -2, -2, -3, -4, -5, -5, -6, -7, -8,
62+
-9, -9, -10, -11, -12, -12, -13, -14, -15, -16, -16, -17, -18, -19, -19, -20,
63+
-21, -22, -22, -23, -24, -25, -26, -26, -27, -28, -29, -29, -30, -31, -32, -32,
64+
-33, -34, -35, -35, -36, -37, -38, -38, -39, -40, -41, -41, -42, -43, -44, -44,
65+
-45, -46, -46, -47, -48, -49, -49, -50, -51, -51, -52, -53, -54, -54, -55, -56,
66+
-56, -57, -58, -58, -59, -60, -61, -61, -62, -63, -63, -64, -65, -65, -66, -67,
67+
-67, -68, -69, -69, -70, -71, -71, -72, -72, -73, -74, -74, -75, -76, -76, -77,
68+
-78, -78, -79, -79, -80, -81, -81, -82, -82, -83, -84, -84, -85, -85, -86, -86,
69+
-87, -88, -88, -89, -89, -90, -90, -91, -91, -92, -93, -93, -94, -94, -95, -95,
70+
-96, -96, -97, -97, -98, -98, -99, -99, -100, -100, -101, -101, -102, -102,
71+
-102, -103, -103, -104, -104, -105, -105, -106, -106, -106, -107, -107, -108,
72+
-108, -109, -109, -109, -110, -110, -111, -111, -111, -112, -112, -112, -113,
73+
-113, -113, -114, -114, -114, -115, -115, -115, -116, -116, -116, -117, -117,
74+
-117, -118, -118, -118, -118, -119, -119, -119, -120, -120, -120, -120, -121,
75+
-121, -121, -121, -122, -122, -122, -122, -122, -123, -123, -123, -123, -123,
76+
-124, -124, -124, -124, -124, -124, -125, -125, -125, -125, -125, -125, -125,
77+
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -127, -127,
78+
-127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127,
79+
};
80+
81+
#endif /* COS1024_INT8_H_ */

0 commit comments

Comments
 (0)