aboutsummaryrefslogtreecommitdiff
path: root/keyboards/inland
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/inland')
-rw-r--r--keyboards/inland/kb83/halconf.h2
-rw-r--r--keyboards/inland/kb83/kb83.c6
-rw-r--r--keyboards/inland/kb83/keyboard.json2
-rw-r--r--keyboards/inland/kb83/keymaps/default/keymap.c8
-rw-r--r--keyboards/inland/kb83/keymaps/default/rules.mk1
-rw-r--r--keyboards/inland/mk47/halconf.h2
-rw-r--r--keyboards/inland/mk47/keyboard.json3
-rw-r--r--keyboards/inland/v83p/halconf.h2
-rw-r--r--keyboards/inland/v83p/keyboard.json2
9 files changed, 7 insertions, 21 deletions
diff --git a/keyboards/inland/kb83/halconf.h b/keyboards/inland/kb83/halconf.h
index 2f64e65393..2ddb9c35d8 100644
--- a/keyboards/inland/kb83/halconf.h
+++ b/keyboards/inland/kb83/halconf.h
@@ -17,7 +17,5 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/inland/kb83/kb83.c b/keyboards/inland/kb83/kb83.c
index 1052131a91..07d8bdbdb4 100644
--- a/keyboards/inland/kb83/kb83.c
+++ b/keyboards/inland/kb83/kb83.c
@@ -313,11 +313,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
return false;
}
if (index == 0) {
- default_layer_set(1UL << (active ? 2 : 0));
- }
- if(active){
- keymap_config.no_gui = 0;
- eeconfig_update_keymap(keymap_config.raw);
+ default_layer_set(1UL << (active ? MAC_B : WIN_B));
}
return true;
}
diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json
index 4c82a557ee..2920da52e1 100644
--- a/keyboards/inland/kb83/keyboard.json
+++ b/keyboards/inland/kb83/keyboard.json
@@ -60,7 +60,7 @@
},
"encoder": {
"rotary": [
- {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
+ {"pin_a": "B13", "pin_b": "B14", "resolution": 4}
]
},
"qmk": {
diff --git a/keyboards/inland/kb83/keymaps/default/keymap.c b/keyboards/inland/kb83/keymaps/default/keymap.c
index a564e4e4e1..df7df65678 100644
--- a/keyboards/inland/kb83/keymaps/default/keymap.c
+++ b/keyboards/inland/kb83/keymaps/default/keymap.c
@@ -64,10 +64,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
- [WIN_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) },
- [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
- [MAC_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) },
+ [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
+ [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
};
#endif
diff --git a/keyboards/inland/kb83/keymaps/default/rules.mk b/keyboards/inland/kb83/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/inland/kb83/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/inland/mk47/halconf.h b/keyboards/inland/mk47/halconf.h
index 55bfe5c977..b8ebdb3369 100644
--- a/keyboards/inland/mk47/halconf.h
+++ b/keyboards/inland/mk47/halconf.h
@@ -17,7 +17,5 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/inland/mk47/keyboard.json b/keyboards/inland/mk47/keyboard.json
index b6404f58b2..a69ec2ac4a 100644
--- a/keyboards/inland/mk47/keyboard.json
+++ b/keyboards/inland/mk47/keyboard.json
@@ -2,7 +2,6 @@
"keyboard_name": "MK47",
"manufacturer": "Inland",
"maintainer": "jonylee@hfd",
- "url":"",
"usb": {
"vid": "0xFFFE",
"pid": "0x0002",
@@ -16,8 +15,6 @@
"bootmagic": true,
"mousekey": false,
"extrakey": true,
- "console": false,
- "command": false,
"nkro": true,
"rgb_matrix": true
},
diff --git a/keyboards/inland/v83p/halconf.h b/keyboards/inland/v83p/halconf.h
index fcd8b7216a..f3178d93f0 100644
--- a/keyboards/inland/v83p/halconf.h
+++ b/keyboards/inland/v83p/halconf.h
@@ -5,7 +5,5 @@
#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>
diff --git a/keyboards/inland/v83p/keyboard.json b/keyboards/inland/v83p/keyboard.json
index 139cfb693b..5fad1a96d4 100644
--- a/keyboards/inland/v83p/keyboard.json
+++ b/keyboards/inland/v83p/keyboard.json
@@ -21,8 +21,6 @@
},
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,