forked from mirrors/qmk_userspace
		
	[Keyboard] Fix compilation issues for Pearlboards (#15562)
This commit is contained in:
		
					parent
					
						
							
								d563ab052e
							
						
					
				
			
			
				commit
				
					
						db149052c3
					
				
			
		
					 3 changed files with 52 additions and 30 deletions
				
			
		| 
						 | 
				
			
			@ -17,7 +17,11 @@
 | 
			
		|||
#include "pandora.h"
 | 
			
		||||
 | 
			
		||||
// Encoder rotate function
 | 
			
		||||
bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		||||
#ifdef ENCODER_ENABLE
 | 
			
		||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
 | 
			
		||||
    if (!encoder_update_user(index, clockwise)) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
    /* First encoder */
 | 
			
		||||
    if (index == 0) {
 | 
			
		||||
        if (clockwise) {
 | 
			
		||||
| 
						 | 
				
			
			@ -28,8 +32,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		|||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Encoder click function
 | 
			
		||||
bool dip_switch_update_user(uint8_t index, bool active) {
 | 
			
		||||
#ifdef DIP_SWITCH_ENABLE
 | 
			
		||||
bool dip_switch_update_kb(uint8_t index, bool active) {
 | 
			
		||||
    if (!dip_switch_update_user(index, active)) { return false; }
 | 
			
		||||
 | 
			
		||||
    switch (index) {
 | 
			
		||||
    /* First encoder */
 | 
			
		||||
    case 0:
 | 
			
		||||
| 
						 | 
				
			
			@ -40,3 +49,4 @@ bool dip_switch_update_user(uint8_t index, bool active) {
 | 
			
		|||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,8 +17,11 @@
 | 
			
		|||
#include "zeus.h"
 | 
			
		||||
 | 
			
		||||
// Encoder rotate function
 | 
			
		||||
bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		||||
    /* First encoder */
 | 
			
		||||
#ifdef ENCODER_ENABLE
 | 
			
		||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
 | 
			
		||||
    if (!encoder_update_user(index, clockwise)) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }    /* First encoder */
 | 
			
		||||
    if (index == 0) {
 | 
			
		||||
        if (clockwise) {
 | 
			
		||||
            tap_code(KC_AUDIO_VOL_UP);
 | 
			
		||||
| 
						 | 
				
			
			@ -28,3 +31,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		|||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,21 +17,29 @@
 | 
			
		|||
#include "zeuspad.h"
 | 
			
		||||
 | 
			
		||||
// Encoder rotate function
 | 
			
		||||
bool encoder_update_user(uint8_t index, bool clockwise) {
 | 
			
		||||
#ifdef ENCODER_ENABLE
 | 
			
		||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
 | 
			
		||||
    if (!encoder_update_user(index, clockwise)) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
    /* First encoder */
 | 
			
		||||
    if (index == 0) {
 | 
			
		||||
        if (clockwise) {
 | 
			
		||||
            tap_code(KC_AUDIO_VOL_UP);
 | 
			
		||||
            tap_code_delay(KC_AUDIO_VOL_UP, 10);
 | 
			
		||||
        } else {
 | 
			
		||||
            tap_code(KC_AUDIO_VOL_DOWN);
 | 
			
		||||
            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// 21 characters max
 | 
			
		||||
#ifdef OLED_ENABLE
 | 
			
		||||
void oled_task_user(void) {
 | 
			
		||||
bool oled_task_kb(void) {
 | 
			
		||||
    if (oled_task_user()) {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
    oled_write_P(PSTR("ZEUSPAD BY KOOBACZECH"), false);
 | 
			
		||||
    // Keyboard Layer Status
 | 
			
		||||
    oled_write_P(PSTR("LAYER: "), false);
 | 
			
		||||
| 
						 | 
				
			
			@ -54,14 +62,14 @@ void oled_task_user(void) {
 | 
			
		|||
            // Or use the write_ln shortcut over adding '\n' to the end of your string
 | 
			
		||||
            oled_write_P(PSTR("RGB"), false);
 | 
			
		||||
            static char led_buf[30];
 | 
			
		||||
          snprintf(led_buf, sizeof(led_buf) - 1, "\nMODE:%2d BRIGHT:%2d/10",
 | 
			
		||||
          (uint8_t)(rgblight_get_mode()),
 | 
			
		||||
          (uint8_t)(rgblight_get_val()/25.5));
 | 
			
		||||
            snprintf(led_buf, sizeof(led_buf) - 1, "\nMODE:%2d BRIGHT:%2d/10", (uint8_t)(rgblight_get_mode()), (uint8_t)(rgblight_get_val() / 25.5));
 | 
			
		||||
            oled_write(led_buf, false);
 | 
			
		||||
            break;
 | 
			
		||||
        default:
 | 
			
		||||
            oled_write_ln_P(PSTR(""), false);
 | 
			
		||||
            oled_write_P(PSTR("\n"), false);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue