adafruit-mirror/Adafruit_Learning_System_Guides
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing delays, remove unused variable

Browse source
This commit is contained in:
Henry Gabryjelski 2021-08-18 20:03:00 -07:00
parent bc3e3f8644
commit 0cab64db50
3 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Macropad_Hotkeys/macros/minecraft-messages.py
View file

@ -7,7 +7,6 @@
from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values
DELAY_AFTER_ESCAPE = 0.05 DELAY_AFTER_ESCAPE = 0.05
DELAY_AFTER_COMMAND = 0.10
app = { # REQUIRED dict, must be named 'app' app = { # REQUIRED dict, must be named 'app'
'name' : 'Minecraft (/msg)', # Application name 'name' : 'Minecraft (/msg)', # Application name
@ -15,15 +14,15 @@ app = { # REQUIRED dict, must be named 'app'
# COLOR LABEL KEY SEQUENCE # COLOR LABEL KEY SEQUENCE
# 1st row ---------- # 1st row ----------
(0x000020, 'list', [ (0x000020, 'list', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/list', '/list',
Keycode.RETURN, -Keycode.RETURN]), Keycode.RETURN, -Keycode.RETURN]),
(0x000020, 'list', [ (0x000020, 'list', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/list', '/list',
Keycode.RETURN, -Keycode.RETURN]), Keycode.RETURN, -Keycode.RETURN]),
(0x000020, 'list', [ (0x000020, 'list', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/list', '/list',
Keycode.RETURN, -Keycode.RETURN]), Keycode.RETURN, -Keycode.RETURN]),
# 2nd row ---------- # 2nd row ----------
@ -36,15 +35,15 @@ app = { # REQUIRED dict, must be named 'app'
(0x000000, '', []), (0x000000, '', []),
# 4th row ---------- # 4th row ----------
(0x101010, 'bed', [ (0x101010, 'bed', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/msg @a Time for bed!', '/msg @a Time for bed!',
Keycode.RETURN, -Keycode.RETURN]), Keycode.RETURN, -Keycode.RETURN]),
(0x101010, 'bed', [ (0x101010, 'bed', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/msg @a Time for bed!', '/msg @a Time for bed!',
Keycode.RETURN, -Keycode.RETURN]), Keycode.RETURN, -Keycode.RETURN]),
(0x101010, 'bed', [ (0x101010, 'bed', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/msg @a Time for bed!', '/msg @a Time for bed!',
Keycode.RETURN, -Keycode.RETURN]), Keycode.RETURN, -Keycode.RETURN]),
# Encoder button --- # Encoder button ---

30
Macropad_Hotkeys/macros/minecraft-pe-effects.py
View file

@ -11,81 +11,81 @@ from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values
DELAY_AFTER_ESCAPE = 0.05 DELAY_AFTER_ESCAPE = 0.05
DELAY_AFTER_COMMAND = 0.10 DELAY_AFTER_COMMAND = 0.10
app = { # REQUIRED dict, must be named 'app' app = { # REQUIRED dict, must be named 'app'
'name' : 'Minecraft PE (effect)', # Application name 'name' : 'Minecraft PE (effect)', # Application name
# #
# /effect <player: target> <effect: Effect> # /effect <player: target> <effect: Effect>
# [seconds: int] [amplifier: int] [hideParticles: Boolean] # [seconds: int] [amplifier: int] [hideParticles: Boolean]
# #
'macros' : [ # List of button macros... 'macros' : [ # List of button macros...
# COLOR LABEL KEY SEQUENCE # COLOR LABEL KEY SEQUENCE
# 1st row ---------- # 1st row ----------
(0x002000, 'speed', [ (0x002000, 'speed', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s speed 999999999 1 true', '/effect @s speed 999999999 1 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x002000, 'str', [ (0x002000, 'str', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s strength 999999999 1 true', '/effect @s strength 999999999 1 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x002000, 'haste', [ (0x002000, 'haste', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s haste 999999999 1 true', '/effect @s haste 999999999 1 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
# 2nd row ---------- # 2nd row ----------
(0x002000, 'jump', [ (0x002000, 'jump', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s jump_boost 999999999 1 true', '/effect @s jump_boost 999999999 1 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x000030, 'breath', [ (0x000030, 'breath', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s water_breathing 999999999 0 true', '/effect @s water_breathing 999999999 0 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x202020, 'darkv', [ (0x202020, 'darkv', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s night_vision 999999999 0 true', '/effect @s night_vision 999999999 0 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
# 3rd row ---------- # 3rd row ----------
(0x300000, 'health', [ (0x300000, 'health', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s health_boost 999999999 4 true', '/effect @s health_boost 999999999 4 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x300000, 'regen', [ (0x300000, 'regen', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s regeneration 999999999 4 true', '/effect @s regeneration 999999999 4 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x002000, 'absorb', [ (0x002000, 'absorb', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s absorption 999999999 3 true', '/effect @s absorption 999999999 3 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
# 4th row --------- # 4th row ---------
(0x002000, 'resist', [ (0x002000, 'resist', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s resistance 999999999 3 true', '/effect @s resistance 999999999 3 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x101010, 'invis', [ (0x101010, 'invis', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s invisibility 999999999 0 true', '/effect @s invisibility 999999999 0 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
(0x300000, 'fire_r', [ (0x300000, 'fire_r', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s fire_resistance 999999999 0 true', '/effect @s fire_resistance 999999999 0 true',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),
# Encoder button --- Remove all status effects.... # Encoder button --- Remove all status effects....
(0x000000, '', [ (0x000000, '', [
Keycode.ESCAPE, -Keycode.ESCAPE, Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE,
'/effect @s clear', '/effect @s clear',
Keycode.RETURN, -Keycode.RETURN, Keycode.RETURN, -Keycode.RETURN,
Keycode.ESCAPE, -Keycode.ESCAPE]), Keycode.ESCAPE, -Keycode.ESCAPE]),

3
Macropad_Hotkeys/macros/minecraft-pe-equip.py
View file

@ -11,6 +11,9 @@ from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values
# Unfortunately, bedrock edition has no single command that both # Unfortunately, bedrock edition has no single command that both
# gives an item and enchants it. Thus, have to place the item in # gives an item and enchants it. Thus, have to place the item in
# the player's inventory slot, enchant it, then equip it. # the player's inventory slot, enchant it, then equip it.
#
# As a result, it is probably better to learn on less complex
# macro files before attempting to adjust settings in this one.
from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values