Code

Consolidate modelm v2#14996

Code

Merged

tzarc merged 26 commits intoqmk:developqmk/qmk_firmware:developfrom nuess0r:consolidate_modelm_v2nuess0r/qmk_firmware:consolidate_modelm_v2Copy head branch name to clipboardMay 27, 2023

+293-105

Commits

Commits on May 17, 2023

• Putting all IBM Model M projects under one folder

  Show description for 9a7cf62
  nuess0r

  committed
  9a7cf62

• Add readme files for the different mschwingen targets

  Show description for 54ce10e
  nuess0r

  committed
  54ce10e

• Move Model M SSK controller based on Teensy++ 2.0 to consolidated folder

  nuess0r

  committed
  01ea546

• Fix readme and URL for moved SSK project

  nuess0r

  committed
  0a250e2

• Move Model M controller based on Teensy 2.0 to consolidated folder

  nuess0r

  committed
  f3bd956

• Fix readme and URL for moved Teensy 2.0 project

  nuess0r

  committed
  bf409ba

• Readding modelm101_teensy2.c and renaming to teensy2.c

  Show description for d03c5c9
  nuess0r

  committed
  d03c5c9

• Adding ChangeLog file describing the changes

  nuess0r

  committed
  26810ee

• For teensypp_ssk adjust file names according to new folder name

  Show description for be20876
  nuess0r

  committed
  be20876

• Enhance PR14996 changelog

  Show description for 1858f91
  nuess0r

  committed
  1858f91

• Adding moved keyboards to keyboard_aliases.hjson to not break historical mappings

  nuess0r

  committed
  319c8cb

• Fix misspelled alias target for modelm/mschwingen

  nuess0r

  committed
  b787c90

• Move m122_3270 based from tronguylabs consolidated folder

  nuess0r

  committed
  9ade528

• Remove merge conflict residues

  nuess0r

  committed
  e7e2759

• Update keyboards/modelm/ibm122m/readme.md

  Show description for 9f73753
  

  nuess0r

  and

  fauxpark

  committed
  9f73753

• Update keyboards/modelm/mschwingen/led_ffc/readme.md

  Show description for 157fbbf
  

  nuess0r

  and

  fauxpark

  committed
  157fbbf

• Update keyboards/modelm/mschwingen/led_wired/readme.md

  Show description for 8110936
  

  nuess0r

  and

  fauxpark

  committed
  8110936

• Update keyboards/modelm/mschwingen/led_ws2812/readme.md

  Show description for 2cdf138
  

  nuess0r

  and

  fauxpark

  committed
  2cdf138

• Update keyboards/modelm/teensypp/readme.md

  Show description for 34c8d31
  

  nuess0r

  and

  fauxpark

  committed
  34c8d31

• Delete useless .noci file found in review by fauxpark

  nuess0r

  committed
  44958de

• Move all Model M's under keyboards/ibm

  Show description for 6767b95
  nuess0r

  committed
  6767b95

• Update URLs and paths for all moved Model M variants

  nuess0r

  committed
  2cb4d7f

• Update pull-request files

  nuess0r

  committed
  be55388

Commits on May 22, 2023

• Fixed unresolved merge conflict found by keyboard-magpie

  nuess0r

  committed
  bd6242e

Commits on May 27, 2023

• Merge remote-tracking branch 'upstream/develop' into consolidate_modelm_v2

  tzarc

  committed
  ee9cb2f

• Fixup build errors.

  tzarc

  committed
  108191e