From 5abe05147c5b3113327d5d40db0ee12d759c73d3 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sun, 19 Feb 2017 21:25:35 -0600 Subject: familiar layout v0.1 from ErgoDox-EZ configurator --- keyboards/ergodox/keymaps/familiar/keymap.c | 111 ++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 keyboards/ergodox/keymaps/familiar/keymap.c (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c new file mode 100644 index 0000000000..7cd81a87c5 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -0,0 +1,111 @@ +#include "ergodox.h" +#include "debug.h" +#include "action_layer.h" +#include "version.h" + + +#include "keymap_german.h" + +#include "keymap_nordic.h" + + + +enum custom_keycodes { + PLACEHOLDER = SAFE_RANGE, // can always be here + EPRM, + VRSN, + RGB_SLD, + +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = KEYMAP(KC_ESCAPE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_HOME,KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_END,CTL_T(KC_LGUI),KC_APPLICATION,KC_GRAVE,KC_QUOTE,KC_BSLASH,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,ALT_T(KC_SPACE),MO(1),KC_RALT,KC_KP_PLUS,KC_6,KC_7,KC_8,KC_9,KC_0,KC_PSCREEN,KC_PGUP,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSPACE,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_ENTER,KC_PGDOWN,KC_N,KC_M,KC_COMMA,KC_DOT,KC_KP_SLASH,KC_RSPC,KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_APPLICATION,CTL_T(KC_RGUI),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_RALT,MO(1),ALT_T(KC_SPACE)), + + [1] = KEYMAP(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F11,KC_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LEFT,KC_DOWN,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_STOP,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_INSERT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT), + +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(1) +}; + +// leaving this in place for compatibilty with old keymaps cloned and re-compiled. +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case 0: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + break; + } + return MACRO_NONE; +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + // dynamically generate these. + case EPRM: + if (record->event.pressed) { + eeconfig_init(); + } + return false; + break; + case VRSN: + if (record->event.pressed) { + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + } + return false; + break; + case RGB_SLD: + if (record->event.pressed) { + rgblight_mode(1); + } + return false; + break; + + } + return true; +} + +void matrix_scan_user(void) { + + uint8_t layer = biton32(layer_state); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + case 1: + ergodox_right_led_1_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + case 3: + ergodox_right_led_3_on(); + break; + case 4: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + break; + case 5: + ergodox_right_led_1_on(); + ergodox_right_led_3_on(); + break; + case 6: + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + break; + case 7: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + break; + default: + break; + } + +}; -- cgit v1.2.3 From 9b40dd796ea2aae9f342dc4d9e7d431d8448e1b9 Mon Sep 17 00:00:00 2001 From: nstickney Date: Thu, 23 Feb 2017 21:13:45 -0600 Subject: familiar layout graphics, etc --- keyboards/ergodox/keymaps/familiar/HNTR.svg | 7253 +++++++++++++++++++ keyboards/ergodox/keymaps/familiar/familiar.json | 865 +++ keyboards/ergodox/keymaps/familiar/familiar.png | Bin 0 -> 102059 bytes keyboards/ergodox/keymaps/familiar/familiar.svg | 7131 ++++++++++++++++++ .../ergodox/keymaps/familiar/familiar_stick.svg | 7592 ++++++++++++++++++++ keyboards/ergodox/keymaps/familiar/hntr.json | 634 ++ keyboards/ergodox/keymaps/familiar/hntr.png | Bin 0 -> 77473 bytes 7 files changed, 23475 insertions(+) create mode 100644 keyboards/ergodox/keymaps/familiar/HNTR.svg create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.json create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.png create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.svg create mode 100644 keyboards/ergodox/keymaps/familiar/familiar_stick.svg create mode 100644 keyboards/ergodox/keymaps/familiar/hntr.json create mode 100644 keyboards/ergodox/keymaps/familiar/hntr.png (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/HNTR.svg b/keyboards/ergodox/keymaps/familiar/HNTR.svg new file mode 100644 index 0000000000..a419e7ab8b --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/HNTR.svg @@ -0,0 +1,7253 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 😎 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/familiar.json b/keyboards/ergodox/keymaps/familiar/familiar.json new file mode 100644 index 0000000000..e80f99e5f0 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/familiar.json @@ -0,0 +1,865 @@ +[ + { + "name": "ErgoDox Familiar (CosmicStick Colors)", + "author": "Stick" + }, + [ + { + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "\n\n#\nF3\n\n\n³\n\n\n3", + { + "x": 10.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "*\nF8\n\n\n\n\n\n¾\n\n8" + ], + [ + { + "y": -0.87, + "x": 2.5 + }, + "\n\n@\nF2\n\n\n²\n\n\n2", + { + "x": 1, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¤\n\n$\nF4\n\n\n£\n\n\n4", + { + "x": 8.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "&\nF7\n\n\n\n\n\n½\n\n7", + { + "x": 1 + }, + "(\nF9\n\n\n\n\n\n‘\n\n9" + ], + [ + { + "y": -0.8699999999999999, + "x": 5.5 + }, + "\n\n%\nF5\n\n\n€\n\n\n5", + "\n\n_\nF11\n\n\n¥\n\n\n-", + { + "x": 4.5, + "fa": [ + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "+\nF12\n÷\n\n\n\n\n×\n\n=", + "^\nF6\n\n\n\n\n\n¼\n\n6" + ], + [ + { + "y": -0.88, + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "ESCAPE", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¡\n\n!\nF1\n\n\n¹\n\n\n1", + { + "x": 14.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + ")\nF10\n\n/\n\n\n\n’\n\n0", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "SYSREQ" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#993300", + "a": 4 + }, + "\n\n\n↑\n\n\né\n\n\nE", + { + "x": 10.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n5\n\n\n\ní\n\nI" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "a": 6, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 7 + ] + }, + "å\n\n\n\n\n\n\n\nW", + { + "x": 1 + }, + "®\n\n\n\n\n\n\n\nR", + { + "x": 8.5, + "a": 4, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "\n\n\n4\n\n\n\nú\n\nU", + { + "x": 1 + }, + "\n\n\n6\n\n\n\nó\n\nO" + ], + [ + { + "y": -0.8699999999999999, + "x": 5.5, + "a": 6 + }, + "þ\n\n\n\n\n\n\n\nT", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "f": 3, + "h": 1.5 + }, + "HOME", + { + "x": 4.5, + "f": 3, + "h": 1.5 + }, + "PAGE UP", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 7 + ] + }, + "\n\nü\n\n\n\n\n\nY" + ], + [ + { + "y": -0.8799999999999999, + "c": "#605d57", + "t": "#FFF8E7", + "a": 4, + "w": 1.5 + }, + "\n\n\nBREAK\n\n\n\n\n\nDELETE", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6 + }, + "ä\n\n\n\n\n\n\n\nQ", + { + "x": 14.5, + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "\n\n\n×\n\n\n\nö\n\nP", + { + "c": "#605d57", + "t": "#FFF8E7", + "fa": [ + 1, + 1 + ], + "w": 1.5 + }, + "\nINSERT\n\n\n\n\n\n\n\nBCKSPC" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#993300", + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "Ð\n\n\n↓\n\n\nð\n\n\nD", + { + "x": 10.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n2\n\n\n\n\n\nK" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "c": "#993300", + "t": "#FFF8E7" + }, + "§\n\n\n←\n\n\nß\n\n\nS", + { + "x": 1 + }, + "\n\n\n→\n\n\n\n\n\nF", + { + "x": 8.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n1\n\n\n\n\n\nJ", + { + "x": 1, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "\n\n\n3\n\n\n\nø\n\nL" + ], + [ + { + "y": -0.8799999999999999, + "x": 5.5, + "a": 7, + "fa": [ + 7 + ] + }, + "G", + { + "x": 6.5 + }, + "H" + ], + [ + { + "y": -0.8700000000000001, + "c": "#605d57", + "t": "#FFF8E7", + "f": 3, + "w": 1.5 + }, + "TAB", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "á\n\n\n\n\n\n\n\nA", + { + "x": 14.5, + "a": 4, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 7, + 7, + 0 + ] + }, + ":\n\n°\n-\n\n\n\n¶\n\n;", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "ENTER" + ], + [ + { + "y": -0.6299999999999999, + "x": 6.5, + "h": 1.5 + }, + "END", + { + "x": 4.5, + "h": 1.5 + }, + "PAGE DOWN" + ], + [ + { + "y": -0.75, + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "¢\n\n\n\n\n\n©\n\n\nC", + { + "x": 10.5, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "<\n\n\n0\n\n\n\nç\n\n," + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "a": 7, + "fa": [ + 7 + ] + }, + "X", + { + "x": 1 + }, + "V", + { + "x": 8.5, + "a": 6, + "fa": [ + 7, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "\n\nµ\n\n\n\n\n\nM", + { + "x": 1, + "a": 4, + "fa": [ + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7, + 7, + 0 + ] + }, + ">\n\n\n\n\n\n\n\n\n." + ], + [ + { + "y": -0.8799999999999999, + "x": 5.5, + "a": 7, + "fa": [ + 7 + ] + }, + "B", + { + "x": 6.5, + "a": 6, + "fa": [ + 7, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "\n\nñ\n\n\n\n\n\nN" + ], + [ + { + "y": -0.8700000000000001, + "c": "#403e3a", + "t": "#FFF8E7", + "a": 5, + "fa": [ + 1, + 0, + 1, + 0, + 0, + 0, + 7 + ], + "w": 1.5 + }, + "SHIFT\n\n\n\n\n\n(", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 0, + 1, + 0, + 0, + 0, + 7, + 0, + 7 + ] + }, + "æ\n\n\n\n\n\n\n\nZ", + { + "x": 14.5, + "a": 4, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 7, + 1, + 7, + 7, + 0 + ] + }, + "?\n\n\n+\n\n\n\n¿\n\n/", + { + "c": "#403e3a", + "t": "#FFF8E7", + "a": 5, + "fa": [ + 1, + 0, + 1, + 1, + 0, + 0, + 7 + ], + "w": 1.5 + }, + "SHIFT\n\n\n\n\n\n)" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "¨\n\n\"\n\n\n\n´\n\n\n'", + { + "x": 10.5, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "}\n\n\n\n\n\n\n»\n\n]" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5 + }, + "\n\n~\n\n\n\n\n\n\n`", + { + "x": 1, + "fa": [ + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¦\n\n|\n\n\n\n¬\n\n\n\\", + { + "x": 8.5, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "{\n\n\n\n\n\n\n«\n\n[", + { + "x": 1, + "c": "#605d57", + "t": "#FFF8E7", + "a": 7 + }, + "PRNT SCRN" + ], + [ + { + "y": -0.75, + "x": 0.5, + "c": "#006699", + "a": 4, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ] + }, + "\n\n\nFLASH\n\n\n\n\nCTRL\nGUI", + { + "c": "#403e3a", + "a": 5, + "fa": [ + 1 + ] + }, + "CTL+SFT\n\n\n\n\n\nMENU", + { + "x": 14.5 + }, + "CTL+SFT\n\n\n\n\n\nMENU", + { + "c": "#006699", + "a": 4, + "fa": [ + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1 + ] + }, + "\nFLASH\n\n\n\n\n\n\nCTRL\nGUI" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "c": "#605d57", + "fa": [ + 1, + 1, + 0, + 1 + ] + }, + "\n\n\nKBDBRT-\n\n\n\n\n\nVOL-", + "\n\n\nKBDBRT+\n\n\n\n\n\nVOL+" + ], + [ + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 5, + "h": 2 + }, + "ALT", + { + "c": "#403e3a", + "t": "#FFF8E7", + "a": 7, + "f": 3, + "h": 2 + }, + "FN", + { + "c": "#605d57", + "f": 3 + }, + "MUTE" + ], + [ + { + "x": 2, + "c": "#403e3a", + "a": 5 + }, + "ALTGR\n\n\n\n\n\nLDR" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "c": "#605d57", + "a": 4 + }, + "\n\n\nKBDBRT-\n\n\n\n\n\nBRT-", + "\n\n\nKBDBRT+\n\n\n\n\n\nBRT+" + ], + [ + { + "x": -3, + "a": 7, + "f": 3 + }, + "NUM LOCK", + { + "c": "#403e3a", + "f": 3, + "h": 2 + }, + "FN", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 5, + "h": 2 + }, + "ALT" + ], + [ + { + "x": -3, + "c": "#403e3a", + "t": "#FFF8E7" + }, + "ALTGR\n\n\n\n\n\nLDR" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/familiar.png new file mode 100644 index 0000000000..4d61846eb8 Binary files /dev/null and b/keyboards/ergodox/keymaps/familiar/familiar.png differ diff --git a/keyboards/ergodox/keymaps/familiar/familiar.svg b/keyboards/ergodox/keymaps/familiar/familiar.svg new file mode 100644 index 0000000000..94e7cae602 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/familiar.svg @@ -0,0 +1,7131 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/familiar_stick.svg new file mode 100644 index 0000000000..18ec937e28 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/familiar_stick.svg @@ -0,0 +1,7592 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/hntr.json b/keyboards/ergodox/keymaps/familiar/hntr.json new file mode 100644 index 0000000000..c1aae552be --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/hntr.json @@ -0,0 +1,634 @@ +[ + { + "name": "Infinity ErgoDox - H.NT.R" + }, + [ + { + "x": 3.5, + "c": "#e3e2dd", + "t": "#525554", + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "\n\n#\nF3\n\n\n\n\n\n3", + { + "x": 10.5, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "*\nF8\n\n\n\n\n\n\n\n8" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n\n@\nF2\n\n\n\n\n\n2", + { + "x": 1 + }, + "\n\n$\nF4\n\n\n\n\n\n4", + { + "x": 8.5 + }, + "&\nF7\n\n\n\n\n\n\n\n7", + { + "x": 1 + }, + "(\nF9\n\n\n\n\n\n\n\n9" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "\n\n%\nF5\n\n\n\n\n\n5", + "\n\n\nF11", + { + "x": 4.5 + }, + "\nF12", + "^\nF6\n\n\n\n\n\n\n\n6" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "CYCLE LAYER", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 4, + "f": 3 + }, + "\n\n!\nF1\n\n\n\n\n\n1", + { + "x": 14.5, + "f": 3 + }, + ")\nF10\n\n\n/\n\n\n\n\n0", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "CYCLE LAYER" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#c0472c", + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n\nPG UP\n▲\n\n\n\ne\nO", + { + "x": 10.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n]\n\n\n5\n\n\n\ni\nL" + ], + [ + { + "y": -0.875, + "x": 2.5, + "a": 7, + "fa": [ + 5 + ] + }, + "W", + { + "x": 1, + "a": 5, + "fa": [ + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "r\n\n\n\n\n\nU", + { + "x": 8.5, + "a": 4, + "fa": [ + 1, + 1, + 0, + 0, + 0, + 0, + 5, + 0, + 1, + 5 + ] + }, + "\n[\n\n\n4\n\n\n\nu\nD", + { + "x": 1 + }, + "\n?\n\n\n6\n\n\n\no\nG" + ], + [ + { + "y": -0.875, + "x": 5.5, + "a": 5 + }, + "t\n\n\n\n\n\nJ", + { + "a": 7, + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "", + { + "a": 5 + }, + "y\n\n\n\n\n\nK" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "DELETE", + { + "c": "#e3e2dd", + "t": "#525554", + "fa": [ + 5 + ] + }, + "Q", + { + "x": 14.5, + "a": 4, + "fa": [ + 5, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "\n|\n\n\n×\n\n\n\n\nP", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "⌫" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#c0472c", + "a": 4, + "fa": [ + 5, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n\nPG DN\n▼\n\n\n\nd\nE", + { + "x": 10.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n)\n\n\n2\n\n\n\nk\nN" + ], + [ + { + "y": -0.875, + "x": 2.5, + "c": "#c0472c", + "t": "#e3e2dd" + }, + "\n\n\nHOME\n◀\n\n\n\ns\nI", + { + "x": 1 + }, + "\n\n\nEND\n▶\n\n\n\nf\nA", + { + "x": 8.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n(\n\n\n1\n\n\n\nj\nH", + { + "x": 1 + }, + "\n/\n\n\n3\n\n\n\nl\nT" + ], + [ + { + "y": -0.875, + "x": 5.5, + "fa": [ + 5, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n:\n\n\n\n\n\ng\n;", + { + "x": 6.5, + "a": 5, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5 + ] + }, + "h\n\n\n\n\n\nF" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "TAB", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 5 + }, + "a\n\n\n\n\n\nS", + { + "x": 14.5, + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 5 + ] + }, + "\n\\\n\n\n-\n\n\n\n;\nR", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ENTER" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#e3e2dd", + "t": "#525554", + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "" + ], + [ + { + "y": -0.75, + "x": 3.5, + "a": 4 + }, + "\n\n\n-\n\n\n\n\n\nC", + { + "x": 10.5 + }, + "<\n}\n\n\n.\n\n\n\n\n," + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n\n\n=\n\n\n\n\n\nX", + { + "x": 1 + }, + "\n\n\n—\n\n\n\n\n\nV", + { + "x": 8.5 + }, + "\n{\n\n\n0\n\n\n\n\nM", + { + "x": 1 + }, + ">\n~\n\n\nENTER\n\n\n\n\n." + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "\n\n\n_\n\n\n\n\nb\nY", + { + "x": 6.5, + "a": 5 + }, + "n\n\n\n\n\n\nB" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ALT", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 4 + }, + "\n\n\n+\n\n\n\n\n\nZ", + { + "x": 14.5 + }, + "\"\n`\n\n\n+\n\n\n\n/\n'", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ALT" + ], + [ + { + "y": -0.375, + "x": 3.5, + "f": 3 + }, + "END", + { + "x": 10.5, + "f": 3 + }, + "PAGE UP" + ], + [ + { + "y": -0.875, + "x": 2.5, + "f": 3 + }, + "HOME", + { + "x": 1, + "f": 3 + }, + "🔒2", + { + "x": 8.5, + "f": 3 + }, + "🔒3", + { + "x": 1, + "f": 3 + }, + "PAGE DOWN" + ], + [ + { + "y": -0.75, + "x": 0.5, + "c": "#0075ad", + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 9 + ] + }, + "\n\n\nFLASH\n\n\n\n\n\nΑ", + { + "c": "#525554", + "a": 7, + "f": 3 + }, + "MENU", + { + "x": 14.5, + "f": 3 + }, + "MENU", + { + "c": "#0075ad", + "a": 4, + "f": 3 + }, + "\nFLASH\n\n\n\n\n\n\n\nΩ" + ], + [ + { + "y": 1.125, + "c": "#c0472c", + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 5 + ], + "w": 6 + }, + "SHIFTED\nLAYER 4\nSHIFTED\nLAYER 4\nLAYER 2 (LEFT) / LAYER 3 (RIGHT)\n\n\n\nqwerty (layer 1)\nMAIN LAYER" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "c": "#525554", + "fa": [ + 1, + 1, + 1, + 1 + ] + }, + "\n\n\n🔅-\n\n\n\n\n\n🔉", + "\n\n\n🔆+\n\n\n\n\n\n🔊" + ], + [ + { + "a": 7, + "f": 3, + "h": 2 + }, + "SHIFT", + { + "f": 3, + "h": 2 + }, + "ƒ4", + { + "f": 3 + }, + "🔒1" + ], + [ + { + "x": 2, + "f": 3 + }, + "CTRL" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "a": 4, + "f": 3 + }, + "\n🔅-\n\n\n\n\n\n\n\n🔅-", + { + "f": 3 + }, + "\n🔆+\n\n\n\n\n\n\n\n🔆+" + ], + [ + { + "x": -3, + "a": 7, + "f": 3 + }, + "🔒1", + { + "f": 3, + "h": 2 + }, + "ƒ4", + { + "c": "#e3e2dd", + "t": "#525554", + "h": 2 + }, + "" + ], + [ + { + "x": -3, + "c": "#525554", + "t": "#e3e2dd", + "f": 3 + }, + "CTRL" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/hntr.png b/keyboards/ergodox/keymaps/familiar/hntr.png new file mode 100644 index 0000000000..519d152df5 Binary files /dev/null and b/keyboards/ergodox/keymaps/familiar/hntr.png differ -- cgit v1.2.3 From 474f7ee3fdbbd949f55d68d8f5b2387dcf746e0f Mon Sep 17 00:00:00 2001 From: nstickney Date: Thu, 23 Feb 2017 22:24:32 -0600 Subject: initial layer of familiar layout) --- keyboards/ergodox/keymaps/familiar/keymap.c | 104 ++++++++++++++++++---------- 1 file changed, 67 insertions(+), 37 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 7cd81a87c5..3688eb1fce 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -3,42 +3,82 @@ #include "action_layer.h" #include "version.h" - -#include "keymap_german.h" - -#include "keymap_nordic.h" - - +#define BASE 0 // default layer +//#define FUNC 1 // function, media, arrow keys +//#define NUMP 2 // numpad +//#define INTL 3 // international symbols enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here EPRM, VRSN, - RGB_SLD, - + RGB_SLD }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = KEYMAP(KC_ESCAPE,KC_1,KC_2,KC_3,KC_4,KC_5,KC_MINUS,KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_HOME,KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_LSPO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_END,CTL_T(KC_LGUI),KC_APPLICATION,KC_GRAVE,KC_QUOTE,KC_BSLASH,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_AUDIO_MUTE,ALT_T(KC_SPACE),MO(1),KC_RALT,KC_KP_PLUS,KC_6,KC_7,KC_8,KC_9,KC_0,KC_PSCREEN,KC_PGUP,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSPACE,KC_H,KC_J,KC_K,KC_L,KC_SCOLON,KC_ENTER,KC_PGDOWN,KC_N,KC_M,KC_COMMA,KC_DOT,KC_KP_SLASH,KC_RSPC,KC_LBRACKET,KC_RBRACKET,KC_TRANSPARENT,KC_APPLICATION,CTL_T(KC_RGUI),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_RALT,MO(1),ALT_T(KC_SPACE)), - - [1] = KEYMAP(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F11,KC_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LEFT,KC_DOWN,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_STOP,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_INSERT,KC_LEFT,KC_DOWN,KC_UP,KC_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT), - +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | SYSREQ | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| + * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |LGUI/LCTRL|MENU| ` | ' | CAPS | | [ | ] | \ |MENU|RGUI/RCTRL| + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | VOL- | VOL+ | | BRT- | BRT+ | + * ,------|------|------| |------+------+------. + * | ALT/ | | MUTE | | NUM | | ALT/ | + * | SPC | LAY1 |------| |------| LAY1 | SPC | + * | | | LAY3 | | LAY2 | | | + * `--------------------' `--------------------' + */ +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* +[BASE] = KEYMAP( // layer 0 : default + // left hand + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, + KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, + KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_CAPS, + KC_VOLD, KC_VOLU, + KC_MUTE, + ALT_T(KC_SPC), MO(BASE), MO(BASE), + // right hand + KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SYSREQ, + KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, + KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, + KC_VOLD, KC_VOLU, + KC_NLCK, + TT(BASE), MO(BASE), ALT_T(KC_SPC) + ), }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(1) + [1] = ACTION_LAYER_TAP_TOGGLE(BASE) // FN1 - Momentary Layer 1 (Function Keys) }; -// leaving this in place for compatibilty with old keymaps cloned and re-compiled. const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + // MACRODOWN only works in this function switch(id) { case 0: if (record->event.pressed) { SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); } break; + case 1: + if (record->event.pressed) { // For resetting EEPROM + eeconfig_init(); + } + break; } return MACRO_NONE; }; @@ -60,15 +100,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case RGB_SLD: if (record->event.pressed) { - rgblight_mode(1); + #ifdef RGBLIGHT_ENABLE + rgblight_mode(1); + #endif } return false; break; - } return true; } +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + +}; + + +// Runs constantly in the background, in a loop. void matrix_scan_user(void) { uint8_t layer = biton32(layer_state); @@ -78,33 +126,15 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { + // TODO: Make this relevant to the ErgoDox EZ. case 1: ergodox_right_led_1_on(); break; case 2: ergodox_right_led_2_on(); break; - case 3: - ergodox_right_led_3_on(); - break; - case 4: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - break; - case 5: - ergodox_right_led_1_on(); - ergodox_right_led_3_on(); - break; - case 6: - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - break; - case 7: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - break; default: + // none break; } -- cgit v1.2.3 From ebc6948e969f0785619a4caa6e0a9574388a6dab Mon Sep 17 00:00:00 2001 From: nstickney Date: Fri, 24 Feb 2017 17:11:19 -0600 Subject: first two layers of ErgoDox Familiar completeC --- keyboards/ergodox/keymaps/familiar/keymap.c | 68 +++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 13 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 3688eb1fce..e68e77f79c 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -4,7 +4,7 @@ #include "version.h" #define BASE 0 // default layer -//#define FUNC 1 // function, media, arrow keys +#define ARRW 1 // function, media, arrow keys //#define NUMP 2 // numpad //#define INTL 3 // international symbols @@ -16,53 +16,95 @@ enum custom_keycodes { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// If it accepts an argument (i.e, is a function), it doesn't need KC_. +// Otherwise, it needs KC_* /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. * | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | SYSREQ | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | + * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |LGUI/LCTRL|MENU| ` | ' | CAPS | | [ | ] | \ |MENU|RGUI/RCTRL| + * | LCTRL | LGUI | ` | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | VOL- | VOL+ | | BRT- | BRT+ | * ,------|------|------| |------+------+------. - * | ALT/ | | MUTE | | NUM | | ALT/ | + * | ALT/ | | MUTE | | NUMLK| | ALT/ | * | SPC | LAY1 |------| |------| LAY1 | SPC | - * | | | LAY3 | | LAY2 | | | + * | | | LAY3 | |TTLAY2| | | * `--------------------' `--------------------' */ -// If it accepts an argument (i.e, is a function), it doesn't need KC_. -// Otherwise, it needs KC_* [BASE] = KEYMAP( // layer 0 : default // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_CAPS, - KC_VOLD, KC_VOLU, + KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_PSCR, + KC_VOLD, KC_VOLU, KC_MUTE, - ALT_T(KC_SPC), MO(BASE), MO(BASE), + ALT_T(KC_SPC), MO(ARRW), TT(BASE), // right hand KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SYSREQ, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, - KC_VOLD, KC_VOLU, + KC_VOLD, KC_VOLU, KC_NLCK, - TT(BASE), MO(BASE), ALT_T(KC_SPC) + TT(BASE), MO(ARRW), ALT_T(KC_SPC) + ), + +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | UP | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[ARRW] = KEYMAP(// layer 1 : functions and arrows + // left hand + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, + KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + // right hand + KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS ), }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(BASE) // FN1 - Momentary Layer 1 (Function Keys) + [1] = ACTION_LAYER_TAP_TOGGLE(ARRW) // FN1 - Momentary Layer 1 (Function Keys) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -- cgit v1.2.3 From b69b214d524bb658152c5b2491cb270b8464aeb4 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sat, 25 Feb 2017 22:04:21 -0600 Subject: making numbers more familiar --- keyboards/ergodox/keymaps/familiar/keymap.c | 224 ++++++++++++++++------------ 1 file changed, 131 insertions(+), 93 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index e68e77f79c..e79e961092 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -5,8 +5,10 @@ #define BASE 0 // default layer #define ARRW 1 // function, media, arrow keys -//#define NUMP 2 // numpad -//#define INTL 3 // international symbols +#define NUMP 2 // numpad +#define INTL 3 // international symbols + +#define _______ KC_TRNS // Make the layouts easier to read enum custom_keycodes { PLACEHOLDER = SAFE_RANGE, // can always be here @@ -18,60 +20,60 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* -/* Keymap 0: Basic layer +/* layer 0 : default * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | SYSREQ | + * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | DEL | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | BKSP | + * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | INSERT | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LCTRL | LGUI | ` | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | + * | LCTRL | LGUI | | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | VOL- | VOL+ | | BRT- | BRT+ | * ,------|------|------| |------+------+------. * | ALT/ | | MUTE | | NUMLK| | ALT/ | * | SPC | LAY1 |------| |------| LAY1 | SPC | - * | | | LAY3 | |TTLAY2| | | + * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ -[BASE] = KEYMAP( // layer 0 : default +[BASE] = KEYMAP( // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, - KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI,KC_GRV, KC_QUOT,KC_PSCR, - KC_VOLD, KC_VOLU, - KC_MUTE, - ALT_T(KC_SPC), MO(ARRW), TT(BASE), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_INS, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, + KC_LCTL, KC_LGUI, _______, KC_QUOT, KC_PSCR, + KC_VOLD, KC_VOLU, + KC_MUTE, + ALT_T(KC_SPC), MO(ARRW), TG(INTL), // right hand - KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SYSREQ, - KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, - KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, - KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, + KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, + KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, KC_VOLD, KC_VOLU, KC_NLCK, - TT(BASE), MO(ARRW), ALT_T(KC_SPC) + TG(NUMP), MO(ARRW), ALT_T(KC_SPC) ), -/* Keymap 0: Basic layer +/* layer 1 : functions and arrows * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | | + * | SYSREQ | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PAUSE | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | UP | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | UP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | | | | | | | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -81,83 +83,117 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ -[ARRW] = KEYMAP(// layer 1 : functions and arrows +[ARRW] = KEYMAP( // left hand - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, - KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, + KC_SYSREQ, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, _______, _______, KC_UP, _______, _______, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______, // right hand - KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUSE, + _______, _______, _______, _______, _______, _______, _______, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, KC_UP, _______, + _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, + _______, _______, + _______, + _______, _______, _______ ), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(ARRW) // FN1 - Momentary Layer 1 (Function Keys) -}; +/* layer 2 : numberpad + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | |------| |------| | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[NUMP] = KEYMAP( + // left hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______ + ), -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - } - break; - case 1: - if (record->event.pressed) { // For resetting EEPROM - eeconfig_init(); - } - break; - } - return MACRO_NONE; +/* layer 3: International symbols, etc + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | |------| |------| | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[INTL] = KEYMAP( + // left hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______, + // right hand + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, + _______, + _______, _______, _______ + ), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - // dynamically generate these. - case EPRM: - if (record->event.pressed) { - eeconfig_init(); - } - return false; - break; - case VRSN: - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - } - return false; - break; - case RGB_SLD: - if (record->event.pressed) { - #ifdef RGBLIGHT_ENABLE - rgblight_mode(1); - #endif - } - return false; - break; - } - return true; -} - // Runs just one time when the keyboard initializes. void matrix_init_user(void) { }; - // Runs constantly in the background, in a loop. void matrix_scan_user(void) { @@ -168,13 +204,15 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { - // TODO: Make this relevant to the ErgoDox EZ. case 1: ergodox_right_led_1_on(); break; case 2: ergodox_right_led_2_on(); break; + case 3: + ergodox_right_led_3_on(); + break; default: // none break; -- cgit v1.2.3 From 4880e72b77cd934dfc2e9ae4397bd7466ca002e5 Mon Sep 17 00:00:00 2001 From: nstickney Date: Tue, 7 Mar 2017 22:30:43 -0600 Subject: SLASH and WHACK functions added (based on algernon's CT_TA) --- keyboards/ergodox/config.h | 2 +- keyboards/ergodox/keymaps/familiar/Makefile | 5 + keyboards/ergodox/keymaps/familiar/config.h | 37 +++++++ keyboards/ergodox/keymaps/familiar/keymap.c | 146 ++++++++++++++++++++++------ 4 files changed, 157 insertions(+), 33 deletions(-) create mode 100644 keyboards/ergodox/keymaps/familiar/Makefile create mode 100644 keyboards/ergodox/keymaps/familiar/config.h (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h index 3618598320..994a8c6433 100644 --- a/keyboards/ergodox/config.h +++ b/keyboards/ergodox/config.h @@ -34,4 +34,4 @@ #endif -#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ \ No newline at end of file +#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile new file mode 100644 index 0000000000..f795271f0a --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/Makefile @@ -0,0 +1,5 @@ +TAP_DANCE_ENABLE = yes + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/ergodox/keymaps/familiar/config.h b/keyboards/ergodox/keymaps/familiar/config.h new file mode 100644 index 0000000000..994a8c6433 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/config.h @@ -0,0 +1,37 @@ +#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ +#define KEYBOARDS_ERGODOX_CONFIG_H_ + +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_TIME_TO_MAX 5 +#define MOUSEKEY_MAX_SPEED 2 +#define MOUSEKEY_WHEEL_DELAY 0 + +#define TAPPING_TOGGLE 1 + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +#define TAPPING_TERM 200 +#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ + keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ +) + +#ifdef SUBPROJECT_ez + #include "ez/config.h" +#endif +#ifdef SUBPROJECT_infinity + #include "infinity/config.h" +#endif + + +#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index e79e961092..c4ecdee511 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -8,13 +8,14 @@ #define NUMP 2 // numpad #define INTL 3 // international symbols -#define _______ KC_TRNS // Make the layouts easier to read +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO -enum custom_keycodes { - PLACEHOLDER = SAFE_RANGE, // can always be here - EPRM, - VRSN, - RGB_SLD +// Tap Dance Codes +enum { + SLASH, + WHACK, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -23,51 +24,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 0 : default * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | INSERT | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | NOOP | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| - * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | / | )/RSFT | + * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LCTRL | LGUI | | ' |PRTSCR| | [ | ] | \ | RGUI | RCTRL | + * | LCTRL | LGUI | MENU | ' | NOOP | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | VOL- | VOL+ | | BRT- | BRT+ | + * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ | | MUTE | | NUMLK| | ALT/ | - * | SPC | LAY1 |------| |------| LAY1 | SPC | + * | ALT/ | | NUMLK| | MUTE | | ALT/ | + * | SPC | SLASH|------| |------|WHACK | SPC | * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_INS, KC_A, KC_S, KC_D, KC_F, KC_G, + XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI, _______, KC_QUOT, KC_PSCR, - KC_VOLD, KC_VOLU, - KC_MUTE, - ALT_T(KC_SPC), MO(ARRW), TG(INTL), + KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, XXXXXXX, + KC_INS, KC_ESC, + KC_NLCK, + ALT_T(KC_SPC), TD(SLASH), TG(INTL), // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, - KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, - KC_LBRC, KC_RBRC, KC_BSLS, KC_RGUI, KC_RCTL, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, + KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_VOLU, - KC_NLCK, - TG(NUMP), MO(ARRW), ALT_T(KC_SPC) + KC_MUTE, + TG(NUMP), TD(WHACK), ALT_T(KC_SPC) ), /* layer 1 : functions and arrows * * ,--------------------------------------------------. ,--------------------------------------------------. - * | SYSREQ | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | PAUSE | + * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | UP | | | | | | | | | | | | + * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -76,26 +77,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | | | | | | + * |SYSREQ| PAUSE| | | | * ,------|------|------| |------+------+------. - * | | | | | | | | + * | | | SCRLK| | | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ [ARRW] = KEYMAP( // left hand - KC_SYSREQ, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, - _______, + KC_SYSREQ, KC_PAUSE, + KC_SLCK, _______, _______, _______, // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUSE, - _______, _______, _______, _______, _______, _______, _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, @@ -189,6 +190,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +// See https://github.com/algernon/ergodox-layout/blob/master/keymap.c +// When holding the SLASH or WHACK key, the ARRW layer activates while the key is held. +// Tapping the key produces the / or \ key. Double-tapping it toggles the ARRW layer +// on until a third tap. + +typedef struct { + bool layer_toggle; + bool sticky; +} td_ta_state_t; + +static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (td_ta->sticky) { + td_ta->sticky = false; + td_ta->layer_toggle = false; + layer_off (ARRW); + return; + } + + if (state->count == 1 && !state->pressed) { + register_code (KC_SLSH); + td_ta->sticky = false; + td_ta->layer_toggle = false; + } else { + td_ta->layer_toggle = true; + layer_on (ARRW); + td_ta->sticky = (state->count == 2); + } +} + +static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (!td_ta->layer_toggle) + unregister_code (KC_SLSH); + if (!td_ta->sticky) + layer_off (ARRW); +} + +static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (td_ta->sticky) { + td_ta->sticky = false; + td_ta->layer_toggle = false; + layer_off (ARRW); + return; + } + + if (state->count == 1 && !state->pressed) { + register_code (KC_BSLS); + td_ta->sticky = false; + td_ta->layer_toggle = false; + } else { + td_ta->layer_toggle = true; + layer_on (ARRW); + td_ta->sticky = (state->count == 2); + } +} + +static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) { + td_ta_state_t *td_ta = (td_ta_state_t *) user_data; + + if (!td_ta->layer_toggle) + unregister_code (KC_BSLS); + if (!td_ta->sticky) + layer_off (ARRW); +} + +qk_tap_dance_action_t tap_dance_actions[] = { + [SLASH] = { + .fn = { NULL, ang_tap_dance_s_finished, ang_tap_dance_s_reset }, + .user_data = (void *)&((td_ta_state_t) { false, false }) + }, + [WHACK] = { + .fn = { NULL, ang_tap_dance_w_finished, ang_tap_dance_w_reset }, + .user_data = (void *)&((td_ta_state_t) { false, false }) + } +}; + // Runs just one time when the keyboard initializes. void matrix_init_user(void) { -- cgit v1.2.3 From 29e7003fc22de30d0b467ff9263a3462c3970dd9 Mon Sep 17 00:00:00 2001 From: nstickney Date: Tue, 7 Mar 2017 22:31:14 -0600 Subject: SLASH and WHACK functions added (based on algernon's CT_TA) --- keyboards/ergodox/keymaps/familiar/config.h | 37 ----------------------------- 1 file changed, 37 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/config.h (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/config.h b/keyboards/ergodox/keymaps/familiar/config.h deleted file mode 100644 index 994a8c6433..0000000000 --- a/keyboards/ergodox/keymaps/familiar/config.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ -#define KEYBOARDS_ERGODOX_CONFIG_H_ - -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_DELAY 0 -#define MOUSEKEY_TIME_TO_MAX 5 -#define MOUSEKEY_MAX_SPEED 2 -#define MOUSEKEY_WHEEL_DELAY 0 - -#define TAPPING_TOGGLE 1 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -#define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ - keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ -) - -#ifdef SUBPROJECT_ez - #include "ez/config.h" -#endif -#ifdef SUBPROJECT_infinity - #include "infinity/config.h" -#endif - - -#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ -- cgit v1.2.3 From fa44e8d4dca234847548656f4f38bce14bf33b31 Mon Sep 17 00:00:00 2001 From: nstickney Date: Wed, 8 Mar 2017 16:26:45 -0600 Subject: corralled image files --- keyboards/ergodox/keymaps/familiar/HNTR.svg | 7253 ------------------- keyboards/ergodox/keymaps/familiar/familiar.json | 865 --- keyboards/ergodox/keymaps/familiar/familiar.png | Bin 102059 -> 0 bytes keyboards/ergodox/keymaps/familiar/familiar.svg | 7131 ------------------ .../ergodox/keymaps/familiar/familiar_stick.svg | 7592 -------------------- keyboards/ergodox/keymaps/familiar/hntr.json | 634 -- keyboards/ergodox/keymaps/familiar/hntr.png | Bin 77473 -> 0 bytes keyboards/ergodox/keymaps/familiar/img/HNTR.svg | 7253 +++++++++++++++++++ .../ergodox/keymaps/familiar/img/familiar.json | 865 +++ .../ergodox/keymaps/familiar/img/familiar.png | Bin 0 -> 102059 bytes .../ergodox/keymaps/familiar/img/familiar.svg | 7131 ++++++++++++++++++ .../keymaps/familiar/img/familiar_stick.svg | 7592 ++++++++++++++++++++ keyboards/ergodox/keymaps/familiar/img/hntr.json | 634 ++ keyboards/ergodox/keymaps/familiar/img/hntr.png | Bin 0 -> 77473 bytes keyboards/ergodox/keymaps/familiar/keymap.c | 26 +- 15 files changed, 23488 insertions(+), 23488 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/HNTR.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/familiar.json delete mode 100644 keyboards/ergodox/keymaps/familiar/familiar.png delete mode 100644 keyboards/ergodox/keymaps/familiar/familiar.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/familiar_stick.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/hntr.json delete mode 100644 keyboards/ergodox/keymaps/familiar/hntr.png create mode 100644 keyboards/ergodox/keymaps/familiar/img/HNTR.svg create mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.json create mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.png create mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.svg create mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg create mode 100644 keyboards/ergodox/keymaps/familiar/img/hntr.json create mode 100644 keyboards/ergodox/keymaps/familiar/img/hntr.png (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/HNTR.svg b/keyboards/ergodox/keymaps/familiar/HNTR.svg deleted file mode 100644 index a419e7ab8b..0000000000 --- a/keyboards/ergodox/keymaps/familiar/HNTR.svg +++ /dev/null @@ -1,7253 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 😎 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/familiar.json b/keyboards/ergodox/keymaps/familiar/familiar.json deleted file mode 100644 index e80f99e5f0..0000000000 --- a/keyboards/ergodox/keymaps/familiar/familiar.json +++ /dev/null @@ -1,865 +0,0 @@ -[ - { - "name": "ErgoDox Familiar (CosmicStick Colors)", - "author": "Stick" - }, - [ - { - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "\n\n#\nF3\n\n\n³\n\n\n3", - { - "x": 10.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "*\nF8\n\n\n\n\n\n¾\n\n8" - ], - [ - { - "y": -0.87, - "x": 2.5 - }, - "\n\n@\nF2\n\n\n²\n\n\n2", - { - "x": 1, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¤\n\n$\nF4\n\n\n£\n\n\n4", - { - "x": 8.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "&\nF7\n\n\n\n\n\n½\n\n7", - { - "x": 1 - }, - "(\nF9\n\n\n\n\n\n‘\n\n9" - ], - [ - { - "y": -0.8699999999999999, - "x": 5.5 - }, - "\n\n%\nF5\n\n\n€\n\n\n5", - "\n\n_\nF11\n\n\n¥\n\n\n-", - { - "x": 4.5, - "fa": [ - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "+\nF12\n÷\n\n\n\n\n×\n\n=", - "^\nF6\n\n\n\n\n\n¼\n\n6" - ], - [ - { - "y": -0.88, - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "ESCAPE", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¡\n\n!\nF1\n\n\n¹\n\n\n1", - { - "x": 14.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - ")\nF10\n\n/\n\n\n\n’\n\n0", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "SYSREQ" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#993300", - "a": 4 - }, - "\n\n\n↑\n\n\né\n\n\nE", - { - "x": 10.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n5\n\n\n\ní\n\nI" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "a": 6, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 7 - ] - }, - "å\n\n\n\n\n\n\n\nW", - { - "x": 1 - }, - "®\n\n\n\n\n\n\n\nR", - { - "x": 8.5, - "a": 4, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "\n\n\n4\n\n\n\nú\n\nU", - { - "x": 1 - }, - "\n\n\n6\n\n\n\nó\n\nO" - ], - [ - { - "y": -0.8699999999999999, - "x": 5.5, - "a": 6 - }, - "þ\n\n\n\n\n\n\n\nT", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "f": 3, - "h": 1.5 - }, - "HOME", - { - "x": 4.5, - "f": 3, - "h": 1.5 - }, - "PAGE UP", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 7 - ] - }, - "\n\nü\n\n\n\n\n\nY" - ], - [ - { - "y": -0.8799999999999999, - "c": "#605d57", - "t": "#FFF8E7", - "a": 4, - "w": 1.5 - }, - "\n\n\nBREAK\n\n\n\n\n\nDELETE", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6 - }, - "ä\n\n\n\n\n\n\n\nQ", - { - "x": 14.5, - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "\n\n\n×\n\n\n\nö\n\nP", - { - "c": "#605d57", - "t": "#FFF8E7", - "fa": [ - 1, - 1 - ], - "w": 1.5 - }, - "\nINSERT\n\n\n\n\n\n\n\nBCKSPC" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#993300", - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "Ð\n\n\n↓\n\n\nð\n\n\nD", - { - "x": 10.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n2\n\n\n\n\n\nK" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "c": "#993300", - "t": "#FFF8E7" - }, - "§\n\n\n←\n\n\nß\n\n\nS", - { - "x": 1 - }, - "\n\n\n→\n\n\n\n\n\nF", - { - "x": 8.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n1\n\n\n\n\n\nJ", - { - "x": 1, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "\n\n\n3\n\n\n\nø\n\nL" - ], - [ - { - "y": -0.8799999999999999, - "x": 5.5, - "a": 7, - "fa": [ - 7 - ] - }, - "G", - { - "x": 6.5 - }, - "H" - ], - [ - { - "y": -0.8700000000000001, - "c": "#605d57", - "t": "#FFF8E7", - "f": 3, - "w": 1.5 - }, - "TAB", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "á\n\n\n\n\n\n\n\nA", - { - "x": 14.5, - "a": 4, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 7, - 7, - 0 - ] - }, - ":\n\n°\n-\n\n\n\n¶\n\n;", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "ENTER" - ], - [ - { - "y": -0.6299999999999999, - "x": 6.5, - "h": 1.5 - }, - "END", - { - "x": 4.5, - "h": 1.5 - }, - "PAGE DOWN" - ], - [ - { - "y": -0.75, - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "¢\n\n\n\n\n\n©\n\n\nC", - { - "x": 10.5, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "<\n\n\n0\n\n\n\nç\n\n," - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "a": 7, - "fa": [ - 7 - ] - }, - "X", - { - "x": 1 - }, - "V", - { - "x": 8.5, - "a": 6, - "fa": [ - 7, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "\n\nµ\n\n\n\n\n\nM", - { - "x": 1, - "a": 4, - "fa": [ - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7, - 7, - 0 - ] - }, - ">\n\n\n\n\n\n\n\n\n." - ], - [ - { - "y": -0.8799999999999999, - "x": 5.5, - "a": 7, - "fa": [ - 7 - ] - }, - "B", - { - "x": 6.5, - "a": 6, - "fa": [ - 7, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "\n\nñ\n\n\n\n\n\nN" - ], - [ - { - "y": -0.8700000000000001, - "c": "#403e3a", - "t": "#FFF8E7", - "a": 5, - "fa": [ - 1, - 0, - 1, - 0, - 0, - 0, - 7 - ], - "w": 1.5 - }, - "SHIFT\n\n\n\n\n\n(", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 0, - 1, - 0, - 0, - 0, - 7, - 0, - 7 - ] - }, - "æ\n\n\n\n\n\n\n\nZ", - { - "x": 14.5, - "a": 4, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 7, - 1, - 7, - 7, - 0 - ] - }, - "?\n\n\n+\n\n\n\n¿\n\n/", - { - "c": "#403e3a", - "t": "#FFF8E7", - "a": 5, - "fa": [ - 1, - 0, - 1, - 1, - 0, - 0, - 7 - ], - "w": 1.5 - }, - "SHIFT\n\n\n\n\n\n)" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "¨\n\n\"\n\n\n\n´\n\n\n'", - { - "x": 10.5, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "}\n\n\n\n\n\n\n»\n\n]" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5 - }, - "\n\n~\n\n\n\n\n\n\n`", - { - "x": 1, - "fa": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¦\n\n|\n\n\n\n¬\n\n\n\\", - { - "x": 8.5, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "{\n\n\n\n\n\n\n«\n\n[", - { - "x": 1, - "c": "#605d57", - "t": "#FFF8E7", - "a": 7 - }, - "PRNT SCRN" - ], - [ - { - "y": -0.75, - "x": 0.5, - "c": "#006699", - "a": 4, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ] - }, - "\n\n\nFLASH\n\n\n\n\nCTRL\nGUI", - { - "c": "#403e3a", - "a": 5, - "fa": [ - 1 - ] - }, - "CTL+SFT\n\n\n\n\n\nMENU", - { - "x": 14.5 - }, - "CTL+SFT\n\n\n\n\n\nMENU", - { - "c": "#006699", - "a": 4, - "fa": [ - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1 - ] - }, - "\nFLASH\n\n\n\n\n\n\nCTRL\nGUI" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1, - "c": "#605d57", - "fa": [ - 1, - 1, - 0, - 1 - ] - }, - "\n\n\nKBDBRT-\n\n\n\n\n\nVOL-", - "\n\n\nKBDBRT+\n\n\n\n\n\nVOL+" - ], - [ - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 5, - "h": 2 - }, - "ALT", - { - "c": "#403e3a", - "t": "#FFF8E7", - "a": 7, - "f": 3, - "h": 2 - }, - "FN", - { - "c": "#605d57", - "f": 3 - }, - "MUTE" - ], - [ - { - "x": 2, - "c": "#403e3a", - "a": 5 - }, - "ALTGR\n\n\n\n\n\nLDR" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3, - "c": "#605d57", - "a": 4 - }, - "\n\n\nKBDBRT-\n\n\n\n\n\nBRT-", - "\n\n\nKBDBRT+\n\n\n\n\n\nBRT+" - ], - [ - { - "x": -3, - "a": 7, - "f": 3 - }, - "NUM LOCK", - { - "c": "#403e3a", - "f": 3, - "h": 2 - }, - "FN", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 5, - "h": 2 - }, - "ALT" - ], - [ - { - "x": -3, - "c": "#403e3a", - "t": "#FFF8E7" - }, - "ALTGR\n\n\n\n\n\nLDR" - ] -] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/familiar.png deleted file mode 100644 index 4d61846eb8..0000000000 Binary files a/keyboards/ergodox/keymaps/familiar/familiar.png and /dev/null differ diff --git a/keyboards/ergodox/keymaps/familiar/familiar.svg b/keyboards/ergodox/keymaps/familiar/familiar.svg deleted file mode 100644 index 94e7cae602..0000000000 --- a/keyboards/ergodox/keymaps/familiar/familiar.svg +++ /dev/null @@ -1,7131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/familiar_stick.svg deleted file mode 100644 index 18ec937e28..0000000000 --- a/keyboards/ergodox/keymaps/familiar/familiar_stick.svg +++ /dev/null @@ -1,7592 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/hntr.json b/keyboards/ergodox/keymaps/familiar/hntr.json deleted file mode 100644 index c1aae552be..0000000000 --- a/keyboards/ergodox/keymaps/familiar/hntr.json +++ /dev/null @@ -1,634 +0,0 @@ -[ - { - "name": "Infinity ErgoDox - H.NT.R" - }, - [ - { - "x": 3.5, - "c": "#e3e2dd", - "t": "#525554", - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "\n\n#\nF3\n\n\n\n\n\n3", - { - "x": 10.5, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "*\nF8\n\n\n\n\n\n\n\n8" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "\n\n@\nF2\n\n\n\n\n\n2", - { - "x": 1 - }, - "\n\n$\nF4\n\n\n\n\n\n4", - { - "x": 8.5 - }, - "&\nF7\n\n\n\n\n\n\n\n7", - { - "x": 1 - }, - "(\nF9\n\n\n\n\n\n\n\n9" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "\n\n%\nF5\n\n\n\n\n\n5", - "\n\n\nF11", - { - "x": 4.5 - }, - "\nF12", - "^\nF6\n\n\n\n\n\n\n\n6" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "CYCLE LAYER", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 4, - "f": 3 - }, - "\n\n!\nF1\n\n\n\n\n\n1", - { - "x": 14.5, - "f": 3 - }, - ")\nF10\n\n\n/\n\n\n\n\n0", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "CYCLE LAYER" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#c0472c", - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n\nPG UP\n▲\n\n\n\ne\nO", - { - "x": 10.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n]\n\n\n5\n\n\n\ni\nL" - ], - [ - { - "y": -0.875, - "x": 2.5, - "a": 7, - "fa": [ - 5 - ] - }, - "W", - { - "x": 1, - "a": 5, - "fa": [ - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "r\n\n\n\n\n\nU", - { - "x": 8.5, - "a": 4, - "fa": [ - 1, - 1, - 0, - 0, - 0, - 0, - 5, - 0, - 1, - 5 - ] - }, - "\n[\n\n\n4\n\n\n\nu\nD", - { - "x": 1 - }, - "\n?\n\n\n6\n\n\n\no\nG" - ], - [ - { - "y": -0.875, - "x": 5.5, - "a": 5 - }, - "t\n\n\n\n\n\nJ", - { - "a": 7, - "h": 1.5 - }, - "", - { - "x": 4.5, - "h": 1.5 - }, - "", - { - "a": 5 - }, - "y\n\n\n\n\n\nK" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "DELETE", - { - "c": "#e3e2dd", - "t": "#525554", - "fa": [ - 5 - ] - }, - "Q", - { - "x": 14.5, - "a": 4, - "fa": [ - 5, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "\n|\n\n\n×\n\n\n\n\nP", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "⌫" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#c0472c", - "a": 4, - "fa": [ - 5, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n\nPG DN\n▼\n\n\n\nd\nE", - { - "x": 10.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n)\n\n\n2\n\n\n\nk\nN" - ], - [ - { - "y": -0.875, - "x": 2.5, - "c": "#c0472c", - "t": "#e3e2dd" - }, - "\n\n\nHOME\n◀\n\n\n\ns\nI", - { - "x": 1 - }, - "\n\n\nEND\n▶\n\n\n\nf\nA", - { - "x": 8.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n(\n\n\n1\n\n\n\nj\nH", - { - "x": 1 - }, - "\n/\n\n\n3\n\n\n\nl\nT" - ], - [ - { - "y": -0.875, - "x": 5.5, - "fa": [ - 5, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n:\n\n\n\n\n\ng\n;", - { - "x": 6.5, - "a": 5, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5 - ] - }, - "h\n\n\n\n\n\nF" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "TAB", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 5 - }, - "a\n\n\n\n\n\nS", - { - "x": 14.5, - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 5 - ] - }, - "\n\\\n\n\n-\n\n\n\n;\nR", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ENTER" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#e3e2dd", - "t": "#525554", - "h": 1.5 - }, - "", - { - "x": 4.5, - "h": 1.5 - }, - "" - ], - [ - { - "y": -0.75, - "x": 3.5, - "a": 4 - }, - "\n\n\n-\n\n\n\n\n\nC", - { - "x": 10.5 - }, - "<\n}\n\n\n.\n\n\n\n\n," - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "\n\n\n=\n\n\n\n\n\nX", - { - "x": 1 - }, - "\n\n\n—\n\n\n\n\n\nV", - { - "x": 8.5 - }, - "\n{\n\n\n0\n\n\n\n\nM", - { - "x": 1 - }, - ">\n~\n\n\nENTER\n\n\n\n\n." - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "\n\n\n_\n\n\n\n\nb\nY", - { - "x": 6.5, - "a": 5 - }, - "n\n\n\n\n\n\nB" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ALT", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 4 - }, - "\n\n\n+\n\n\n\n\n\nZ", - { - "x": 14.5 - }, - "\"\n`\n\n\n+\n\n\n\n/\n'", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ALT" - ], - [ - { - "y": -0.375, - "x": 3.5, - "f": 3 - }, - "END", - { - "x": 10.5, - "f": 3 - }, - "PAGE UP" - ], - [ - { - "y": -0.875, - "x": 2.5, - "f": 3 - }, - "HOME", - { - "x": 1, - "f": 3 - }, - "🔒2", - { - "x": 8.5, - "f": 3 - }, - "🔒3", - { - "x": 1, - "f": 3 - }, - "PAGE DOWN" - ], - [ - { - "y": -0.75, - "x": 0.5, - "c": "#0075ad", - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 9 - ] - }, - "\n\n\nFLASH\n\n\n\n\n\nΑ", - { - "c": "#525554", - "a": 7, - "f": 3 - }, - "MENU", - { - "x": 14.5, - "f": 3 - }, - "MENU", - { - "c": "#0075ad", - "a": 4, - "f": 3 - }, - "\nFLASH\n\n\n\n\n\n\n\nΩ" - ], - [ - { - "y": 1.125, - "c": "#c0472c", - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 5 - ], - "w": 6 - }, - "SHIFTED\nLAYER 4\nSHIFTED\nLAYER 4\nLAYER 2 (LEFT) / LAYER 3 (RIGHT)\n\n\n\nqwerty (layer 1)\nMAIN LAYER" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1, - "c": "#525554", - "fa": [ - 1, - 1, - 1, - 1 - ] - }, - "\n\n\n🔅-\n\n\n\n\n\n🔉", - "\n\n\n🔆+\n\n\n\n\n\n🔊" - ], - [ - { - "a": 7, - "f": 3, - "h": 2 - }, - "SHIFT", - { - "f": 3, - "h": 2 - }, - "ƒ4", - { - "f": 3 - }, - "🔒1" - ], - [ - { - "x": 2, - "f": 3 - }, - "CTRL" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3, - "a": 4, - "f": 3 - }, - "\n🔅-\n\n\n\n\n\n\n\n🔅-", - { - "f": 3 - }, - "\n🔆+\n\n\n\n\n\n\n\n🔆+" - ], - [ - { - "x": -3, - "a": 7, - "f": 3 - }, - "🔒1", - { - "f": 3, - "h": 2 - }, - "ƒ4", - { - "c": "#e3e2dd", - "t": "#525554", - "h": 2 - }, - "" - ], - [ - { - "x": -3, - "c": "#525554", - "t": "#e3e2dd", - "f": 3 - }, - "CTRL" - ] -] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/hntr.png b/keyboards/ergodox/keymaps/familiar/hntr.png deleted file mode 100644 index 519d152df5..0000000000 Binary files a/keyboards/ergodox/keymaps/familiar/hntr.png and /dev/null differ diff --git a/keyboards/ergodox/keymaps/familiar/img/HNTR.svg b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg new file mode 100644 index 0000000000..a419e7ab8b --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg @@ -0,0 +1,7253 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 😎 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.json b/keyboards/ergodox/keymaps/familiar/img/familiar.json new file mode 100644 index 0000000000..e80f99e5f0 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/img/familiar.json @@ -0,0 +1,865 @@ +[ + { + "name": "ErgoDox Familiar (CosmicStick Colors)", + "author": "Stick" + }, + [ + { + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "\n\n#\nF3\n\n\n³\n\n\n3", + { + "x": 10.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "*\nF8\n\n\n\n\n\n¾\n\n8" + ], + [ + { + "y": -0.87, + "x": 2.5 + }, + "\n\n@\nF2\n\n\n²\n\n\n2", + { + "x": 1, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¤\n\n$\nF4\n\n\n£\n\n\n4", + { + "x": 8.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "&\nF7\n\n\n\n\n\n½\n\n7", + { + "x": 1 + }, + "(\nF9\n\n\n\n\n\n‘\n\n9" + ], + [ + { + "y": -0.8699999999999999, + "x": 5.5 + }, + "\n\n%\nF5\n\n\n€\n\n\n5", + "\n\n_\nF11\n\n\n¥\n\n\n-", + { + "x": 4.5, + "fa": [ + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "+\nF12\n÷\n\n\n\n\n×\n\n=", + "^\nF6\n\n\n\n\n\n¼\n\n6" + ], + [ + { + "y": -0.88, + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "ESCAPE", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¡\n\n!\nF1\n\n\n¹\n\n\n1", + { + "x": 14.5, + "fa": [ + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + ")\nF10\n\n/\n\n\n\n’\n\n0", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "SYSREQ" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#993300", + "a": 4 + }, + "\n\n\n↑\n\n\né\n\n\nE", + { + "x": 10.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n5\n\n\n\ní\n\nI" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "a": 6, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 7 + ] + }, + "å\n\n\n\n\n\n\n\nW", + { + "x": 1 + }, + "®\n\n\n\n\n\n\n\nR", + { + "x": 8.5, + "a": 4, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "\n\n\n4\n\n\n\nú\n\nU", + { + "x": 1 + }, + "\n\n\n6\n\n\n\nó\n\nO" + ], + [ + { + "y": -0.8699999999999999, + "x": 5.5, + "a": 6 + }, + "þ\n\n\n\n\n\n\n\nT", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "f": 3, + "h": 1.5 + }, + "HOME", + { + "x": 4.5, + "f": 3, + "h": 1.5 + }, + "PAGE UP", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 7 + ] + }, + "\n\nü\n\n\n\n\n\nY" + ], + [ + { + "y": -0.8799999999999999, + "c": "#605d57", + "t": "#FFF8E7", + "a": 4, + "w": 1.5 + }, + "\n\n\nBREAK\n\n\n\n\n\nDELETE", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6 + }, + "ä\n\n\n\n\n\n\n\nQ", + { + "x": 14.5, + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "\n\n\n×\n\n\n\nö\n\nP", + { + "c": "#605d57", + "t": "#FFF8E7", + "fa": [ + 1, + 1 + ], + "w": 1.5 + }, + "\nINSERT\n\n\n\n\n\n\n\nBCKSPC" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#993300", + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "Ð\n\n\n↓\n\n\nð\n\n\nD", + { + "x": 10.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n2\n\n\n\n\n\nK" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "c": "#993300", + "t": "#FFF8E7" + }, + "§\n\n\n←\n\n\nß\n\n\nS", + { + "x": 1 + }, + "\n\n\n→\n\n\n\n\n\nF", + { + "x": 8.5, + "c": "#FFF8E7", + "t": "#403e3a" + }, + "\n\n\n1\n\n\n\n\n\nJ", + { + "x": 1, + "fa": [ + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "\n\n\n3\n\n\n\nø\n\nL" + ], + [ + { + "y": -0.8799999999999999, + "x": 5.5, + "a": 7, + "fa": [ + 7 + ] + }, + "G", + { + "x": 6.5 + }, + "H" + ], + [ + { + "y": -0.8700000000000001, + "c": "#605d57", + "t": "#FFF8E7", + "f": 3, + "w": 1.5 + }, + "TAB", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "á\n\n\n\n\n\n\n\nA", + { + "x": 14.5, + "a": 4, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 7, + 7, + 0 + ] + }, + ":\n\n°\n-\n\n\n\n¶\n\n;", + { + "c": "#605d57", + "t": "#FFF8E7", + "a": 7, + "w": 1.5 + }, + "ENTER" + ], + [ + { + "y": -0.6299999999999999, + "x": 6.5, + "h": 1.5 + }, + "END", + { + "x": 4.5, + "h": 1.5 + }, + "PAGE DOWN" + ], + [ + { + "y": -0.75, + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "¢\n\n\n\n\n\n©\n\n\nC", + { + "x": 10.5, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 7, + 7, + 0 + ] + }, + "<\n\n\n0\n\n\n\nç\n\n," + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5, + "a": 7, + "fa": [ + 7 + ] + }, + "X", + { + "x": 1 + }, + "V", + { + "x": 8.5, + "a": 6, + "fa": [ + 7, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "\n\nµ\n\n\n\n\n\nM", + { + "x": 1, + "a": 4, + "fa": [ + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7, + 7, + 0 + ] + }, + ">\n\n\n\n\n\n\n\n\n." + ], + [ + { + "y": -0.8799999999999999, + "x": 5.5, + "a": 7, + "fa": [ + 7 + ] + }, + "B", + { + "x": 6.5, + "a": 6, + "fa": [ + 7, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 7 + ] + }, + "\n\nñ\n\n\n\n\n\nN" + ], + [ + { + "y": -0.8700000000000001, + "c": "#403e3a", + "t": "#FFF8E7", + "a": 5, + "fa": [ + 1, + 0, + 1, + 0, + 0, + 0, + 7 + ], + "w": 1.5 + }, + "SHIFT\n\n\n\n\n\n(", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 6, + "fa": [ + 1, + 0, + 1, + 0, + 0, + 0, + 7, + 0, + 7 + ] + }, + "æ\n\n\n\n\n\n\n\nZ", + { + "x": 14.5, + "a": 4, + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 7, + 1, + 7, + 7, + 0 + ] + }, + "?\n\n\n+\n\n\n\n¿\n\n/", + { + "c": "#403e3a", + "t": "#FFF8E7", + "a": 5, + "fa": [ + 1, + 0, + 1, + 1, + 0, + 0, + 7 + ], + "w": 1.5 + }, + "SHIFT\n\n\n\n\n\n)" + ], + [ + { + "y": -0.3799999999999999, + "x": 3.5, + "c": "#FFF8E7", + "t": "#403e3a", + "a": 4, + "fa": [ + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 7, + 0 + ] + }, + "¨\n\n\"\n\n\n\n´\n\n\n'", + { + "x": 10.5, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "}\n\n\n\n\n\n\n»\n\n]" + ], + [ + { + "y": -0.8700000000000001, + "x": 2.5 + }, + "\n\n~\n\n\n\n\n\n\n`", + { + "x": 1, + "fa": [ + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "¦\n\n|\n\n\n\n¬\n\n\n\\", + { + "x": 8.5, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 7, + 0 + ] + }, + "{\n\n\n\n\n\n\n«\n\n[", + { + "x": 1, + "c": "#605d57", + "t": "#FFF8E7", + "a": 7 + }, + "PRNT SCRN" + ], + [ + { + "y": -0.75, + "x": 0.5, + "c": "#006699", + "a": 4, + "fa": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ] + }, + "\n\n\nFLASH\n\n\n\n\nCTRL\nGUI", + { + "c": "#403e3a", + "a": 5, + "fa": [ + 1 + ] + }, + "CTL+SFT\n\n\n\n\n\nMENU", + { + "x": 14.5 + }, + "CTL+SFT\n\n\n\n\n\nMENU", + { + "c": "#006699", + "a": 4, + "fa": [ + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1 + ] + }, + "\nFLASH\n\n\n\n\n\n\nCTRL\nGUI" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "c": "#605d57", + "fa": [ + 1, + 1, + 0, + 1 + ] + }, + "\n\n\nKBDBRT-\n\n\n\n\n\nVOL-", + "\n\n\nKBDBRT+\n\n\n\n\n\nVOL+" + ], + [ + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 5, + "h": 2 + }, + "ALT", + { + "c": "#403e3a", + "t": "#FFF8E7", + "a": 7, + "f": 3, + "h": 2 + }, + "FN", + { + "c": "#605d57", + "f": 3 + }, + "MUTE" + ], + [ + { + "x": 2, + "c": "#403e3a", + "a": 5 + }, + "ALTGR\n\n\n\n\n\nLDR" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "c": "#605d57", + "a": 4 + }, + "\n\n\nKBDBRT-\n\n\n\n\n\nBRT-", + "\n\n\nKBDBRT+\n\n\n\n\n\nBRT+" + ], + [ + { + "x": -3, + "a": 7, + "f": 3 + }, + "NUM LOCK", + { + "c": "#403e3a", + "f": 3, + "h": 2 + }, + "FN", + { + "c": "#FFF8E7", + "t": "#403e3a", + "a": 5, + "h": 2 + }, + "ALT" + ], + [ + { + "x": -3, + "c": "#403e3a", + "t": "#FFF8E7" + }, + "ALTGR\n\n\n\n\n\nLDR" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.png b/keyboards/ergodox/keymaps/familiar/img/familiar.png new file mode 100644 index 0000000000..4d61846eb8 Binary files /dev/null and b/keyboards/ergodox/keymaps/familiar/img/familiar.png differ diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.svg b/keyboards/ergodox/keymaps/familiar/img/familiar.svg new file mode 100644 index 0000000000..94e7cae602 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/img/familiar.svg @@ -0,0 +1,7131 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg new file mode 100644 index 0000000000..18ec937e28 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg @@ -0,0 +1,7592 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out + + + Keyboards + + + + + + + + + To avoid delays and errors in your order you must convert all of your fonts and text to vector data + This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. + + + Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) + + Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. + + + Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. + Inkscape Tutorial + FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. + Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. + + + + Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size + + + + + Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. + + + + Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. + Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. + + + SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. + + Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style + Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides + + + WASD Keyboards 104/87-Key Design Template + IMPORTANT: + Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/ergodox/keymaps/familiar/img/hntr.json b/keyboards/ergodox/keymaps/familiar/img/hntr.json new file mode 100644 index 0000000000..c1aae552be --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/img/hntr.json @@ -0,0 +1,634 @@ +[ + { + "name": "Infinity ErgoDox - H.NT.R" + }, + [ + { + "x": 3.5, + "c": "#e3e2dd", + "t": "#525554", + "fa": [ + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "\n\n#\nF3\n\n\n\n\n\n3", + { + "x": 10.5, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "*\nF8\n\n\n\n\n\n\n\n8" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n\n@\nF2\n\n\n\n\n\n2", + { + "x": 1 + }, + "\n\n$\nF4\n\n\n\n\n\n4", + { + "x": 8.5 + }, + "&\nF7\n\n\n\n\n\n\n\n7", + { + "x": 1 + }, + "(\nF9\n\n\n\n\n\n\n\n9" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "\n\n%\nF5\n\n\n\n\n\n5", + "\n\n\nF11", + { + "x": 4.5 + }, + "\nF12", + "^\nF6\n\n\n\n\n\n\n\n6" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "CYCLE LAYER", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 4, + "f": 3 + }, + "\n\n!\nF1\n\n\n\n\n\n1", + { + "x": 14.5, + "f": 3 + }, + ")\nF10\n\n\n/\n\n\n\n\n0", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "CYCLE LAYER" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#c0472c", + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n\nPG UP\n▲\n\n\n\ne\nO", + { + "x": 10.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n]\n\n\n5\n\n\n\ni\nL" + ], + [ + { + "y": -0.875, + "x": 2.5, + "a": 7, + "fa": [ + 5 + ] + }, + "W", + { + "x": 1, + "a": 5, + "fa": [ + 1, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "r\n\n\n\n\n\nU", + { + "x": 8.5, + "a": 4, + "fa": [ + 1, + 1, + 0, + 0, + 0, + 0, + 5, + 0, + 1, + 5 + ] + }, + "\n[\n\n\n4\n\n\n\nu\nD", + { + "x": 1 + }, + "\n?\n\n\n6\n\n\n\no\nG" + ], + [ + { + "y": -0.875, + "x": 5.5, + "a": 5 + }, + "t\n\n\n\n\n\nJ", + { + "a": 7, + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "", + { + "a": 5 + }, + "y\n\n\n\n\n\nK" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "DELETE", + { + "c": "#e3e2dd", + "t": "#525554", + "fa": [ + 5 + ] + }, + "Q", + { + "x": 14.5, + "a": 4, + "fa": [ + 5, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 5 + ] + }, + "\n|\n\n\n×\n\n\n\n\nP", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "⌫" + ], + [ + { + "y": -0.375, + "x": 3.5, + "c": "#c0472c", + "a": 4, + "fa": [ + 5, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n\nPG DN\n▼\n\n\n\nd\nE", + { + "x": 10.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n)\n\n\n2\n\n\n\nk\nN" + ], + [ + { + "y": -0.875, + "x": 2.5, + "c": "#c0472c", + "t": "#e3e2dd" + }, + "\n\n\nHOME\n◀\n\n\n\ns\nI", + { + "x": 1 + }, + "\n\n\nEND\n▶\n\n\n\nf\nA", + { + "x": 8.5, + "c": "#e3e2dd", + "t": "#525554" + }, + "\n(\n\n\n1\n\n\n\nj\nH", + { + "x": 1 + }, + "\n/\n\n\n3\n\n\n\nl\nT" + ], + [ + { + "y": -0.875, + "x": 5.5, + "fa": [ + 5, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 5 + ] + }, + "\n\n:\n\n\n\n\n\ng\n;", + { + "x": 6.5, + "a": 5, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5 + ] + }, + "h\n\n\n\n\n\nF" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "TAB", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 5 + }, + "a\n\n\n\n\n\nS", + { + "x": 14.5, + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 5 + ] + }, + "\n\\\n\n\n-\n\n\n\n;\nR", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ENTER" + ], + [ + { + "y": -0.625, + "x": 6.5, + "c": "#e3e2dd", + "t": "#525554", + "h": 1.5 + }, + "", + { + "x": 4.5, + "h": 1.5 + }, + "" + ], + [ + { + "y": -0.75, + "x": 3.5, + "a": 4 + }, + "\n\n\n-\n\n\n\n\n\nC", + { + "x": 10.5 + }, + "<\n}\n\n\n.\n\n\n\n\n," + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "\n\n\n=\n\n\n\n\n\nX", + { + "x": 1 + }, + "\n\n\n—\n\n\n\n\n\nV", + { + "x": 8.5 + }, + "\n{\n\n\n0\n\n\n\n\nM", + { + "x": 1 + }, + ">\n~\n\n\nENTER\n\n\n\n\n." + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "\n\n\n_\n\n\n\n\nb\nY", + { + "x": 6.5, + "a": 5 + }, + "n\n\n\n\n\n\nB" + ], + [ + { + "y": -0.875, + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ALT", + { + "c": "#e3e2dd", + "t": "#525554", + "a": 4 + }, + "\n\n\n+\n\n\n\n\n\nZ", + { + "x": 14.5 + }, + "\"\n`\n\n\n+\n\n\n\n/\n'", + { + "c": "#525554", + "t": "#e3e2dd", + "a": 7, + "f": 3, + "w": 1.5 + }, + "ALT" + ], + [ + { + "y": -0.375, + "x": 3.5, + "f": 3 + }, + "END", + { + "x": 10.5, + "f": 3 + }, + "PAGE UP" + ], + [ + { + "y": -0.875, + "x": 2.5, + "f": 3 + }, + "HOME", + { + "x": 1, + "f": 3 + }, + "🔒2", + { + "x": 8.5, + "f": 3 + }, + "🔒3", + { + "x": 1, + "f": 3 + }, + "PAGE DOWN" + ], + [ + { + "y": -0.75, + "x": 0.5, + "c": "#0075ad", + "a": 4, + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 9 + ] + }, + "\n\n\nFLASH\n\n\n\n\n\nΑ", + { + "c": "#525554", + "a": 7, + "f": 3 + }, + "MENU", + { + "x": 14.5, + "f": 3 + }, + "MENU", + { + "c": "#0075ad", + "a": 4, + "f": 3 + }, + "\nFLASH\n\n\n\n\n\n\n\nΩ" + ], + [ + { + "y": 1.125, + "c": "#c0472c", + "fa": [ + 1, + 1, + 1, + 1, + 0, + 0, + 5, + 0, + 1, + 5 + ], + "w": 6 + }, + "SHIFTED\nLAYER 4\nSHIFTED\nLAYER 4\nLAYER 2 (LEFT) / LAYER 3 (RIGHT)\n\n\n\nqwerty (layer 1)\nMAIN LAYER" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1, + "c": "#525554", + "fa": [ + 1, + 1, + 1, + 1 + ] + }, + "\n\n\n🔅-\n\n\n\n\n\n🔉", + "\n\n\n🔆+\n\n\n\n\n\n🔊" + ], + [ + { + "a": 7, + "f": 3, + "h": 2 + }, + "SHIFT", + { + "f": 3, + "h": 2 + }, + "ƒ4", + { + "f": 3 + }, + "🔒1" + ], + [ + { + "x": 2, + "f": 3 + }, + "CTRL" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3, + "a": 4, + "f": 3 + }, + "\n🔅-\n\n\n\n\n\n\n\n🔅-", + { + "f": 3 + }, + "\n🔆+\n\n\n\n\n\n\n\n🔆+" + ], + [ + { + "x": -3, + "a": 7, + "f": 3 + }, + "🔒1", + { + "f": 3, + "h": 2 + }, + "ƒ4", + { + "c": "#e3e2dd", + "t": "#525554", + "h": 2 + }, + "" + ], + [ + { + "x": -3, + "c": "#525554", + "t": "#e3e2dd", + "f": 3 + }, + "CTRL" + ] +] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/img/hntr.png b/keyboards/ergodox/keymaps/familiar/img/hntr.png new file mode 100644 index 0000000000..519d152df5 Binary files /dev/null and b/keyboards/ergodox/keymaps/familiar/img/hntr.png differ diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index c4ecdee511..46069b0dbc 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -37,9 +37,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------. ,-------------. * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ | | NUMLK| | MUTE | | ALT/ | - * | SPC | SLASH|------| |------|WHACK | SPC | - * | | | LAY3 | | LAY2 | | | + * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | + * | SPC |MO(1)/|------| |------|MO(1)/| SPC | + * | |TG(1) | LAY3 | | LAY2 |TG(1) | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( @@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | UP | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | LEFT | DOWN | RIGHT | + * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * |SYSREQ| PAUSE| | | | @@ -98,8 +98,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, KC_UP, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, + _______, _______, _______, _______, _______, KC_PGUP, _______, + _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______ @@ -200,7 +200,7 @@ typedef struct { bool sticky; } td_ta_state_t; -static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_data) { +static void slash_finished (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (td_ta->sticky) { @@ -221,7 +221,7 @@ static void ang_tap_dance_s_finished (qk_tap_dance_state_t *state, void *user_da } } -static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) { +static void slash_reset (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (!td_ta->layer_toggle) @@ -230,7 +230,7 @@ static void ang_tap_dance_s_reset (qk_tap_dance_state_t *state, void *user_data) layer_off (ARRW); } -static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_data) { +static void whack_finished (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (td_ta->sticky) { @@ -251,7 +251,7 @@ static void ang_tap_dance_w_finished (qk_tap_dance_state_t *state, void *user_da } } -static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) { +static void whack_reset (qk_tap_dance_state_t *state, void *user_data) { td_ta_state_t *td_ta = (td_ta_state_t *) user_data; if (!td_ta->layer_toggle) @@ -262,11 +262,11 @@ static void ang_tap_dance_w_reset (qk_tap_dance_state_t *state, void *user_data) qk_tap_dance_action_t tap_dance_actions[] = { [SLASH] = { - .fn = { NULL, ang_tap_dance_s_finished, ang_tap_dance_s_reset }, + .fn = { NULL, slash_finished, slash_reset }, .user_data = (void *)&((td_ta_state_t) { false, false }) }, [WHACK] = { - .fn = { NULL, ang_tap_dance_w_finished, ang_tap_dance_w_reset }, + .fn = { NULL, whack_finished, whack_reset }, .user_data = (void *)&((td_ta_state_t) { false, false }) } }; -- cgit v1.2.3 From 82cbe71bb52403f0c9cd23925c10cfdc97021919 Mon Sep 17 00:00:00 2001 From: nstickney Date: Wed, 8 Mar 2017 22:28:18 -0600 Subject: found LT(layer, kc) so I could take out TapDance code --- keyboards/ergodox/keymaps/familiar/Makefile | 5 -- keyboards/ergodox/keymaps/familiar/keymap.c | 127 +++++----------------------- 2 files changed, 20 insertions(+), 112 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/Makefile (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile deleted file mode 100644 index f795271f0a..0000000000 --- a/keyboards/ergodox/keymaps/familiar/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -TAP_DANCE_ENABLE = yes - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 46069b0dbc..34c48d5f34 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -12,12 +12,6 @@ #define _______ KC_TRNS #define XXXXXXX KC_NO -// Tap Dance Codes -enum { - SLASH, - WHACK, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* @@ -28,30 +22,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | NOOP | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | CLEAR | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | LCTRL | LGUI | MENU | ' | NOOP | | [ | ] | LEFT | DOWN | RIGHT | + * | LCTRL | LGUI | MENU | ' | " | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * |PRTSCR| ESC | | VOL- | VOL+ | * ,------|------|------| |------+------+------. * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | - * | SPC |MO(1)/|------| |------|MO(1)/| SPC | - * | |TG(1) | LAY3 | | LAY2 |TG(1) | | + * | SPC | MO(1)|------| |------|MO(1) | SPC | + * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_CLEAR, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, - KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, XXXXXXX, + KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), KC_INS, KC_ESC, KC_NLCK, - ALT_T(KC_SPC), TD(SLASH), TG(INTL), + ALT_T(KC_SPC), LT(ARRW,KC_SLSH), TG(INTL), // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, @@ -60,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_VOLU, KC_MUTE, - TG(NUMP), TD(WHACK), ALT_T(KC_SPC) + TG(NUMP), LT(ARRW,KC_BSLS), ALT_T(KC_SPC) ), /* layer 1 : functions and arrows @@ -70,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | + * |CAPSLOCK| | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -88,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, _______, KC_UP, _______, _______, _______, - _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SYSREQ, KC_PAUSE, @@ -108,15 +102,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 2 : numberpad * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | ( | ) | ÷ | × | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | 7 | 8 | 9 | - | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | |------| |------| | | | | | | + * | | | | | | |------| |------| | 4 | 5 | 6 | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | 1 | 2 | 3 | = | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | | | | | 0 | . | , | ENTER| | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -137,11 +131,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, // right hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + _______, _______, S(KC_9), S(KC_0), KC_PSLS, KC_PAST, _______, + _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, + _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, + _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PEQL, _______, + KC_KP_0, KC_KP_DOT, KC_PCMM, KC_PENT, _______, _______, _______, _______, _______, _______, _______ @@ -190,87 +184,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -// See https://github.com/algernon/ergodox-layout/blob/master/keymap.c -// When holding the SLASH or WHACK key, the ARRW layer activates while the key is held. -// Tapping the key produces the / or \ key. Double-tapping it toggles the ARRW layer -// on until a third tap. - -typedef struct { - bool layer_toggle; - bool sticky; -} td_ta_state_t; - -static void slash_finished (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (td_ta->sticky) { - td_ta->sticky = false; - td_ta->layer_toggle = false; - layer_off (ARRW); - return; - } - - if (state->count == 1 && !state->pressed) { - register_code (KC_SLSH); - td_ta->sticky = false; - td_ta->layer_toggle = false; - } else { - td_ta->layer_toggle = true; - layer_on (ARRW); - td_ta->sticky = (state->count == 2); - } -} - -static void slash_reset (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (!td_ta->layer_toggle) - unregister_code (KC_SLSH); - if (!td_ta->sticky) - layer_off (ARRW); -} - -static void whack_finished (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (td_ta->sticky) { - td_ta->sticky = false; - td_ta->layer_toggle = false; - layer_off (ARRW); - return; - } - - if (state->count == 1 && !state->pressed) { - register_code (KC_BSLS); - td_ta->sticky = false; - td_ta->layer_toggle = false; - } else { - td_ta->layer_toggle = true; - layer_on (ARRW); - td_ta->sticky = (state->count == 2); - } -} - -static void whack_reset (qk_tap_dance_state_t *state, void *user_data) { - td_ta_state_t *td_ta = (td_ta_state_t *) user_data; - - if (!td_ta->layer_toggle) - unregister_code (KC_BSLS); - if (!td_ta->sticky) - layer_off (ARRW); -} - -qk_tap_dance_action_t tap_dance_actions[] = { - [SLASH] = { - .fn = { NULL, slash_finished, slash_reset }, - .user_data = (void *)&((td_ta_state_t) { false, false }) - }, - [WHACK] = { - .fn = { NULL, whack_finished, whack_reset }, - .user_data = (void *)&((td_ta_state_t) { false, false }) - } -}; - // Runs just one time when the keyboard initializes. void matrix_init_user(void) { -- cgit v1.2.3 From 9895e376e76ed528d042e6892a529ec448fea736 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sun, 12 Mar 2017 14:51:33 -0500 Subject: added US-International support --- keyboards/ergodox/keymaps/familiar/Makefile | 1 + keyboards/ergodox/keymaps/familiar/keymap.c | 156 ++++++++++++++++++---------- 2 files changed, 104 insertions(+), 53 deletions(-) create mode 100644 keyboards/ergodox/keymaps/familiar/Makefile (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile new file mode 100644 index 0000000000..61c3c22725 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/Makefile @@ -0,0 +1 @@ +UNIS_ENABLE = yes diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 34c48d5f34..08640b9fc4 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -3,10 +3,12 @@ #include "action_layer.h" #include "version.h" +// Layers #define BASE 0 // default layer -#define ARRW 1 // function, media, arrow keys -#define NUMP 2 // numpad -#define INTL 3 // international symbols +#define INTL 1 // international symbols +#define INSF 2 // international symbols shifted +#define NUMP 3 // numpad +#define ARRW 4 // function, media, arrow keys // Fillers to make layering more clear #define _______ KC_TRNS @@ -22,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | CLEAR | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | MO(3) | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -40,10 +42,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // left hand KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_CLEAR, KC_A, KC_S, KC_D, KC_F, KC_G, + MO(INTL), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), - KC_INS, KC_ESC, + KC_PSCR, KC_ESC, KC_NLCK, ALT_T(KC_SPC), LT(ARRW,KC_SLSH), TG(INTL), // right hand @@ -57,52 +59,96 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TG(NUMP), LT(ARRW,KC_BSLS), ALT_T(KC_SPC) ), -/* layer 1 : functions and arrows +/* layer 1: International symbols, etc * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | + * | ´ | ¡ | ² | ³ | ¤ | € | ¼ | | ½ | ¾ | ‘ | ’ | ¥ | × | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | UP | | | | | | | | | | | INSERT | + * | | ä | å | é | ® | þ | | | | ü | ú | í | ó | ö | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * |CAPSLOCK| | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | + * | | á | ß | ð | | |------| |------| | | | Ø | ° | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | + * |MO(INSF)| æ | | © | | | | | | ñ | µ | ç | | |MO(INSF)| * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | HOME | PGDN | END | + * | | | | ¬ | ¿ | | « | » | | | | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * |SYSREQ| PAUSE| | | | + * | | | | | | * ,------|------|------| |------+------+------. - * | | | SCRLK| | | | | + * | | | | | | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ -[ARRW] = KEYMAP( +[INTL] = KEYMAP( // left hand - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, - _______, _______, _______, KC_UP, _______, _______, _______, - KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - KC_SYSREQ, KC_PAUSE, - KC_SLCK, + UC(0x00B4), UC(0x00A1), UC(0x00B2), UC(0x00B3), UC(0x00A4), UC(0x20AC), UC(0x00BC), + _______, UC(0x00E4), UC(0x00E5), UC(0x00E9), UC(0x00AE), UC(0x00FE), _______, + _______, UC(0x00E1), UC(0x00DF), UC(0x00F0), _______, _______, + MO(INSF), UC(0x00E6), _______, UC(0x00A9), _______, _______, _______, + _______, _______, _______, UC(0x00AC), UC(0x00BF), + _______, _______, + _______, + _______, _______, _______, + // right hand + UC(0x00BD), UC(0x00BE), UC(0x2018), UC(0x2019), UC(0x00A5), UC(0x00D7), _______, + _______, UC(0x00FC), UC(0x00FA), UC(0x00ED), UC(0x00F3), UC(0x00F6), _______, + _______, _______, _______, UC(0x00D8), UC(0x00B0), _______, + _______, UC(0x00F1), UC(0x00B5), UC(0x00E7), _______, _______, MO(INSF), + UC(0x00AB), UC(0x00BB), _______, _______, _______, + _______, _______, + _______, + _______, _______, _______ + ), + +/* layer 2 : international symbols, shifted + * This layer is an ugly workaround; it pretends that SHIFT still works normally on keys + * which don't produce an "upper case" or "shifted" international symobol. + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ¨ | ¹ | | | £ | | | | | | | | | ÷ | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | Ä | Å | É | | Þ | | | | Ü | Ú | Í | Ó | Ö | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Á | § | Ð | | |------| |------| | | | Ø | ° | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Æ | | ¢ | | | | | | Ñ | | Ç | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | ¦ | | | | | | | | + * `------------------------------------' `------------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[INSF] = KEYMAP( + // left hand + UC(0x00A8), UC(0x00B9), S(KC_2), S(KC_3), UC(0x00A3), UC(0x2014), S(KC_6), + _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), S(KC_R), UC(0x00DE), _______, + _______, UC(0x00C1), UC(0x00A7), UC(0x00D0), S(KC_F), S(KC_G), + _______, UC(0x00C6), S(KC_X), UC(0x00A2), S(KC_V), S(KC_B), _______, + _______, _______, _______, UC(0x00A6), _______, + _______, _______, + _______, _______, _______, _______, // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, _______, _______, _______, _______, _______, KC_INS, - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, - _______, _______, _______, _______, _______, KC_PGUP, _______, - _______, _______, KC_HOME, KC_PGDN, KC_END, + S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS), UC(0x00F7), _______, + _______, UC(0x00DC), UC(0x00DA), UC(0x00CD), UC(0x00D3), UC(0x00D6), _______, + S(KC_H), S(KC_J), S(KC_K), UC(0x00D8), UC(0x00B0), _______, + _______, UC(0x00D1), S(KC_M), UC(0x00C7), S(KC_DOT), _______, _______, + S(KC_LBRC), S(KC_RBRC), _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -/* layer 2 : numberpad +/* layer 3: numberpad * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | ( | ) | ÷ | × | | + * | | | | | | | | | | | ( | ) | / | * | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | | | | | | | | 7 | 8 | 9 | - | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -141,43 +187,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______ ), -/* layer 3: International symbols, etc +/* layer 4 : functions and arrows * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | |------| |------| | | | | | | + * |CAPSLOCK| | LEFT | DOWN |RIGHT | |------| |------| LEFT | DOWN | UP | RIGHT| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | + * | |M_PREV|M_STOP|M_PLPS|M_NEXT| | | | | | | | | PGUP | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | | | | | | + * |SYSREQ| PAUSE| | | | * ,------|------|------| |------+------+------. - * | | | | | | | | + * | | | SCRLK| | | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ -[INTL] = KEYMAP( +[ARRW] = KEYMAP( // left hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + _______, _______, _______, KC_UP, _______, _______, _______, + KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, - _______, - _______, _______, _______, + KC_SYSREQ, KC_PAUSE, + KC_SLCK, + _______, _______, _______, // right hand - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, KC_INS, + KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, KC_PGUP, _______, + _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, _______, _______, _______ @@ -186,7 +232,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Runs just one time when the keyboard initializes. void matrix_init_user(void) { - + set_unicode_input_mode(UC_LNX); // Linux + //set_unicode_input_mode(UC_OSX); // Mac OSX + //set_unicode_input_mode(UC_WIN); // Windows (with registry key, see wiki) + //set_unicode_input_mode(UC_WINC); // Windows (with WinCompose, see wiki) }; // Runs constantly in the background, in a loop. @@ -199,13 +248,14 @@ void matrix_scan_user(void) { ergodox_right_led_2_off(); ergodox_right_led_3_off(); switch (layer) { - case 1: + case INTL: + case INSF: ergodox_right_led_1_on(); break; - case 2: + case NUMP: ergodox_right_led_2_on(); break; - case 3: + case ARRW: ergodox_right_led_3_on(); break; default: -- cgit v1.2.3 From d9efa02cfbd9aebd691711c326645ad6f8af71b1 Mon Sep 17 00:00:00 2001 From: nstickney Date: Sun, 12 Mar 2017 22:43:44 -0500 Subject: added README.md --- keyboards/ergodox/keymaps/familiar/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 keyboards/ergodox/keymaps/familiar/README.md (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/README.md b/keyboards/ergodox/keymaps/familiar/README.md new file mode 100644 index 0000000000..0b24853415 --- /dev/null +++ b/keyboards/ergodox/keymaps/familiar/README.md @@ -0,0 +1,3 @@ +# Familiar Layout for ErgoDox # +An ErgoDox layout meant to be as easy to learn as possible for typists coming from a standard +QWERTY US-International layout. -- cgit v1.2.3 From a03d946d0c4edf0c3e50812af7f3c826b958c945 Mon Sep 17 00:00:00 2001 From: Stick Date: Mon, 27 Mar 2017 21:18:12 -0500 Subject: fixed unicode input issue --- keyboards/ergodox/keymaps/familiar/Makefile | 1 - keyboards/ergodox/keymaps/familiar/keymap.c | 35 +++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 keyboards/ergodox/keymaps/familiar/Makefile (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/Makefile b/keyboards/ergodox/keymaps/familiar/Makefile deleted file mode 100644 index 61c3c22725..0000000000 --- a/keyboards/ergodox/keymaps/familiar/Makefile +++ /dev/null @@ -1 +0,0 @@ -UNIS_ENABLE = yes diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 08640b9fc4..153d73040c 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -20,29 +20,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 0 : default * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | + * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | + * | ` | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | MO(3) | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | LCTRL | LGUI | MENU | ' | " | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * |PRTSCR| ESC | | VOL- | VOL+ | + * | VOL- | VOL+ | | VOL- | VOL+ | * ,------|------|------| |------+------+------. - * | ALT/ |SLASH/| NUMLK| | MUTE |WHACK/| ALT/ | - * | SPC | MO(1)|------| |------|MO(1) | SPC | + * | SPC/ |SLASH/| MUTE | |NUMLCK|WHACK/| SPC/ | + * | ALT | MO(1)|------| |------|MO(1) | ALT | * | | | LAY3 | | LAY2 | | | * `--------------------' `--------------------' */ [BASE] = KEYMAP( // left hand - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - MO(INTL), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, + KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), KC_PSCR, KC_ESC, @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | ä | å | é | ® | þ | | | | ü | ú | í | ó | ö | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | á | ß | ð | | |------| |------| | | | Ø | ° | | + * | | á | ß | ð | | |------| |------| | | | ø | ¶ | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * |MO(INSF)| æ | | © | | | | | | ñ | µ | ç | | |MO(INSF)| * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // right hand UC(0x00BD), UC(0x00BE), UC(0x2018), UC(0x2019), UC(0x00A5), UC(0x00D7), _______, _______, UC(0x00FC), UC(0x00FA), UC(0x00ED), UC(0x00F3), UC(0x00F6), _______, - _______, _______, _______, UC(0x00D8), UC(0x00B0), _______, + _______, _______, _______, UC(0x00F8), UC(0x00B6), _______, _______, UC(0x00F1), UC(0x00B5), UC(0x00E7), _______, _______, MO(INSF), UC(0x00AB), UC(0x00BB), _______, _______, _______, _______, _______, @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * which don't produce an "upper case" or "shifted" international symobol. * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ¨ | ¹ | | | £ | | | | | | | | | ÷ | | + * | ¨ | ¹ | | | £ | | | | | | | | — | ÷ | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | Ä | Å | É | | Þ | | | | Ü | Ú | Í | Ó | Ö | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -126,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [INSF] = KEYMAP( // left hand - UC(0x00A8), UC(0x00B9), S(KC_2), S(KC_3), UC(0x00A3), UC(0x2014), S(KC_6), - _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), S(KC_R), UC(0x00DE), _______, + UC(0x00A8), UC(0x00B9), _______, _______, UC(0x00A3), _______, _______, + _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), _______, UC(0x00DE), _______, _______, UC(0x00C1), UC(0x00A7), UC(0x00D0), S(KC_F), S(KC_G), _______, UC(0x00C6), S(KC_X), UC(0x00A2), S(KC_V), S(KC_B), _______, _______, _______, _______, UC(0x00A6), _______, @@ -135,11 +135,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, // right hand - S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS), UC(0x00F7), _______, + _______, _______, _______, _______, UC(0x2014), UC(0x00F7), _______, _______, UC(0x00DC), UC(0x00DA), UC(0x00CD), UC(0x00D3), UC(0x00D6), _______, S(KC_H), S(KC_J), S(KC_K), UC(0x00D8), UC(0x00B0), _______, - _______, UC(0x00D1), S(KC_M), UC(0x00C7), S(KC_DOT), _______, _______, - S(KC_LBRC), S(KC_RBRC), _______, _______, _______, + _______, UC(0x00D1), _______, UC(0x00C7), S(KC_DOT), _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -188,6 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), /* layer 4 : functions and arrows + * This layer is at the top so that the functions still work no matter what layers are active. * * ,--------------------------------------------------. ,--------------------------------------------------. * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | -- cgit v1.2.3 From b6280d0cac59c741db62a63072efd5de4887fc01 Mon Sep 17 00:00:00 2001 From: Stick Date: Mon, 27 Mar 2017 21:56:47 -0500 Subject: unsatisfied with ESC/GRV/TAB positioning --- keyboards/ergodox/keymaps/familiar/keymap.c | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c index 153d73040c..c5f94afda8 100644 --- a/keyboards/ergodox/keymaps/familiar/keymap.c +++ b/keyboards/ergodox/keymaps/familiar/keymap.c @@ -22,16 +22,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BCKSPC | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | ` | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | + * | TAB | Q | W | E | R | T | HOME | | PGUP | Y | U | I | O | P | DELETE | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | TAB | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | + * | ` | A | S | D | F | G |------| |------| H | J | K | L | ; | ENTER | * |--------+------+------+------+------+------| END | | PGDN |------+------+------+------+------+--------| * | (/LSFT | Z | X | C | V | B | | | | N | M | , | . | UP | )/RSFT | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | LCTRL | LGUI | MENU | ' | " | | [ | ] | LEFT | DOWN | RIGHT | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * | VOL- | VOL+ | | VOL- | VOL+ | + * | VOL- | VOL+ | | | | * ,------|------|------| |------+------+------. * | SPC/ |SLASH/| MUTE | |NUMLCK|WHACK/| SPC/ | * | ALT | MO(1)|------| |------|MO(1) | ALT | @@ -41,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = KEYMAP( // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME, + KC_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_LCTL, KC_LGUI, KC_MENU, KC_QUOT, S(KC_QUOT), - KC_PSCR, KC_ESC, - KC_NLCK, + KC_VOLD, KC_VOLU, + KC_MUTE, ALT_T(KC_SPC), LT(ARRW,KC_SLSH), TG(INTL), // right hand KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, @@ -54,8 +54,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_RGHT, - KC_VOLD, KC_VOLU, - KC_MUTE, + _______, _______, + KC_NLCK, TG(NUMP), LT(ARRW,KC_BSLS), ALT_T(KC_SPC) ), @@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * This layer is at the top so that the functions still work no matter what layers are active. * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | | + * | ESCAPE | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | SYSREQ | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * | | | | UP | | | | | | | | | | | INSERT | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| @@ -202,9 +202,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | HOME | PGDN | END | * `------------------------------------' `------------------------------------' * ,-------------. ,-------------. - * |SYSREQ| PAUSE| | | | + * | | PAUSE| | | | * ,------|------|------| |------+------+------. - * | | | SCRLK| | | | | + * | | | | |SCRLK | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' @@ -216,17 +216,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_CAPS, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_SYSREQ, KC_PAUSE, - KC_SLCK, + _______, KC_PAUSE, + _______, _______, _______, _______, // right hand - KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_SYSREQ, _______, _______, _______, _______, _______, _______, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, - _______, + KC_SLCK, _______, _______, _______ ), }; -- cgit v1.2.3 From bcf70c0203e003d3f9c47d11bd2d57f7a3cd3bf8 Mon Sep 17 00:00:00 2001 From: Stick Date: Fri, 7 Apr 2017 16:04:43 -0500 Subject: ErgoDox Familiar layout v1 --- keyboards/ergodox/keymaps/familiar/README.md | 72 +- keyboards/ergodox/keymaps/familiar/familiar.png | Bin 0 -> 149846 bytes keyboards/ergodox/keymaps/familiar/img/HNTR.svg | 7253 ------------------- .../ergodox/keymaps/familiar/img/familiar.json | 865 --- .../ergodox/keymaps/familiar/img/familiar.png | Bin 102059 -> 0 bytes .../ergodox/keymaps/familiar/img/familiar.svg | 7131 ------------------ .../keymaps/familiar/img/familiar_stick.svg | 7592 -------------------- keyboards/ergodox/keymaps/familiar/img/hntr.json | 634 -- keyboards/ergodox/keymaps/familiar/img/hntr.png | Bin 77473 -> 0 bytes 9 files changed, 69 insertions(+), 23478 deletions(-) create mode 100644 keyboards/ergodox/keymaps/familiar/familiar.png delete mode 100644 keyboards/ergodox/keymaps/familiar/img/HNTR.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.json delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.png delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg delete mode 100644 keyboards/ergodox/keymaps/familiar/img/hntr.json delete mode 100644 keyboards/ergodox/keymaps/familiar/img/hntr.png (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/familiar/README.md b/keyboards/ergodox/keymaps/familiar/README.md index 0b24853415..e4336d9b55 100644 --- a/keyboards/ergodox/keymaps/familiar/README.md +++ b/keyboards/ergodox/keymaps/familiar/README.md @@ -1,3 +1,69 @@ -# Familiar Layout for ErgoDox # -An ErgoDox layout meant to be as easy to learn as possible for typists coming from a standard -QWERTY US-International layout. +# ErgoDox Familiar Layout +Familiar layout for those who regularly switch back and forth from ErgoDox to regular QWERTY. + +[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](../../../../license_GPLv3.md../../../../license_GPLv3.md) [![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg)](https://github.com/RichardLitt/standard-readme) + +## Table of Contents + +- [Background](#background) +- [Install](#install) +- [Usage](#usage) + - [Layers](#layers) +- [Contribute](#contribute) + - [Issues](#issues) +- [License](#license) + +## Background + +This layout is built to be as familiar as possible for users coming directly from a default (QWERTY US) keyboard, while gaining as much advantage as possible from the ErgoDox and QMK featureset. I use an ErgoDoxEZ at home, but I don't have a regular office (CS grad student) so I regularly use either my laptop or a default-setup lab computer; I context switch daily so this layout is meant to reduce the mental overhead as much as possible. + +The default ErgoDoxEZ layout is probably more optimized as a solo daily driver - as are a lot of the others available keymaps. The focus of this layout is to get as much from the 'Dox as possible without overly disrupting long-established muscle memory. + +Key features of the familiar layout: +1. QWERTY default layout. +1. International symbols layer, mapped in the US-International layout default positions, through [UCIS](https://github.com/qmk/qmk_firmware/wiki/Unicode-and-additional-language-support#ucis_enable). +1. Numpad layer on right hand. +1. Thumb cluster holds spacebar, ALT, and access to secondary layers. +1. Function-layer arrow keys in both the first-person-shooter (actually ESDF instead of WASD) and vim (HJKL) locations. + +## Install + +If you are on Windows or Mac, choose the proper line in [`keymap.c`](keymap.c) for [unicode/international character support](https://github.com/qmk/qmk_firmware/wiki/Unicode-and-additional-language-support#ucis_enable) (starts at line 235). +```c +void matrix_init_user(void) { + set_unicode_input_mode(UC_LNX); // Linux + //set_unicode_input_mode(UC_OSX); // Mac OSX + //set_unicode_input_mode(UC_WIN); // Windows (with registry key, see wiki) + //set_unicode_input_mode(UC_WINC); // Windows (with WinCompose, see wiki) +}; +``` + +For instructions on building and installing this keymap, [go to the wiki](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ergodox#build-dependencies). Below is the command for me; it may be different for you. +```sh +$ make ergodox-ez-familiar-teensy +``` + +## Usage + +[![Familiar Layout](familiar.png)](http://www.keyboard-layout-editor.com/#/gists/13508a9f99cff381d58b7be6f7dcc644) + +### Layers +1. Base Layer: QWERTY, with arrow keys at bottom right. +1. UCIS Layer: US-International symbols layer, plus —. Accessed by toggling the `INTL` layer using the UCIS key (bottom of left thumb cluster). +1. UCIS-Shifted Layer: Making shift work for UCIS characters. An ugly workaround. Any ideas? Accessed through holding shift while the UCIS layer is active (toggles the `INSF` layer). +1. Numpad Layer: Right hand number pad. Accessed by toggling the `NUMP` layer using the NPAD key (bottom of right thumb cluster). +1. Function Layer: F1-F12, arrows on ESDF and HJKL, media player controls. Accessed by holding either FN key (center key of each thumb cluster), which toggles the `ARRW` layer. I know, I need to work on my naming conventions. + +## Contribute + +[Contributor Covenant](http://contributor-covenant.org/) + +I'm terrible at this; I have no background in human-computer interaction, kinesiology, or keyboard-ology. Please send comments/issues/pull requests/angry tweets/etc. If you think there is a better way to take advantage of the ErgoDox/QMK comination without straying far from 84/101-key QWERTY, I want to know it. + +### Issues +1. The top two keys of the right thumb cluster are currently unused. I wanted them for screen brightness, but I haven't found a solution I like. +1. The `'`, `"`, `[`, and `]` keys are terrible to access; I want to put them somewhere else but I haven't figured out where. +1. The `INSF` layer is an ugly workaround. I should write a function for doing different things in the `INTL` layer depending on whether SHIFT is being held. Or something. Ideas? + +## License +QMK is licensed ([mostly](https://github.com/qmk/qmk_firmware/issues/1038)) under the [GPLv2](blob/master/license_GPLv2.md). Accordingly, to whatever extent applicable, this keymap is licensed under the [GPLv3](../../../../license_GPLv3.md). diff --git a/keyboards/ergodox/keymaps/familiar/familiar.png b/keyboards/ergodox/keymaps/familiar/familiar.png new file mode 100644 index 0000000000..f8b50e75ec Binary files /dev/null and b/keyboards/ergodox/keymaps/familiar/familiar.png differ diff --git a/keyboards/ergodox/keymaps/familiar/img/HNTR.svg b/keyboards/ergodox/keymaps/familiar/img/HNTR.svg deleted file mode 100644 index a419e7ab8b..0000000000 --- a/keyboards/ergodox/keymaps/familiar/img/HNTR.svg +++ /dev/null @@ -1,7253 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 😎 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.json b/keyboards/ergodox/keymaps/familiar/img/familiar.json deleted file mode 100644 index e80f99e5f0..0000000000 --- a/keyboards/ergodox/keymaps/familiar/img/familiar.json +++ /dev/null @@ -1,865 +0,0 @@ -[ - { - "name": "ErgoDox Familiar (CosmicStick Colors)", - "author": "Stick" - }, - [ - { - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "\n\n#\nF3\n\n\n³\n\n\n3", - { - "x": 10.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "*\nF8\n\n\n\n\n\n¾\n\n8" - ], - [ - { - "y": -0.87, - "x": 2.5 - }, - "\n\n@\nF2\n\n\n²\n\n\n2", - { - "x": 1, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¤\n\n$\nF4\n\n\n£\n\n\n4", - { - "x": 8.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "&\nF7\n\n\n\n\n\n½\n\n7", - { - "x": 1 - }, - "(\nF9\n\n\n\n\n\n‘\n\n9" - ], - [ - { - "y": -0.8699999999999999, - "x": 5.5 - }, - "\n\n%\nF5\n\n\n€\n\n\n5", - "\n\n_\nF11\n\n\n¥\n\n\n-", - { - "x": 4.5, - "fa": [ - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "+\nF12\n÷\n\n\n\n\n×\n\n=", - "^\nF6\n\n\n\n\n\n¼\n\n6" - ], - [ - { - "y": -0.88, - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "ESCAPE", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¡\n\n!\nF1\n\n\n¹\n\n\n1", - { - "x": 14.5, - "fa": [ - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - ")\nF10\n\n/\n\n\n\n’\n\n0", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "SYSREQ" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#993300", - "a": 4 - }, - "\n\n\n↑\n\n\né\n\n\nE", - { - "x": 10.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n5\n\n\n\ní\n\nI" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "a": 6, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 7 - ] - }, - "å\n\n\n\n\n\n\n\nW", - { - "x": 1 - }, - "®\n\n\n\n\n\n\n\nR", - { - "x": 8.5, - "a": 4, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "\n\n\n4\n\n\n\nú\n\nU", - { - "x": 1 - }, - "\n\n\n6\n\n\n\nó\n\nO" - ], - [ - { - "y": -0.8699999999999999, - "x": 5.5, - "a": 6 - }, - "þ\n\n\n\n\n\n\n\nT", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "f": 3, - "h": 1.5 - }, - "HOME", - { - "x": 4.5, - "f": 3, - "h": 1.5 - }, - "PAGE UP", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 7 - ] - }, - "\n\nü\n\n\n\n\n\nY" - ], - [ - { - "y": -0.8799999999999999, - "c": "#605d57", - "t": "#FFF8E7", - "a": 4, - "w": 1.5 - }, - "\n\n\nBREAK\n\n\n\n\n\nDELETE", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6 - }, - "ä\n\n\n\n\n\n\n\nQ", - { - "x": 14.5, - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "\n\n\n×\n\n\n\nö\n\nP", - { - "c": "#605d57", - "t": "#FFF8E7", - "fa": [ - 1, - 1 - ], - "w": 1.5 - }, - "\nINSERT\n\n\n\n\n\n\n\nBCKSPC" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#993300", - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "Ð\n\n\n↓\n\n\nð\n\n\nD", - { - "x": 10.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n2\n\n\n\n\n\nK" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "c": "#993300", - "t": "#FFF8E7" - }, - "§\n\n\n←\n\n\nß\n\n\nS", - { - "x": 1 - }, - "\n\n\n→\n\n\n\n\n\nF", - { - "x": 8.5, - "c": "#FFF8E7", - "t": "#403e3a" - }, - "\n\n\n1\n\n\n\n\n\nJ", - { - "x": 1, - "fa": [ - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "\n\n\n3\n\n\n\nø\n\nL" - ], - [ - { - "y": -0.8799999999999999, - "x": 5.5, - "a": 7, - "fa": [ - 7 - ] - }, - "G", - { - "x": 6.5 - }, - "H" - ], - [ - { - "y": -0.8700000000000001, - "c": "#605d57", - "t": "#FFF8E7", - "f": 3, - "w": 1.5 - }, - "TAB", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "á\n\n\n\n\n\n\n\nA", - { - "x": 14.5, - "a": 4, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 7, - 7, - 0 - ] - }, - ":\n\n°\n-\n\n\n\n¶\n\n;", - { - "c": "#605d57", - "t": "#FFF8E7", - "a": 7, - "w": 1.5 - }, - "ENTER" - ], - [ - { - "y": -0.6299999999999999, - "x": 6.5, - "h": 1.5 - }, - "END", - { - "x": 4.5, - "h": 1.5 - }, - "PAGE DOWN" - ], - [ - { - "y": -0.75, - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "¢\n\n\n\n\n\n©\n\n\nC", - { - "x": 10.5, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 7, - 7, - 0 - ] - }, - "<\n\n\n0\n\n\n\nç\n\n," - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5, - "a": 7, - "fa": [ - 7 - ] - }, - "X", - { - "x": 1 - }, - "V", - { - "x": 8.5, - "a": 6, - "fa": [ - 7, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "\n\nµ\n\n\n\n\n\nM", - { - "x": 1, - "a": 4, - "fa": [ - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7, - 7, - 0 - ] - }, - ">\n\n\n\n\n\n\n\n\n." - ], - [ - { - "y": -0.8799999999999999, - "x": 5.5, - "a": 7, - "fa": [ - 7 - ] - }, - "B", - { - "x": 6.5, - "a": 6, - "fa": [ - 7, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 7 - ] - }, - "\n\nñ\n\n\n\n\n\nN" - ], - [ - { - "y": -0.8700000000000001, - "c": "#403e3a", - "t": "#FFF8E7", - "a": 5, - "fa": [ - 1, - 0, - 1, - 0, - 0, - 0, - 7 - ], - "w": 1.5 - }, - "SHIFT\n\n\n\n\n\n(", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 6, - "fa": [ - 1, - 0, - 1, - 0, - 0, - 0, - 7, - 0, - 7 - ] - }, - "æ\n\n\n\n\n\n\n\nZ", - { - "x": 14.5, - "a": 4, - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 7, - 1, - 7, - 7, - 0 - ] - }, - "?\n\n\n+\n\n\n\n¿\n\n/", - { - "c": "#403e3a", - "t": "#FFF8E7", - "a": 5, - "fa": [ - 1, - 0, - 1, - 1, - 0, - 0, - 7 - ], - "w": 1.5 - }, - "SHIFT\n\n\n\n\n\n)" - ], - [ - { - "y": -0.3799999999999999, - "x": 3.5, - "c": "#FFF8E7", - "t": "#403e3a", - "a": 4, - "fa": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 7, - 0 - ] - }, - "¨\n\n\"\n\n\n\n´\n\n\n'", - { - "x": 10.5, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "}\n\n\n\n\n\n\n»\n\n]" - ], - [ - { - "y": -0.8700000000000001, - "x": 2.5 - }, - "\n\n~\n\n\n\n\n\n\n`", - { - "x": 1, - "fa": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "¦\n\n|\n\n\n\n¬\n\n\n\\", - { - "x": 8.5, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 7, - 0 - ] - }, - "{\n\n\n\n\n\n\n«\n\n[", - { - "x": 1, - "c": "#605d57", - "t": "#FFF8E7", - "a": 7 - }, - "PRNT SCRN" - ], - [ - { - "y": -0.75, - "x": 0.5, - "c": "#006699", - "a": 4, - "fa": [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ] - }, - "\n\n\nFLASH\n\n\n\n\nCTRL\nGUI", - { - "c": "#403e3a", - "a": 5, - "fa": [ - 1 - ] - }, - "CTL+SFT\n\n\n\n\n\nMENU", - { - "x": 14.5 - }, - "CTL+SFT\n\n\n\n\n\nMENU", - { - "c": "#006699", - "a": 4, - "fa": [ - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1 - ] - }, - "\nFLASH\n\n\n\n\n\n\nCTRL\nGUI" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1, - "c": "#605d57", - "fa": [ - 1, - 1, - 0, - 1 - ] - }, - "\n\n\nKBDBRT-\n\n\n\n\n\nVOL-", - "\n\n\nKBDBRT+\n\n\n\n\n\nVOL+" - ], - [ - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 5, - "h": 2 - }, - "ALT", - { - "c": "#403e3a", - "t": "#FFF8E7", - "a": 7, - "f": 3, - "h": 2 - }, - "FN", - { - "c": "#605d57", - "f": 3 - }, - "MUTE" - ], - [ - { - "x": 2, - "c": "#403e3a", - "a": 5 - }, - "ALTGR\n\n\n\n\n\nLDR" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3, - "c": "#605d57", - "a": 4 - }, - "\n\n\nKBDBRT-\n\n\n\n\n\nBRT-", - "\n\n\nKBDBRT+\n\n\n\n\n\nBRT+" - ], - [ - { - "x": -3, - "a": 7, - "f": 3 - }, - "NUM LOCK", - { - "c": "#403e3a", - "f": 3, - "h": 2 - }, - "FN", - { - "c": "#FFF8E7", - "t": "#403e3a", - "a": 5, - "h": 2 - }, - "ALT" - ], - [ - { - "x": -3, - "c": "#403e3a", - "t": "#FFF8E7" - }, - "ALTGR\n\n\n\n\n\nLDR" - ] -] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.png b/keyboards/ergodox/keymaps/familiar/img/familiar.png deleted file mode 100644 index 4d61846eb8..0000000000 Binary files a/keyboards/ergodox/keymaps/familiar/img/familiar.png and /dev/null differ diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar.svg b/keyboards/ergodox/keymaps/familiar/img/familiar.svg deleted file mode 100644 index 94e7cae602..0000000000 --- a/keyboards/ergodox/keymaps/familiar/img/familiar.svg +++ /dev/null @@ -1,7131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg b/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg deleted file mode 100644 index 18ec937e28..0000000000 --- a/keyboards/ergodox/keymaps/familiar/img/familiar_stick.svg +++ /dev/null @@ -1,7592 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PanningHold down Scroll Wheel to pan with mouseUp/Down - Scroll WheelLeft/Right - Shift + Scroll WheelZooming- Ctrl + Scroll View to zoom in/out- Press 1, 2, 4, or 5 for preset zoom views.Zoom Tool (F3) :- Left click to zoom in- Right click to zoom out - - - Keyboards - - - - - - - - - To avoid delays and errors in your order you must convert all of your fonts and text to vector data - This layout is used for your legends only. Keycap colors need to be defined with the online designer tool.Please check out our online tutorials at support.wasdkeyboards.comfor help and instructions regarding layout creation. - - - Quick Start:1. Enable Layers by going to: Layer > Layers (Ctrl + Shift + L) *The layers window can be expanded by dragging the area under the opacity slider.2. Use the Eyeball Icons to toggle visibility for preset layers3. Use the Select tool to move and scale objects (F1)4. Use the Text Tool to add and edit text (F8) - - Managing Layers1. Enable Layers by pressing Ctrl + Shift + L2. The Layer window can be enlarged by dragging thearea under the Opacity slider.3. Use the Eyeball Icon to toggle layer visibility.4. Use the Lock Icon to toggle the ability to edit layer.5. To add a layer, use the button from Layers panel. - - - Manipulating ObjectsThe Select Tool (F1) allows you to select and move,scale, and delete objects. Select an object, then drag the object to move it. You can drag the arrows around the object to scale it.Holding Ctrl while moving will keep the object locked onthe same X or Y axis. Holding Ctrl while scaling will keep the size ratio locked. - Inkscape Tutorial - FAQ (Frequently Asked Questions)I can't see any layers, I just see one layer or no layers when I open the layers panel.This happens when you drag and drop the layout file into Inkscape which "imports" it instead of opening it. Please close your Inkscape window, go back to the original file, right click it and choose "edit with Inkscape". What are the grids for on the layout? Can I place objects outside the grid?Yes. The grids are for reference only. You can snap the grids to use our standard margins. You can print all the way to the edge of the frame. There is a +/-0.01" tolerance, so we suggest that you stay within the grids when possible.Can I put a graphic that spans over multiple keys? Yes. Large images will be cropped to the top face of the keys. The areas in between the keys will not be printed.Advanced users can use a clipping mask to get a better idea of what the final image will look like.How can I change the color of the printing?We have tutorials in our support center that can show you how to add colors to your text and images.Go to support.wasdkeyboards.comI want to edit the Mac-style layouts, but the text is not editable.The Mac layout text is not editable since the font is not common. The font used is VAG Rounded-Light. - Adding text1. Click on the Text Tool (F8)2. Click on the area where you want add text3. Type your text4. Font and size and can changed in the text toolbar5. Use the Select Tool (F1) to reposition thetext if necessary. - - - - Editing font type and size1. Use the Select Tool (F1) select the objects youwant to edit.2. Click on the Text Tool (F8)3. Use the text toolbar to change font type and text size - - - - - Editing textUse the Select Tool (F1) and double click a singletext object.-or-Use the Text Tool (F8) and click on a single text object. - - - - Adding stock artworkCommonly used icons and symbols are available within the file.1. Turn on the visibility of the layer titled: "Stock Artwork"2. Use the Select Tool (F1) to select the object you want to use.3. Press Ctrl + C to copy4. Select the layer you want to paste the object to, then press Ctrl + V5. You can then use the Select Tool (F1) to move and/or scale the object to proper size. See "Snapping" for tips on aligning objects. - Adding custom artNormal graphics can be added into the file, but you must convert thegraphic to a path.1. Copy the graphic from another program. (Usually Right Click > Copy)2. Select the layer you want to paste the graphic to, then press Ctrl + V-or-1. File > Import (Ctrl + I) and select the file you want to import.2. Select the Embed option and click OK.3. Select the graphic, and goto Path > Trace Bitmap (Shift + Alt + B)4. Make sure your graphic is selected, then select a Scan option andclick OK. The graphic will be traced, and will overlay the original object.5. Move the new object into position and delete the original image. - - - SnappingEnabling snapping allows you to snap objects at various reference points of other objects which will allow you to quickly and accurately align objects to each other.Make sure Snap Controls Toolbar is displayed on the right hand side. (View > Show/Hide > Snap Controls Bar)Make sure Snapping is enabled (Toggle with "%")Hover over the various points to see what snappingare available. You can turn each one on/off.Drag objects over other objects to snap. You may need to zoom in or out to snap to certain objects. Turning off irrelevant points will also make it easier to snap. - - Copy and PasteCtrl + C: Copy objectCtrl + V: Paste objectCtrl + Alt + V: Paste in placeShift + Ctrl + V: Paste style - Guide LinesYou can use Guides to help align objects. Click and drag from the rulerson the edge of the document.Enable snapping to guides in the Snap Control Bar You can Show/Hide Guides by going to View > Guides - - - WASD Keyboards 104/87-Key Design Template - IMPORTANT: - Before saving and uploading your file: select all of your text; go to Path > Object to Path (Ctrl+Shift+C) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/keyboards/ergodox/keymaps/familiar/img/hntr.json b/keyboards/ergodox/keymaps/familiar/img/hntr.json deleted file mode 100644 index c1aae552be..0000000000 --- a/keyboards/ergodox/keymaps/familiar/img/hntr.json +++ /dev/null @@ -1,634 +0,0 @@ -[ - { - "name": "Infinity ErgoDox - H.NT.R" - }, - [ - { - "x": 3.5, - "c": "#e3e2dd", - "t": "#525554", - "fa": [ - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "\n\n#\nF3\n\n\n\n\n\n3", - { - "x": 10.5, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "*\nF8\n\n\n\n\n\n\n\n8" - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "\n\n@\nF2\n\n\n\n\n\n2", - { - "x": 1 - }, - "\n\n$\nF4\n\n\n\n\n\n4", - { - "x": 8.5 - }, - "&\nF7\n\n\n\n\n\n\n\n7", - { - "x": 1 - }, - "(\nF9\n\n\n\n\n\n\n\n9" - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "\n\n%\nF5\n\n\n\n\n\n5", - "\n\n\nF11", - { - "x": 4.5 - }, - "\nF12", - "^\nF6\n\n\n\n\n\n\n\n6" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "CYCLE LAYER", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 4, - "f": 3 - }, - "\n\n!\nF1\n\n\n\n\n\n1", - { - "x": 14.5, - "f": 3 - }, - ")\nF10\n\n\n/\n\n\n\n\n0", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "CYCLE LAYER" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#c0472c", - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n\nPG UP\n▲\n\n\n\ne\nO", - { - "x": 10.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n]\n\n\n5\n\n\n\ni\nL" - ], - [ - { - "y": -0.875, - "x": 2.5, - "a": 7, - "fa": [ - 5 - ] - }, - "W", - { - "x": 1, - "a": 5, - "fa": [ - 1, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "r\n\n\n\n\n\nU", - { - "x": 8.5, - "a": 4, - "fa": [ - 1, - 1, - 0, - 0, - 0, - 0, - 5, - 0, - 1, - 5 - ] - }, - "\n[\n\n\n4\n\n\n\nu\nD", - { - "x": 1 - }, - "\n?\n\n\n6\n\n\n\no\nG" - ], - [ - { - "y": -0.875, - "x": 5.5, - "a": 5 - }, - "t\n\n\n\n\n\nJ", - { - "a": 7, - "h": 1.5 - }, - "", - { - "x": 4.5, - "h": 1.5 - }, - "", - { - "a": 5 - }, - "y\n\n\n\n\n\nK" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "DELETE", - { - "c": "#e3e2dd", - "t": "#525554", - "fa": [ - 5 - ] - }, - "Q", - { - "x": 14.5, - "a": 4, - "fa": [ - 5, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 5 - ] - }, - "\n|\n\n\n×\n\n\n\n\nP", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "⌫" - ], - [ - { - "y": -0.375, - "x": 3.5, - "c": "#c0472c", - "a": 4, - "fa": [ - 5, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n\nPG DN\n▼\n\n\n\nd\nE", - { - "x": 10.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n)\n\n\n2\n\n\n\nk\nN" - ], - [ - { - "y": -0.875, - "x": 2.5, - "c": "#c0472c", - "t": "#e3e2dd" - }, - "\n\n\nHOME\n◀\n\n\n\ns\nI", - { - "x": 1 - }, - "\n\n\nEND\n▶\n\n\n\nf\nA", - { - "x": 8.5, - "c": "#e3e2dd", - "t": "#525554" - }, - "\n(\n\n\n1\n\n\n\nj\nH", - { - "x": 1 - }, - "\n/\n\n\n3\n\n\n\nl\nT" - ], - [ - { - "y": -0.875, - "x": 5.5, - "fa": [ - 5, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 5 - ] - }, - "\n\n:\n\n\n\n\n\ng\n;", - { - "x": 6.5, - "a": 5, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5 - ] - }, - "h\n\n\n\n\n\nF" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "TAB", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 5 - }, - "a\n\n\n\n\n\nS", - { - "x": 14.5, - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 5 - ] - }, - "\n\\\n\n\n-\n\n\n\n;\nR", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ENTER" - ], - [ - { - "y": -0.625, - "x": 6.5, - "c": "#e3e2dd", - "t": "#525554", - "h": 1.5 - }, - "", - { - "x": 4.5, - "h": 1.5 - }, - "" - ], - [ - { - "y": -0.75, - "x": 3.5, - "a": 4 - }, - "\n\n\n-\n\n\n\n\n\nC", - { - "x": 10.5 - }, - "<\n}\n\n\n.\n\n\n\n\n," - ], - [ - { - "y": -0.875, - "x": 2.5 - }, - "\n\n\n=\n\n\n\n\n\nX", - { - "x": 1 - }, - "\n\n\n—\n\n\n\n\n\nV", - { - "x": 8.5 - }, - "\n{\n\n\n0\n\n\n\n\nM", - { - "x": 1 - }, - ">\n~\n\n\nENTER\n\n\n\n\n." - ], - [ - { - "y": -0.875, - "x": 5.5 - }, - "\n\n\n_\n\n\n\n\nb\nY", - { - "x": 6.5, - "a": 5 - }, - "n\n\n\n\n\n\nB" - ], - [ - { - "y": -0.875, - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ALT", - { - "c": "#e3e2dd", - "t": "#525554", - "a": 4 - }, - "\n\n\n+\n\n\n\n\n\nZ", - { - "x": 14.5 - }, - "\"\n`\n\n\n+\n\n\n\n/\n'", - { - "c": "#525554", - "t": "#e3e2dd", - "a": 7, - "f": 3, - "w": 1.5 - }, - "ALT" - ], - [ - { - "y": -0.375, - "x": 3.5, - "f": 3 - }, - "END", - { - "x": 10.5, - "f": 3 - }, - "PAGE UP" - ], - [ - { - "y": -0.875, - "x": 2.5, - "f": 3 - }, - "HOME", - { - "x": 1, - "f": 3 - }, - "🔒2", - { - "x": 8.5, - "f": 3 - }, - "🔒3", - { - "x": 1, - "f": 3 - }, - "PAGE DOWN" - ], - [ - { - "y": -0.75, - "x": 0.5, - "c": "#0075ad", - "a": 4, - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 9 - ] - }, - "\n\n\nFLASH\n\n\n\n\n\nΑ", - { - "c": "#525554", - "a": 7, - "f": 3 - }, - "MENU", - { - "x": 14.5, - "f": 3 - }, - "MENU", - { - "c": "#0075ad", - "a": 4, - "f": 3 - }, - "\nFLASH\n\n\n\n\n\n\n\nΩ" - ], - [ - { - "y": 1.125, - "c": "#c0472c", - "fa": [ - 1, - 1, - 1, - 1, - 0, - 0, - 5, - 0, - 1, - 5 - ], - "w": 6 - }, - "SHIFTED\nLAYER 4\nSHIFTED\nLAYER 4\nLAYER 2 (LEFT) / LAYER 3 (RIGHT)\n\n\n\nqwerty (layer 1)\nMAIN LAYER" - ], - [ - { - "r": 30, - "rx": 6.5, - "ry": 4.25, - "y": -1, - "x": 1, - "c": "#525554", - "fa": [ - 1, - 1, - 1, - 1 - ] - }, - "\n\n\n🔅-\n\n\n\n\n\n🔉", - "\n\n\n🔆+\n\n\n\n\n\n🔊" - ], - [ - { - "a": 7, - "f": 3, - "h": 2 - }, - "SHIFT", - { - "f": 3, - "h": 2 - }, - "ƒ4", - { - "f": 3 - }, - "🔒1" - ], - [ - { - "x": 2, - "f": 3 - }, - "CTRL" - ], - [ - { - "r": -30, - "rx": 13, - "y": -1, - "x": -3, - "a": 4, - "f": 3 - }, - "\n🔅-\n\n\n\n\n\n\n\n🔅-", - { - "f": 3 - }, - "\n🔆+\n\n\n\n\n\n\n\n🔆+" - ], - [ - { - "x": -3, - "a": 7, - "f": 3 - }, - "🔒1", - { - "f": 3, - "h": 2 - }, - "ƒ4", - { - "c": "#e3e2dd", - "t": "#525554", - "h": 2 - }, - "" - ], - [ - { - "x": -3, - "c": "#525554", - "t": "#e3e2dd", - "f": 3 - }, - "CTRL" - ] -] \ No newline at end of file diff --git a/keyboards/ergodox/keymaps/familiar/img/hntr.png b/keyboards/ergodox/keymaps/familiar/img/hntr.png deleted file mode 100644 index 519d152df5..0000000000 Binary files a/keyboards/ergodox/keymaps/familiar/img/hntr.png and /dev/null differ -- cgit v1.2.3 From aee9b10e92a597984ba9693b2dfcf597ca380a70 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 10 Jul 2016 23:45:39 +0300 Subject: Add a keyboard specific visualizer --- keyboards/ergodox/infinity/Makefile | 2 +- keyboards/ergodox/infinity/rules.mk | 2 +- keyboards/ergodox/infinity/visualizer.c | 168 ++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 keyboards/ergodox/infinity/visualizer.c (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/Makefile b/keyboards/ergodox/infinity/Makefile index 191c6bb664..bd09e5885d 100644 --- a/keyboards/ergodox/infinity/Makefile +++ b/keyboards/ergodox/infinity/Makefile @@ -1,3 +1,3 @@ ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif \ No newline at end of file +endif diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index 473a6dfec6..1b011cd589 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -59,7 +59,7 @@ OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000 # CUSTOM_MATRIX ?= yes # Custom matrix file SERIAL_LINK_ENABLE = yes -VISUALIZER_ENABLE ?= no #temporarily disabled to make everything compile +VISUALIZER_ENABLE ?= yes LCD_ENABLE ?= yes LED_ENABLE ?= yes LCD_BACKLIGHT_ENABLE ?= yes diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c new file mode 100644 index 0000000000..c0d335ce6a --- /dev/null +++ b/keyboards/ergodox/infinity/visualizer.c @@ -0,0 +1,168 @@ +/* +Copyright 2016 Fred Sundvik + +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 . +*/ + +// Currently we are assuming that both the backlight and LCD are enabled +// But it's entirely possible to write a custom visualizer that use only +// one of them +#ifndef LCD_BACKLIGHT_ENABLE +#error This visualizer needs that LCD backlight is enabled +#endif + +#ifndef LCD_ENABLE +#error This visualizer needs that LCD is enabled +#endif + +#include "visualizer.h" +#include "led_test.h" + +static const char* welcome_text[] = {"TMK", "Infinity Ergodox"}; + +// Just an example how to write custom keyframe functions, we could have moved +// all this into the init function +bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)animation; + // Read the uGFX documentation for information how to use the displays + // http://wiki.ugfx.org/index.php/Main_Page + gdispClear(White); + // You can use static variables for things that can't be found in the animation + // or state structs + gdispDrawString(0, 3, welcome_text[0], state->font_dejavusansbold12, Black); + gdispDrawString(0, 15, welcome_text[1], state->font_dejavusansbold12, Black); + // Always remember to flush the display + gdispFlush(); + // you could set the backlight color as well, but we won't do it here, since + // it's part of the following animation + // lcd_backlight_color(hue, saturation, intensity); + // We don't need constant updates, just drawing the screen once is enough + return false; +} + +// Feel free to modify the animations below, or even add new ones if needed + +// Don't worry, if the startup animation is long, you can use the keyboard like normal +// during that time +static keyframe_animation_t startup_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_functions = { + display_welcome, + keyframe_animate_backlight_color, + keyframe_no_operation, + enable_visualization + }, +}; + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t color_animation = { + .num_frames = 2, + .loop = false, + // Note that there's a 200 ms no-operation frame, + // this prevents the color from changing when activating the layer + // momentarily + .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, + .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, +}; + +// The LCD animation alternates between the layer name display and a +// bitmap that displays all active layers +static keyframe_animation_t lcd_animation = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, + .frame_functions = {keyframe_display_layer_text, keyframe_display_layer_bitmap}, +}; + +static keyframe_animation_t suspend_animation = { + .num_frames = 3, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_functions = { + keyframe_display_layer_text, + keyframe_animate_backlight_color, + keyframe_disable_lcd_and_backlight, + }, +}; + +static keyframe_animation_t resume_animation = { + .num_frames = 5, + .loop = false, + .frame_lengths = {0, 0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_functions = { + keyframe_enable_lcd_and_backlight, + display_welcome, + keyframe_animate_backlight_color, + keyframe_no_operation, + enable_visualization, + }, +}; + +void initialize_user_visualizer(visualizer_state_t* state) { + // The brightness will be dynamically adjustable in the future + // But for now, change it here. + lcd_backlight_brightness(0x50); + state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0xFF); + state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + start_keyframe_animation(&startup_animation); + start_keyframe_animation(&led_test_animation); +} + +void update_user_visualizer_state(visualizer_state_t* state) { + // Add more tests, change the colors and layer texts here + // Usually you want to check the high bits (higher layers first) + // because that's the order layers are processed for keypresses + // You can for check for example: + // state->status.layer + // state->status.default_layer + // state->status.leds (see led.h for available statuses) + if (state->status.layer & 0x8) { + state->target_lcd_color = LCD_COLOR(0xC0, 0xB0, 0xFF); + state->layer_text = "Numpad"; + } + else if (state->status.layer & 0x4) { + state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); + state->layer_text = "KBD functions"; + } + else if (state->status.layer & 0x2) { + state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); + state->layer_text = "Function keys"; + } + else { + state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); + state->layer_text = "Default"; + } + // You can also stop existing animations, and start your custom ones here + // remember that you should normally have only one animation for the LCD + // and one for the background. But you can also combine them if you want. + start_keyframe_animation(&lcd_animation); + start_keyframe_animation(&color_animation); +} + +void user_visualizer_suspend(visualizer_state_t* state) { + state->layer_text = "Suspending..."; + uint8_t hue = LCD_HUE(state->current_lcd_color); + uint8_t sat = LCD_SAT(state->current_lcd_color); + state->target_lcd_color = LCD_COLOR(hue, sat, 0); + start_keyframe_animation(&suspend_animation); +} + +void user_visualizer_resume(visualizer_state_t* state) { + state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0x00); + state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + start_keyframe_animation(&resume_animation); + start_keyframe_animation(&led_test_animation); +} -- cgit v1.2.3 From bb86be1f1f3927a7ce339cb9439c97914af24754 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 28 Aug 2016 23:08:34 +0300 Subject: Remove unneeded makefile include --- keyboards/ergodox/ez/rules.mk | 4 ---- keyboards/ergodox/infinity/rules.mk | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk index 64b2db8158..6cd1c0c4f7 100644 --- a/keyboards/ergodox/ez/rules.mk +++ b/keyboards/ergodox/ez/rules.mk @@ -74,7 +74,3 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512 SLEEP_LED_ENABLE = no API_SYSEX_ENABLE ?= no RGBLIGHT_ENABLE ?= yes - -ifndef QUANTUM_DIR - include ../../../Makefile -endif diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index 1b011cd589..d51574acae 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -66,10 +66,6 @@ LCD_BACKLIGHT_ENABLE ?= yes MIDI_ENABLE = no RGBLIGHT_ENABLE = no -ifndef QUANTUM_DIR - include ../../../Makefile -endif - ifdef LCD_ENABLE include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk endif -- cgit v1.2.3 From f5c89416527a3ec435ed49137fd2bf4af216024c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 28 Aug 2016 23:25:39 +0300 Subject: UGFX is compiled once per keyboard instead of keymap --- keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index 290571ce5b..abda0bd858 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -8,8 +8,6 @@ #ifndef _GDISP_LLD_BOARD_H #define _GDISP_LLD_BOARD_H -#include "print.h" - #define ST7565_LCD_BIAS ST7565_LCD_BIAS_9 // actually 6 #define ST7565_ADC ST7565_ADC_NORMAL #define ST7565_COM_SCAN ST7565_COM_SCAN_DEC -- cgit v1.2.3 From 2b24d35846693a3365a35b6ee9bc31b70659cfcf Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 31 Mar 2017 23:58:10 +0300 Subject: Hopefully finally fix the corrupt LCD The SPI bus is now selected and deselected before each set of commands. Also speed up things by buffering many commands into a single batch. --- .../drivers/gdisp/st7565ergodox/board_ST7565.h | 46 +-- .../drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 393 +++++++++++---------- 2 files changed, 228 insertions(+), 211 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index abda0bd858..c2092b5e8d 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -37,10 +37,14 @@ // MSB First // CLK Low by default static const SPIConfig spi1config = { - NULL, - /* HW dependent part.*/ - ST7565_GPIOPORT, - ST7565_SS_PIN, + // Operation complete callback or @p NULL. + .end_cb = NULL, + //The chip select line port - when not using pcs. + .ssport = ST7565_GPIOPORT, + // brief The chip select line pad number - when not using pcs. + .sspad=ST7565_SS_PIN, + // SPI initialization data. + .tar0 = SPIx_CTARn_FMSZ(7) | SPIx_CTARn_ASC(7) | SPIx_CTARn_DT(7) @@ -50,13 +54,10 @@ static const SPIConfig spi1config = { //SPI_CR1_BR_0 }; -static bool_t st7565_is_data_mode = 1; - static GFXINLINE void init_board(GDisplay *g) { (void) g; palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL); palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); - st7565_is_data_mode = 1; palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL); palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN); palSetPadModeRaw(MOSI, ST7565_SPI_MODE); @@ -65,7 +66,6 @@ static GFXINLINE void init_board(GDisplay *g) { spiInit(); spiStart(&SPID1, &spi1config); - spiSelect(&SPID1); } static GFXINLINE void post_init_board(GDisplay *g) { @@ -86,39 +86,27 @@ static GFXINLINE void acquire_bus(GDisplay *g) { (void) g; // Only the LCD is using the SPI bus, so no need to acquire // spiAcquireBus(&SPID1); + spiSelect(&SPID1); } static GFXINLINE void release_bus(GDisplay *g) { (void) g; // Only the LCD is using the SPI bus, so no need to release //spiReleaseBus(&SPID1); + spiUnselect(&SPID1); } -static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) { - (void) g; - if (st7565_is_data_mode) { - // The sleeps need to be at lest 10 vs 25 ns respectively - // So let's sleep two ticks, one tick might not be enough - // if we are at the end of the tick - chThdSleep(2); - palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN); - chThdSleep(2); - st7565_is_data_mode = 0; - } - spiSend(&SPID1, 1, &cmd); +static GFXINLINE void enter_data_mode(GDisplay *g) { + palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); +} + +static GFXINLINE void enter_cmd_mode(GDisplay *g) { + palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN); } + static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) { (void) g; - if (!st7565_is_data_mode) { - // The sleeps need to be at lest 10 vs 25 ns respectively - // So let's sleep two ticks, one tick might not be enough - // if we are at the end of the tick - chThdSleep(2); - palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); - chThdSleep(2); - st7565_is_data_mode = 1; - } spiSend(&SPID1, length, data); } diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index c33aea81a8..4547f14193 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -20,16 +20,16 @@ /*===========================================================================*/ #ifndef GDISP_SCREEN_HEIGHT - #define GDISP_SCREEN_HEIGHT 32 +#define GDISP_SCREEN_HEIGHT 32 #endif #ifndef GDISP_SCREEN_WIDTH - #define GDISP_SCREEN_WIDTH 128 +#define GDISP_SCREEN_WIDTH 128 #endif #ifndef GDISP_INITIAL_CONTRAST - #define GDISP_INITIAL_CONTRAST 0 +#define GDISP_INITIAL_CONTRAST 0 #endif #ifndef GDISP_INITIAL_BACKLIGHT - #define GDISP_INITIAL_BACKLIGHT 100 +#define GDISP_INITIAL_BACKLIGHT 100 #endif #define GDISP_FLG_NEEDFLUSH (GDISP_FLG_DRIVER<<0) @@ -40,16 +40,16 @@ /* Driver config defaults for backward compatibility. */ /*===========================================================================*/ #ifndef ST7565_LCD_BIAS - #define ST7565_LCD_BIAS ST7565_LCD_BIAS_7 +#define ST7565_LCD_BIAS ST7565_LCD_BIAS_7 #endif #ifndef ST7565_ADC - #define ST7565_ADC ST7565_ADC_NORMAL +#define ST7565_ADC ST7565_ADC_NORMAL #endif #ifndef ST7565_COM_SCAN - #define ST7565_COM_SCAN ST7565_COM_SCAN_INC +#define ST7565_COM_SCAN ST7565_COM_SCAN_INC #endif #ifndef ST7565_PAGE_ORDER - #define ST7565_PAGE_ORDER 0,1,2,3 +#define ST7565_PAGE_ORDER 0,1,2,3 #endif /*===========================================================================*/ @@ -58,12 +58,24 @@ typedef struct{ bool_t buffer2; + uint8_t data_pos; + uint8_t data[16]; uint8_t ram[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8]; }PrivData; // Some common routines and macros #define PRIV(g) ((PrivData*)g->priv) #define RAM(g) (PRIV(g)->ram) + +static GFXINLINE void write_cmd(GDisplay* g, uint8_t cmd) { + PRIV(g)->data[PRIV(g)->data_pos++] = cmd; +} + +static GFXINLINE void flush_cmd(GDisplay* g) { + write_data(g, PRIV(g)->data, PRIV(g)->data_pos); + PRIV(g)->data_pos = 0; +} + #define write_cmd2(g, cmd1, cmd2) { write_cmd(g, cmd1); write_cmd(g, cmd2); } #define write_cmd3(g, cmd1, cmd2, cmd3) { write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); } @@ -86,207 +98,224 @@ typedef struct{ */ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { - // The private area is the display surface. - g->priv = gfxAlloc(sizeof(PrivData)); - PRIV(g)->buffer2 = false; - - // Initialise the board interface - init_board(g); - - // Hardware reset - setpin_reset(g, TRUE); - gfxSleepMilliseconds(20); - setpin_reset(g, FALSE); - gfxSleepMilliseconds(20); - - acquire_bus(g); + // The private area is the display surface. + g->priv = gfxAlloc(sizeof(PrivData)); + PRIV(g)->buffer2 = false; + PRIV(g)->data_pos = 0; + + // Initialise the board interface + init_board(g); + + // Hardware reset + setpin_reset(g, TRUE); + gfxSleepMilliseconds(20); + setpin_reset(g, FALSE); + gfxSleepMilliseconds(20); + + acquire_bus(g); + enter_cmd_mode(g); write_cmd(g, ST7565_DISPLAY_OFF); - write_cmd(g, ST7565_LCD_BIAS); + write_cmd(g, ST7565_LCD_BIAS); write_cmd(g, ST7565_ADC); write_cmd(g, ST7565_COM_SCAN); - + write_cmd(g, ST7565_START_LINE | 0); - write_cmd(g, ST7565_RESISTOR_RATIO | 0x6); + write_cmd(g, ST7565_RESISTOR_RATIO | 0x6); - // turn on voltage converter (VC=1, VR=0, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x04); - delay_ms(50); + // turn on voltage converter (VC=1, VR=0, VF=0) + write_cmd(g, ST7565_POWER_CONTROL | 0x04); + flush_cmd(g); + delay_ms(50); - // turn on voltage regulator (VC=1, VR=1, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x06); - delay_ms(50); + // turn on voltage regulator (VC=1, VR=1, VF=0) + write_cmd(g, ST7565_POWER_CONTROL | 0x06); + flush_cmd(g); + delay_ms(50); - // turn on voltage follower (VC=1, VR=1, VF=1) - write_cmd(g, ST7565_POWER_CONTROL | 0x07); - delay_ms(50); + // turn on voltage follower (VC=1, VR=1, VF=1) + write_cmd(g, ST7565_POWER_CONTROL | 0x07); + flush_cmd(g); + delay_ms(50); - write_cmd(g, 0xE2); + write_cmd(g, 0xE2); write_cmd(g, ST7565_COM_SCAN); - write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101); - //write_cmd2(g, ST7565_CONTRAST, 0); - write_cmd(g, ST7565_DISPLAY_ON); - write_cmd(g, ST7565_ALLON_NORMAL); - write_cmd(g, ST7565_INVERT_DISPLAY); + write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101); + //write_cmd2(g, ST7565_CONTRAST, 0); + write_cmd(g, ST7565_DISPLAY_ON); + write_cmd(g, ST7565_ALLON_NORMAL); + write_cmd(g, ST7565_INVERT_DISPLAY); - write_cmd(g, ST7565_RMW); + write_cmd(g, ST7565_RMW); + flush_cmd(g); // Finish Init post_init_board(g); - // Release the bus - release_bus(g); - - /* Initialise the GDISP structure */ - g->g.Width = GDISP_SCREEN_WIDTH; - g->g.Height = GDISP_SCREEN_HEIGHT; - g->g.Orientation = GDISP_ROTATE_0; - g->g.Powermode = powerOn; - g->g.Backlight = GDISP_INITIAL_BACKLIGHT; - g->g.Contrast = GDISP_INITIAL_CONTRAST; - return TRUE; + // Release the bus + release_bus(g); + + /* Initialise the GDISP structure */ + g->g.Width = GDISP_SCREEN_WIDTH; + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Orientation = GDISP_ROTATE_0; + g->g.Powermode = powerOn; + g->g.Backlight = GDISP_INITIAL_BACKLIGHT; + g->g.Contrast = GDISP_INITIAL_CONTRAST; + return TRUE; } #if GDISP_HARDWARE_FLUSH - LLDSPEC void gdisp_lld_flush(GDisplay *g) { - unsigned p; - - // Don't flush if we don't need it. - if (!(g->flags & GDISP_FLG_NEEDFLUSH)) - return; - - acquire_bus(g); - unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0); - for (p = 0; p < 4; p++) { - write_cmd(g, ST7565_PAGE | (p + dstOffset)); - write_cmd(g, ST7565_COLUMN_MSB | 0); - write_cmd(g, ST7565_COLUMN_LSB | 0); - write_cmd(g, ST7565_RMW); - write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH); - } - unsigned line = (PRIV(g)->buffer2 ? 32 : 0); - write_cmd(g, ST7565_START_LINE | line); - PRIV(g)->buffer2 = !PRIV(g)->buffer2; - release_bus(g); - - g->flags &= ~GDISP_FLG_NEEDFLUSH; - } +LLDSPEC void gdisp_lld_flush(GDisplay *g) { + unsigned p; + + // Don't flush if we don't need it. + if (!(g->flags & GDISP_FLG_NEEDFLUSH)) + return; + + acquire_bus(g); + enter_cmd_mode(g); + unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0); + for (p = 0; p < 4; p++) { + write_cmd(g, ST7565_PAGE | (p + dstOffset)); + write_cmd(g, ST7565_COLUMN_MSB | 0); + write_cmd(g, ST7565_COLUMN_LSB | 0); + write_cmd(g, ST7565_RMW); + flush_cmd(g); + enter_data_mode(g); + write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH); + enter_cmd_mode(g); + } + unsigned line = (PRIV(g)->buffer2 ? 32 : 0); + write_cmd(g, ST7565_START_LINE | line); + flush_cmd(g); + PRIV(g)->buffer2 = !PRIV(g)->buffer2; + release_bus(g); + + g->flags &= ~GDISP_FLG_NEEDFLUSH; +} #endif #if GDISP_HARDWARE_DRAWPIXEL - LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { - coord_t x, y; - - switch(g->g.Orientation) { - default: - case GDISP_ROTATE_0: - x = g->p.x; - y = g->p.y; - break; - case GDISP_ROTATE_90: - x = g->p.y; - y = GDISP_SCREEN_HEIGHT-1 - g->p.x; - break; - case GDISP_ROTATE_180: - x = GDISP_SCREEN_WIDTH-1 - g->p.x; - y = GDISP_SCREEN_HEIGHT-1 - g->p.y; - break; - case GDISP_ROTATE_270: - x = GDISP_SCREEN_HEIGHT-1 - g->p.y; - y = g->p.x; - break; - } - if (gdispColor2Native(g->p.color) != Black) - RAM(g)[xyaddr(x, y)] |= xybit(y); - else - RAM(g)[xyaddr(x, y)] &= ~xybit(y); - g->flags |= GDISP_FLG_NEEDFLUSH; - } +LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { + coord_t x, y; + + switch(g->g.Orientation) { + default: + case GDISP_ROTATE_0: + x = g->p.x; + y = g->p.y; + break; + case GDISP_ROTATE_90: + x = g->p.y; + y = GDISP_SCREEN_HEIGHT-1 - g->p.x; + break; + case GDISP_ROTATE_180: + x = GDISP_SCREEN_WIDTH-1 - g->p.x; + y = GDISP_SCREEN_HEIGHT-1 - g->p.y; + break; + case GDISP_ROTATE_270: + x = GDISP_SCREEN_HEIGHT-1 - g->p.y; + y = g->p.x; + break; + } + if (gdispColor2Native(g->p.color) != Black) + RAM(g)[xyaddr(x, y)] |= xybit(y); + else + RAM(g)[xyaddr(x, y)] &= ~xybit(y); + g->flags |= GDISP_FLG_NEEDFLUSH; +} #endif #if GDISP_HARDWARE_PIXELREAD - LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { - coord_t x, y; - - switch(g->g.Orientation) { - default: - case GDISP_ROTATE_0: - x = g->p.x; - y = g->p.y; - break; - case GDISP_ROTATE_90: - x = g->p.y; - y = GDISP_SCREEN_HEIGHT-1 - g->p.x; - break; - case GDISP_ROTATE_180: - x = GDISP_SCREEN_WIDTH-1 - g->p.x; - y = GDISP_SCREEN_HEIGHT-1 - g->p.y; - break; - case GDISP_ROTATE_270: - x = GDISP_SCREEN_HEIGHT-1 - g->p.y; - y = g->p.x; - break; - } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; - } +LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { + coord_t x, y; + + switch(g->g.Orientation) { + default: + case GDISP_ROTATE_0: + x = g->p.x; + y = g->p.y; + break; + case GDISP_ROTATE_90: + x = g->p.y; + y = GDISP_SCREEN_HEIGHT-1 - g->p.x; + break; + case GDISP_ROTATE_180: + x = GDISP_SCREEN_WIDTH-1 - g->p.x; + y = GDISP_SCREEN_HEIGHT-1 - g->p.y; + break; + case GDISP_ROTATE_270: + x = GDISP_SCREEN_HEIGHT-1 - g->p.y; + y = g->p.x; + break; + } + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; +} #endif #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL - LLDSPEC void gdisp_lld_control(GDisplay *g) { - switch(g->p.x) { - case GDISP_CONTROL_POWER: - if (g->g.Powermode == (powermode_t)g->p.ptr) - return; - switch((powermode_t)g->p.ptr) { - case powerOff: - case powerSleep: - case powerDeepSleep: - acquire_bus(g); - write_cmd(g, ST7565_DISPLAY_OFF); - release_bus(g); - break; - case powerOn: - acquire_bus(g); - write_cmd(g, ST7565_DISPLAY_ON); - release_bus(g); - break; - default: - return; - } - g->g.Powermode = (powermode_t)g->p.ptr; - return; - - case GDISP_CONTROL_ORIENTATION: - if (g->g.Orientation == (orientation_t)g->p.ptr) - return; - switch((orientation_t)g->p.ptr) { - /* Rotation is handled by the drawing routines */ - case GDISP_ROTATE_0: - case GDISP_ROTATE_180: - g->g.Height = GDISP_SCREEN_HEIGHT; - g->g.Width = GDISP_SCREEN_WIDTH; - break; - case GDISP_ROTATE_90: - case GDISP_ROTATE_270: - g->g.Height = GDISP_SCREEN_WIDTH; - g->g.Width = GDISP_SCREEN_HEIGHT; - break; - default: - return; - } - g->g.Orientation = (orientation_t)g->p.ptr; - return; - - case GDISP_CONTROL_CONTRAST: - if ((unsigned)g->p.ptr > 100) - g->p.ptr = (void *)100; - acquire_bus(g); - write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F); - release_bus(g); - g->g.Contrast = (unsigned)g->p.ptr; - return; - } - } +LLDSPEC void gdisp_lld_control(GDisplay *g) { + switch(g->p.x) { + case GDISP_CONTROL_POWER: + if (g->g.Powermode == (powermode_t)g->p.ptr) + return; + switch((powermode_t)g->p.ptr) { + case powerOff: + case powerSleep: + case powerDeepSleep: + acquire_bus(g); + enter_cmd_mode(g); + write_cmd(g, ST7565_DISPLAY_OFF); + flush_cmd(g); + release_bus(g); + break; + case powerOn: + acquire_bus(g); + enter_cmd_mode(g); + write_cmd(g, ST7565_DISPLAY_ON); + flush_cmd(g); + release_bus(g); + break; + default: + return; + } + g->g.Powermode = (powermode_t)g->p.ptr; + return; + + case GDISP_CONTROL_ORIENTATION: + if (g->g.Orientation == (orientation_t)g->p.ptr) + return; + switch((orientation_t)g->p.ptr) { + /* Rotation is handled by the drawing routines */ + case GDISP_ROTATE_0: + case GDISP_ROTATE_180: + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Width = GDISP_SCREEN_WIDTH; + break; + case GDISP_ROTATE_90: + case GDISP_ROTATE_270: + g->g.Height = GDISP_SCREEN_WIDTH; + g->g.Width = GDISP_SCREEN_HEIGHT; + break; + default: + return; + } + g->g.Orientation = (orientation_t)g->p.ptr; + return; + + case GDISP_CONTROL_CONTRAST: + if ((unsigned)g->p.ptr > 100) + g->p.ptr = (void *)100; + acquire_bus(g); + enter_cmd_mode(g); + write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F); + flush_cmd(g); + release_bus(g); + g->g.Contrast = (unsigned)g->p.ptr; + return; + } +} #endif // GDISP_NEED_CONTROL #endif // GFX_USE_GDISP -- cgit v1.2.3 From a8f5897b976ee9f16b1798db38fb0ee4b8981c9e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 16:36:34 +0300 Subject: Add support for blitting to the Infinity LCD --- .../drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 26 ++++++++++++++++++++++ .../drivers/gdisp/st7565ergodox/gdisp_lld_config.h | 11 ++++----- keyboards/ergodox/infinity/gfxconf.h | 2 +- 3 files changed, 33 insertions(+), 6 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 4547f14193..2c8a168e76 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -254,6 +254,32 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { } #endif +LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { + uint8_t* buffer = (uint8_t*)g->p.ptr; + int linelength = g->p.cx; + for (int i = 0; i < g->p.cy; i++) { + unsigned dstx = g->p.x; + unsigned dsty = g->p.y + i; + unsigned srcx = g->p.x1; + unsigned srcy = g->p.y1 + i; + unsigned srcbit = srcy * g->p.x2 + srcx; + for(int j=0; j < linelength; j++) { + uint8_t src = buffer[srcbit / 8]; + uint8_t bit = 7-(srcbit % 8); + uint8_t bitset = (src >> bit) & 1; + uint8_t* dst = &(RAM(g)[xyaddr(dstx, dsty)]); + if (bitset) { + *dst |= xybit(dsty); + } + else { + *dst &= ~xybit(dsty); + } + dstx++; + srcbit++; + } + } +} + #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL LLDSPEC void gdisp_lld_control(GDisplay *g) { switch(g->p.x) { diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h index 48587b9e14..2b66a877c8 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h @@ -14,12 +14,13 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL TRUE +#define GDISP_HARDWARE_PIXELREAD TRUE +#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_BITFILLS TRUE -#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO +#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO #endif /* GFX_USE_GDISP */ diff --git a/keyboards/ergodox/infinity/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h index 8caa577b73..45b9f58580 100644 --- a/keyboards/ergodox/infinity/gfxconf.h +++ b/keyboards/ergodox/infinity/gfxconf.h @@ -143,7 +143,7 @@ #define GDISP_HARDWARE_DRAWPIXEL TRUE #define GDISP_HARDWARE_CLEARS FALSE #define GDISP_HARDWARE_FILLS FALSE - #define GDISP_HARDWARE_BITFILLS FALSE + //#define GDISP_HARDWARE_BITFILLS FALSE #define GDISP_HARDWARE_SCROLL FALSE #define GDISP_HARDWARE_PIXELREAD TRUE #define GDISP_HARDWARE_CONTROL TRUE -- cgit v1.2.3 From e6f7a8a47a82258725683980b83e215c8323aef2 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 16:37:31 +0300 Subject: Display QMK logo at startup of Infinity Ergodox --- keyboards/ergodox/infinity/lcd_logo.png | Bin 0 -> 490 bytes keyboards/ergodox/infinity/visualizer.c | 89 +++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 keyboards/ergodox/infinity/lcd_logo.png (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/lcd_logo.png b/keyboards/ergodox/infinity/lcd_logo.png new file mode 100644 index 0000000000..6cf26fc678 Binary files /dev/null and b/keyboards/ergodox/infinity/lcd_logo.png differ diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index c0d335ce6a..0ce1d4ae4e 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -29,25 +29,68 @@ along with this program. If not, see . #include "visualizer.h" #include "led_test.h" -static const char* welcome_text[] = {"TMK", "Infinity Ergodox"}; +// To generate an image array like this +// Ensure the image is 128 x 32 or smaller +// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ +// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom +// Update array in the source code with the C array produced by the conversion program + +// The image below is generated from lcd_logo.png +static const uint8_t image_data_lcd_logo[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0x80); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0xFF); -// Just an example how to write custom keyframe functions, we could have moved -// all this into the init function -bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) { +bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)state; (void)animation; + (void)state; // Read the uGFX documentation for information how to use the displays // http://wiki.ugfx.org/index.php/Main_Page gdispClear(White); + // You can use static variables for things that can't be found in the animation - // or state structs - gdispDrawString(0, 3, welcome_text[0], state->font_dejavusansbold12, Black); - gdispDrawString(0, 15, welcome_text[1], state->font_dejavusansbold12, Black); + // or state structs, here we use the image + + //gdispGBlitArea is a tricky function to use since it supports blitting part of the image + // if you have full screen image, then just use 128 and 32 for both source and target dimensions + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + // Always remember to flush the display gdispFlush(); - // you could set the backlight color as well, but we won't do it here, since - // it's part of the following animation - // lcd_backlight_color(hue, saturation, intensity); - // We don't need constant updates, just drawing the screen once is enough return false; } @@ -56,13 +99,12 @@ bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 4, + .num_frames = 3, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - display_welcome, + display_logo, keyframe_animate_backlight_color, - keyframe_no_operation, enable_visualization }, }; @@ -78,6 +120,7 @@ static keyframe_animation_t color_animation = { .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, }; + // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers static keyframe_animation_t lcd_animation = { @@ -99,14 +142,13 @@ static keyframe_animation_t suspend_animation = { }; static keyframe_animation_t resume_animation = { - .num_frames = 5, + .num_frames = 4, .loop = false, - .frame_lengths = {0, 0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0}, + .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { keyframe_enable_lcd_and_backlight, - display_welcome, + display_logo, keyframe_animate_backlight_color, - keyframe_no_operation, enable_visualization, }, }; @@ -115,10 +157,9 @@ void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. lcd_backlight_brightness(0x50); - state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0xFF); - state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; start_keyframe_animation(&startup_animation); - start_keyframe_animation(&led_test_animation); } void update_user_visualizer_state(visualizer_state_t* state) { @@ -161,8 +202,8 @@ void user_visualizer_suspend(visualizer_state_t* state) { } void user_visualizer_resume(visualizer_state_t* state) { - state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0x00); - state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; start_keyframe_animation(&resume_animation); start_keyframe_animation(&led_test_animation); } -- cgit v1.2.3 From bc97413bf70b1906b387dea35bb22575ec57eff8 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 16:38:12 +0300 Subject: Disable LEDs on Infinity Ergodox --- keyboards/ergodox/infinity/rules.mk | 2 +- keyboards/ergodox/infinity/visualizer.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index d51574acae..aaadfe34b5 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -61,7 +61,7 @@ CUSTOM_MATRIX ?= yes # Custom matrix file SERIAL_LINK_ENABLE = yes VISUALIZER_ENABLE ?= yes LCD_ENABLE ?= yes -LED_ENABLE ?= yes +LED_ENABLE ?= no LCD_BACKLIGHT_ENABLE ?= yes MIDI_ENABLE = no RGBLIGHT_ENABLE = no diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 0ce1d4ae4e..c8fc3d78ef 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,7 +27,6 @@ along with this program. If not, see . #endif #include "visualizer.h" -#include "led_test.h" // To generate an image array like this // Ensure the image is 128 x 32 or smaller @@ -205,5 +204,4 @@ void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; start_keyframe_animation(&resume_animation); - start_keyframe_animation(&led_test_animation); } -- cgit v1.2.3 From f113f95440f8cd7377930868656caf515dbd609c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 17:43:38 +0300 Subject: Move CIE1931 and breathing tables to its own file --- .../drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c | 37 +++------------------- 1 file changed, 5 insertions(+), 32 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c index 1d21f0c498..ea09c4bb0c 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c @@ -25,6 +25,10 @@ along with this program. If not, see . #include "board_IS31FL3731C.h" + +// Can't include led_tables from here +extern const uint8_t CIE1931_CURVE[]; + /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -100,37 +104,6 @@ along with this program. If not, see . #define IS31 -//Generated by http://jared.geek.nz/2013/feb/linear-led-pwm -const unsigned char cie[256] = { - 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, - 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, - 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, - 10, 10, 11, 11, 11, 12, 12, 12, 13, 13, - 13, 14, 14, 15, 15, 15, 16, 16, 17, 17, - 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, - 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, - 28, 28, 29, 29, 30, 31, 31, 32, 32, 33, - 34, 34, 35, 36, 37, 37, 38, 39, 39, 40, - 41, 42, 43, 43, 44, 45, 46, 47, 47, 48, - 49, 50, 51, 52, 53, 54, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 70, 71, 72, 73, 74, 75, 76, 77, 79, - 80, 81, 82, 83, 85, 86, 87, 88, 90, 91, - 92, 94, 95, 96, 98, 99, 100, 102, 103, 105, - 106, 108, 109, 110, 112, 113, 115, 116, 118, 120, - 121, 123, 124, 126, 128, 129, 131, 132, 134, 136, - 138, 139, 141, 143, 145, 146, 148, 150, 152, 154, - 155, 157, 159, 161, 163, 165, 167, 169, 171, 173, - 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, - 196, 198, 200, 202, 204, 207, 209, 211, 214, 216, - 218, 220, 223, 225, 228, 230, 232, 235, 237, 240, - 242, 245, 247, 250, 252, 255, -}; - - /*===========================================================================*/ /* Driver local functions. */ /*===========================================================================*/ @@ -231,7 +204,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { uint8_t* src = PRIV(g)->frame_buffer; for (int y=0;ywrite_buffer[get_led_address(g, x, y)]=cie[*src]; + PRIV(g)->write_buffer[get_led_address(g, x, y)]=CIE1931_CURVE[*src]; ++src; } } -- cgit v1.2.3 From 951b6f33a0dc479d29831aaa5c73fc526faf0471 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 21:28:27 +0300 Subject: CIE 1931 for the LCD backlight --- keyboards/ergodox/infinity/infinity.c | 29 ++++++++++++++++++++++++++--- keyboards/ergodox/infinity/visualizer.c | 6 +++--- 2 files changed, 29 insertions(+), 6 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/infinity.c b/keyboards/ergodox/infinity/infinity.c index 02db67eaf2..ecc072abbe 100644 --- a/keyboards/ergodox/infinity/infinity.c +++ b/keyboards/ergodox/infinity/infinity.c @@ -70,10 +70,33 @@ void lcd_backlight_hal_init(void) { RGB_PORT->PCR[BLUE_PIN] = RGB_MODE; } +static uint16_t cie_lightness(uint16_t v) { + // The CIE 1931 formula for lightness + // Y = luminance (output) 0-1 + // L = lightness input 0 - 100 + + // Y = (L* / 902.3) if L* <= 8 + // Y = ((L* + 16) / 116)^3 if L* > 8 + + float l = 100.0f * (v / 65535.0f); + float y = 0.0f; + if (l <= 8.0f) { + y = l / 902.3; + } + else { + y = ((l + 16.0f) / 116.0f); + y = y * y * y; + if (y > 1.0f) { + y = 1.0f; + } + } + return y * 65535.0f; +} + void lcd_backlight_hal_color(uint16_t r, uint16_t g, uint16_t b) { - CHANNEL_RED.CnV = r; - CHANNEL_GREEN.CnV = g; - CHANNEL_BLUE.CnV = b; + CHANNEL_RED.CnV = cie_lightness(r); + CHANNEL_GREEN.CnV = cie_lightness(g); + CHANNEL_BLUE.CnV = cie_lightness(b); } __attribute__ ((weak)) diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index c8fc3d78ef..12336fdc57 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -70,8 +70,8 @@ static const uint8_t image_data_lcd_logo[512] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0x80); -static const uint32_t initial_color = LCD_COLOR(0, 0, 0xFF); +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0); bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; @@ -155,7 +155,7 @@ static keyframe_animation_t resume_animation = { void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. - lcd_backlight_brightness(0x50); + lcd_backlight_brightness(130); state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; start_keyframe_animation(&startup_animation); -- cgit v1.2.3 From 9a4ce28683b667ab67d48d92196bab7e277d4800 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 1 Apr 2017 22:52:58 +0300 Subject: Display layer bitmap and keyboard led states on the LCD --- keyboards/ergodox/infinity/visualizer.c | 86 ++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 29 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 12336fdc57..6af3a72ee1 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -73,6 +73,14 @@ static const uint8_t image_data_lcd_logo[512] = { static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); +typedef enum { + LCD_STATE_INITIAL, + LCD_STATE_LAYER_BITMAP, + LCD_STATE_BITMAP_AND_LEDS, +} lcd_state_t; + +static lcd_state_t lcd_state = LCD_STATE_INITIAL; + bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; @@ -122,11 +130,18 @@ static keyframe_animation_t color_animation = { // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers -static keyframe_animation_t lcd_animation = { +static keyframe_animation_t lcd_bitmap_animation = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_display_layer_bitmap}, +}; + +static keyframe_animation_t lcd_bitmap_leds_animation = { .num_frames = 2, .loop = true, .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, - .frame_functions = {keyframe_display_layer_text, keyframe_display_layer_bitmap}, + .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, }; static keyframe_animation_t suspend_animation = { @@ -158,38 +173,50 @@ void initialize_user_visualizer(visualizer_state_t* state) { lcd_backlight_brightness(130); state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&startup_animation); } -void update_user_visualizer_state(visualizer_state_t* state) { - // Add more tests, change the colors and layer texts here - // Usually you want to check the high bits (higher layers first) - // because that's the order layers are processed for keypresses - // You can for check for example: - // state->status.layer - // state->status.default_layer - // state->status.leds (see led.h for available statuses) - if (state->status.layer & 0x8) { - state->target_lcd_color = LCD_COLOR(0xC0, 0xB0, 0xFF); - state->layer_text = "Numpad"; - } - else if (state->status.layer & 0x4) { - state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); - state->layer_text = "KBD functions"; - } - else if (state->status.layer & 0x2) { - state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); - state->layer_text = "Function keys"; - } - else { +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { + // Check the status here to start and stop animations + // You might have to save some state, like the current animation here so that you can start the right + // This function is called every time the status changes + + // NOTE that this is called from the visualizer thread, so don't access anything else outside the status + // This is also important because the slave won't have access to the active layer for example outside the + // status. + + if (lcd_state == LCD_STATE_INITIAL) { state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); - state->layer_text = "Default"; + start_keyframe_animation(&color_animation); + } + + if (state->status.leds) { + if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || + state->status.leds != prev_status.leds || + state->status.layer != prev_status.layer || + state->status.default_layer != prev_status.default_layer) { + + // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case + stop_keyframe_animation(&lcd_bitmap_animation); + + lcd_state = LCD_STATE_BITMAP_AND_LEDS; + // For information: + // The logic in this function makes sure that this doesn't happen, but if you call start on an + // animation that is already playing it will be restarted. + start_keyframe_animation(&lcd_bitmap_leds_animation); + } + } else { + if (lcd_state != LCD_STATE_LAYER_BITMAP || + state->status.layer != prev_status.layer || + state->status.default_layer != prev_status.default_layer) { + + stop_keyframe_animation(&lcd_bitmap_leds_animation); + + lcd_state = LCD_STATE_LAYER_BITMAP; + start_keyframe_animation(&lcd_bitmap_animation); + } } - // You can also stop existing animations, and start your custom ones here - // remember that you should normally have only one animation for the LCD - // and one for the background. But you can also combine them if you want. - start_keyframe_animation(&lcd_animation); - start_keyframe_animation(&color_animation); } void user_visualizer_suspend(visualizer_state_t* state) { @@ -203,5 +230,6 @@ void user_visualizer_suspend(visualizer_state_t* state) { void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&resume_animation); } -- cgit v1.2.3 From 39385144e7dc3337e623cdc8147b4a441f22fd62 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 2 Apr 2017 01:31:04 +0300 Subject: Emulate Ergodox EZ leds by LCD colors --- keyboards/ergodox/infinity/config.h | 2 + keyboards/ergodox/infinity/infinity.c | 22 +++- keyboards/ergodox/infinity/infinity.h | 71 +++++++------ keyboards/ergodox/infinity/visualizer.c | 175 ++++++++++++++++++++++++++++++-- 4 files changed, 226 insertions(+), 44 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/config.h b/keyboards/ergodox/infinity/config.h index 9e264083be..6cde193e13 100644 --- a/keyboards/ergodox/infinity/config.h +++ b/keyboards/ergodox/infinity/config.h @@ -54,6 +54,8 @@ along with this program. If not, see . // The visualizer needs gfx thread priorities #define VISUALIZER_THREAD_PRIORITY (NORMAL_PRIORITY - 2) +#define VISUALIZER_USER_DATA_SIZE 16 + /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/ergodox/infinity/infinity.c b/keyboards/ergodox/infinity/infinity.c index ecc072abbe..62259ed3f6 100644 --- a/keyboards/ergodox/infinity/infinity.c +++ b/keyboards/ergodox/infinity/infinity.c @@ -126,34 +126,48 @@ void matrix_scan_kb(void) { matrix_scan_user(); } +__attribute__ ((weak)) void ergodox_board_led_on(void){ } +__attribute__ ((weak)) void ergodox_right_led_1_on(void){ } +__attribute__ ((weak)) void ergodox_right_led_2_on(void){ } +__attribute__ ((weak)) void ergodox_right_led_3_on(void){ } -void ergodox_right_led_on(uint8_t led){ -} - +__attribute__ ((weak)) void ergodox_board_led_off(void){ } +__attribute__ ((weak)) void ergodox_right_led_1_off(void){ } +__attribute__ ((weak)) void ergodox_right_led_2_off(void){ } +__attribute__ ((weak)) void ergodox_right_led_3_off(void){ } -void ergodox_right_led_off(uint8_t led){ +__attribute__ ((weak)) +void ergodox_right_led_1_set(uint8_t n) { +} + +__attribute__ ((weak)) +void ergodox_right_led_2_set(uint8_t n) { +} + +__attribute__ ((weak)) +void ergodox_right_led_3_set(uint8_t n) { } #ifdef ONEHAND_ENABLE diff --git a/keyboards/ergodox/infinity/infinity.h b/keyboards/ergodox/infinity/infinity.h index fec9e565cd..73a0f4bf70 100644 --- a/keyboards/ergodox/infinity/infinity.h +++ b/keyboards/ergodox/infinity/infinity.h @@ -7,13 +7,38 @@ void ergodox_board_led_on(void); void ergodox_right_led_1_on(void); void ergodox_right_led_2_on(void); void ergodox_right_led_3_on(void); -void ergodox_right_led_on(uint8_t led); + +inline void ergodox_right_led_on(uint8_t led) { + switch (led) { + case 0: + ergodox_right_led_1_on(); + break; + case 1: + ergodox_right_led_2_on(); + break; + case 2: + ergodox_right_led_3_on(); + break; + } +} void ergodox_board_led_off(void); void ergodox_right_led_1_off(void); void ergodox_right_led_2_off(void); void ergodox_right_led_3_off(void); -void ergodox_right_led_off(uint8_t led); +inline void ergodox_right_led_off(uint8_t led) { + switch (led) { + case 0: + ergodox_right_led_1_off(); + break; + case 1: + ergodox_right_led_2_off(); + break; + case 2: + ergodox_right_led_3_off(); + break; + } +} inline void ergodox_led_all_on(void) { @@ -31,36 +56,22 @@ inline void ergodox_led_all_off(void) ergodox_right_led_3_off(); } -inline void ergodox_right_led_1_set(uint8_t n){ - if (n) { - ergodox_right_led_1_on(); - } else { - ergodox_right_led_1_off(); - } -} - -inline void ergodox_right_led_2_set(uint8_t n){ - if (n) { - ergodox_right_led_2_on(); - } else { - ergodox_right_led_2_off(); - } -} - -inline void ergodox_right_led_3_set(uint8_t n){ - if (n) { - ergodox_right_led_3_on(); - } else { - ergodox_right_led_3_off(); - } -} +void ergodox_right_led_1_set(uint8_t n); +void ergodox_right_led_2_set(uint8_t n); +void ergodox_right_led_3_set(uint8_t n); inline void ergodox_right_led_set(uint8_t led, uint8_t n){ - if (n) { - ergodox_right_led_on(led); - } else { - ergodox_right_led_off(led); - } + switch (led) { + case 0: + ergodox_right_led_1_set(n); + break; + case 1: + ergodox_right_led_2_set(n); + break; + case 2: + ergodox_right_led_3_set(n); + break; + } } inline void ergodox_led_all_set(uint8_t n) { diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 6af3a72ee1..7bc42fbc70 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "system/serial_link.h" // To generate an image array like this // Ensure the image is 128 x 32 or smaller @@ -73,6 +74,15 @@ static const uint8_t image_data_lcd_logo[512] = { static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); +static const uint32_t led_emulation_colors[4] = { + LCD_COLOR(0, 0, 0), + LCD_COLOR(255, 255, 255), + LCD_COLOR(84, 255, 255), + LCD_COLOR(168, 255, 255), +}; + +static uint32_t next_led_target_color = 0; + typedef enum { LCD_STATE_INITIAL, LCD_STATE_LAYER_BITMAP, @@ -81,6 +91,19 @@ typedef enum { static lcd_state_t lcd_state = LCD_STATE_INITIAL; +typedef struct { + uint8_t led_on; + uint8_t led1; + uint8_t led2; + uint8_t led3; +} visualizer_user_data_t; + +// Don't access from visualization function, use the visualizer state instead +static visualizer_user_data_t user_data_keyboard = {}; + +_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, + "Please increase the VISUALIZER_USER_DATA_SIZE"); + bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; @@ -117,16 +140,27 @@ static keyframe_animation_t startup_animation = { }; // The color animation animates the LCD color when you change layers -static keyframe_animation_t color_animation = { - .num_frames = 2, +static keyframe_animation_t one_led_color = { + .num_frames = 1, .loop = false, - // Note that there's a 200 ms no-operation frame, - // this prevents the color from changing when activating the layer - // momentarily - .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, - .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color}, }; +bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { + uint32_t temp = next_led_target_color; + next_led_target_color = state->target_lcd_color; + state->target_lcd_color = temp; + return false; +} + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t two_led_colors = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, +}; // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers @@ -177,6 +211,45 @@ void initialize_user_visualizer(visualizer_state_t* state) { start_keyframe_animation(&startup_animation); } +static const uint32_t red; +static const uint32_t green; +static const uint32_t blue; + +inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { + return user_data->led_on & (1u << num); +} + +static uint8_t get_led_index_master(visualizer_user_data_t* user_data) { + for (int i=0; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + return 0; +} + +static uint8_t get_led_index_slave(visualizer_user_data_t* user_data) { + uint8_t master_index = get_led_index_master(user_data); + if (master_index!=0) { + for (int i=master_index; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + } + + return 0; +} + +static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { + if (is_led_on(user_data, 0) && + is_led_on(user_data, 1) && + is_led_on(user_data, 2)) { + return 3; + } + return 0; +} + void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { // Check the status here to start and stop animations // You might have to save some state, like the current animation here so that you can start the right @@ -186,9 +259,38 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard // This is also important because the slave won't have access to the active layer for example outside the // status. - if (lcd_state == LCD_STATE_INITIAL) { - state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); - start_keyframe_animation(&color_animation); + + visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; + visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status.user_data; + + uint8_t new_index; + uint8_t old_index; + + if (is_serial_link_master()) { + new_index = get_led_index_master(user_data_new); + old_index = get_led_index_master(user_data_old); + } + else { + new_index = get_led_index_slave(user_data_new); + old_index = get_led_index_slave(user_data_old); + } + uint8_t new_secondary_index = get_secondary_led_index(user_data_new); + uint8_t old_secondary_index = get_secondary_led_index(user_data_old); + + if (lcd_state == LCD_STATE_INITIAL || + new_index != old_index || + new_secondary_index != old_secondary_index) { + + if (new_secondary_index != 0) { + state->target_lcd_color = led_emulation_colors[new_index]; + next_led_target_color = led_emulation_colors[new_secondary_index]; + stop_keyframe_animation(&one_led_color); + start_keyframe_animation(&two_led_colors); + } else { + state->target_lcd_color = led_emulation_colors[new_index]; + stop_keyframe_animation(&two_led_colors); + start_keyframe_animation(&one_led_color); + } } if (state->status.leds) { @@ -233,3 +335,56 @@ void user_visualizer_resume(visualizer_state_t* state) { lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&resume_animation); } + +void ergodox_board_led_on(void){ + // No board led support +} + +void ergodox_right_led_1_on(void){ + user_data_keyboard.led_on |= (1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_on(void){ + user_data_keyboard.led_on |= (1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_on(void){ + user_data_keyboard.led_on |= (1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_board_led_off(void){ + // No board led support +} + +void ergodox_right_led_1_off(void){ + user_data_keyboard.led_on &= ~(1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_off(void){ + user_data_keyboard.led_on &= ~(1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_off(void){ + user_data_keyboard.led_on &= ~(1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_1_set(uint8_t n) { + user_data_keyboard.led1 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_set(uint8_t n) { + user_data_keyboard.led2 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_set(uint8_t n) { + user_data_keyboard.led3 = n; + visualizer_set_user_data(&user_data_keyboard); +} -- cgit v1.2.3 From 5fbaf31dc26a7bb27eb276ec419255e92b293d60 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 2 Apr 2017 02:29:50 +0300 Subject: Brightness for Ergodox Infinity emulated LEDs --- keyboards/ergodox/infinity/config.h | 2 +- keyboards/ergodox/infinity/visualizer.c | 76 ++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/config.h b/keyboards/ergodox/infinity/config.h index 6cde193e13..95f713819e 100644 --- a/keyboards/ergodox/infinity/config.h +++ b/keyboards/ergodox/infinity/config.h @@ -40,7 +40,7 @@ along with this program. If not, see . /* number of backlight levels */ #define BACKLIGHT_LEVELS 3 -#define LED_BRIGHTNESS_LO 15 +#define LED_BRIGHTNESS_LO 100 #define LED_BRIGHTNESS_HI 255 /* define if matrix has ghost */ diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 7bc42fbc70..c7afd9384c 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -99,7 +99,12 @@ typedef struct { } visualizer_user_data_t; // Don't access from visualization function, use the visualizer state instead -static visualizer_user_data_t user_data_keyboard = {}; +static visualizer_user_data_t user_data_keyboard = { + .led_on = 0, + .led1 = LED_BRIGHTNESS_HI, + .led2 = LED_BRIGHTNESS_HI, + .led3 = LED_BRIGHTNESS_HI, +}; _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, "Please increase the VISUALIZER_USER_DATA_SIZE"); @@ -250,18 +255,21 @@ static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { return 0; } -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t prev_status) { - // Check the status here to start and stop animations - // You might have to save some state, like the current animation here so that you can start the right - // This function is called every time the status changes - - // NOTE that this is called from the visualizer thread, so don't access anything else outside the status - // This is also important because the slave won't have access to the active layer for example outside the - // status. - +static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) { + switch (index) { + case 1: + return user_data->led1; + case 2: + return user_data->led2; + case 3: + return user_data->led3; + } + return 0; +} +static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; - visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status.user_data; + visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data; uint8_t new_index; uint8_t old_index; @@ -277,27 +285,41 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard uint8_t new_secondary_index = get_secondary_led_index(user_data_new); uint8_t old_secondary_index = get_secondary_led_index(user_data_old); + uint8_t old_brightness = get_brightness(user_data_old, old_index); + uint8_t new_brightness = get_brightness(user_data_new, new_index); + + uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index); + uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index); + if (lcd_state == LCD_STATE_INITIAL || new_index != old_index || - new_secondary_index != old_secondary_index) { + new_secondary_index != old_secondary_index || + new_brightness != old_brightness || + new_secondary_brightness != old_secondary_brightness) { if (new_secondary_index != 0) { - state->target_lcd_color = led_emulation_colors[new_index]; - next_led_target_color = led_emulation_colors[new_secondary_index]; + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); + next_led_target_color = change_lcd_color_intensity( + led_emulation_colors[new_secondary_index], new_secondary_brightness); + stop_keyframe_animation(&one_led_color); start_keyframe_animation(&two_led_colors); } else { - state->target_lcd_color = led_emulation_colors[new_index]; + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); stop_keyframe_animation(&two_led_colors); start_keyframe_animation(&one_led_color); } } +} +static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { if (state->status.leds) { if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || - state->status.leds != prev_status.leds || - state->status.layer != prev_status.layer || - state->status.default_layer != prev_status.default_layer) { + state->status.leds != prev_status->leds || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case stop_keyframe_animation(&lcd_bitmap_animation); @@ -310,8 +332,8 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard } } else { if (lcd_state != LCD_STATE_LAYER_BITMAP || - state->status.layer != prev_status.layer || - state->status.default_layer != prev_status.default_layer) { + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { stop_keyframe_animation(&lcd_bitmap_leds_animation); @@ -321,6 +343,20 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard } } +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Check the status here to start and stop animations + // You might have to save some state, like the current animation here so that you can start the right + // This function is called every time the status changes + + // NOTE that this is called from the visualizer thread, so don't access anything else outside the status + // This is also important because the slave won't have access to the active layer for example outside the + // status. + + update_emulated_leds(state, prev_status); + update_lcd_text(state, prev_status); + +} + void user_visualizer_suspend(visualizer_state_t* state) { state->layer_text = "Suspending..."; uint8_t hue = LCD_HUE(state->current_lcd_color); -- cgit v1.2.3 From 65e8127c91c6a0fc027a1a482de443302e00d019 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 3 Apr 2017 22:08:34 +0300 Subject: Add visualizer for Ergodox default --- keyboards/ergodox/keymaps/default/visualizer.c | 426 +++++++++++++++++++++++++ 1 file changed, 426 insertions(+) create mode 100644 keyboards/ergodox/keymaps/default/visualizer.c (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c new file mode 100644 index 0000000000..c7afd9384c --- /dev/null +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -0,0 +1,426 @@ +/* +Copyright 2016 Fred Sundvik + +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 . +*/ + +// Currently we are assuming that both the backlight and LCD are enabled +// But it's entirely possible to write a custom visualizer that use only +// one of them +#ifndef LCD_BACKLIGHT_ENABLE +#error This visualizer needs that LCD backlight is enabled +#endif + +#ifndef LCD_ENABLE +#error This visualizer needs that LCD is enabled +#endif + +#include "visualizer.h" +#include "system/serial_link.h" + +// To generate an image array like this +// Ensure the image is 128 x 32 or smaller +// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ +// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom +// Update array in the source code with the C array produced by the conversion program + +// The image below is generated from lcd_logo.png +static const uint8_t image_data_lcd_logo[512] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0); + +static const uint32_t led_emulation_colors[4] = { + LCD_COLOR(0, 0, 0), + LCD_COLOR(255, 255, 255), + LCD_COLOR(84, 255, 255), + LCD_COLOR(168, 255, 255), +}; + +static uint32_t next_led_target_color = 0; + +typedef enum { + LCD_STATE_INITIAL, + LCD_STATE_LAYER_BITMAP, + LCD_STATE_BITMAP_AND_LEDS, +} lcd_state_t; + +static lcd_state_t lcd_state = LCD_STATE_INITIAL; + +typedef struct { + uint8_t led_on; + uint8_t led1; + uint8_t led2; + uint8_t led3; +} visualizer_user_data_t; + +// Don't access from visualization function, use the visualizer state instead +static visualizer_user_data_t user_data_keyboard = { + .led_on = 0, + .led1 = LED_BRIGHTNESS_HI, + .led2 = LED_BRIGHTNESS_HI, + .led3 = LED_BRIGHTNESS_HI, +}; + +_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, + "Please increase the VISUALIZER_USER_DATA_SIZE"); + +bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { + (void)state; + (void)animation; + (void)state; + // Read the uGFX documentation for information how to use the displays + // http://wiki.ugfx.org/index.php/Main_Page + gdispClear(White); + + // You can use static variables for things that can't be found in the animation + // or state structs, here we use the image + + //gdispGBlitArea is a tricky function to use since it supports blitting part of the image + // if you have full screen image, then just use 128 and 32 for both source and target dimensions + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + + // Always remember to flush the display + gdispFlush(); + return false; +} + +// Feel free to modify the animations below, or even add new ones if needed + +// Don't worry, if the startup animation is long, you can use the keyboard like normal +// during that time +static keyframe_animation_t startup_animation = { + .num_frames = 3, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, + .frame_functions = { + display_logo, + keyframe_animate_backlight_color, + enable_visualization + }, +}; + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t one_led_color = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color}, +}; + +bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { + uint32_t temp = next_led_target_color; + next_led_target_color = state->target_lcd_color; + state->target_lcd_color = temp; + return false; +} + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t two_led_colors = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, +}; + +// The LCD animation alternates between the layer name display and a +// bitmap that displays all active layers +static keyframe_animation_t lcd_bitmap_animation = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_display_layer_bitmap}, +}; + +static keyframe_animation_t lcd_bitmap_leds_animation = { + .num_frames = 2, + .loop = true, + .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, + .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, +}; + +static keyframe_animation_t suspend_animation = { + .num_frames = 3, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_functions = { + keyframe_display_layer_text, + keyframe_animate_backlight_color, + keyframe_disable_lcd_and_backlight, + }, +}; + +static keyframe_animation_t resume_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, + .frame_functions = { + keyframe_enable_lcd_and_backlight, + display_logo, + keyframe_animate_backlight_color, + enable_visualization, + }, +}; + +void initialize_user_visualizer(visualizer_state_t* state) { + // The brightness will be dynamically adjustable in the future + // But for now, change it here. + lcd_backlight_brightness(130); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; + start_keyframe_animation(&startup_animation); +} + +static const uint32_t red; +static const uint32_t green; +static const uint32_t blue; + +inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { + return user_data->led_on & (1u << num); +} + +static uint8_t get_led_index_master(visualizer_user_data_t* user_data) { + for (int i=0; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + return 0; +} + +static uint8_t get_led_index_slave(visualizer_user_data_t* user_data) { + uint8_t master_index = get_led_index_master(user_data); + if (master_index!=0) { + for (int i=master_index; i < 3; i++) { + if (is_led_on(user_data, i)) { + return i + 1; + } + } + } + + return 0; +} + +static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { + if (is_led_on(user_data, 0) && + is_led_on(user_data, 1) && + is_led_on(user_data, 2)) { + return 3; + } + return 0; +} + +static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) { + switch (index) { + case 1: + return user_data->led1; + case 2: + return user_data->led2; + case 3: + return user_data->led3; + } + return 0; +} + +static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; + visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data; + + uint8_t new_index; + uint8_t old_index; + + if (is_serial_link_master()) { + new_index = get_led_index_master(user_data_new); + old_index = get_led_index_master(user_data_old); + } + else { + new_index = get_led_index_slave(user_data_new); + old_index = get_led_index_slave(user_data_old); + } + uint8_t new_secondary_index = get_secondary_led_index(user_data_new); + uint8_t old_secondary_index = get_secondary_led_index(user_data_old); + + uint8_t old_brightness = get_brightness(user_data_old, old_index); + uint8_t new_brightness = get_brightness(user_data_new, new_index); + + uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index); + uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index); + + if (lcd_state == LCD_STATE_INITIAL || + new_index != old_index || + new_secondary_index != old_secondary_index || + new_brightness != old_brightness || + new_secondary_brightness != old_secondary_brightness) { + + if (new_secondary_index != 0) { + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); + next_led_target_color = change_lcd_color_intensity( + led_emulation_colors[new_secondary_index], new_secondary_brightness); + + stop_keyframe_animation(&one_led_color); + start_keyframe_animation(&two_led_colors); + } else { + state->target_lcd_color = change_lcd_color_intensity( + led_emulation_colors[new_index], new_brightness); + stop_keyframe_animation(&two_led_colors); + start_keyframe_animation(&one_led_color); + } + } +} + +static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + if (state->status.leds) { + if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || + state->status.leds != prev_status->leds || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { + + // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case + stop_keyframe_animation(&lcd_bitmap_animation); + + lcd_state = LCD_STATE_BITMAP_AND_LEDS; + // For information: + // The logic in this function makes sure that this doesn't happen, but if you call start on an + // animation that is already playing it will be restarted. + start_keyframe_animation(&lcd_bitmap_leds_animation); + } + } else { + if (lcd_state != LCD_STATE_LAYER_BITMAP || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer) { + + stop_keyframe_animation(&lcd_bitmap_leds_animation); + + lcd_state = LCD_STATE_LAYER_BITMAP; + start_keyframe_animation(&lcd_bitmap_animation); + } + } +} + +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Check the status here to start and stop animations + // You might have to save some state, like the current animation here so that you can start the right + // This function is called every time the status changes + + // NOTE that this is called from the visualizer thread, so don't access anything else outside the status + // This is also important because the slave won't have access to the active layer for example outside the + // status. + + update_emulated_leds(state, prev_status); + update_lcd_text(state, prev_status); + +} + +void user_visualizer_suspend(visualizer_state_t* state) { + state->layer_text = "Suspending..."; + uint8_t hue = LCD_HUE(state->current_lcd_color); + uint8_t sat = LCD_SAT(state->current_lcd_color); + state->target_lcd_color = LCD_COLOR(hue, sat, 0); + start_keyframe_animation(&suspend_animation); +} + +void user_visualizer_resume(visualizer_state_t* state) { + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + lcd_state = LCD_STATE_INITIAL; + start_keyframe_animation(&resume_animation); +} + +void ergodox_board_led_on(void){ + // No board led support +} + +void ergodox_right_led_1_on(void){ + user_data_keyboard.led_on |= (1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_on(void){ + user_data_keyboard.led_on |= (1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_on(void){ + user_data_keyboard.led_on |= (1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_board_led_off(void){ + // No board led support +} + +void ergodox_right_led_1_off(void){ + user_data_keyboard.led_on &= ~(1u << 0); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_off(void){ + user_data_keyboard.led_on &= ~(1u << 1); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_off(void){ + user_data_keyboard.led_on &= ~(1u << 2); + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_1_set(uint8_t n) { + user_data_keyboard.led1 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_2_set(uint8_t n) { + user_data_keyboard.led2 = n; + visualizer_set_user_data(&user_data_keyboard); +} + +void ergodox_right_led_3_set(uint8_t n) { + user_data_keyboard.led3 = n; + visualizer_set_user_data(&user_data_keyboard); +} -- cgit v1.2.3 From fa6da78ff3c96a71ed65684e276352700843d539 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 3 Apr 2017 23:00:58 +0300 Subject: Simple layer display on Infinity Ergodox default layout --- keyboards/ergodox/keymaps/default/visualizer.c | 286 ++++++------------------- 1 file changed, 62 insertions(+), 224 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index c7afd9384c..d99d5f7026 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -1,5 +1,5 @@ /* -Copyright 2016 Fred Sundvik +Copyright 2017 Fred Sundvik 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 @@ -74,15 +74,6 @@ static const uint8_t image_data_lcd_logo[512] = { static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); -static const uint32_t led_emulation_colors[4] = { - LCD_COLOR(0, 0, 0), - LCD_COLOR(255, 255, 255), - LCD_COLOR(84, 255, 255), - LCD_COLOR(168, 255, 255), -}; - -static uint32_t next_led_target_color = 0; - typedef enum { LCD_STATE_INITIAL, LCD_STATE_LAYER_BITMAP, @@ -91,24 +82,6 @@ typedef enum { static lcd_state_t lcd_state = LCD_STATE_INITIAL; -typedef struct { - uint8_t led_on; - uint8_t led1; - uint8_t led2; - uint8_t led3; -} visualizer_user_data_t; - -// Don't access from visualization function, use the visualizer state instead -static visualizer_user_data_t user_data_keyboard = { - .led_on = 0, - .led1 = LED_BRIGHTNESS_HI, - .led2 = LED_BRIGHTNESS_HI, - .led3 = LED_BRIGHTNESS_HI, -}; - -_Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, - "Please increase the VISUALIZER_USER_DATA_SIZE"); - bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { (void)state; (void)animation; @@ -144,43 +117,34 @@ static keyframe_animation_t startup_animation = { }, }; -// The color animation animates the LCD color when you change layers -static keyframe_animation_t one_led_color = { - .num_frames = 1, - .loop = false, - .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color}, -}; - -bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { - uint32_t temp = next_led_target_color; - next_led_target_color = state->target_lcd_color; - state->target_lcd_color = temp; - return false; -} - -// The color animation animates the LCD color when you change layers -static keyframe_animation_t two_led_colors = { - .num_frames = 2, - .loop = true, - .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, -}; - // The LCD animation alternates between the layer name display and a // bitmap that displays all active layers -static keyframe_animation_t lcd_bitmap_animation = { - .num_frames = 1, - .loop = false, - .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_display_layer_bitmap}, +static keyframe_animation_t lcd_layer_bitmap_animation = { + .num_frames = 2, + .loop = true, + .frame_lengths = { + gfxMillisecondsToTicks(2000), + gfxMillisecondsToTicks(2000) + }, + .frame_functions = { + keyframe_display_layer_text, + keyframe_display_layer_bitmap + }, }; -static keyframe_animation_t lcd_bitmap_leds_animation = { - .num_frames = 2, +static keyframe_animation_t lcd_layer_bitmap_leds_animation = { + .num_frames = 3, .loop = true, - .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, - .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, + .frame_lengths = { + gfxMillisecondsToTicks(2000), + gfxMillisecondsToTicks(2000), + gfxMillisecondsToTicks(2000) + }, + .frame_functions = { + keyframe_display_layer_text, + keyframe_display_led_states, + keyframe_display_layer_bitmap, + }, }; static keyframe_animation_t suspend_animation = { @@ -206,6 +170,17 @@ static keyframe_animation_t resume_animation = { }, }; +// The color animation animates the LCD color when you change layers +static keyframe_animation_t color_animation = { + .num_frames = 2, + .loop = false, + // Note that there's a 200 ms no-operation frame, + // this prevents the color from changing when activating the layer + // momentarily + .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, + .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, +}; + void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. @@ -216,105 +191,32 @@ void initialize_user_visualizer(visualizer_state_t* state) { start_keyframe_animation(&startup_animation); } -static const uint32_t red; -static const uint32_t green; -static const uint32_t blue; - -inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { - return user_data->led_on & (1u << num); -} - -static uint8_t get_led_index_master(visualizer_user_data_t* user_data) { - for (int i=0; i < 3; i++) { - if (is_led_on(user_data, i)) { - return i + 1; - } - } - return 0; -} - -static uint8_t get_led_index_slave(visualizer_user_data_t* user_data) { - uint8_t master_index = get_led_index_master(user_data); - if (master_index!=0) { - for (int i=master_index; i < 3; i++) { - if (is_led_on(user_data, i)) { - return i + 1; - } - } - } - - return 0; -} - -static uint8_t get_secondary_led_index(visualizer_user_data_t* user_data) { - if (is_led_on(user_data, 0) && - is_led_on(user_data, 1) && - is_led_on(user_data, 2)) { - return 3; - } - return 0; -} - -static uint8_t get_brightness(visualizer_user_data_t* user_data, uint8_t index) { - switch (index) { - case 1: - return user_data->led1; - case 2: - return user_data->led2; - case 3: - return user_data->led3; +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Add more tests, change the colors and layer texts here + // Usually you want to check the high bits (higher layers first) + // because that's the order layers are processed for keypresses + // You can for check for example: + // state->status.layer + // state->status.default_layer + // state->status.leds (see led.h for available statuses) + + if (state->status.layer & 0x4) { + state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); + state->layer_text = "Media & Mouse"; } - return 0; -} - -static void update_emulated_leds(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { - visualizer_user_data_t* user_data_new = (visualizer_user_data_t*)state->status.user_data; - visualizer_user_data_t* user_data_old = (visualizer_user_data_t*)prev_status->user_data; - - uint8_t new_index; - uint8_t old_index; - - if (is_serial_link_master()) { - new_index = get_led_index_master(user_data_new); - old_index = get_led_index_master(user_data_old); + else if (state->status.layer & 0x2) { + state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); + state->layer_text = "Symbol"; } else { - new_index = get_led_index_slave(user_data_new); - old_index = get_led_index_slave(user_data_old); + state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); + state->layer_text = "Default"; } - uint8_t new_secondary_index = get_secondary_led_index(user_data_new); - uint8_t old_secondary_index = get_secondary_led_index(user_data_old); - - uint8_t old_brightness = get_brightness(user_data_old, old_index); - uint8_t new_brightness = get_brightness(user_data_new, new_index); - - uint8_t old_secondary_brightness = get_brightness(user_data_old, old_secondary_index); - uint8_t new_secondary_brightness = get_brightness(user_data_new, new_secondary_index); - - if (lcd_state == LCD_STATE_INITIAL || - new_index != old_index || - new_secondary_index != old_secondary_index || - new_brightness != old_brightness || - new_secondary_brightness != old_secondary_brightness) { - - if (new_secondary_index != 0) { - state->target_lcd_color = change_lcd_color_intensity( - led_emulation_colors[new_index], new_brightness); - next_led_target_color = change_lcd_color_intensity( - led_emulation_colors[new_secondary_index], new_secondary_brightness); - - stop_keyframe_animation(&one_led_color); - start_keyframe_animation(&two_led_colors); - } else { - state->target_lcd_color = change_lcd_color_intensity( - led_emulation_colors[new_index], new_brightness); - stop_keyframe_animation(&two_led_colors); - start_keyframe_animation(&one_led_color); - } + + if (lcd_state == LCD_STATE_INITIAL || state->status.layer != prev_status->layer) { + start_keyframe_animation(&color_animation); } -} -static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { if (state->status.leds) { if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || state->status.leds != prev_status->leds || @@ -322,39 +224,28 @@ static void update_lcd_text(visualizer_state_t* state, visualizer_keyboard_statu state->status.default_layer != prev_status->default_layer) { // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case - stop_keyframe_animation(&lcd_bitmap_animation); + stop_keyframe_animation(&lcd_layer_bitmap_animation); lcd_state = LCD_STATE_BITMAP_AND_LEDS; // For information: // The logic in this function makes sure that this doesn't happen, but if you call start on an // animation that is already playing it will be restarted. - start_keyframe_animation(&lcd_bitmap_leds_animation); + start_keyframe_animation(&lcd_layer_bitmap_leds_animation); } } else { if (lcd_state != LCD_STATE_LAYER_BITMAP || state->status.layer != prev_status->layer || state->status.default_layer != prev_status->default_layer) { - stop_keyframe_animation(&lcd_bitmap_leds_animation); + stop_keyframe_animation(&lcd_layer_bitmap_leds_animation); lcd_state = LCD_STATE_LAYER_BITMAP; - start_keyframe_animation(&lcd_bitmap_animation); + start_keyframe_animation(&lcd_layer_bitmap_animation); } } -} - -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { - // Check the status here to start and stop animations - // You might have to save some state, like the current animation here so that you can start the right - // This function is called every time the status changes - - // NOTE that this is called from the visualizer thread, so don't access anything else outside the status - // This is also important because the slave won't have access to the active layer for example outside the - // status. - - update_emulated_leds(state, prev_status); - update_lcd_text(state, prev_status); - + // You can also stop existing animations, and start your custom ones here + // remember that you should normally have only one animation for the LCD + // and one for the background. But you can also combine them if you want. } void user_visualizer_suspend(visualizer_state_t* state) { @@ -371,56 +262,3 @@ void user_visualizer_resume(visualizer_state_t* state) { lcd_state = LCD_STATE_INITIAL; start_keyframe_animation(&resume_animation); } - -void ergodox_board_led_on(void){ - // No board led support -} - -void ergodox_right_led_1_on(void){ - user_data_keyboard.led_on |= (1u << 0); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_2_on(void){ - user_data_keyboard.led_on |= (1u << 1); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_3_on(void){ - user_data_keyboard.led_on |= (1u << 2); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_board_led_off(void){ - // No board led support -} - -void ergodox_right_led_1_off(void){ - user_data_keyboard.led_on &= ~(1u << 0); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_2_off(void){ - user_data_keyboard.led_on &= ~(1u << 1); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_3_off(void){ - user_data_keyboard.led_on &= ~(1u << 2); - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_1_set(uint8_t n) { - user_data_keyboard.led1 = n; - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_2_set(uint8_t n) { - user_data_keyboard.led2 = n; - visualizer_set_user_data(&user_data_keyboard); -} - -void ergodox_right_led_3_set(uint8_t n) { - user_data_keyboard.led3 = n; - visualizer_set_user_data(&user_data_keyboard); -} -- cgit v1.2.3 From 05bc4880ddc9e904cfa1773caff1ae81977d2a76 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 4 Apr 2017 22:29:40 +0300 Subject: Tweaks to the Ergodox default visualizer No animation, display led statuses and layer name on the same screen Don't display layer bitmap Fully saturated colors for caps, less saturated ones normally --- keyboards/ergodox/keymaps/default/visualizer.c | 76 ++++++-------------------- 1 file changed, 18 insertions(+), 58 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index d99d5f7026..305aaae157 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -28,6 +28,7 @@ along with this program. If not, see . #include "visualizer.h" #include "system/serial_link.h" +#include "led.h" // To generate an image array like this // Ensure the image is 128 x 32 or smaller @@ -117,34 +118,11 @@ static keyframe_animation_t startup_animation = { }, }; -// The LCD animation alternates between the layer name display and a -// bitmap that displays all active layers -static keyframe_animation_t lcd_layer_bitmap_animation = { - .num_frames = 2, - .loop = true, - .frame_lengths = { - gfxMillisecondsToTicks(2000), - gfxMillisecondsToTicks(2000) - }, - .frame_functions = { - keyframe_display_layer_text, - keyframe_display_layer_bitmap - }, -}; - -static keyframe_animation_t lcd_layer_bitmap_leds_animation = { - .num_frames = 3, - .loop = true, - .frame_lengths = { - gfxMillisecondsToTicks(2000), - gfxMillisecondsToTicks(2000), - gfxMillisecondsToTicks(2000) - }, - .frame_functions = { - keyframe_display_layer_text, - keyframe_display_led_states, - keyframe_display_layer_bitmap, - }, +static keyframe_animation_t lcd_layer_display = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {keyframe_display_layer_and_led_states} }; static keyframe_animation_t suspend_animation = { @@ -200,49 +178,31 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard // state->status.default_layer // state->status.leds (see led.h for available statuses) + uint8_t saturation = 60; + if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { + saturation = 255; + } if (state->status.layer & 0x4) { - state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF); + state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF); state->layer_text = "Media & Mouse"; } else if (state->status.layer & 0x2) { - state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF); + state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF); state->layer_text = "Symbol"; } else { - state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF); + state->target_lcd_color = LCD_COLOR(84, saturation, 0xFF); state->layer_text = "Default"; } - if (lcd_state == LCD_STATE_INITIAL || state->status.layer != prev_status->layer) { + if (lcd_state == LCD_STATE_INITIAL || + state->status.layer != prev_status->layer || + state->status.default_layer != prev_status->default_layer || + state->status.leds != prev_status->leds) { start_keyframe_animation(&color_animation); + start_keyframe_animation(&lcd_layer_display); } - if (state->status.leds) { - if (lcd_state != LCD_STATE_BITMAP_AND_LEDS || - state->status.leds != prev_status->leds || - state->status.layer != prev_status->layer || - state->status.default_layer != prev_status->default_layer) { - - // NOTE: that it doesn't matter if the animation isn't playing, stop will do nothing in that case - stop_keyframe_animation(&lcd_layer_bitmap_animation); - - lcd_state = LCD_STATE_BITMAP_AND_LEDS; - // For information: - // The logic in this function makes sure that this doesn't happen, but if you call start on an - // animation that is already playing it will be restarted. - start_keyframe_animation(&lcd_layer_bitmap_leds_animation); - } - } else { - if (lcd_state != LCD_STATE_LAYER_BITMAP || - state->status.layer != prev_status->layer || - state->status.default_layer != prev_status->default_layer) { - - stop_keyframe_animation(&lcd_layer_bitmap_leds_animation); - - lcd_state = LCD_STATE_LAYER_BITMAP; - start_keyframe_animation(&lcd_layer_bitmap_animation); - } - } // You can also stop existing animations, and start your custom ones here // remember that you should normally have only one animation for the LCD // and one for the background. But you can also combine them if you want. -- cgit v1.2.3 From 5815c5d317b02d688990980fdf01848e81247c21 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 08:40:39 +0300 Subject: Move LCD keyframes to its own file --- keyboards/ergodox/infinity/visualizer.c | 7 ++++--- keyboards/ergodox/keymaps/default/visualizer.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index c7afd9384c..3abed08db0 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "lcd_keyframes.h" #include "system/serial_link.h" // To generate an image array like this @@ -173,14 +174,14 @@ static keyframe_animation_t lcd_bitmap_animation = { .num_frames = 1, .loop = false, .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_display_layer_bitmap}, + .frame_functions = {lcd_keyframe_display_layer_bitmap}, }; static keyframe_animation_t lcd_bitmap_leds_animation = { .num_frames = 2, .loop = true, .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)}, - .frame_functions = {keyframe_display_layer_bitmap, keyframe_display_led_states}, + .frame_functions = {lcd_keyframe_display_layer_bitmap, lcd_keyframe_display_led_states}, }; static keyframe_animation_t suspend_animation = { @@ -188,7 +189,7 @@ static keyframe_animation_t suspend_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { - keyframe_display_layer_text, + lcd_keyframe_display_layer_text, keyframe_animate_backlight_color, keyframe_disable_lcd_and_backlight, }, diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 305aaae157..ef87ac4195 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "lcd_keyframes.h" #include "system/serial_link.h" #include "led.h" @@ -122,7 +123,7 @@ static keyframe_animation_t lcd_layer_display = { .num_frames = 1, .loop = false, .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_display_layer_and_led_states} + .frame_functions = {lcd_keyframe_display_layer_and_led_states} }; static keyframe_animation_t suspend_animation = { @@ -130,7 +131,7 @@ static keyframe_animation_t suspend_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { - keyframe_display_layer_text, + lcd_keyframe_display_layer_text, keyframe_animate_backlight_color, keyframe_disable_lcd_and_backlight, }, -- cgit v1.2.3 From 5ba228b684a32c1099efc6207842a56ff102961a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 08:48:30 +0300 Subject: Move LCD backlight keyframes to its own file --- keyboards/ergodox/infinity/visualizer.c | 11 ++++++----- keyboards/ergodox/keymaps/default/visualizer.c | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 3abed08db0..bbed4e9897 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -28,6 +28,7 @@ along with this program. If not, see . #include "visualizer.h" #include "lcd_keyframes.h" +#include "lcd_backlight_keyframes.h" #include "system/serial_link.h" // To generate an image array like this @@ -140,7 +141,7 @@ static keyframe_animation_t startup_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization }, }; @@ -150,7 +151,7 @@ static keyframe_animation_t one_led_color = { .num_frames = 1, .loop = false, .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color}, + .frame_functions = {backlight_keyframe_set_color}, }; bool swap_led_target_color(keyframe_animation_t* animation, visualizer_state_t* state) { @@ -165,7 +166,7 @@ static keyframe_animation_t two_led_colors = { .num_frames = 2, .loop = true, .frame_lengths = {gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(0)}, - .frame_functions = {keyframe_set_backlight_color, swap_led_target_color}, + .frame_functions = {backlight_keyframe_set_color, swap_led_target_color}, }; // The LCD animation alternates between the layer name display and a @@ -190,7 +191,7 @@ static keyframe_animation_t suspend_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { lcd_keyframe_display_layer_text, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, keyframe_disable_lcd_and_backlight, }, }; @@ -202,7 +203,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { keyframe_enable_lcd_and_backlight, display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index ef87ac4195..07f5a44ab3 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -28,6 +28,7 @@ along with this program. If not, see . #include "visualizer.h" #include "lcd_keyframes.h" +#include "lcd_backlight_keyframes.h" #include "system/serial_link.h" #include "led.h" @@ -114,7 +115,7 @@ static keyframe_animation_t startup_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization }, }; @@ -132,7 +133,7 @@ static keyframe_animation_t suspend_animation = { .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, .frame_functions = { lcd_keyframe_display_layer_text, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, keyframe_disable_lcd_and_backlight, }, }; @@ -144,7 +145,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { keyframe_enable_lcd_and_backlight, display_logo, - keyframe_animate_backlight_color, + backlight_keyframe_animate_color, enable_visualization, }, }; @@ -157,7 +158,7 @@ static keyframe_animation_t color_animation = { // this prevents the color from changing when activating the layer // momentarily .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, - .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color}, + .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color}, }; void initialize_user_visualizer(visualizer_state_t* state) { -- cgit v1.2.3 From 1e7585e76771e1a2d8ca733fc09c19f9fa0e903c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 09:21:18 +0300 Subject: Separated backlight and LCD disable/enable Also moved them to correct places --- keyboards/ergodox/infinity/visualizer.c | 14 ++++++++------ keyboards/ergodox/keymaps/default/visualizer.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index bbed4e9897..8e684d9919 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -186,22 +186,24 @@ static keyframe_animation_t lcd_bitmap_leds_animation = { }; static keyframe_animation_t suspend_animation = { - .num_frames = 3, + .num_frames = 4, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, .frame_functions = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, - keyframe_disable_lcd_and_backlight, + lcd_keyframe_disable, + lcd_keyframe_disable, }, }; static keyframe_animation_t resume_animation = { - .num_frames = 4, + .num_frames = 5, .loop = false, - .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - keyframe_enable_lcd_and_backlight, + lcd_keyframe_enable, + backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, enable_visualization, diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 07f5a44ab3..5ee49c9bc2 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -128,22 +128,24 @@ static keyframe_animation_t lcd_layer_display = { }; static keyframe_animation_t suspend_animation = { - .num_frames = 3, + .num_frames = 4, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0}, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, .frame_functions = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, - keyframe_disable_lcd_and_backlight, + lcd_keyframe_disable, + lcd_keyframe_disable, }, }; static keyframe_animation_t resume_animation = { - .num_frames = 4, + .num_frames = 5, .loop = false, - .frame_lengths = {0, 0, gfxMillisecondsToTicks(10000), 0}, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - keyframe_enable_lcd_and_backlight, + lcd_keyframe_enable, + backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, enable_visualization, -- cgit v1.2.3 From 64d63ab42281318d891434fbc00277043298dd70 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 10:08:25 +0300 Subject: Remove the need to manually enable the visualizer --- keyboards/ergodox/infinity/visualizer.c | 6 ++---- keyboards/ergodox/keymaps/default/visualizer.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 8e684d9919..0897ea348b 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -136,13 +136,12 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 3, + .num_frames = 2, .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, backlight_keyframe_animate_color, - enable_visualization }, }; @@ -198,7 +197,7 @@ static keyframe_animation_t suspend_animation = { }; static keyframe_animation_t resume_animation = { - .num_frames = 5, + .num_frames = 4, .loop = false, .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { @@ -206,7 +205,6 @@ static keyframe_animation_t resume_animation = { backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, - enable_visualization, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 5ee49c9bc2..73d864c646 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -110,13 +110,12 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 3, + .num_frames = 2, .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { display_logo, backlight_keyframe_animate_color, - enable_visualization }, }; @@ -140,7 +139,7 @@ static keyframe_animation_t suspend_animation = { }; static keyframe_animation_t resume_animation = { - .num_frames = 5, + .num_frames = 4, .loop = false, .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { @@ -148,7 +147,6 @@ static keyframe_animation_t resume_animation = { backlight_keyframe_enable, display_logo, backlight_keyframe_animate_color, - enable_visualization, }, }; -- cgit v1.2.3 From b7041d06aef4dcf2f2a47504a699e538cfb1d9ac Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 5 Apr 2017 10:14:24 +0300 Subject: Move common visualizer keyframes into visualizer_keyframes.h --- keyboards/ergodox/infinity/visualizer.c | 1 + keyboards/ergodox/keymaps/default/visualizer.c | 1 + 2 files changed, 2 insertions(+) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 0897ea348b..2e10fdd709 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "visualizer_keyframes.h" #include "lcd_keyframes.h" #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 73d864c646..f6159e1ef1 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -27,6 +27,7 @@ along with this program. If not, see . #endif #include "visualizer.h" +#include "visualizer_keyframes.h" #include "lcd_keyframes.h" #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" -- cgit v1.2.3 From 3994fb1e79615af849aa03378293831f59c9b259 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 7 Apr 2017 10:51:53 +0300 Subject: Yet another try to fix the LCD corruption It turns out that the ChibiOS K20 SPI driver doesn't handle the chip select, so it needs to be done manually. Acquiring the bus is not enough since the pin was in the wrong mode. This is now fixed. Also increase the frequency of the SPI from around 200kHz to nearly 20 Mhz. --- .../drivers/gdisp/st7565ergodox/board_ST7565.h | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index c2092b5e8d..e8c17e6e33 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -45,15 +45,28 @@ static const SPIConfig spi1config = { .sspad=ST7565_SS_PIN, // SPI initialization data. .tar0 = - SPIx_CTARn_FMSZ(7) - | SPIx_CTARn_ASC(7) - | SPIx_CTARn_DT(7) - | SPIx_CTARn_CSSCK(7) - | SPIx_CTARn_PBR(0) - | SPIx_CTARn_BR(7) - //SPI_CR1_BR_0 + SPIx_CTARn_FMSZ(7) // Frame size = 8 bytes + | SPIx_CTARn_ASC(1) // After SCK Delay Scaler (min 50 ns) = 55.56ns + | SPIx_CTARn_DT(0) // Delay After Transfer Scaler (no minimum)= 27.78ns + | SPIx_CTARn_CSSCK(0) // PCS to SCK Delay Scaler (min 20 ns) = 27.78ns + | SPIx_CTARn_PBR(0) // Baud Rate Prescaler = 2 + | SPIx_CTARn_BR(0) // Baud rate (min 50ns) = 55.56ns }; +static GFXINLINE void acquire_bus(GDisplay *g) { + (void) g; + // Only the LCD is using the SPI bus, so no need to acquire + // spiAcquireBus(&SPID1); + spiSelect(&SPID1); +} + +static GFXINLINE void release_bus(GDisplay *g) { + (void) g; + // Only the LCD is using the SPI bus, so no need to release + //spiReleaseBus(&SPID1); + spiUnselect(&SPID1); +} + static GFXINLINE void init_board(GDisplay *g) { (void) g; palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL); @@ -62,10 +75,11 @@ static GFXINLINE void init_board(GDisplay *g) { palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN); palSetPadModeRaw(MOSI, ST7565_SPI_MODE); palSetPadModeRaw(SLCK, ST7565_SPI_MODE); - palSetPadModeRaw(SS, ST7565_SPI_MODE); + palSetPadModeRaw(SS, PAL_MODE_OUTPUT_PUSHPULL); spiInit(); spiStart(&SPID1, &spi1config); + release_bus(g); } static GFXINLINE void post_init_board(GDisplay *g) { @@ -82,20 +96,6 @@ static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { } } -static GFXINLINE void acquire_bus(GDisplay *g) { - (void) g; - // Only the LCD is using the SPI bus, so no need to acquire - // spiAcquireBus(&SPID1); - spiSelect(&SPID1); -} - -static GFXINLINE void release_bus(GDisplay *g) { - (void) g; - // Only the LCD is using the SPI bus, so no need to release - //spiReleaseBus(&SPID1); - spiUnselect(&SPID1); -} - static GFXINLINE void enter_data_mode(GDisplay *g) { palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); } -- cgit v1.2.3 From 995002fa912545128625ec2d8c53cff5de560b97 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 7 Apr 2017 10:55:29 +0300 Subject: LCD initialization sequence according to the docs The LCD initialization show now be much better and faster with no flickering at the startup. Also fix the contrast control. --- .../drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 40 ++++++---------------- .../infinity/drivers/gdisp/st7565ergodox/st7565.h | 2 ++ 2 files changed, 13 insertions(+), 29 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 2c8a168e76..0de457a7ae 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -26,7 +26,7 @@ #define GDISP_SCREEN_WIDTH 128 #endif #ifndef GDISP_INITIAL_CONTRAST -#define GDISP_INITIAL_CONTRAST 0 +#define GDISP_INITIAL_CONTRAST 35 #endif #ifndef GDISP_INITIAL_BACKLIGHT #define GDISP_INITIAL_BACKLIGHT 100 @@ -111,41 +111,25 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { gfxSleepMilliseconds(20); setpin_reset(g, FALSE); gfxSleepMilliseconds(20); - acquire_bus(g); enter_cmd_mode(g); - write_cmd(g, ST7565_DISPLAY_OFF); + + write_cmd(g, ST7565_RESET); write_cmd(g, ST7565_LCD_BIAS); write_cmd(g, ST7565_ADC); write_cmd(g, ST7565_COM_SCAN); - write_cmd(g, ST7565_START_LINE | 0); - - write_cmd(g, ST7565_RESISTOR_RATIO | 0x6); - - // turn on voltage converter (VC=1, VR=0, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x04); - flush_cmd(g); - delay_ms(50); - - // turn on voltage regulator (VC=1, VR=1, VF=0) - write_cmd(g, ST7565_POWER_CONTROL | 0x06); - flush_cmd(g); - delay_ms(50); + write_cmd(g, ST7565_RESISTOR_RATIO | 0x1); + write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST); - // turn on voltage follower (VC=1, VR=1, VF=1) + // turn on internal power supply (VC=1, VR=1, VF=1) write_cmd(g, ST7565_POWER_CONTROL | 0x07); - flush_cmd(g); - delay_ms(50); - write_cmd(g, 0xE2); - write_cmd(g, ST7565_COM_SCAN); - write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST*64/101); - //write_cmd2(g, ST7565_CONTRAST, 0); - write_cmd(g, ST7565_DISPLAY_ON); - write_cmd(g, ST7565_ALLON_NORMAL); write_cmd(g, ST7565_INVERT_DISPLAY); + write_cmd(g, ST7565_ALLON_NORMAL); + write_cmd(g, ST7565_DISPLAY_ON); + write_cmd(g, ST7565_START_LINE | 0); write_cmd(g, ST7565_RMW); flush_cmd(g); @@ -331,14 +315,12 @@ LLDSPEC void gdisp_lld_control(GDisplay *g) { return; case GDISP_CONTROL_CONTRAST: - if ((unsigned)g->p.ptr > 100) - g->p.ptr = (void *)100; + g->g.Contrast = (unsigned)g->p.ptr & 63; acquire_bus(g); enter_cmd_mode(g); - write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F); + write_cmd2(g, ST7565_CONTRAST, g->g.Contrast); flush_cmd(g); release_bus(g); - g->g.Contrast = (unsigned)g->p.ptr; return; } } diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h index 48636b33d6..24924ff050 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h @@ -34,4 +34,6 @@ #define ST7565_RESISTOR_RATIO 0x20 #define ST7565_POWER_CONTROL 0x28 +#define ST7565_RESET 0xE2 + #endif /* _ST7565_H */ -- cgit v1.2.3 From 3eb8785e8770c07e6a4280c50240d5d951461911 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 20:10:20 +0300 Subject: Add automatic flush for the LCD screen --- .../ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 1 + keyboards/ergodox/infinity/visualizer.c | 2 -- keyboards/ergodox/keymaps/default/visualizer.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 0de457a7ae..5b7b6d44c4 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -262,6 +262,7 @@ LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { srcbit++; } } + g->flags |= GDISP_FLG_NEEDFLUSH; } #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 2e10fdd709..6f9b0210a7 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -127,8 +127,6 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // if you have full screen image, then just use 128 and 32 for both source and target dimensions gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); - // Always remember to flush the display - gdispFlush(); return false; } diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index f6159e1ef1..1b0f12f250 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -101,8 +101,6 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { // if you have full screen image, then just use 128 and 32 for both source and target dimensions gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); - // Always remember to flush the display - gdispFlush(); return false; } -- cgit v1.2.3 From df67169d4260881443d88b142855d4aa2def6dc3 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 21:19:44 +0300 Subject: Move LCD logo to visualizer resources --- keyboards/ergodox/infinity/lcd_logo.png | Bin 490 -> 0 bytes keyboards/ergodox/infinity/visualizer.c | 44 ++----------------------- keyboards/ergodox/keymaps/default/visualizer.c | 44 ++----------------------- 3 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 keyboards/ergodox/infinity/lcd_logo.png (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/lcd_logo.png b/keyboards/ergodox/infinity/lcd_logo.png deleted file mode 100644 index 6cf26fc678..0000000000 Binary files a/keyboards/ergodox/infinity/lcd_logo.png and /dev/null differ diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 6f9b0210a7..90933b00a4 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -32,47 +32,7 @@ along with this program. If not, see . #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" -// To generate an image array like this -// Ensure the image is 128 x 32 or smaller -// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ -// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom -// Update array in the source code with the C array produced by the conversion program - -// The image below is generated from lcd_logo.png -static const uint8_t image_data_lcd_logo[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; +#include "resources/resources.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -125,7 +85,7 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { //gdispGBlitArea is a tricky function to use since it supports blitting part of the image // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); return false; } diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 1b0f12f250..f03702f602 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -33,47 +33,7 @@ along with this program. If not, see . #include "system/serial_link.h" #include "led.h" -// To generate an image array like this -// Ensure the image is 128 x 32 or smaller -// Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/ -// Ensure the the conversion process produces a monochrome format array - 1 bit/pixel, left to right, top to bottom -// Update array in the source code with the C array produced by the conversion program - -// The image below is generated from lcd_logo.png -static const uint8_t image_data_lcd_logo[512] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; +#include "resources/resources.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -99,7 +59,7 @@ bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { //gdispGBlitArea is a tricky function to use since it supports blitting part of the image // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)image_data_lcd_logo); + gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); return false; } -- cgit v1.2.3 From 3074269c4a07ff7f1ab2a76ebdb8904cd642e283 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 21:30:11 +0300 Subject: Move the logo drawing keyframe to lcd_keyframes --- keyboards/ergodox/infinity/visualizer.c | 22 ++-------------------- keyboards/ergodox/keymaps/default/visualizer.c | 22 ++-------------------- 2 files changed, 4 insertions(+), 40 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 90933b00a4..bac85c593c 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -72,24 +72,6 @@ static visualizer_user_data_t user_data_keyboard = { _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, "Please increase the VISUALIZER_USER_DATA_SIZE"); -bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)state; - (void)animation; - (void)state; - // Read the uGFX documentation for information how to use the displays - // http://wiki.ugfx.org/index.php/Main_Page - gdispClear(White); - - // You can use static variables for things that can't be found in the animation - // or state structs, here we use the image - - //gdispGBlitArea is a tricky function to use since it supports blitting part of the image - // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); - - return false; -} - // Feel free to modify the animations below, or even add new ones if needed // Don't worry, if the startup animation is long, you can use the keyboard like normal @@ -99,7 +81,7 @@ static keyframe_animation_t startup_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; @@ -162,7 +144,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { lcd_keyframe_enable, backlight_keyframe_enable, - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index f03702f602..afa6f1bdd7 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -46,24 +46,6 @@ typedef enum { static lcd_state_t lcd_state = LCD_STATE_INITIAL; -bool display_logo(keyframe_animation_t* animation, visualizer_state_t* state) { - (void)state; - (void)animation; - (void)state; - // Read the uGFX documentation for information how to use the displays - // http://wiki.ugfx.org/index.php/Main_Page - gdispClear(White); - - // You can use static variables for things that can't be found in the animation - // or state structs, here we use the image - - //gdispGBlitArea is a tricky function to use since it supports blitting part of the image - // if you have full screen image, then just use 128 and 32 for both source and target dimensions - gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, 128, (pixel_t*)resource_lcd_logo); - - return false; -} - // Feel free to modify the animations below, or even add new ones if needed // Don't worry, if the startup animation is long, you can use the keyboard like normal @@ -73,7 +55,7 @@ static keyframe_animation_t startup_animation = { .loop = false, .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; @@ -104,7 +86,7 @@ static keyframe_animation_t resume_animation = { .frame_functions = { lcd_keyframe_enable, backlight_keyframe_enable, - display_logo, + lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, }; -- cgit v1.2.3 From ed1710589f2f63e485c8780c7c8c03e0f65136a0 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 21:34:30 +0300 Subject: Fix suspend not disabling backlight --- keyboards/ergodox/infinity/visualizer.c | 2 +- keyboards/ergodox/keymaps/default/visualizer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index bac85c593c..8c3f3f29fc 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -133,7 +133,7 @@ static keyframe_animation_t suspend_animation = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, lcd_keyframe_disable, - lcd_keyframe_disable, + backlight_keyframe_disable, }, }; diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index afa6f1bdd7..6a7178968b 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -75,7 +75,7 @@ static keyframe_animation_t suspend_animation = { lcd_keyframe_display_layer_text, backlight_keyframe_animate_color, lcd_keyframe_disable, - lcd_keyframe_disable, + backlight_keyframe_disable, }, }; -- cgit v1.2.3 From c6ca996f4eaa4cce90e02c123230e1e655c9465a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 22:30:37 +0300 Subject: Combine startup and resume animations --- .../drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 3 +-- keyboards/ergodox/infinity/visualizer.c | 20 +++++--------------- 2 files changed, 6 insertions(+), 17 deletions(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c index 5b7b6d44c4..b04ad02935 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c @@ -127,7 +127,6 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { write_cmd(g, ST7565_INVERT_DISPLAY); write_cmd(g, ST7565_ALLON_NORMAL); - write_cmd(g, ST7565_DISPLAY_ON); write_cmd(g, ST7565_START_LINE | 0); write_cmd(g, ST7565_RMW); @@ -143,7 +142,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Orientation = GDISP_ROTATE_0; - g->g.Powermode = powerOn; + g->g.Powermode = powerOff; g->g.Backlight = GDISP_INITIAL_BACKLIGHT; g->g.Contrast = GDISP_INITIAL_CONTRAST; return TRUE; diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 8c3f3f29fc..7ae371c5fc 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -77,10 +77,12 @@ _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time static keyframe_animation_t startup_animation = { - .num_frames = 2, + .num_frames = 4, .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, .frame_functions = { + lcd_keyframe_enable, + backlight_keyframe_enable, lcd_keyframe_draw_logo, backlight_keyframe_animate_color, }, @@ -137,18 +139,6 @@ static keyframe_animation_t suspend_animation = { }, }; -static keyframe_animation_t resume_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_enable, - backlight_keyframe_enable, - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; - void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. @@ -312,7 +302,7 @@ void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&resume_animation); + start_keyframe_animation(&startup_animation); } void ergodox_board_led_on(void){ -- cgit v1.2.3 From 306353bf06e5e5a76890ffb0c48a4dcca76c4399 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 22:48:18 +0300 Subject: Create a file for shared Ergodox Infinity animations --- keyboards/ergodox/infinity/animations.c | 54 ++++++++++++++++++++++++++ keyboards/ergodox/infinity/animations.h | 25 ++++++++++++ keyboards/ergodox/infinity/rules.mk | 5 ++- keyboards/ergodox/infinity/visualizer.c | 38 ++---------------- keyboards/ergodox/keymaps/default/visualizer.c | 45 ++------------------- 5 files changed, 90 insertions(+), 77 deletions(-) create mode 100644 keyboards/ergodox/infinity/animations.c create mode 100644 keyboards/ergodox/infinity/animations.h (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/animations.c b/keyboards/ergodox/infinity/animations.c new file mode 100644 index 0000000000..54ab994607 --- /dev/null +++ b/keyboards/ergodox/infinity/animations.c @@ -0,0 +1,54 @@ +/* Copyright 2017 Fred Sundvik + * + * 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 . + */ + +#include "animations.h" +#include "visualizer.h" +#ifdef LCD_ENABLE +#include "lcd_keyframes.h" +#endif +#ifdef LCD_BACKLIGHT_ENABLE +#include "lcd_backlight_keyframes.h" +#endif + +#if defined(VISUALIZER_ENABLE) && defined(LCD_ENABLE) && defined(LCD_BACKLIGHT_ENABLE) + +// Don't worry, if the startup animation is long, you can use the keyboard like normal +// during that time +keyframe_animation_t default_startup_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(5000), 0}, + .frame_functions = { + lcd_keyframe_enable, + backlight_keyframe_enable, + lcd_keyframe_draw_logo, + backlight_keyframe_animate_color, + }, +}; + +keyframe_animation_t default_suspend_animation = { + .num_frames = 4, + .loop = false, + .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, + .frame_functions = { + lcd_keyframe_display_layer_text, + backlight_keyframe_animate_color, + lcd_keyframe_disable, + backlight_keyframe_disable, + }, +}; + +#endif diff --git a/keyboards/ergodox/infinity/animations.h b/keyboards/ergodox/infinity/animations.h new file mode 100644 index 0000000000..0c441ff7e9 --- /dev/null +++ b/keyboards/ergodox/infinity/animations.h @@ -0,0 +1,25 @@ +/* Copyright 2017 Fred Sundvik + * + * 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 . + */ + +#ifndef KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ +#define KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ + +#include "visualizer.h" + +extern keyframe_animation_t default_startup_animation; +extern keyframe_animation_t default_suspend_animation; + +#endif /* KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ */ diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index aaadfe34b5..9e6170d89a 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -1,6 +1,7 @@ # project specific files SRC = matrix.c \ - led.c + led.c \ + animations.c ## chip/board settings # - the next two should match the directories in @@ -72,4 +73,4 @@ endif ifdef LED_ENABLE include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk -endif +endif \ No newline at end of file diff --git a/keyboards/ergodox/infinity/visualizer.c b/keyboards/ergodox/infinity/visualizer.c index 7ae371c5fc..a4b09a34d0 100644 --- a/keyboards/ergodox/infinity/visualizer.c +++ b/keyboards/ergodox/infinity/visualizer.c @@ -31,8 +31,7 @@ along with this program. If not, see . #include "lcd_keyframes.h" #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" - -#include "resources/resources.h" +#include "animations.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -74,19 +73,6 @@ _Static_assert(sizeof(visualizer_user_data_t) <= VISUALIZER_USER_DATA_SIZE, // Feel free to modify the animations below, or even add new ones if needed -// Don't worry, if the startup animation is long, you can use the keyboard like normal -// during that time -static keyframe_animation_t startup_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_enable, - backlight_keyframe_enable, - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; // The color animation animates the LCD color when you change layers static keyframe_animation_t one_led_color = { @@ -127,18 +113,6 @@ static keyframe_animation_t lcd_bitmap_leds_animation = { .frame_functions = {lcd_keyframe_display_layer_bitmap, lcd_keyframe_display_led_states}, }; -static keyframe_animation_t suspend_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, - .frame_functions = { - lcd_keyframe_display_layer_text, - backlight_keyframe_animate_color, - lcd_keyframe_disable, - backlight_keyframe_disable, - }, -}; - void initialize_user_visualizer(visualizer_state_t* state) { // The brightness will be dynamically adjustable in the future // But for now, change it here. @@ -146,13 +120,9 @@ void initialize_user_visualizer(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&startup_animation); + start_keyframe_animation(&default_startup_animation); } -static const uint32_t red; -static const uint32_t green; -static const uint32_t blue; - inline bool is_led_on(visualizer_user_data_t* user_data, uint8_t num) { return user_data->led_on & (1u << num); } @@ -295,14 +265,14 @@ void user_visualizer_suspend(visualizer_state_t* state) { uint8_t hue = LCD_HUE(state->current_lcd_color); uint8_t sat = LCD_SAT(state->current_lcd_color); state->target_lcd_color = LCD_COLOR(hue, sat, 0); - start_keyframe_animation(&suspend_animation); + start_keyframe_animation(&default_suspend_animation); } void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&startup_animation); + start_keyframe_animation(&default_startup_animation); } void ergodox_board_led_on(void){ diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 6a7178968b..779de00506 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -32,8 +32,7 @@ along with this program. If not, see . #include "lcd_backlight_keyframes.h" #include "system/serial_link.h" #include "led.h" - -#include "resources/resources.h" +#include "animations.h" static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); static const uint32_t initial_color = LCD_COLOR(0, 0, 0); @@ -48,18 +47,6 @@ static lcd_state_t lcd_state = LCD_STATE_INITIAL; // Feel free to modify the animations below, or even add new ones if needed -// Don't worry, if the startup animation is long, you can use the keyboard like normal -// during that time -static keyframe_animation_t startup_animation = { - .num_frames = 2, - .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; - static keyframe_animation_t lcd_layer_display = { .num_frames = 1, .loop = false, @@ -67,30 +54,6 @@ static keyframe_animation_t lcd_layer_display = { .frame_functions = {lcd_keyframe_display_layer_and_led_states} }; -static keyframe_animation_t suspend_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0, 0}, - .frame_functions = { - lcd_keyframe_display_layer_text, - backlight_keyframe_animate_color, - lcd_keyframe_disable, - backlight_keyframe_disable, - }, -}; - -static keyframe_animation_t resume_animation = { - .num_frames = 4, - .loop = false, - .frame_lengths = {0, 0, 0, gfxMillisecondsToTicks(10000), 0}, - .frame_functions = { - lcd_keyframe_enable, - backlight_keyframe_enable, - lcd_keyframe_draw_logo, - backlight_keyframe_animate_color, - }, -}; - // The color animation animates the LCD color when you change layers static keyframe_animation_t color_animation = { .num_frames = 2, @@ -109,7 +72,7 @@ void initialize_user_visualizer(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&startup_animation); + start_keyframe_animation(&default_startup_animation); } void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { @@ -156,12 +119,12 @@ void user_visualizer_suspend(visualizer_state_t* state) { uint8_t hue = LCD_HUE(state->current_lcd_color); uint8_t sat = LCD_SAT(state->current_lcd_color); state->target_lcd_color = LCD_COLOR(hue, sat, 0); - start_keyframe_animation(&suspend_animation); + start_keyframe_animation(&default_suspend_animation); } void user_visualizer_resume(visualizer_state_t* state) { state->current_lcd_color = initial_color; state->target_lcd_color = logo_background_color; lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&resume_animation); + start_keyframe_animation(&default_startup_animation); } -- cgit v1.2.3 From c5d2b7ff16f81a8061127e0ec636cf9b914725c5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 8 Apr 2017 23:04:27 +0300 Subject: Rename led test to led_keyframes and move animation to Ergodox --- keyboards/ergodox/infinity/animations.c | 55 ++++++++++++++++++++++++++++++++- keyboards/ergodox/infinity/animations.h | 5 +++ 2 files changed, 59 insertions(+), 1 deletion(-) (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/animations.c b/keyboards/ergodox/infinity/animations.c index 54ab994607..4c9f6d9c85 100644 --- a/keyboards/ergodox/infinity/animations.c +++ b/keyboards/ergodox/infinity/animations.c @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#if defined(VISUALIZER_ENABLE) + #include "animations.h" #include "visualizer.h" #ifdef LCD_ENABLE @@ -23,7 +25,14 @@ #include "lcd_backlight_keyframes.h" #endif -#if defined(VISUALIZER_ENABLE) && defined(LCD_ENABLE) && defined(LCD_BACKLIGHT_ENABLE) +#ifdef LED_ENABLE +#include "led_keyframes.h" +#endif + +#include "visualizer_keyframes.h" + + +#if defined(LCD_ENABLE) && defined(LCD_BACKLIGHT_ENABLE) // Don't worry, if the startup animation is long, you can use the keyboard like normal // during that time @@ -50,5 +59,49 @@ keyframe_animation_t default_suspend_animation = { backlight_keyframe_disable, }, }; +#endif + +#if defined(LED_ENABLE) +#define CROSSFADE_TIME 1000 +#define GRADIENT_TIME 3000 + +keyframe_animation_t led_test_animation = { + .num_frames = 14, + .loop = true, + .frame_lengths = { + gfxMillisecondsToTicks(1000), // fade in + gfxMillisecondsToTicks(1000), // no op (leds on) + gfxMillisecondsToTicks(1000), // fade out + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // left to rigt (outside in) + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // top_to_bottom + 0, // mirror leds + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // left_to_right (mirrored, so inside out) + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + gfxMillisecondsToTicks(GRADIENT_TIME), // top_to_bottom + 0, // normal leds + gfxMillisecondsToTicks(CROSSFADE_TIME), // crossfade + + }, + .frame_functions = { + led_keyframe_fade_in_all, + keyframe_no_operation, + led_keyframe_fade_out_all, + led_keyframe_crossfade, + led_keyframe_left_to_right_gradient, + led_keyframe_crossfade, + led_keyframe_top_to_bottom_gradient, + led_keyframe_mirror_orientation, + led_keyframe_crossfade, + led_keyframe_left_to_right_gradient, + led_keyframe_crossfade, + led_keyframe_top_to_bottom_gradient, + led_keyframe_normal_orientation, + led_keyframe_crossfade, + }, +}; +#endif #endif diff --git a/keyboards/ergodox/infinity/animations.h b/keyboards/ergodox/infinity/animations.h index 0c441ff7e9..6d8b9830d9 100644 --- a/keyboards/ergodox/infinity/animations.h +++ b/keyboards/ergodox/infinity/animations.h @@ -19,7 +19,12 @@ #include "visualizer.h" +// You can use these default animations, but of course you can also write your own custom ones instead extern keyframe_animation_t default_startup_animation; extern keyframe_animation_t default_suspend_animation; +// An animation for testing and demonstrating the led support, should probably not be used for real world +// cases +extern keyframe_animation_t led_test_animation; + #endif /* KEYBOARDS_ERGODOX_INFINITY_ANIMATIONS_H_ */ -- cgit v1.2.3 From 65b7bf68785b5b1d4257ba4fd95c3f53df230985 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 9 Apr 2017 18:32:10 +0300 Subject: Extract Ergodox default visualizer into simple_visualizer It's good enough if you only want to change the lcd text and color. --- keyboards/ergodox/infinity/simple_visualizer.h | 123 +++++++++++++++++++++++++ keyboards/ergodox/keymaps/default/visualizer.c | 104 ++------------------- 2 files changed, 131 insertions(+), 96 deletions(-) create mode 100644 keyboards/ergodox/infinity/simple_visualizer.h (limited to 'keyboards/ergodox') diff --git a/keyboards/ergodox/infinity/simple_visualizer.h b/keyboards/ergodox/infinity/simple_visualizer.h new file mode 100644 index 0000000000..ded8a3222e --- /dev/null +++ b/keyboards/ergodox/infinity/simple_visualizer.h @@ -0,0 +1,123 @@ +/* Copyright 2017 Fred Sundvik + * + * 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 . + */ + +#ifndef KEYBOARDS_ERGODOX_INFINITY_SIMPLE_VISUALIZER_H_ +#define KEYBOARDS_ERGODOX_INFINITY_SIMPLE_VISUALIZER_H_ + +// Currently we are assuming that both the backlight and LCD are enabled +// But it's entirely possible to write a custom visualizer that use only +// one of them +#ifndef LCD_BACKLIGHT_ENABLE +#error This visualizer needs that LCD backlight is enabled +#endif + +#ifndef LCD_ENABLE +#error This visualizer needs that LCD is enabled +#endif + +#include "visualizer.h" +#include "visualizer_keyframes.h" +#include "lcd_keyframes.h" +#include "lcd_backlight_keyframes.h" +#include "system/serial_link.h" +#include "led.h" +#include "animations.h" + +static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); +static const uint32_t initial_color = LCD_COLOR(0, 0, 0); + +static bool initial_update = true; + +// Feel free to modify the animations below, or even add new ones if needed + +static keyframe_animation_t lcd_layer_display = { + .num_frames = 1, + .loop = false, + .frame_lengths = {gfxMillisecondsToTicks(0)}, + .frame_functions = {lcd_keyframe_display_layer_and_led_states} +}; + +// The color animation animates the LCD color when you change layers +static keyframe_animation_t color_animation = { + .num_frames = 2, + .loop = false, + // Note that there's a 200 ms no-operation frame, + // this prevents the color from changing when activating the layer + // momentarily + .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, + .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color}, +}; + +void initialize_user_visualizer(visualizer_state_t* state) { + // The brightness will be dynamically adjustable in the future + // But for now, change it here. + lcd_backlight_brightness(130); + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + initial_update = true; + start_keyframe_animation(&default_startup_animation); +} + + +// This function should be implemented by the keymap visualizer +// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing +// that the simple_visualizer assumes that you are updating +// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is +// stopped. This can be done by either double buffering it or by using constant strings +static void get_visualizer_layer_and_color(visualizer_state_t* state); + +void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { + // Add more tests, change the colors and layer texts here + // Usually you want to check the high bits (higher layers first) + // because that's the order layers are processed for keypresses + // You can for check for example: + // state->status.layer + // state->status.default_layer + // state->status.leds (see led.h for available statuses) + + uint32_t prev_color = state->target_lcd_color; + const char* prev_layer_text = state->layer_text; + + get_visualizer_layer_and_color(state); + + if (initial_update || prev_color != state->target_lcd_color) { + start_keyframe_animation(&color_animation); + } + + if (initial_update || prev_layer_text != state->layer_text) { + start_keyframe_animation(&lcd_layer_display); + } + // You can also stop existing animations, and start your custom ones here + // remember that you should normally have only one animation for the LCD + // and one for the background. But you can also combine them if you want. +} + +void user_visualizer_suspend(visualizer_state_t* state) { + state->layer_text = "Suspending..."; + uint8_t hue = LCD_HUE(state->current_lcd_color); + uint8_t sat = LCD_SAT(state->current_lcd_color); + state->target_lcd_color = LCD_COLOR(hue, sat, 0); + start_keyframe_animation(&default_suspend_animation); +} + +void user_visualizer_resume(visualizer_state_t* state) { + state->current_lcd_color = initial_color; + state->target_lcd_color = logo_background_color; + initial_update = true; + start_keyframe_animation(&default_startup_animation); +} + +#endif /* KEYBOARDS_ERGODOX_INFINITY_SIMPLE_VISUALIZER_H_ */ diff --git a/keyboards/ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/keymaps/default/visualizer.c index 779de00506..502e53f3d1 100644 --- a/keyboards/ergodox/keymaps/default/visualizer.c +++ b/keyboards/ergodox/keymaps/default/visualizer.c @@ -15,75 +15,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -// Currently we are assuming that both the backlight and LCD are enabled -// But it's entirely possible to write a custom visualizer that use only -// one of them -#ifndef LCD_BACKLIGHT_ENABLE -#error This visualizer needs that LCD backlight is enabled -#endif - -#ifndef LCD_ENABLE -#error This visualizer needs that LCD is enabled -#endif - -#include "visualizer.h" -#include "visualizer_keyframes.h" -#include "lcd_keyframes.h" -#include "lcd_backlight_keyframes.h" -#include "system/serial_link.h" -#include "led.h" -#include "animations.h" - -static const uint32_t logo_background_color = LCD_COLOR(0x00, 0x00, 0xFF); -static const uint32_t initial_color = LCD_COLOR(0, 0, 0); - -typedef enum { - LCD_STATE_INITIAL, - LCD_STATE_LAYER_BITMAP, - LCD_STATE_BITMAP_AND_LEDS, -} lcd_state_t; - -static lcd_state_t lcd_state = LCD_STATE_INITIAL; - -// Feel free to modify the animations below, or even add new ones if needed - -static keyframe_animation_t lcd_layer_display = { - .num_frames = 1, - .loop = false, - .frame_lengths = {gfxMillisecondsToTicks(0)}, - .frame_functions = {lcd_keyframe_display_layer_and_led_states} -}; - -// The color animation animates the LCD color when you change layers -static keyframe_animation_t color_animation = { - .num_frames = 2, - .loop = false, - // Note that there's a 200 ms no-operation frame, - // this prevents the color from changing when activating the layer - // momentarily - .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)}, - .frame_functions = {keyframe_no_operation, backlight_keyframe_animate_color}, -}; - -void initialize_user_visualizer(visualizer_state_t* state) { - // The brightness will be dynamically adjustable in the future - // But for now, change it here. - lcd_backlight_brightness(130); - state->current_lcd_color = initial_color; - state->target_lcd_color = logo_background_color; - lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&default_startup_animation); -} - -void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard_status_t* prev_status) { - // Add more tests, change the colors and layer texts here - // Usually you want to check the high bits (higher layers first) - // because that's the order layers are processed for keypresses - // You can for check for example: - // state->status.layer - // state->status.default_layer - // state->status.leds (see led.h for available statuses) - +#include "simple_visualizer.h" + +// This function should be implemented by the keymap visualizer +// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing +// that the simple_visualizer assumes that you are updating +// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is +// stopped. This can be done by either double buffering it or by using constant strings +static void get_visualizer_layer_and_color(visualizer_state_t* state) { uint8_t saturation = 60; if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { saturation = 255; @@ -100,31 +39,4 @@ void update_user_visualizer_state(visualizer_state_t* state, visualizer_keyboard state->target_lcd_color = LCD_COLOR(84, saturation, 0xFF); state->layer_text = "Default"; } - - if (lcd_state == LCD_STATE_INITIAL || - state->status.layer != prev_status->layer || - state->status.default_layer != prev_status->default_layer || - state->status.leds != prev_status->leds) { - start_keyframe_animation(&color_animation); - start_keyframe_animation(&lcd_layer_display); - } - - // You can also stop existing animations, and start your custom ones here - // remember that you should normally have only one animation for the LCD - // and one for the background. But you can also combine them if you want. -} - -void user_visualizer_suspend(visualizer_state_t* state) { - state->layer_text = "Suspending..."; - uint8_t hue = LCD_HUE(state->current_lcd_color); - uint8_t sat = LCD_SAT(state->current_lcd_color); - state->target_lcd_color = LCD_COLOR(hue, sat, 0); - start_keyframe_animation(&default_suspend_animation); -} - -void user_visualizer_resume(visualizer_state_t* state) { - state->current_lcd_color = initial_color; - state->target_lcd_color = logo_background_color; - lcd_state = LCD_STATE_INITIAL; - start_keyframe_animation(&default_startup_animation); } -- cgit v1.2.3