diff --git a/keyboards/bajjak/bajjak.c b/keyboards/bajjak/bajjak.c
index 73857055d8ca..eab38197867e 100644
--- a/keyboards/bajjak/bajjak.c
+++ b/keyboards/bajjak/bajjak.c
@@ -21,27 +21,27 @@ along with this program. If not, see .
#include "bajjak.h"
-extern inline void ergodox_board_led_on(void);
-extern inline void ergodox_right_led_1_on(void);
-extern inline void ergodox_right_led_2_on(void);
-extern inline void ergodox_right_led_3_on(void);
-extern inline void ergodox_right_led_on(uint8_t led);
+extern inline void BAJJAK_board_led_on(void);
+extern inline void BAJJAK_right_led_1_on(void);
+extern inline void BAJJAK_right_led_2_on(void);
+extern inline void BAJJAK_right_led_3_on(void);
+extern inline void BAJJAK_right_led_on(uint8_t led);
-extern inline void ergodox_board_led_off(void);
-extern inline void ergodox_right_led_1_off(void);
-extern inline void ergodox_right_led_2_off(void);
-extern inline void ergodox_right_led_3_off(void);
-extern inline void ergodox_right_led_off(uint8_t led);
+extern inline void BAJJAK_board_led_off(void);
+extern inline void BAJJAK_right_led_1_off(void);
+extern inline void BAJJAK_right_led_2_off(void);
+extern inline void BAJJAK_right_led_3_off(void);
+extern inline void BAJJAK_right_led_off(uint8_t led);
-extern inline void ergodox_led_all_on(void);
-extern inline void ergodox_led_all_off(void);
+extern inline void BAJJAK_led_all_on(void);
+extern inline void BAJJAK_led_all_off(void);
-extern inline void ergodox_right_led_1_set(uint8_t n);
-extern inline void ergodox_right_led_2_set(uint8_t n);
-extern inline void ergodox_right_led_3_set(uint8_t n);
-extern inline void ergodox_right_led_set(uint8_t led, uint8_t n);
+extern inline void BAJJAK_right_led_1_set(uint8_t n);
+extern inline void BAJJAK_right_led_2_set(uint8_t n);
+extern inline void BAJJAK_right_led_3_set(uint8_t n);
+extern inline void BAJJAK_right_led_set(uint8_t led, uint8_t n);
-extern inline void ergodox_led_all_set(uint8_t n);
+extern inline void BAJJAK_led_all_set(uint8_t n);
keyboard_config_t keyboard_config;
@@ -65,7 +65,7 @@ void matrix_init_kb(void) {
PORTE |= (1<<6);
keyboard_config.raw = eeconfig_read_kb();
- ergodox_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4 );
+ BAJJAK_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4 );
#ifdef RGB_MATRIX_ENABLE
if (keyboard_config.rgb_matrix_enable) {
rgb_matrix_set_flags(LED_FLAG_ALL);
@@ -74,54 +74,54 @@ void matrix_init_kb(void) {
}
#endif
- ergodox_blink_all_leds();
+ BAJJAK_blink_all_leds();
matrix_init_user();
}
-void ergodox_blink_all_leds(void)
+void BAJJAK_blink_all_leds(void)
{
- ergodox_led_all_off();
- ergodox_led_all_set(LED_BRIGHTNESS_DEFAULT);
- ergodox_right_led_1_on();
+ BAJJAK_led_all_off();
+ BAJJAK_led_all_set(LED_BRIGHTNESS_DEFAULT);
+ BAJJAK_right_led_1_on();
_delay_ms(50);
- ergodox_right_led_2_on();
+ BAJJAK_right_led_2_on();
_delay_ms(50);
- ergodox_right_led_3_on();
+ BAJJAK_right_led_3_on();
_delay_ms(50);
#ifdef LEFT_LEDS
- ergodox_left_led_1_on();
+ BAJJAK_left_led_1_on();
_delay_ms(50);
if (!mcp23018_status) {
- mcp23018_status = ergodox_left_leds_update();
+ mcp23018_status = BAJJAK_left_leds_update();
}
- ergodox_left_led_2_on();
+ BAJJAK_left_led_2_on();
_delay_ms(50);
if (!mcp23018_status) {
- mcp23018_status = ergodox_left_leds_update();
+ mcp23018_status = BAJJAK_left_leds_update();
}
#endif
- ergodox_right_led_1_off();
+ BAJJAK_right_led_1_off();
_delay_ms(50);
- ergodox_right_led_2_off();
+ BAJJAK_right_led_2_off();
_delay_ms(50);
- ergodox_right_led_3_off();
+ BAJJAK_right_led_3_off();
#ifdef LEFT_LEDS
_delay_ms(50);
- ergodox_left_led_1_off();
+ BAJJAK_left_led_1_off();
if (!mcp23018_status) {
- mcp23018_status = ergodox_left_leds_update();
+ mcp23018_status = BAJJAK_left_leds_update();
}
_delay_ms(50);
- ergodox_left_led_2_off();
+ BAJJAK_left_led_2_off();
if (!mcp23018_status) {
- mcp23018_status = ergodox_left_leds_update();
+ mcp23018_status = BAJJAK_left_leds_update();
}
#endif
- //ergodox_led_all_on();
+ //BAJJAK_led_all_on();
//_delay_ms(333);
- ergodox_led_all_off();
+ BAJJAK_led_all_off();
}
uint8_t init_mcp23018(void) {
@@ -145,26 +145,26 @@ uint8_t init_mcp23018(void) {
// - unused : input : 1
// - input : input : 1
// - driving : output : 0
- mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(IODIRA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(0b00000000, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(0b00111111, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(IODIRA, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(0b00000000, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(0b00111111, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
i2c_stop();
// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
- mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(GPPUA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(0b00000000, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(0b01111111, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(GPPUA, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(0b00000000, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(0b01111111, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
out:
i2c_stop();
#ifdef LEFT_LEDS
- if (!mcp23018_status) mcp23018_status = ergodox_left_leds_update();
+ if (!mcp23018_status) mcp23018_status = BAJJAK_left_leds_update();
#endif // LEFT_LEDS
// SREG=sreg_prev;
@@ -173,7 +173,7 @@ uint8_t init_mcp23018(void) {
}
#ifdef LEFT_LEDS
-uint8_t ergodox_left_leds_update(void) {
+uint8_t BAJJAK_left_leds_update(void) {
if (mcp23018_status) { // if there was an error
return mcp23018_status;
}
@@ -184,17 +184,17 @@ uint8_t ergodox_left_leds_update(void) {
// - unused : hi-Z : 1
// - input : hi-Z : 1
// - driving : hi-Z : 1
- mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);
if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(OLATA, ERGODOX_EZ_I2C_TIMEOUT);
+ mcp23018_status = i2c_write(OLATA, BAJJAK_EZ_I2C_TIMEOUT);
if (mcp23018_status) goto out;
mcp23018_status = i2c_write(0b11111111
- & ~(ergodox_left_led_1< 4) {
keyboard_config.led_level = 0;
}
- ergodox_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4 );
+ BAJJAK_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4 );
eeconfig_update_kb(keyboard_config.raw);
layer_state_set_kb(layer_state);
}
diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h
index 49c3bd98f065..6dcbceb13fb9 100644
--- a/keyboards/bajjak/bajjak.h
+++ b/keyboards/bajjak/bajjak.h
@@ -26,12 +26,6 @@ along with this program. If not, see .
#include
#include "i2c_master.h"
-#if defined(KEYBOARD_ergodox_ez_glow)
-# include "glow.h"
-#elif defined(KEYBOARD_ergodox_ez_shine)
-# include "shine.h"
-#endif
-
// I2C aliases and register addresses (see "mcp23018.md")
#define I2C_ADDR 0b0100000
#define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE )
@@ -46,12 +40,12 @@ along with this program. If not, see .
#define OLATB 0x15
extern i2c_status_t mcp23018_status;
-#define ERGODOX_EZ_I2C_TIMEOUT 100
+#define BAJJAK_EZ_I2C_TIMEOUT 100
-void init_ergodox(void);
-void ergodox_blink_all_leds(void);
+void init_BAJJAK(void);
+void BAJJAK_blink_all_leds(void);
uint8_t init_mcp23018(void);
-uint8_t ergodox_left_leds_update(void);
+uint8_t BAJJAK_left_leds_update(void);
#ifndef LED_BRIGHTNESS_LO
#define LED_BRIGHTNESS_LO 15
@@ -61,69 +55,69 @@ uint8_t ergodox_left_leds_update(void);
#endif
-inline void ergodox_board_led_on(void) { DDRD |= (1<<6); PORTD |= (1<<6); }
-inline void ergodox_right_led_1_on(void) { DDRB |= (1<<5); PORTB |= (1<<5); }
-inline void ergodox_right_led_2_on(void) { DDRB |= (1<<6); PORTB |= (1<<6); }
-inline void ergodox_right_led_3_on(void) { DDRB |= (1<<7); PORTB |= (1<<7); }
-inline void ergodox_right_led_on(uint8_t led) { DDRB |= (1<<(led+4)); PORTB |= (1<<(led+4)); }
+inline void BAJJAK_board_led_on(void) { DDRD |= (1<<6); PORTD |= (1<<6); }
+inline void BAJJAK_right_led_1_on(void) { DDRB |= (1<<5); PORTB |= (1<<5); }
+inline void BAJJAK_right_led_2_on(void) { DDRB |= (1<<6); PORTB |= (1<<6); }
+inline void BAJJAK_right_led_3_on(void) { DDRB |= (1<<7); PORTB |= (1<<7); }
+inline void BAJJAK_right_led_on(uint8_t led) { DDRB |= (1<<(led+4)); PORTB |= (1<<(led+4)); }
-inline void ergodox_board_led_off(void) { DDRD &= ~(1<<6); PORTD &= ~(1<<6); }
-inline void ergodox_right_led_1_off(void) { DDRB &= ~(1<<5); PORTB &= ~(1<<5); }
-inline void ergodox_right_led_2_off(void) { DDRB &= ~(1<<6); PORTB &= ~(1<<6); }
-inline void ergodox_right_led_3_off(void) { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
-inline void ergodox_right_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); }
+inline void BAJJAK_board_led_off(void) { DDRD &= ~(1<<6); PORTD &= ~(1<<6); }
+inline void BAJJAK_right_led_1_off(void) { DDRB &= ~(1<<5); PORTB &= ~(1<<5); }
+inline void BAJJAK_right_led_2_off(void) { DDRB &= ~(1<<6); PORTB &= ~(1<<6); }
+inline void BAJJAK_right_led_3_off(void) { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
+inline void BAJJAK_right_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); }
#ifdef LEFT_LEDS
-bool ergodox_left_led_1;
-bool ergodox_left_led_2;
-bool ergodox_left_led_3;
+bool BAJJAK_left_led_1;
+bool BAJJAK_left_led_2;
+bool BAJJAK_left_led_3;
-inline void ergodox_left_led_1_on(void) { ergodox_left_led_1 = 1; }
-inline void ergodox_left_led_2_on(void) { ergodox_left_led_2 = 1; }
+inline void BAJJAK_left_led_1_on(void) { BAJJAK_left_led_1 = 1; }
+inline void BAJJAK_left_led_2_on(void) { BAJJAK_left_led_2 = 1; }
-inline void ergodox_left_led_1_off(void) { ergodox_left_led_1 = 0; }
-inline void ergodox_left_led_2_off(void) { ergodox_left_led_2 = 0; }
+inline void BAJJAK_left_led_1_off(void) { BAJJAK_left_led_1 = 0; }
+inline void BAJJAK_left_led_2_off(void) { BAJJAK_left_led_2 = 0; }
#endif // LEFT_LEDS
-inline void ergodox_led_all_on(void) {
- ergodox_board_led_on();
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
+inline void BAJJAK_led_all_on(void) {
+ BAJJAK_board_led_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_2_on();
+ BAJJAK_right_led_3_on();
#ifdef LEFT_LEDS
- ergodox_left_led_1_on();
- ergodox_left_led_2_on();
+ BAJJAK_left_led_1_on();
+ BAJJAK_left_led_2_on();
#endif // LEFT_LEDS
}
-inline void ergodox_led_all_off(void)
+inline void BAJJAK_led_all_off(void)
{
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
+ BAJJAK_board_led_off();
+ BAJJAK_right_led_1_off();
+ BAJJAK_right_led_2_off();
+ BAJJAK_right_led_3_off();
#ifdef LEFT_LEDS
- ergodox_left_led_1_off();
- ergodox_left_led_2_off();
+ BAJJAK_left_led_1_off();
+ BAJJAK_left_led_2_off();
#endif // LEFT_LEDS
}
-inline void ergodox_right_led_1_set(uint8_t n) { OCR1A = n; }
-inline void ergodox_right_led_2_set(uint8_t n) { OCR1B = n; }
-inline void ergodox_right_led_3_set(uint8_t n) { OCR1C = n; }
-inline void ergodox_right_led_set(uint8_t led, uint8_t n) {
+inline void BAJJAK_right_led_1_set(uint8_t n) { OCR1A = n; }
+inline void BAJJAK_right_led_2_set(uint8_t n) { OCR1B = n; }
+inline void BAJJAK_right_led_3_set(uint8_t n) { OCR1C = n; }
+inline void BAJJAK_right_led_set(uint8_t led, uint8_t n) {
(led == 1) ? (OCR1A = n) :
(led == 2) ? (OCR1B = n) :
(OCR1C = n);
}
-inline void ergodox_led_all_set(uint8_t n) {
- ergodox_right_led_1_set(n);
- ergodox_right_led_2_set(n);
- ergodox_right_led_3_set(n);
+inline void BAJJAK_led_all_set(uint8_t n) {
+ BAJJAK_right_led_1_set(n);
+ BAJJAK_right_led_2_set(n);
+ BAJJAK_right_led_3_set(n);
}
-enum ergodox_ez_keycodes {
+enum BAJJAK_ez_keycodes {
LED_LEVEL = SAFE_RANGE,
TOGGLE_LAYER_COLOR,
EZ_SAFE_RANGE,
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 08bf53c10b9d..1daf79859e52 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -92,9 +92,9 @@ along with this program. If not, see .
// Pick one of the modes
// Defaults to 15 mirror, for legacy behavior
-// #define ERGODOX_LED_15 // Addresses 15 LEDs, but same position on both halves
-// #define ERGODOX_LED_15_MIRROR // Addresses 15 LEDs, but are mirrored
-// #define ERGODOX_LED_30 // Addresses all 30 LED individually
+// #define BAJJAK_LED_15 // Addresses 15 LEDs, but same position on both halves
+// #define BAJJAK_LED_15_MIRROR // Addresses 15 LEDs, but are mirrored
+// #define BAJJAK_LED_30 // Addresses all 30 LED individually
/* fix space cadet rollover issue */
#define DISABLE_SPACE_CADET_ROLLOVER
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
index 9c95c4fb8f53..2808ca9a7180 100644
--- a/keyboards/bajjak/keymaps/5x6/keymap.c
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -162,9 +162,9 @@ void keyboard_post_init_user(void) {
// Runs whenever there is a layer state change.
layer_state_t layer_state_set_user(layer_state_t state) {
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
+ BAJJAK_right_led_1_off();
+ BAJJAK_right_led_2_off();
+ BAJJAK_right_led_3_off();
uint8_t layer = get_highest_layer(state);
switch (layer) {
@@ -174,48 +174,48 @@ layer_state_t layer_state_set_user(layer_state_t state) {
#endif
break;
case 1:
- ergodox_right_led_1_on();
+ BAJJAK_right_led_1_on();
#ifdef RGBLIGHT_COLOR_LAYER_1
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1);
#endif
break;
case 2:
- ergodox_right_led_2_on();
+ BAJJAK_right_led_2_on();
#ifdef RGBLIGHT_COLOR_LAYER_2
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2);
#endif
break;
case 3:
- ergodox_right_led_3_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_3
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3);
#endif
break;
case 4:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_2_on();
#ifdef RGBLIGHT_COLOR_LAYER_4
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4);
#endif
break;
case 5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_5
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5);
#endif
break;
case 6:
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
+ BAJJAK_right_led_2_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_6
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6);
#endif
break;
case 7:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_2_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_7
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7);
#endif
diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c
index f3d0443931bd..7b7c48c9fcc2 100644
--- a/keyboards/bajjak/keymaps/default/keymap.c
+++ b/keyboards/bajjak/keymaps/default/keymap.c
@@ -168,9 +168,9 @@ void keyboard_post_init_user(void) {
// Runs whenever there is a layer state change.
layer_state_t layer_state_set_user(layer_state_t state) {
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
+ BAJJAK_right_led_1_off();
+ BAJJAK_right_led_2_off();
+ BAJJAK_right_led_3_off();
uint8_t layer = get_highest_layer(state);
switch (layer) {
@@ -180,48 +180,48 @@ layer_state_t layer_state_set_user(layer_state_t state) {
#endif
break;
case 1:
- ergodox_right_led_1_on();
+ BAJJAK_right_led_1_on();
#ifdef RGBLIGHT_COLOR_LAYER_1
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1);
#endif
break;
case 2:
- ergodox_right_led_2_on();
+ BAJJAK_right_led_2_on();
#ifdef RGBLIGHT_COLOR_LAYER_2
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2);
#endif
break;
case 3:
- ergodox_right_led_3_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_3
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3);
#endif
break;
case 4:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_2_on();
#ifdef RGBLIGHT_COLOR_LAYER_4
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4);
#endif
break;
case 5:
- ergodox_right_led_1_on();
- ergodox_right_led_3_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_5
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5);
#endif
break;
case 6:
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
+ BAJJAK_right_led_2_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_6
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6);
#endif
break;
case 7:
- ergodox_right_led_1_on();
- ergodox_right_led_2_on();
- ergodox_right_led_3_on();
+ BAJJAK_right_led_1_on();
+ BAJJAK_right_led_2_on();
+ BAJJAK_right_led_3_on();
#ifdef RGBLIGHT_COLOR_LAYER_7
rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7);
#endif
diff --git a/keyboards/bajjak/keymaps/default/readme.md b/keyboards/bajjak/keymaps/default/readme.md
index e4ab4eef0944..b51705d3707d 100644
--- a/keyboards/bajjak/keymaps/default/readme.md
+++ b/keyboards/bajjak/keymaps/default/readme.md
@@ -2,8 +2,8 @@
## Changelog
* March 2021:
- * This keymap is for a 6x7 array keyboard based on Ergodox EZ.
- * __Not compatible with Ergodox EZ.__
+ * This keymap is for a 6x7 array keyboard based on bajjak EZ.
+ * __Not compatible with bajjak EZ.__
# Full-Text of Ergodox EZ
> # ErgoDox EZ Default Configuration
diff --git a/keyboards/bajjak/led_i2c.c b/keyboards/bajjak/led_i2c.c
index 5d207c71aae6..b56446625e6c 100644
--- a/keyboards/bajjak/led_i2c.c
+++ b/keyboards/bajjak/led_i2c.c
@@ -24,26 +24,26 @@ along with this program. If not, see .
void rgblight_call_driver(LED_TYPE *led, uint8_t led_num) {
i2c_init();
- i2c_start(0x84, ERGODOX_EZ_I2C_TIMEOUT);
+ i2c_start(0x84, BAJJAK_EZ_I2C_TIMEOUT);
int i = 0;
-# if defined(ERGODOX_LED_30)
+# if defined(BAJJAK_LED_30)
// prevent right-half code from trying to bitbang all 30
// so with 30 LEDs, we count from 29 to 15 here, and the
// other half does 0 to 14.
uint8_t half_led_num = RGBLED_NUM / 2;
for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i)
-# elif defined(ERGODOX_LED_15_MIRROR)
+# elif defined(BAJJAK_LED_15_MIRROR)
for (i = 0; i < led_num; ++i)
# else // ERGDOX_LED_15 non-mirrored
for (i = led_num - 1; i >= 0; --i)
# endif
{
uint8_t *data = (uint8_t *)(led + i);
- i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
- i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
- i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
+ i2c_write(*data++, BAJJAK_EZ_I2C_TIMEOUT);
+ i2c_write(*data++, BAJJAK_EZ_I2C_TIMEOUT);
+ i2c_write(*data++, BAJJAK_EZ_I2C_TIMEOUT);
#ifdef RGBW
- i2c_write(*data++, ERGODOX_EZ_I2C_TIMEOUT);
+ i2c_write(*data++, BAJJAK_EZ_I2C_TIMEOUT);
#endif
}
i2c_stop();
diff --git a/keyboards/bajjak/matrix.c b/keyboards/bajjak/matrix.c
index 15a60c50f3fd..1bda542df4c8 100644
--- a/keyboards/bajjak/matrix.c
+++ b/keyboards/bajjak/matrix.c
@@ -39,7 +39,7 @@ along with this program. If not, see .
/*
* This constant define not debouncing time in msecs, assuming eager_pr.
*
- * On Ergodox matrix scan rate is relatively low, because of slow I2C.
+ * On BAJJAK matrix scan rate is relatively low, because of slow I2C.
* Now it's only 317 scans/second, or about 3.15 msec/scan.
* According to Cherry specs, debouncing time is 5 msec.
*
@@ -88,7 +88,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
print("left side not responding\n");
} else {
print("left side attached\n");
- ergodox_blink_all_leds();
+ BAJJAK_blink_all_leds();
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_init(); // re-init driver on reconnect
#endif
@@ -97,7 +97,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
}
#ifdef LEFT_LEDS
- mcp23018_status = ergodox_left_leds_update();
+ mcp23018_status = BAJJAK_left_leds_update();
#endif // LEFT_LEDS
bool changed = false;
for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) {
@@ -148,8 +148,8 @@ static matrix_row_t read_cols(uint8_t row) {
uint8_t data = 0;
// reading GPIOB (column port) since in mcp23018's sequential mode
// it is addressed directly after writing to GPIOA in select_row()
- mcp23018_status = i2c_start(I2C_ADDR_READ, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_read_nack(ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status < 0) goto out;
+ mcp23018_status = i2c_start(I2C_ADDR_READ, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_read_nack(BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status < 0) goto out;
data = ~((uint8_t)mcp23018_status);
mcp23018_status = I2C_STATUS_SUCCESS;
out:
@@ -198,9 +198,9 @@ static void select_row(uint8_t row) {
if (!mcp23018_status) {
// set active row low : 0
// set other rows hi-Z : 1
- mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(GPIOA, ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
- mcp23018_status = i2c_write(0xFF & ~(1 << row), ERGODOX_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(GPIOA, BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
+ mcp23018_status = i2c_write(0xFF & ~(1 << row), BAJJAK_EZ_I2C_TIMEOUT); if (mcp23018_status) goto out;
out:
i2c_stop();
}
diff --git a/keyboards/bajjak/post_config.h b/keyboards/bajjak/post_config.h
index 0d4fe5c6832b..f76e17cf00c7 100644
--- a/keyboards/bajjak/post_config.h
+++ b/keyboards/bajjak/post_config.h
@@ -20,18 +20,18 @@ along with this program. If not, see .
#pragma once
-#if !defined(ERGODOX_LED_15) && !defined(ERGODOX_LED_30)
+#if !defined(BAJJAK_LED_15) && !defined(BAJJAK_LED_30)
// if no value is defined, assume previous behavior
-// # define ERGODOX_LED_15
-// # define ERGODOX_LED_30
-# define ERGODOX_LED_15_MIRROR
+// # define BAJJAK_LED_15
+// # define BAJJAK_LED_30
+# define BAJJAK_LED_15_MIRROR
#endif
-#if (defined(ERGODOX_LED_30) + defined(ERGODOX_LED_15) + defined(ERGODOX_LED_15_MIRROR)) != 1
-# error "You must only define one of the ERGODOX_LED options."
+#if (defined(BAJJAK_LED_30) + defined(BAJJAK_LED_15) + defined(BAJJAK_LED_15_MIRROR)) != 1
+# error "You must only define one of the BAJJAK_LED options."
#endif
-#ifdef ERGODOX_LED_30
+#ifdef BAJJAK_LED_30
// If using 30 LEDs, then define that many
# define RGBLED_NUM 30 // Number of LEDs
#else
diff --git a/keyboards/bajjak/readme.md b/keyboards/bajjak/readme.md
index 9c3b96e71030..3f1044d3a7e7 100644
--- a/keyboards/bajjak/readme.md
+++ b/keyboards/bajjak/readme.md
@@ -1,5 +1,5 @@
# BAJJAK
-* This keyboard is a 6x7 array keyboard based on ergodox ez.
+* This keyboard is a 6x7 array keyboard based on Ergodox EZ.
* __Not compatible with Ergodox EZ.__
# Full-Text of Ergodox EZ
diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk
index ea31d546c8f3..d4d8105dd0f2 100644
--- a/keyboards/bajjak/rules.mk
+++ b/keyboards/bajjak/rules.mk
@@ -24,7 +24,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
-CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ
+CUSTOM_MATRIX = lite # Custom matrix file for the BAJJAK
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
UNICODE_ENABLE = yes # Unicode
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
@@ -40,13 +40,11 @@ SRC += matrix.c \
led_i2c.c
QUANTUM_LIB_SRC += i2c_master.c
-# LAYOUTS = ergodox
+# LAYOUTS = bajjak
# Disable unsupported hardware
AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
-# Ergodox EZ Shine
# RGBLIGHT_ENABLE = yes
-# Ergodox EZ Glow
# RGB_MATRIX_ENABLE = yes