Rebase #4

ghostseven · 2020-10-15T15:57:09Z

No description provided.

Co-authored-by: Ryan <fauxpark@gmail.com>

Make the EVE Meteor IDs both unique and somewhat logical based on the product name. Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com>

in tutorial for combos feature, changed type of compo_index argument of process_combo_event form uint8_t to uint16_t

* start translation docs/ja/isp_flashing_guide.md * Japanese translation is in progress. * Japanese translation is in progress. * Japanese translation is in progress. * Japanese translation is in progress. * Japanese translation is in progress. * Japanese translation is in progress. * Japanese translation is in progress. * update docs/ja/isp_flashing_guide.md * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md * Update docs/ja/isp_flashing_guide.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: Takuya Urakawa <urkwtky@gmail.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: Takuya Urakawa <urkwtky@gmail.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: Takuya Urakawa <urkwtky@gmail.com> * Update docs/ja/isp_flashing_guide.md Co-authored-by: Takuya Urakawa <urkwtky@gmail.com> Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: Takuya Urakawa <urkwtky@gmail.com>

* Update Japanese document. * Left justified. * Update docs/ja/feature_bluetooth.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/feature_bluetooth.md Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: s-show <s1shimz@gmail.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* Rename keyboards/handwired/zergo/keymap.c to keyboards/handwired/zergo/keymaps/default/keymap.c * Update rules.mk * Update rules.mk * Update bootloader.mk * Update rules.mk * Update bootloader.mk * Update info.json * Update rules.mk * Update zergo.h * Update info.json * Update keymap.c * Update keyboards/handwired/zergo/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/zergo/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * update layout * update zergo layout * update layout * Update keyboards/handwired/zergo/keymaps/default/keymap.c Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * [Keyboard] Support MJ63 which is a 60% hotswap RGB keyboard with arrows and the size of left shift is 2U * Update keyboards/melgeek/mj63/mj63.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/rev1/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/mj63/mj63.c Co-authored-by: Joel Challis <git@zvecr.com> * [Keyboard] MelGeek MJ63 * Change the VID and PID * move the mj63.c to the rev1/rev1.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com>

* Add VID/PIDs to ErgoDox EZ * Add VID/PIDs for Planck EZ and Glow revision * Make names consistent * fix typo in docs * Move LED config back, for maximum compatibility * Add revisions for ErgoDox EZ boards * Fix embarassing typo * Typooooo Co-authored-by: Nick Brassel <nick@tzarc.org> * Update Licensing info * Update Moonlander default keymap to match Oryx's default * Fix formatting based on suggestions Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Make indicator LEDs more configurable * Update default keymap * Handle older eeprom settings Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Add VIA keymap for EVE Meteor. * Remove bootmagic flag and add vendor/product IDs. * Update keyboards/eve/meteor/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Increment EVE Vendor ID to be unique. * Change product IDs. Make the EVE Meteor IDs both unique and somewhat logical based on the product name. Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>

* own KBD67 MKII keymap Signed-off-by: Christian Eiden <christian@eiden.ch> * Update keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Signed-off-by: Christian Eiden <christian@eiden.ch> Co-authored-by: Drashna Jaelre <drashna@live.com>

* add voyager60_alps * add readme, add gpl headers * add info.json * include all keys in info.json * fix typo in config.h * Update keyboards/ai03/voyager60_alps/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ai03/voyager60_alps/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ai03/voyager60_alps/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ai03/voyager60_alps/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ai03/voyager60_alps/voyager60_alps.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>

* japanese translation of docs/pr_checklist.md * update docs/ja/pr_checklist.md * update docs/ja/pr_checklist.md * update docs/ja/pr_checklist.md * add :id=lite to docs/ja/custom_matrix.md * add :id=... to docs/ja/custom_quantum_functions.md * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md Co-authored-by: shela <shelaf@users.noreply.github.com> * Update docs/ja/pr_checklist.md * Update docs/ja/pr_checklist.md * Update docs/ja/pr_checklist.md Co-authored-by: s-show <s1shimz@gmail.com> * Update docs/ja/pr_checklist.md Co-authored-by: s-show <s1shimz@gmail.com> Co-authored-by: shela <shelaf@users.noreply.github.com> Co-authored-by: s-show <s1shimz@gmail.com>

