cml/picadae
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

picadae/app/picadae_api.py, picadae_shell.py : Updated PWM settters and getters.

Browse Source
This commit is contained in:
kevin.larke 2019-11-18 09:37:45 -05:00
parent 3851812b8e
commit 08b1671d74
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
control/app/picadae_api.py
View File

@ -174,14 +174,14 @@ class Picadae:
return result return result
def write( self, i2c_addr, reg_addr, byteL ): def write_tiny_reg( self, i2c_addr, reg_addr, byteL ):
return self._send( 'w', i2c_addr, reg_addr, [ len(byteL) ] + byteL ) return self._send( 'w', i2c_addr, reg_addr, [ len(byteL) ] + byteL )
def call_op( self, midi_pitch, op_code, argL ): def call_op( self, midi_pitch, op_code, argL ):
return self.write( self._pitch_to_i2c_addr( midi_pitch ), op_code, argL ) return self.write_tiny_reg( self._pitch_to_i2c_addr( midi_pitch ), op_code, argL )
def set_read_addr( self, i2c_addr, mem_id, addr ): def set_read_addr( self, i2c_addr, mem_id, addr ):
return self. write(i2c_addr, TinyOp.setReadAddr.value,[ mem_id, addr ]) return self.write_tiny_reg(i2c_addr, TinyOp.setReadAddr.value,[ mem_id, addr ])
def read_request( self, i2c_addr, reg_addr, byteOutN ): def read_request( self, i2c_addr, reg_addr, byteOutN ):
return self._send( 'r', i2c_addr, reg_addr,[ byteOutN ] ) return self._send( 'r', i2c_addr, reg_addr,[ byteOutN ] )
@ -253,12 +253,23 @@ class Picadae:
byteOutN = 2 byteOutN = 2
return self.block_on_picadae_read( midi_pitch, TinyConst.kRdTableSrcId.value, midi_vel*2, byteOutN, time_out_ms ) return self.block_on_picadae_read( midi_pitch, TinyConst.kRdTableSrcId.value, midi_vel*2, byteOutN, time_out_ms )
def set_pwm( self, midi_pitch, duty_cycle_pct ): def set_pwm_duty( self, midi_pitch, duty_cycle_pct ):
return self.call_op( midi_pitch, TinyOp.setPwmOp.value, [ int( duty_cycle_pct * 255.0 /100.0 )]) if 0 <= duty_cycle_pct and duty_cycle_pct <= 100:
duty_cycle_pct = 100.0 - duty_cycle_pct
return self.call_op( midi_pitch, TinyOp.setPwmOp.value, [ int( duty_cycle_pct * 255.0 /100.0 )])
else:
return Result(msg="Duty cycle (%f) out of range 0-100." % (duty_cycle_pct))
def get_pwm( self, midi_pitch, time_out_ms=250 ): def get_pwm_duty( self, midi_pitch, time_out_ms=250 ):
return self.block_on_picadae_read_reg( midi_pitch, TinyRegAddr.kPwmDutyAddr.value, time_out_ms=time_out_ms ) return self.block_on_picadae_read_reg( midi_pitch, TinyRegAddr.kPwmDutyAddr.value, time_out_ms=time_out_ms )
def set_pwm_freq( self, midi_pitch, freq ):
res = self.get_pwm_duty( midi_pitch )
if res:
print("duty",int(res.value[0]))
res = self.call_op( midi_pitch, TinyOp.setPwmOp.value, [ int(res.value[0]), int(freq) ])
return res
def get_pwm_freq( self, midi_pitch, time_out_ms=250 ): def get_pwm_freq( self, midi_pitch, time_out_ms=250 ):
return self.block_on_picadae_read_reg( midi_pitch, TinyRegAddr.kPwmFreqAddr.value, time_out_ms=time_out_ms ) return self.block_on_picadae_read_reg( midi_pitch, TinyRegAddr.kPwmFreqAddr.value, time_out_ms=time_out_ms )
@ -296,12 +307,14 @@ class Picadae:
coarse_usec = self.prescaler_usec*255 # usec's in one coarse tick coarse_usec = self.prescaler_usec*255 # usec's in one coarse tick
coarse = int( usec / coarse_usec ) coarse = int( usec / coarse_usec )
fine = int((usec - coarse*coarse_usec) / self.prescaler_usec) fine = int(round((usec - coarse*coarse_usec) / self.prescaler_usec))
assert( coarse <= 255 ) assert( coarse <= 255 )
assert( fine <= 255) assert( fine <= 255)
print("C:%i F:%i : %i " % (coarse,fine, coarse*coarse_usec + fine*self.prescaler_usec )) x = coarse*coarse_usec + fine*self.prescaler_usec
print("C:%i F:%i : %i %i (%i)" % (coarse,fine, x, usec, usec-x ))
return coarse,fine return coarse,fine

4
control/app/picadae_shell.py
View File

@ -16,9 +16,11 @@ class PicadaeShell:
'o':{ "func":"note_off", "minN":1, "maxN":1, "help":"note-off <pitch>"}, 'o':{ "func":"note_off", "minN":1, "maxN":1, "help":"note-off <pitch>"},
'T':{ "func":"set_vel_map", "minN":3, "maxN":3, "help":"table <pitch> <vel> <usec>"}, 'T':{ "func":"set_vel_map", "minN":3, "maxN":3, "help":"table <pitch> <vel> <usec>"},
't':{ "func":"get_vel_map", "minN":2, "maxN":2, "help":"table <pitch> <vel>"}, 't':{ "func":"get_vel_map", "minN":2, "maxN":2, "help":"table <pitch> <vel>"},
'D':{ "func":"set_pwm", "minN":2, "maxN":4, "help":"duty <pitch> <percent> {<hz> {<div>}} div:2=2,3=4,4=8,5=16,6=32,7=64,8=128,9=256,(10)=512 32us, 11=1024,12=2048,13=4096,14=8192,15=16384" }, 'D':{ "func":"set_pwm_duty", "minN":2, "maxN":4, "help":"duty <pitch> <percent> {<hz> {<div>}} " },
'd':{ "func":"get_pwm_duty", "minN":1, "maxN":1, "help":"duty <pitch>"}, 'd':{ "func":"get_pwm_duty", "minN":1, "maxN":1, "help":"duty <pitch>"},
'F':{ "func":"set_pwm_freq", "minN":2, "maxN":2, "help":"freq <pitch> <hz> 254=~123Hz"},
'f':{ "func":"get_pwm_freq", "minN":1, "maxN":1, "help":"freq <pitch>"}, 'f':{ "func":"get_pwm_freq", "minN":1, "maxN":1, "help":"freq <pitch>"},
'I':{ "func":"set_pwm_div", "minN":2, "maxN":2, "help":"div <pitch> <div> div:2=2,3=4,4=8,5=16,6=32,7=64,8=128,9=256,(10)=512 32us, 11=1024,12=2048,13=4096,14=8192,15=16384"},
'i':{ "func":"get_pwm_div", "minN":1, "maxN":1, "help":"div <pitch>"}, 'i':{ "func":"get_pwm_div", "minN":1, "maxN":1, "help":"div <pitch>"},
'W':{ "func":"write_table", "minN":1, "maxN":1, "help":"write_table <pitch>"}, 'W':{ "func":"write_table", "minN":1, "maxN":1, "help":"write_table <pitch>"},
'N':{ "func":"make_note", "minN":3, "maxN":3, "help":"note <pitch> <atkUs> <durMs>"}, 'N':{ "func":"make_note", "minN":3, "maxN":3, "help":"note <pitch> <atkUs> <durMs>"},