summaryrefslogtreecommitdiff
path: root/keyboards/rama/m6_a
diff options
context:
space:
mode:
authorWilba6582 <Wilba6582@users.noreply.github.com>2018-10-01 01:35:10 +1000
committerJack Humbert <jack.humb@gmail.com>2018-09-30 11:35:10 -0400
commit66ef1e3d6770e388d631d25e4cd1c6b1640cea24 (patch)
treedc0b4eb5b3f2adba1a41c4199871e4a0d341611e /keyboards/rama/m6_a
parent6734cd9c5c7b63677d3d4cf9bef8ccf878fd3551 (diff)
RAMA M6-B and IS31FL3218 driver (#4021)
* Initial RAMA M6-B commit. * Moved IS31FL3218 driver, minor cleanups * Refactor, added dynamic keymap. * Added dynamic keymaps to RAMA M6-A * Refactor M6-A and M6-B to use common code. * Formatting * Cleanup * Cleanup * Changes from review
Diffstat (limited to 'keyboards/rama/m6_a')
-rw-r--r--keyboards/rama/m6_a/config.h24
-rw-r--r--keyboards/rama/m6_a/keymaps/default/config.h24
-rw-r--r--keyboards/rama/m6_a/keymaps/default/keymap.c316
-rw-r--r--keyboards/rama/m6_a/m6_a.c31
-rw-r--r--keyboards/rama/m6_a/readme.md2
-rw-r--r--keyboards/rama/m6_a/rules.mk44
6 files changed, 48 insertions, 393 deletions
diff --git a/keyboards/rama/m6_a/config.h b/keyboards/rama/m6_a/config.h
index 0c5355f4a8..8d77f5339d 100644
--- a/keyboards/rama/m6_a/config.h
+++ b/keyboards/rama/m6_a/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
#include "config_common.h"
@@ -187,4 +186,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
//#define MIDI_TONE_KEYCODE_OCTAVES 1
-#endif
+#define RGB_BACKLIGHT_ENABLED 0
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+
+// EEPROM usage
+
+// TODO: refactor with new user EEPROM code (coming soon)
+#define EEPROM_MAGIC 0x451F
+#define EEPROM_MAGIC_ADDR 32
+// Bump this every time we change what we store
+// This will automatically reset the EEPROM with defaults
+// and avoid loading invalid data from the EEPROM
+#define EEPROM_VERSION 0x07
+#define EEPROM_VERSION_ADDR 34
+
+// Backlight config starts after EEPROM version
+#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 35
+// Dynamic keymap starts after backlight config (35+37)
+#define DYNAMIC_KEYMAP_EEPROM_ADDR 72
diff --git a/keyboards/rama/m6_a/keymaps/default/config.h b/keyboards/rama/m6_a/keymaps/default/config.h
deleted file mode 100644
index d150575c1a..0000000000
--- a/keyboards/rama/m6_a/keymaps/default/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018 Wilba
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/rama/m6_a/keymaps/default/keymap.c b/keyboards/rama/m6_a/keymaps/default/keymap.c
index 6b15f3cd10..7a408fa8aa 100644
--- a/keyboards/rama/m6_a/keymaps/default/keymap.c
+++ b/keyboards/rama/m6_a/keymaps/default/keymap.c
@@ -3,322 +3,14 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- TO(1), KC_A, KC_B, KC_C, KC_D, KC_E),
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6),
LAYOUT(
- TO(2), KC_F, KC_G, KC_H, KC_I, KC_J),
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
LAYOUT(
- TO(3), KC_K, KC_L, KC_M, KC_N, KC_O),
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
LAYOUT(
- TO(4), KC_P, KC_Q, KC_R, KC_S, KC_T),
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO) };
- LAYOUT(
- TO(5), KC_U, KC_V, KC_W, KC_X, KC_Y),
-
- LAYOUT(
- TO(0), KC_Z, KC_1, KC_2, KC_3, KC_4)};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- //keyevent_t event = record->event;
-
- switch (id)
- {
- case 0:
- if (record->event.pressed)
- {
- return MACRO(T(T), T(G), T(L), T(H), T(F), T(ENT), END);
- }
- break;
- case 1:
- if (record->event.pressed)
- {
- return MACRO(T(T), T(G), T(G), T(ENT), END);
- }
- break;
- case 2:
- if (record->event.pressed)
- {
- return MACRO(D(NO), T(L), U(NO), END);
- }
- break;
- case 3:
- if (record->event.pressed)
- {
- return MACRO(D(LCTL), T(Z), U(LCTL), END);
- }
- break;
- case 4:
- if (record->event.pressed)
- {
- return MACRO(D(LCTL), D(LSFT), T(Z), U(LSFT), U(LCTL), END);
- }
- break;
- case 5:
- if (record->event.pressed)
- {
- return MACRO(D(LCTL), T(X), U(LCTL), END);
- }
- break;
- case 6:
- if (record->event.pressed)
- {
- return MACRO(D(LCTL), T(C), U(LCTL), END);
- }
- break;
- case 7:
- if (record->event.pressed)
- {
- return MACRO(D(LCTL), T(V), U(LCTL), END);
- }
- break;
- }
- return MACRO_NONE;
-}
-
-// M6-A LEDs are connected to D6, B6, F5, B4, C7, F7
-// This is 1-based because I copied it from Knops code.
-void set_switch_led(int ledId, bool state)
-{
- if (state)
- {
- switch (ledId)
- {
- case 1:
- PORTD |= (1 << 6);
- break;
- case 2:
- PORTB |= (1 << 6);
- break;
- case 3:
- PORTF |= (1 << 5);
- break;
- case 4:
- PORTB |= (1 << 4);
- break;
- case 5:
- PORTC |= (1 << 7);
- break;
- case 6:
- PORTF |= (1 << 7);
- break;
- }
- }
- else
- {
- switch (ledId)
- {
- case 1:
- PORTD &= ~(1 << 6);
- break;
- case 2:
- PORTB &= ~(1 << 6);
- break;
- case 3:
- PORTF &= ~(1 << 5);
- break;
- case 4:
- PORTB &= ~(1 << 4);
- break;
- case 5:
- PORTC &= ~(1 << 7);
- break;
- case 6:
- PORTF &= ~(1 << 7);
- break;
- }
- }
-}
-
-void set_layer_led(int layerId)
-{
- // UNUSED
-}
-
-void led_set_layer(int layer);
-
-void matrix_init_user(void)
-{
- led_init_ports();
- led_set_layer(0);
-}
-
-void matrix_scan_user(void)
-{
-}
-
-// M6-A LEDs are connected to D6, B6, F5, B4, C7, F7
-void led_init_ports()
-{
- // Switch #1
- DDRD |= (1 << 6);
- PORTD &= ~(1 << 6);
-
- // Switch #2
- DDRB |= (1 << 6);
- PORTB &= ~(1 << 6);
-
- // Switch #3
- DDRF |= (1 << 5);
- PORTF &= ~(1 << 5);
-
- // Switch #4
- DDRB |= (1 << 4);
- PORTB &= ~(1 << 4);
-
- // Switch #5
- DDRC |= (1 << 7);
- PORTC &= ~(1 << 7);
-
- // Switch #6
- DDRF |= (1 << 7);
- PORTF &= ~(1 << 7);
-}
-
-void led_set_user(uint8_t usb_led)
-{
-
- if (usb_led & (1 << USB_LED_NUM_LOCK))
- {
- }
- else
- {
- }
-
- if (usb_led & (1 << USB_LED_CAPS_LOCK))
- {
- }
- else
- {
- }
-
- if (usb_led & (1 << USB_LED_SCROLL_LOCK))
- {
- }
- else
- {
- }
-
- if (usb_led & (1 << USB_LED_COMPOSE))
- {
- }
- else
- {
- }
-
- if (usb_led & (1 << USB_LED_KANA))
- {
- }
- else
- {
- }
-}
-
-void led_set_layer(int layer)
-{
- switch (layer)
- {
- case 0:
- set_switch_led(1, true);
- set_switch_led(2, false);
- set_switch_led(3, false);
- set_switch_led(4, false);
- set_switch_led(5, false);
- set_switch_led(6, false);
- break;
- case 1:
- set_switch_led(1, false);
- set_switch_led(2, true);
- set_switch_led(3, false);
- set_switch_led(4, false);
- set_switch_led(5, false);
- set_switch_led(6, false);
- break;
- case 2:
- set_switch_led(1, false);
- set_switch_led(2, false);
- set_switch_led(3, true);
- set_switch_led(4, false);
- set_switch_led(5, false);
- set_switch_led(6, false);
- break;
- case 3:
- set_switch_led(1, false);
- set_switch_led(2, false);
- set_switch_led(3, false);
- set_switch_led(4, true);
- set_switch_led(5, false);
- set_switch_led(6, false);
- break;
- case 4:
- set_switch_led(1, false);
- set_switch_led(2, false);
- set_switch_led(3, false);
- set_switch_led(4, false);
- set_switch_led(5, true);
- set_switch_led(6, false);
- break;
- case 5:
- set_switch_led(1, false);
- set_switch_led(2, false);
- set_switch_led(3, false);
- set_switch_led(4, false);
- set_switch_led(5, false);
- set_switch_led(6, true);
- break;
- default:
- set_switch_led(1, true);
- set_switch_led(2, true);
- set_switch_led(3, true);
- set_switch_led(4, true);
- set_switch_led(5, true);
- set_switch_led(6, true);
- break;
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
- switch (keycode)
- {
- case TO(0):
- if (record->event.pressed)
- {
- led_set_layer(0);
- }
- break;
- case TO(1):
- if (record->event.pressed)
- {
- led_set_layer(1);
- }
- break;
- case TO(2):
- if (record->event.pressed)
- {
- led_set_layer(2);
- }
- break;
- case TO(3):
- if (record->event.pressed)
- {
- led_set_layer(3);
- }
- break;
- case TO(4):
- if (record->event.pressed)
- {
- led_set_layer(4);
- }
- break;
- case TO(5):
- if (record->event.pressed)
- {
- led_set_layer(5);
- }
- break;
- }
- return true;
-}
diff --git a/keyboards/rama/m6_a/m6_a.c b/keyboards/rama/m6_a/m6_a.c
index 1c84ea2b83..fa19003600 100644
--- a/keyboards/rama/m6_a/m6_a.c
+++ b/keyboards/rama/m6_a/m6_a.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 Wilba
+/* Copyright 2018 Jason Williams (Wilba)
*
* 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
@@ -13,32 +13,3 @@
* 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 "m6_a.h"
-/*
-void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
-
- matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
- // put your looping keyboard code here
- // runs every cycle (a lot)
-
- matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
- // put your per-action keyboard code here
- // runs for every action, just before processing by the firmware
-
- return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
- // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
- led_set_user(usb_led);
-}
-*/
diff --git a/keyboards/rama/m6_a/readme.md b/keyboards/rama/m6_a/readme.md
index 5dd2b92e19..ceaf6a88de 100644
--- a/keyboards/rama/m6_a/readme.md
+++ b/keyboards/rama/m6_a/readme.md
@@ -12,4 +12,4 @@ Make example for this keyboard (after setting up your build environment):
make rama/m6_a:default
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. \ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file
diff --git a/keyboards/rama/m6_a/rules.mk b/keyboards/rama/m6_a/rules.mk
index ca2a2a5f80..ed85ac36d0 100644
--- a/keyboards/rama/m6_a/rules.mk
+++ b/keyboards/rama/m6_a/rules.mk
@@ -1,5 +1,7 @@
+# project specific files
+SRC = keyboards/rama/m6_b/m6_b.c
+
# MCU name
-#MCU = at90usb1286
MCU = atmega32u4
# Processor frequency.
@@ -38,31 +40,27 @@ F_USB = $(F_CPU)
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-# Boot Section Size in *bytes*
-# Teensy halfKay 512
-# Teensy++ halfKay 1024
-# Atmel DFU loader 4096
-# LUFA bootloader 4096
-# USBaspLoader 2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
+# Boot Section
+BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes # Console for debug(+400)
-COMMAND_ENABLE ?= yes # Commands for debug and configuration
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = no # Console for debug(+400)
+COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE ?= no # USB Nkey Rollover
-BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE ?= no # Unicode
-BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no # Audio output on port C6
-FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no # Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no # Audio output on port C6
+FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
+
+RAW_ENABLE = yes
+DYNAMIC_KEYMAP_ENABLE = yes \ No newline at end of file