summaryrefslogtreecommitdiff
path: root/keyboards/1upkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/1upkeyboards')
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c3
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c32
-rw-r--r--keyboards/1upkeyboards/sweet16/rules.mk2
-rw-r--r--keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c4
4 files changed, 21 insertions, 20 deletions
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
index 4778d2108c..9ab912d7b5 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef ENCODER_ENABLE
#include "encoder.h"
-void encoder_update_user(int8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
tap_code(KC_VOLU);
@@ -35,5 +35,6 @@ void encoder_update_user(int8_t index, bool clockwise) {
tap_code(KC_VOLD);
}
}
+ return true;
}
#endif
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
index ad9786ba7f..7e6d131307 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
@@ -91,21 +91,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
switch(keycode) {
- case CLOUD: // (っ◕‿◕)っ
+ case CLOUD:
if(record->event.pressed){
- send_unicode_hex_string("0028 3063 25D5 203F 25D5 0029 3063");
+ send_unicode_string("(っ◕‿◕)っ");
}
return false;
break;
- case FU: // t(-_-t)
+ case FU:
if(record->event.pressed){
SEND_STRING("t(-_-t)");
}
return false;
break;
- case HAPPYFACE: // ʘ‿ʘ
+ case HAPPYFACE:
if(record->event.pressed){
- send_unicode_hex_string("0298 203F 0298");
+ send_unicode_string("ʘ‿ʘ");
}
return false;
break;
@@ -118,33 +118,33 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
- case SHRUG: // ¯\_(ツ)_/¯
+ case SHRUG:
if (record->event.pressed) {
- send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
+ send_unicode_string("¯\\_(ツ)_/¯");
}
return false;
break;
- case HEARTFACE: // ♥‿♥
+ case HEARTFACE:
if(record->event.pressed){
- send_unicode_hex_string("2665 203F 2665");
+ send_unicode_string("♥‿♥");
}
return false;
break;
- case DISFACE: // ಠ_ಠ
+ case DISFACE:
if(record->event.pressed){
- send_unicode_hex_string("0CA0 005F 0CA0");
+ send_unicode_string("ಠ_ಠ");
}
return false;
break;
- case TFLIP: // (╯°□°)╯ ︵ ┻━┻
+ case TFLIP:
if(record->event.pressed){
- send_unicode_hex_string("0028 256F 00B0 25A1 00B0 0029 256F 0020 FE35 0020 253B 2501 253B");
+ send_unicode_string("(╯°□°)╯ ︵ ┻━┻");
}
return false;
break;
- case TFLIP2: // ┻━┻︵ \(°□°)/ ︵ ┻━┻
+ case TFLIP2:
if(record->event.pressed){
- send_unicode_hex_string("253B 2501 253B FE35 0020 005C 0028 00B0 25A1 00B0 0029 002F 0020 FE35 0020 253B 2501 253B");
+ send_unicode_string("┻━┻︵ \\(°□°)/ ︵ ┻━┻");
}
return false;
break;
@@ -212,4 +212,4 @@ uint32_t layer_state_set_user(uint32_t state) {
break;
}
return state;
-} \ No newline at end of file
+}
diff --git a/keyboards/1upkeyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk
index d7e57eb33e..22f9c36e64 100644
--- a/keyboards/1upkeyboards/sweet16/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/rules.mk
@@ -1,7 +1,7 @@
# Build Options
#
DEFAULT_FOLDER = 1upkeyboards/sweet16/v1
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
index 0176dc1a3c..d850a3b5c6 100644
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
@@ -2,7 +2,7 @@
#include "encoder.h"
#ifdef ENCODER_ENABLED
-void encoder_update_kb(int8_t index, bool clockwise) {
- encoder_update_user(index, clockwise);
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ return encoder_update_user(index, clockwise);
}
#endif