Skip to content

Commit

Permalink
Fix shift key via midi, triggers, set first mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Lcchy committed Nov 21, 2020
1 parent a26141b commit 8588a49
Show file tree
Hide file tree
Showing 4 changed files with 327 additions and 308 deletions.
18 changes: 9 additions & 9 deletions engines/python/etc_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ class System:
link_connected = False

# knobs a used by mode
knob1 = .200
knob2 = .200
knob3 = .200
knob4 = .200
knob5 = .200
knob1 = .500
knob2 = .500
knob3 = .500
knob4 = .500
knob5 = .500

# knob values used internally
knob = [.2] * 5
knob_hardware = [.2] * 5
knob_snapshot = [.2] * 5
# knob values used internally (custom init for the mode Football Scope)
knob = [0.173, 0.811, 0.496, 0.520, 0]
knob_hardware = [0.173, 0.811, 0.496, 0.520, 0]
knob_snapshot = [0.173, 0.811, 0.496, 0.520, 0]
knob_override = [False] * 5

# midi stuff (CC gets updated into knobs
Expand Down
2 changes: 1 addition & 1 deletion engines/python/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
if (etc.memory_used > 100): etc.memory_used = 100

# set initial mode
etc.set_mode_by_index(0)
etc.set_mode_by_index(18)
mode = sys.modules[etc.mode]

midi_led_flashing = False
Expand Down
5 changes: 4 additions & 1 deletion engines/python/osc.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def keys_callback(path, args) :
if (k == 1 and v > 0) :
if (etc.osd) : etc.set_osd(False)
else : etc.set_osd(True)
if (k == 3 and v > 0) :
if (k == 3 and v > 0) :
if (etc.auto_clear) : etc.auto_clear = False
else : etc.auto_clear = True

Expand All @@ -198,6 +198,8 @@ def init (etc_object) :
osc_server = liblo.Server(4000)
except liblo.ServerError, err:
print str(err)

# added methods for TouchOsc template as it cannot send two arguments
osc_server.add_method("/knobs/1", 'f', knob1_callback)
osc_server.add_method("/knobs/2", 'f', knob2_callback)
osc_server.add_method("/knobs/3", 'f', knob3_callback)
Expand All @@ -213,6 +215,7 @@ def init (etc_object) :
osc_server.add_method("/key/9", 'f', skey_callback)
osc_server.add_method("/key/10", 'f', skey_callback)

# original osc methods
osc_server.add_method("/knobs", 'iiiiii', knobs_callback)
osc_server.add_method("/key", 'ii', keys_callback)
osc_server.add_method("/mblob", 'b', mblob_callback)
Expand Down
Loading

0 comments on commit 8588a49

Please sign in to comment.