Update repo name in README (#307)

* fix: italian keymap it quot is redefined

* fix: missing deprecated swedish key code

* Adds Moonlander to the list of supported keyboards

* Sorts list and adds EZ suffix to Planck in Readme

* Update Mouse Wheel config

Co-authored-by: Florian Didron <0x6664@hey.com>
Co-authored-by: Erez Zukerman <1092548+ezuk@users.noreply.github.com>

keyboards/ergodox_ez/config.h

@@ -35,11 +35,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
 #define MATRIX_COLS 6
 
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        MOUSEKEY_DELAY
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
 
 #define TAPPING_TOGGLE  1
 
@@ -49,11 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TERM    200
 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* key combination for command */
 #define IS_COMMAND() ( \
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \

keyboards/moonlander/config.h

@@ -106,11 +106,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_TOGGLE 1
 
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_TIME_TO_MAX 60
-#define MOUSEKEY_MAX_SPEED 7
-#define MOUSEKEY_WHEEL_DELAY 0
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        MOUSEKEY_DELAY
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
 
 #define MUSIC_MAP
 

keyboards/moonlander/moonlander.c

@@ -184,6 +184,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
             break;
         case 3:
             ML_LED_3(1);
+            ML_LED_6(1);
             break;
         case 4:
             ML_LED_4(1);

keyboards/planck/ez/config.h

@@ -156,8 +156,11 @@
 
 #define TAPPING_TOGGLE  1
 
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        MOUSEKEY_DELAY
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX

lib/python/qmk/cli/__init__.py

@@ -9,6 +9,7 @@ from milc import cli
 from . import cformat
 from . import compile
 from . import config
+from . import docs
 from . import doctor
 from . import flash
 from . import hello

lib/python/qmk/cli/cformat.py

@@ -43,8 +43,8 @@ def cformat(cli):
     # Empty array for files
     files = []
     # Core directories for formatting
-    core_dirs = ['drivers', 'quantum', 'tests', 'tmk_core']
-    ignores = ['tmk_core/protocol/usb_hid', 'quantum/template']
+    core_dirs = ['drivers', 'quantum', 'tests', 'tmk_core', 'platforms']
+    ignores = ['tmk_core/protocol/usb_hid', 'quantum/template', 'platforms/chibios']
     # Find the list of files to format
     if cli.args.files:
         files.extend(normpath(file) for file in cli.args.files)

lib/python/qmk/cli/flash.py

@@ -4,6 +4,7 @@ You can compile a keymap already in the repo or using a QMK Configurator export.
 A bootloader must be specified.
 """
 import subprocess
+from argparse import FileType
 
 from milc import cli
 
@@ -26,6 +27,7 @@ def print_bootloader_help():
     cli.echo('\tdfu-util-split-left')
     cli.echo('\tdfu-util-split-right')
     cli.echo('\tst-link-cli')
+    cli.echo('\tst-flash')
     cli.echo('For more info, visit https://docs.qmk.fm/#/flashing')
 
 

lib/python/qmk/commands.py

@@ -7,6 +7,7 @@ import subprocess
 import shlex
 import shutil
 
+from milc import cli
 import qmk.keymap
 
 
@@ -37,7 +38,7 @@ def create_make_command(keyboard, keymap, target=None):
     return [make_cmd, ':'.join(make_args)]
 
 
-def compile_configurator_json(configurator_filename, bootloader=None):
+def compile_configurator_json(user_keymap, bootloader=None):
     """Convert a configurator export JSON file into a C file
 
     Args:
@@ -52,9 +53,6 @@ def compile_configurator_json(configurator_filename, bootloader=None):
 
         A command to run to compile and flash the C file.
     """
-    # Parse the configurator json
-    user_keymap = parse_configurator_json(configurator_filename)
-
     # Write the keymap C file
     qmk.keymap.write(user_keymap['keyboard'], user_keymap['keymap'], user_keymap['layout'], user_keymap['layers'])
 
@@ -86,4 +84,6 @@ def run(command, *args, **kwargs):
         safecmd = ' '.join(safecmd)
         command = [os.environ['SHELL'], '-c', safecmd]
 
+    cli.log.debug('Running command: %s', command)
+
     return subprocess.run(command, *args, **kwargs)

lib/python/qmk/info.py

@@ -77,7 +77,6 @@ def _extract_config_h(info_data):
         'device_ver': config_c.get('DEVICE_VER'),
         'manufacturer': config_c.get('MANUFACTURER'),
         'product': config_c.get('PRODUCT'),
-        'description': config_c.get('DESCRIPTION'),
     }
 
     return info_data

quantum/audio/audio_chibios.c

@@ -86,18 +86,25 @@ static void gpt_cb8(GPTDriver *gptp);
 
 #define START_CHANNEL_1()        \
     gptStart(&GPTD6, &gpt6cfg1); \
-    gptStartContinuous(&GPTD6, 2U)
+    gptStartContinuous(&GPTD6, 2U); \
+    palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG)
+
 #define START_CHANNEL_2()        \
     gptStart(&GPTD7, &gpt7cfg1); \
     gptStartContinuous(&GPTD7, 2U); \
     palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG)
 
-#define STOP_CHANNEL_1() gptStopTimer(&GPTD6)
+#define STOP_CHANNEL_1()          \
+    gptStopTimer(&GPTD6);         \
+    palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL); \
+    palSetPad(GPIOA, 4)
+
 #define STOP_CHANNEL_2()         \
     gptStopTimer(&GPTD7);        \
     palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \
     palSetPad(GPIOA, 5)
 
+
 #define RESTART_CHANNEL_1() \
     STOP_CHANNEL_1();       \
     START_CHANNEL_1()

quantum/audio/musical_notes.h

@@ -18,7 +18,9 @@
 #define MUSICAL_NOTES_H
 
 // Tempo Placeholder
-#define TEMPO_DEFAULT 100
+#ifndef TEMPO_DEFAULT
+#    define TEMPO_DEFAULT 100
+#endif
 
 #define SONG(notes...) \
     { notes }
@@ -61,7 +63,9 @@
 #define TIMBRE_25 0.250f
 #define TIMBRE_50 0.500f
 #define TIMBRE_75 0.750f
-#define TIMBRE_DEFAULT TIMBRE_50
+#ifndef TIMBRE_DEFAULT
+#    define TIMBRE_DEFAULT TIMBRE_50
+#endif
 
 // Notes - # = Octave
 

readme.md

@@ -9,8 +9,9 @@ This purpose of this fork is maintain a clean repo that only contains the keyboa
 
 ## Supported Keyboards
 
-* [Planck](/keyboards/planck/ez)
 * [ErgoDox EZ](/keyboards/ergodox_ez/)
+* [Planck EZ](/keyboards/planck/ez)
+* [Moonlander Mark I](/keyboards/moonlander)
 
 ## Maintainers
 
@@ -20,7 +21,7 @@ QMK is developed and maintained by Jack Humbert of OLKB with contributions from
 # Update Process
 
 1. Check out branch from ZSA's master branch:
-    1. `git remote add zsa https://github.com/ErgoDox-EZ/qmk_firmware.git`
+    1. `git remote add zsa https://github.com/zsa/qmk_firmware.git`
     2. `git fetch --all`
     3. `git checkout -B branchname zsa/master`
     4. `git push -u zsa branchname`