Skip to content

Commit 0cab64d

Browse files
committed
Add missing delays, remove unused variable
1 parent bc3e3f8 commit 0cab64d

3 files changed

Lines changed: 24 additions & 22 deletions

File tree

Macropad_Hotkeys/macros/minecraft-messages.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,22 @@
77
from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values
88

99
DELAY_AFTER_ESCAPE = 0.05
10-
DELAY_AFTER_COMMAND = 0.10
1110

1211
app = { # REQUIRED dict, must be named 'app'
1312
'name' : 'Minecraft (/msg)', # Application name
1413
'macros' : [ # List of button macros...
1514
# COLOR LABEL KEY SEQUENCE
1615
# 1st row ----------
1716
(0x000020, 'list', [
18-
Keycode.ESCAPE, -Keycode.ESCAPE,
17+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
1918
'/list',
2019
Keycode.RETURN, -Keycode.RETURN]),
2120
(0x000020, 'list', [
22-
Keycode.ESCAPE, -Keycode.ESCAPE,
21+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
2322
'/list',
2423
Keycode.RETURN, -Keycode.RETURN]),
2524
(0x000020, 'list', [
26-
Keycode.ESCAPE, -Keycode.ESCAPE,
25+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
2726
'/list',
2827
Keycode.RETURN, -Keycode.RETURN]),
2928
# 2nd row ----------
@@ -36,15 +35,15 @@
3635
(0x000000, '', []),
3736
# 4th row ----------
3837
(0x101010, 'bed', [
39-
Keycode.ESCAPE, -Keycode.ESCAPE,
38+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
4039
'/msg @a Time for bed!',
4140
Keycode.RETURN, -Keycode.RETURN]),
4241
(0x101010, 'bed', [
43-
Keycode.ESCAPE, -Keycode.ESCAPE,
42+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
4443
'/msg @a Time for bed!',
4544
Keycode.RETURN, -Keycode.RETURN]),
4645
(0x101010, 'bed', [
47-
Keycode.ESCAPE, -Keycode.ESCAPE,
46+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
4847
'/msg @a Time for bed!',
4948
Keycode.RETURN, -Keycode.RETURN]),
5049
# Encoder button ---

Macropad_Hotkeys/macros/minecraft-pe-effects.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,81 +11,81 @@
1111
DELAY_AFTER_ESCAPE = 0.05
1212
DELAY_AFTER_COMMAND = 0.10
1313

14-
app = { # REQUIRED dict, must be named 'app'
14+
app = { # REQUIRED dict, must be named 'app'
1515
'name' : 'Minecraft PE (effect)', # Application name
1616
#
1717
# /effect <player: target> <effect: Effect>
1818
# [seconds: int] [amplifier: int] [hideParticles: Boolean]
1919
#
20-
'macros' : [ # List of button macros...
20+
'macros' : [ # List of button macros...
2121
# COLOR LABEL KEY SEQUENCE
2222
# 1st row ----------
2323
(0x002000, 'speed', [
24-
Keycode.ESCAPE, -Keycode.ESCAPE,
24+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
2525
'/effect @s speed 999999999 1 true',
2626
Keycode.RETURN, -Keycode.RETURN,
2727
Keycode.ESCAPE, -Keycode.ESCAPE]),
2828
(0x002000, 'str', [
29-
Keycode.ESCAPE, -Keycode.ESCAPE,
29+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
3030
'/effect @s strength 999999999 1 true',
3131
Keycode.RETURN, -Keycode.RETURN,
3232
Keycode.ESCAPE, -Keycode.ESCAPE]),
3333
(0x002000, 'haste', [
34-
Keycode.ESCAPE, -Keycode.ESCAPE,
34+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
3535
'/effect @s haste 999999999 1 true',
3636
Keycode.RETURN, -Keycode.RETURN,
3737
Keycode.ESCAPE, -Keycode.ESCAPE]),
3838
# 2nd row ----------
3939
(0x002000, 'jump', [
40-
Keycode.ESCAPE, -Keycode.ESCAPE,
40+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
4141
'/effect @s jump_boost 999999999 1 true',
4242
Keycode.RETURN, -Keycode.RETURN,
4343
Keycode.ESCAPE, -Keycode.ESCAPE]),
4444
(0x000030, 'breath', [
45-
Keycode.ESCAPE, -Keycode.ESCAPE,
45+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
4646
'/effect @s water_breathing 999999999 0 true',
4747
Keycode.RETURN, -Keycode.RETURN,
4848
Keycode.ESCAPE, -Keycode.ESCAPE]),
4949
(0x202020, 'darkv', [
50-
Keycode.ESCAPE, -Keycode.ESCAPE,
50+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
5151
'/effect @s night_vision 999999999 0 true',
5252
Keycode.RETURN, -Keycode.RETURN,
5353
Keycode.ESCAPE, -Keycode.ESCAPE]),
5454
# 3rd row ----------
5555
(0x300000, 'health', [
56-
Keycode.ESCAPE, -Keycode.ESCAPE,
56+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
5757
'/effect @s health_boost 999999999 4 true',
5858
Keycode.RETURN, -Keycode.RETURN,
5959
Keycode.ESCAPE, -Keycode.ESCAPE]),
6060
(0x300000, 'regen', [
61-
Keycode.ESCAPE, -Keycode.ESCAPE,
61+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
6262
'/effect @s regeneration 999999999 4 true',
6363
Keycode.RETURN, -Keycode.RETURN,
6464
Keycode.ESCAPE, -Keycode.ESCAPE]),
6565
(0x002000, 'absorb', [
66-
Keycode.ESCAPE, -Keycode.ESCAPE,
66+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
6767
'/effect @s absorption 999999999 3 true',
6868
Keycode.RETURN, -Keycode.RETURN,
6969
Keycode.ESCAPE, -Keycode.ESCAPE]),
7070
# 4th row ---------
7171
(0x002000, 'resist', [
72-
Keycode.ESCAPE, -Keycode.ESCAPE,
72+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
7373
'/effect @s resistance 999999999 3 true',
7474
Keycode.RETURN, -Keycode.RETURN,
7575
Keycode.ESCAPE, -Keycode.ESCAPE]),
7676
(0x101010, 'invis', [
77-
Keycode.ESCAPE, -Keycode.ESCAPE,
77+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
7878
'/effect @s invisibility 999999999 0 true',
7979
Keycode.RETURN, -Keycode.RETURN,
8080
Keycode.ESCAPE, -Keycode.ESCAPE]),
8181
(0x300000, 'fire_r', [
82-
Keycode.ESCAPE, -Keycode.ESCAPE,
82+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
8383
'/effect @s fire_resistance 999999999 0 true',
8484
Keycode.RETURN, -Keycode.RETURN,
8585
Keycode.ESCAPE, -Keycode.ESCAPE]),
8686
# Encoder button --- Remove all status effects....
8787
(0x000000, '', [
88-
Keycode.ESCAPE, -Keycode.ESCAPE,
88+
Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
8989
'/effect @s clear',
9090
Keycode.RETURN, -Keycode.RETURN,
9191
Keycode.ESCAPE, -Keycode.ESCAPE]),

Macropad_Hotkeys/macros/minecraft-pe-equip.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
# Unfortunately, bedrock edition has no single command that both
1212
# gives an item and enchants it. Thus, have to place the item in
1313
# the player's inventory slot, enchant it, then equip it.
14+
#
15+
# As a result, it is probably better to learn on less complex
16+
# macro files before attempting to adjust settings in this one.
1417

1518
from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values
1619

0 commit comments

Comments
 (0)