Skip to content

Commit

Permalink
[Keyboard] Add eeprom IC-less rev for MechWild OBE and Waka60 (#17126)
Browse files Browse the repository at this point in the history
  • Loading branch information
kylemccreery authored May 20, 2022
1 parent 713ce7b commit c60c19e
Show file tree
Hide file tree
Showing 21 changed files with 112 additions and 18 deletions.
2 changes: 0 additions & 2 deletions keyboards/mechwild/obe/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 7
#define MATRIX_COLS 10

#define EEPROM_I2C_24LC64

/*
* Keyboard Matrix Assignments
*
Expand Down
20 changes: 20 additions & 0 deletions keyboards/mechwild/obe/f401/eeprom/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define EEPROM_I2C_24LC64
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions keyboards/mechwild/obe/f401/eeprom/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# MCU name
MCU = STM32F401

# Bootloader selection
BOOTLOADER = stm32-dfu

EEPROM_DRIVER = i2c
20 changes: 20 additions & 0 deletions keyboards/mechwild/obe/f411/eeprom/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define EEPROM_I2C_24LC64
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@

#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

7 changes: 7 additions & 0 deletions keyboards/mechwild/obe/f411/eeprom/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# MCU name
MCU = STM32F411

# Bootloader selection
BOOTLOADER = stm32-dfu

EEPROM_DRIVER = i2c
4 changes: 4 additions & 0 deletions keyboards/mechwild/obe/obe.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

#pragma once

//#ifdef KEYBOARD_mechwild_obe_eeprom
//# include "eeprom.h"
//#endif

#include "quantum.h"

/* This is a shortcut to help you visually see your layout.
Expand Down
2 changes: 0 additions & 2 deletions keyboards/mechwild/obe/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Encoder Enabled

EEPROM_DRIVER = i2c

DEFAULT_FOLDER = mechwild/obe/f401
2 changes: 0 additions & 2 deletions keyboards/mechwild/waka60/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 10
#define MATRIX_COLS 7

#define EEPROM_I2C_24LC64

/*
* Keyboard Matrix Assignments
*
Expand Down
20 changes: 20 additions & 0 deletions keyboards/mechwild/waka60/f401/eeprom/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define EEPROM_I2C_24LC64
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@

#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

7 changes: 7 additions & 0 deletions keyboards/mechwild/waka60/f401/eeprom/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# MCU name
MCU = STM32F401

# Bootloader selection
BOOTLOADER = stm32-dfu

EEPROM_DRIVER = i2c
20 changes: 20 additions & 0 deletions keyboards/mechwild/waka60/f411/eeprom/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define EEPROM_I2C_24LC64
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
#pragma once

#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE
#define HAL_USE_PAL TRUE
#define HAL_USE_GPT TRUE

#include_next <halconf.h>

Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,3 @@

#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

#undef STM32_PWM_USE_TIM1
#define STM32_PWM_USE_TIM1 TRUE
#undef STM32_GPT_USE_TIM4
#define STM32_GPT_USE_TIM4 TRUE
7 changes: 7 additions & 0 deletions keyboards/mechwild/waka60/f411/eeprom/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# MCU name
MCU = STM32F411

# Bootloader selection
BOOTLOADER = stm32-dfu

EEPROM_DRIVER = i2c
2 changes: 0 additions & 2 deletions keyboards/mechwild/waka60/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Encoder Enabled

EEPROM_DRIVER = i2c

DEFAULT_FOLDER = mechwild/waka60/f401

0 comments on commit c60c19e

Please sign in to comment.