From f24035e2f07a94ba5ed3a381398857905c094f8f Mon Sep 17 00:00:00 2001 From: kozec Date: Sun, 24 Dec 2017 10:05:35 +0100 Subject: [PATCH] Bumping all the numbers and upgrading default profiles --- default_profiles/Desktop.sccprofile | 38 ++++++++--------- ...ller with High Precision Camera.sccprofile | 37 ++++++++--------- default_profiles/XBox Controller.sccprofile | 41 ++++++++----------- scc/constants.py | 2 +- 4 files changed, 53 insertions(+), 65 deletions(-) diff --git a/default_profiles/Desktop.sccprofile b/default_profiles/Desktop.sccprofile index 24c912210..1c55b3627 100644 --- a/default_profiles/Desktop.sccprofile +++ b/default_profiles/Desktop.sccprofile @@ -1,18 +1,16 @@ { "buttons": { - "A" : { "action": "button(Keys.KEY_ENTER)" }, - "B" : { "action": "button(Keys.KEY_ESC)" }, - "BACK" : { "action": "button(Keys.KEY_BACKSPACE)" }, - "C" : { - "action": "menu('Default.menu')", - "hold": { "action": "menu('Default.menu')" } - }, - "LB" : { "action": "button(Keys.KEY_LEFTCTRL)" }, - "RB" : { "action": "button(Keys.KEY_LEFTALT)" }, - "RPAD" : { "action": "button(Keys.BTN_LEFT)" }, - "START" : { "action": "button(Keys.KEY_LEFTSHIFT)" }, - "X" : { "action": "button(Keys.KEY_SPACE)" }, - "Y" : { "action": "button(Keys.KEY_TAB)" } + "A" : { "action": "button(Keys.KEY_ENTER)" }, + "B" : { "action": "button(Keys.KEY_ESC)" }, + "BACK" : { "action": "button(Keys.KEY_BACKSPACE)" }, + "C" : { "action": "hold(menu('Default.menu'), menu('Default.menu'))" }, + "CPADPRESS" : { "action": "button(Keys.BTN_LEFT)" }, + "LB" : { "action": "button(Keys.KEY_LEFTCTRL)" }, + "RB" : { "action": "button(Keys.KEY_LEFTALT)" }, + "RPAD" : { "action": "button(Keys.BTN_LEFT)" }, + "START" : { "action": "button(Keys.KEY_LEFTSHIFT)" }, + "X" : { "action": "button(Keys.KEY_SPACE)" }, + "Y" : { "action": "button(Keys.KEY_TAB)" } }, "trigger_left": { "action": "button(Keys.BTN_RIGHT)" }, @@ -21,18 +19,18 @@ "gyro": {}, "pad_left": { - "X": { "action": "mouse(Rels.REL_HWHEEL, 1.0)" }, - "Y": { "action": "mouse(Rels.REL_WHEEL, 1.0)" }, - "feedback": ["LEFT", 1052.0] + "action": "feedback(LEFT, 4096, 16, ball(XY(mouse(Rels.REL_HWHEEL, 1.0), mouse(Rels.REL_WHEEL, 1.0))))" }, "pad_right": { - "action": "trackball(1.0)", - "feedback": ["RIGHT", 256], - "smooth" : [ 8, 0.78 ] + "action": "smooth(8, 0.78, 2.0, feedback(RIGHT, 256, ball(mouse())))" + }, + + "cpad": { + "action": "mouse()" }, "stick": { "action": "dpad(button(Keys.KEY_UP), button(Keys.KEY_DOWN), button(Keys.KEY_LEFT), button(Keys.KEY_RIGHT))" }, - "version": 1 + "version": 1.3 } diff --git a/default_profiles/XBox Controller with High Precision Camera.sccprofile b/default_profiles/XBox Controller with High Precision Camera.sccprofile index 0a6443907..c2dfe71fc 100644 --- a/default_profiles/XBox Controller with High Precision Camera.sccprofile +++ b/default_profiles/XBox Controller with High Precision Camera.sccprofile @@ -1,21 +1,18 @@ { "buttons" : { - "A" : { "action" : "button(Keys.BTN_A)" }, - "B" : { "action" : "button(Keys.BTN_B)" }, - "X" : { "action" : "button(Keys.BTN_X)" }, - "Y" : { "action" : "button(Keys.BTN_Y)" }, - "LB" : { "action" : "button(Keys.BTN_TL)" }, - "RB" : { "action" : "button(Keys.BTN_TR)" }, - "BACK" : { "action" : "button(Keys.BTN_SELECT)" }, - "START" : { "action" : "button(Keys.BTN_START)" }, - "C" : { - "action": "menu('Default.menu')", - "hold": { "action": "menu('Default.menu')" } - }, - "LPAD" : { "action" : "button(Keys.BTN_THUMBL)" }, - "RPAD" : { "action" : "button(Keys.BTN_THUMBR)" }, - "LGRIP" : { "action" : "button(Keys.BTN_A)" }, - "RGRIP" : { "action" : "button(Keys.BTN_X)" } + "A" : { "action" : "button(Keys.BTN_A)" }, + "B" : { "action" : "button(Keys.BTN_B)" }, + "X" : { "action" : "button(Keys.BTN_X)" }, + "Y" : { "action" : "button(Keys.BTN_Y)" }, + "LB" : { "action" : "button(Keys.BTN_TL)" }, + "RB" : { "action" : "button(Keys.BTN_TR)" }, + "BACK" : { "action" : "button(Keys.BTN_SELECT)" }, + "START" : { "action" : "button(Keys.BTN_START)" }, + "C" : { "action": "hold(menu('Default.menu'), menu('Default.menu'))" }, + "STICKPRESS" : { "action": "button(Keys.BTN_THUMBL)" }, + "RPAD" : { "action" : "button(Keys.BTN_THUMBR)" }, + "LGRIP" : { "action" : "button(Keys.BTN_A)" }, + "RGRIP" : { "action" : "button(Keys.BTN_X)" } }, "trigger_left": { "action": "axis(Axes.ABS_Z)" }, @@ -30,14 +27,12 @@ }, "pad_left" : { - "action" : "dpad(hatup(Axes.ABS_HAT0Y), hatdown(Axes.ABS_HAT0Y), hatleft(Axes.ABS_HAT0X), hatright(Axes.ABS_HAT0X) )" + "action": "click(dpad(hatup(Axes.ABS_HAT0Y), hatdown(Axes.ABS_HAT0Y), hatleft(Axes.ABS_HAT0X), hatright(Axes.ABS_HAT0X)))" }, "pad_right" : { - "action" : "trackball", - "feedback": ["RIGHT", 256], - "smooth" : [ 8, 0.78 ] + "action": "smooth(8, 0.78, feedback(RIGHT, 256, ball(mouse())))" }, - "version": 1 + "version": 1.3 } diff --git a/default_profiles/XBox Controller.sccprofile b/default_profiles/XBox Controller.sccprofile index 4dec19e73..bc6ae8826 100644 --- a/default_profiles/XBox Controller.sccprofile +++ b/default_profiles/XBox Controller.sccprofile @@ -1,26 +1,23 @@ { "buttons" : { - "A" : { "action" : "button(Keys.BTN_A)" }, - "B" : { "action" : "button(Keys.BTN_B)" }, - "X" : { "action" : "button(Keys.BTN_X)" }, - "Y" : { "action" : "button(Keys.BTN_Y)" }, - "LB" : { "action" : "button(Keys.BTN_TL)" }, - "RB" : { "action" : "button(Keys.BTN_TR)" }, - "BACK" : { "action" : "button(Keys.BTN_SELECT)" }, - "START" : { "action" : "button(Keys.BTN_START)" }, - "C" : { - "action": "menu('Default.menu')", - "hold": { "action": "menu('Default.menu')" } - }, - "LPAD" : { "action" : "button(Keys.BTN_THUMBL)" }, - "RPAD" : { "action" : "button(Keys.BTN_THUMBR)" }, - "LGRIP" : { "action" : "button(Keys.BTN_A)" }, - "RGRIP" : { "action" : "button(Keys.BTN_X)" } + "A" : { "action" : "button(Keys.BTN_A)" }, + "B" : { "action" : "button(Keys.BTN_B)" }, + "X" : { "action" : "button(Keys.BTN_X)" }, + "Y" : { "action" : "button(Keys.BTN_Y)" }, + "LB" : { "action" : "button(Keys.BTN_TL)" }, + "RB" : { "action" : "button(Keys.BTN_TR)" }, + "BACK" : { "action" : "button(Keys.BTN_SELECT)" }, + "START" : { "action" : "button(Keys.BTN_START)" }, + "C" : { "action": "hold(menu('Default.menu'), menu('Default.menu'))" }, + "STICKPRESS" : { "action": "button(Keys.BTN_THUMBL)" }, + "RPAD" : { "action" : "button(Keys.BTN_THUMBR)" }, + "LGRIP" : { "action" : "button(Keys.BTN_A)" }, + "RGRIP" : { "action" : "button(Keys.BTN_X)" } }, "trigger_left": { "action": "axis(Axes.ABS_Z)" }, - "trigger_right": { "action": "axis(Axes.ABS_RZ)" } - , + "trigger_right": { "action": "axis(Axes.ABS_RZ)" }, + "gyro": {}, "stick" : { @@ -30,14 +27,12 @@ }, "pad_left" : { - "action" : "dpad(hatup(Axes.ABS_HAT0Y), hatdown(Axes.ABS_HAT0Y), hatleft(Axes.ABS_HAT0X), hatright(Axes.ABS_HAT0X) )" + "action": "click(dpad(hatup(Axes.ABS_HAT0Y), hatdown(Axes.ABS_HAT0Y), hatleft(Axes.ABS_HAT0X), hatright(Axes.ABS_HAT0X)))" }, "pad_right" : { - "X" : { "action" : "axis(Axes.ABS_RX)" }, - "Y" : { "action" : "raxis(Axes.ABS_RY)" }, - "feedback": ["RIGHT", 256] + "action": "feedback(RIGHT, 256, XY(axis(Axes.ABS_RX), raxis(Axes.ABS_RY)))" }, - "version": 1 + "version": 1.3 } diff --git a/scc/constants.py b/scc/constants.py index cc3cee86e..db9fb53de 100644 --- a/scc/constants.py +++ b/scc/constants.py @@ -28,7 +28,7 @@ If SC-Controller is updated while daemon is running, DAEMON_VERSION send by daemon will differ one one expected by UI and daemon will be forcefully restarted. """ -DAEMON_VERSION = "0.3.99.7" +DAEMON_VERSION = "0.4" HPERIOD = 0.02 LPERIOD = 0.5