Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Keyboard] Add zoom75 wired #20396

Merged
merged 17 commits into from
Apr 16, 2023
Merged

[Keyboard] Add zoom75 wired #20396

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fcadc11
update
spbgzh Mar 22, 2023
7d5fc80
add
spbgzh Apr 10, 2023
de55ab1
update
spbgzh Apr 10, 2023
6b233dd
update
spbgzh Apr 10, 2023
3382a44
update
spbgzh Apr 10, 2023
bc31e54
bug fix
spbgzh Apr 10, 2023
186e3bc
Update zoom75.h
spbgzh Apr 10, 2023
88fbb97
fix
spbgzh Apr 10, 2023
81be3c2
fix
spbgzh Apr 10, 2023
1770a70
update
spbgzh Apr 10, 2023
165127c
fix key
spbgzh Apr 10, 2023
e8c23a1
update
spbgzh Apr 10, 2023
6709de2
update
spbgzh Apr 10, 2023
d100a00
update
spbgzh Apr 10, 2023
69dd290
update
spbgzh Apr 10, 2023
ee9d9c2
Specify a specific version
spbgzh Apr 12, 2023
f1a7848
Update readme.md
spbgzh Apr 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions keyboards/meletrix/zoom75/config.h
View file
Open in desktop
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* Copyright 2023 meletrix
*
* 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/>.
*/

spbgzh marked this conversation as resolved.
Show resolved Hide resolved
#pragma once

