Merge upstream #38
Closed
Merge upstream #38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jack <[email protected]> Co-authored-by: Ryan <[email protected]>
Affects: - `nacly/sodium42` - `nacly/sodium50` - `nacly/sodium62` - `nacly/splitreus62` - `nacly/ua62` - `nek_type_a` - `nemui` - `nibiria/stream15` - `nightingale_studios/hailey` - `nightly_boards/adellein` - `nightly_boards/alter/rev1` - `nightly_boards/alter_lite` - `nightly_boards/conde60` - `nightly_boards/daily60` - `nightly_boards/jisoo` - `nightly_boards/n2` - `nightly_boards/n40_o` - `nightly_boards/n60_s` - `nightly_boards/n87` - `nightly_boards/n9` - `nightly_boards/octopad` - `nightly_boards/octopadplus` - `nightly_boards/paraluman` - `nightly_boards/ph_arisu` - `nightmare` - `nimrod` - `nix_studio/oxalys80` - `nopunin10did/jabberwocky/v1` - `nopunin10did/jabberwocky/v2` - `nopunin10did/railroad/rev0` - `novelkeys/novelpad` - `noxary/220` - `noxary/260` - `noxary/268` - `noxary/268_2` - `noxary/268_2_rgb` - `noxary/280` - `noxary/378` - `noxary/valhalla` - `noxary/vulcan` - `noxary/x268` - `numatreus`
Affects: - `kabedon/kabedon98e` - `kagizaraya/chidori` - `kagizaraya/halberd` - `kagizaraya/miniaxe` - `kagizaraya/scythe` - `kakunpc/angel17/alpha` - `kakunpc/angel17/rev1` - `kakunpc/angel64/alpha` - `kakunpc/angel64/rev1` - `kakunpc/business_card/alpha` - `kakunpc/business_card/beta` - `kakunpc/choc_taro` - `kakunpc/rabbit_capture_plan` - `kakunpc/suihankey/alpha` - `kakunpc/suihankey/rev1` - `kakunpc/suihankey/split/alpha` - `kakunpc/suihankey/split/rev1` - `kakunpc/thedogkeyboard` - `kapcave/arya` - `kapcave/gskt00` - `kapcave/paladin64` - `kapl/rev1` - `kb58` - `kb_elmo/aek2_usb` - `kb_elmo/m0110a_usb` - `kb_elmo/m0116_usb` - `kbdclack/kaishi65` - `kbdfans/bella/soldered` - `kbdfans/bounce/pad` - `kbdfans/jm60` - `kbdfans/kbd19x` - `kbdfans/kbd4x` - `kbdfans/kbd66` - `kbdfans/kbd67/hotswap` - `kbdfans/kbd67/mkii_soldered` - `kbdfans/kbd6x` - `kbdfans/kbd75/rev1` - `kbdfans/kbd75/rev2` - `kbdfans/kbd8x` - `kbdfans/kbd8x_mk2` - `kbdfans/kbdpad/mk2` - `kbdfans/maja_soldered` - `kbdfans/niu_mini` - `kbdfans/phaseone` - `kbdmania/kmac` - `kbdmania/kmac_pad` - `kc60`
Affects: - `m10a` - `machine_industries/m4_a` - `magic_force/mf34` - `majistic` - `makenova/omega/omega4` - `makrosu` - `manta60` - `maple_computing/christmas_tree/v2017` - `maple_computing/ivy/rev1` - `maple_computing/launchpad/rev1` - `maple_computing/minidox/rev1` - `maple_computing/the_ruler` - `marksard/leftover30` - `marksard/treadstone48/rev1` - `marksard/treadstone48/rev2` - `masterworks/classy_tkl/rev_a` - `maxipad` - `maxr1998/phoebe` - `mc_76k` - `mechkeys/acr60` - `mechkeys/alu84` - `mechkeys/espectro` - `mechkeys/mechmini/v2` - `mechkeys/mk60` - `mechlovin/hannah910/rev1` - `mechlovin/hannah910/rev2` - `mechlovin/hannah910/rev3` - `mechlovin/jay60` - `mechlovin/tmkl` - `mechwild/bde/lefty` - `mechwild/bde/rev2` - `mechwild/bde/righty` - `mechwild/mercutio` - `mechwild/mokulua/mirrored` - `mechwild/mokulua/standard` - `mechwild/murphpad` - `mechwild/obe` - `mechwild/puckbuddy` - `meletrix/zoom98` - `melgeek/mj6xy/rev3` - `meme` - `meow65` - `mesa/mesa_tkl` - `meson` - `mikeneko65` - `millipad` - `mini_elixivy` - `mini_ten_key_plus` - `minimon/index_tab` - `mint60` - `misonoworks/karina` - `miuni32` - `mixi`
Affects: - `kindakeyboards/conone65` - `kinesis` - `kingly_keys/ave/ortho` - `kingly_keys/ave/staggered` - `kingly_keys/little_foot` - `kingly_keys/romac` - `kingly_keys/romac_plus` - `kingly_keys/ropro` - `kingly_keys/smd_milk` - `kingly_keys/soap` - `kira/kira75` - `kisakeyluxury/qtz` - `kiserdesigns/madeline` - `kiwikeebs/macro` - `kiwikeebs/macro_v2` - `kiwikey/borderland` - `kiwikey/kawii9` - `kiwikey/wanderland` - `kkatano/bakeneko60` - `kkatano/bakeneko65/rev2` - `kkatano/bakeneko65/rev3` - `kkatano/bakeneko80` - `kkatano/wallaby` - `kkatano/yurei` - `knops/mini` - `kona_classic` - `kopibeng/mnk60_stm32` - `kopibeng/mnk65` - `kopibeng/mnk65_stm32` - `kopibeng/mnk88` - `kopibeng/typ65` - `kopibeng/xt60` - `kopibeng/xt60_singa` - `kopibeng/xt65` - `kopibeng/xt8x` - `kprepublic/bm16s` - `kprepublic/bm40hsrgb/rev1` - `kprepublic/bm65hsrgb/rev1` - `kprepublic/bm68hsrgb/rev1` - `kprepublic/bm980hsrgb` - `kprepublic/cospad` - `ktec/daisy` - `kumaokobo/kudox/columner` - `kumaokobo/kudox/rev1` - `kumaokobo/kudox/rev2` - `kumaokobo/kudox/rev3` - `kumaokobo/kudox_full/rev1` - `kumaokobo/kudox_game/rev1` - `kumaokobo/kudox_game/rev2` - `kumaokobo/pico/65keys` - `kumaokobo/pico/70keys` - `kv/revt` - `kwub/bloop` - `ky01`
Affects: - `keebio/bamfk4` - `keebio/bdn9/rev1` - `keebio/bdn9/rev2` - `keebio/bfo9000` - `keebio/bigswitchseat` - `keebio/choconum` - `keebio/dilly` - `keebio/dsp40/rev1` - `keebio/ergodicity` - `keebio/foldkb/rev1` - `keebio/fourier` - `keebio/iris/rev1` - `keebio/iris/rev1_led` - `keebio/iris/rev2` - `keebio/iris/rev3` - `keebio/iris/rev4` - `keebio/kbo5000/rev1` - `keebio/levinson/rev1` - `keebio/levinson/rev2` - `keebio/levinson/rev3` - `keebio/nyquist/rev1` - `keebio/nyquist/rev2` - `keebio/nyquist/rev3` - `keebio/quefrency/rev1` - `keebio/quefrency/rev4` - `keebio/quefrency/rev5` - `keebio/rorschach/rev1` - `keebio/sinc/rev1` - `keebio/sinc/rev2` - `keebio/tragicforce68` - `keebio/tukey` - `keebio/viterbi/rev1` - `keebio/viterbi/rev2` - `keebio/wavelet` - `keebio/wtf60` - `keebsforall/coarse60` - `keebsforall/freebirdnp/lite` - `keebsforall/freebirdnp/pro` - `keebsforall/freebirdtkl` - `keebwerk/nano_slider` - `keebzdotnet/fme` - `keebzdotnet/wazowski` - `keyboardio/atreus` - `keycapsss/kimiko/rev1` - `keycapsss/o4l_5x12` - `keygem/kg60ansi` - `keygem/kg65rgbv2` - `keyhive/absinthe` - `keyhive/ergosaurus` - `keyhive/lattice60` - `keyhive/maypad` - `keyhive/navi10/rev0` - `keyhive/navi10/rev2` - `keyhive/navi10/rev3` - `keyhive/opus` - `keyhive/southpole` - `keyhive/ut472` - `keyprez/bison` - `keyprez/corgi` - `keyprez/rhino` - `keyprez/unicorn` - `keysofkings/twokey` - `keystonecaps/gameroyadvance`
Affects: - `uk78` - `ungodly/nines` - `unikeyboard/diverge3` - `unikeyboard/divergetm2` - `unikeyboard/felix` - `uranuma` - `utd80` - `v60_type_r` - `vagrant_10` - `viendi8l` - `viktus/at101_bh` - `viktus/omnikey_bh` - `viktus/smolka` - `viktus/sp111` - `viktus/styrka` - `viktus/z150_bh` - `vitamins_included/rev1`
Affects: - `takashicompany/center_enter` - `takashicompany/endzone34` - `takashicompany/qoolee` - `takashicompany/radialex` - `takashiski/namecard2x4/rev1` - `takashiski/namecard2x4/rev2` - `takashiski/otaku_split/rev0` - `takashiski/otaku_split/rev1` - `taleguers/taleguers75` - `tanuki` - `team0110/p1800fl` - `technika` - `tenki` - `tetris` - `tg4x` - `the_royal/liminal` - `the_royal/schwann` - `thevankeyboards/bananasplit` - `thevankeyboards/caravan` - `thevankeyboards/jetvan` - `thevankeyboards/minivan` - `thevankeyboards/roadkit` - `tkc/california` - `tkc/m0lly` - `tkc/tkc1800` - `tkc/tkl_ab87` - `tkw/stoutgat/v2` - `tmo50` - `toad` - `toffee_studio/blueberry` - `tokyokeyboard/alix40` - `tokyokeyboard/tokyo60` - `tominabox1/adalyn` - `tominabox1/le_chiffre` - `tominabox1/qaz` - `tr60w` - `treasure/type9` - `tszaboo/ortho4exent`
Affects: - `oddball` - `oddforge/vea` - `ok60` - `om60` - `omkbd/ergodash/mini` - `omkbd/ergodash/rev1` - `omkbd/runner3680/3x6` - `omkbd/runner3680/3x7` - `omkbd/runner3680/3x8` - `omkbd/runner3680/4x6` - `omkbd/runner3680/4x7` - `omkbd/runner3680/4x8` - `omkbd/runner3680/5x6` - `omkbd/runner3680/5x6_5x8` - `omkbd/runner3680/5x7` - `omkbd/runner3680/5x8` - `omnikeyish` - `orange75` - `org60` - `ortho5by12` - `orthocode`
Affects: - `p3d/eu_isolation` - `p3d/glitch` - `p3d/q4z` - `p3d/synapse` - `p3d/tw40` - `panc40` - `papercranekeyboards/gerald65` - `parallel/parallel_65/hotswap` - `parallel/parallel_65/soldered` - `pdxkbc` - `pearlboards/atlas` - `pearlboards/pandora` - `pearlboards/pearl` - `pearlboards/zeus` - `pearlboards/zeuspad` - `pegasus` - `phantom` - `phoenix` - `picolab/frusta_fundamental` - `pimentoso/paddino02/rev1` - `pimentoso/paddino02/rev2/left` - `pimentoso/paddino02/rev2/right` - `pisces` - `pizzakeyboards/pizza65` - `pkb65` - `planck` - `playkbtw/ca66` - `playkbtw/pk60` - `playkbtw/pk64rgb` - `pluckey` - `plume/plume65` - `plywrks/ahgase` - `plywrks/lune` - `pohjolaworks/louhi` - `polycarbdiet/s20` - `pom_keyboards/tnln95` - `portal_66/hotswap` - `portal_66/soldered` - `pos78`
Affects: - `preonic/rev1` - `preonic/rev2` - `preonic/rev3` - `preonic/rev3_drop` - `primekb/meridian/ktr1010` - `primekb/meridian/ws2812` - `primekb/meridian_rgb` - `primekb/prime_m` - `primekb/prime_o` - `primekb/prime_r` - `projectcain/relic` - `projectcain/vault45` - `projectd/65/projectd_65_ansi` - `projectd/75/ansi` - `projectkb/alice/rev1` - `projectkb/alice/rev2` - `projectkb/signature65` - `projectkb/signature87` - `prototypist/allison` - `prototypist/allison_numpad` - `prototypist/j01` - `psuieee/pluto12` - `pteron36` - `puck` - `punk75`
Affects: - `waldo` - `walletburner/cajal` - `walletburner/neuron` - `wavtype/foundation` - `wavtype/p01_ultra` - `weirdo/geminate60` - `weirdo/kelowna/rgb64` - `weirdo/ls_60` - `weirdo/naiping/np64` - `weirdo/naiping/nphhkb` - `weirdo/naiping/npminila` - `weirdo/tiger910` - `wekey/polaris` - `westfoxtrot/aanzee` - `westfoxtrot/cyclops` - `westfoxtrot/cypher/rev1` - `westfoxtrot/cypher/rev5` - `westfoxtrot/prophet` - `westm/westm9` - `westm/westm68`
Affects: - `qpockets/space_space/rev1` - `qpockets/space_space/rev2` - `quad_h/lb75` - `quantrik/kyuu` - `qwertlekeys/calice` - `rabbit/rabbit68` - `rainkeebs/delilah` - `rainkeebs/rainkeeb` - `rainkeebs/yasui` - `rart/rart45` - `rart/rart4x4` - `rart/rart60` - `rart/rart67` - `rart/rart67m` - `rart/rart75` - `rart/rart75m` - `rart/rartand` - `rart/rartland` - `rart/rartlice` - `rart/rartlite` - `rart/rartpad` - `rate/pistachio/rev1` - `rate/pistachio/rev2` - `rate/pistachio_mp` - `rate/pistachio_pro` - `redox/rev1` - `redscarf_iiplus/verb` - `redscarf_iiplus/verc` - `redscarf_iiplus/verd` - `retro_75` - `reversestudio/decadepad` - `reviung/reviung5` - `reviung/reviung33` - `reviung/reviung34` - `reviung/reviung39` - `reviung/reviung41` - `reviung/reviung53` - `rgbkb/zen/rev1` - `rgbkb/zen/rev2` - `rmi_kb/aelith` - `rmi_kb/chevron` - `rmi_kb/herringbone/pro` - `rmi_kb/herringbone/v1` - `rmi_kb/squishy65` - `rmi_kb/squishyfrl` - `rmi_kb/squishytkl` - `rmi_kb/wete/v1` - `rmi_kb/wete/v2` - `rocketboard_16` - `rominronin/katana60/rev1` - `rominronin/katana60/rev2` - `roseslite` - `rotr` - `rpiguy9907/southpaw66` - `rubi` - `rura66/rev1` - `ryanbaekr/rb1` - `ryanbaekr/rb18` - `ryanbaekr/rb69` - `ryanbaekr/rb86` - `ryanbaekr/rb87` - `ryanskidmore/rskeys100` - `ryloo_studio/m0110`
Affects: - `slz40` - `smithrune/iron160/iron160_s` - `smithrune/iron165r2/f072` - `smithrune/iron165r2/f411` - `smithrune/iron180` - `smithrune/iron180v2/v2h` - `smithrune/iron180v2/v2s` - `smoll/lefty` - `snampad` - `sneakbox/aliceclone` - `sneakbox/disarray/ortho` - `sneakbox/disarray/staggered` - `soup10` - `soy20` - `sparrow62` - `split67` - `splitish` - `splitography` - `star75` - `stello65/beta` - `stello65/hs_rev1` - `stello65/sl_rev1` - `stenokeyboards/the_uni/pro_micro` - `stenokeyboards/the_uni/usb_c` - `strech/soulstone` - `studiokestra/bourgeau` - `studiokestra/cascade` - `studiokestra/frl84` - `studiokestra/galatea/rev1` - `studiokestra/galatea/rev2` - `studiokestra/galatea/rev3` - `studiokestra/line_friends_tkl` - `studiokestra/nascent` - `studiokestra/nue` - `suavity/ehan` - `subatomic` - `switchplate/southpaw_65` - `switchplate/southpaw_fullsize` - `switchplate/switchplate910` - `sx60` - `system76/launch_1`
Affects: - `salicylic_acid3/7skb/rev1` - `salicylic_acid3/7splus` - `salicylic_acid3/ajisai74` - `salicylic_acid3/ergoarrows` - `salicylic_acid3/getta25/rev1` - `salicylic_acid3/jisplit89/rev1` - `salicylic_acid3/nafuda` - `salicylic_acid3/naked48/rev1` - `salicylic_acid3/naked60/rev1` - `salicylic_acid3/naked64/rev1` - `salicylic_acid3/nknl7en` - `salicylic_acid3/nknl7jp` - `salicylic_acid3/setta21/rev1` - `sandwich/keeb68` - `satt/vision` - `sauce/mild` - `scatter42` - `sck/gtm` - `sck/m0116b` - `sck/neiso` - `sekigon/grs_70ec` - `sendyyeah/pix` - `senselessclay/ck65` - `senselessclay/gos65` - `senselessclay/had60` - `sentraq/s60_x/default` - `sentraq/s60_x/rgb` - `sentraq/s65_plus` - `sentraq/s65_x` - `sets3n/kk980` - `shambles` - `shandoncodes/flygone60/rev3` - `shandoncodes/mino/hotswap` - `shapeshifter4060` - `shiro` - `shk9` - `sidderskb/majbritt/rev2` - `sixkeyboard` - `skeletonkbd/skeletonnumpad` - `skme/zeno`
Affects: - `wilba_tech/rama_works_kara` - `wilba_tech/rama_works_koyu` - `wilba_tech/rama_works_m10_b` - `wilba_tech/rama_works_m10_c` - `wilba_tech/rama_works_m50_a` - `wilba_tech/rama_works_m50_ax` - `wilba_tech/rama_works_m60_a` - `wilba_tech/rama_works_m65_b` - `wilba_tech/rama_works_m65_bx` - `wilba_tech/rama_works_m6_a` - `wilba_tech/rama_works_m6_b` - `wilba_tech/rama_works_u80_a` - `wilba_tech/wt60_a` - `wilba_tech/wt60_b` - `wilba_tech/wt60_bx` - `wilba_tech/wt60_c` - `wilba_tech/wt60_d` - `wilba_tech/wt60_g` - `wilba_tech/wt60_g2` - `wilba_tech/wt60_h1` - `wilba_tech/wt60_h2` - `wilba_tech/wt60_h3` - `wilba_tech/wt60_xt` - `wilba_tech/wt65_a` - `wilba_tech/wt65_b` - `wilba_tech/wt65_d` - `wilba_tech/wt65_f` - `wilba_tech/wt65_fx` - `wilba_tech/wt65_g` - `wilba_tech/wt65_g2` - `wilba_tech/wt65_h1` - `wilba_tech/wt65_xt` - `wilba_tech/wt65_xtx` - `wilba_tech/wt69_a` - `wilba_tech/wt70_jb` - `wilba_tech/wt75_a` - `wilba_tech/wt75_b` - `wilba_tech/wt75_c` - `wilba_tech/wt80_a` - `wilba_tech/wt80_g` - `wilba_tech/zeal60` - `wilba_tech/zeal65` - `woodkeys/meira/featherble` - `wsk/alpha9` - `wsk/g4m3ralpha` - `wsk/gothic50` - `wsk/gothic70` - `wsk/houndstooth` - `wsk/jerkin` - `wsk/kodachi50` - `wsk/pain27` - `wsk/sl40` - `wsk/tkl30` - `wuque/ikki68` - `wuque/mammoth20x` - `wuque/mammoth75x` - `wuque/nemui65` - `wuque/tata80/wk` - `wuque/tata80/wkl`
Affects: - `x16` - `xelus/akis` - `xelus/dharma` - `xelus/kangaroo/rev1` - `xelus/kangaroo/rev2` - `xelus/ninjin` - `xelus/pachi/mini_32u4` - `xelus/pachi/rev1` - `xelus/snap96` - `xelus/xs108` - `xiudi/xd60/rev2` - `xiudi/xd60/rev3` - `xiudi/xd68` - `xiudi/xd75` - `xiudi/xd84pro` - `xiudi/xd87` - `xmmx` - `ydkb/chili` - `ydkb/grape` - `ydkb/just60` - `yiancardesigns/barleycorn` - `yiancardesigns/gingham` - `yiancardesigns/seigaiha` - `ymdk/melody96/soldered` - `ymdk/np21` - `ymdk/yd60mq` - `ymdk/ymd09` - `ymdk/ymd67` - `yoichiro/lunakey_mini` - `yushakobo/quick7` - `yynmt/acperience12/rev1` - `yynmt/dozen0` - `yynmt/kagamidget` - `zigotica/z12` - `zigotica/z34` - `zj68` - `zlant` - `zoo/wampus` - `zsa/moonlander` - `ztboards/after` - `ztboards/noon`
* Modify PR23309 changelog Adds a direct link to the pull request. * Add PR23329 changelog * Update keyboard aliases file Updates the legacy keyboard aliases for the JJ40 and JJ50, which have been moved again for version 0.25.0. * Minor touch-up for JJ40 rev1 readme
Co-authored-by: James Young <[email protected]> Co-authored-by: Nick Brassel <[email protected]>
- Remove `develop` notice from readme.
Additionaly corrects files that needed to be modified for newer changes.
This change is in support of qmk/qmk_firmware#22891 which changes the build file marking a build target.
Factors out all common fields for any of the different keyboards, and consolidates them into a top level info.json file.
|
Thank you for your contribution! |
|
Thank you for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merged current upstream into repo.
There should be no functional changes. The merge commit just brought everything up to date, and mode sure all the Framework keyboards/keymaps could compile.
There are two commits after the merge that simply refactor the info.json files to consolidate common fields, as well as fixing a warning about changing from info.json to keyboard.json to mark build targets.
If there is interest, I could also make a PR to the master branch, with just the updates there. I did keep them separate.