Skip to content

Commit

Permalink
fix: Remove OLED support (qmk#18719)
Browse files Browse the repository at this point in the history 
* fix: Remove OLED support

* redundant files

Co-authored-by: zvecr <git@zvecr.com>
  • Loading branch information
@riblee @zvecr
riblee and zvecr committed Oct 15, 2022
1 parent 1e726a1 commit ccdd289
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 159 deletions.
2 changes: 0 additions & 2 deletions keyboards/handwired/riblee_f411/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,3 @@
#define MOUSEKEY_INTERVAL 32

#define TAPPING_TERM 175

#define OLED_DISPLAY_128X64
27 changes: 0 additions & 27 deletions keyboards/handwired/riblee_f411/halconf.h
View file

This file was deleted.

22 changes: 0 additions & 22 deletions keyboards/handwired/riblee_f411/mcuconf.h
View file

This file was deleted.

4 changes: 0 additions & 4 deletions keyboards/handwired/riblee_f411/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

LAYOUTS = ortho_5x12

OLED_ENABLE = yes
OLED_DRIVER = SSD1306
RAW_ENABLE = yes
104 changes: 0 additions & 104 deletions users/riblee/riblee.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

#include "riblee.h"
#include "raw_hid.h"
#include <string.h>

// Tap Dance functions
Expand Down Expand Up @@ -166,109 +165,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
};

#ifdef OLED_ENABLE

static char receive_buffer[128] = {};
static uint8_t receive_buffer_length = 0;
uint16_t startup_timer;

oled_rotation_t oled_init_user(oled_rotation_t rotation) {
startup_timer = timer_read();
return rotation;
}

static void render_logo(void) {
static const char PROGMEM raw_logo[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 96, 96, 96,240,248,255, 63, 56,255,255,248, 63, 63,248,255,255, 56, 63,255,248,240, 96, 96, 96, 0, 0, 0, 0, 0,252,254, 38, 54, 60, 8,240,152,152,248,240, 24,248,224,248,120,224,240,120, 96,248,248,248,248, 32,248,248, 24, 24,240,248,248,248,240,240,248,152,152,254,254, 0, 0, 0,254,254,152,248,240, 24,248,224,240,120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,219,219,219,255,255,255,240,192,143,159, 63, 0, 0, 63,159,143,192,240,255,255,255,219,219,219, 0, 0, 0, 0, 0,192,225,112, 48, 48, 48,112,225,129, 1,240,240,240,193, 1, 0, 1,193,240,240,241, 1, 1,241,240,193,225,112, 48, 0, 1, 1, 1, 1,240,241, 49, 49, 49, 0,240,240, 0,129,193,129,193,192, 0,196,135,193,192,128,128,192,192,128, 0, 0,192,128, 0,128,192,128, 0, 0,192,192,128,128,192,192,192,128, 0,128,192,128,192,192, 0,128,192,192,192,128, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 6, 6, 6, 15, 31,255,255, 31,255,255, 31,252,252, 31,255,255, 31,255,255, 31, 15, 6, 6, 6, 0, 0, 0, 0, 0, 15, 31, 56, 48, 48, 48, 60,127,103, 96, 63, 63, 0, 7, 63, 56, 31, 7, 0, 63, 63, 0, 0, 63, 63, 7, 30, 60, 48, 0, 0, 0, 0, 0, 63, 31, 3, 3, 3, 0, 63, 63, 0, 31, 63, 1, 0, 0, 0, 63, 31, 0, 1, 63, 63, 0, 0, 63, 63, 0, 7, 63, 60, 63, 7, 31, 60, 63, 15, 0, 28, 60, 54, 54, 63, 63, 0, 63, 63, 1, 0, 0, 31, 63, 54, 54, 55, 55, 2, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128,128,128, 0, 0,192,192,192, 0,192,192,192, 0, 0, 0, 0, 0, 0,192,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255,255,255, 29,127,255,247,224, 0,254,254,254, 0,255,255,255,198,254,254,254, 0, 0,255,255,255,124,254,254,214,214,222,222, 92,124,254,254,214,214,222,222, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};

oled_write_raw_P(raw_logo, sizeof(raw_logo));
}

static void render_info(void) {
// Keyboard Layer Status
oled_write_P(PSTR("Layer: "), false);

switch (get_highest_layer(layer_state)) {
case _QWERTY:
if (layer_state_cmp(default_layer_state, _QWERTY)) {
oled_write_P(PSTR("Qwerty\n"), false);
} else if (layer_state_cmp(default_layer_state, _COLEMAK)) {
oled_write_P(PSTR("Colmak\n"), false);
} else if (layer_state_cmp(default_layer_state, _DVORAK)) {
oled_write_P(PSTR("Dvorak\n"), false);
} else if (layer_state_cmp(default_layer_state, _WORKMAN)) {
oled_write_P(PSTR("Workman\n"), false);
} else if (layer_state_cmp(default_layer_state, _HUNGARIAN)) {
oled_write_P(PSTR("HUN Qwerty\n"), false);
} else {
oled_write_P(PSTR("Undefined\n"), false);
}
break;
case _LOWER:
oled_write_P(PSTR("Lower\n"), false);
break;
case _RAISE:
oled_write_P(PSTR("Raise\n"), false);
break;
case _ADJUST:
oled_write_P(PSTR("Adjust\n"), false);
break;
default:
oled_write_P(PSTR("Undefined\n"), false);
}

// Print string received via HID RAW
oled_write_ln(receive_buffer, false);}

bool oled_task_user(void) {
static bool finished_timer = false;
if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) {
render_logo();
} else {
if (!finished_timer) {
oled_clear();
finished_timer = true;
}
render_info();
}
return false;

}

#ifdef RAW_ENABLE

void raw_hid_receive(uint8_t *data, uint8_t length) {

// Append data to receive_buffer, without the first byte
memcpy(receive_buffer + receive_buffer_length, data + 1, length - 1);
receive_buffer_length += (length - 1);

// First byte indicate if we will recive more package for the current string
// If it's 1 then this was the last package and we can reset the offset
if (data[0] == 1) {
// Reset the offset for memcpy to the begining of our buffer
receive_buffer_length = 0;
}

// Reset the offset to prevent overwriting memory outside of the buffer
if (receive_buffer_length + 32 >= 128) {
receive_buffer_length = 0;
}

}

#endif

#endif

void keyboard_pre_init_user(void) {
// Set C13 pin as output
setPinOutput(C13);
Expand Down

0 comments on commit ccdd289

Please sign in to comment.