Skip to content

Commit

Permalink
fix lint issues for voyager
Browse files Browse the repository at this point in the history
  • Loading branch information
drashna committed Oct 2, 2023
1 parent 9a95ca8 commit 0b30bf5
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ user_song_list.h
/users/
/layouts/
/keyboards/*

!/keyboards/planck
!/keyboards/moonlander
!/keyboards/ergodox_ez
!/keyboards/voyager
# clangd
compile_commands.json
.clangd/
Expand Down
Binary file removed keyboards/voyager/.DS_Store
Binary file not shown.
19 changes: 17 additions & 2 deletions keyboards/voyager/gd32/chconf.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
#pragma once
/* Copyright 2021 QMK
*
* 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 3 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 <https://www.gnu.org/licenses/>.
*/

#pragma once

#define CH_CFG_ST_RESOLUTION 16

Expand All @@ -11,4 +27,3 @@
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE

#include_next <chconf.h>

8 changes: 7 additions & 1 deletion keyboards/voyager/gd32/config.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define GD32
#define FEE_PAGE_SIZE 0x400
#define FEE_PAGE_COUNT 2
#define FEE_MCU_FLASH_SIZE 256
#define FEE_MCU_FLASH_SIZE 256
5 changes: 4 additions & 1 deletion keyboards/voyager/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
"pid": "0x1977",
"device_version": "0.0.1"
},
"layout_aliases": {
"LAYOUT_voyager": "LAYOUT"
},
"layouts": {
"LAYOUT_voyager": {
"LAYOUT": {
"layout": [
{
"x": 3,
Expand Down
4 changes: 4 additions & 0 deletions keyboards/voyager/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright 2023 ZSA Technology Labs, Inc <@zsa>
// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H
#include "version.h"

Expand Down
2 changes: 1 addition & 1 deletion keyboards/voyager/mcuconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include_next "mcuconf.h"
#include_next <mcuconf.h>

// for i2c expander, and ISSI
#undef STM32_I2C_USE_I2C1
Expand Down
2 changes: 1 addition & 1 deletion keyboards/voyager/voyager.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extern bool mcp23018_leds[];
#define STATUS_LED_4(status) mcp23018_leds[1] = (bool)status

// clang-format off
#define LAYOUT_voyager( \
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k26, k27, k28, k29, k30, k31, \
k06, k07, k08, k09, k10, k11, k32, k33, k34, k35, k36, k37, \
k12, k13, k14, k15, k16, k17, k38, k39, k40, k41, k42, k43, \
Expand Down

0 comments on commit 0b30bf5

Please sign in to comment.