p_ac.py, p_ac.yml : Added use of VelTablePlayer,NoteTester,PolyNoteTester,ChordTester
among other changes.
This commit is contained in:
kevin
parent
ca030abcf5
commit
55695164b5
165
p_ac.py
165
p_ac.py
@ -19,6 +19,10 @@ from keyboard import Keyboard
|
|||||||
from calibrate import Calibrate
|
from calibrate import Calibrate
|
||||||
from rms_analysis import rms_analyze_one_rt_note_wrap
|
from rms_analysis import rms_analyze_one_rt_note_wrap
|
||||||
from MidiFilePlayer import MidiFilePlayer
|
from MidiFilePlayer import MidiFilePlayer
|
||||||
|
from VelTablePlayer import VelTablePlayer
|
||||||
|
from NoteTester import NoteTester
|
||||||
|
from PolyNoteTester import PolyNoteTester
|
||||||
|
from ChordTester import ChordTester
|
||||||
|
|
||||||
class AttackPulseSeq:
|
class AttackPulseSeq:
|
||||||
""" Sequence a fixed pitch over a list of attack pulse lengths."""
|
""" Sequence a fixed pitch over a list of attack pulse lengths."""
|
||||||
@ -33,7 +37,7 @@ class AttackPulseSeq:
|
|||||||
self.noteDurMs = noteDurMs # duration of each chord in milliseconds
|
self.noteDurMs = noteDurMs # duration of each chord in milliseconds
|
||||||
self.pauseDurMs = pauseDurMs # duration between end of previous note and start of next
|
self.pauseDurMs = pauseDurMs # duration between end of previous note and start of next
|
||||||
self.holdDutyPctL= None # hold voltage duty cycle table [ (minPulseSeqUsec,dutyCyclePct) ]
|
self.holdDutyPctL= None # hold voltage duty cycle table [ (minPulseSeqUsec,dutyCyclePct) ]
|
||||||
self.holdDutyPctD= None # { us:dutyPct } for each us in self.pulseUsL
|
self.holdDutyPctD= None # { us:dutyPct } for each us in self.pulseUsL
|
||||||
self.silentNoteN = None
|
self.silentNoteN = None
|
||||||
self.pulse_idx = 0 # Index of next pulse
|
self.pulse_idx = 0 # Index of next pulse
|
||||||
self.state = None # 'note_on','note_off'
|
self.state = None # 'note_on','note_off'
|
||||||
@ -45,25 +49,28 @@ class AttackPulseSeq:
|
|||||||
self.rtAnalyzer = RT_Analyzer()
|
self.rtAnalyzer = RT_Analyzer()
|
||||||
|
|
||||||
def start( self, ms, outDir, pitch, pulseUsL, holdDutyPctL, holdDutyPctD, playOnlyFl=False ):
|
def start( self, ms, outDir, pitch, pulseUsL, holdDutyPctL, holdDutyPctD, playOnlyFl=False ):
|
||||||
self.outDir = outDir # directory to write audio file and results
|
self.outDir = outDir # directory to write audio file and results
|
||||||
self.pitch = pitch # note to play
|
self.pitch = pitch # note to play
|
||||||
self.pulseUsL = pulseUsL # one onset pulse length in microseconds per sequence element
|
self.pulseUsL = pulseUsL # one onset pulse length in microseconds per sequence element
|
||||||
self.holdDutyPctL = holdDutyPctL
|
self.holdDutyPctL = holdDutyPctL
|
||||||
self.holdDutyPctD = holdDutyPctD
|
self.holdDutyPctD = holdDutyPctD
|
||||||
self.silentNoteN = 0
|
self.silentNoteN = 0
|
||||||
self.pulse_idx = 0
|
self.pulse_idx = 0
|
||||||
self.state = 'note_on'
|
self.state = 'note_on'
|
||||||
self.prevHoldDutyPct = None
|
self.prevHoldDutyPct = None
|
||||||
self.next_ms = ms + 500 # wait for 500ms to play the first note (this will guarantee that there is some empty space in the audio file before the first note)
|
self.next_ms = ms + 500 # wait for 500ms to play the first note (this will guarantee that there is some empty space in the audio file before the first note)
|
||||||
self.eventTimeL = [[0,0] for _ in range(len(pulseUsL))] # initialize the event time
|
self.eventTimeL = [[0,0] for _ in range(len(pulseUsL))] # initialize the event time
|
||||||
self.beginMs = ms
|
self.beginMs = ms
|
||||||
self.playOnlyFl = playOnlyFl
|
self.playOnlyFl = playOnlyFl
|
||||||
|
|
||||||
# kpl if not playOnlyFl:
|
# kpl if not playOnlyFl:
|
||||||
self.audio.record_enable(True) # start recording audio
|
self.audio.record_enable(True) # start recording audio
|
||||||
|
|
||||||
print("Hold Delay from end of attack:",cfg.defaultHoldDelayUsecs)
|
#print("Hold Delay from end of attack:",cfg.defaultHoldDelayUsecs)
|
||||||
self.api.set_hold_delay(pitch,cfg.defaultHoldDelayUsecs)
|
# self.api.set_hold_delay(pitch,cfg.defaultHoldDelayUsecs)
|
||||||
|
|
||||||
|
self.api.set_hold_duty(pitch,35)
|
||||||
|
print("Hold Duty Cycle=35.")
|
||||||
|
|
||||||
self.tick(ms) # play the first note
|
self.tick(ms) # play the first note
|
||||||
|
|
||||||
@ -128,14 +135,35 @@ class AttackPulseSeq:
|
|||||||
|
|
||||||
def _set_duty_cycle( self, pitch, pulseUsec ):
|
def _set_duty_cycle( self, pitch, pulseUsec ):
|
||||||
|
|
||||||
|
if False:
|
||||||
|
dutyPct = self._get_duty_cycle( pulseUsec )
|
||||||
|
|
||||||
dutyPct = self._get_duty_cycle( pulseUsec )
|
if dutyPct != self.prevHoldDutyPct:
|
||||||
|
# self.api.set_pwm_duty( pitch, dutyPct )
|
||||||
|
# print("Hold Duty:",dutyPct)
|
||||||
|
pass
|
||||||
|
|
||||||
if dutyPct != self.prevHoldDutyPct:
|
self.prevHoldDutyPct = dutyPct
|
||||||
self.api.set_pwm_duty( pitch, dutyPct )
|
|
||||||
print("Hold Duty:",dutyPct)
|
if False:
|
||||||
|
maxLevel = 64 # 225 # 64
|
||||||
|
minLevel = 24 # 89 # 24
|
||||||
|
maxUsec = 10000
|
||||||
|
minUsec = 2500
|
||||||
|
decayLevel = maxLevel
|
||||||
|
|
||||||
|
if pulseUsec < maxUsec and pulseUsec >= minUsec:
|
||||||
|
decayLevel = minLevel + ((pulseUsec-minUsec)/(maxUsec-minUsec)) * (maxLevel-minLevel)
|
||||||
|
else:
|
||||||
|
if pulseUsec < minUsec:
|
||||||
|
decayLevel = minLevel
|
||||||
|
|
||||||
|
decayLevel = int(decayLevel)
|
||||||
|
|
||||||
|
decayLevel = self.api.calc_decay_level( pulseUsec )
|
||||||
|
self.api.set_decay_level( pitch, decayLevel )
|
||||||
|
print("Decay Level:", decayLevel)
|
||||||
|
|
||||||
self.prevHoldDutyPct = dutyPct
|
|
||||||
|
|
||||||
def _note_on( self, ms ):
|
def _note_on( self, ms ):
|
||||||
|
|
||||||
@ -144,9 +172,13 @@ class AttackPulseSeq:
|
|||||||
self.state = 'note_off'
|
self.state = 'note_off'
|
||||||
|
|
||||||
pulse_usec = int(self.pulseUsL[ self.pulse_idx ])
|
pulse_usec = int(self.pulseUsL[ self.pulse_idx ])
|
||||||
self._set_duty_cycle( self.pitch, pulse_usec )
|
|
||||||
|
# decay_level = self.api.calc_decay_level( pulse_usec )
|
||||||
|
|
||||||
|
#self._set_duty_cycle( self.pitch, pulse_usec )
|
||||||
|
|
||||||
self.api.note_on_us( self.pitch, pulse_usec )
|
self.api.note_on_us( self.pitch, pulse_usec )
|
||||||
print("note-on:",self.pitch, self.pulse_idx, pulse_usec)
|
print("note-on:",self.pitch, self.pulse_idx, pulse_usec, "dcy:", decay_level)
|
||||||
|
|
||||||
def _note_off( self, ms ):
|
def _note_off( self, ms ):
|
||||||
self.eventTimeL[ self.pulse_idx ][1] = self.audio.buffer_sample_ms().value
|
self.eventTimeL[ self.pulse_idx ][1] = self.audio.buffer_sample_ms().value
|
||||||
@ -209,7 +241,7 @@ class CalibrateKeys:
|
|||||||
self.pulseUsL = pulseUsL
|
self.pulseUsL = pulseUsL
|
||||||
self.pitchL = pitchL
|
self.pitchL = pitchL
|
||||||
self.pitch_idx = -1
|
self.pitch_idx = -1
|
||||||
self._start_next_note( ms, playOnlyFl )
|
self._start_next_seq( ms, playOnlyFl )
|
||||||
|
|
||||||
|
|
||||||
def stop( self, ms ):
|
def stop( self, ms ):
|
||||||
@ -225,11 +257,11 @@ class CalibrateKeys:
|
|||||||
|
|
||||||
# if the sequencer is done playing
|
# if the sequencer is done playing
|
||||||
if not self.seq.is_enabled():
|
if not self.seq.is_enabled():
|
||||||
self._start_next_note( ms, self.seq.playOnlyFl ) # ... else start the next sequence
|
self._start_next_seq( ms, self.seq.playOnlyFl ) # ... else start the next sequence
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def _start_next_note( self, ms, playOnlyFl ):
|
def _start_next_seq( self, ms, playOnlyFl ):
|
||||||
|
|
||||||
self.pitch_idx += 1
|
self.pitch_idx += 1
|
||||||
|
|
||||||
@ -253,8 +285,6 @@ class CalibrateKeys:
|
|||||||
# get the next available output directory id
|
# get the next available output directory id
|
||||||
outDir_id = self._calc_next_out_dir_id( outDir )
|
outDir_id = self._calc_next_out_dir_id( outDir )
|
||||||
|
|
||||||
print(outDir_id,outDir)
|
|
||||||
|
|
||||||
# if this is not the first time this note has been sampled then get the resample locations
|
# if this is not the first time this note has been sampled then get the resample locations
|
||||||
if (outDir_id == 0) or self.cfg.useFullPulseListFl:
|
if (outDir_id == 0) or self.cfg.useFullPulseListFl:
|
||||||
self.pulseUsL = self.cfg.full_pulseL
|
self.pulseUsL = self.cfg.full_pulseL
|
||||||
@ -265,9 +295,10 @@ class CalibrateKeys:
|
|||||||
|
|
||||||
holdDutyPctL = self.cfg.calibrateArgs['holdDutyPctD'][pitch]
|
holdDutyPctL = self.cfg.calibrateArgs['holdDutyPctD'][pitch]
|
||||||
|
|
||||||
|
# if playback of the current calibration was requested
|
||||||
if playOnlyFl:
|
if playOnlyFl:
|
||||||
|
|
||||||
|
# form the calibrated pulse list
|
||||||
self.pulseUsL,_,holdDutyPctL = form_final_pulse_list( baseDir, pitch, self.cfg.analysisArgs, take_id=None )
|
self.pulseUsL,_,holdDutyPctL = form_final_pulse_list( baseDir, pitch, self.cfg.analysisArgs, take_id=None )
|
||||||
|
|
||||||
noteN = cfg.analysisArgs['auditionNoteN']
|
noteN = cfg.analysisArgs['auditionNoteN']
|
||||||
@ -318,6 +349,10 @@ class App:
|
|||||||
self.keyboard = None
|
self.keyboard = None
|
||||||
self.calibrate = None
|
self.calibrate = None
|
||||||
self.midiFilePlayer = None
|
self.midiFilePlayer = None
|
||||||
|
self.velTablePlayer = None
|
||||||
|
self.noteTester = None
|
||||||
|
self.polyNoteTester = None
|
||||||
|
self.chordTester = None
|
||||||
|
|
||||||
def setup( self, cfg ):
|
def setup( self, cfg ):
|
||||||
self.cfg = cfg
|
self.cfg = cfg
|
||||||
@ -369,6 +404,15 @@ class App:
|
|||||||
|
|
||||||
self.midiFilePlayer = MidiFilePlayer( cfg, self.api, self.midiDev, cfg.midiFileFn )
|
self.midiFilePlayer = MidiFilePlayer( cfg, self.api, self.midiDev, cfg.midiFileFn )
|
||||||
|
|
||||||
|
self.velTablePlayer = VelTablePlayer( cfg, self.api, self.audioDev, self.cfg.calibrateArgs['holdDutyPctD'], "velMapD.json")
|
||||||
|
|
||||||
|
self.noteTester = NoteTester(cfg,self.api)
|
||||||
|
|
||||||
|
self.polyNoteTester = PolyNoteTester(cfg,self.api)
|
||||||
|
|
||||||
|
self.chordTester = ChordTester(cfg,self.api)
|
||||||
|
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def tick( self, ms ):
|
def tick( self, ms ):
|
||||||
@ -388,13 +432,30 @@ class App:
|
|||||||
if self.midiFilePlayer:
|
if self.midiFilePlayer:
|
||||||
self.midiFilePlayer.tick(ms)
|
self.midiFilePlayer.tick(ms)
|
||||||
|
|
||||||
|
if self.midiDev:
|
||||||
|
msgL = self.midiDev.get_input()
|
||||||
|
for msg in msgL:
|
||||||
|
print(msg['value']);
|
||||||
|
|
||||||
|
if self.velTablePlayer:
|
||||||
|
self.velTablePlayer.tick(ms)
|
||||||
|
|
||||||
|
if self.noteTester:
|
||||||
|
self.noteTester.tick(ms)
|
||||||
|
|
||||||
|
if self.polyNoteTester:
|
||||||
|
self.polyNoteTester.tick(ms)
|
||||||
|
|
||||||
|
if self.chordTester:
|
||||||
|
self.chordTester.tick(ms)
|
||||||
|
|
||||||
def audio_dev_list( self, ms ):
|
def audio_dev_list( self, ms ):
|
||||||
|
|
||||||
if self.audioDev is not None:
|
if self.audioDev is not None:
|
||||||
portL = self.audioDev.get_port_list( True )
|
portL = self.audioDev.get_port_list( True )
|
||||||
|
|
||||||
for port in portL:
|
for port in portL:
|
||||||
print("chs:%4i label:%s" % (port['chN'],port['label']))
|
print("chs:%4i label:'%s'" % (port['chN'],port['label']))
|
||||||
|
|
||||||
def midi_dev_list( self, ms ):
|
def midi_dev_list( self, ms ):
|
||||||
d = self.midiDev.get_port_list( True )
|
d = self.midiDev.get_port_list( True )
|
||||||
@ -447,6 +508,33 @@ class App:
|
|||||||
def midi_file_player_stop( self, ms ):
|
def midi_file_player_stop( self, ms ):
|
||||||
self.midiFilePlayer.stop(ms)
|
self.midiFilePlayer.stop(ms)
|
||||||
|
|
||||||
|
def vel_table_updown( self, ms, argL):
|
||||||
|
self.velTablePlayer.start(argL[0],argL[1],"updown")
|
||||||
|
|
||||||
|
def vel_table_across( self, ms, argL ):
|
||||||
|
self.velTablePlayer.start(argL[0],argL[1],"across")
|
||||||
|
|
||||||
|
def vel_table_stop( self, ms ):
|
||||||
|
self.velTablePlayer.stop()
|
||||||
|
|
||||||
|
def note_tester_start( self, ms ):
|
||||||
|
self.noteTester.start();
|
||||||
|
|
||||||
|
def note_tester_stop( self, ms ):
|
||||||
|
self.noteTester.stop();
|
||||||
|
|
||||||
|
def poly_note_tester_start( self, ms ):
|
||||||
|
self.polyNoteTester.start();
|
||||||
|
|
||||||
|
def poly_note_tester_stop( self, ms ):
|
||||||
|
self.polyNoteTester.stop();
|
||||||
|
|
||||||
|
def chord_tester_start( self, ms ):
|
||||||
|
self.chordTester.start()
|
||||||
|
|
||||||
|
def chord_tester_stop( self, ms ):
|
||||||
|
self.chordTester.stop()
|
||||||
|
|
||||||
def pedal_down( self, ms ):
|
def pedal_down( self, ms ):
|
||||||
print("pedal_down")
|
print("pedal_down")
|
||||||
self.midiDev.send_controller(64, 100 )
|
self.midiDev.send_controller(64, 100 )
|
||||||
@ -455,6 +543,12 @@ class App:
|
|||||||
print("pedal_up");
|
print("pedal_up");
|
||||||
self.midiDev.send_controller(64, 0 )
|
self.midiDev.send_controller(64, 0 )
|
||||||
|
|
||||||
|
def all_notes_off(self, ms):
|
||||||
|
self.api.all_notes_off();
|
||||||
|
|
||||||
|
def check_for_errors(self,ms):
|
||||||
|
self.api.check_for_serial_errors()
|
||||||
|
|
||||||
def quit( self, ms ):
|
def quit( self, ms ):
|
||||||
if self.api:
|
if self.api:
|
||||||
self.api.close()
|
self.api.close()
|
||||||
@ -587,8 +681,19 @@ class Shell:
|
|||||||
'R':{ "func":"keyboard_repeat_target_db", "minN":1, "maxN":1, "help":"Repeat db across keyboard with new pulse_idx"},
|
'R':{ "func":"keyboard_repeat_target_db", "minN":1, "maxN":1, "help":"Repeat db across keyboard with new pulse_idx"},
|
||||||
'F':{ "func":"midi_file_player_start", "minN":0, "maxN":0, "help":"Play the MIDI file."},
|
'F':{ "func":"midi_file_player_start", "minN":0, "maxN":0, "help":"Play the MIDI file."},
|
||||||
'f':{ "func":"midi_file_player_stop", "minN":0, "maxN":0, "help":"Stop the MIDI file."},
|
'f':{ "func":"midi_file_player_stop", "minN":0, "maxN":0, "help":"Stop the MIDI file."},
|
||||||
|
'V':{ "func":"vel_table_updown", "minN":2, "maxN":2, "help":"Play Velocity Table up/down - across."},
|
||||||
|
'A':{ "func":"vel_table_across", "minN":2, "maxN":2, "help":"Play Velocity Table across - up/down."},
|
||||||
|
'v':{ "func":"vel_table_stop", "minN":0, "maxN":0, "help":"Stop the velocity table playback."},
|
||||||
|
'N':{ "func":"note_tester_start", "minN":0, "maxN":0, "help":"Play a note using NoteTester."},
|
||||||
|
'n':{ "func":"note_tester_stop", "minN":0, "maxN":0, "help":"Stop NoteTester."},
|
||||||
|
'T':{ "func":"poly_note_tester_start", "minN":0, "maxN":0, "help":"Play random notes using PolyNoteTester."},
|
||||||
|
't':{ "func":"poly_note_tester_stop", "minN":0, "maxN":0, "help":"Stop NoteTester."},
|
||||||
|
'H':{ "func":"chord_tester_start", "minN":0, "maxN":0, "help":"Chord tester start."},
|
||||||
|
'h':{ "func":"chord_tester_stop", "minN":0, "maxN":0, "help":"Chord tester stop."},
|
||||||
'P':{ "func":"pedal_down", "minN":0, "maxN":0, "help":"Pedal down."},
|
'P':{ "func":"pedal_down", "minN":0, "maxN":0, "help":"Pedal down."},
|
||||||
'U':{ "func":"pedal_up", "minN":0, "maxN":0, "help":"Pedal up."},
|
'p':{ "func":"pedal_up", "minN":0, "maxN":0, "help":"Pedal up."},
|
||||||
|
'O':{ "func":"all_notes_off", "minN":0, "maxN":0, "help":"All notes off."},
|
||||||
|
'E':{ "func":"check_for_errors", "minN":0, "maxN":0, "help":"Check for errors."}
|
||||||
}
|
}
|
||||||
|
|
||||||
def _help( self, _=None ):
|
def _help( self, _=None ):
|
||||||
|
|||||||
355
p_ac.yml
355
p_ac.yml
@ -5,6 +5,7 @@
|
|||||||
# Audio device setup
|
# Audio device setup
|
||||||
audio: {
|
audio: {
|
||||||
inPortLabel: "8 USB Audio CODEC:", #"HDA Intel PCH: CS4208", # "5 USB Audio CODEC:", #"5 USB Sound Device",
|
inPortLabel: "8 USB Audio CODEC:", #"HDA Intel PCH: CS4208", # "5 USB Audio CODEC:", #"5 USB Sound Device",
|
||||||
|
#inPortLabel: "8 Scarlett 18i20 USB: Audio",
|
||||||
outPortLabel: ,
|
outPortLabel: ,
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -12,12 +13,62 @@
|
|||||||
inMonitorFl: False,
|
inMonitorFl: False,
|
||||||
outMonitorFl: False,
|
outMonitorFl: False,
|
||||||
throughFl: False,
|
throughFl: False,
|
||||||
inPortLabel: "Fastlane:Fastlane MIDI A",
|
#inPortLabel: "MIDI9/QRS PNOScan:MIDI9/QRS PNOScan MIDI 1",
|
||||||
outPortLabel: "Fastlane:Fastlane MIDI A"
|
#outPortLabel: "MIDI9/QRS PNOScan:MIDI9/QRS PNOScan MIDI 1"
|
||||||
|
#inPortLabel: "Fastlane:Fastlane MIDI A",
|
||||||
|
#outPortLabel: "Fastlane:Fastlane MIDI A",
|
||||||
#inPortLabel: "picadae:picadae MIDI 1",
|
#inPortLabel: "picadae:picadae MIDI 1",
|
||||||
#outPortLabel: "picadae:picadae MIDI 1"
|
#outPortLabel: "picadae:picadae MIDI 1"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
NoteTester:
|
||||||
|
{
|
||||||
|
noteCount: 200,
|
||||||
|
minNoteDurMs: 100,
|
||||||
|
maxNoteDurMs: 1000,
|
||||||
|
minPauseDurMs: 5,
|
||||||
|
maxPauseDurMs: 500,
|
||||||
|
pitch: 60,
|
||||||
|
minAttackUsec: 4000,
|
||||||
|
maxAttackUsec: 20000,
|
||||||
|
filename: "note_tester.json"
|
||||||
|
},
|
||||||
|
|
||||||
|
PolyNoteTester:
|
||||||
|
{
|
||||||
|
mode: "simple",
|
||||||
|
noteCount: 11,
|
||||||
|
minPitch: 21,
|
||||||
|
maxPitch: 31,
|
||||||
|
skipPitchL: [22,68,102],
|
||||||
|
minNoteDurMs: 1000,
|
||||||
|
maxNoteDurMs: 2000,
|
||||||
|
minInterOnsetMs: 100,
|
||||||
|
maxInterOnsetMs: 1000,
|
||||||
|
minAttackUsec: 4000,
|
||||||
|
maxAttackUsec: 20000,
|
||||||
|
holdDutyPct: 35,
|
||||||
|
|
||||||
|
},
|
||||||
|
|
||||||
|
ChordTester:
|
||||||
|
{
|
||||||
|
useVelTableFl: False,
|
||||||
|
#pitchL: [24,36,48,60,72,84,96],
|
||||||
|
#pitchL: [24,96,48,72,36,84,60],
|
||||||
|
#pitchL: [ 36,40,43,47, 48, 52, 55, 59],
|
||||||
|
#pitchL: [ 36,39,41,33 ],
|
||||||
|
pitchL: [ 21,23,24,25,26,27,28,29,30,31],
|
||||||
|
#pitchL: [ 36,33,35,34,37,40,43,42,38,39,41],
|
||||||
|
#pitchL: [ 43,44,45,46,47,48,49,50,51,52,53],
|
||||||
|
#pitchL: [ 54,55,56,57,58,59,60,61,62,63,64 ],
|
||||||
|
repeatCnt: 3,
|
||||||
|
atkUsec: 10000,
|
||||||
|
durMs: 1000,
|
||||||
|
pauseMs: 1000,
|
||||||
|
holdDuty: 35,
|
||||||
|
},
|
||||||
|
|
||||||
# Picadae API args
|
# Picadae API args
|
||||||
serial_dev: "/dev/ttyACM0",
|
serial_dev: "/dev/ttyACM0",
|
||||||
serial_baud: 38400,
|
serial_baud: 38400,
|
||||||
@ -28,11 +79,11 @@
|
|||||||
|
|
||||||
|
|
||||||
# MeasureSeq args
|
# MeasureSeq args
|
||||||
outDir: "~/temp/p_ac_3_of",
|
outDir: "~/temp/p_ac_3_ok",
|
||||||
noteDurMs: 500,
|
noteDurMs: 500,
|
||||||
pauseDurMs: 500,
|
pauseDurMs: 500,
|
||||||
reversePulseListFl: True,
|
reversePulseListFl: True,
|
||||||
useFullPulseListFl: True,
|
useFullPulseListFl: True, # don't select a new set of resample points based on the previous samples from this pitch
|
||||||
maxSilentNoteCount: 4,
|
maxSilentNoteCount: 4,
|
||||||
silentNoteMaxPulseUs: 15000,
|
silentNoteMaxPulseUs: 15000,
|
||||||
silentNoteMinDurMs: 180, #250,
|
silentNoteMinDurMs: 180, #250,
|
||||||
@ -40,7 +91,7 @@
|
|||||||
defaultHoldDelayUsecs: 1000,
|
defaultHoldDelayUsecs: 1000,
|
||||||
|
|
||||||
# Midi file player
|
# Midi file player
|
||||||
midiFileFn: "/home/kevin/media/audio/midi/txt/round4.txt",
|
midiFileFn: "/home/kevin/media/audio/midi/txt/988-v25.txt",
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -94,7 +145,26 @@
|
|||||||
full_pulse22L: [ 3500, 3750, 4000, 4250, 4500, 4750, 5000, 5250, 5500, 5750, 6000, 6250, 6500, 6750, 7000, 7500, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000 ],
|
full_pulse22L: [ 3500, 3750, 4000, 4250, 4500, 4750, 5000, 5250, 5500, 5750, 6000, 6250, 6500, 6750, 7000, 7500, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000 ],
|
||||||
|
|
||||||
# 60,72,84
|
# 60,72,84
|
||||||
full_pulseL: [ 2000, 2250, 2500,2750, 3000, 3250, 3500, 3750, 4000, 4250, 4500, 4750, 5000, 5250, 5500, 5750, 6000, 6250, 6500, 6750, 7000, 7500, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000, 22000 ],
|
full_pulse23L: [ 2000, 2250, 2500,2750, 3000, 3250, 3500, 3750, 4000, 4250, 4500, 4750, 5000, 5250, 5500, 5750, 6000, 6250, 6500, 6750, 7000, 7500, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000, 22000 ],
|
||||||
|
|
||||||
|
full_pulseL24: [ 5000, 5125, 5250, 5375, 5500, 5625, 5750, 5875, 6000, 6125, 6250, 6500, 6750, 7000, 7500, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000, 22000 ],
|
||||||
|
|
||||||
|
# 23-40
|
||||||
|
full_pulseL25: [ 3500, 3625, 3750, 3875, 4000, 4125, 4250, 4375, 4500, 4625, 4750, 4875, 5000, 5125, 5250, 5375, 5500, 5625, 5750, 5875, 6000, 6125, 6250, 6375, 6500, 6625, 6750, 6875, 7000, 7250, 7500, 7750, 8000, 8250, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000 ],
|
||||||
|
|
||||||
|
full_pulse25aL: [ 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350, 2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350, 3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850, 3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350, 4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850, 4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350, 5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850, 5900, 5950, 6000, 6125, 6250, 6375, 6500, 6625, 6750, 6875, 7000, 7250, 7500, 7750, 8000, 8250, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000 ],
|
||||||
|
|
||||||
|
# 21-
|
||||||
|
full_pulse26L: [ 1500, 1625, 1750, 1875, 2000, 2125, 2250, 2375, 2500, 2625, 2750, 2875, 3000, 3125, 3250, 3375,3500, 3625, 3750, 3875, 4000, 4125, 4250, 4375, 4500, 4625, 4750, 4875, 5000, 5125, 5250, 5375, 5500, 5625, 5750, 5875, 6000, 6125, 6250, 6375, 6500, 6625, 6750, 6875, 7000, 7250, 7500, 7750, 8000, 8250, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000, 22000 ],
|
||||||
|
|
||||||
|
full_pulseL: [ 1500, 1600, 1700, 1800, 1900, 2000, 2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900, 3000, 3100, 3200, 3300, 3400, 3500, 3625, 3750, 3875, 4000, 4125, 4250, 4375, 4500, 4625, 4750, 4875, 5000, 5125, 5250, 5375, 5500, 5625, 5750, 5875, 6000, 6125, 6250, 6375, 6500, 6625, 6750, 6875, 7000, 7250, 7500, 7750, 8000, 8250, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000, 20000, 22000 ],
|
||||||
|
|
||||||
|
# 92
|
||||||
|
full_pulse27L: [ 1500, 1625, 1750, 1875, 2000, 2125, 2250, 2375, 2500, 2625, 2750, 2875, 3000, 3125, 3250, 3375, 3500, 3625, 3750, 3875, 4000, 4125, 4250, 4375, 4500, 4625, 4750, 4875, 5000, 5125, 5250, 5375, 5500, 5625, 5750, 5875, 6000, 6125, 6250, 6375, 6500, 6625, 6750, 6875, 7000, 7250, 7500, 7750, 8000, 8250, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 14000, 15000, 16000, 17000, 18000, 19000 ],
|
||||||
|
|
||||||
|
full_pulse28L: [ 4000, 8000, 12000, 16000 ],
|
||||||
|
|
||||||
|
full_pulse29L: [ 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000, 5500, 6000, 6500, 7000, 7500, 8000, 8500, 9000, 9500, 10000, 10500, 11000, 11500, 12000, 12500, 13000, 13500, 14000, 14500, 15000, 15500, 16000, 16500, 17000, 17500, 18000, 18500, 19000, 19500, 20000 ],
|
||||||
|
|
||||||
# RMS analysis args
|
# RMS analysis args
|
||||||
analysisArgs: {
|
analysisArgs: {
|
||||||
@ -112,28 +182,113 @@
|
|||||||
resampleMinDurMs: 150, # notes's whose duration is less than this will be skipped
|
resampleMinDurMs: 150, # notes's whose duration is less than this will be skipped
|
||||||
|
|
||||||
useLastTakeOnlyFl: True,
|
useLastTakeOnlyFl: True,
|
||||||
minAttkDb: -5.0, # threshold of silence level
|
minAttkDb: -5.0, # threshold of silence level
|
||||||
maxDbOffset: 0.25, # travel down the from the max. note level by at most this amount to locate the max. peak
|
maxDbOffset: 0.25, # travel down the from the max. note level by at most this amount to locate the max. peak
|
||||||
maxDeltaDb: 1.5, # maximum db change between volume samples (changes greater than this will trigger resampling)
|
maxDeltaDb: 1.5, # maximum db change between volume samples (changes greater than this will trigger resampling)
|
||||||
samplesPerDb: 4, # count of samples per dB to resample ranges whose range is less than maxDeltaDb
|
samplesPerDb: 4, # count of samples per dB to resample ranges whose range is less than maxDeltaDb
|
||||||
minSampleDistUs: 50, # minimum distance between sample points in microseconds
|
minSampleDistUs: 50, # minimum distance between sample points in microseconds
|
||||||
auditionNoteN: 19, # count of notes to play for audition
|
auditionNoteN: 19, # count of notes to play for audition
|
||||||
|
|
||||||
finalPulseListCacheFn: "/home/kevin/temp/final_pulse_list_cache.pickle",
|
finalPulseListCacheFn: "/home/kevin/temp/final_pulse_list_cache.pickle",
|
||||||
rmsAnalysisCacheFn: "/home/kevin/temp/rms_analysis_cache.pickle"
|
rmsAnalysisCacheFn: "/home/kevin/temp/rms_analysis_cache.pickle"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
# used by plot_seq_1.gen_vel_map()
|
||||||
|
velTableDbL: [ 2, 7, 10, 12, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25, 27, 29 ],
|
||||||
|
|
||||||
manualMinD: {
|
manualMinD: {
|
||||||
36: [2, 10],
|
21:[-1,6],
|
||||||
48: [2, 10],
|
23:[-1,1], # 10
|
||||||
60: [2, 10],
|
24:[-1,11], # 11
|
||||||
72: [2, 10],
|
25:[-1,8],
|
||||||
84: [2, 10]
|
26:[-1,9], # 13
|
||||||
},
|
27:[-1,11],
|
||||||
|
28:[-1,2],
|
||||||
|
29:[-1,16],
|
||||||
|
30:[-1,4],
|
||||||
|
31:[-1,8],
|
||||||
|
32:[-1,9],
|
||||||
|
33:[-1,10],
|
||||||
|
34:[-1,9], # 15
|
||||||
|
35:[-1,9],
|
||||||
|
36:[-1,4],
|
||||||
|
37:[-1,7],
|
||||||
|
38:[-1,5],
|
||||||
|
39:[-1,5],
|
||||||
|
40:[-1,6], # 2 lwr
|
||||||
|
41:[-1,10], # 24 lwr
|
||||||
|
42:[-1,2],
|
||||||
|
43:[-1,4],
|
||||||
|
44:[-1,5],
|
||||||
|
45:[-1,10],
|
||||||
|
46:[-1,4],
|
||||||
|
47:[-1,7],
|
||||||
|
48:[-1,9],
|
||||||
|
49:[-1,2],
|
||||||
|
50:[-1,5],
|
||||||
|
51:[-1,4],
|
||||||
|
52:[-1,8],
|
||||||
|
53:[-1,0], # 16
|
||||||
|
54:[-1,8],
|
||||||
|
55:[-1,14],
|
||||||
|
56:[-1,8],
|
||||||
|
57:[-1,9],
|
||||||
|
58:[-1,10],
|
||||||
|
59:[-1,7],
|
||||||
|
60:[-1,7], # 14
|
||||||
|
61:[-1,10], # 14
|
||||||
|
62:[-1,1], # 7
|
||||||
|
63:[-1,5],
|
||||||
|
64:[-1,2],
|
||||||
|
65:[-1,8],
|
||||||
|
66:[-1,3],
|
||||||
|
67:[-1,3], # 17 lwr
|
||||||
|
68:[-1,3],
|
||||||
|
69:[-1,9],
|
||||||
|
70:[-1,15], # 15 lwr
|
||||||
|
71:[-1,0], # 7 lwr
|
||||||
|
72:[-1,3],# 12 lwr
|
||||||
|
73:[-1,0],# 21 lwr
|
||||||
|
74:[-1,0],# 24 lwr
|
||||||
|
75:[-1,0],# 18 lwr
|
||||||
|
76:[-1,0],# 13 lwr
|
||||||
|
77:[-1,0],# 22 lwr
|
||||||
|
78:[-1,0],# 14 lwr
|
||||||
|
79:[-1,8],
|
||||||
|
80:[-1,3],
|
||||||
|
81:[-1,2], # 14 lwr
|
||||||
|
82:[-1,5], # 11
|
||||||
|
83:[-1,7],
|
||||||
|
84:[-1,3], # 13
|
||||||
|
85:[-1,5],
|
||||||
|
86:[-1,4],
|
||||||
|
87:[-1,7],
|
||||||
|
88:[-1,5], # 22
|
||||||
|
89:[-1,19],
|
||||||
|
90:[-1,2], # 10
|
||||||
|
91:[-1,10],
|
||||||
|
92:[-1,8],
|
||||||
|
93:[-1,7],
|
||||||
|
94:[-1,5], # 10
|
||||||
|
95:[-1,9],
|
||||||
|
96:[-1,13],
|
||||||
|
97:[-1,12],
|
||||||
|
98:[-1,14],
|
||||||
|
99:[-1,14],
|
||||||
|
100:[-1,18],
|
||||||
|
101:[-1,18],
|
||||||
|
103:[-1,25],
|
||||||
|
104:[-1,26],
|
||||||
|
105:[-1,18],
|
||||||
|
106:[-1,26],
|
||||||
|
107:[-1,29],
|
||||||
|
108:[-1,28],
|
||||||
|
},
|
||||||
|
|
||||||
manualAnchorPitchMinDbL: [ 36,48,72,84 ],
|
manualAnchorPitchMinDbL: [ 24, 36,48,60,72,84,96 ],
|
||||||
manualAnchorPitchMaxDbL: [ 36,48,60,72,84 ],
|
manualAnchorPitchMaxDbL: [ 24, 36,48,60,72,84,96 ],
|
||||||
|
|
||||||
|
manualLastFl: true,
|
||||||
|
|
||||||
manualMinD_0: {
|
manualMinD_0: {
|
||||||
23: [2, 24],
|
23: [2, 24],
|
||||||
@ -256,85 +411,93 @@
|
|||||||
dbSrcLabel: 'hm', # source of the db measurement 'td' (time-domain) or 'hm' (harmonic)
|
dbSrcLabel: 'hm', # source of the db measurement 'td' (time-domain) or 'hm' (harmonic)
|
||||||
|
|
||||||
holdDutyPctD: {
|
holdDutyPctD: {
|
||||||
23: [[0, 40]],
|
21: [[0, 50]],
|
||||||
24: [[0, 40]],
|
23: [[0, 50]],
|
||||||
25: [[0, 40]],
|
24: [[0, 50]],
|
||||||
26: [[0, 40]],
|
25: [[0, 50]],
|
||||||
27: [[0, 40]],
|
26: [[0, 50]],
|
||||||
28: [[0, 40]],
|
27: [[0, 50]],
|
||||||
29: [[0, 40]],
|
28: [[0, 50]],
|
||||||
30: [[0, 40]],
|
29: [[0, 50]],
|
||||||
31: [[0, 40]],
|
30: [[0, 50]],
|
||||||
32: [[0, 40]],
|
31: [[0, 50]],
|
||||||
33: [[0, 40]],
|
32: [[0, 50]],
|
||||||
34: [[0, 40]],
|
33: [[0, 50]],
|
||||||
35: [[0, 40]],
|
34: [[0, 50]],
|
||||||
36: [[0, 40]],
|
35: [[0, 50]],
|
||||||
37: [[0, 40]],
|
36: [[0, 50]],
|
||||||
38: [[0, 40]],
|
37: [[0, 50]],
|
||||||
39: [[0, 40]],
|
38: [[0, 50]],
|
||||||
40: [[0, 40]],
|
39: [[0, 50]],
|
||||||
41: [[0, 40]],
|
40: [[0, 50]],
|
||||||
42: [[0, 40]],
|
41: [[0, 45]],
|
||||||
43: [[0, 40]],
|
42: [[0, 45]],
|
||||||
44: [[0, 40]],
|
43: [[0, 45]],
|
||||||
45: [[0, 40]],
|
44: [[0, 45]],
|
||||||
46: [[0, 40]],
|
45: [[0, 45]],
|
||||||
47: [[0, 40]],
|
46: [[0, 40],[10000,45]],
|
||||||
48: [[0, 40]],
|
47: [[0, 40],[10000,45]],
|
||||||
49: [[0, 40]],
|
48: [[0, 40],[10000,45]],
|
||||||
50: [[0, 40]],
|
49: [[0, 40],[10000,45]],
|
||||||
51: [[0, 40]],
|
50: [[0, 40],[10000,45]],
|
||||||
52: [[0, 40]],
|
51: [[0, 40],[10000,45]],
|
||||||
53: [[0, 40]],
|
52: [[0, 40],[10000,45]],
|
||||||
54: [[0, 40]],
|
53: [[0, 40],[10000,45]],
|
||||||
55: [[0, 40]],
|
54: [[0, 40],[10000,45]],
|
||||||
56: [[0, 40]],
|
55: [[0, 40],[10000,45]],
|
||||||
57: [[0, 40]],
|
56: [[0, 40],[10000,45]],
|
||||||
58: [[0, 40]],
|
57: [[0, 40],[10000,45]],
|
||||||
59: [[0, 45]],
|
58: [[0, 40],[10000,45]],
|
||||||
60: [[0, 40],[10000,50]],
|
59: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
61: [[0, 40],[10000,50]],
|
60: [[0, 40],[10000,43],[11000,45],[12000,45], [13000,50],[14000,55],[15000,60],[16000,65]],
|
||||||
62: [[0, 40],[10000,50]],
|
61: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
63: [[0, 40],[10000,50]],
|
62: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
64: [[0, 40],[10000,50]],
|
63: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
65: [[0, 99]],
|
64: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
66: [[0, 40]],
|
65: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
67: [[0, 40],[14000, 45],[15000,50],[16000,55],[17000,60],[18000,65],[19000,55]],
|
66: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
68: [[0, 40],[14000, 45],[15000,50],[16000,55],[17000,60],[18000,65],[19000,55]],
|
67: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
69: [[0, 40],[14000, 45],[15000,50],[16000,55],[17000,60],[18000,65],[19000,55]],
|
68: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
70: [[0, 40],[14000, 45],[15000,50],[16000,55],[17000,60],[18000,65],[19000,55]],
|
69: [[0, 32],[5000,64] ],
|
||||||
71: [[0, 40],[14000, 45],[15000,50],[16000,55],[17000,60],[18000,65],[19000,55]],
|
70: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
72: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
71: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
73: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
72: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
74: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
73: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
75: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
74: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
76: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
75: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
77: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
76: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
78: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
77: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55],[15000,60]],
|
||||||
79: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
78: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
80: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
79: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
81: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
80: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
82: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
81: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
83: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
82: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
84: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
83: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
85: [[0, 42],[8000,44],[9000,46],[10000, 48],[11000,50],[12000,52],[13000,54],[14000,56],[15000,58],[16000,60],[17000,60],[18000,60],[19000,60],[20000,60] ],
|
84: [[0, 35],[8000,40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
86: [[0, 40]],
|
85: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
87: [[0, 40]],
|
86: [[0, 40],[10000,45],[12000,48],[13000,50],[14000,55]],
|
||||||
88: [[0, 40]],
|
87: [[0, 40],[10000,45],[12000,48],[13000,50]],
|
||||||
89: [[0, 40]],
|
88: [[0, 40],[10000,45],[12000,48],[13000,50]],
|
||||||
91: [[0, 40]],
|
89: [[0, 40],[10000,45],[12000,48],[13000,50]],
|
||||||
92: [[0, 40]],
|
90: [[0, 40],[10000,45],[12000,48],[13000,50]],
|
||||||
93: [[0, 40]],
|
91: [[0, 40],[10000,45],[12000,48],[13000,50]],
|
||||||
94: [[0, 40]],
|
92: [[0, 37]],
|
||||||
95: [[0, 40]],
|
93: [[0, 37]],
|
||||||
96: [[0, 40]],
|
94: [[0, 37]],
|
||||||
|
95: [[0, 37]],
|
||||||
|
96: [[0, 37]],
|
||||||
97: [[0, 40]],
|
97: [[0, 40]],
|
||||||
98: [[0, 40]],
|
98: [[0, 40]],
|
||||||
99: [[0, 40]],
|
99: [[0, 37]],
|
||||||
100: [[0, 40]],
|
100: [[0, 37]],
|
||||||
101: [[0, 40]],
|
101: [[0, 37]],
|
||||||
106: [[0, 40]]
|
102: [[0, 37]],
|
||||||
|
103: [[0, 40],[10000,45],[15000,50]],
|
||||||
|
104: [[0, 40],[7500,45],[15000,50]],
|
||||||
|
105: [[0, 40],[10000,45],[15000,50]],
|
||||||
|
106: [[0, 37]],
|
||||||
|
107: [[0, 37]],
|
||||||
|
108: [[0, 37]],
|
||||||
},
|
},
|
||||||
|
|
||||||
# Final for Matt's piano
|
# Final for Matt's piano
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user