minor tidyup + fix syntax error in config

This commit is contained in:
Tristan Rowley
2020-02-09 16:02:46 +00:00
parent fbfa919476
commit 8c67090cad
3 changed files with 9 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
# Auto-generated Actions list
Sat 8 Feb 18:58:59 UTC 2020
Sun 9 Feb 15:57:04 UTC 2020
for branch=feature_plugins
@@ -192,10 +192,11 @@ for branch=feature_plugins
* wj_send_serial_([0-9a-zA-Z:]*) (from WJSendPlugin)
* wj_set_colour_([A|B|T])_([x|y]) (from WJSendPlugin)
* wj_set_back_colour_([x|y|z]) (from WJSendPlugin)
* wj_set_back_wash_colour_([x|y|z]) (from WJSendPlugin)
* wj_set_position_([N|L])_([x|y]) (from WJSendPlugin)
* wj_set_mix (from WJSendPlugin)
* wj_send_append_pad_([0-9]*)_(([A-Z:[0-9a-zA-Z]) (from WJSendPlugin)
* wj_send_append_([A-Z:[0-9a-zA-Z]) (from WJSendPlugin)
* wj_send_append_pad_([0-9]*)_([[:0-9a-zA-Z]*) (from WJSendPlugin)
* wj_send_append_([:0-9a-zA-Z]*) (from WJSendPlugin)
----

View File

@@ -58,7 +58,7 @@
},
"control_change 51": {
"DEFAULT": ["set_the_shader_param_3_layer_offset_0_continuous","set_shader_speed_layer_2_amount"],
"NAV_DETOUR": ["set_detour_end_continuous"]
"NAV_DETOUR": ["set_detour_end_continuous"],
"WJMXSEND": ["wj_set_colour_T_y"]
},
"control_change 52": {

View File

@@ -124,7 +124,7 @@ class WJSendPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
elif dim=='y':
self.colour_y = int(255*value)
output = "VCC:{}{:02X}{:02X}".format(chan, self.colour_x,self.colour_y) #,random.randint(0,255))
output = "VCC:{}{:02X}{:02X}".format(chan, self.colour_x,self.colour_y)
self.send('VCC', output)
back_colour_x = 127
@@ -139,9 +139,10 @@ class WJSendPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
elif dim=='z':
self.back_colour_z = int(255*value)
output = "VBM:{:02X}{:02X}{:02X}".format(self.back_colour_x,self.back_colour_y,self.back_colour_z) #,random.randint(0,255))
output = "VBM:{:02X}{:02X}{:02X}".format(self.back_colour_x,self.back_colour_y,self.back_colour_z)
self.send('VBM', output)
# this doesnt seem to work on WJ-MX30 at least, or maybe i dont know how to get it into the right mode?
back_wash_colour_x = 127
back_wash_colour_y = 127
back_wash_colour_z = 127
@@ -154,7 +155,7 @@ class WJSendPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin):
elif dim=='z':
self.back_wash_colour_z = int(255*value)
output = "VBW:{:02X}{:02X}{:02X}".format(self.back_wash_colour_x,self.back_wash_colour_y,self.back_wash_colour_z) #,random.randint(0,255))
output = "VBW:{:02X}{:02X}{:02X}".format(self.back_wash_colour_x,self.back_wash_colour_y,self.back_wash_colour_z)
self.send('VBW', output)