summaryrefslogtreecommitdiffstats
path: root/keyboards/iris/rev2
diff options
context:
space:
mode:
authorDanny <nooges@users.noreply.github.com>2019-01-15 17:04:56 -0500
committerDrashna Jaelre <drashna@live.com>2019-01-15 14:04:56 -0800
commitc768ffeb33e8635f1ef6fa46928a5b992ee8aae9 (patch)
tree393692ddb4d29c6e7cfd028e13a0c7bde3c25637 /keyboards/iris/rev2
parent2dcce4c35160066e32b827985a924c4f7ea5b4d9 (diff)
[Keyboard] Iris via support, Rev 3 updates (#4849)
* Add encoder support * Add VIA support to Iris Rev. 3 * Update pinout and disable mouse keys to free up space * Rollout VIA support to all Iris revisions * Update default keymap * Update vendor ID
Diffstat (limited to 'keyboards/iris/rev2')
-rw-r--r--keyboards/iris/rev2/config.h38
-rw-r--r--keyboards/iris/rev2/rev2.c14
2 files changed, 20 insertions, 32 deletions
diff --git a/keyboards/iris/rev2/config.h b/keyboards/iris/rev2/config.h
index d43d4b1c64..e0465ca8a4 100644
--- a/keyboards/iris/rev2/config.h
+++ b/keyboards/iris/rev2/config.h
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_CONFIG_H
/* USB Device descriptor parameter */
-#define VENDOR_ID 0xCEEB
+#define VENDOR_ID 0xCB10
#define PRODUCT_ID 0x1256
#define DEVICE_VER 0x0200
#define MANUFACTURER Keebio
@@ -68,20 +68,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN D3
#define RGBLED_NUM 12 // Number of LEDs
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+#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 0x08
+#define EEPROM_VERSION_ADDR 34
+
+// Dynamic keymap starts after EEPROM version
+#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
+// Dynamic macro starts after dynamic keymaps (35+(4*10*6*2)) = (35+480)
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 515
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 509 // 1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR
+#define DYNAMIC_KEYMAP_MACRO_COUNT 16
diff --git a/keyboards/iris/rev2/rev2.c b/keyboards/iris/rev2/rev2.c
index 133fce66ad..8575243f0d 100644
--- a/keyboards/iris/rev2/rev2.c
+++ b/keyboards/iris/rev2/rev2.c
@@ -7,20 +7,6 @@ void led_set_kb(uint8_t usb_led) {
}
#endif
-void matrix_init_kb(void) {
-
- // // green led on
- // DDRD |= (1<<5);
- // PORTD &= ~(1<<5);
-
- // // orange led on
- // DDRB |= (1<<0);
- // PORTB &= ~(1<<0);
-
- matrix_init_user();
-};
-
-
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
// swap-hands action needs a matrix to define the swap