diff options
Diffstat (limited to 'keyboards/glenpickle/chimera_ergo')
| -rw-r--r-- | keyboards/glenpickle/chimera_ergo/chimera_ergo.c | 10 | ||||
| -rw-r--r-- | keyboards/glenpickle/chimera_ergo/chimera_ergo.h | 40 | ||||
| -rw-r--r-- | keyboards/glenpickle/chimera_ergo/keyboard.json (renamed from keyboards/glenpickle/chimera_ergo/info.json) | 8 | ||||
| -rw-r--r-- | keyboards/glenpickle/chimera_ergo/matrix.c | 1 | ||||
| -rw-r--r-- | keyboards/glenpickle/chimera_ergo/rules.mk | 12 | 
5 files changed, 24 insertions, 47 deletions
| diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.c b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c index 47653c2e4b..40748e0b3d 100644 --- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.c +++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c @@ -1,10 +1,12 @@  #include "chimera_ergo.h"  void led_init(void) { -	DDRD  |= (1<<1); -	PORTD |= (1<<1); -	DDRF  |= (1<<4) | (1<<5); -	PORTF |= (1<<4) | (1<<5); +	gpio_set_pin_output(CHIMERA_ERGO_GREEN_LED_PIN); +	gpio_write_pin_high(CHIMERA_ERGO_GREEN_LED_PIN); +	gpio_set_pin_output(CHIMERA_ERGO_BLUE_LED_PIN); +	gpio_write_pin_high(CHIMERA_ERGO_BLUE_LED_PIN); +	gpio_set_pin_output(CHIMERA_ERGO_RED_LED_PIN); +	gpio_write_pin_high(CHIMERA_ERGO_RED_LED_PIN);  } diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h index 04ef56503f..46f0b931e8 100644 --- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h +++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h @@ -2,12 +2,16 @@  #include "quantum.h" -#define red_led_off   PORTF |= (1<<5) -#define red_led_on    PORTF &= ~(1<<5) -#define blu_led_off   PORTF |= (1<<4) -#define blu_led_on    PORTF &= ~(1<<4) -#define grn_led_off   PORTD |= (1<<1) -#define grn_led_on    PORTD &= ~(1<<1) +#define CHIMERA_ERGO_RED_LED_PIN F5 +#define CHIMERA_ERGO_GREEN_LED_PIN D1 +#define CHIMERA_ERGO_BLUE_LED_PIN F4 + +#define red_led_off   gpio_write_pin_high(CHIMERA_ERGO_RED_LED_PIN) +#define red_led_on    gpio_write_pin_low(CHIMERA_ERGO_RED_LED_PIN) +#define blu_led_off   gpio_write_pin_high(CHIMERA_ERGO_BLUE_LED_PIN) +#define blu_led_on    gpio_write_pin_low(CHIMERA_ERGO_BLUE_LED_PIN) +#define grn_led_off   gpio_write_pin_high(CHIMERA_ERGO_GREEN_LED_PIN) +#define grn_led_on    gpio_write_pin_low(CHIMERA_ERGO_GREEN_LED_PIN)  #define set_led_off     red_led_off; grn_led_off; blu_led_off  #define set_led_red     red_led_on;  grn_led_off; blu_led_off @@ -17,27 +21,3 @@  #define set_led_magenta red_led_on;  grn_led_off; blu_led_on  #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on  #define set_led_white   red_led_on;  grn_led_on;  blu_led_on - -/* -#define LED_B 5 -#define LED_R 6 -#define LED_G 7 - -#define all_leds_off PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G) - -#define red_led_on   PORTF |= (1<<LED_R) -#define red_led_off  PORTF &= ~(1<<LED_R) -#define grn_led_on   PORTF |= (1<<LED_G) -#define grn_led_off  PORTF &= ~(1<<LED_G) -#define blu_led_on   PORTF |= (1<<LED_B) -#define blu_led_off  PORTF &= ~(1<<LED_B) - -#define set_led_off     PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G) -#define set_led_red     PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_G) | (1<<LED_R) -#define set_led_blue    PORTF = PORTF & ~(1<<LED_G) & ~(1<<LED_R) | (1<<LED_B) -#define set_led_green   PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_R) | (1<<LED_G) -#define set_led_yellow  PORTF = PORTF & ~(1<<LED_B) | (1<<LED_R) | (1<<LED_G) -#define set_led_magenta PORTF = PORTF & ~(1<<LED_G) | (1<<LED_R) | (1<<LED_B) -#define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G) -#define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G) -*/ diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/keyboard.json index ea49dabbca..038498fd10 100644 --- a/keyboards/glenpickle/chimera_ergo/info.json +++ b/keyboards/glenpickle/chimera_ergo/keyboard.json @@ -10,6 +10,14 @@    },    "processor": "atmega32u4",    "bootloader": "caterina", +  "features": { +    "bootmagic": false, +    "mousekey": true, +    "extrakey": true, +    "console": true, +    "command": true, +    "nkro": true +  },    "layouts": {      "LAYOUT": {        "layout": [ diff --git a/keyboards/glenpickle/chimera_ergo/matrix.c b/keyboards/glenpickle/chimera_ergo/matrix.c index 32d7b09310..47c3c61e27 100644 --- a/keyboards/glenpickle/chimera_ergo/matrix.c +++ b/keyboards/glenpickle/chimera_ergo/matrix.c @@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public License  along with this program.  If not, see <http://www.gnu.org/licenses/>.  */ -#include "quantum.h"  #include "matrix.h"  #include "uart.h" diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk index f543b5fd9a..18d234d62a 100644 --- a/keyboards/glenpickle/chimera_ergo/rules.mk +++ b/keyboards/glenpickle/chimera_ergo/rules.mk @@ -1,15 +1,3 @@ -# Build Options -#   change yes to no to disable -# -BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes       # Mouse keys -EXTRAKEY_ENABLE = yes       # Audio control and System control -CONSOLE_ENABLE = yes        # Console for debug -COMMAND_ENABLE = yes        # Commands for debug and configuration -NKRO_ENABLE = yes           # Enable N-Key Rollover -BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow -AUDIO_ENABLE = no           # Audio output  CUSTOM_MATRIX = lite  # project specific files | 