Co-authored-by: FilipParyz <paryz.1i12@op.p>

* update reviung34 PRODUCT_ID

* Update Japanese document * Fix inline code * Update docs/ja/other_vscode.md Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

* update "Hardware Availability" * add a section of "How to build" * update "Hardware Supported" * add SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT for rev3_4rows/config.h Co-authored-by: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com>

* on behalf of VashtaNerada commiting his code to get caps lock led working on the soldered E8d E8.5 * Update keyboards/exclusive/e85/soldered/soldered.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>

* adds eosti/planck keymaps * updates eosti keymaps * add header guard to bdn9 config.h Co-authored-by: Joel Challis <git@zvecr.com> * reduce file size of compiled firmware * move console disable to rules.mk Co-authored-by: Joel Challis <git@zvecr.com>

stein3 and others added 30 commits September 26, 2020 19:06

Add VIA keymap for EVE Meteor.

bb15503

Remove bootmagic flag and add vendor/product IDs.

1531087

Update keyboards/eve/meteor/info.json

3e5e4f7

Co-authored-by: Ryan <fauxpark@gmail.com>

Merge branch 'master' into meteor

2e40274

Increment EVE Vendor ID to be unique.

f7cffcb

Change product IDs.

b84b610

Make the EVE Meteor IDs both unique and somewhat logical based on the product name. Co-authored-by: Ryan <fauxpark@gmail.com>

Fix configurator layout helix/rev3_4rows (#10618)

2d4ae0f

Co-authored-by: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com>

changed type of process_combo_event argument in tutorial (#10621)

49abff9

in tutorial for combos feature, changed type of compo_index argument of process_combo_event form uint8_t to uint16_t

Update Japanese document (#10603)

c66d65d

Update Japanese document. (#10589)

216f9ed

Update Japanese document. (#10599)

a4efb55

Update Japanese document (#10601)

975c242

Update Japanese document (#10605)

3d9fff1

Partial fix for sendstring_french.h (#10623)

6c78f80

Remove bootloader_defs.h for some F072 boards (#10582)

adc06c5

Add STM32Duino to bootloader selection (#10558)

d46b8ef

Fix typo within debounce documentation (#10600)

4d59657

updating my own keyboard layout (#10626)

30c65a2

Update tags to check for document updates (#10606)

b4e7d4f

[Keyboard] update boot-mode method for EVE Meteor docs (#10453)

451e600

Update Japanese document (#10607)

f706e1e

Filip Paryż and others added 10 commits October 14, 2020 13:41

Fix for issue #10386 - Can't compile preonic:dudeofawesome (#10557)

381884f

Co-authored-by: FilipParyz <paryz.1i12@op.p>

Whitefox refactor (#10175)

7437a38

Update reviung34 PRODUCT_ID (#10480)

49dd1ed

* update reviung34 PRODUCT_ID

Fix issues with suspend code for ZSA split boards (#10640)

6aae926

Update other_vscode.md of Japanese document (#10604)

a2af0a3

* Update Japanese document * Fix inline code * Update docs/ja/other_vscode.md Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

adds eosti/planck keymaps (#10616)

af2c506

Fix STM32duino bootloader (#10648)

b0dbe73

update eosti keymaps (#10610)

2c5ad91

* adds eosti/planck keymaps * updates eosti keymaps * add header guard to bdn9 config.h Co-authored-by: Joel Challis <git@zvecr.com> * reduce file size of compiled firmware * move console disable to rules.mk Co-authored-by: Joel Challis <git@zvecr.com>

ghostseven merged commit a4bef83 into ghostseven:master Oct 15, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase #4

Rebase #4

ghostseven commented Oct 15, 2020

Rebase #4

Rebase #4

Conversation

ghostseven commented Oct 15, 2020