Skip to content

Commit

Permalink
firmware fix qmk#2
Browse files Browse the repository at this point in the history
  • Loading branch information
@milletmilletmilletmilletmilletmilletmil
milletmilletmilletmilletmilletmilletmil committed Oct 14, 2023
1 parent b44b521 commit 5c0fea6
Show file tree
Hide file tree
Showing 11 changed files with 179 additions and 48 deletions.
72 changes: 29 additions & 43 deletions keyboards/millet/doksin/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,30 @@
{
"manufacturer": "millet",
"keyboard_name": "doksin",
"maintainer": "millet",
"bootloader": "atmel-dfu",
"bootmagic": {
"enabled": false
},
"diode_direction": "COL2ROW",
"features": {
"audio": false,
"backlight": false,
"bootmagic": false,
"command": false,
"console": false,
"extrakey": false,
"mousekey": false,
"nkro": false,
"rgblight": false,
"swap_hands": false
},
"matrix_pins": {
"direct": [
["D4"]
]
},
"mouse_key": {
"enabled": false
},
"processor": "atmega32u2",
"url": "",
"usb": {
"device_version": "0.0.1",
"pid": "0x1919",
"vid": "0xBDD1"
},
"layouts": {
"LAYOUT": {
"layout": [
{
"manufacturer": "millet",
"keyboard_name": "doksin",
"maintainer": "millet",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true
},
"matrix_pins": {
"direct": [
["D4"]
]
},
"processor": "atmega32u2",
"url": "",
"usb": {
"device_version": "0.0.1",
"pid": "0x1919",
"vid": "0xBDD1"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0}
]
}
}
}
]
}
}
}
2 changes: 0 additions & 2 deletions keyboards/millet/doksin/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
VIA_ENABLE = yes
CONSOLE_ENABLE = no
COMMAND_ENABLE = no
20 changes: 19 additions & 1 deletion keyboards/millet/doksin/readme.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
# DOKСИН
# DOKСИН

![DOKСИН](https://imgur.com/OaDlfwr)

Can be used as a keyboard...

* Keyboard Maintainer: [millet](https://github.com/milletmilletmilletmilletmilletmilletmil)
* Hardware Supported: The DOKСИН PCB
* Hardware Availability: None

Make example for this keyboard (after setting up your build environment):

make millet/doksin:default

Flashing example for this keyboard:

make millet/doksin:default:flash

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
6 changes: 4 additions & 2 deletions keyboards/millet/doksin/config.h → keyboards/millet/family/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.


/* key matrix size */
#define MATRIX_ROWS 1
#define MATRIX_COLS 1
#define MATRIX_ROWS 2
#define MATRIX_COLS 3





56 changes: 56 additions & 0 deletions keyboards/millet/family/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"manufacturer": "millet",
"keyboard_name": "family",
"maintainer": "millet",
"bootloader": "atmel-dfu",
"bootmagic": {
"enabled": false
},
"diode_direction": "COL2ROW",
"features": {
"audio": false,
"backlight": false,
"bootmagic": false,
"command": false,
"console": false,
"extrakey": false,
"mousekey": false,
"nkro": false,
"rgblight": false,
"swap_hands": false
},

"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B4"},
{"pin_a": "B5", "pin_b": "B6"}
]
},

"matrix_pins": {
"cols": ["D1", "D2", "D3"],
"rows": ["B2", "C6"]
},
"mouse_key": {
"enabled": false
},
"processor": "atmega32u2",
"url": "",
"usb": {
"device_version": "0.0.1",
"pid": "0x1910",
"vid": "0xBDD2"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1}
]
}
}
}
39 changes: 39 additions & 0 deletions keyboards/millet/family/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Copyright 2019 Biacco42
*
* 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/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_LEFT, KC_DOWN, KC_RIGHT, KC_ESC, KC_UP, KC_ENT
),
};

bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
tap_code(KC_PGUP);
} else {
tap_code(KC_PGDN);
}
}
return false;
}
4 changes: 4 additions & 0 deletions keyboards/millet/family/keymaps/default/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# これはDOKСИН(ドクシン)のデフォルトキーマップです

1、と入力されます
クソほど下らないですね
23 changes: 23 additions & 0 deletions keyboards/millet/family/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* Copyright 2019 Biacco42
*
* 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/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
KC_1
),

};
3 changes: 3 additions & 0 deletions keyboards/millet/family/keymaps/via/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VIA_ENABLE = yes
CONSOLE_ENABLE = no
COMMAND_ENABLE = no
1 change: 1 addition & 0 deletions keyboards/millet/family/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# ФАМИLY
1 change: 1 addition & 0 deletions keyboards/millet/family/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_ENABLE = yes

0 comments on commit 5c0fea6

Please sign in to comment.