Tokyo Keyboard alix40 initial commit #11918

quadcube · 2021-02-15T13:40:37Z

Description

New keyboard vendor directory under tokyokeyboard
~~Moved tokyo60 into new tokyokeyboard directory~~
Added alix40 with BLE and VIA support

Types of Changes

Issues Fixed or Closed by This PR

Checklist

My code follows the code style of this project: C, Python
I have read the PR Checklist document and have made the appropriate changes.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

…percentage calculation

This reverts commit 5b8c41d.

quadcube · 2021-02-15T13:52:31Z

@alvn alix40 PR

quadcube · 2021-02-17T08:49:45Z

@fauxpark Hi, could you help me to review this pull request? Thanks!

zvecr

Moved tokyo60 into new tokyokeyboard directory

This change will have to go via develop and not directly to master, I suggest breaking it out into its own PR as to not slow down the rest of the changes.

keyboards/tokyokeyboard/alix40/alix40.c

keyboards/tokyokeyboard/alix40/config.h

keyboards/tokyokeyboard/alix40/readme.md

keyboards/tokyokeyboard/alix40/rules.mk

quadcube · 2021-02-19T17:16:50Z

Moved tokyo60 into new tokyokeyboard directory

This change will have to go via develop and not directly to master, I suggest breaking it out into its own PR as to not slow down the rest of the changes.

I have removed tokyo60 folder relocation from this PR. Will open another PR via the develop branch. Thank you for the review and suggestions!

drashna

Could you add a GPL2+ compatible license header to all of the c and h files?

For instance:

qmk_firmware/quantum/template/base/keyboard.c

Lines 1 to 15 in 28ff511

    
           /* Copyright %YEAR% %YOUR_NAME% 
        
            * 
        
            * This program is free software: you can redistribute it and/or modify 
        
            * it under the terms of the GNU General Public License as published by 
        
            * the Free Software Foundation, either version 2 of the License, or 
        
            * (at your option) any later version. 
        
            * 
        
            * This program is distributed in the hope that it will be useful, 
        
            * but WITHOUT ANY WARRANTY; without even the implied warranty of 
        
            * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
        
            * GNU General Public License for more details. 
        
            * 
        
            * You should have received a copy of the GNU General Public License 
        
            * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
        
            */

keyboards/tokyokeyboard/alix40/config.h

keyboards/tokyokeyboard/alix40/keymaps/default/config.h

keyboards/tokyokeyboard/alix40/keymaps/default/keymap.c

keyboards/tokyokeyboard/alix40/keymaps/via/keymap.c

keyboards/tokyokeyboard/alix40/readme.md

keyboards/tokyokeyboard/alix40/rules.mk

…g.h.

keyboards/tokyokeyboard/alix40/rules.mk

keyboards/tokyokeyboard/alix40/alix40.c

keyboards/tokyokeyboard/alix40/config.h

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

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: QuadCube <quadcube@QuadCube-Mac-mini.local>

quadcube and others added 15 commits March 4, 2020 23:21

Enable battery BLE GATT service and introduced linear li-ion battery …

559220f

…percentage calculation

Merge branch 'master' of git://github.com/qmk/qmk_firmware

7b37cf6

Updated with alix40 source code. Rearranged into tokyokeyboard/

14ff77f

Updated readme with more info.

bf3566f

Added support for VIA.

3822ab0

Merge branch 'master' of https://github.com/quadcube/qmk_firmware

bfd9888

Updated readme with battery toggle switch indication

1f2744b

Added VIA support for alix40

b64d812

Merge branch 'master' of https://github.com/quadcube/qmk_firmware

85d5d74

Removed modification for adafruit_ble.cpp

5b8c41d

Revert "Removed modification for adafruit_ble.cpp"

4924ba3

This reverts commit 5b8c41d.

Revert tmk_core/protocol/lufa/adafruit_ble.cpp back to qmk:master

a4f543e

Removed not related keymap folder.

e929e30

Updated info.json with correct keymap

ebfacda

Fixed lint check regarding missing layout issue

551ab4f

github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Feb 15, 2021

quadcube mentioned this pull request Feb 16, 2021

Add support for tokyokeyboard's alix40 the-via/keyboards#575

Merged

6 tasks

Added missing BATTERY_LEVEL_PIN declaration

ae790b5

zvecr requested changes Feb 18, 2021

View reviewed changes

zvecr requested a review from a team February 18, 2021 23:50

quadcube added 2 commits February 20, 2021 00:50

Resolved all requested change.

85a9852

Revert tokyo60 files to ori.

f311b8c

quadcube requested review from zvecr and removed request for a team February 19, 2021 17:17

drashna requested changes Feb 20, 2021

View reviewed changes

keyboards/tokyokeyboard/alix40/config.h Show resolved Hide resolved

keyboards/tokyokeyboard/alix40/config.h Outdated Show resolved Hide resolved

quadcube added 2 commits February 20, 2021 13:23

Added GPL2+ compatible license headers in all .h, .c files.

5763e49

Removed unused backup files.

a380b25

fauxpark requested changes Feb 20, 2021

View reviewed changes

quadcube added 2 commits February 20, 2021 15:57

Remove "/" from keymap files, clean up rules.mk, removed unused confi…

72cb64a

…g.h.

Merge branch 'master' of https://github.com/quadcube/qmk_firmware

d18ea3e

fauxpark requested changes Feb 20, 2021

View reviewed changes

Removed redundant code in alix40,c, clean up rules.mk

7f6121e

fauxpark requested changes Feb 20, 2021

View reviewed changes

keyboards/tokyokeyboard/alix40/config.h Outdated Show resolved Hide resolved

quadcube and others added 2 commits February 20, 2021 18:12

Update keyboards/tokyokeyboard/alix40/config.h

60161f1

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

Remove description in config.h

a14dc81

Co-authored-by: Drashna Jaelre <drashna@live.com>

fauxpark approved these changes Feb 20, 2021

View reviewed changes

drashna approved these changes Feb 22, 2021

View reviewed changes

drashna merged commit 37e14fd into qmk:master Feb 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tokyo Keyboard alix40 initial commit #11918

Tokyo Keyboard alix40 initial commit #11918

quadcube commented Feb 15, 2021 •

edited

Loading

quadcube commented Feb 15, 2021

quadcube commented Feb 17, 2021

zvecr left a comment

quadcube commented Feb 19, 2021

drashna left a comment

	/* Copyright %YEAR% %YOUR_NAME%
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 2 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	*/

Tokyo Keyboard alix40 initial commit #11918

Tokyo Keyboard alix40 initial commit #11918

Conversation

quadcube commented Feb 15, 2021 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

quadcube commented Feb 15, 2021

quadcube commented Feb 17, 2021

zvecr left a comment

Choose a reason for hiding this comment

quadcube commented Feb 19, 2021

drashna left a comment

Choose a reason for hiding this comment

quadcube commented Feb 15, 2021 •

edited

Loading