From 62893331f7c478fdfb04464637fac413007fb455 Mon Sep 17 00:00:00 2001 From: Christophe Jacquet Date: Sat, 5 Apr 2014 19:36:06 +0200 Subject: [PATCH] New filter settings --- src/generate_waveforms.py | 21 +++++++++++++++++---- src/rds.c | 33 ++++++++++++++++++++------------- src/waveforms.c | 2 +- src/waveforms.h | 2 +- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/src/generate_waveforms.py b/src/generate_waveforms.py index 0b4d318..0cfc55f 100755 --- a/src/generate_waveforms.py +++ b/src/generate_waveforms.py @@ -3,10 +3,10 @@ # This program uses Pydemod, see https://github.com/ChristopheJacquet/Pydemod import pydemod.app.rds as rds -import pydemod.modulation.am as am import numpy import scipy.io.wavfile as wavfile import io +import matplotlib.pyplot as plt sample_rate = 228000 @@ -29,16 +29,29 @@ def generate_bit_in_context(pattern, name): l = 96 count = 2 - shapedSamples = rds.unmodulated_signal(pattern, sample_rate) - out = shapedSamples #[offset:offset+l*count] + sample = numpy.zeros(3*l) + sample[l] = 1 + sample[2*l] = -1 + + # Apply the data-shaping filter + sf = rds.pulse_shaping_filter(96*8, 228000) + shapedSamples = numpy.convolve(sample, sf) + + +# shapedSamples = rds.unmodulated_signal(pattern, sample_rate) + + out = shapedSamples[528-288:528+288] #[offset:offset+l*count] + plt.plot(sf) + plt.plot(out) + plt.show() iout = (out * 20000./max(abs(out)) ).astype(numpy.dtype('>i2')) wavfile.write(u"waveform_{}.wav".format(name), sample_rate, iout) outc.write(u"float waveform_{name}[] = {{{values}}};\n\n".format( name = name, - values = u", ".join(map(unicode, out/3.)))) + values = u", ".join(map(unicode, out/2.5)))) # note: need to limit the amplitude so as not to saturate when the biphase # waveforms are summed diff --git a/src/rds.c b/src/rds.c index 437d858..f2391ca 100644 --- a/src/rds.c +++ b/src/rds.c @@ -42,6 +42,7 @@ struct { #define BITS_PER_GROUP (GROUP_LENGTH * (BLOCK_SIZE+POLY_DEG)) #define SAMPLES_PER_BIT 192 #define FILTER_SIZE (sizeof(waveform_biphase)/sizeof(float)) +#define SAMPLE_BUFFER_SIZE (8*SAMPLES_PER_BIT) uint16_t offset_words[] = {0x0FC, 0x198, 0x168, 0x1B4}; @@ -118,7 +119,7 @@ void get_rds_group(int *buffer) { void get_rds_samples(float *buffer, int count) { static int bit_buffer[BITS_PER_GROUP]; static int bit_pos = BITS_PER_GROUP; - static float sample_buffer[2*FILTER_SIZE] = {0}; + static float sample_buffer[SAMPLE_BUFFER_SIZE] = {0}; static int prev_output = 0; static int cur_output = 0; @@ -128,7 +129,7 @@ void get_rds_samples(float *buffer, int count) { static int phase = 0; static int in_sample_index = 0; - static int out_sample_index = FILTER_SIZE; + static int out_sample_index = 0; for(int i=0; i= SAMPLES_PER_BIT) { @@ -142,21 +143,27 @@ void get_rds_samples(float *buffer, int count) { prev_output = cur_output; cur_output = prev_output ^ cur_bit; - inverting = (cur_output == 1) ? 1 : -1; + inverting = (cur_output == 1); + + // zero out last bit + int idx = in_sample_index-1; + for(int j=0; j= 2*FILTER_SIZE) idx = 0; + float val = (*src++); + if(inverting) val = -val; + sample_buffer[idx++] += val; + if(idx >= SAMPLE_BUFFER_SIZE) idx = 0; } in_sample_index += SAMPLES_PER_BIT; - if(in_sample_index >= 2*FILTER_SIZE) in_sample_index -= 2*FILTER_SIZE; + if(in_sample_index >= SAMPLE_BUFFER_SIZE) in_sample_index -= SAMPLE_BUFFER_SIZE; bit_pos++; sample_count = 0; @@ -164,7 +171,7 @@ void get_rds_samples(float *buffer, int count) { } float sample = sample_buffer[out_sample_index++]; - if(out_sample_index >= 2*FILTER_SIZE) out_sample_index = 0; + if(out_sample_index >= SAMPLE_BUFFER_SIZE) out_sample_index = 0; // modulate at 57 kHz // use phase for this diff --git a/src/waveforms.c b/src/waveforms.c index d0dfa92..e21644d 100644 --- a/src/waveforms.c +++ b/src/waveforms.c @@ -4,5 +4,5 @@ Released under the GNU GPL v3 license. */ -float waveform_biphase[] = {0.00673677718983, 0.00679403642502, 0.00682273973009, 0.0068221446506, 0.00679161421102, 0.00673062170707, 0.00663875516691, 0.00651572145826, 0.00636135001898, 0.00617559619029, 0.00595854413228, 0.00571040930293, 0.00543154048285, 0.00512242132959, 0.00478367144641, 0.00441604695219, 0.00402044054066, 0.00359788101852, 0.00314953231408, 0.00267669194955, 0.00218078897186, 0.00166338133892, 0.00112615275998, 0.000570908990579, -4.26415203366e-07, -0.00058581689098, -0.00118311817613, -0.00179008415739, -0.00240437322365, -0.00302355512147, -0.00364511829711, -0.00426647770892, -0.00488498309177, -0.00549792765372, -0.00610255718298, -0.00669607954159, -0.00727567452055, -0.00783850402925, -0.00838172259088, -0.00890248811335, -0.00939797290455, -0.00986537489873, -0.01030192906, -0.0107049189277, -0.0110716882667, -0.0113996527865, -0.011686311889, -0.0119292604081, -0.0121262003005, -0.0122749522468, -0.0123734671251, -0.0124198373133, -0.0124123077826, -0.0123492869383, -0.01222935717, -0.01205128507, -0.0118140312798, -0.0115167599257, -0.0111588476057, -0.0107398918895, -0.0102597192944, -0.00971839270307, -0.0091162181877, -0.00845375120797, -0.00773180215162, -0.00695144118772, -0.00611400240464, -0.00522108720651, -0.00427456694399, -0.00327658475718, -0.00222955661067, -0.00113617150305, 6.09164687691e-07, 0.0011775530746, 0.00239115934186, 0.00363766173719, 0.0049130327871, 0.00621298875462, 0.00753299550052, 0.00886827522218, 0.0102138140648, 0.0115643705966, 0.0129144851367, 0.0142584899227, 0.0155905200998, 0.0169045255146, 0.0181942832888, 0.0194534111497, 0.0206753814906, 0.0218535361293, 0.0229811017341, 0.0240512058817, 0.0250568937092, 0.025991145122, 0.026846892515, 0.0208802617733, 0.0215004404114, 0.0220493670614, 0.02252071244, 0.0229080889852, 0.0232050658842, 0.0234051846015, 0.0235019748787, 0.0234889711696, 0.0233597294773, 0.0231078445553, 0.0227269674344, 0.0222108232336, 0.0215532292157, 0.0207481130415, 0.0197895311804, 0.0186716874303, 0.0173889514999, 0.0159358776071, 0.0143072230431, 0.0124979666534, 0.0105033271864, 0.0083187814584, 0.00594008228468, 0.00336327612503, 0.00058472039374, -0.00239889961774, -0.00559055425582, -0.00899285350785, -0.0126080315432, -0.0164379318415, -0.0204839929563, -0.0247472349616, -0.029228246628, -0.0339271733732, -0.0388437060308, -0.0439770704793, -0.0493260181727, -0.0548888176114, -0.0606632467894, -0.0666465866542, -0.0728356156114, -0.079226605105, -0.085815316301, -0.0925969979009, -0.0995663851079, -0.106717699766, -0.114044651692, -0.12154044121, -0.129197762907, -0.137008810616, -0.144965283632, -0.153058394164, -0.161278876022, -0.169616994542, -0.178062557734, -0.186604928652, -0.195233038959, -0.203935403694, -0.212700137198, -0.221514970197, -0.230367267995, -0.239244049773, -0.248132008943, -0.257017534529, -0.265886733544, -0.27472545431, -0.283519310685, -0.292253707156, -0.300913864739, -0.309484847638, -0.317951590619, -0.326298927026, -0.334511617403, -0.342574378617, -0.350471913529, -0.358188940969, -0.365710226133, -0.37302061123, -0.38010504633, -0.386948620366, -0.393536592196, -0.399854421664, -0.405887800591, -0.411622683621, -0.417045318846, -0.422142278147, -0.42690048717, -0.431307254869, -0.435350302545, -0.439017792314, -0.442298354922, -0.445181116853, -0.447655726654, -0.449712380411, -0.451341846316, -0.452535488256, -0.45328528837, -0.45358386851, -0.453424510549, -0.452801175487, -0.4517085213, -0.450141919481, -0.448097470229, -0.445572016247, -0.442563155103, -0.439069250116, -0.435089439737, -0.430623645404, -0.425672577819, -0.420237741654, -0.414321438639, -0.407926769046, -0.401057631521, -0.393718721294, -0.385915526733, -0.377654324254, -0.368942171597, -0.359786899457, -0.350197101502, -0.340182122778, -0.329752046534, -0.318917679448, -0.307690535391, -0.296082817584, -0.284107399358, -0.271777803435, -0.259108179838, -0.246113282433, -0.232808444176, -0.219209551108, -0.205333015151, -0.191195745759, -0.176815120496, -0.162208954589, -0.147395469529, -0.132393260789, -0.11722126472, -0.101898724703, -0.0864451566369, -0.0708803138172, -0.0552241513045, -0.0394967898461, -0.0237184794354, -0.00790956258758, 0.00790956258758, 0.0237184794354, 0.0394967898461, 0.0552241513045, 0.0708803138172, 0.0864451566369, 0.101898724703, 0.11722126472, 0.132393260789, 0.147395469529, 0.162208954589, 0.176815120496, 0.191195745759, 0.205333015151, 0.219209551108, 0.232808444176, 0.246113282433, 0.259108179838, 0.271777803435, 0.284107399358, 0.296082817584, 0.307690535391, 0.318917679448, 0.329752046534, 0.340182122778, 0.350197101502, 0.359786899457, 0.368942171597, 0.377654324254, 0.385915526733, 0.393718721294, 0.401057631521, 0.407926769046, 0.414321438639, 0.420237741654, 0.425672577819, 0.430623645404, 0.435089439737, 0.439069250116, 0.442563155103, 0.445572016247, 0.448097470229, 0.450141919481, 0.4517085213, 0.452801175487, 0.453424510549, 0.45358386851, 0.45328528837, 0.452535488256, 0.451341846316, 0.449712380411, 0.447655726654, 0.445181116853, 0.442298354922, 0.439017792314, 0.435350302545, 0.431307254869, 0.42690048717, 0.422142278147, 0.417045318846, 0.411622683621, 0.405887800591, 0.399854421664, 0.393536592196, 0.386948620366, 0.38010504633, 0.37302061123, 0.365710226133, 0.358188940969, 0.350471913529, 0.342574378617, 0.334511617403, 0.326298927026, 0.317951590619, 0.309484847638, 0.300913864739, 0.292253707156, 0.283519310685, 0.27472545431, 0.265886733544, 0.257017534529, 0.248132008943, 0.239244049773, 0.230367267995, 0.221514970197, 0.212700137198, 0.203935403694, 0.195233038959, 0.186604928652, 0.178062557734, 0.169616994542, 0.161278876022, 0.153058394164, 0.144965283632, 0.137008810616, 0.129197762907, 0.12154044121, 0.114044651692, 0.106717699766, 0.0995663851079, 0.0925969979009, 0.085815316301, 0.079226605105, 0.0728356156114, 0.0666465866542, 0.0606632467894, 0.0548888176114, 0.0493260181727, 0.0439770704793, 0.0388437060308, 0.0339271733732, 0.029228246628, 0.0247472349616, 0.0204839929563, 0.0164379318415, 0.0126080315432, 0.00899285350785, 0.00559055425582, 0.00239889961774, -0.00058472039374, -0.00336327612503, -0.00594008228468, -0.0083187814584, -0.0105033271864, -0.0124979666534, -0.0143072230431, -0.0159358776071, -0.0173889514999, -0.0186716874303, -0.0197895311804, -0.0207481130415, -0.0215532292157, -0.0222108232336, -0.0227269674344, -0.0231078445553, -0.0233597294773, -0.0234889711696, -0.0235019748787, -0.0234051846015, -0.0232050658842, -0.0229080889852, -0.02252071244, -0.0220493670614, -0.0215004404114, -0.0276170389631, -0.026846892515, -0.025991145122, -0.0250568937092, -0.0240512058817, -0.0229811017341, -0.0218535361293, -0.0206753814906, -0.0194534111497, -0.0181942832888, -0.0169045255146, -0.0155905200998, -0.0142584899227, -0.0129144851367, -0.0115643705966, -0.0102138140648, -0.00886827522218, -0.00753299550052, -0.00621298875462, -0.0049130327871, -0.00363766173719, -0.00239115934186, -0.0011775530746, -6.09164687691e-07, 0.00113617150305, 0.00222955661067, 0.00327658475718, 0.00427456694399, 0.00522108720651, 0.00611400240464, 0.00695144118772, 0.00773180215162, 0.00845375120797, 0.0091162181877, 0.00971839270307, 0.0102597192944, 0.0107398918895, 0.0111588476057, 0.0115167599257, 0.0118140312798, 0.01205128507, 0.01222935717, 0.0123492869383, 0.0124123077826, 0.0124198373133, 0.0123734671251, 0.0122749522468, 0.0121262003005, 0.0119292604081, 0.011686311889, 0.0113996527865, 0.0110716882667, 0.0107049189277, 0.01030192906, 0.00986537489873, 0.00939797290455, 0.00890248811335, 0.00838172259088, 0.00783850402925, 0.00727567452055, 0.00669607954159, 0.00610255718298, 0.00549792765372, 0.00488498309177, 0.00426647770892, 0.00364511829711, 0.00302355512147, 0.00240437322365, 0.00179008415739, 0.00118311817613, 0.00058581689098, 4.26415203366e-07, -0.000570908990579, -0.00112615275998, -0.00166338133892, -0.00218078897186, -0.00267669194955, -0.00314953231408, -0.00359788101852, -0.00402044054066, -0.00441604695219, -0.00478367144641, -0.00512242132959, -0.00543154048285, -0.00571040930293, -0.00595854413228, -0.00617559619029, -0.00636135001898, -0.00651572145826, -0.00663875516691, -0.00673062170707, -0.00679161421102, -0.0068221446506, -0.00682273973009, -0.00679403642502, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; +float waveform_biphase[] = {0.00253265133022, 0.00255504491037, 0.00256667102126, 0.0025672385497, 0.00255649674667, 0.00253423716573, 0.00250029547253, 0.00245455311551, 0.00239693884806, 0.00232743009314, 0.00224605414143, 0.00215288917468, 0.00204806510656, 0.00193176423352, 0.00180422168917, 0.00166572569587, 0.00151661760823, 0.00135729174364, 0.00118819499588, 0.00100982622839, 0.000822735444702, 0.000627522734284, 0.000424836992883, 0.000215374417197, -1.23225298158e-07, -0.000220870549765, -0.000446040728168, -0.000674767880774, -0.000906149680707, -0.00113925016637, -0.00137310275567, -0.00160671345499, -0.00183906425517, -0.00206911670572, -0.00229581565752, -0.00251809316382, -0.00273487252813, -0.00294507248686, -0.0031476115141, -0.00334141223473, -0.0035254059317, -0.00369853713255, -0.00385976825946, -0.00400808432674, -0.00414249766903, -0.00426205268297, -0.00436583056466, -0.00445295402495, -0.00452259196407, -0.00457396408696, -0.00460634544047, -0.00461907085337, -0.00461153926002, -0.00458321788861, -0.00453364629481, -0.00446244022186, -0.0043692952683, -0.00425399034471, -0.0041163909013, -0.00395645190841, -0.00377422057251, -0.0035698387709, -0.00334354518872, -0.00309567714275, -0.00282667207705, -0.00253706871632, -0.00222750786389, -0.00189873283191, -0.00155158949247, -0.0011870259394, -0.000806091751623, -0.000409936849938, 1.90059383236e-07, 0.00042294345989, 0.000856883423268, 0.00130047843362, 0.00175210863919, 0.00221006953169, 0.00267257605183, 0.00313776711824, 0.0036037105756, 0.00406840855594, 0.00452980324611, 0.00498578305229, 0.00543418915128, 0.00587282241677, 0.00629945070701, 0.00671181649912, 0.00710764485348, 0.00748465169059, 0.00784055236082, 0.00817307048659, 0.00847994705483, 0.00875894973632, 0.00900788240743, 0.00922459484812, 0.00940699258958, 0.00955304688301, 0.00966080476069, 0.00972839915915, 0.00975405907344, 0.00973611971083, 0.00967303261139, 0.00956337570235, 0.00940586325271, 0.00919935569384, 0.00894286927184, 0.00863558549687, 0.00827686035476, 0.00786623324593, 0.00740343561706, 0.00688839925073, 0.00632126417893, 0.00570238618641, 0.00503234387065, 0.0043119452256, 0.00354223371723, 0.00272449381977, 0.0018602559824, 0.000951300997274, -3.36259008787e-07, -0.000992363737284, -0.0020222298062, -0.00308712154498, -0.00418396376074, -0.00530941875093, -0.0064598868296, -0.00763150763453, -0.00882016223, -0.0100214760183, -0.011230822471, -0.0124433276877, -0.0136538757908, -0.0148571151577, -0.0160474654948, -0.0172191257514, -0.0183660828705, -0.0194821213717, -0.0205608337587, -0.0215956317392, -0.0225797582461, -0.0235063002445, -0.0243682023052, -0.0251582809259, -0.0258692395759, -0.0264936844398, -0.0270241408326, -0.0274530702548, -0.0277728880563, -0.0279759816737, -0.0280547294041, -0.0280015196764, -0.0278087707783, -0.0274689509968, -0.026974599126, -0.0263183452962, -0.0254929320749, -0.02449123579, -0.0233062880235, -0.0219312972225, -0.0203596703733, -0.0185850346832, -0.0166012592143, -0.0144024764108, -0.0119831034641, -0.00933786345535, -0.00646180621834, -0.0033503288631, 8.04098443393e-07, 0.00359544108347, 0.0074370242845, 0.0115285710889, 0.0158726561293, 0.0204713940206, 0.0253264228417, 0.0304388884133, 0.0358094294279, 0.041438163483, 0.0473246740673, 0.0534679985499, 0.0598666172177, 0.0665184434076, 0.0734208147742, 0.0805704857345, 0.0879636211267, 0.0955957911196, 0.103461967402, 0.111556520688, 0.119873219553, 0.128405230643, 0.137145120254, 0.146084857323, 0.155215817824, 0.164528790593, 0.174013984585, 0.18366103756, 0.193459026213, 0.203396477728, 0.213461382761, 0.223641209834, 0.233922921126, 0.244292989649, 0.254737417779, 0.265241757122, 0.275791129685, 0.286370250309, 0.296963450356, 0.307554702567, 0.318127647097, 0.328665618632, 0.339151674584, 0.349568624272, 0.359899059063, 0.37012538339, 0.380229846614, 0.39019457563, 0.400001608191, 0.40963292682, 0.419070493361, 0.428296283903, 0.437292324199, 0.446040725381, 0.45452371993, 0.462723697829, 0.470623242797, 0.478205168549, 0.485452554966, 0.492348784132, 0.498877576118, 0.505023024448, 0.510769631171, 0.516102341434, 0.521006577488, 0.525468272051, 0.529473900929, 0.533010514831, 0.536065770289, 0.538627959622, 0.540686039841, 0.542229660459, 0.543249190098, 0.543735741853, 0.543681197332, 0.543078229311, 0.541920322948, 0.540201795495, 0.537917814453, 0.535064414122, 0.5316385105, 0.527637914479, 0.523061343309, 0.51790843029, 0.512179732652, 0.505876737611, 0.499001866561, 0.491558477398, 0.483550864942, 0.474984259467, 0.46586482332, 0.456199645625, 0.445996735085, 0.43526501088, 0.424014291681, 0.412255282783, 0.399999561397, 0.387259560081, 0.374048548451, 0.360380613021, 0.346270635398, 0.331734268754, 0.316787912671, 0.301448686393, 0.28573440054, 0.269663527349, 0.253255169494, 0.236529027553, 0.219505366195, 0.202204979147, 0.184649153022, 0.166859630089, 0.148858570049, 0.13066851092, 0.112312329091, 0.0938131986527, 0.0751945500785, 0.0564800283494, 0.0376934506144, 0.018858763477, 0.0, -0.018858763477, -0.0376934506144, -0.0564800283494, -0.0751945500785, -0.0938131986527, -0.112312329091, -0.13066851092, -0.148858570049, -0.166859630089, -0.184649153022, -0.202204979147, -0.219505366195, -0.236529027553, -0.253255169494, -0.269663527349, -0.28573440054, -0.301448686393, -0.316787912671, -0.331734268754, -0.346270635398, -0.360380613021, -0.374048548451, -0.387259560081, -0.399999561397, -0.412255282783, -0.424014291681, -0.43526501088, -0.445996735085, -0.456199645625, -0.46586482332, -0.474984259467, -0.483550864942, -0.491558477398, -0.499001866561, -0.505876737611, -0.512179732652, -0.51790843029, -0.523061343309, -0.527637914479, -0.5316385105, -0.535064414122, -0.537917814453, -0.540201795495, -0.541920322948, -0.543078229311, -0.543681197332, -0.543735741853, -0.543249190098, -0.542229660459, -0.540686039841, -0.538627959622, -0.536065770289, -0.533010514831, -0.529473900929, -0.525468272051, -0.521006577488, -0.516102341434, -0.510769631171, -0.505023024448, -0.498877576118, -0.492348784132, -0.485452554966, -0.478205168549, -0.470623242797, -0.462723697829, -0.45452371993, -0.446040725381, -0.437292324199, -0.428296283903, -0.419070493361, -0.40963292682, -0.400001608191, -0.39019457563, -0.380229846614, -0.37012538339, -0.359899059063, -0.349568624272, -0.339151674584, -0.328665618632, -0.318127647097, -0.307554702567, -0.296963450356, -0.286370250309, -0.275791129685, -0.265241757122, -0.254737417779, -0.244292989649, -0.233922921126, -0.223641209834, -0.213461382761, -0.203396477728, -0.193459026213, -0.18366103756, -0.174013984585, -0.164528790593, -0.155215817824, -0.146084857323, -0.137145120254, -0.128405230643, -0.119873219553, -0.111556520688, -0.103461967402, -0.0955957911196, -0.0879636211267, -0.0805704857345, -0.0734208147742, -0.0665184434076, -0.0598666172177, -0.0534679985499, -0.0473246740673, -0.041438163483, -0.0358094294279, -0.0304388884133, -0.0253264228417, -0.0204713940206, -0.0158726561293, -0.0115285710889, -0.0074370242845, -0.00359544108347, -8.04098443393e-07, 0.0033503288631, 0.00646180621834, 0.00933786345535, 0.0119831034641, 0.0144024764108, 0.0166012592143, 0.0185850346832, 0.0203596703733, 0.0219312972225, 0.0233062880235, 0.02449123579, 0.0254929320749, 0.0263183452962, 0.026974599126, 0.0274689509968, 0.0278087707783, 0.0280015196764, 0.0280547294041, 0.0279759816737, 0.0277728880563, 0.0274530702548, 0.0270241408326, 0.0264936844398, 0.0258692395759, 0.0251582809259, 0.0243682023052, 0.0235063002445, 0.0225797582461, 0.0215956317392, 0.0205608337587, 0.0194821213717, 0.0183660828705, 0.0172191257514, 0.0160474654948, 0.0148571151577, 0.0136538757908, 0.0124433276877, 0.011230822471, 0.0100214760183, 0.00882016223, 0.00763150763453, 0.0064598868296, 0.00530941875093, 0.00418396376074, 0.00308712154498, 0.0020222298062, 0.000992363737284, 3.36259008787e-07, -0.000951300997274, -0.0018602559824, -0.00272449381977, -0.00354223371723, -0.0043119452256, -0.00503234387065, -0.00570238618641, -0.00632126417893, -0.00688839925073, -0.00740343561706, -0.00786623324593, -0.00827686035476, -0.00863558549687, -0.00894286927184, -0.00919935569384, -0.00940586325271, -0.00956337570235, -0.00967303261139, -0.00973611971083, -0.00975405907344, -0.00972839915915, -0.00966080476069, -0.00955304688301, -0.00940699258958, -0.00922459484812, -0.00900788240743, -0.00875894973632, -0.00847994705483, -0.00817307048659, -0.00784055236082, -0.00748465169059, -0.00710764485348, -0.00671181649912, -0.00629945070701, -0.00587282241677, -0.00543418915128, -0.00498578305229, -0.00452980324611, -0.00406840855594, -0.0036037105756, -0.00313776711824, -0.00267257605183, -0.00221006953169, -0.00175210863919, -0.00130047843362, -0.000856883423268, -0.00042294345989, -1.90059383236e-07, 0.000409936849938, 0.000806091751623, 0.0011870259394, 0.00155158949247, 0.00189873283191, 0.00222750786389, 0.00253706871632, 0.00282667207705, 0.00309567714275, 0.00334354518872, 0.0035698387709, 0.00377422057251, 0.00395645190841, 0.0041163909013, 0.00425399034471, 0.0043692952683, 0.00446244022186, 0.00453364629481, 0.00458321788861, 0.00461153926002, 0.00461907085337, 0.00460634544047, 0.00457396408696, 0.00452259196407, 0.00445295402495, 0.00436583056466, 0.00426205268297, 0.00414249766903, 0.00400808432674, 0.00385976825946, 0.00369853713255, 0.0035254059317, 0.00334141223473, 0.0031476115141, 0.00294507248686, 0.00273487252813, 0.00251809316382, 0.00229581565752, 0.00206911670572, 0.00183906425517, 0.00160671345499, 0.00137310275567, 0.00113925016637, 0.000906149680707, 0.000674767880774, 0.000446040728168, 0.000220870549765, 1.23225298158e-07, -0.000215374417197, -0.000424836992883, -0.000627522734284, -0.000822735444702, -0.00100982622839, -0.00118819499588, -0.00135729174364, -0.00151661760823, -0.00166572569587, -0.00180422168917, -0.00193176423352, -0.00204806510656, -0.00215288917468, -0.00224605414143, -0.00232743009314, -0.00239693884806, -0.00245455311551, -0.00250029547253, -0.00253423716573, -0.00255649674667, -0.0025672385497, -0.00256667102126, -0.00255504491037}; diff --git a/src/waveforms.h b/src/waveforms.h index f12c9b7..745705c 100644 --- a/src/waveforms.h +++ b/src/waveforms.h @@ -4,4 +4,4 @@ Released under the GNU GPL v3 license. */ -extern float waveform_biphase[575]; +extern float waveform_biphase[576];