// Loaction { { col, row } )
#define ENCODERS_CW_KEY { { 3, 5 } }
#define ENCODERS_CCW_KEY { { 4, 5 } }
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
151 changes: 151 additions & 0 deletions keyboards/meletrix/zoom75/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
{
"keyboard_name": "zoom75",
"manufacturer": "meletrix",
"url": "https://zoom-75.com/",
"maintainer": "spbgzh",
"usb": {
"vid": "0x806D",
"pid": "0x0006",
"device_version": "0.0.1"
},

"encoder": {
"rotary": [
{"pin_a": "B0", "pin_b": "B1", "resolution": 2}
]
},
"indicators": {
"caps_lock": "F6",
"on_state": 0
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"rows": ["F4", "F1", "F0", "C6", "B6", "F5"],
"cols": [
"C7",
"D5",
"B5",
"B4",
"D7",
"D6",
"D4",
"D3",
"D2",
"D1",
"D0",
"B7",
"B2",
"B3",
"F7"
]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "F1", "x": 1.25, "y": 0 },
{ "label": "F2", "x": 2.25, "y": 0 },
{ "label": "F3", "x": 3.25, "y": 0 },
{ "label": "F4", "x": 4.25, "y": 0 },
{ "label": "F5", "x": 5.5, "y": 0 },
{ "label": "F6", "x": 6.5, "y": 0 },
{ "label": "F7", "x": 7.5, "y": 0 },
{ "label": "F8", "x": 8.5, "y": 0 },
{ "label": "F9", "x": 9.75, "y": 0 },
{ "label": "F10", "x": 10.75, "y": 0 },
{ "label": "F11", "x": 11.75, "y": 0 },
{ "label": "F12", "x": 12.75, "y": 0 },
{ "label": "F13", "x": 14, "y": 0 },
{ "label": "Encoder", "x": 16.25, "y": 0 },

{ "label": "~", "x": 0, "y": 1.25 },
{ "label": "1", "x": 1, "y": 1.25 },
{ "label": "2", "x": 2, "y": 1.25 },
{ "label": "3", "x": 3, "y": 1.25 },
{ "label": "4", "x": 4, "y": 1.25 },
{ "label": "5", "x": 5, "y": 1.25 },
{ "label": "6", "x": 6, "y": 1.25 },
{ "label": "7", "x": 7, "y": 1.25 },
{ "label": "8", "x": 8, "y": 1.25 },
{ "label": "9", "x": 9, "y": 1.25 },
{ "label": "0", "x": 10, "y": 1.25 },
{ "label": "-", "x": 11, "y": 1.25 },
{ "label": "=", "x": 12, "y": 1.25 },
{ "label": "Backspace", "x": 13, "y": 1.25 },
{ "label": "Delect", "x": 15, "y": 1.25 },

{ "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 2.25 },
{ "label": "W", "x": 2.5, "y": 2.25 },
{ "label": "E", "x": 3.5, "y": 2.25 },
{ "label": "R", "x": 4.5, "y": 2.25 },
{ "label": "T", "x": 5.5, "y": 2.25 },
{ "label": "Y", "x": 6.5, "y": 2.25 },
{ "label": "U", "x": 7.5, "y": 2.25 },
{ "label": "I", "x": 8.5, "y": 2.25 },
{ "label": "O", "x": 9.5, "y": 2.25 },
{ "label": "P", "x": 10.5, "y": 2.25 },
{ "label": "[", "x": 11.5, "y": 2.25 },
{ "label": "]", "x": 12.5, "y": 2.25 },
{ "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
{ "label": "PageUp", "x": 15, "y": 2.25 },

{ "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 3.25 },
{ "label": "S", "x": 2.75, "y": 3.25 },
{ "label": "D", "x": 3.75, "y": 3.25 },
{ "label": "F", "x": 4.75, "y": 3.25 },
{ "label": "G", "x": 5.75, "y": 3.25 },
{ "label": "H", "x": 6.75, "y": 3.25 },
{ "label": "J", "x": 7.75, "y": 3.25 },
{ "label": "K", "x": 8.75, "y": 3.25 },
{ "label": "L", "x": 9.75, "y": 3.25 },
{ "label": ";", "x": 10.75, "y": 3.25 },
{ "label": "'", "x": 11.75, "y": 3.25 },
{ "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
{ "label": "Backspace1", "x": 14, "y": 1.25 },
{ "label": "PageDown", "x": 15, "y": 3.25 },

{ "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
{ "label": "Shift2", "x": 1.25, "y": 4.25 },
{ "label": "Z", "x": 2.25, "y": 4.25 },
{ "label": "X", "x": 3.25, "y": 4.25 },
{ "label": "C", "x": 4.25, "y": 4.25 },
{ "label": "V", "x": 5.25, "y": 4.25 },
{ "label": "B", "x": 6.25, "y": 4.25 },
{ "label": "N", "x": 7.25, "y": 4.25 },
{ "label": "M", "x": 8.25, "y": 4.25 },
{ "label": ",", "x": 9.25, "y": 4.25 },
{ "label": ".", "x": 10.25, "y": 4.25 },
{ "label": "/", "x": 11.25, "y": 4.25 },
{ "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
{ "label": "\u2191", "x": 14, "y": 4.25 },

{ "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
{ "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },

{ "label": "EA", "x": 15.25, "y": 0 },
{ "label": "EB", "x": 17.25, "y": 0 },
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
{ "x": 3.75, "y": 5.25, "w": 2.25 },
{ "x": 6, "y": 5.25, "w": 1.25 },
{ "x": 7.25, "y": 5.25, "w": 2.75 },
{ "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
{ "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 },
{ "label": "\u2190", "x": 13, "y": 5.25 },
{ "label": "\u2193", "x": 14, "y": 5.25 },
{ "label": "\u2192", "x": 15, "y": 5.25 }
]
}
}
}
36 changes: 36 additions & 0 deletions keyboards/meletrix/zoom75/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* Copyright 2023 meletrix
*
* 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_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_VOLU, KC_MUTE, KC_VOLD,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_MPLY, KC_MPRV,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
95 changes: 95 additions & 0 deletions keyboards/meletrix/zoom75/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/* Copyright 2023 meletrix
*
* 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


static uint8_t encoder_state[NUM_ENCODERS] = {0};
static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY;
static keypos_t encoder_ccw[NUM_ENCODERS] = ENCODERS_CCW_KEY;

void encoder_action_unregister(void)
{
for (int index = 0; index < NUM_ENCODERS; ++index)
{
if (encoder_state[index])
{
keyevent_t encoder_event = (keyevent_t){
.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
.pressed = false,
.time = (timer_read() | 1)};
encoder_state[index] = 0;
action_exec(encoder_event);
}
}
}
void encoder_action_register(uint8_t index, bool clockwise)
{
keyevent_t encoder_event = (keyevent_t){
.key = clockwise ? encoder_cw[index] : encoder_ccw[index],
.pressed = true,
.time = (timer_read() | 1)};
encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
action_exec(encoder_event);
}

void matrix_scan_kb(void)
{
encoder_action_unregister();
matrix_scan_user();
}

bool encoder_update_kb(uint8_t index, bool clockwise)
{
encoder_action_register(index, clockwise);
return true;
}
spbgzh marked this conversation as resolved.
Show resolved Hide resolved


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_VOLU, KC_MUTE, KC_VOLD,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT
),
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_MPLY, KC_MPRV,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
};
3 changes: 3 additions & 0 deletions keyboards/meletrix/zoom75/keymaps/via/rules.mk
View file
Open in desktop
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
ENCODER_MAP_ENABLE = yes
27 changes: 27 additions & 0 deletions keyboards/meletrix/zoom75/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# zoom75

More Info at [meletrix](https://meletrix.com/)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please clarify here how this sits/interacts with the bluetooth hardware, to avoid inevitable confusion.

Copy link
Contributor Author

@spbgzh spbgzh Apr 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know either, I am just a college student, I write single mode version.😂 Bluetooth version solutions should be provided by third-party contractors. And they provided screen solutions too. I'm also curious about how to realize Bluetooth n-keys.
🤨

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is the product I write: https://meletrix.com/products/zoom75-essential-edition-black-wired

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So in that case, you'd probably want to add text specifying that this entry for the Zoom75 is only for the wired variant and not for the BT/Tri-mode variant, so as to not add confusion.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, specified version.

​

* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
* Hardware Supported: zoom 75
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
* Hardware Availability: [zoom75](https://meletrix.com/collections/zoom75-collection#)
​

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

make meletrix/zoom75:default

Flashing example for this keyboard:

make meletrix/zoom75:default:flash

## Bootloader

Enter the bootloader using one of the following methods:

* Tap the Reset switch mounted on the PCB
* In the case of the default keymap, use the key combination Fn + Delect
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
* Hold the Esc key while connecting the USB cable (also erases persistent settings)

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).
3 changes: 3 additions & 0 deletions keyboards/meletrix/zoom75/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
ENCODER_ENABLE = yes # Enable encoder function
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
25 changes: 25 additions & 0 deletions keyboards/meletrix/zoom75/zoom75.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* Copyright 2023 meletrix
*
* 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/>.
*/

spbgzh marked this conversation as resolved.
Show resolved Hide resolved
#include "zoom75.h"

#ifndef VIA_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
return true;
}
#endif
spbgzh marked this conversation as resolved.
Show resolved Hide resolved
Loading