diff options
Diffstat (limited to 'keyboard')
381 files changed, 27804 insertions, 23634 deletions
diff --git a/keyboard/IIgs/Makefile b/keyboard/IIgs/Makefile deleted file mode 100644 index 3bf380e64b..0000000000 --- a/keyboard/IIgs/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = IIgs_Standard - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = at90usb162 # Teensy 1.0 -#MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Build Options -# comment out to disable the options. -# -MOUSEKEY_ENABLE = no # Mouse keys -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -EXTRAKEY_ENABLE = yes # Audio control and System control -#NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex - - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/IIgs/README b/keyboard/IIgs/README deleted file mode 100644 index 820d771102..0000000000 --- a/keyboard/IIgs/README +++ /dev/null @@ -1,45 +0,0 @@ -Replaceable USB Controller for Apple IIgs/Standard(M0116)
-JeffreySung(nattyman@gmail.com)
-
-===============================
-
-Feature
--------
-- Replaceable keyboard controller for Apple IIgs(A9M0330)/Standard(M0116)
-- Teensy++ 2.0 required
-- Some signal bypass required
-- ADB keyboard doesn't use matrix for modifier keys. With virtual row for modifier keys,
- these keys are merged into key matrix using virtual row.
-
-History
-=======
-- 2012.09.17 First Release
-- 2012.09.17 CapsLock support
-- 2012.09.19 Power button added
-Build
-=====
-0. Just Type "Make" and return.
-
-Hardware
-========
-PJRC Teensy
------------
-0. The following ports should not be connected to board.
- From top view of Teensy++, from GND and counter clock wise.
- -7,26(in keyboard PCB, these pins are VDD,GND)
- -30,31(in Teensy++, these pins are Ref,GND respectively)
- -5,6(D2,D3 for bluetooth in future)
-1. Bypass #31 pin(from board) to E4(Teensy)
-2. Bypass #30 pin(from board) to F2(Teensy)
-3. Bypass #6 pin(from board) to A0(Teensy)
-4. Refer to documentation directory
-
-To Do
-=====
-0. When DEBOUNCE defined, there is a errors.
-1. Layer Change by toggling Clear Key
-2. Eject Key add. (following files should be modified.)
- common/keycode.h
- common/keyboard.c
-3. Use bluetooth
-EOF
diff --git a/keyboard/IIgs/config.h b/keyboard/IIgs/config.h deleted file mode 100644 index bc8bf75f94..0000000000 --- a/keyboard/IIgs/config.h +++ /dev/null @@ -1,63 +0,0 @@ -/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-
-/* USB Device descriptor parameter */
-/* for Apple
-#define VENDOR_ID 0x05AC
-#define PRODUCT_ID 0xBEE0
-*/
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xBEE0
-#define DEVICE_VER 0x0202
-#define MANUFACTURER t.m.k.
-#define PRODUCT Apple Desktop Bus Keyboard
-
-
-/* message strings */
-#define DESCRIPTION Apple M0116/A9M0660 keyboard firmware
-
-
-/* matrix size */
-#define MATRIX_ROWS 11 // last row is virtual for modifier
-#define MATRIX_COLS 8
-/* define if matrix has ghost */
-#define MATRIX_HAS_GHOST
-/* Set 0 if need no debouncing */
-#define DEBOUNCE 5
-
-
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-
-/* layer switching */
-#define LAYER_SWITCH_DELAY 100
-#define LAYER_SEND_FN_TERM 300
-
-
-/* legacy keymap support */
-#define USE_LEGACY_KEYMAP
-
-
-#endif
diff --git a/keyboard/IIgs/doc/PIN_BYPASS.jpg b/keyboard/IIgs/doc/PIN_BYPASS.jpg Binary files differdeleted file mode 100644 index 2998f0c3f8..0000000000 --- a/keyboard/IIgs/doc/PIN_BYPASS.jpg +++ /dev/null diff --git a/keyboard/IIgs/doc/Teensy++_Mod.jpg b/keyboard/IIgs/doc/Teensy++_Mod.jpg Binary files differdeleted file mode 100644 index 146c1ab93c..0000000000 --- a/keyboard/IIgs/doc/Teensy++_Mod.jpg +++ /dev/null diff --git a/keyboard/IIgs/hid_listen.mac b/keyboard/IIgs/hid_listen.mac Binary files differdeleted file mode 100755 index 8758fdf886..0000000000 --- a/keyboard/IIgs/hid_listen.mac +++ /dev/null diff --git a/keyboard/IIgs/keymap.c b/keyboard/IIgs/keymap.c deleted file mode 100644 index cd33e223ac..0000000000 --- a/keyboard/IIgs/keymap.c +++ /dev/null @@ -1,142 +0,0 @@ -/*
-Copyright 2012 Jeffrey Sung <nattyman@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * Keymap for Apple IIgs/Standard Keyboard
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/pgmspace.h>
-#include "keycode.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "keymap.h"
-
-
-// Convert physical keyboard layout to matrix array.
-// This is a macro to define keymap easily in keyboard layout form.
-#define KEYMAP( R10C5, \
- R3C7, R3C6, R3C5, R3C4, R3C3, R3C2, R3C1, R8C1, R8C0, R3C0, R0C0, R0C1, R0C2, R0C3, R4C4, R4C5, R4C6, R4C7, \
- R9C7, R9C6, R9C5, R9C4, R9C3, R9C2, R9C1, R9C0, R1C0, R1C1, R1C2, R1C3, R1C4, R2C4, R2C5, R2C6, R2C3, \
- R10C0,R7C7, R7C6, R7C5, R7C4, R7C3, R7C2, R7C1, R7C0, R0C4, R1C6, R1C7, R1C5, R2C0, R2C1, R2C2, R2C7, \
- R10C1,R6C7, R6C6, R6C5, R6C4, R6C3, R6C2, R6C1, R6C0, R0C5, R0C6, R4C0, R4C1, R4C2, \
- R10C4,R10C2,R10C3,R5C4, R5C7, R5C5, R5C6, R5C0, R5C2, R0C7, R5C1, R5C3, R4C3 \
-) { \
- { R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R0C6, R0C7 }, \
- { R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R1C6, R1C7 }, \
- { R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R2C6, R2C7 }, \
- { R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R3C6, R3C7 }, \
- { R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6, R4C7 }, \
- { R5C0, R5C1, R5C2, R5C3, R5C4, R5C5, R5C6, R5C7 }, \
- { R6C0, R6C1, R6C2, R6C3, R6C4, R6C5, R6C6, R6C7 }, \
- { R7C0, R7C1, R7C2, R7C3, R7C4, R7C5, R7C6, R7C7 }, \
- { R8C0, R8C1, KC_NO, KC_NO, KC_NO,KC_NO, KC_NO, KC_NO }, \
- { R9C0, R9C1, R9C2, R9C3, R9C4, R9C5, R9C6, R9C7 }, \
- { R10C0,R10C1, R10C2, R10C3, R10C4,R10C5, KC_NO, KC_NO} \
-}
-
-#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
-
-
-// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
-static const uint8_t PROGMEM fn_layer[] = {
- 0, // Fn0
- 1, // Fn1
- 2, // Fn2
- 3, // Fn3
- 4, // Fn4
- 0, // Fn5
- 3, // Fn6
- 3 // Fn7
-};
-
-// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
-// See layer.c for details.
-static const uint8_t PROGMEM fn_keycode[] = {
- KC_NO, // Fn0
- KC_NO, // Fn1
- KC_SLSH, // Fn2
- KC_SCLN, // Fn3
- KC_SPC, // Fn4
- KC_NO, // Fn5
- KC_NO, // Fn6
- KC_NO // Fn7
-};
-
-static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Layer 0: Default Layer
- * ,-----------------------------------------------------------. ,---------------,
- * | POWER | | |
- * |-----------------------------------------------------------| |---------------|
- * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |FN0| = | / | * |
- * |-----------------------------------------------------------| |---------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7 | 8 | 9 | + |
- * |-----------------------------------------------------' | |---------------|
- * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Return | | 4 | 5 | 6 | - |
- * |-----------------------------------------------------------| |---------------|
- * |Shift | Z| X| C| V| B| N| M| ,| .| / |Shift | | 1 | 2 | 3 | E |
- * |-----------------------------------------------------------| |-----------| N |
- * |CAPS|Alt |Gui |` |SPC |BSLS |LFT|RGT|DN|UP| | 0 | . | T |
- * `-----------------------------------------------------------' |---------------'
- */
- KEYMAP( KC_PWR,
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_FN1, KC_PEQL, KC_PSLS, KC_PAST, \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PPLS, \
- KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,KC_ENT, KC_P4, KC_P5, KC_P6, KC_PMNS, \
- KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_P1, KC_P2, KC_P3, \
- KC_CAPS,KC_LALT,KC_LGUI,KC_GRV, KC_SPC, KC_BSLS,KC_LEFT,KC_RGHT,KC_DOWN,KC_UP, KC_P0, KC_PDOT, KC_PENT),
-
-
- /* Layer 1: Tenkey use Layer
- * ,-----------------------------------------------------------. ,---------------,
- * | POWER | | |
- * |-----------------------------------------------------------| |---------------|
- * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |NLK| = | / | * |
- * |-----------------------------------------------------------| |---------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | |INS| 8 |PGU|V+ |
- * |-----------------------------------------------------' | |---------------|
- * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Return | |DEL|UP |PGD|V- |
- * |-----------------------------------------------------------| |---------------|
- * |Shift | Z| X| C| V| B| N| M| ,| .| / |Shift | |LFT|DN |RGT| E |
- * |-----------------------------------------------------------| |-----------| N |
- * |CAPS|Alt |Gui |` |SPC |BSLS |LFT|RGT|DN|UP| | 0 | . | T |
- * `-----------------------------------------------------------' `---------------'
- */
- KEYMAP( KC_PWR, \
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSPC, KC_FN1, KC_PEQL, KC_PSLS, KC_MUTE, \
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC, KC_INS, KC_P8, KC_PGUP, KC_VOLU, \
- KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,KC_ENT, KC_DEL, KC_UP, KC_PGDN, KC_VOLD, \
- KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_LEFT, KC_DOWN, KC_RIGHT, \
- KC_CAPS,KC_LALT,KC_LGUI,KC_GRV, KC_SPC, KC_BSLS,KC_LEFT,KC_RGHT,KC_DOWN,KC_UP, KC_P0, KC_PDOT, KC_PENT),
-};
-
-
-uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
-{
- return KEYCODE(layer, row, col);
-}
-
-uint8_t keymap_fn_layer(uint8_t index)
-{
- return pgm_read_byte(&fn_layer[index]);
-}
-
-uint8_t keymap_fn_keycode(uint8_t index)
-{
- return pgm_read_byte(&fn_keycode[index]);
-}
diff --git a/keyboard/IIgs/led.c b/keyboard/IIgs/led.c deleted file mode 100644 index f76545f0ba..0000000000 --- a/keyboard/IIgs/led.c +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ -} diff --git a/keyboard/IIgs/matrix.c b/keyboard/IIgs/matrix.c deleted file mode 100644 index 6ca55b7ea2..0000000000 --- a/keyboard/IIgs/matrix.c +++ /dev/null @@ -1,363 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * scan matrix - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" -#include "led.h" - - -#if (MATRIX_COLS > 16) -# error "MATRIX_COLS must not exceed 16" -#endif -#if (MATRIX_ROWS > 255) -# error "MATRIX_ROWS must not exceed 255" -#endif - - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -// matrix state buffer(1:on, 0:off) -#if (MATRIX_COLS <= 8) -static uint8_t *matrix; -static uint8_t *matrix_prev; -static uint8_t _matrix0[MATRIX_ROWS]; -static uint8_t _matrix1[MATRIX_ROWS]; -#else -static uint16_t *matrix; -static uint16_t *matrix_prev; -static uint16_t _matrix0[MATRIX_ROWS]; -static uint16_t _matrix1[MATRIX_ROWS]; -#endif - -#ifdef MATRIX_HAS_GHOST -static bool matrix_has_ghost_in_row(uint8_t row); -#endif -static uint8_t read_col(uint8_t row); -static void unselect_rows(void); -static void select_row(uint8_t row); - - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // initialize row and col - unselect_rows(); - // Input with pull-up(DDR:0, PORT:1) - // Column C1 ~ C7 (PortC0-6) - // Column C0(Port E1) - DDRC &= ~0b01111111; - PORTC |= 0b01111111; - DDRE &= ~0b00000010; - PORTE |= 0b00000010; - //DDRB &= ~0b00000100; - //PORTB |= 0b00000100; - // modifier B3/4,F4/5,E4 always input - // A0 - //DDRA |= 0b00000001; - //PORTA &= 0b00000001; - //DDRB |= 0b00011000; - //PORTB &= 0b00011000; - //DDRF |= ~0b00110000; - //PORTF &= 0b00110000; - //DDRB &= ~0b00011000; - //PORTB |= 0b00011000; - //DDRF &= ~0b00110000; - //PORTF |= 0b00110000; - //DDRE &= ~0b00010000; - //PORTE |= 0b00010000; - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; - matrix = _matrix0; - matrix_prev = _matrix1; -} - -uint8_t matrix_scan(void) -{ - if (!debouncing) { - uint8_t *tmp = matrix_prev; - matrix_prev = matrix; - matrix = tmp; - } - - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - unselect_rows(); - select_row(i); - _delay_us(30); // without this wait read unstable value. - if ( i == ( MATRIX_ROWS - 1 ) ) { // CHECK CAPS LOCK - if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { // CAPS LOCK is ON on HOST - if ( ~read_col(i) & (1<< 4) ) { // CAPS LOCK is still DOWN ( 0bXXX1_XXXX) - matrix[i] = ~read_col(i) & 0b11101111; // change CAPS LOCK as released - } else { // CAPS LOCK in UP - matrix[i] = ~read_col(i) | 0b00010000; // send fake caps lock down - } - } else { // CAPS LOCK is OFF on HOST - if (matrix[i] != (uint8_t)~read_col(i)) { - matrix[i] = (uint8_t)~read_col(i); - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); print("\n"); - } - debouncing = DEBOUNCE; - } - } - } else { - if (matrix[i] != (uint8_t)~read_col(i)) { - matrix[i] = (uint8_t)~read_col(i); - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); print("\n"); - } - debouncing = DEBOUNCE; - } - } - } - unselect_rows(); - - if (debouncing) { - debouncing--; - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - if (matrix[i] != matrix_prev[i]) { - return true; - } - } - return false; -} - -inline -bool matrix_has_ghost(void) -{ -#ifdef MATRIX_HAS_GHOST - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - if (matrix_has_ghost_in_row(i)) - return true; - } -#endif - return false; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ -// if ( row == ( MATRIX_ROWS - 1 ) && col == 4) { // CHECK CAPS LOCK -// if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { // CAPS LOCK is ON on HOST -// if ((matrix_prev[row] & 0b00010000) && (~matrix[row] & 0b00010000)) { -// debug("CapsLock Reverse:");debug_hex(matrix[row]); -// matrix[row] |= 0b00010000; -// matrix_prev[row] &= ~0b00010000; -// debug("->");debug_hex(matrix[row]);debug("\n"); -// } -// } -// } - return (matrix[row] & (1<<col)); -} - -inline -#if (MATRIX_COLS <= 8) -uint8_t matrix_get_row(uint8_t row) -#else -uint16_t matrix_get_row(uint8_t row) -#endif -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 01234567\n"); - for (uint8_t row = 0; row < matrix_rows(); row++) { - phex(row); print(": "); -#if (MATRIX_COLS <= 8) - pbin_reverse(matrix_get_row(row)); -#else - pbin_reverse16(matrix_get_row(row)); -#endif -#ifdef MATRIX_HAS_GHOST - if (matrix_has_ghost_in_row(row)) { - print(" <ghost"); - } -#endif - print("\n"); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { -#if (MATRIX_COLS <= 8) - count += bitpop(matrix[i]); -#else - count += bitpop16(matrix[i]); -#endif - } - return count; -} - -#ifdef MATRIX_HAS_GHOST -inline -static bool matrix_has_ghost_in_row(uint8_t row) -{ - // no ghost exists in case less than 2 keys on - if (((matrix[row] - 1) & matrix[row]) == 0) - return false; - - // ghost exists in case same state as other row - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - if (i != row && (matrix[i] & matrix[row]) == matrix[row]) - return true; - } - return false; -} -#endif - -inline -static uint8_t read_col(uint8_t row) -{ - // For normal : Column C1 ~ C7 (PortC0-6), C0(Port E1) - // For modifier : B3(CNTRL)/4(SHIFT),F4(CMD/GUI)/5(OPTION,ALT) - // Modifier would be copied to report->mods except E4(CAPSLOCK) - uint8_t tmp; - if ( row == 10 ) { - tmp = 0xC0; - tmp |= (PINB >> 3 ) & 0b00000011; // LEFT CTRL is 0bit in modifier (HID Spec) - // LEFT SHIFT is 1bit in modifier (HID Spec) - tmp |= (PINF >> 3 ) & 0b00000100; // LEFT ALT is 2bit in modifier (HID Spec) - tmp |= (PINF >> 1 ) & 0b00001000; // LEFT GUI is 3bit in modifier (HID Spec) - tmp |= (PINA << 4 ) & 0b00010000; // CAPSLOCK - tmp |= (PINB << 3 ) & 0b00100000; // POWER - } else { - tmp = 0x00; - tmp = (PINE >> 1)&0b00000001; - tmp |= PINC << 1 ; - } - return tmp; -} - -inline -static void unselect_rows(void) -{ - // Hi-Z(DDR:0, PORT:0) to unselect - // DDR : 1, output 0, input - DDRB &= ~0b00000011; // PB: 1,0 - PORTB &= ~0b00000011; - DDRD &= ~0b00010000; // PD: 4 - PORTD &= ~0b00010000; - DDRE &= ~0b11000000; // PE: 7,6 - PORTE &= ~0b11000000; - DDRF &= ~0b11000111; // PF: 7,6,2,1,0 - PORTF &= ~0b11000111; - // to unselect virtual row(modifier), set port to output with low - DDRA |= 0b00000001; // PA: 0 for CAPSLOCK - PORTA &= ~0b00000001; - DDRB |= 0b00011100; // PB: 3,4 for modifier(row10) - PORTB &= ~0b00011100; // PB: 2 for power - DDRF |= 0b00110000; // PF: 4,5 for modifier - PORTF &= ~0b00110000; -} - -inline -static void select_row(uint8_t row) -{ - // Output low(DDR:1, PORT:0) to select - // with row enable, column could send low to AVR when pressed - // row: 0 1 2 3 4 5 6 7 8 9 - // pin: PB1, PB0, PE7, PE6, PD4, PF2, PF0, PF1, PF6 PF7 - switch (row) { - case 0: - DDRB |= (1<<1); - PORTB &= ~(1<<1); - break; - case 1: - DDRB |= (1<<0); - PORTB &= ~(1<<0); - break; - case 2: - DDRE |= (1<<7); - PORTE &= ~(1<<7); - break; - case 3: - DDRE |= (1<<6); - PORTE &= ~(1<<6); - break; - case 4: - DDRD |= (1<<4); - PORTD &= ~(1<<4); - break; - case 5: - DDRF |= (1<<2); - PORTF &= ~(1<<2); - break; - case 6: - DDRF |= (1<<0); - PORTF &= ~(1<<0); - break; - case 7: - DDRF |= (1<<1); - PORTF &= ~(1<<1); - break; - case 8: - DDRF |= (1<<6); - PORTF &= ~(1<<6); - break; - case 9: - DDRF |= (1<<7); - PORTF &= ~(1<<7); - break; - case 10: - // modifier has no row enable - // to select virtual row, set port as input - DDRA &= ~0b00000001; - PORTA |= 0b00000001; - DDRB &= ~0b00011100; - PORTB |= 0b00011100; - DDRF &= ~0b00110000; - PORTF |= 0b00110000; - break; - - } -} diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile index 7634c4280e..bd6ecb6b91 100644 --- a/keyboard/alps64/Makefile +++ b/keyboard/alps64/Makefile @@ -42,14 +42,14 @@ TARGET = alps64 # Directory common source filess exist +TOP_DIR = ../.. TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . # project specific files -SRC = keymap_common.c \ - matrix.c \ +SRC = alps64.c \ led.c ifdef KEYMAP @@ -127,8 +127,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # Search Path VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) VPATH += $(TMK_DIR) -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk +include $(TOP_DIR)/quantum/quantum.mk diff --git a/keyboard/gh60/keymap_common.c b/keyboard/alps64/alps64.c index fdb1769e1c..dde10c11e3 100644 --- a/keyboard/gh60/keymap_common.c +++ b/keyboard/alps64/alps64.c @@ -14,17 +14,30 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "keymap_common.h" +#include "quantum.h" +#define LED_ON() do { DDRC |= (1<<5); PORTC |= (1<<5); } while (0) +#define LED_OFF() do { DDRC &= ~(1<<5); PORTC &= ~(1<<5); } while (0) +#define LED_TGL() do { DDRC |= (1<<5); PINC |= (1<<5); } while (0) -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); +__attribute__ ((weak)) +void matrix_init_user(void) { + +} + +__attribute__ ((weak)) +void matrix_scan_user(void) { + +} + +void matrix_init_kb(void) { + LED_ON(); + _delay_ms(500); + LED_OFF(); + + matrix_init_user(); } -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; +void matrix_scan_kb(void) { + matrix_scan_user(); } diff --git a/keyboard/alps64/keymap_common.h b/keyboard/alps64/alps64.h index 957db57922..d0777201e0 100644 --- a/keyboard/alps64/keymap_common.h +++ b/keyboard/alps64/alps64.h @@ -14,25 +14,10 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; +#ifndef ALPS64_H +#define ALPS64_H +#include "quantum.h" /* Alps64 keymap definition macro */ #define KEYMAP( \ diff --git a/keyboard/alps64/config.h b/keyboard/alps64/config.h index 824d3e8302..858a82ecdd 100644 --- a/keyboard/alps64/config.h +++ b/keyboard/alps64/config.h @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef CONFIG_H #define CONFIG_H +#include "config_common.h" /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED @@ -31,6 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 8 #define MATRIX_COLS 8 +#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } +#define MATRIX_ROW_PINS { D0, D1, D2, D3, D4, D5, D6, C2 } +#define UNUSED_PINS + /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST diff --git a/keyboard/alps64/keymap_common.c b/keyboard/alps64/keymap_common.c deleted file mode 100644 index fdb1769e1c..0000000000 --- a/keyboard/alps64/keymap_common.c +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "keymap_common.h" - - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} diff --git a/keyboard/alps64/keymaps/default.c b/keyboard/alps64/keymaps/default.c index a54899196a..2c45dc7f34 100644 --- a/keyboard/alps64/keymaps/default.c +++ b/keyboard/alps64/keymaps/default.c @@ -1,6 +1,6 @@ -#include "keymap_common.h" +#include "alps64.h" -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 0: qwerty */ KEYMAP( \ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, NUHS, BSPC, \ diff --git a/keyboard/alps64/keymaps/hasu.c b/keyboard/alps64/keymaps/hasu.c index d297d72fea..e93dd0d410 100644 --- a/keyboard/alps64/keymaps/hasu.c +++ b/keyboard/alps64/keymaps/hasu.c @@ -1,9 +1,9 @@ -#include "keymap_common.h" +#include "alps64.h" /* * Hasu */ -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Default Layer * ,-----------------------------------------------------------. * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \ | diff --git a/keyboard/alps64/matrix.c b/keyboard/alps64/matrix.c index 5638d7f69d..805999d4a1 100644 --- a/keyboard/alps64/matrix.c +++ b/keyboard/alps64/matrix.c @@ -55,10 +55,6 @@ uint8_t matrix_cols(void) return MATRIX_COLS; } -#define LED_ON() do { DDRC |= (1<<5); PORTC |= (1<<5); } while (0) -#define LED_OFF() do { DDRC &= ~(1<<5); PORTC &= ~(1<<5); } while (0) -#define LED_TGL() do { DDRC |= (1<<5); PINC |= (1<<5); } while (0) - void matrix_init(void) { // initialize row and col @@ -160,6 +156,7 @@ static void unselect_rows(void) PORTC &= ~0b00000100; } + static void select_row(uint8_t row) { // Output low(DDR:1, PORT:0) to select diff --git a/keyboard/atomic/atomic.c b/keyboard/atomic/atomic.c index 3996497161..fa218a48f3 100644 --- a/keyboard/atomic/atomic.c +++ b/keyboard/atomic/atomic.c @@ -2,27 +2,28 @@ __attribute__ ((weak)) void matrix_init_user(void) { - // leave this function blank - it can be defined in a keymap file + // leave this function blank - it can be defined in a keymap file }; __attribute__ ((weak)) void matrix_scan_user(void) { - // leave this function blank - it can be defined in a keymap file + // leave this function blank - it can be defined in a keymap file } __attribute__ ((weak)) -void process_action_user(keyrecord_t *record) { - // leave this function blank - it can be defined in a keymap file +bool process_action_user(keyrecord_t *record) { + // leave this function blank - it can be defined in a keymap file + return true; } __attribute__ ((weak)) void led_set_user(uint8_t usb_led) { - // leave this function blank - it can be defined in a keymap file + // leave this function blank - it can be defined in a keymap file } void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up + // put your keyboard start-up code here + // runs once when the firmware starts up MCUCR |= (1<<JTD); MCUCR |= (1<<JTD); @@ -35,31 +36,39 @@ void matrix_init_kb(void) { DDRE |= (1<<6); PORTE |= (1<<6); - matrix_init_user(); + matrix_init_user(); } void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) + // put your looping keyboard code here + // runs every cycle (a lot) - matrix_scan_user(); + matrix_scan_user(); } -void process_action_kb(keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware +bool process_action_kb(keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware - process_action_user(record); + return process_action_user(record); } void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); + led_set_user(usb_led); } #ifdef BACKLIGHT_ENABLE #define CHANNEL OCR1C +#define BREATHING_NO_HALT 0 +#define BREATHING_HALT_OFF 1 +#define BREATHING_HALT_ON 2 + +static uint8_t breath_intensity; +static uint8_t breath_speed; +static uint16_t breathing_index; +static uint8_t breathing_halt; void backlight_init_ports() { @@ -67,54 +76,250 @@ void backlight_init_ports() // Setup PB7 as output and output low. DDRB |= (1<<7); PORTB &= ~(1<<7); - - // Use full 16-bit resolution. + + // Use full 16-bit resolution. ICR1 = 0xFFFF; // I could write a wall of text here to explain... but TL;DW // Go read the ATmega32u4 datasheet. // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on - + // Pin PB7 = OCR1C (Timer 1, Channel C) // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0 // (i.e. start high, go low when counter matches.) // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0 // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1 - + TCCR1A = _BV(COM1C1) | _BV(WGM11); // = 0b00001010; TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001; backlight_init(); + breathing_defaults(); } void backlight_set(uint8_t level) { + // Prevent backlight blink on lowest level + PORTB &= ~(_BV(PORTB7)); + if ( level == 0 ) { // Turn off PWM control on PB7, revert to output low. TCCR1A &= ~(_BV(COM1C1)); + + // Set the brightness to 0 CHANNEL = 0x0; - // Prevent backlight blink on lowest level - PORTB &= ~(_BV(PORTB7)); } - else if ( level == BACKLIGHT_LEVELS ) + else if ( level >= BACKLIGHT_LEVELS ) { - // Prevent backlight blink on lowest level - PORTB &= ~(_BV(PORTB7)); // Turn on PWM control of PB7 TCCR1A |= _BV(COM1C1); - // Set the brightness + + // Set the brightness to max CHANNEL = 0xFFFF; } - else + else { - // Prevent backlight blink on lowest level - PORTB &= ~(_BV(PORTB7)); // Turn on PWM control of PB7 TCCR1A |= _BV(COM1C1); + // Set the brightness CHANNEL = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2)); } + breathing_intensity_default(); +} + + +void breathing_enable(void) +{ + if (get_backlight_level() == 0) + { + breathing_index = 0; + } + else + { + // Set breathing_index to be at the midpoint (brightest point) + breathing_index = 0x20 << breath_speed; + } + + breathing_halt = BREATHING_NO_HALT; + + // Enable breathing interrupt + TIMSK1 |= _BV(OCIE1A); +} + +void breathing_pulse(void) +{ + if (get_backlight_level() == 0) + { + breathing_index = 0; + } + else + { + // Set breathing_index to be at the midpoint + 1 (brightest point) + breathing_index = 0x21 << breath_speed; + } + + breathing_halt = BREATHING_HALT_ON; + + // Enable breathing interrupt + TIMSK1 |= _BV(OCIE1A); +} + +void breathing_disable(void) +{ + // Disable breathing interrupt + TIMSK1 &= ~_BV(OCIE1A); + backlight_set(get_backlight_level()); +} + +void breathing_self_disable(void) +{ + if (get_backlight_level() == 0) + { + breathing_halt = BREATHING_HALT_OFF; + } + else + { + breathing_halt = BREATHING_HALT_ON; + } + + //backlight_set(get_backlight_level()); +} + +void breathing_toggle(void) +{ + if (!is_breathing()) + { + if (get_backlight_level() == 0) + { + breathing_index = 0; + } + else + { + // Set breathing_index to be at the midpoint + 1 (brightest point) + breathing_index = 0x21 << breath_speed; + } + + breathing_halt = BREATHING_NO_HALT; + } + + // Toggle breathing interrupt + TIMSK1 ^= _BV(OCIE1A); + + // Restore backlight level + if (!is_breathing()) + { + backlight_set(get_backlight_level()); + } +} + +bool is_breathing(void) +{ + return (TIMSK1 && _BV(OCIE1A)); +} + +void breathing_intensity_default(void) +{ + //breath_intensity = (uint8_t)((uint16_t)100 * (uint16_t)get_backlight_level() / (uint16_t)BACKLIGHT_LEVELS); + breath_intensity = ((BACKLIGHT_LEVELS - get_backlight_level()) * ((BACKLIGHT_LEVELS + 1) / 2)); +} + +void breathing_intensity_set(uint8_t value) +{ + breath_intensity = value; +} + +void breathing_speed_default(void) +{ + breath_speed = 4; +} + +void breathing_speed_set(uint8_t value) +{ + bool is_breathing_now = is_breathing(); + uint8_t old_breath_speed = breath_speed; + + if (is_breathing_now) + { + // Disable breathing interrupt + TIMSK1 &= ~_BV(OCIE1A); + } + + breath_speed = value; + + if (is_breathing_now) + { + // Adjust index to account for new speed + breathing_index = (( (uint8_t)( (breathing_index) >> old_breath_speed ) ) & 0x3F) << breath_speed; + + // Enable breathing interrupt + TIMSK1 |= _BV(OCIE1A); + } + +} + +void breathing_speed_inc(uint8_t value) +{ + if ((uint16_t)(breath_speed - value) > 10 ) + { + breathing_speed_set(0); + } + else + { + breathing_speed_set(breath_speed - value); + } +} + +void breathing_speed_dec(uint8_t value) +{ + if ((uint16_t)(breath_speed + value) > 10 ) + { + breathing_speed_set(10); + } + else + { + breathing_speed_set(breath_speed + value); + } +} + +void breathing_defaults(void) +{ + breathing_intensity_default(); + breathing_speed_default(); + breathing_halt = BREATHING_NO_HALT; +} + +/* Breathing Sleep LED brighness(PWM On period) table + * (64[steps] * 4[duration]) / 64[PWM periods/s] = 4 second breath cycle + * + * http://www.wolframalpha.com/input/?i=%28sin%28+x%2F64*pi%29**8+*+255%2C+x%3D0+to+63 + * (0..63).each {|x| p ((sin(x/64.0*PI)**8)*255).to_i } + */ +static const uint8_t breathing_table[64] PROGMEM = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 6, 10, + 15, 23, 32, 44, 58, 74, 93, 113, 135, 157, 179, 199, 218, 233, 245, 252, +255, 252, 245, 233, 218, 199, 179, 157, 135, 113, 93, 74, 58, 44, 32, 23, + 15, 10, 6, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +ISR(TIMER1_COMPA_vect) +{ + // CHANNEL = (pgm_read_byte(&breathing_table[ ( (uint8_t)( (breathing_index++) >> breath_speed ) ) & 0x3F ] )) * breath_intensity; + + + uint8_t local_index = ( (uint8_t)( (breathing_index++) >> breath_speed ) ) & 0x3F; + + if (((breathing_halt == BREATHING_HALT_ON) && (local_index == 0x20)) || ((breathing_halt == BREATHING_HALT_OFF) && (local_index == 0x3F))) + { + // Disable breathing interrupt + TIMSK1 &= ~_BV(OCIE1A); + } + + CHANNEL = (uint16_t)(((uint16_t)pgm_read_byte(&breathing_table[local_index]) * 257)) >> breath_intensity; + } + + #endif
\ No newline at end of file diff --git a/keyboard/atomic/atomic.h b/keyboard/atomic/atomic.h index 0c7aeb1cc8..456c3fbdf8 100644 --- a/keyboard/atomic/atomic.h +++ b/keyboard/atomic/atomic.h @@ -1,11 +1,7 @@ #ifndef ATOMIC_H #define ATOMIC_H -#include "matrix.h" -#include "keymap_common.h" -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif +#include "quantum.h" #include <stddef.h> #include <avr/io.h> @@ -29,8 +25,24 @@ void matrix_init_user(void); void matrix_scan_user(void); -void process_action_user(keyrecord_t *record); +bool process_action_user(keyrecord_t *record); void led_set_user(uint8_t usb_led); void backlight_init_ports(void); +void breathing_enable(void); +void breathing_pulse(void); +void breathing_disable(void); +void breathing_self_disable(void); +void breathing_toggle(void); +bool is_breathing(void); + + +void breathing_defaults(void); +void breathing_intensity_default(void); +void breathing_speed_default(void); +void breathing_speed_set(uint8_t value); +void breathing_speed_inc(uint8_t value); +void breathing_speed_dec(uint8_t value); + + #endif
\ No newline at end of file diff --git a/keyboard/atomic/config.h b/keyboard/atomic/config.h index 1b34decf9c..bf9550e948 100644 --- a/keyboard/atomic/config.h +++ b/keyboard/atomic/config.h @@ -41,15 +41,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * -*/ -#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } -#define ROWS (int []){ D0, D5, B5, B6, C6 } +*/ +#define MATRIX_ROW_PINS { D0, D5, B5, B6, C6 } +#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST @@ -62,17 +63,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* +/* * Force NKRO * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the * makefile for this to work.) * * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) * until the next keyboard reset. * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is * fully operational during normal computer usage. * * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) @@ -90,7 +91,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * the keyboard. They are best used in combination with the HID Listen program, * found here: https://www.pjrc.com/teensy/hid_listen.html * - * The options below allow the magic key functionality to be changed. This is + * The options below allow the magic key functionality to be changed. This is * useful if your keyboard/keypad is missing keys and you want magic key support. * */ diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboard/atomic/keymaps/pvc/config.h index cc92634646..1473aac34f 100644 --- a/keyboard/atomic/keymaps/pvc/config.h +++ b/keyboard/atomic/keymaps/pvc/config.h @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define PRODUCT_ID 0x0419 #define DEVICE_VER 0x0001 #define MANUFACTURER Ortholinear Keyboards #define PRODUCT The Atomic Keyboard @@ -42,14 +42,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } -#define ROWS (int []){ D0, D5, B5, B6, B3 } +#define MATRIX_ROW_PINS { D0, D5, B5, B6, B3 } +#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7, D3, D2, D1 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ //#define MATRIX_HAS_GHOST @@ -158,4 +159,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION + +//#define VIBRATO_ENABLE +//#define VIBRATO_STRENGTH_ENABLE + #endif diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c index e17c41e23d..f16ec8a6ec 100644 --- a/keyboard/atomic/keymaps/pvc/keymap.c +++ b/keyboard/atomic/keymaps/pvc/keymap.c @@ -8,42 +8,44 @@ #include "song_list.h" #endif -#define LAYER_QWERTY 0 -#define LAYER_COLEMAK 1 -#define LAYER_DVORAK 2 -#define LAYER_LOWER 3 -#define LAYER_RAISE 4 -#define LAYER_FUNCTION 5 -#define LAYER_MOUSE 6 -#define LAYER_MUSIC 7 -#define LAYER_ADJUST 8 - -#define MACRO_QWERTY 0 -#define MACRO_COLEMAK 1 -#define MACRO_DVORAK 2 -#define MACRO_LOWER 3 -#define MACRO_RAISE 4 -#define MACRO_FUNCTION 5 -#define MACRO_MOUSE 6 -#define MACRO_TIMBRE_1 7 -#define MACRO_TIMBRE_2 8 -#define MACRO_TIMBRE_3 9 -#define MACRO_TIMBRE_4 10 -#define MACRO_TEMPO_U 11 -#define MACRO_TEMPO_D 12 -#define MACRO_TONE_DEFAULT 13 -#define MACRO_MUSIC_ON 14 -#define MACRO_MUSIC_OFF 15 -#define MACRO_AUDIO_ON 16 -#define MACRO_AUDIO_OFF 17 -#define MACRO_INC_VOICE 18 -#define MACRO_DEC_VOICE 19 +#define LAYER_QWERTY 0 +#define LAYER_COLEMAK 1 +#define LAYER_DVORAK 2 +#define LAYER_UPPER 3 +#define LAYER_LOWER 4 +#define LAYER_FUNCTION 5 +#define LAYER_MOUSE 6 +#define LAYER_ADJUST 7 + +#define MACRO_QWERTY 0 +#define MACRO_COLEMAK 1 +#define MACRO_DVORAK 2 +#define MACRO_UPPER 3 +#define MACRO_LOWER 4 +#define MACRO_FUNCTION 5 +#define MACRO_MOUSE 6 +#define MACRO_TIMBRE_1 7 +#define MACRO_TIMBRE_2 8 +#define MACRO_TIMBRE_3 9 +#define MACRO_TIMBRE_4 10 +#define MACRO_TEMPO_U 11 +#define MACRO_TEMPO_D 12 +#define MACRO_TONE_DEFAULT 13 +#define MACRO_MUSIC_TOGGLE 14 +#define MACRO_AUDIO_TOGGLE 16 +#define MACRO_INC_VOICE 18 +#define MACRO_DEC_VOICE 19 +#define MACRO_BACKLIGHT 20 +#define MACRO_BREATH_TOGGLE 21 +#define MACRO_BREATH_SPEED_INC 23 +#define MACRO_BREATH_SPEED_DEC 24 +#define MACRO_BREATH_DEFAULT 25 #define M_QWRTY M(MACRO_QWERTY) #define M_COLMK M(MACRO_COLEMAK) #define M_DVORK M(MACRO_DVORAK) +#define M_UPPER M(MACRO_UPPER) #define M_LOWER M(MACRO_LOWER) -#define M_RAISE M(MACRO_RAISE) #define M_FUNCT M(MACRO_FUNCTION) #define M_MOUSE M(MACRO_MOUSE) #define TIMBR_1 M(MACRO_TIMBRE_1) @@ -53,12 +55,13 @@ #define TMPO_UP M(MACRO_TEMPO_U) #define TMPO_DN M(MACRO_TEMPO_D) #define TMPO_DF M(MACRO_TONE_DEFAULT) +#define M_BACKL M(MACRO_BACKLIGHT) +#define M_BRTOG M(MACRO_BREATH_TOGGLE) +#define M_BSPDU M(MACRO_BREATH_SPEED_INC) +#define M_BSPDD M(MACRO_BREATH_SPEED_DEC) +#define M_BDFLT M(MACRO_BREATH_DEFAULT) -#define MUS_ON M(MACRO_MUSIC_ON) -#define MUS_OFF M(MACRO_MUSIC_OFF) -#define AUD_OFF M(MACRO_AUDIO_OFF) -#define AUD_ON M(MACRO_AUDIO_ON) #define VC_UP M(MACRO_INC_VOICE) #define VC_DOWN M(MACRO_DEC_VOICE) @@ -74,6 +77,7 @@ #define SC_ACLS LALT(KC_F4) #define SC_CCLS LCTL(KC_F4) +#define OS_SHFT KC_FN0 #define _______ KC_TRNS #define XXXXXXX KC_NO @@ -92,16 +96,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | XXXXXX . SPACE | LOWER | RALT | RWIN | MENU | RCTRL | LEFT | DOWN | RIGHT | + * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | * '--------------------------------------------------------------------------------------------------------------------------------------' */ - [LAYER_QWERTY] = { /* QWERTY */ + [LAYER_QWERTY] = { // QWERTY { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, - { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, + { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, }, /* COLEMAK @@ -114,17 +118,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | XXXXXX . SPACE | LOWER | RALT | RWIN | MENU | RCTRL | LEFT | DOWN | RIGHT | + * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | * '--------------------------------------------------------------------------------------------------------------------------------------' */ - [LAYER_COLEMAK] = { /* COLEMAK */ + [LAYER_COLEMAK] = { // COLEMAK { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, - { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, - }, + { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, +}, /* DVORAK * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. @@ -136,36 +140,63 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | XXXXXX . SPACE | LOWER | RALT | RWIN | MENU | RCTRL | LEFT | DOWN | RIGHT | + * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | * '--------------------------------------------------------------------------------------------------------------------------------------' */ - [LAYER_DVORAK] = { /* DVORAK */ + [LAYER_DVORAK] = { // DVORAK { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_BSPC }, { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL }, { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_ENT, KC_PGUP }, { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, - { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, + { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, }, +/* UPPER + * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. + * | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| + * | CAP LK | F5 | F6 | F7 | F8 | | | 4 | 5 | 6 | + | | XXXXXX . | HOME | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| + * | | F9 | F10 | F11 | F12 | | | 1 | 2 | 3 | ENTER | XXXXXX . | | END | + * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| + * | | | | | | 0 | | RALT | . | ENTER | | | | | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ - [LAYER_LOWER] = { /* LOWERED */ - { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, - { _______, _______, _______, _______, SC_CCLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS }, - { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_HOME }, - { _______, SC_REDO, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______, KC_END }, - { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______ }, + [LAYER_UPPER] = { // UPPER + { KC_PSCR, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, XXXXXXX, XXXXXXX, KC_SLCK, KC_PAUS, KC_PAUS }, + { _______, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS }, + { KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, ________________, KC_HOME }, + { _______, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, ________________, _______, KC_END }, + { _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______ }, }, - [LAYER_RAISE] = { /* RAISED */ - { KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, - { _______, _______, _______, _______, SC_ACLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS }, - { _______, SC_SELA, SC_SAVE, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_HOME }, - { _______, SC_UNDO, SC_CUT, SC_COPY, SC_PSTE, _______, _______, _______, _______, _______, _______, ________________, _______, KC_END }, +/* LOWER + * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. + * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . BACKSP | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| + * | | ^ | * | + | - | ; | : | _ | ' | " | ` | | XXXXXX . | HOME | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| + * | | | | & | ! | ~ | / | \ | = | < | > | ? | XXXXXX . | | END | + * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| + * | | | | | | | | | | | | | | | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + + [LAYER_LOWER] = { // LOWER + { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, + { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS }, + { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME }, + { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END }, { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ }, }, - [LAYER_FUNCTION] = { /* FUNCTION */ + [LAYER_FUNCTION] = { // FUNCTION { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_PAUS }, { KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_PSCR }, @@ -175,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef MOUSEKEY_ENABLE - [LAYER_MOUSE] = { /* MOUSE */ + [LAYER_MOUSE] = { // MOUSE { _______, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX }, { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, KC_WH_U }, @@ -185,25 +216,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #endif - [LAYER_MUSIC] = { /* MUSIC */ - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_RAISE, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - }, - - [LAYER_ADJUST] = { /* ADJUST */ - { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, MUS_ON, MUS_OFF, AUD_ON, AUD_OFF, ________________ }, + [LAYER_ADJUST] = { // ADJUST + { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, _______, _______, MU_TOG, AU_TOG, ________________ }, { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______ }, - { _______, _______, _______, _______, _______, RESET, _______, M_MOUSE, _______, _______, _______, ________________, VC_UP, _______ }, - { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, VC_DOWN, _______ }, + { _______, _______, _______, _______, M_BACKL, RESET, _______, M_MOUSE, _______, _______, _______, ________________, MUV_IN, _______ }, + { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, MUV_DE, _______ }, }, /* - [LAYER_EMPTY] = { + [LAYER_EMPTY] = { // LAYER { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________ }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______ }, @@ -225,13 +248,14 @@ float tone_colemak[][2] = SONG(COLEMAK_SOUND); float tone_audio_on[][2] = SONG(CLOSE_ENCOUNTERS_5_NOTE); float tone_music_on[][2] = SONG(DOE_A_DEER); +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); + float tone_caps_on[][2] = SONG(CAPS_LOCK_ON_SOUND); float tone_caps_off[][2] = SONG(CAPS_LOCK_OFF_SOUND); float tone_numlk_on[][2] = SONG(NUM_LOCK_ON_SOUND); float tone_numlk_off[][2] = SONG(NUM_LOCK_OFF_SOUND); float tone_scroll_on[][2] = SONG(SCROLL_LOCK_ON_SOUND); float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND); -float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); #endif /* AUDIO_ENABLE */ @@ -242,6 +266,7 @@ void persistant_default_layer_set(uint16_t default_layer) } const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_MODS_ONESHOT(MOD_LSFT), }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -251,13 +276,41 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) switch(id) { + case MACRO_BREATH_TOGGLE: + if (record->event.pressed) + { + breathing_toggle(); + } + break; + + case MACRO_BREATH_SPEED_INC: + if (record->event.pressed) + { + breathing_speed_inc(1); + } + break; + + case MACRO_BREATH_SPEED_DEC: + if (record->event.pressed) + { + breathing_speed_dec(1); + } + break; + + case MACRO_BREATH_DEFAULT: + if (record->event.pressed) + { + breathing_defaults(); + } + break; + case MACRO_QWERTY: if (record->event.pressed) { persistant_default_layer_set(1UL<<LAYER_QWERTY); - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO); - #endif /* AUDIO_ENABLE */ + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, STACCATO); + #endif /* AUDIO_ENABLE */ } break; @@ -265,9 +318,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) if (record->event.pressed) { persistant_default_layer_set(1UL<<LAYER_COLEMAK); - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO); - #endif /* AUDIO_ENABLE */ + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, STACCATO); + #endif /* AUDIO_ENABLE */ } break; @@ -275,45 +328,53 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) if (record->event.pressed) { persistant_default_layer_set(1UL<<LAYER_DVORAK); - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO); - #endif /* AUDIO_ENABLE */ + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, STACCATO); + #endif /* AUDIO_ENABLE */ } break; - case MACRO_LOWER: + case MACRO_UPPER: if (record->event.pressed) { - layer_on(LAYER_LOWER); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + layer_on(LAYER_UPPER); + breathing_speed_set(2); + breathing_pulse(); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } else { - layer_off(LAYER_LOWER); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + layer_off(LAYER_UPPER); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } break; - case MACRO_RAISE: + case MACRO_LOWER: if (record->event.pressed) { - layer_on(LAYER_RAISE); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + layer_on(LAYER_LOWER); + breathing_speed_set(2); + breathing_pulse(); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } else { - layer_off(LAYER_RAISE); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + layer_off(LAYER_LOWER); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } break; case MACRO_FUNCTION: if (record->event.pressed) { + breathing_speed_set(3); + breathing_enable(); layer_on(LAYER_FUNCTION); } else { + breathing_speed_set(1); + breathing_self_disable(); layer_off(LAYER_FUNCTION); } break; @@ -363,45 +424,37 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } break; - case MACRO_AUDIO_OFF: +/* + case MACRO_AUDIO_TOGGLE: if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_off(); - #endif + if (is_audio_on()) + { + audio_off(); + } + else + { + audio_on(); + PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); + } } break; - case MACRO_AUDIO_ON: + case MACRO_MUSIC_TOGGLE: if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_on(); - PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); - #endif - } - break; - - case MACRO_MUSIC_ON: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE + if (IS_LAYER_ON(LAYER_MUSIC)) + { + layer_off(LAYER_MUSIC); + stop_all_notes(); + } + else + { PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); layer_on(LAYER_MUSIC); - #endif - } - break; - - case MACRO_MUSIC_OFF: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - layer_off(LAYER_MUSIC); - stop_all_notes(); - #endif + } } break; - case MACRO_INC_VOICE: if (record->event.pressed) { @@ -421,9 +474,18 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) #endif } break; +*/ #endif /* AUDIO_ENABLE */ +#ifdef BACKLIGHT_ENABLE + case MACRO_BACKLIGHT: + if (record->event.pressed) + { + backlight_step(); + } +#endif + default: break; @@ -434,31 +496,10 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) #ifdef AUDIO_ENABLE - -void process_action_user(keyrecord_t *record) -{ - - uint8_t starting_note = 0x0C; - int offset = 7; - - if (IS_LAYER_ON(LAYER_MUSIC)) - { - if (record->event.pressed) - { - play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); - } - else - { - stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); - } - } -} - - void matrix_init_user(void) { set_voice(default_voice); - play_startup_tone(); + startup_user(); println("Matrix Init"); } @@ -468,50 +509,70 @@ void led_set_user(uint8_t usb_led) _delay_ms(10); // gets rid of tick - if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) - { - // If CAPS LK LED is turning on... - PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO); - } - else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) - { - // If CAPS LK LED is turning off... - PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO); - } - else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK))) - { - // If NUM LK LED is turning on... - PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO); - } - else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK))) - { - // If NUM LED is turning off... - PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO); - } - else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK))) - { - // If SCROLL LK LED is turning on... - PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO); - } - else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK))) + if (!is_playing_notes()) { - // If SCROLL LED is turning off... - PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO); + if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) + { + // If CAPS LK LED is turning on... + PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO); + } + else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) + { + // If CAPS LK LED is turning off... + PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO); + } + else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK))) + { + // If NUM LK LED is turning on... + PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO); + } + else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK))) + { + // If NUM LED is turning off... + PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO); + } + else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK))) + { + // If SCROLL LK LED is turning on... + PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO); + } + else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK))) + { + // If SCROLL LED is turning off... + PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO); + } } + old_usb_led = usb_led; } -void play_startup_tone() +void startup_user() { _delay_ms(10); // gets rid of tick PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); } -void play_goodbye_tone() +void shutdown_user() { PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); - _delay_ms(1000); + _delay_ms(2000); + stop_all_notes(); +} + +void audio_on_user(void) +{ + PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); +} + +void music_on_user(void) +{ + PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); +} + +void music_scale_user(void) +{ + PLAY_NOTE_ARRAY(music_scale, false, STACCATO); } #endif /* AUDIO_ENABLE */
\ No newline at end of file diff --git a/keyboard/atomic/keymaps/pvc/makefile.mk b/keyboard/atomic/keymaps/pvc/makefile.mk index eefa42855f..f7798b09d5 100644 --- a/keyboard/atomic/keymaps/pvc/makefile.mk +++ b/keyboard/atomic/keymaps/pvc/makefile.mk @@ -4,7 +4,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode diff --git a/keyboard/atreus/config.h b/keyboard/atreus/config.h index ca0cd7e47a..624d90188c 100644 --- a/keyboard/atreus/config.h +++ b/keyboard/atreus/config.h @@ -36,11 +36,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Change this to how you wired your keyboard // COLS: Left to right, ROWS: Top to bottom #if defined(ATREUS_ASTAR) - #define COLS (int []){ B7, D6, F7, F6, B6, D4, E6, B4, B5, C6, D7 } - #define ROWS (int []){ D0, D1, D3, D2 } +# define MATRIX_ROW_PINS { D0, D1, D3, D2 } +# define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 } +# define UNUSED_PINS #elif defined(ATREUS_TEENSY2) - #define COLS (int []){ F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0} - #define ROWS (int []){ D0, D1, D2, D3 } +# define MATRIX_ROW_PINS { D0, D1, D2, D3 } +# define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 } +# define UNUSED_PINS #endif /* COL2ROW or ROW2COL */ @@ -53,7 +55,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/Bantam44/Bantam44.c b/keyboard/bantam44/Bantam44.c index ad91401eeb..ad91401eeb 100644 --- a/keyboard/Bantam44/Bantam44.c +++ b/keyboard/bantam44/Bantam44.c diff --git a/keyboard/Bantam44/Bantam44.h b/keyboard/bantam44/Bantam44.h index fa5b9df9e4..fa5b9df9e4 100644 --- a/keyboard/Bantam44/Bantam44.h +++ b/keyboard/bantam44/Bantam44.h diff --git a/keyboard/Bantam44/Makefile b/keyboard/bantam44/Makefile index e7dea9f602..e7dea9f602 100644 --- a/keyboard/Bantam44/Makefile +++ b/keyboard/bantam44/Makefile diff --git a/keyboard/Bantam44/README.md b/keyboard/bantam44/README.md index cd059a66c9..cd059a66c9 100644 --- a/keyboard/Bantam44/README.md +++ b/keyboard/bantam44/README.md diff --git a/keyboard/Bantam44/config.h b/keyboard/bantam44/config.h index 26d680704d..a55f629990 100644 --- a/keyboard/Bantam44/config.h +++ b/keyboard/bantam44/config.h @@ -35,8 +35,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Planck PCB default pin-out // Change this to how you wired your keyboard // COLS: Left to right, ROWS: Top to bottom -#define COLS (int []){ B0, B1, B2, B3, B7, D0, B6, F7, F6, F5, F4, F1 } -#define ROWS (int []){ F0, D6, D4, D5 } +#define MATRIX_ROW_PINS { F0, D6, D4, D5 } +#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, B6, F7, F6, F5, F4, F1 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -48,7 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/Bantam44/keymaps/default.c b/keyboard/bantam44/keymaps/default.c index 17ade6241f..17ade6241f 100644 --- a/keyboard/Bantam44/keymaps/default.c +++ b/keyboard/bantam44/keymaps/default.c diff --git a/keyboard/clueboard1/config.h b/keyboard/clueboard1/config.h index 2b20c3873d..16338ddb03 100644 --- a/keyboard/clueboard1/config.h +++ b/keyboard/clueboard1/config.h @@ -32,19 +32,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 5 #define MATRIX_COLS 16 -// COLS: Left to right, ROWS: Top to bottom - +// ROWS: Top to bottom, COLS: Left to right /* Column pin configuration - * col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - * pin: B3 F1 F4 F5 F6 C7 C6 B6 B5 B4 D7 D6 D4 F7 B0 B1 - */ -#define COLS (int []){ B3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, F7, B0, B1 } - - /* Row pin configuration - * row: 0 1 2 3 4 - * pin: D1 D0 D2 D5 D3 - */ -#define ROWS (int []){ D1, D0, D2, D5, D3 } +* col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 +* pin: B3 F1 F4 F5 F6 C7 C6 B6 B5 B4 D7 D6 D4 F7 B0 B1 +*/ +#define MATRIX_COL_PINS { B3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, F7, B0, B1 } +/* Row pin configuration +* row: 0 1 2 3 4 +* pin: D1 D0 D2 D5 D3 +*/ +#define MATRIX_ROW_PINS { D1, D0, D2, D5, D3 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -53,7 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/clueboard2/config.h b/keyboard/clueboard2/config.h index 04166c20f6..2887519afd 100644 --- a/keyboard/clueboard2/config.h +++ b/keyboard/clueboard2/config.h @@ -32,19 +32,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 10 #define MATRIX_COLS 8 -// COLS: Left to right, ROWS: Top to bottom - +// ROWS: Top to bottom, COLS: Left to right +/* Row pin configuration +* row: 0 1 2 3 4 5 6 7 8 9 +* pin: B2 C7 C6 B6 B5 B0 B3 D5 D3 D2 +*/ +#define MATRIX_ROW_PINS { B2, C7, C6, B6, B5, B0, B3, D5, D3, D2 } /* Column pin configuration * col: 0 1 2 3 4 5 6 7 * pin: F0 F1 F4 F5 F6 F7 E6 B1 */ -#define COLS (int []){ F0, F1, F4, F5, F6, F7, E6, B1 } - - /* Row pin configuration - * row: 0 1 2 3 4 5 6 7 8 9 - * pin: B2 C7 C6 B6 B5 B0 B3 D5 D3 D2 - */ -#define ROWS (int []){ B2, C7, C6, B6, B5, B0, B3, D5, D3, D2 } +#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, B1 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -53,7 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/cluepad/config.h b/keyboard/cluepad/config.h index 5ed421a6e0..0955e0f702 100644 --- a/keyboard/cluepad/config.h +++ b/keyboard/cluepad/config.h @@ -32,19 +32,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 5 #define MATRIX_COLS 4 -// COLS: Left to right, ROWS: Top to bottom - +// ROWS: Top to bottom, COLS: Left to right +/* Row pin configuration +* row: 0 1 2 3 4 +* pin: +*/ +#define MATRIX_ROW_PINS { B0, D3, D5, D4, D6 } /* Column pin configuration * col: 0 1 2 3 * pin: F4 E6 B1 D2 */ -#define COLS (int []){ F4, E6, B1, D2 } - - /* Row pin configuration - * row: 0 1 2 3 4 - * pin: - */ -#define ROWS (int []){ B0, D3, D5, D4, D6 } +#define MATRIX_COL_PINS { F4, E6, B1, D2 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -53,7 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define MATRIX_HAS_GHOST /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Number of backlighting levels */ #define BACKLIGHT_LEVELS 3 diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile index 5dfcca2c80..3a07ec254f 100644 --- a/keyboard/ergodox_ez/Makefile +++ b/keyboard/ergodox_ez/Makefile @@ -101,6 +101,22 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: ht # MIDI_ENABLE = yes # MIDI controls # UNICODE_ENABLE = yes # Unicode +# If you want to have your own config_user.h, you can just put it in +# your keymap directory. Anything you set there will take precedence +# over the global config.h. +ifneq ("$(wildcard keymaps/$(KEYMAP)/config_user.h)","") +CONFIG_USER_H = keymaps/$(KEYMAP)/config_user.h +endif + +ifdef KEYMAP + +ifeq ("$(wildcard keymaps/$(KEYMAP).c)","") +ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","") + include keymaps/$(KEYMAP)/makefile.mk +endif +endif +endif + # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboard/ergodox_ez/ergodox_ez.h index 1e446baf6f..402abc167b 100644 --- a/keyboard/ergodox_ez/ergodox_ez.h +++ b/keyboard/ergodox_ez/ergodox_ez.h @@ -1,13 +1,9 @@ #ifndef ERGODOX_EZ_H #define ERGODOX_EZ_H -#include "matrix.h" -#include "keymap_common.h" -#include "backlight.h" -#include <stddef.h> +#include "quantum.h" #include <stdint.h> #include <stdbool.h> -#include <avr/io.h> #include "i2cmaster.h" #include <util/delay.h> diff --git a/keyboard/ergodox_ez/keymaps/ab/ab.hex b/keyboard/ergodox_ez/keymaps/ab/ab.hex new file mode 100644 index 0000000000..1659ae5802 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ab/ab.hex @@ -0,0 +1,1146 @@ +:100000000C940F020C9453020C9453020C94530260
+:100010000C9453020C9453020C9453020C9453020C
+:100020000C9453020C9453020C94190C0C94EB0C8A
+:100030000C9453020C9453020C9453020C945302EC
+:100040000C9453020C94CF210C9453020C94530241
+:100050000C9453020C94631B0C9453020C945302A3
+:100060000C9453020C9453020C9453020C945302BC
+:100070000C9453020C9453020C9453020C945302AC
+:100080000C9453020C9453020C9453020C9453029C
+:100090000C9453020C9453020C9453020C9453028C
+:1000A0000C9453020C9453020C945302500D720D95
+:1000B0005D0E720D5D0EB40DD70D5D0E2C0E3F0E54
+:1000C000391139117A117A11BC11F811F813F8139A
+:1000D0001012F81307130713D213F813F813E613CB
+:1000E00035002B003971E100E00000001E00140013
+:1000F00004001D0029002F001F001A0016001B001D
+:10010000E3004C002000080007000600E2002C007D
+:100110002100150009001900E20026022200170044
+:100120000A000500000006012300B60000004B0095
+:1001300000002F022400B70000004E000000300233
+:1001400025001C000B0011000000190126001800FA
+:100150000D0010005200270227000C000E00360090
+:1001600050002A002D0012000F0037004F00280019
+:100170002E00130033003800510030002A003100F7
+:100180002800340001540000290001000100010092
+:10019000010000003A00010001000100010001001F
+:1001A0003B000100F2000100010001003C00F000F2
+:1001B000F1000100F40000503D000100F3000100D7
+:1001C000F50001003E0001000100010000000100F7
+:1001D0003F0001000000010000000100400001009C
+:1001E00000000100000001004100010001000100C9
+:1001F00000000100420001000100010001000100B7
+:100200004300010001000100AA00010044000100B8
+:1002100001000100A90001004500010001000100EA
+:10022000A80001002A000100AE000100010000004A
+:1002300016034500720067006F0044006F007800ED
+:10024000200045005A0000001603450072006700B8
+:100250006F0044006F007800200045005A00000045
+:100260000403090409026D00040100A0FA09040056
+:10027000000103010100092111010001223F0007D3
+:1002800005810308000A09040100010301020009B5
+:100290002111010001224D000705820308000A090F
+:1002A00004020001030000000921110100012236AF
+:1002B000000705830308000A090403000103000086
+:1002C00000092111010001223900070584031000F3
+:1002D000011201100100000008EDFE0713010001EA
+:1002E00002000105010906A101050719E029E7152A
+:1002F0000025019508750181020508190129059558
+:1003000005750191029501750391010507190029F1
+:100310007715002501957875018102C005010980D6
+:10032000A101850216010026B7001A01002AB700B4
+:10033000751095018100C0050C0901A10185031606
+:100340000100269C021A01002A9C02751095018169
+:1003500000C005010902A1010901A1000509190157
+:100360002905150025019505750181029501750383
+:1003700081010501093009311581257F9502750834
+:10038000810609381581257F950175088106050CC0
+:100390000A38021581257F950175088106C0C005C0
+:1003A000010906A101050719E029E71500250195B6
+:1003B0000875018102950175088101050819012957
+:1003C00005950575019102950175039101050719C0
+:1003D0000029FF150025FF950675088100C0000063
+:1003E000000000000000000000010204060A0F17D0
+:1003F000202C3A4A5D71879DB3C7DAE9F5FCFFFC12
+:10040000F5E9DAC7B39D87715D4A3A2C20170F0AC8
+:10041000060402010000000000000000000011249A
+:100420001FBECFEFDAE0DEBFCDBF04B603FE24C0AF
+:100430008091EE019091EF01A091F001B091F10156
+:100440008730904BA740B04BB9F41092EE01109258
+:10045000EF011092F0011092F10114BE84B7877F72
+:1004600084BF88E10FB6F89480936000109260001A
+:100470000FBEE0E0FFE3099511E0A0E0B1E0EAE49F
+:10048000F7E402C005900D92A433B107D9F721E03B
+:10049000A4E3B1E001C01D92AE3EB207E1F70E94B5
+:1004A0005F090C94A3230C94000061110BC0FC01A4
+:1004B0008281882321F085EE0E94C10F03C085EE62
+:1004C0000E94891080E090E0089508956091B10144
+:1004D0007091B2018091B3019091B4010E948A1A87
+:1004E00056985E9825982D9826982E9827982F989C
+:1004F000813019F0823021F00895259A2D9A0895BF
+:10050000269A2E9A08950C94660256985E9825981D
+:100510002D9826982E9827982F988FEF90E09093FB
+:1005200089008093880090938B0080938A00909339
+:100530008D0080938C00259A2D9A2FEF80E792E012
+:10054000215080409040E1F700C00000269A2E9A8A
+:100550002FEF80E792E0215080409040E1F700C00B
+:100560000000279A2F9A2FEF80E792E021508040D9
+:100570009040E1F700C0000025982D982FEF80E70C
+:1005800092E0215080409040E1F700C000002698A2
+:100590002E982FEF80E792E0215080409040E1F7C5
+:1005A00000C0000027982F9856985E9825982D989F
+:1005B00026982E9827982F98089589EA809380008E
+:1005C00089E08093810024982C983F988AB18F7499
+:1005D0008AB96E98479A8BB1806B8BB9769A0E94D4
+:1005E00085020C94650280E28093000180913401C1
+:1005F00081110EC00E94420381E0809334012FEFED
+:1006000083ED90E3215080409040E1F700C000006E
+:1006100080E40E9448038093000181112EC00E9453
+:10062000720380930001811128C00E94720380939D
+:100630000001811122C08FE30E94720380930001A8
+:1006400081111BC00E946A0380E40E9448038093CA
+:100650000001811112C08CE00E947203809300019E
+:1006600081110BC00E94720380930001811105C0AB
+:100670008FE30E947203809300010E946A038091BD
+:10068000000108951092B9008AE08093B80008959F
+:1006900094EA9093BC009091BC0097FFFCCF90919E
+:1006A000B900987F983021F0903111F081E00895E1
+:1006B0008093BB0084E88093BC008091BC0087FFDE
+:1006C000FCCF8091B900887F883111F0803471F7B8
+:1006D00080E0089584E98093BC008091BC0084FD93
+:1006E000FCCF08958093BB0084E88093BC00809188
+:1006F000BC0087FFFCCF9091B900987F81E09832D1
+:1007000009F480E0089584E88093BC008091BC00E7
+:1007100087FFFCCF8091BB0008958091000181117B
+:1007200015C080E40E9448038093000181110CC031
+:1007300082E10E94720380930001811105C08FEF56
+:100740000E947203809300010E946A0384B1807F3B
+:1007500084B985B1807F85B98AB1837F8AB98BB12D
+:10076000837F8BB93E98469808950E94F302809348
+:1007700000010E948D0380B38C7080BB81B3836FB6
+:1007800081BBA6E3B1E0E4E4F1E08EE08E0F1192CC
+:100790001D928E13FCCF0C94DD02BF92CF92DF929C
+:1007A000EF92FF920F931F93CF93DF9380910001FD
+:1007B000882379F0809135018F5F80933501811115
+:1007C00008C00E94F30280930001811102C00E94C0
+:1007D000850206E311E0C0E0D0E0DD24D39482E09E
+:1007E000C82EEE24E394F12CC730D10500F580919A
+:1007F0000001811164C080E40E94480380930001DD
+:10080000811112C082E10E94720380930001811164
+:100810000BC0C7010C2E01C0880F0A94EAF780951F
+:100820000E947203809300010E946A0348C0CA308C
+:10083000A1F028F4C83059F0C93061F005C0CC30BF
+:1008400089F070F0CD3089F0209A289810C0219A54
+:1008500029980DC0229A2A980AC0239A2B9807C07B
+:10086000529A01C0539A5B9802C03E9A469890EA09
+:100870009A95F1F79FB1799902C082E001C080E0BA
+:1008800091709D25982B7C9902C084E001C080E086
+:10089000892B7D9902C038E001C030E0832B7E991E
+:1008A00002C020E101C020E0822B9FB19095991FEA
+:1008B0009927991F9295990F907E892B0FC080914F
+:1008C0000001811149C080E40E9448038093000127
+:1008D000882379F1B12C0E946A038B2DF801908155
+:1008E000981719F08083C09201010E948D03219610
+:1008F0000F5F1F4FCE30D10509F076CF80910101F7
+:10090000882361F1815080930101882339F08FE9B8
+:100910009FE00197F1F700C0000020C0A4E4B1E01F
+:10092000E6E3F1E0CF01825F91919D938E13FCCFBE
+:1009300015C083E10E947203809300018111CACF28
+:1009400081E40E944803809300018111C3CF0E947B
+:100950008303B82EB094BFCF80E0C0CF0E94830243
+:1009600081E0DF91CF911F910F91FF90EF90DF9089
+:10097000CF90BF900895E82FF0E0EC5BFE4F8081B0
+:1009800008950895089596E0799FF001112494E563
+:10099000899FE00DF11D1124E60FF11DEE0FFF1FE1
+:1009A000E052FF4F859194910895880F991FFC01A3
+:1009B000E05AF040859194910895880F991FFC01A9
+:1009C000E052FF4F8591949108950F931F93CF9319
+:1009D000DF93EC018115904350F5C11580E2D807F3
+:1009E00008F0B3C0CB3BD10590F4C83AD10508F06C
+:1009F0005AC0C53AD10508F04BC0C430D10508F043
+:100A0000BBC1219709F0B5C101E010E0F5C1CF3FAE
+:100A1000D10511F008F0B0C1C03FD10508F092C077
+:100A2000CE01805E9109089708F4A6C1A2C1C11544
+:100A300091E5D907A8F4C23020E5D20708F09EC09E
+:100A4000C11580E5D80709F485C008F091C0C1152B
+:100A500020E4D20708F08DC1DD278E01106CCCC1D7
+:100A6000C11580E8D80758F4C11590E7D90708F0F8
+:100A70007CC1C11520E6D20708F422C17AC1C11594
+:100A800080E9D80708F075C1DF708E01106AB4C123
+:100A9000C53AD10509F472C1C63AD10509F071C150
+:100AA00002E810E4A9C1C83AD10509F46DC1C93AF8
+:100AB000D10509F46CC1CA3AD10509F46BC1CB3A2E
+:100AC000D10509F46AC1CC3AD10509F469C1CD3A1E
+:100AD000D10509F468C1C03BD10509F467C1CE3A1C
+:100AE000D10509F466C1CF3AD10509F465C1C13B0E
+:100AF000D10509F464C1C23BD10509F463C1C33B0C
+:100B0000D10509F462C1C43BD10509F461C1C53BFB
+:100B1000D10509F460C1C63BD10509F45FC1C73BEB
+:100B2000D10509F45EC1C83BD10509F45DC1C93BDB
+:100B3000D10509F45CC1CA3BD10509F45BC100E0F1
+:100B400014E45AC18E01106557C1CE019F700E94F6
+:100B5000DD0453C10E941B149FEF24E38CE09150ED
+:100B600020408040E1F700C000000E94881B44C183
+:100B70008091CD0181608093CD013EC10E94321DE4
+:100B8000811102C00E94181D0E944F1D90E0909399
+:100B9000EE018093ED01C23090E5D90721F48091F8
+:100BA000ED01816086C0C43020E5D20721F4809138
+:100BB000ED0182607EC0C63080E5D80721F48091C7
+:100BC000ED01846076C0C83090E5D90719F48091B2
+:100BD000ED0127C0CA3020E5D20721F48091ED0154
+:100BE000806167C0CC3080E5D80721F48091ED01A9
+:100BF00080625FC0CE3090E5D90721F48091ED018D
+:100C0000806457C0C03120E5D20721F48091ED0106
+:100C100080684FC0C23180E5D80729F48091ED018A
+:100C20008460886046C0C33090E5D90721F4809184
+:100C3000ED018E7F3EC0C53020E5D20721F48091C2
+:100C4000ED018D7F36C0C73080E5D80721F4809153
+:100C5000ED018B7F2EC0C93090E5D90719F4809142
+:100C6000ED0126C0CB3020E5D20721F48091ED01C3
+:100C70008F7E1FC0CD3080E5D80721F48091ED0133
+:100C80008F7D17C0CF3090E5D90721F48091ED0119
+:100C90008F7B0FC0C13120E5D20721F48091ED0197
+:100CA0008F7707C0C331D04531F48091ED018B7F40
+:100CB000877F8093ED018091ED010E94531D9CC0C0
+:100CC0008D2F99278F70992781309105D9F49E0136
+:100CD0002370332702C0880F991F2A95E2F79C687A
+:100CE0008E0144E0000F111F4A95E1F700271370B1
+:100CF000802B912B53E0CC0FDD1F5A95E1F7C07686
+:100D0000DD272FC08230910531F4DC2FCC278E01F6
+:100D1000016F106A71C08330910569F4CE01837050
+:100D2000992701E010E002C0000F111F8A95E2F739
+:100D3000C8019C680FC0049709F05EC0CE018370A3
+:100D4000992701E010E002C0000F111F8A95E2F719
+:100D5000C8019A6823E0CC0FDD1F2A95E1F7C07E19
+:100D6000D7708C010C2B1D2B47C0DF708E011062D9
+:100D700043C000E010E040C08E013EC001E810E436
+:100D80003BC003E810E438C002EE14E435C009EEBD
+:100D900014E432C00AEE14E42FC005EB14E42CC0B6
+:100DA00006EB14E429C007EB14E426C00CEC14E4B1
+:100DB00023C00DEC14E420C003E815E41DC00AE8CC
+:100DC00015E41AC002E915E417C004E915E414C0DB
+:100DD00001E216E411C003E216E40EC004E216E4D8
+:100DE0000BC005E216E408C006E216E405C007E2FF
+:100DF00016E402C00AE216E4C801DF91CF911F9108
+:100E00000F91089596E0799FF001112494E5899F50
+:100E1000E00DF11D1124E60FF11DEE0FFF1FE05252
+:100E2000FF4F85919491803E9105E0F4803C9105BF
+:100E300058F58133910509F46FC048F48932910562
+:100E400009F463C08A32910509F46DC072C0893318
+:100E50009105E9F082389105D1F08533910509F4C7
+:100E60004DC067C0833E910581F138F4803E910505
+:100E7000B9F0823E9105D9F05CC0863E910561F1E2
+:100E8000873E9105A1F155C00E94D5040895209197
+:100E9000ED0120FD02C021FF4CC080EE90E049C072
+:100EA0008091ED0180FFF9CF89E390E042C080910D
+:100EB000ED0182FF0EC08091ED0184FF03C080E050
+:100EC00090E037C083EE90E034C08091ED0182FF66
+:100ED000F2CF82EE90E02DC08091ED0183FF0BC038
+:100EE0008091ED0184FDEBCF87EE90E022C08091F0
+:100EF000ED0183FFF5CF86EE90E01BC08091ED0100
+:100F000085FF07C089E290E014C08091ED0185FF64
+:100F1000F9CF85E390E00DC08091ED0186FF07C019
+:100F20008AE290E006C08091ED0186FFF9CF81E36F
+:100F300090E00E94E504089508950C949C07809128
+:100F400062010895CF93DF9300D01F92CDB7DEB733
+:100F50002091E401243019F523E029839B838A83BF
+:100F60002093E9008FEF9091E800815095FD06C035
+:100F700095ED9A95F1F700008111F5CF8091E80089
+:100F800085FF0DC040E050E063E070E0CE010196C7
+:100F90000E940C0A8091E8008E778093E8000F9001
+:100FA0000F900F90DF91CF910895CF93DF9300D0F2
+:100FB0001F92CDB7DEB72091E401243021F522E065
+:100FC00029839B838A8383E08093E9008FEF90914C
+:100FD000E800815095FD06C095ED9A95F1F7000067
+:100FE0008111F5CF8091E80085FF0DC040E050E011
+:100FF00063E070E0CE0101960E940C0A8091E80047
+:101000008E778093E8000F900F900F90DF91CF9133
+:1010100008952091E4012430F1F422E02093E900C6
+:101020002FEF3091E800215035FD06C035ED3A959F
+:10103000F1F700002111F5CF2091E80025FF0BC04A
+:1010400040E050E065E070E00E940C0A8091E8000A
+:101050008E778093E8000895CF93DF93EC01809121
+:10106000E401843009F046C090910C019923D9F035
+:1010700090910D019923B9F08093E9008FEF909141
+:10108000E800815095FD06C095E19A95F1F70000C2
+:101090008111F5CF8091E80085FF2CC040E050E041
+:1010A00060E170E017C081E08093E9008FEF9091DC
+:1010B000E800815095FD06C095ED9A95F1F7000086
+:1010C0008111F5CF8091E80085FF14C040E050E029
+:1010D00068E070E0CE010E940C0A8091E8008E77F3
+:1010E0008093E80080E1FE01A2E5B1E001900D925D
+:1010F0008A95E1F7DF91CF9108958091E301811105
+:1011000009C00E949E0B0E94FB0B8091E20084604C
+:101110008093E20008951092E301089508950C94DD
+:10112000BC210E941F1B0E94C2210E94980E0C9499
+:101130009D0742E061EC81E00E94180B42E061EC07
+:1011400082E00E94180B42E061EC83E00E94180BE1
+:1011500042E161EC84E00C94180B8091E60183304D
+:1011600009F455C030F4813071F0823009F48EC03A
+:1011700008958A3009F47AC08B3009F460C0893050
+:1011800009F09CC020C08091E501813A09F096C029
+:101190008091E800877F8093E8008091E901909139
+:1011A000EA01892B21F060E080E090E003C060E17B
+:1011B00082E591E070E00E94550A8091E8008B770B
+:1011C0008093E80008958091E501813209F076C0AE
+:1011D0008091E9019091EA01009719F0039709F0D5
+:1011E0006DC08091E800877F8093E8008091E800DF
+:1011F00082FD05C08091E4018111F8CF5FC080912C
+:10120000F100809362018091E8008B7753C0809158
+:10121000E501813A09F052C08091E9019091EA011B
+:10122000892B09F04BC08091E800877F8093E8000C
+:101230008091E80080FFFCCF80910C0136C0809146
+:10124000E5018132D9F58091E9019091EA01892B7C
+:10125000A9F58091E800877F8093E8000E944D0BFC
+:101260008091E70180930C010C941B148091E5019F
+:10127000813221F58091E800877F8093E8000E9409
+:101280004D0B8091E8018093630108958091E50101
+:10129000813AA1F48091E800877F8093E8008091F3
+:1012A000E80080FFFCCF809163018093F100809182
+:1012B000E8008E778093E8000C944D0B089584B776
+:1012C000877F84BF88E10FB6F89480936000109206
+:1012D00060000FBE90E080E80FB6F8948093610044
+:1012E000909361000FBE0E94E70E0E949E0B0E9429
+:1012F000FB0B8091E20084608093E20078940E946E
+:10130000760E0E94E90E82E091E00E94930E0E9408
+:10131000AA218091E401853069F40E94DD1A809150
+:10132000E2018823B1F30E940B1B882391F30E94F2
+:10133000F609EFCF0E94EF0EECCF292F3327233091
+:101340003105A9F06CF42130310509F442C0223096
+:10135000310509F043C08DE690E024E632E042C05A
+:1013600021323105C9F02232310519F137C09927F0
+:101370008130910541F08230910541F0892B71F562
+:10138000E0E6F2E005C0E8E4F2E002C0E0E3F2E00B
+:10139000849190E09F0126C0643000F5E62FF0E0D4
+:1013A000EE0FFF1FEE5DFE4F2081318189E090E05E
+:1013B00019C0643098F4E62FF0E0DF01AA0FBB1FDC
+:1013C000A65EBE4F2D913C91EA5EFE4F808190E07B
+:1013D00009C082E190E021ED32E004C080E090E0BD
+:1013E00020E030E0FA0131832083089580E189BD57
+:1013F00082E189BD09B400FEFDCF8091D8008F7DC8
+:101400008093D8008091E00082608093E00080911A
+:10141000E00081FDFCCF0895CF92DF92EF92FF9222
+:101420000F931F93CF93DF937C018B01EA010E94FE
+:101430006E0B811131C0209731F088819981081B92
+:10144000190BE80EF91EC12CD12C0115110519F14B
+:101450008091E80085FD14C08091E8008E7780932C
+:10146000E800209741F0888199818C0D9D1D99831A
+:10147000888385E011C00E946E0B882331F30CC075
+:10148000F70181917F018093F10001501109FFEF75
+:10149000CF1ADF0ADACF80E0DF91CF911F910F9151
+:1014A000FF90EF90DF90CF9008952091EB01309165
+:1014B000EC012617370748F06115710539F42091C2
+:1014C000E8002E772093E80001C0B901FC0120E07C
+:1014D00061157105B9F18091E401882309F440C0D8
+:1014E000853009F43FC08091E80083FD3DC08091C4
+:1014F000E80082FF06C08091E80082FF26C080E0FD
+:1015000008958091E80080FFE3CF2091F30080915F
+:10151000F20090E0922B6115710551F08830910531
+:1015200038F421912093F100615071090196F3CFB5
+:1015300021E0089709F020E08091E8008E77809301
+:10154000E800C6CF2111C7CFD6CF8091E401882310
+:1015500039F0853039F08091E80083FFCCCF04C0AA
+:1015600082E0089583E0089581E008952091EB01E1
+:101570003091EC012617370748F06115710539F4F1
+:101580002091E8002E772093E80001C0B901FC010A
+:1015900020E061157105C1F18091E401882309F40F
+:1015A00041C0853009F440C08091E80083FD3EC011
+:1015B0008091E80082FF06C08091E80082FF27C08A
+:1015C00080E008958091E80080FFE3CF2091F30050
+:1015D0008091F20090E0922B6115710559F08830EE
+:1015E000910540F424912093F100319661507109E6
+:1015F0000196F2CF21E0089709F020E08091E80001
+:101600008E778093E800C5CF2111C6CFD5CF8091CA
+:10161000E401882339F0853039F08091E80083FFB8
+:10162000CBCF04C082E0089583E0089581E008955F
+:10163000982F973058F59093E900981739F07091EA
+:10164000EC002091ED005091F00003C0242F762F84
+:1016500050E021FF19C03091EB003E7F3093EB004A
+:101660003091ED003D7F3093ED003091EB00316023
+:101670003093EB007093EC002093ED005093F0005A
+:101680002091EE0027FF07C09F5FD3CF8F7080931C
+:10169000E90081E0089580E008958091E50187FDEB
+:1016A00005C08091E80080FF0EC012C08091E80064
+:1016B00082FD05C08091E4018111F8CF08958091E9
+:1016C000E8008B7708C08091E4018111EACF08958A
+:1016D0008091E8008E778093E80008958091E4007F
+:1016E0009091E50045E62091EC0020FF21C020917B
+:1016F000E80020FD21C02091E401222389F025305B
+:1017000089F02091EB0025FD0FC02091E40030917D
+:10171000E5002817390739F3415041F0C901E3CFFB
+:1017200082E0089583E0089581E0089584E00895BB
+:101730002091E80022FFDFCF80E008950E940C0C8A
+:101740000E94140CE0EEF0E0808181608083E8ED7F
+:10175000F0E080818F77808319BCA7EDB0E08C9199
+:101760008E7F8C9380818F7E80831092E301089519
+:101770000F931F93CF93DF930E940C0C0E94140CC5
+:10178000C8EDD0E088818F778883888180688883DE
+:1017900088818F7D888319BC1092E4011092E0014A
+:1017A0001092E2011092E10100EE10E0F801808158
+:1017B0008B7F808388818160888342E060E080E065
+:1017C0000E94180BE1EEF0E080818E7F8083E2EED4
+:1017D000F0E0808181608083808188608083F8016F
+:1017E00080818E7F8083888180618883DF91CF9123
+:1017F0001F910F910895E8EDF0E080818F7E808346
+:10180000E7EDF0E080818160808384E082BF81E049
+:101810008093E3010C94B80BE8EDF0E080818E7FBB
+:1018200080831092E20008951092DA001092E10095
+:1018300008951F920F920FB60F9211242F933F938A
+:101840004F935F936F937F938F939F93AF93BF93C8
+:10185000EF93FF938091E10082FF0BC08091E20043
+:1018600082FF07C08091E1008B7F8093E1000E949E
+:10187000750E8091DA0080FF1FC08091D80080FF34
+:101880001BC08091DA008E7F8093DA008091D900AE
+:1018900080FF0DC080E189BD82E189BD09B400FEF1
+:1018A000FDCF81E08093E4010E947D0805C019BC52
+:1018B0001092E4010E948B088091E10080FF19C022
+:1018C0008091E20080FF15C08091E2008E7F8093BE
+:1018D000E2008091E20080618093E2008091D80074
+:1018E00080628093D80019BC85E08093E4010E9457
+:1018F0008F088091E10084FF30C08091E20084FF76
+:101900002CC080E189BD82E189BD09B400FEFDCF14
+:101910008091D8008F7D8093D8008091E1008F7EE8
+:101920008093E1008091E2008F7E8093E2008091BD
+:10193000E20081608093E2008091E001882311F051
+:1019400084E007C08091E30087FF02C083E001C00C
+:1019500081E08093E4010E9491088091E10083FF7F
+:1019600029C08091E20083FF25C08091E100877F3C
+:101970008093E10082E08093E4011092E001809185
+:10198000E1008E7F8093E1008091E2008E7F809362
+:10199000E2008091E20080618093E20042E060E03A
+:1019A00080E00E94180B8091F00088608093F00026
+:1019B0000E948E08FF91EF91BF91AF919F918F91FF
+:1019C0007F916F915F914F913F912F910F900FBE3B
+:1019D0000F901F9018951F920F920FB60F9211241F
+:1019E0002F933F934F935F936F937F938F939F9327
+:1019F000AF93BF93CF93EF93FF93C091E900CF7064
+:101A00008091EC001092E9008091F000877F809334
+:101A1000F00078940E94270D1092E9008091F00068
+:101A200088608093F000C093E900FF91EF91CF911F
+:101A3000BF91AF919F918F917F916F915F914F91E6
+:101A40003F912F910F900FBE0F901F9018951F93ED
+:101A5000CF93DF93CDB7DEB7AA970FB6F894DEBF6A
+:101A60000FBECDBFE5EEF1E08091F100819321E062
+:101A7000ED3EF207C9F70E94AD088091E80083FFB0
+:101A80001CC12091E5013091E601832F90E08A305E
+:101A9000910508F012C1FC01EA5AFF4F0C94532340
+:101AA000203881F0223809F008C18091E9018F7057
+:101AB0008093E9008091EB0085FB882780F91092E4
+:101AC000E90006C08091E1019091E20191118260EC
+:101AD0009091E800977F9093E8008093F100109236
+:101AE000F100C5C0822F8D7F09F0E7C0222319F0D5
+:101AF000223061F0E2C08091E701813009F0DDC061
+:101B0000333009F080E08093E20128C08091E70142
+:101B1000811124C02091E9012F7009F4CEC02093D7
+:101B2000E9008091EB0080FF19C08091EB00333019
+:101B300011F4806211C080618093EB0081E090E03D
+:101B4000022E01C0880F0A94EAF78093EA001092EF
+:101B5000EA008091EB0088608093EB001092E9002E
+:101B60008091E800877F86C02111A7C01091E7010E
+:101B70001F778091E3008078812B8093E300809130
+:101B8000E800877F8093E8000E944D0B8091E80079
+:101B900080FFFCCF8091E30080688093E3001123F5
+:101BA00011F083E001C082E08093E40186C02058F8
+:101BB000223008F082C08091E7019091E8018C3DCD
+:101BC00023E0920779F583E08A838AE289834FB71D
+:101BD000F894DE01139620E03EE051E2E32FF0E0BE
+:101BE00050935700E49120FF03C0E295EF703F5FF0
+:101BF000EF708E2F90E0EA3010F0C79601C0C096CB
+:101C00008D939D932F5F243149F74FBF8091E8005A
+:101C1000877F8093E8006AE270E0CE0101960E941F
+:101C2000550A14C0AE014F5F5F4F6091E9010E94F9
+:101C30009D09009709F441C02091E800277F209377
+:101C4000E800BC0189819A810E94B60A8091E8006F
+:101C50008B778093E80031C0203879F58091E800D7
+:101C6000877F8093E8008091E0018093F10080916C
+:101C7000E8008E778093E8000E944D0B1EC0211172
+:101C80001CC09091E7019230C0F48091E800877FFA
+:101C90008093E8009093E0010E944D0B8091E00159
+:101CA000811104C08091E30087FF02C084E001C07D
+:101CB00081E08093E4010E9499088091E80083FF0D
+:101CC0000AC08091E800877F8093E8008091EB0054
+:101CD00080628093EB00AA960FB6F894DEBF0FBE29
+:101CE000CDBFDF91CF911F9108950895CF9380913B
+:101CF000E4018823B1F08091E9008F709091EC00AD
+:101D000090FF02C090E801C090E0C92FC82B10924C
+:101D1000E9008091E80083FD0E94270DCF70C093F9
+:101D2000E900CF9108959093690180936801089527
+:101D3000E0916801F0916901309721F00190F08104
+:101D4000E02D099480E00895E0916801F091690127
+:101D5000309721F00280F381E02D09940895E091FD
+:101D60006801F0916901309721F00480F581E02D40
+:101D700009940895209166013091670182179307B5
+:101D800071F09093670180936601E0916801F09192
+:101D90006901309721F00680F781E02D09940895BC
+:101DA00020916401309165018217930771F090933F
+:101DB000650180936401E0916801F09169013097B9
+:101DC00021F00084F185E02D0994089508950C9484
+:101DD000E60E0E94251B0E94B5030C94EB1BCF92CC
+:101DE000DF92EF92FF920F931F93CF93DF93CDB7C4
+:101DF000DEB72B970FB6F894DEBF0FBECDBF0E94A3
+:101E0000CD038BE6C82E81E0D82E00E010E0E02E56
+:101E1000802F0E94BB04F60141916F01F42EF82639
+:101E2000B1F40F5F1F4F0E30110589F78FEF8983D3
+:101E30008A831B820E942E1B8160782F9D838C8356
+:101E400049815A816B818D810E94920F40C090918F
+:101E5000CD0191FF04C08B870E94C1048B8520E0D7
+:101E600030E04F2D50E0922FBA01022E02C075953E
+:101E700067950A94E2F760FF24C02E83EF8221E089
+:101E800030E0690102C0CC0CDD1C9A95E2F790E0CD
+:101E90008C219D21892B09F420E028870E942E1B8C
+:101EA0008160782F9A8789874E815F8168858A85CE
+:101EB0000E94920FF801E559FE4F8081C826C0822A
+:101EC00006C02F5F3F4F2630310569F6AACF0E942A
+:101ED000D11E10916A010E94980E1817A1F00E945D
+:101EE000980E80936A012B960FB6F894DEBF0FBE52
+:101EF000CDBFDF91CF911F910F91FF90EF90DF90B9
+:101F0000CF900C949D072B960FB6F894DEBF0FBEB2
+:101F1000CDBFDF91CF911F910F91FF90EF90DF9098
+:101F2000CF900895CF93DF93CDB7DEB72B970FB641
+:101F3000F894DEBF0FBECDBF4F83588769877A877D
+:101F40008B87DE01119686E0FD0111928A95E9F7F3
+:101F500085E0FE01379601900D928A95E1F749815F
+:101F60005A816B817C818D819E810E94E7162B9620
+:101F70000FB6F894DEBF0FBECDBFDF91CF910895AD
+:101F80000895CF93C82F882309F4C1C0823859F42B
+:101F90000E94980E81FDBBC089E30E9491190E94A6
+:101FA0005B1A89E30CC0833879F40E94980E80FD97
+:101FB000AEC083E50E9491190E945B1A83E50E94DE
+:101FC000D119CF910C945B1A843859F40E94980E61
+:101FD00082FD9DC087E40E9491190E945B1A87E4EC
+:101FE000EECF8CEF8C0F813A48F48C2F0E940F219A
+:101FF00081118DC08C2F0E949119E3CF80E28C0F4C
+:10200000883048F4C77081E001C0880FCA95EAF7AC
+:102010000E94121AD6CF8BE58C0F833078F4C53A24
+:1020200029F0C63A31F482E890E005C081E890E0FA
+:1020300002C083E890E0CF910C94BA0E88E58C0F33
+:10204000833108F064C0C83A39F1C93A41F1CA3A5B
+:1020500049F1CB3A51F1CC3A59F1CD3A61F1C03B5B
+:1020600069F1CE3A71F1CF3A79F1C13B81F1C23BCE
+:1020700089F1C33B91F1C43B99F1C53BA1F1C63B4A
+:10208000A9F1C73BB1F1C83BB9F1C93BC1F1CA3BAA
+:10209000C9F58AE292E038C082EE90E035C089EE60
+:1020A00090E032C08AEE90E02FC085EB90E02CC02B
+:1020B00086EB90E029C087EB90E026C08CEC90E0A6
+:1020C00023C08DEC90E020C083E891E01DC08AE839
+:1020D00091E01AC082E991E017C084E991E014C050
+:1020E00081E292E011C083E292E00EC084E292E0CD
+:1020F0000BC085E292E008C086E292E005C087E26C
+:1021000092E002C080E090E0CF910C94D00ECF918D
+:102110000895882309F44BC0823859F40E94980E20
+:1021200081FF45C089E30E9491190E945B1A89E3EF
+:102130000CC0833871F40E94980E80FF38C083E58C
+:102140000E9491190E945B1A83E50E94D1190C9498
+:102150005B1A843859F40E94980E82FF28C087E4E5
+:102160000E9491190E945B1A87E4EFCF9CEF980FB1
+:10217000913A58F390E2980F983050F4877091E0BC
+:1021800001C0990F8A95EAF7892F0E94181ADFCFAC
+:102190009BE5980F933020F480E090E00C94BA0E09
+:1021A000885A833120F480E090E00C94D00E08959A
+:1021B000882321F00E94121A0C945B1A0895882338
+:1021C00021F00E94181A0C945B1A0895CF92DF92A6
+:1021D000EF92FF920F931F93CF93DF93CDB7DEB7AC
+:1021E00028970FB6F894DEBF0FBECDBF8C0185E0F7
+:1021F000F801DE01119601900D928A95E1F7F80140
+:10220000D080E180F280558152955F7023813481C6
+:10221000232B39F0FFEFEF1206C081E0DF1203C07D
+:1022200003C081E001C080E080FDE2C2C8015F839D
+:102230000E94C00FD982EA8269817A818F2D0E9423
+:102240008D199E8388870E9441190E9414184E811F
+:102250005F816885FF2029F00E942F1A68855F81C1
+:102260004E81E42FE295EF70F0E0E05AFF4F0C94BE
+:102270005323842F807F142F1F70882311F0129511
+:10228000107FFF20B1F0112309F467C280E2860FAE
+:10229000883028F4812F68870E94121A04C0812F89
+:1022A00068870E94221A688568870E945B1A688581
+:1022B00054C2862F68870E9489106885112309F40B
+:1022C00097C2605E812F683018F40E94181A02C00D
+:1022D0000E94281A28960FB6F894DEBF0FBECDBF15
+:1022E000DF91CF911F910F91FF90EF90DF90CF90F2
+:1022F0000C945B1A242F207F842F8F70203211F0D2
+:102300008295807F662319F0613019F12BC0FF2080
+:10231000B1F0552309F493C1513009F090C12896CA
+:102320000FB6F894DEBF0FBECDBFDF91CF911F91E6
+:102330000F91FF90EF90DF90CF900C94421A5523AD
+:1023400019F0513009F454C28E830E94451A8E81CF
+:1023500089C1FF2021F0523008F04AC270C15111EA
+:1023600047C280C1FF2021F0552309F468C1F5C19F
+:10237000552309F477C105C2242F2695269523708D
+:1023800030E02115310521F021303105C9F030C28E
+:10239000FF2021F0862F942F937002C080E090E000
+:1023A00028960FB6F894DEBF0FBECDBFDF91CF9158
+:1023B0001F910F91FF90EF90DF90CF900C94BA0E89
+:1023C000FF2021F0862F942F937002C080E090E0D0
+:1023D00028960FB6F894DEBF0FBECDBFDF91CF9128
+:1023E0001F910F91FF90EF90DF90CF900C94D00E43
+:1023F000862FFF2019F00E94D91D02C00E94411EA5
+:1024000028960FB6F894DEBF0FBECDBFDF91CF91F7
+:102410001F910F91FF90EF90DF90CF900C94C61E0C
+:10242000842F837009F076C0F110E2C1262F229527
+:1024300026952770220F220F862F8F70C82ED12C41
+:10244000E12CF12C022E04C0CC0CDD1CEE1CFF1C78
+:102450000A94D2F764FF10C06FE070E080E090E073
+:1024600004C0660F771F881F991F2A95D2F76095C1
+:1024700070958095909503C060E070E0CB01242FAB
+:10248000269526952370422F50E042305105D1F019
+:102490004330510559F16C297D298E299F294130FE
+:1024A000510541F128960FB6F894DEBF0FBECDBF9F
+:1024B000DF91CF911F910F91FF90EF90DF90CF9020
+:1024C0000C9439186C297D298E299F2928960FB6DE
+:1024D000F894DEBF0FBECDBFDF91CF911F910F915A
+:1024E000FF90EF90DF90CF900C9453180E94391812
+:1024F000C701B60128960FB6F894DEBF0FBECDBF58
+:10250000DF91CF911F910F91FF90EF90DF90CF90CF
+:102510000C941F18FF2019F0842F817001C086953C
+:10252000882309F465C1262F229526952770220F4E
+:10253000220F862F8F70C82ED12CE12CF12C022E69
+:1025400004C0CC0CDD1CEE1CFF1C0A94D2F764FF07
+:1025500010C06FE070E080E090E004C0660F771F6D
+:10256000881F991F2A95D2F7609570958095909550
+:1025700003C060E070E0CB01242F269526952370E0
+:10258000422F50E042305105D1F04330510559F10E
+:102590006C297D298E299F294130510541F12896CA
+:1025A0000FB6F894DEBF0FBECDBFDF91CF911F9164
+:1025B0000F91FF90EF90DF90CF900C940D196C2944
+:1025C0007D298E299F2928960FB6F894DEBF0FBE6D
+:1025D000CDBFDF91CF911F910F91FF90EF90DF90D2
+:1025E000CF900C9427190E940D19C701B6012896A7
+:1025F0000FB6F894DEBF0FBECDBFDF91CF911F9114
+:102600000F91FF90EF90DF90CF900C94F318603F04
+:10261000C9F118F4603E50F49BC0623F09F460C0F9
+:1026200008F44AC0633F09F46FC092C0162F1F70B0
+:10263000842F8F71FF2099F00E948C18812F28968B
+:102640000FB6F894DEBF0FBECDBFDF91CF911F91C3
+:102650000F91FF90EF90DF90CF900C94D8100E94D4
+:10266000AD18812F28960FB6F894DEBF0FBECDBFF0
+:10267000DF91CF911F910F91FF90EF90DF90CF905E
+:102680000C94DF10FF20A1F05111B2C0842F8F7184
+:1026900028960FB6F894DEBF0FBECDBFDF91CF9165
+:1026A0001F910F91FF90EF90DF90CF900C94D21874
+:1026B000523008F09DC0EACFFF20A1F0842F8F7127
+:1026C00028960FB6F894DEBF0FBECDBFDF91CF9135
+:1026D0001F910F91FF90EF90DF90CF900C948C188A
+:1026E000FF2061F3842F8F7128960FB6F894DEBF18
+:1026F0000FBECDBFDF91CF911F910F91FF90EF9053
+:10270000DF90CF900C94AD18FF2091F0842F8F7143
+:1027100028960FB6F894DEBF0FBECDBFDF91CF91E4
+:102720001F910F91FF90EF90DF90CF900C9477184E
+:1027300028960FB6F894DEBF0FBECDBFDF91CF91C4
+:102740001F910F91FF90EF90DF90CF900C946D1838
+:10275000FF20A1F0552309F4B1CF862F28960FB69C
+:10276000F894DEBF0FBECDBFDF91CF911F910F91C7
+:10277000FF90EF90DF90CF900C94C10F552309F498
+:10278000B1CF862F28960FB6F894DEBF0FBECDBF0F
+:10279000DF91CF911F910F91FF90EF90DF90CF903D
+:1027A0000C9489104F70C8010E94550228960FB6EC
+:1027B000F894DEBF0FBECDBFDF91CF911F910F9177
+:1027C000FF90EF90DF90CF900C9494174F70C8015A
+:1027D00028960FB6F894DEBF0FBECDBFDF91CF9124
+:1027E0001F910F91FF90EF90DF90CF900C94C20457
+:1027F00028960FB6F894DEBF0FBECDBFDF91CF9104
+:102800001F910F91FF90EF90DF90CF9008950E945D
+:102810002F1A0E943F1A0E94041A0E945B1A0E94FB
+:10282000721F0E94C61E80E090E00E94BA0E80E0F7
+:1028300090E00C94D00E0E941F1A0C9407140E9472
+:102840008219292F22952F7030E02C3031054CF45D
+:102850002A3031056CF4225031092230310590F4D0
+:1028600007C02C30310551F02F30310539F00AC046
+:10287000803E10F0803F31F481E0089593FB88277B
+:1028800080F9089580E00895CF93DF9300D000D0C1
+:102890001F92CDB7DEB70F900F900F900F900F9053
+:1028A000DF91CF910895CF93DF9300D000D000D077
+:1028B000CDB7DEB726960FB6F894DEBF0FBECDBFFC
+:1028C000DF91CF9108951F93CF93DF93C09179014A
+:1028D00016E080917A01C81799F0D0E01C9FF001B2
+:1028E0001D9FF00D1124E558FE4F408151816281FA
+:1028F0007381848195810E9453142196C770E9CF1A
+:10290000DF91CF911F9108954091AB015091AC019F
+:102910006091AD017091AE018091AF019091B001D5
+:102920000C945314CF938091B00182958F7009F06D
+:102930005FC08091AD01882309F45AC020917901CC
+:10294000A0917A016091AB017091AC018091AE01D0
+:102950009091AF0131E06F3F09F030E0B32FC6E056
+:102960002A1709F445C0009721F07F3F21F44B2F2F
+:1029700003C041E001C040E030E040FD35C0C29FEF
+:10298000F001C39FF00D1124E558FE4F41817413EF
+:102990002BC04081641328C04281411125C043816E
+:1029A00054814817590710F441505109481B590BDD
+:1029B000483C5105C8F48091B0018F7080618093CC
+:1029C000B00186E0829FF001839FF00D1124E05852
+:1029D000FE4F80818F70806180838BEA91E00E943E
+:1029E000E610CF910C9463142F5F3F4F2770B8CF40
+:1029F000CF910895CF92DF92EF92FF920F931F93A2
+:102A0000CF93DF93CDB7DEB762970FB6F894DEBFF2
+:102A10000FBECDBF8C0185E0F801DE011D9601904F
+:102A20000D928A95E1F7D8014C9111965C9111971E
+:102A300012966C9112971396ED90FC9014977091EA
+:102A4000AB01E091AC012091AE013091AF012115B5
+:102A5000310531F0EF3F31F481E07F3F19F403C0DD
+:102A600081E001C080E0B82FB170CB2E80FD6CC139
+:102A7000D090AD01DD2009F4F5C0F091B001E2166F
+:102A8000F30638F0C701821B930B883C910548F090
+:102A90009BC0209530952E0D3F1D283C310508F038
+:102AA00093C08F2F807F09F052C0E51314C07413B8
+:102AB00012C0D62E61110FC0FF70F061F093B0010B
+:102AC0000E9484148BEA91E00E94E6108091B0018C
+:102AD000F80185836CC1EF2831F05F3F31F481E06C
+:102AE0004F3F19F403C081E001C080E080FD03C0C6
+:102AF00081E0862701C080E0F82FF170FF2E80FF73
+:102B00001CC08091790120917A0136E0821709F486
+:102B100028C190E0389FF001399FF00D1124E5584D
+:102B2000FE4F7181571306C07081471303C0728135
+:102B3000671303C001968770E9CFD62E662309F488
+:102B400036C18091B00181608093B00153C0E5131C
+:102B500008C0741306C0611104C0D8011596FC9317
+:102B6000AEC04D875E878D859E856A8B0E941F143F
+:102B70006A89882329F1D62E662311F12091B001AC
+:102B8000822F82958F7090E002970CF460C0809144
+:102B9000AB019091AC0198878F831986FB86EA86FA
+:102BA0002C87CE01079651C0E51731F14D875E871E
+:102BB0008D859E856A8B0E941F146A8981112EC0A3
+:102BC000C8010E94E610A4C08F2F807F69F77E2D78
+:102BD000F98AE88A89890E9444148BEA91E00E946C
+:102BE000E610EBEAF1E086E0DF011D928A95E9F755
+:102BF0000E948414D12CDBC07413D8CF6111D6CFBE
+:102C0000D8011596FC93C8010E94E610EBEAF1E0AA
+:102C100086E0DF011D928A95E9F7C9C0D62E6623AA
+:102C200079F22091B001822F82958F7090E0029707
+:102C300074F08091AB019091AC019A8389831B82DF
+:102C4000FD82EC822E83CE0101960E94E61086E082
+:102C5000F801ABEAB1E001900D928A95E1F70E948C
+:102C600092146FC0E216F30628F0C701821B930B83
+:102C70009C0104C0209530952E0D3F1D283C310548
+:102C800008F052C0D62E662309F49ACFE5132CC063
+:102C900074132AC08091B00180FD1DC0982F9295B9
+:102CA0009F70C9F0D80115968C9315979F3039F015
+:102CB0009F5F9295907F8F70892B15968C93C8019A
+:102CC0000E94E61086E0F801ABEAB1E001900D92B7
+:102CD0008A95E1F736C086E0F801ABEAB1E00190F1
+:102CE0000D928A95E1F763C04D875E878D859E853D
+:102CF0000E941F14882379F086E0F801ABEAB1E066
+:102D000001900D928A95E1F70E9492140E9484141A
+:102D1000DD24D3944CC08091B00181608093B001D8
+:102D2000C8010E94E61043C07E2DF98AE88A89898D
+:102D30000E944414EBEAF1E086E0DF011D928A95DF
+:102D4000E9F70E94841433C0662309F439CF4D8714
+:102D50005E878D859E850E941F14882309F430CFDD
+:102D6000CBCF4D875E878D859E850E948219292F46
+:102D700022952F7030E0223031052CF49F7041F005
+:102D8000811106C00CC0243031052CF49F7049F429
+:102D9000805E883020F0C8010E94E610CF2CDC2C29
+:102DA00006C0D80115969C91907F91F7F8CF8D2D94
+:102DB00062960FB6F894DEBF0FBECDBFDF91CF9104
+:102DC0001F910F91FF90EF90DF90CF9008951F9388
+:102DD000CF93DF93CDB7DEB72C970FB6F894DEBF55
+:102DE0000FBECDBF4F83588769877A878B879C87B3
+:102DF000CE0107960E94FA148823C1F02F813885EE
+:102E00008A859B85892B31F03F3F11F080E003C01C
+:102E10002F3FE1F781E0811147C04F8158856985D7
+:102E20007A858B859C850E9453143EC086E0FE0106
+:102E30003796DE01119601900D928A95E1F7FF8198
+:102E4000E8854A855B854115510531F0EF3F31F446
+:102E500081E0FF3F19F403C081E001C080E080FD04
+:102E600023C020917A0130E0C9010196877099272B
+:102E70006091790170E086179707F1F1F983EA8391
+:102E80005D834C8396E0929FD001939FB00D1124F7
+:102E9000A558BE4FFE01319601900D929A95E1F72B
+:102EA00080937A010E94631416E0809179019091D9
+:102EB0007A01891779F1189FC001112485589E4F16
+:102EC0000E94FA14882331F1E09179011E9FF001EC
+:102ED0001124E558FE4F40815181628173818481C4
+:102EE00095810E9453148091790190E0019687703A
+:102EF000992780937901D9CF0E941B1410927A01EF
+:102F000010927901EBEAF1E086E0DF011D928A95EB
+:102F1000E9F7CACF2C960FB6F894DEBF0FBECDBF2F
+:102F2000DF91CF911F910895EF92FF920F931F931E
+:102F3000CF93DF93FC01009709F46FC0F12CEE24CE
+:102F4000E394EF0121968491843740F4843008F0B3
+:102F500055C0813081F0823021F15FC0853709F49E
+:102F600047C0C0F19CE7980F903708F056C08F77A4
+:102F70000E94891045C08F010E5F1F4FFE01849192
+:102F800090E2980F983050F48770FE2D01C0FF0F2B
+:102F90008A95EAF78F2F0E94321A15C00E94C10F3E
+:102FA00014C08F010E5F1F4FFE01849190E2980FB5
+:102FB000983068F48770FE2D01C0FF0F8A95EAF7FC
+:102FC0008F2F0E94381A0E945B1AE80119C00E94D4
+:102FD0008910FBCFCF010296FE01C491CC2361F092
+:102FE000EFE9FFE03197F1F700C00000C150F6CFE4
+:102FF000CF010296FE01F490EC0102C00E94C10FC5
+:103000008F2D882341F0EFE9FFE03197F1F700C001
+:1030100000008150F6CFFE0194CFDF91CF911F9138
+:103020000F91FF90EF90089508956093B50170930C
+:10303000B6018093B7019093B8010C9407140F93D5
+:103040001F930091B5011091B6012091B701309105
+:10305000B801062B172B282B392B0093B5011093A1
+:10306000B6012093B7013093B8011F910F910C94D2
+:1030700007140F931F930091B5011091B601209191
+:10308000B7013091B8010623172328233923009371
+:10309000B5011093B6012093B7013093B8011F9189
+:1030A0000F910C9407140F931F930091B501109189
+:1030B000B6012091B7013091B801062717272827BC
+:1030C00039270093B5011093B6012093B7013093CF
+:1030D000B8011F910F910C9407141092B101109236
+:1030E000B2011092B3011092B4010C94071441E0A4
+:1030F00050E060E070E004C0440F551F661F771F6A
+:103100008A95D2F74093B1015093B2016093B30115
+:103110007093B4010C94071441E050E060E070E05B
+:1031200004C0440F551F661F771F8A95D2F7809100
+:10313000B1019091B201A091B301B091B401842B7F
+:10314000952BA62BB72B8093B1019093B201A0933E
+:10315000B301B093B4010C94071441E050E060E077
+:1031600070E004C0440F551F661F771F8A95D2F781
+:1031700040955095609570958091B1019091B20104
+:10318000A091B301B091B40184239523A623B72362
+:103190008093B1019093B201A093B301B093B401B5
+:1031A0000C94071441E050E060E070E004C0440F6C
+:1031B000551F661F771F8A95D2F78091B1019091B4
+:1031C000B201A091B301B091B40184279527A6273D
+:1031D000B7278093B1019093B201A093B301B0934C
+:1031E000B4010C9407140F931F930091B101109137
+:1031F000B2012091B3013091B401062B172B282B7B
+:10320000392B0093B1011093B2012093B301309395
+:10321000B4011F910F910C9407140F931F93009109
+:10322000B1011091B2012091B3013091B401062394
+:103230001723282339230093B1011093B20120935F
+:10324000B3013093B4011F910F910C9407140F93A5
+:103250001F930091B1011091B2012091B3013091FF
+:10326000B40106271727282739270093B1011093A7
+:10327000B2012093B3013093B4011F910F910C94CC
+:1032800007140895CF92DF92EF92FF920F931F934E
+:10329000CF93DF93EC01C090B501D090B601E090E0
+:1032A000B701F090B8018091B1019091B201A09165
+:1032B000B301B091B401C82AD92AEA2AFB2A0FE146
+:1032C00010E0B701A601002E04C0769567955795CA
+:1032D00047950A94D2F740FD05C00150110988F7BF
+:1032E00080E007C0BE01802F0E9402070197A9F36A
+:1032F000802FDF91CF911F910F91FF90EF90DF9082
+:10330000CF900895CF93DF93EC010E944219BE0144
+:103310000E940207DF91CF910895CB010E9482198C
+:10332000089590910C019923D9F090910D01992362
+:10333000B9F0982F9695969596959F3088F5E091DF
+:103340000E01F0910F01E90FF11D877021E030E0CF
+:1033500001C0220F8A95EAF78181822B818308952B
+:1033600040910E0150910F0120E030E09FEFFA01F3
+:10337000E20FF31F6281681799F09F3F19F4611102
+:1033800001C0922F2F5F3F4F2E30310581F79F3FB5
+:1033900039F0FA01E90FF11D97FDFA95828308953E
+:1033A000089590910C019923E1F090910D019923DA
+:1033B000C1F0982F9695969596959F3020F5E091BF
+:1033C0000E01F0910F01E90FF11D877021E030E04F
+:1033D00001C0220F8A95EAF7209581812823218355
+:1033E000089540910E0150910F0120E030E0FA0164
+:1033F000E20FF31F9281981301C012822F5F3F4F9B
+:103400002E303105A1F7089581E090E0E0910E01A2
+:10341000F0910F01E80FF91F10820196803191059C
+:10342000A9F708959091CC01982B9093CC01089521
+:1034300080959091CC0198239093CC01089510929F
+:10344000CC0108959091CB01982B9093CB010895D6
+:1034500080959091CB0198239093CB010895109281
+:10346000CB0108959091CA01982B9093CA010895B9
+:1034700080959091CA0198239093CA010895109263
+:10348000CA0108958093B90108951092B901089571
+:1034900040910E0150910F0120E030E080E0FA01F0
+:1034A000E20FF31F918191118F5F2F5F3F4F2F30FC
+:1034B0003105A9F70895E0910E01F0910F01809177
+:1034C000CC018083E0910E01F0910F0180819091F9
+:1034D000CB01892B8083E0910E01F0910F01808157
+:1034E0009091CA01892B80839091B901992361F051
+:1034F000E0910E01F0910F018081892B80830E9461
+:10350000481A81111092B90180910E0190910F011A
+:103510000C94A40ECF92DF92EF92FF920F931F9321
+:103520006C01EE24FF24C114D104E104F10421F460
+:103530006B017C0180E001C080E133272F2D1E2D1F
+:103540000D2D011511052105310519F0885F680160
+:10355000790197018601A4E036952795179507957F
+:10356000AA95D1F7011511052105310519F08C5FD8
+:103570006801790197018601F2E036952795179544
+:103580000795FA95D1F7011511052105310519F0B7
+:103590008E5F68017901B701A60176956795579509
+:1035A0004795452B462B472B09F08F5F1F910F91B5
+:1035B000FF90EF90DF90CF9008958091E4018430E8
+:1035C00039F11092CE0120E488E190E00FB6F89432
+:1035D000A895809360000FBE2093600080E00E9459
+:1035E0009D0783B7817F846083BF83B7816083BF7A
+:1035F0007894889583B78E7F83BF0FB6F894A8958B
+:1036000080916000886180936000109260000FBE1E
+:10361000089508950895CF930E94091B0E94CD0339
+:103620000E940A1BC0E08C2F0E94BB04811104C0C1
+:10363000CF5FCE30C1F701C081E0CF9108950E94E5
+:103640001B140E94980E0C949D0782E084BD93E0A9
+:1036500095BD9AEF97BD80936E0008952FB7F894AB
+:103660008091CF019091D001A091D101B091D20170
+:103670002FBF0895CF92DF92EF92FF920F931F9387
+:103680002FB7F8944091CF015091D0016091D101B2
+:103690007091D2012FBF6A017B01EE24FF248C01BF
+:1036A00020E030E0C016D106E206F30610F44150E7
+:1036B0005109481B590BCA011F910F91FF90EF90C0
+:1036C000DF90CF9008951F920F920FB60F921124A2
+:1036D0008F939F93AF93BF938091CF019091D0012F
+:1036E000A091D101B091D2010196A11DB11D80938D
+:1036F000CF019093D001A093D101B093D201BF919B
+:10370000AF919F918F910F900FBE0F901F901895C2
+:103710000E949E0BF8942FEF87EA91E6215080409B
+:103720009040E1F700C0000087E090EBDC0180935F
+:10373000EE019093EF01A093F001B093F1012CE022
+:1037400088E190E00FB6F894A895809360000FBED2
+:1037500020936000FFCFEF92FF920F931F93CF93C0
+:10376000DF93D82FC0E08C2F0E94BB0400E010E054
+:10377000E82EF12CC701002E02C0959587950A947A
+:10378000E2F780FD06C00F5F1F4F0630110591F76D
+:1037900009C0602F7C2F80E00E94C304D813F3CFB0
+:1037A00081E004C0CF5FCE30F1F680E0DF91CF91B1
+:1037B0001F910F91FF90EF900895CF93C82F8CE247
+:1037C0000E94AB1B882321F08C2FCF910C94AB1B54
+:1037D00080E0CF910895CF930E94321D811102C0E5
+:1037E0000E94181DC5E6C15049F00E94CD038FE329
+:1037F0009CE90197F1F700C00000F5CF89E20E9433
+:10380000DD1B811113C18AE20E94DD1B81110E9420
+:10381000181D85E00E94DD1B81110E94881B0E94FB
+:103820003D1D8093CD0187E00E94DD1B8823A9F117
+:103830008BE10E94DD1B882351F08091CD0181FB3B
+:10384000222720F991E0922790FB81F90EC08EE0AB
+:103850000E94DD1B882361F08091CD0182FB22272D
+:1038600020F991E0922790FB82F98093CD0115C059
+:1038700080E10E94DD1B9091CD01882341F093FBF4
+:10388000222720F981E0822780FB93F904C0892F49
+:10389000809580FB90F99093CD018091CD010E949D
+:1038A000411D0E944F1D8093ED0180EE0E94DD1BA3
+:1038B000882341F08091ED01982F909590FB80F93D
+:1038C0008093ED0189E30E94DD1B882359F08091EC
+:1038D000ED0181FB222720F991E0922790FB81F9ED
+:1038E0008093ED0182EE0E94DD1B882359F08091C8
+:1038F000ED0182FB222720F991E0922790FB82F9CB
+:103900008093ED0186EE0E94DD1B882359F08091A3
+:10391000ED0183FB222720F991E0922790FB83F9A8
+:103920008093ED0183EE0E94DD1B882359F0809186
+:10393000ED0184FB222720F991E0922790FB84F986
+:103940008093ED0185E30E94DD1B882359F080916F
+:10395000ED0185FB222720F991E0922790FB85F964
+:103960008093ED0181E30E94DD1B882359F0809153
+:10397000ED0186FB222720F991E0922790FB86F942
+:103980008093ED0181E10E94DD1B882359F0809135
+:10399000ED0187FB222720F991E0922790FB87F920
+:1039A0008093ED018091ED010E94531D8091ED0106
+:1039B00087FB882780F980930D0187E20E94DD1B39
+:1039C000C82F8EE10E94DD1B8111C2608FE10E9431
+:1039D000DD1B8111C46080E20E94DD1B8111C86083
+:1039E00081E20E94DD1B8111C06182E20E94DD1B29
+:1039F0008111C06283E20E94DD1B8111C06484E2F8
+:103A00000E94DD1B882311F0C06802C0CC2329F07E
+:103A10008C2F0E944A1D6C2F03C00E94461D682FE8
+:103A200070E080E090E0CF910C941518CF9108954C
+:103A30006DEE7EEF80E090E00E948D2360E082E0FA
+:103A400090E00E947B2360E083E090E00E947B2373
+:103A500060E084E090E00E947B2360E085E090E0FD
+:103A60000C947B2380E090E00E94752321E08D3E42
+:103A70009E4F09F020E0822F089582E090E00C94A0
+:103A80006D23682F82E090E00C947B2383E090E02C
+:103A90000C946D23682F83E090E00C947B2384E0EA
+:103AA00090E00C946D23682F84E090E00C947B23CD
+:103AB0008091D50180FF0BC06091130185E0689F64
+:103AC000B001112475956795759567952AC081FF9A
+:103AD00009C06091130185E0689FB00111247595BC
+:103AE00067951FC082FF07C06091130185E0689F42
+:103AF000B001112416C04091D6014423C9F0609151
+:103B00001201461788F72091130185E0289F900144
+:103B10001124429FC001439F900D112470E00E9428
+:103B20003F236038710540F46115710539F002C01A
+:103B300065E070E0862F08958FE7089581E008958D
+:103B40008091D50180FF08C06091110170E07595EA
+:103B500067957595679521C081FF06C06091110139
+:103B600070E07595679519C082FF04C060911101DE
+:103B700070E010C08091D6018823C1F060911001DF
+:103B80008617A0F790911101989FC001112470E051
+:103B90000E943F236038710528F46115710521F0FA
+:103BA000862F08958FE7089581E0089561E070E021
+:103BB000F4CF803F21F40E94581D819504C0813FBD
+:103BC00029F40E94581D8093D9010895823F21F461
+:103BD0000E94581D819504C0833F29F40E94581DFE
+:103BE0008093D8010895893F19F40E94A01D05C053
+:103BF0008A3F31F40E94A01D81958093DA010895D7
+:103C00008B3F21F40E94A01D819504C08C3F29F4B4
+:103C10000E94A01D8093DB010895843F21F48091D0
+:103C2000D701816017C0853F21F48091D701826060
+:103C300011C0863F21F48091D70184600BC0873F7B
+:103C400021F48091D701886005C0883F31F48091CC
+:103C5000D70180618093D70108958D3F21F4809131
+:103C6000D50181600BC08E3F21F48091D501826027
+:103C700005C08F3F29F48091D50184608093D501E0
+:103C80000895803F39F48091D90187FF6CC010926C
+:103C9000D90169C0813F29F48091D9011816BCF37C
+:103CA00062C09091D801823F29F497FF5CC01092C6
+:103CB000D80159C0833F19F41916CCF354C0893F79
+:103CC00041F48091DA0118160CF04DC01092DA011F
+:103CD0004AC08A3F29F48091DA0187FF44C0F6CFB9
+:103CE0008B3F39F48091DB0187FF3DC01092DB01EF
+:103CF0003AC08C3F29F48091DB011816BCF333C025
+:103D0000843F21F48091D7018E7F17C0853F21F435
+:103D10008091D7018D7F11C0863F21F48091D7011A
+:103D20008B7F0BC0873F21F48091D701877F05C02F
+:103D3000883F31F48091D7018F7E8093D70113C0E3
+:103D40008D3F21F48091D5018E7F0BC08E3F21F4F1
+:103D50008091D5018D7F05C08F3F29F48091D501D9
+:103D60008B7F8093D5018091D80181110EC0809105
+:103D7000D90181110AC08091DA01811106C08091B8
+:103D8000DB01811102C01092D601089587ED91E008
+:103D90000E94AF0E0E942E1B9093D4018093D301FA
+:103DA00008951F93CF93DF938091D3019091D40115
+:103DB0000E943A1B4091D601442321F02091140126
+:103DC00030E006C0209115015AE0259F9001112492
+:103DD0008217930708F482C08091D8011091D9010D
+:103DE000D091DA01C091DB01811107C0111105C02A
+:103DF000D11103C0CC2309F471C04F3F19F04F5FBC
+:103E00004093D601181624F40E94581D8093D801BF
+:103E10008091D80187FF05C00E94581D819580932D
+:103E2000D801111624F40E94581D8093D901809165
+:103E3000D90187FF05C00E94581D81958093D90143
+:103E40006091D801662339F11091D901112319F13C
+:103E5000772767FD7095872F972F0E94462223E3CF
+:103E600033E343E35FE30E94AA220E940E226093A1
+:103E7000D801612F772767FD7095872F972F0E94B4
+:103E8000462223E333E343E35FE30E94AA220E9436
+:103E90000E226093D9011D1624F40E94A01D809368
+:103EA000DA018091DA0187FF05C00E94A01D81958B
+:103EB0008093DA011C1624F40E94A01D8093DB017C
+:103EC0008091DB0187FF05C00E94A01D8195809332
+:103ED000DB01DF91CF911F910C94C61EDF91CF9132
+:103EE0001F910895E7EDF1E085E0DF011D928A95CD
+:103EF000E9F71092D6011092D5010895833081F12F
+:103F000028F4813059F08230D1F00895853009F4D9
+:103F100049C0B8F1863009F456C008958091150162
+:103F2000262F30E0280F311D2F3F310524F4680F74
+:103F30006093150108958FEF809315010895809186
+:103F40001401262F30E0280F311D2F3F310524F4B6
+:103F5000680F6093140108958FEF80931401089502
+:103F600080911301262F30E0280F311D2F3F31059E
+:103F700024F4680F6093130108958FEF8093130169
+:103F8000089580911201262F30E0280F311D2F3F18
+:103F9000310524F4680F6093120108958FEF809328
+:103FA0001201089580911101262F30E0280F311D54
+:103FB0002F3F310524F4680F6093110108958FEFAE
+:103FC00080931101089580911001262F30E0280F71
+:103FD000311D2F3F310524F4680F609310010895BF
+:103FE0008FEF809310010895833011F128F4813010
+:103FF00049F0823091F00895853081F120F18630CA
+:10400000C1F1089580911501681720F4861B8093F3
+:1040100015010895109215010895809114016817F3
+:1040200020F4861B809314010895109214010895C2
+:1040300080911301681720F4861B80931301089563
+:1040400010921301089580911201681720F4861BC5
+:104050008093120108951092120108958091110128
+:10406000681720F4861B80931101089510921101A6
+:10407000089580911001681720F4861B8093100129
+:1040800008951092100108950F931F938D3109F434
+:104090006BC008F03FC08E3009F47FC0C0F4873099
+:1040A00009F469C068F4863009F0B1C08091CD018F
+:1040B000817F8E7F8093CD0181E08093DD01A8C058
+:1040C000883009F4A2C08B3009F49FC0A0C08631AB
+:1040D00009F49BC078F4803109F472C0813109F091
+:1040E00096C00E941B1490910D0181E08927809356
+:1040F0000D018BC0893109F488C08B3109F087C06C
+:104100008091CD0181FB222720F991E0922790FB3D
+:1041100081F94CC0853309F470C048F4873209F442
+:104120006CC008F459C0893209F467C070C0833488
+:1041300038F48A3308F04EC0883309F466C067C08B
+:10414000833409F45AC0883409F061C00E941B14FA
+:104150000FEF13ED20E3015010402040E1F700C0C5
+:1041600000000E94881B51C00E94C8210E94980E26
+:104170000E949D074AC09091CD01892F8095817042
+:1041800080FB90F929F0966098609093CD0140C033
+:10419000997F977F9093CD0138C08091CD0182FBAC
+:1041A000222720F991E0922790FB82F98093CD019C
+:1041B000992359F18091CD0181608093CD0125C073
+:1041C0008091CD0183FB222720F991E0922790FB7B
+:1041D00083F9ECCF895301C08D5141E050E060E09C
+:1041E00070E08A019B0104C0000F111F221F331FC2
+:1041F0008A95D2F7C901B80104C061E070E080E09F
+:1042000090E00E9415180E941B1481E001C080E01C
+:104210001F910F91089580E0089580E00895CF9355
+:10422000C82F8091DD01813079F018F08230E9F1FA
+:1042300087C0E0910E01F0910F018081813169F01A
+:10424000823209F07FC009C0E0910E01F0910F01A8
+:104250008081813111F0823261F48C2F0E940B2118
+:10426000811104C08C2F0E9444201DC081E090E089
+:104270001AC08C2F0E940D21811114C0C43179F015
+:1042800048F4CB3079F0C03109F060C082E080930F
+:10429000DD0108C0C93219F0C83321F057C01092AF
+:1042A000DD0154C081E0817053C0C93289F118F535
+:1042B000C43171F1A8F4C73009F046C08AE0809398
+:1042C000150194E19093140193E09093130180936E
+:1042D000120188E08093110188E28093100134C0BC
+:1042E000CE51C63088F5EC2FF0E0E65DFE4F8081C0
+:1042F0008093DC0129C0CE34E9F020F4CB3421F5E1
+:104300006AE013C0C13579F0C235F1F461E00DC047
+:104310008091DC01882319F01092DC0115C081E046
+:104320008093DD0115C061E006C08091DC010E9430
+:104330007E1F0AC06AE08091DC010E94F41F04C065
+:104340001092DD0180E004C081E002C080E0ABCFCC
+:10435000CF910895E1E8F0E08081886080838081DA
+:10436000816080838FB7F89493E09093890090EDFB
+:10437000909388008FBF0895EFE6F0E0808182601F
+:1043800080830895EFE6F0E080818D7F808308953B
+:10439000EFE6F0E0808192E08927808308951F9204
+:1043A0000F920FB60F9211242F933F934F935F9369
+:1043B0006F937F938F939F93AF93BF93EF93FF93ED
+:1043C0008091DE019091DF0101969093DF0180934F
+:1043D000DE01811103C082E00E949D07E091DF01B0
+:1043E000E695E695F0E0E252FC4FE4918091DE0123
+:1043F0008E1303C080E00E949D07FF91EF91BF9153
+:10440000AF919F918F917F916F915F914F913F916C
+:104410002F910F900FBE0F901F9018950E9415229C
+:104420006894B1110C94A42208950E94892288F006
+:104430009F5798F0B92F9927B751B0F0E1F0660F68
+:10444000771F881F991F1AF0BA95C9F714C0B130A9
+:1044500091F00E94A322B1E008950C94A322672F4B
+:10446000782F8827B85F39F0B93FCCF386957795D8
+:104470006795B395D9F73EF49095809570956195C1
+:104480007F4F8F4F9F4F0895E89409C097FB3EF4EC
+:1044900090958095709561957F4F8F4F9F4F992391
+:1044A000A9F0F92F96E9BB279395F695879577950F
+:1044B0006795B795F111F8CFFAF4BB0F11F460FFCF
+:1044C0001BC06F5F7F4F8F4F9F4F16C0882311F027
+:1044D00096E911C0772321F09EE8872F762F05C03B
+:1044E000662371F096E8862F70E060E02AF09A95D6
+:1044F000660F771F881FDAF7880F9695879597F9CB
+:10450000089557FD9058440F551F59F05F3F71F0C3
+:104510004795880F97FB991F61F09F3F79F087952A
+:104520000895121613061406551FF2CF4695F1DFB3
+:1045300008C0161617061806991FF1CF8695710543
+:10454000610508940895E894BB2766277727CB0177
+:1045500097F908950E94BD220C942E230E942023D7
+:1045600038F00E94272320F0952311F00C94172394
+:104570000C941D2311240C94A4220E94812270F318
+:10458000959FC1F3950F50E0551F629FF001729FF8
+:10459000BB27F00DB11D639FAA27F00DB11DAA1F07
+:1045A000649F6627B00DA11D661F829F2227B00D54
+:1045B000A11D621F739FB00DA11D621F839FA00DDF
+:1045C000611D221F749F3327A00D611D231F849F2F
+:1045D000600D211D822F762F6A2F11249F57504086
+:1045E0009AF0F1F088234AF0EE0FFF1FBB1F661F01
+:1045F000771F881F91505040A9F79E3F510580F0CA
+:104600000C9417230C94A4225F3FE4F3983ED4F358
+:10461000869577956795B795F795E7959F5FC1F76D
+:10462000FE2B880F911D9695879597F9089597F918
+:104630009F6780E870E060E008959FEF80EC089548
+:1046400000240A9416161706180609060895002471
+:104650000A9412161306140605060895092E0394EB
+:10466000000C11F4882352F0BB0F40F4BF2B11F45F
+:1046700060FF04C06F5F7F4F8F4F9F4F089597FB80
+:10468000072E16F4009407D077FD09D00E94592315
+:1046900007FC05D03EF4909581959F4F0895709545
+:1046A00061957F4F0895EE0FFF1F0590F491E02D67
+:1046B0000994AA1BBB1B51E107C0AA1FBB1FA61769
+:1046C000B70710F0A61BB70B881F991F5A95A9F7BB
+:1046D00080959095BC01CD010895F999FECF92BDCA
+:1046E00081BDF89A992780B50895A8E1B0E042E02D
+:1046F00050E00C949523262FF999FECF92BD81BDF1
+:10470000F89A019700B4021639F01FBA20BD0FB60F
+:10471000F894FA9AF99A0FBE08950196272F0E94ED
+:104720007C230C947B23DC01CB01FC01F999FECFA7
+:1047300006C0F2BDE1BDF89A319600B40D92415029
+:0A4740005040B8F70895F894FFCF39
+:10474A0020029F072C080908D507A2070101BA0110
+:10475A0028080A03140A3F4D36399F0352031C03E3
+:10476A00E30276028F02A802C102010203040506CF
+:04477A000708090023
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json b/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json new file mode 100644 index 0000000000..4ade748732 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json @@ -0,0 +1,385 @@ +[ + { + "name": "Beginner's Keymap for Ergodox-EZ", + "author": "Anand Babu Periasamy" + }, + [ + { + "x": 3.5 + }, + "#\n3\n\n\nF3", + { + "x": 10.5 + }, + ")\n0\n\n\nF10" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "@\n2\n\n\nF2", + { + "x": 1 + }, + "$\n4\n\n\nF4", + { + "x": 8.5 + }, + "(\n9\n\n\nF9", + { + "x": 1 + }, + "_\n-\n\n\nF11" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "%\n5\n\n\nF5", + "^\n6\n\n\nF6", + { + "x": 4.5 + }, + "&\n7\n\n\nF7", + "*\n8\n\n\nF8" + ], + [ + { + "y": -0.875, + "w": 1.5 + }, + "~\n`\n\n\nEsc", + "!\n1\n\n\nF1", + { + "x": 14.5 + }, + "+\n=\n\n\nF12", + { + "a": 7, + "w": 1.5 + }, + "Backspace\n\n\n\nBackspace" + ], + [ + { + "y": -0.375, + "x": 3.5 + }, + "E\n\n\n\n<i class=\"fa fa-caret-up\" aria-hidden=\"true\"></i>", + { + "x": 10.5 + }, + "I" + ], + [ + { + "y": -0.8799999999999999, + "x": 2.5 + }, + "W" + ], + [ + { + "y": -0.9950000000000001, + "x": 4.5, + "a": 4 + }, + "R", + { + "x": 8.5, + "a": 7 + }, + "U", + { + "x": 1 + }, + "O" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "T", + { + "h": 1.5 + }, + "<i class=\"fa fa-chevron-circle-left\" aria-hidden=\"true\"></i>", + { + "x": 4.5, + "h": 1.5 + }, + "<i class=\"fa fa-chevron-circle-right\" aria-hidden=\"true\"></i>", + "Y" + ], + [ + { + "y": -0.875, + "a": 6, + "w": 1.5 + }, + "Tab", + { + "a": 7 + }, + "Q", + { + "x": 14.5 + }, + "P", + { + "a": 4, + "w": 1.5 + }, + "|\n\\" + ], + [ + { + "y": -0.375, + "x": 3.5, + "a": 7 + }, + "D\n\n\n\n<i class=\"fa fa-caret-down\" aria-hidden=\"true\"></i>", + { + "x": 10.5 + }, + "K" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "S\n\n\n\n<i class=\"fa fa-caret-left\" aria-hidden=\"true\"></i>", + { + "x": 1 + }, + "F\n\n\n\n<i class=\"fa fa-caret-right\" aria-hidden=\"true\"></i>", + { + "x": 8.5 + }, + "J", + { + "x": 1 + }, + "L" + ], + [ + { + "y": -0.875, + "x": 5.5 + }, + "G", + { + "x": 6.5 + }, + "H" + ], + [ + { + "y": -0.875, + "a": 4, + "fa": [ + 0, + 0, + 0, + 2 + ], + "w": 1.5 + }, + "\n\n\nCtrl\n\n\nCaps", + { + "a": 7 + }, + "A", + { + "x": 14.5, + "a": 4 + }, + ":\n;", + { + "a": 7, + "w": 1.5 + }, + "Enter" + ], + [ + { + "y": -0.625, + "x": 6.5, + "h": 1.5 + }, + "PgUp", + { + "x": 4.5, + "h": 1.5 + }, + "PgDn" + ], + [ + { + "y": -0.75, + "x": 3.5 + }, + "C", + { + "x": 10.5, + "a": 4 + }, + "<\n," + ], + [ + { + "y": -0.875, + "x": 2.5, + "a": 7 + }, + "X", + { + "x": 1 + }, + "V", + { + "x": 8.5 + }, + "M", + { + "x": 1, + "a": 4 + }, + ">\n." + ], + [ + { + "y": -0.875, + "x": 5.5, + "a": 7 + }, + "B", + { + "x": 6.5 + }, + "N" + ], + [ + { + "y": -0.875, + "w": 1.5 + }, + "Shift", + "Z", + { + "x": 14.5, + "a": 4 + }, + "?\n/", + { + "w": 1.5 + }, + "\"\n'" + ], + [ + { + "y": -0.375, + "x": 3.5, + "a": 7 + }, + "Alt\n\n\n\n<i class=\"fa fa-hand-o-left\" aria-hidden=\"true\"></i>", + { + "x": 10.5 + }, + "<i class=\"fa fa-long-arrow-down\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-down'></i>" + ], + [ + { + "y": -0.875, + "x": 2.5 + }, + "<i class='fa fa-linux'></i>", + { + "x": 1 + }, + "Alt\n\n\n\n<i class=\"fa fa-hand-o-right\" aria-hidden=\"true\"></i>", + { + "x": 8.5 + }, + "<i class=\"fa fa-long-arrow-left\" aria-hidden=\"true\"></i>", + { + "x": 1 + }, + "<i class=\"fa fa-long-arrow-up\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-up'></i>" + ], + [ + { + "y": -0.75, + "x": 0.5 + }, + "Ctrl\n\n\n\n<i class='fa fa-download'></i>", + "Esc", + { + "x": 14.5 + }, + "<i class=\"fa fa-long-arrow-right\" aria-hidden=\"true\"></i>\n\n\n\n<i class='fa fa-volume-off'></i>", + "Fn" + ], + [ + { + "r": 30, + "rx": 6.5, + "ry": 4.25, + "y": -1, + "x": 1 + }, + "<i class=\"fa fa-clone\" aria-hidden=\"true\"></i>", + "(" + ], + [ + { + "h": 2 + }, + "Space", + { + "h": 2 + }, + "Del", + "[" + ], + [ + { + "x": 2 + }, + "{" + ], + [ + { + "r": -30, + "rx": 13, + "y": -1, + "x": -3 + }, + ")", + "<i class=\"fa fa-paste\" aria-hidden=\"true\"></i>" + ], + [ + { + "x": -3 + }, + "]", + { + "h": 2 + }, + "Enter", + { + "h": 2 + }, + "<i class=\"fa fa-chevron-left\" aria-hidden=\"true\"></i>" + ], + [ + { + "x": -3 + }, + "}" + ] +]
\ No newline at end of file diff --git a/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png b/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png Binary files differnew file mode 100644 index 0000000000..9a6546e357 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png diff --git a/keyboard/ergodox_ez/keymaps/ab/keymap.c b/keyboard/ergodox_ez/keymaps/ab/keymap.c new file mode 100644 index 0000000000..9b5c93c1ee --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ab/keymap.c @@ -0,0 +1,140 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 // default layer +#define FN1 1 // media layer + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | BSpace | + * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| + * | Tab | Q | W | E | R | T | Fwd | | Back | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * |Caps/Ctl| A | S | D | F | G |------| |------| H | J | K | L | ; | Enter | + * |--------+------+------+------+------+------| PgUp | | PgDn |------+------+------+------+------+--------| + * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | ' | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | Ctrl | Esc | LGui | Alt | Alt | | Left | Up | Dn | Right| Fn | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | Copy | ( | | ) | Paste| + * ,------|------+------| |------+------+------. + * | | | [ | | ] | | | + * |Space | Del |------| |------| Enter|BSpace| + * | | | { | | } | | | + * `--------------------' `--------------------' + */ +// 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_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_WBAK, + CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGUP, + KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, KC_LALT, + LCTL(KC_C), KC_LCBR, + KC_LPRN, + KC_SPC, KC_DEL, KC_LBRC, + // right hand + KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_WFWD, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, + KC_UP, KC_LEFT, KC_RIGHT,KC_DOWN, TG(FN1), + KC_RCBR, LCTL(KC_V), + KC_RPRN, + KC_RBRC, KC_ENT, KC_BSPC + ), +/* Keymap 1: Fn Keys, media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | BSpace | + * |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Teensy| | | Lclk | Rclk | | |VolUp |VolDn | Mute | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------+------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// FN1 Layer + [FN1] = KEYMAP( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + KC_TRNS, KC_TRNS, + KC_TRNS, + RESET, KC_TRNS, KC_TRNS, + // right hand + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, + 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_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), +}; + +const uint16_t PROGMEM fn_actions[] = { +}; + +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) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +// 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); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + 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; + default: + // none + break; + } + +}; diff --git a/keyboard/ergodox_ez/keymaps/ab/readme.md b/keyboard/ergodox_ez/keymaps/ab/readme.md new file mode 100644 index 0000000000..67d47151bc --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ab/readme.md @@ -0,0 +1,21 @@ +# Beginner's keymap for Ergodox-EZ +Beginner's keymap emulates standard QWERTY keyboard for beginners. Once you get comfortable with the Ergodox-EZ, you may fork this keymap and customize it for your own needs or find a suitable one from the community contributed keymaps. + + + +#### Pros +* Easier to switch between regular keyboards and Ergodox-EZ. +* Easy on beginners. It has everything you need for your day to day usage. + +#### Cons +* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/jackhumbert/qmk_firmware/blob/master/keyboard/ergodox_ez/keymaps/default/readme.md) +* While multiple layers are possible, beginner's keymap only uses one additional layer for mouse, function and volume keys. + +#### Notes +* Ideally number key [6] should have started from the right-hand side of the keyboard. Doing so breaks the familiar QWERTY layout. +* Quote key ['] should have been placed between [:] and [Enter]. Due to lack of key space, it is placed below [Enter]. +* Double [Alt] keys are placed adjacent to each other for convenience. +* [CapsLock] also acts as [Ctrl] key when you press and hold. It is convenient for GNU Emacs users. +* Additional bracket keys are placed in the center of the keyboard for programmer's convenience. + + diff --git a/keyboard/ergodox_ez/keymaps/adnw/k_o_y/k_o_y.hex b/keyboard/ergodox_ez/keymaps/adnw/k_o_y/k_o_y.hex new file mode 100644 index 0000000000..95036fc444 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/adnw/k_o_y/k_o_y.hex @@ -0,0 +1,1152 @@ +:100000000C9465020C94A9020C94A9020C94A90208
+:100010000C94A9020C94A9020C94A9020C94A902B4
+:100020000C94A9020C94A9020C946B0C0C943D0D39
+:100030000C94A9020C94A9020C94A9020C94A90294
+:100040000C94A9020C940F220C94A9020C94A902FE
+:100050000C94A9020C94B31B0C94A9020C94A90251
+:100060000C94A9020C94A9020C94A9020C94A90264
+:100070000C94A9020C94A9020C94A9020C94A90254
+:100080000C94A9020C94A9020C94A9020C94A90244
+:100090000C94A9020C94A9020C94A9020C94A90234
+:1000A0000C94A9020C94A9020C94A902A20DC40DEF
+:1000B000AF0EC40DAF0E060E290EAF0E7E0E910EC2
+:1000C0008B118B11CC11CC110E124A124A144A1406
+:1000D00062124A145913591324144A144A14381436
+:1000E0000000F0A12E004C002A00E1003581000044
+:1000F0001E000E000B001B7134004D001F00370066
+:1001000004001400E104280020001200080034005C
+:1001100050002C00210036000C002F004F004A0038
+:1001200022001D00180033000000657450000154C7
+:100130000000007F0000E3004F0001540000007742
+:100140000000E200230019000700050000002971EB
+:1001500024000A001700130052004B00250006007F
+:1001600015001A005100E50026000F0011001000D4
+:100170002F002B0027002D0016820D7130004E003D
+:100180002D001C000978E500C100000001000100FD
+:1001900001000100010000003A001E0220022202BC
+:1001A000010001003B001F022102230201000100A7
+:1001B0003C002F0226022F00010001003D0030020A
+:1001C00027023000010001003E00310235003502F7
+:1001D000000001000100010000000100000001001A
+:1001E0000100010000000100000001003F0052007A
+:1001F00051002402000001004000240021001E00E4
+:10020000010001004100250022001F00370001000D
+:1002100042002600230020002700010043002502A1
+:100220002E0231002E0001004400450001000100B3
+:1002300001000000010001000100010001000000B8
+:1002400001000100010001000100010001000100A6
+:10025000F2000100010001000100F000F1000100C6
+:10026000F400010001000100F3000100F5000100AD
+:100270000100010001000100000001000100010077
+:100280000000010000000100010001000000010069
+:100290000000010001000100010001000000010058
+:1002A0000100010001000100A9000100010001009E
+:1002B0000100AC00AA00B600010001000100AB0083
+:1002C000A80001000100010001000100010001007F
+:1002D00001000100AE00010001000000160345000E
+:1002E000720067006F0044006F0078002000450036
+:1002F0005A00000016034500720067006F004400BA
+:100300006F007800200045005A0000000403090433
+:1003100009026D00040100A0FA09040000010301B4
+:100320000100092111010001223F00070581030896
+:10033000000A090401000103010200092111010062
+:1003400001224D000705820308000A09040200018A
+:100350000300000009211101000122360007058376
+:100360000308000A09040300010300000009211129
+:100370000100012239000705840310000112011059
+:100380000100000008EDFE07130100010200010555
+:10039000010906A101050719E029E71500250195C6
+:1003A0000875018102050819012905950575019156
+:1003B000029501750391010507190029771500259C
+:1003C00001957875018102C005010980A1018502AE
+:1003D00016010026B7001A01002AB7007510950112
+:1003E0008100C0050C0901A1018503160100269CAE
+:1003F000021A01002A9C02751095018100C00501B6
+:100400000902A1010901A100050919012905150029
+:10041000250195057501810295017503810105018D
+:10042000093009311581257F950275088106093843
+:100430001581257F950175088106050C0A3802157E
+:1004400081257F950175088106C0C005010906A1B7
+:1004500001050719E029E7150025019508750181B7
+:100460000295017508810105081901290595057591
+:100470000191029501750391010507190029FF15E6
+:100480000025FF950675088100C0000000000000EF
+:100490000000000000010204060A0F17202C3A4A4F
+:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2
+:1004B000B39D87715D4A3A2C20170F0A060402018A
+:1004C0000000000000000000000011241FBECFEF5C
+:1004D000DAE0DEBFCDBF04B603FE24C08091EE019A
+:1004E0009091EF01A091F001B091F1018730904B14
+:1004F000A740B04BB9F41092EE011092EF011092A8
+:10050000F0011092F10114BE84B7877F84BF88E1A7
+:100510000FB6F89480936000109260000FBEE0E088
+:10052000FFE3099511E0A0E0B1E0ECEAF7E402C0D6
+:1005300005900D92A433B107D9F721E0A4E3B1E00F
+:1005400001C01D92AE3EB207E1F70E94B1090C94C2
+:10055000D4230C94000061110BC0FC01828188231C
+:1005600021F085EE0E94131003C085EE0E94DB107F
+:1005700080E090E0089508956091B1017091B2011A
+:100580008091B3019091B4010E94DC1A56985E9854
+:1005900025982D9826982E9827982F98813019F015
+:1005A000823021F00895259A2D9A0895269A2E9A40
+:1005B00008950C94BC0256985E9825982D9826981C
+:1005C0002E9827982F988FEF90E090938900809332
+:1005D000880090938B0080938A0090938D00809385
+:1005E0008C00259A2D9A2FEF80E792E021508040D1
+:1005F0009040E1F700C00000269A2E9A2FEF80E786
+:1006000092E0215080409040E1F700C00000279A1E
+:100610002F9A2FEF80E792E0215080409040E1F741
+:1006200000C0000025982D982FEF80E792E0215020
+:1006300080409040E1F700C0000026982E982FEFF0
+:1006400080E792E0215080409040E1F700C0000038
+:1006500027982F9856985E9825982D9826982E982A
+:1006600027982F98089589EA8093800089E08093E5
+:10067000810024982C983F988AB18F748AB96E981B
+:10068000479A8BB1806B8BB9769A0E94DB020C94EF
+:10069000BB0280E2809300018091340181110EC081
+:1006A0000E94980381E0809334012FEF83ED90E363
+:1006B000215080409040E1F700C0000080E40E949B
+:1006C0009E038093000181112EC00E94C803809375
+:1006D0000001811128C00E94C8038093000181118C
+:1006E00022C08FE30E94C8038093000181111BC0C8
+:1006F0000E94C00380E40E949E0380930001811148
+:1007000012C08CE00E94C8038093000181110BC0CD
+:100710000E94C80380930001811105C08FE30E94ED
+:10072000C803809300010E94C003809100010895D6
+:100730001092B9008AE08093B800089594EA9093EB
+:10074000BC009091BC0097FFFCCF9091B900987FBE
+:10075000983021F0903111F081E008958093BB0032
+:1007600084E88093BC008091BC0087FFFCCF80911F
+:10077000B900887F883111F0803471F780E00895E6
+:1007800084E98093BC008091BC0084FDFCCF089577
+:100790008093BB0084E88093BC008091BC0087FFFD
+:1007A000FCCF9091B900987F81E0983209F480E005
+:1007B000089584E88093BC008091BC0087FFFCCF43
+:1007C0008091BB00089580910001811115C080E4E3
+:1007D0000E949E038093000181110CC082E10E945F
+:1007E000C80380930001811105C08FEF0E94C803E8
+:1007F000809300010E94C00384B1807F84B985B1D9
+:10080000807F85B98AB1837F8AB98BB1837F8BB9A9
+:100810003E98469808950E944903809300010E94E3
+:10082000E30380B38C7080BB81B3836F81BBE4E44E
+:10083000F1E0A6E3B1E011921D9281E0E235F80704
+:10084000D1F70C943303BF92CF92DF92EF92FF92D5
+:100850000F931F93CF93DF9380910001882379F04A
+:10086000809135018F5F80933501811108C00E940E
+:10087000490380930001811102C00E94DB0206E35C
+:1008800011E0C0E0D0E0DD24D39482E0C82EEE2455
+:10089000E394F12CC73000F580910001811162C012
+:1008A00080E40E949E0380930001811112C082E1C6
+:1008B0000E94C8038093000181110BC0C7010C2E58
+:1008C00001C0880F0A94EAF780950E94C8038093BC
+:1008D00000010E94C00346C0CA30A1F028F4C8300D
+:1008E00059F0C93061F005C0CC3089F070F0CD30DE
+:1008F00089F0209A289810C0219A29980DC0229A30
+:100900002A980AC0239A2B9807C0529A01C0539A7A
+:100910005B9802C03E9A4698E0EAEA95F1F78FB1FB
+:1009200079995AC092E081708D25892B7C9B02C0F9
+:1009300090E001C094E0892B7D9B02C090E001C053
+:1009400098E0892B7E9B02C090E001C090E1892B4A
+:100950009FB19095991F9927991F9295990F907E15
+:10096000892B0FC08091000181114BC080E40E944F
+:100970009E0380930001882389F1B12C0E94C0035B
+:100980008B2DF8019081981719F08083C092010196
+:100990000E94E30321960F5F1F4FCE30D10509F06F
+:1009A00079CF80910101882371F1815080930101F9
+:1009B000882339F08FE99FE00197F1F700C000002C
+:1009C00022C0A4E4B1E0E6E3F1E081918D9391E0EF
+:1009D000E434F907D1F717C090E0A5CF83E10E9476
+:1009E000C803809300018111C8CF81E40E949E0357
+:1009F000809300018111C1CF0E94D903B82EB09419
+:100A0000BDCF80E0BECF0E94D90281E0DF91CF91BF
+:100A10001F910F91FF90EF90DF90CF90BF900895BE
+:100A2000E82FF0E0EC5BFE4F808108950895089573
+:100A300096E0799FF001112494E5899FE00DF11D66
+:100A40001124E60FF11DEE0FFF1FEC51FF4F8591B2
+:100A500094910895880F991F805A9040FC018591C8
+:100A600094910895880F991F80529F4FFC018591A2
+:100A7000949108950F931F93CF93DF93EC01811509
+:100A800020E3920730F5811530E2930708F0B1C0FA
+:100A90008B3B910588F4883A910508F058C0853A57
+:100AA000910508F049C08430910508F043C08130B9
+:100AB000910509F4B2C1AEC18F3F910509F0D0F59F
+:100AC000803F910508F092C0805E9109089790F1EF
+:100AD000A1C1C11581E5D807A8F4C23090E5D907B6
+:100AE00008F09FC0C11520E5D20709F486C008F0C0
+:100AF00092C0C11580E4D80708F08CC18E0111277F
+:100B0000106CCCC1C11590E8D90758F4C11520E785
+:100B1000D20708F07BC1C11530E6D30708F423C122
+:100B200079C1C11580E9D80708F074C18E011F7022
+:100B3000106AB4C18E01B2C1853A910509F470C141
+:100B4000863A910509F46FC103E810E4A7C1883A19
+:100B5000910509F46BC1893A910509F46AC18A3A91
+:100B6000910509F469C18B3A910509F468C18C3A81
+:100B7000910509F467C18D3A910509F466C1803B7E
+:100B8000910509F465C18E3A910509F464C18F3A63
+:100B9000910509F463C1813B910509F462C1823B6F
+:100BA000910509F461C1833B910509F460C1843B5F
+:100BB000910509F45FC1853B910509F45EC1863B4F
+:100BC000910509F45DC1873B910509F45CC1883B3F
+:100BD000910509F45BC1893B910509F45AC18A3B2F
+:100BE000910509F059C10AE216E458C18C0110655B
+:100BF00055C19F700E94320552C10E946D149FEF33
+:100C000024E33CE0915020403040E1F700C0000078
+:100C10000E94D81B43C18091CD0181608093CD019A
+:100C20003DC10E94801D811102C00E94661D0E946C
+:100C30009D1D90E09093EE018093ED01C23080E520
+:100C4000D80721F48091ED01816086C0C43090E521
+:100C5000D90721F48091ED0182607EC0C63020E585
+:100C6000D20721F48091ED01846076C0C83030E570
+:100C7000D30719F48091ED0127C0CA3080E5D80769
+:100C800021F48091ED01806167C0CC3090E5D907F7
+:100C900021F48091ED0180625FC0CE3020E5D20763
+:100CA00021F48091ED01806457C0C03130E5D30755
+:100CB00021F48091ED0180684FC0C23180E5D807F2
+:100CC00029F48091ED018460886046C0C33090E5CE
+:100CD000D90721F48091ED018E7F3EC0C53020E51B
+:100CE000D20721F48091ED018D7F36C0C73030E509
+:100CF000D30721F48091ED018B7F2EC0C93080E5B0
+:100D0000D80719F48091ED0126C0CB3090E5D907C2
+:100D100021F48091ED018F7E1FC0CD3020E5D207F8
+:100D200021F48091ED018F7D17C0CF3030E5D307DE
+:100D300021F48091ED018F7B0FC0C13180E5D80790
+:100D400021F48091ED018F7707C0C331D04531F494
+:100D50008091ED018B7F877F8093ED018091ED0184
+:100D60000E94A11D9BC08D2F99278F7099278130DC
+:100D70009105E9F48E01037011279C0102C0220F36
+:100D8000331F0A95E2F789011C68CE0164E0880FE1
+:100D9000991F6A95E1F788279370082B192B73E048
+:100DA000CC0FDD1F7A95E1F7C076DD272CC08230AD
+:100DB000910529F41C2F0027016F106A6FC0833042
+:100DC000910561F4CE018370992701E010E002C023
+:100DD000000F111F8A95E2F71C680EC0049709F0F6
+:100DE0005DC0CE018370992701E010E002C0000FC2
+:100DF000111F8A95E2F71A6843E0CC0FDD1F4A9570
+:100E0000E1F7C07ED7700C2B1D2B48C08E011F70E0
+:100E1000106244C000E010E041C001E010E03EC0BC
+:100E200001E810E43BC002E810E438C002EE14E42C
+:100E300035C009EE14E432C00AEE14E42FC005EB0D
+:100E400014E42CC006EB14E429C007EB14E426C01C
+:100E50000CEC14E423C00DEC14E420C003E815E40A
+:100E60001DC00AE815E41AC002E915E417C004E938
+:100E700015E414C001E216E411C003E216E40EC04A
+:100E800004E216E40BC005E216E408C006E216E42C
+:100E900005C007E216E402C000E014E4C801DF91D7
+:100EA000CF911F910F91089596E0799FF001112441
+:100EB00094E5899FE00DF11D1124E60FF11DEE0F61
+:100EC000FF1FEC51FF4F85919491803E9105E0F416
+:100ED000803C910558F58133910509F46FC048F4C1
+:100EE0008932910509F463C08A32910509F46DC015
+:100EF00072C089339105E9F082389105D1F08533CC
+:100F0000910509F44DC067C0833E910581F138F425
+:100F1000803E9105B9F0823E9105D9F05CC0863ED5
+:100F2000910561F1873E9105A1F155C00E942A0506
+:100F300008952091ED0120FD02C021FF4CC080EEFC
+:100F400090E049C08091ED0180FFF9CF89E390E006
+:100F500042C08091ED0182FF0EC08091ED0184FFBF
+:100F600003C080E090E037C083EE90E034C0809111
+:100F7000ED0182FFF2CF82EE90E02DC08091ED0175
+:100F800083FF0BC08091ED0184FDEBCF87EE90E0F5
+:100F900022C08091ED0183FFF5CF86EE90E01BC06B
+:100FA0008091ED0185FF07C089E290E014C0809137
+:100FB000ED0185FFF9CF85E390E00DC08091ED0153
+:100FC00086FF07C08AE290E006C08091ED0186FFAF
+:100FD000F9CF81E390E00E943A05089508950C94BA
+:100FE000EE07809162010895CF93DF9300D01F92A6
+:100FF000CDB7DEB72091E401243019F523E0298331
+:101000009B838A832093E9008FEF9091E8008150C1
+:1010100095FD06C095ED9A95F1F700008111F5CF89
+:101020008091E80085FF0DC040E050E063E070E093
+:10103000CE0101960E945E0A8091E8008E7780932F
+:10104000E8000F900F900F90DF91CF910895CF930C
+:10105000DF9300D01F92CDB7DEB72091E40124309A
+:1010600021F522E029839B838A8383E08093E90032
+:101070008FEF9091E800815095FD06C095ED9A950F
+:10108000F1F700008111F5CF8091E80085FF0DC0D8
+:1010900040E050E063E070E0CE0101960E945E0AFD
+:1010A0008091E8008E778093E8000F900F900F906A
+:1010B000DF91CF9108952091E4012430F1F422E0F2
+:1010C0002093E9002FEF3091E800215035FD06C054
+:1010D00035ED3A95F1F700002111F5CF2091E800A8
+:1010E00025FF0BC040E050E065E070E00E945E0A22
+:1010F0008091E8008E778093E8000895CF93DF9386
+:10110000EC018091E401843009F046C090910C011B
+:101110009923D9F090910D019923B9F08093E900BA
+:101120008FEF9091E800815095FD06C095E19A956A
+:10113000F1F700008111F5CF8091E80085FF2CC008
+:1011400040E050E060E170E017C081E08093E9008A
+:101150008FEF9091E800815095FD06C095ED9A952E
+:10116000F1F700008111F5CF8091E80085FF14C0F0
+:1011700040E050E068E070E0CE010E945E0A80919D
+:10118000E8008E778093E80080E1FE01A2E5B1E0FF
+:1011900001900D928A95E1F7DF91CF9108958091AA
+:1011A000E301811109C00E94F00B0E944D0C809157
+:1011B000E20084608093E20008951092E3010895B4
+:1011C00008950C94FC210E946F1B0E9402220E9431
+:1011D000EA0E0C94EF0742E061EC81E00E946A0B9A
+:1011E00042E061EC82E00E946A0B42E061EC83E045
+:1011F0000E946A0B42E161EC84E00C946A0B8091DE
+:10120000E601833009F455C030F4813071F082304A
+:1012100009F48EC008958A3009F47AC08B3009F43D
+:1012200060C0893009F09CC020C08091E501813AFE
+:1012300009F096C08091E800877F8093E800809154
+:10124000E9019091EA01892B21F060E080E090E0D3
+:1012500003C060E182E591E070E00E94A70A8091FE
+:10126000E8008B778093E80008958091E501813252
+:1012700009F076C08091E9019091EA01009719F098
+:10128000039709F06DC08091E800877F8093E800A4
+:101290008091E80082FD05C08091E4018111F8CFC2
+:1012A0005FC08091F100809362018091E8008B77AC
+:1012B00053C08091E501813A09F052C08091E90163
+:1012C0009091EA01892B09F04BC08091E800877F5B
+:1012D0008093E8008091E80080FFFCCF80910C01B2
+:1012E00036C08091E5018132D9F58091E901909174
+:1012F000EA01892BA9F58091E800877F8093E800B7
+:101300000E949F0B8091E70180930C010C946D1457
+:101310008091E501813221F58091E800877F8093FB
+:10132000E8000E949F0B8091E8018093630108957B
+:101330008091E501813AA1F48091E800877F809354
+:10134000E8008091E80080FFFCCF809163018093EA
+:10135000F1008091E8008E778093E8000C949F0B59
+:10136000089584B7877F84BF88E10FB6F89480938F
+:101370006000109260000FBE90E080E80FB6F89415
+:1013800080936100909361000FBE0E94390F0E940C
+:10139000F00B0E944D0C8091E20084608093E2008B
+:1013A00078940E94C80E0E943B0F82E091E00E9458
+:1013B000E50E0E94EA218091E401853069F40E94E3
+:1013C0002F1B8091E2018823B1F30E945A1B8823CE
+:1013D00091F30E94480AEFCF0E94410FECCF292FD2
+:1013E000332723303105A9F06CF42130310509F49D
+:1013F00042C02230310509F043C08DE690E020E183
+:1014000033E042C021323105C9F02232310519F1F1
+:1014100037C099278130910541F08230910541F024
+:10142000892B71F5ECE0F3E005C0E4EFF2E002C0D7
+:10143000ECEDF2E0849190E09F0126C0643000F56D
+:10144000E62FF0E0EE0FFF1FEE5DFE4F20813181B1
+:1014500089E090E019C0643098F4E62FF0E0DF01F5
+:10146000AA0FBB1FA65EBE4F2D913C91EA5EFE4FB8
+:10147000808190E009C082E190E02DE733E004C074
+:1014800080E090E020E030E0FA013183208308958D
+:1014900080E189BD82E189BD09B400FEFDCF809164
+:1014A000D8008F7D8093D8008091E0008260809387
+:1014B000E0008091E00081FDFCCF0895CF92DF92A3
+:1014C000EF92FF920F931F93CF93DF937C018B01D9
+:1014D000EA010E94C00B811131C0209731F0888150
+:1014E0009981081B190BE80EF91EC12CD12C01158E
+:1014F000110519F18091E80085FD14C08091E80084
+:101500008E778093E800209741F0888199818C0D37
+:101510009D1D9983888385E011C00E94C00B88239C
+:1015200031F30CC0F70181917F018093F1000150EC
+:101530001109FFEFCF1ADF0ADACF80E0DF91CF91F8
+:101540001F910F91FF90EF90DF90CF900895209121
+:10155000EB013091EC012617370748F06115710552
+:1015600039F42091E8002E772093E80001C0B901FA
+:10157000FC0120E061157105B9F18091E401882337
+:1015800009F440C0853009F43FC08091E80083FD34
+:101590003DC08091E80082FF06C08091E80082FF94
+:1015A00026C080E008958091E80080FFE3CF20917D
+:1015B000F3008091F20090E0922B6115710551F0DB
+:1015C0008830910538F421912093F1006150710920
+:1015D0000196F3CF21E0089709F020E08091E80020
+:1015E0008E778093E800C6CF2111C7CFD6CF8091E8
+:1015F000E401882339F0853039F08091E80083FFD9
+:10160000CCCF04C082E0089583E0089581E008957E
+:101610002091EB013091EC012617370748F0611556
+:10162000710539F42091E8002E772093E80001C07D
+:10163000B901FC0120E061157105C1F18091E4015F
+:10164000882309F441C0853009F440C08091E80046
+:1016500083FD3EC08091E80082FF06C08091E800D3
+:1016600082FF27C080E008958091E80080FFE3CFEB
+:101670002091F3008091F20090E0922B61157105AA
+:1016800059F08830910540F424912093F10031966F
+:10169000615071090196F2CF21E0089709F020E02E
+:1016A0008091E8008E778093E800C5CF2111C6CFE6
+:1016B000D5CF8091E401882339F0853039F08091CD
+:1016C000E80083FFCBCF04C082E0089583E0089553
+:1016D00081E00895982F973058F59093E900981776
+:1016E00039F07091EC002091ED005091F00003C0B2
+:1016F000242F762F50E021FF19C03091EB003E7F60
+:101700003093EB003091ED003D7F3093ED00309150
+:10171000EB0031603093EB007093EC002093ED0010
+:101720005093F0002091EE0027FF07C09F5FD3CFBA
+:101730008F708093E90081E0089580E008958091A2
+:10174000E50187FD05C08091E80080FF0EC012C052
+:101750008091E80082FD05C08091E4018111F8CFFD
+:1017600008958091E8008B7708C08091E401811191
+:10177000EACF08958091E8008E778093E80008957D
+:101780008091E4009091E50045E62091EC0020FF77
+:1017900021C02091E80020FD21C02091E4012223F6
+:1017A00089F0253089F02091EB0025FD0FC02091B4
+:1017B000E4003091E5002817390739F3415041F032
+:1017C000C901E3CF82E0089583E0089581E00895A0
+:1017D00084E008952091E80022FFDFCF80E00895A3
+:1017E0000E945E0C0E94660CE0EEF0E08081816059
+:1017F0008083E8EDF0E080818F77808319BCA7EDCE
+:10180000B0E08C918E7F8C9380818F7E808310924C
+:10181000E30108950F931F93CF93DF930E945E0C13
+:101820000E94660CC8EDD0E088818F77888388811C
+:101830008068888388818F7D888319BC1092E40139
+:101840001092E0011092E2011092E10100EE10E02E
+:10185000F80180818B7F808388818160888342E06A
+:1018600060E080E00E946A0BE1EEF0E080818E7F14
+:101870008083E2EEF0E080818160808380818860F7
+:101880008083F80180818E7F808388818061888356
+:10189000DF91CF911F910F910895E8EDF0E08081E5
+:1018A0008F7E8083E7EDF0E080818160808384E03B
+:1018B00082BF81E08093E3010C940A0CE8EDF0E034
+:1018C00080818E7F80831092E20008951092DA006A
+:1018D0001092E10008951F920F920FB60F921124FB
+:1018E0002F933F934F935F936F937F938F939F9328
+:1018F000AF93BF93EF93FF938091E10082FF0BC002
+:101900008091E20082FF07C08091E1008B7F80938D
+:10191000E1000E94C70E8091DA0080FF1FC0809115
+:10192000D80080FF1BC08091DA008E7F8093DA00A0
+:101930008091D90080FF0DC080E189BD82E189BD21
+:1019400009B400FEFDCF81E08093E4010E94CF083E
+:1019500005C019BC1092E4010E94DD088091E100ED
+:1019600080FF19C08091E20080FF15C08091E200E5
+:101970008E7F8093E2008091E20080618093E2009C
+:101980008091D80080628093D80019BC85E0809354
+:10199000E4010E94E1088091E10084FF30C0809161
+:1019A000E20084FF2CC080E189BD82E189BD09B4D9
+:1019B00000FEFDCF8091D8008F7D8093D80080916C
+:1019C000E1008F7E8093E1008091E2008F7E809322
+:1019D000E2008091E20081608093E2008091E0016A
+:1019E000882311F084E007C08091E30087FF02C0E4
+:1019F00083E001C081E08093E4010E94E3088091CC
+:101A0000E10083FF29C08091E20083FF25C080911F
+:101A1000E100877F8093E10082E08093E4011092EF
+:101A2000E0018091E1008E7F8093E1008091E200EF
+:101A30008E7F8093E2008091E20080618093E200DB
+:101A400042E060E080E00E946A0B8091F0008860D4
+:101A50008093F0000E94E008FF91EF91BF91AF9159
+:101A60009F918F917F916F915F914F913F912F91B6
+:101A70000F900FBE0F901F9018951F920F920FB6E8
+:101A80000F9211242F933F934F935F936F937F9304
+:101A90008F939F93AF93BF93CF93EF93FF93C09197
+:101AA000E900CF708091EC001092E9008091F00085
+:101AB000877F8093F00078940E94790D1092E9005E
+:101AC0008091F00088608093F000C093E900FF915E
+:101AD000EF91CF91BF91AF919F918F917F916F9136
+:101AE0005F914F913F912F910F900FBE0F901F90DC
+:101AF00018951F93CF93DF93CDB7DEB7AA970FB694
+:101B0000F894DEBF0FBECDBFE5EEF1E08091F100AD
+:101B1000819321E0ED3EF207C9F70E94FF08809112
+:101B2000E80083FF1CC12091E5013091E601832F7D
+:101B300090E08A30910508F012C1FC01EA5AFF4F8B
+:101B40000C948423203881F0223809F008C1809158
+:101B5000E9018F708093E9008091EB0085FB882775
+:101B600080F91092E90006C08091E1019091E201B4
+:101B7000911182609091E800977F9093E8008093A4
+:101B8000F1001092F100C5C0822F8D7F09F0E7C0EF
+:101B9000222319F0223061F0E2C08091E701813008
+:101BA00009F0DDC0333009F080E08093E20128C005
+:101BB0008091E701811124C02091E9012F7009F47F
+:101BC000CEC02093E9008091EB0080FF19C0809186
+:101BD000EB00333011F4806211C080618093EB0020
+:101BE00081E090E0022E01C0880F0A94EAF780930A
+:101BF000EA001092EA008091EB0088608093EB008D
+:101C00001092E9008091E800877F86C02111A7C06B
+:101C10001091E7011F778091E3008078812B8093FA
+:101C2000E3008091E800877F8093E8000E949F0B8B
+:101C30008091E80080FFFCCF8091E3008068809372
+:101C4000E300112311F083E001C082E08093E401FE
+:101C500086C02058223008F082C08091E701909120
+:101C6000E8018C3D23E0920779F583E08A838AE2DC
+:101C700089834FB7F894DE01139620E03EE051E2ED
+:101C8000E32FF0E050935700E49120FF03C0E2956A
+:101C9000EF703F5FEF708E2F90E0EA3010F0C79644
+:101CA00001C0C0968D939D932F5F243149F74FBF9C
+:101CB0008091E800877F8093E8006AE270E0CE01BF
+:101CC00001960E94A70A14C0AE014F5F5F4F60915A
+:101CD000E9010E94EF09009709F441C02091E80052
+:101CE000277F2093E800BC0189819A810E94080B1C
+:101CF0008091E8008B778093E80031C0203879F537
+:101D00008091E800877F8093E8008091E0018093D4
+:101D1000F1008091E8008E778093E8000E949F0B8D
+:101D20001EC021111CC09091E7019230C0F4809137
+:101D3000E800877F8093E8009093E0010E949F0B6A
+:101D40008091E001811104C08091E30087FF02C00F
+:101D500084E001C081E08093E4010E94EB0880915F
+:101D6000E80083FF0AC08091E800877F8093E80045
+:101D70008091EB0080628093EB00AA960FB6F894F6
+:101D8000DEBF0FBECDBFDF91CF911F9108950895A3
+:101D9000CF938091E4018823B1F08091E9008F70A6
+:101DA0009091EC0090FF02C090E801C090E0C92F34
+:101DB000C82B1092E9008091E80083FD0E94790D04
+:101DC000CF70C093E900CF910895909369018093FB
+:101DD00068010895E0916801F0916901309721F060
+:101DE0000190F081E02D099480E00895E091680170
+:101DF000F0916901309721F00280F381E02D099480
+:101E00000895E0916801F0916901309721F0048014
+:101E1000F581E02D099408952091660130916701C4
+:101E20008217930771F09093670180936601E091A8
+:101E30006801F0916901309721F00680F781E02D6B
+:101E400009940895209164013091650182179307E8
+:101E500071F09093650180936401E0916801F091C5
+:101E60006901309721F00084F185E02D09940895EF
+:101E700008950C94380F0E94751B0E940B040C945B
+:101E80003B1CCF92DF92EF92FF920F931F93CF9361
+:101E9000DF93CDB7DEB72B970FB6F894DEBF0FBE3A
+:101EA000CDBF0E9423043BE6E32E31E0F32E00E099
+:101EB00010E0C02E802F0E941005F701D1907F0105
+:101EC000D826B1F40F5F1F4F0E30110591F78FEF39
+:101ED00089838A831B820E947E1B8160782F9D8369
+:101EE0008C8349815A816B818D810E94E40F41C0AE
+:101EF0009091CD0191FF04C08B870E9416058B85C0
+:101F000020E030E04D2D50E0922FBA01022E02C0A9
+:101F1000759567950A94E2F760FF25C02E83CF82FE
+:101F2000EE24E394F12C02C0EE0CFF1C9A95E2F72C
+:101F300090E08E219F2121E0892B09F420E0288761
+:101F40000E947E1B8160782F9A8789874E815F81EE
+:101F500068858A850E94E40FF801E559FE4F80816B
+:101F60008E25808306C02F5F3F4F2630310561F6F6
+:101F7000A9CF0E941F1F10916A010E94EA0E181734
+:101F8000A1F00E94EA0E80936A012B960FB6F89496
+:101F9000DEBF0FBECDBFDF91CF911F910F91FF909C
+:101FA000EF90DF90CF900C94EF072B960FB6F8943C
+:101FB000DEBF0FBECDBFDF91CF911F910F91FF907C
+:101FC000EF90DF90CF900895CF93DF93CDB7DEB73A
+:101FD0002B970FB6F894DEBF0FBECDBF4F83588747
+:101FE00069877A878B87DE01119686E0FD01119261
+:101FF0008A95E9F785E0FE01379601900D928A9562
+:10200000E1F749815A816B817C818D819E810E949B
+:1020100039172B960FB6F894DEBF0FBECDBFDF91F8
+:10202000CF9108950895CF93C82F882309F4C1C094
+:10203000823859F40E94EA0E81FDBBC089E30E94F8
+:10204000E3190E94AD1A89E30CC0833879F40E9429
+:10205000EA0E80FDAEC083E50E94E3190E94AD1A2E
+:1020600083E50E94231ACF910C94AD1A843859F459
+:102070000E94EA0E82FD9DC087E40E94E3190E943F
+:10208000AD1A87E4EECF8CEF8C0F813A48F48C2F99
+:102090000E94522181118DC08C2F0E94E319E3CF41
+:1020A00080E28C0F883048F4C77081E001C0880F4F
+:1020B000CA95EAF70E94641AD6CF8BE58C0F83305D
+:1020C00078F4C53A29F0C63A31F482E890E005C0C8
+:1020D00081E890E002C083E890E0CF910C940C0F6F
+:1020E00088E58C0F833108F064C0C83A39F1C93AE9
+:1020F00041F1CA3A49F1CB3A51F1CC3A59F1CD3AD2
+:1021000061F1C03B69F1CE3A71F1CF3A79F1C13B4F
+:1021100081F1C23B89F1C33B91F1C43B99F1C53BCD
+:10212000A1F1C63BA9F1C73BB1F1C83BB9F1C93B2D
+:10213000C1F1CA3BC9F58AE292E038C082EE90E074
+:1021400035C089EE90E032C08AEE90E02FC085EB7A
+:1021500090E02CC086EB90E029C087EB90E026C091
+:102160008CEC90E023C08DEC90E020C083E891E0FF
+:102170001DC08AE891E01AC082E991E017C084E9A5
+:1021800091E014C081E292E011C083E292E00EC0BF
+:1021900084E292E00BC085E292E008C086E292E021
+:1021A00005C087E292E002C080E090E0CF910C94FD
+:1021B000220FCF910895882309F44BC0823859F437
+:1021C0000E94EA0E81FF45C089E30E94E3190E9444
+:1021D000AD1A89E30CC0833871F40E94EA0E80FFC7
+:1021E00038C083E50E94E3190E94AD1A83E50E947E
+:1021F000231A0C94AD1A843859F40E94EA0E82FF17
+:1022000028C087E40E94E3190E94AD1A87E4EFCF4B
+:102210009CEF980F913A58F390E2980F983050F451
+:10222000877091E001C0990F8A95EAF7892F0E9483
+:102230006A1ADFCF9BE5980F933020F480E090E09E
+:102240000C940C0F885A833120F480E090E00C94B9
+:10225000220F0895882321F00E94641A0C94AD1A6D
+:102260000895882321F00E946A1A0C94AD1A0895EB
+:10227000CF92DF92EF92FF920F931F93CF93DF9352
+:10228000CDB7DEB728970FB6F894DEBF0FBECDBF2F
+:102290008C0185E0F801DE01119601900D928A957E
+:1022A000E1F7F801D080E180F280558152955F70AE
+:1022B00023813481232B39F0FFEFEF1206C081E038
+:1022C000DF1203C003C081E001C080E080FDE2C2F4
+:1022D000C8015F830E941210D982EA8269817A81E3
+:1022E0008F2D0E94DF199E8388870E9493190E9478
+:1022F00066184E815F816885FF2029F00E94811A4F
+:1023000068855F814E81E42FE295EF70F0E0E05A3E
+:10231000FF4F0C948423842F807F142F1F708823F9
+:1023200011F01295107FFF20B1F0112309F467C25C
+:1023300080E2860F883028F4812F68870E94641A13
+:1023400004C0812F68870E94741A688568870E947C
+:10235000AD1A688554C2862F68870E94DB10688595
+:10236000112309F497C2605E812F683018F40E942F
+:102370006A1A02C00E947A1A28960FB6F894DEBF35
+:102380000FBECDBFDF91CF911F910F91FF90EF90C6
+:10239000DF90CF900C94AD1A242F207F842F8F7064
+:1023A000203211F08295807F662319F0613019F197
+:1023B0002BC0FF20B1F0552309F493C1513009F02F
+:1023C00090C128960FB6F894DEBF0FBECDBFDF9147
+:1023D000CF911F910F91FF90EF90DF90CF900C94D1
+:1023E000941A552319F0513009F454C28E830E9477
+:1023F000971A8E8189C1FF2021F0523008F04AC21D
+:1024000070C1511147C280C1FF2021F0552309F44A
+:1024100068C1F5C1552309F477C105C2242F26955B
+:102420002695237030E02115310521F0213031054A
+:10243000C9F030C2FF2021F0862F942F937002C084
+:1024400080E090E028960FB6F894DEBF0FBECDBFB7
+:10245000DF91CF911F910F91FF90EF90DF90CF9080
+:102460000C940C0FFF2021F0862F942F937002C044
+:1024700080E090E028960FB6F894DEBF0FBECDBF87
+:10248000DF91CF911F910F91FF90EF90DF90CF9050
+:102490000C94220F862FFF2019F00E94271E02C0E5
+:1024A0000E948F1E28960FB6F894DEBF0FBECDBFD8
+:1024B000DF91CF911F910F91FF90EF90DF90CF9020
+:1024C0000C94141F842F837009F076C0F110E2C1C0
+:1024D000262F229526952770220F220F862F8F7088
+:1024E000C82ED12CE12CF12C022E04C0CC0CDD1C0A
+:1024F000EE1CFF1C0A94D2F764FF10C06FE070E07E
+:1025000080E090E004C0660F771F881F991F2A950E
+:10251000D2F7609570958095909503C060E070E06B
+:10252000CB01242F269526952370422F50E0423070
+:102530005105D1F04330510559F16C297D298E297F
+:102540009F294130510541F128960FB6F894DEBF1E
+:102550000FBECDBFDF91CF911F910F91FF90EF90F4
+:10256000DF90CF900C948B186C297D298E299F29A0
+:1025700028960FB6F894DEBF0FBECDBFDF91CF9186
+:102580001F910F91FF90EF90DF90CF900C94A518C2
+:102590000E948B18C701B60128960FB6F894DEBFCB
+:1025A0000FBECDBFDF91CF911F910F91FF90EF90A4
+:1025B000DF90CF900C947118FF2019F0842F817058
+:1025C00001C08695882309F465C1262F229526959A
+:1025D0002770220F220F862F8F70C82ED12CE12C4E
+:1025E000F12C022E04C0CC0CDD1CEE1CFF1C0A9446
+:1025F000D2F764FF10C06FE070E080E090E004C0AC
+:10260000660F771F881F991F2A95D2F760957095DE
+:102610008095909503C060E070E0CB01242F269553
+:1026200026952370422F50E042305105D1F04330BF
+:10263000510559F16C297D298E299F294130510579
+:1026400041F128960FB6F894DEBF0FBECDBFDF91E3
+:10265000CF911F910F91FF90EF90DF90CF900C944E
+:102660005F196C297D298E299F2928960FB6F89429
+:10267000DEBF0FBECDBFDF91CF911F910F91FF90B5
+:10268000EF90DF90CF900C9479190E945F19C701E9
+:10269000B60128960FB6F894DEBF0FBECDBFDF910E
+:1026A000CF911F910F91FF90EF90DF90CF900C94FE
+:1026B0004519603FC9F118F4603E50F49BC0623F79
+:1026C00009F460C008F44AC0633F09F46FC092C0C7
+:1026D000162F1F70842F8F71FF2099F00E94DE1833
+:1026E000812F28960FB6F894DEBF0FBECDBFDF91C5
+:1026F000CF911F910F91FF90EF90DF90CF900C94AE
+:102700002A110E94FF18812F28960FB6F894DEBF79
+:102710000FBECDBFDF91CF911F910F91FF90EF9032
+:10272000DF90CF900C943111FF20A1F05111B2C075
+:10273000842F8F7128960FB6F894DEBF0FBECDBFE1
+:10274000DF91CF911F910F91FF90EF90DF90CF908D
+:102750000C942419523008F09DC0EACFFF20A1F05C
+:10276000842F8F7128960FB6F894DEBF0FBECDBFB1
+:10277000DF91CF911F910F91FF90EF90DF90CF905D
+:102780000C94DE18FF2061F3842F8F7128960FB60A
+:10279000F894DEBF0FBECDBFDF91CF911F910F9197
+:1027A000FF90EF90DF90CF900C94FF18FF2091F0F6
+:1027B000842F8F7128960FB6F894DEBF0FBECDBF61
+:1027C000DF91CF911F910F91FF90EF90DF90CF900D
+:1027D0000C94C91828960FB6F894DEBF0FBECDBF73
+:1027E000DF91CF911F910F91FF90EF90DF90CF90ED
+:1027F0000C94BF18FF20A1F0552309F4B1CF862F08
+:1028000028960FB6F894DEBF0FBECDBFDF91CF91F3
+:102810001F910F91FF90EF90DF90CF900C941310C9
+:10282000552309F4B1CF862F28960FB6F894DEBF52
+:102830000FBECDBFDF91CF911F910F91FF90EF9011
+:10284000DF90CF900C94DB104F70C8010E94AB0258
+:1028500028960FB6F894DEBF0FBECDBFDF91CF91A3
+:102860001F910F91FF90EF90DF90CF900C94E6179F
+:102870004F70C80128960FB6F894DEBF0FBECDBFCB
+:10288000DF91CF911F910F91FF90EF90DF90CF904C
+:102890000C94170528960FB6F894DEBF0FBECDBF77
+:1028A000DF91CF911F910F91FF90EF90DF90CF902C
+:1028B00008950E94811A0E94911A0E94561A0E943D
+:1028C000AD1A0E94C01F0E94141F80E090E00E9479
+:1028D0000C0F80E090E00C94220F0E94711A0C946F
+:1028E00059140E94D419292F22952F7030E02C30D2
+:1028F00031054CF42A3031056CF422503109223074
+:10290000310590F407C02C30310551F02F303105DE
+:1029100039F00AC0803E10F0803F31F481E0089524
+:1029200093FB882780F9089580E00895CF93DF9383
+:1029300000D000D01F92CDB7DEB70F900F900F9050
+:102940000F900F90DF91CF910895CF93DF9300D038
+:1029500000D000D0CDB7DEB726960FB6F894DEBF14
+:102960000FBECDBFDF91CF9108951F93CF93DF931B
+:10297000C091790116E080917A01C81799F0D0E0F2
+:102980001C9FF0011D9FF00D1124E558FE4F408162
+:10299000518162817381848195810E94A514219661
+:1029A000C770E9CFDF91CF911F9108954091AB019E
+:1029B0005091AC016091AD017091AE018091AF0179
+:1029C0009091B0010C94A514CF938091B0018295A1
+:1029D0008F7009F05FC08091AD01882309F45AC05F
+:1029E00020917901A0917A016091AB017091AC01C5
+:1029F0008091AE019091AF0131E06F3F09F030E07E
+:102A0000B32FC6E02A1709F445C0009721F07F3F95
+:102A100021F44B2F03C041E001C040E030E040FD15
+:102A200035C0C29FF001C39FF00D1124E558FE4F41
+:102A3000418174132BC04081641328C0428141112D
+:102A400025C0438154814817590710F4415051095A
+:102A5000481B590B483C5105C8F48091B0018F7058
+:102A600080618093B00186E0829FF001839FF00D2A
+:102A70001124E058FE4F80818F70806180838BEA43
+:102A800091E00E943811CF910C94B5142F5F3F4F05
+:102A90002770B8CFCF910895CF92DF92EF92FF9237
+:102AA0000F931F93CF93DF93CDB7DEB762970FB627
+:102AB000F894DEBF0FBECDBF8C0185E0F801DE01CA
+:102AC0001D9601900D928A95E1F7D8014C911196CF
+:102AD0005C91119712966C9112971396ED90FC9061
+:102AE00014977091AB01E091AC012091AE0130914F
+:102AF000AF012115310531F0EF3F31F481E07F3F27
+:102B000019F403C081E001C080E0B82FB170CB2E72
+:102B100080FD6CC1D090AD01DD2009F4F5C0F091CD
+:102B2000B001E216F30638F0C701821B930B883C14
+:102B3000910548F09BC0209530952E0D3F1D283CF7
+:102B4000310508F093C08F2F807F09F052C0E51344
+:102B500014C0741312C0D62E61110FC0FF70F06143
+:102B6000F093B0010E94D6148BEA91E00E943811D4
+:102B70008091B001F80185836CC1EF2831F05F3F8F
+:102B800031F481E04F3F19F403C081E001C080E0DF
+:102B900080FD03C081E0862701C080E0F82FF1703E
+:102BA000FF2E80FF1CC08091790120917A0136E0D0
+:102BB000821709F428C190E0389FF001399FF00D89
+:102BC0001124E558FE4F7181571306C070814713D9
+:102BD00003C07281671303C001968770E9CFD62EB8
+:102BE000662309F436C18091B00181608093B00101
+:102BF00053C0E51308C0741306C0611104C0D801A6
+:102C00001596FC93AEC04D875E878D859E856A8B39
+:102C10000E9471146A89882329F1D62E662311F146
+:102C20002091B001822F82958F7090E002970CF472
+:102C300060C08091AB019091AC0198878F83198619
+:102C4000FB86EA862C87CE01079651C0E51731F145
+:102C50004D875E878D859E856A8B0E9471146A8977
+:102C600081112EC0C8010E943811A4C08F2F807F0F
+:102C700069F77E2DF98AE88A89890E9496148BEA81
+:102C800091E00E943811EBEAF1E086E0DF011D924D
+:102C90008A95E9F70E94D614D12CDBC07413D8CFE3
+:102CA0006111D6CFD8011596FC93C8010E94381146
+:102CB000EBEAF1E086E0DF011D928A95E9F7C9C0F1
+:102CC000D62E662379F22091B001822F82958F70E3
+:102CD00090E0029774F08091AB019091AC019A83DF
+:102CE00089831B82FD82EC822E83CE0101960E9495
+:102CF000381186E0F801ABEAB1E001900D928A95B7
+:102D0000E1F70E94E4146FC0E216F30628F0C70151
+:102D1000821B930B9C0104C0209530952E0D3F1D06
+:102D2000283C310508F052C0D62E662309F49ACF0C
+:102D3000E5132CC074132AC08091B00180FD1DC022
+:102D4000982F92959F70C9F0D80115968C9315977E
+:102D50009F3039F09F5F9295907F8F70892B1596E9
+:102D60008C93C8010E94381186E0F801ABEAB1E00B
+:102D700001900D928A95E1F736C086E0F801ABEA42
+:102D8000B1E001900D928A95E1F763C04D875E87AF
+:102D90008D859E850E947114882379F086E0F80164
+:102DA000ABEAB1E001900D928A95E1F70E94E4143C
+:102DB0000E94D614DD24D3944CC08091B001816070
+:102DC0008093B001C8010E94381143C07E2DF98A5A
+:102DD000E88A89890E949614EBEAF1E086E0DF0137
+:102DE0001D928A95E9F70E94D61433C0662309F430
+:102DF00039CF4D875E878D859E850E94711488230B
+:102E000009F430CFCBCF4D875E878D859E850E949C
+:102E1000D419292F22952F7030E0223031052CF45F
+:102E20009F7041F0811106C00CC0243031052CF494
+:102E30009F7049F4805E883020F0C8010E943811EC
+:102E4000CF2CDC2C06C0D80115969C91907F91F771
+:102E5000F8CF8D2D62960FB6F894DEBF0FBECDBFB2
+:102E6000DF91CF911F910F91FF90EF90DF90CF9066
+:102E700008951F93CF93DF93CDB7DEB72C970FB68E
+:102E8000F894DEBF0FBECDBF4F83588769877A871E
+:102E90008B879C87CE0107960E944C158823C1F032
+:102EA0002F8138858A859B85892B31F03F3F11F032
+:102EB00080E003C02F3FE1F781E0811147C04F81DF
+:102EC000588569857A858B859C850E94A5143EC0AE
+:102ED00086E0FE013796DE01119601900D928A95EB
+:102EE000E1F7FF81E8854A855B854115510531F0A1
+:102EF000EF3F31F481E0FF3F19F403C081E001C0EE
+:102F000080E080FD23C020917A0130E0C901019664
+:102F1000877099276091790170E086179707F1F122
+:102F2000F983EA835D834C8396E0929FD001939F5F
+:102F3000B00D1124A558BE4FFE01319601900D929F
+:102F40009A95E1F780937A010E94B51416E080917A
+:102F5000790190917A01891779F1189FC0011124A4
+:102F600085589E4F0E944C15882331F1E0917901DC
+:102F70001E9FF0011124E558FE4F4081518162816E
+:102F80007381848195810E94A5148091790190E0DC
+:102F900001968770992780937901D9CF0E946D148B
+:102FA00010927A0110927901EBEAF1E086E0DF01FC
+:102FB0001D928A95E9F7CACF2C960FB6F894DEBF1A
+:102FC0000FBECDBFDF91CF911F910895EF92FF9279
+:102FD0000F931F93CF93DF93FC01009709F46FC009
+:102FE000F12CEE24E394EF0121968491843740F490
+:102FF000843008F055C0813081F0823021F15FC00B
+:10300000853709F447C0C0F19CE7980F903708F066
+:1030100056C08F770E94DB1045C08F010E5F1F4F97
+:10302000FE01849190E2980F983050F48770FE2D45
+:1030300001C0FF0F8A95EAF78F2F0E94841A15C0EE
+:103040000E94131014C08F010E5F1F4FFE01849168
+:1030500090E2980F983068F48770FE2D01C0FF0F42
+:103060008A95EAF78F2F0E948A1A0E94AD1AE8010A
+:1030700019C00E94DB10FBCFCF010296FE01C49164
+:10308000CC2361F0EFE9FFE03197F1F700C00000D9
+:10309000C150F6CFCF010296FE01F490EC0102C0C0
+:1030A0000E9413108F2D882341F0EFE9FFE0319744
+:1030B000F1F700C000008150F6CFFE0194CFDF9100
+:1030C000CF911F910F91FF90EF9008950895609315
+:1030D000B5017093B6018093B7019093B8010C9439
+:1030E00059140F931F930091B5011091B6012091CF
+:1030F000B7013091B801062B172B282B392B0093E1
+:10310000B5011093B6012093B7013093B8011F9118
+:103110000F910C9459140F931F930091B5011091C6
+:10312000B6012091B7013091B80106231723282357
+:1031300039230093B5011093B6012093B701309362
+:10314000B8011F910F910C9459140F931F93009184
+:10315000B5011091B6012091B7013091B801062751
+:103160001727282739270093B5011093B60120931C
+:10317000B7013093B8011F910F910C94591410921C
+:10318000B1011092B2011092B3011092B4010C94EB
+:10319000591441E050E060E070E004C0440F551F56
+:1031A000661F771F8A95D2F74093B1015093B20101
+:1031B0006093B3017093B4010C94591441E050E052
+:1031C00060E070E004C0440F551F661F771F8A95AA
+:1031D000D2F78091B1019091B201A091B301B09169
+:1031E000B401842B952BA62BB72B8093B101909320
+:1031F000B201A093B301B093B4010C94591441E00F
+:1032000050E060E070E004C0440F551F661F771F58
+:103210008A95D2F740955095609570958091B1014F
+:103220009091B201A091B301B091B4018423952390
+:10323000A623B7238093B1019093B201A093B30169
+:10324000B093B4010C94591441E050E060E070E098
+:1032500004C0440F551F661F771F8A95D2F78091CF
+:10326000B1019091B201A091B301B091B401842752
+:103270009527A627B7278093B1019093B201A09319
+:10328000B301B093B4010C9459140F931F930091A0
+:10329000B1011091B2012091B3013091B401062B1C
+:1032A000172B282B392B0093B1011093B2012093D7
+:1032B000B3013093B4011F910F910C9459140F93E3
+:1032C0001F930091B1011091B2012091B30130918F
+:1032D000B40106231723282339230093B101109347
+:1032E000B2012093B3013093B4011F910F910C945C
+:1032F00059140F931F930091B1011091B2012091C5
+:10330000B3013091B40106271727282739270093E6
+:10331000B1011093B2012093B3013093B4011F9116
+:103320000F910C9459140895CF92DF92EF92FF926F
+:103330000F931F93CF93DF93EC01C090B501D09012
+:10334000B601E090B701F090B8018091B101909181
+:10335000B201A091B301B091B401C82AD92AEA2AD6
+:10336000FB2A0FE110E0B701A601002E04C07695FC
+:103370006795579547950A94D2F740FD05C00150CF
+:10338000110988F780E007C0BE01802F0E94540712
+:103390000197A9F3802FDF91CF911F910F91FF909B
+:1033A000EF90DF90CF900895CF93DF93EC010E94D0
+:1033B0009419BE010E945407DF91CF910895CB016B
+:1033C0000E94D419089590910C019923D9F09091FD
+:1033D0000D019923B9F0982F9695969596959F3063
+:1033E00088F5E0910E01F0910F01E90FF11D877052
+:1033F00021E030E001C0220F8A95EAF78181822B1B
+:103400008183089540910E0150910F0120E030E03A
+:103410009FEFFA01E20FF31F6281681799F09F3F57
+:1034200019F4611101C0922F2F5F3F4F2E303105EB
+:1034300081F79F3F39F0FA01E90FF11D97FDFA95E9
+:1034400082830895089590910C019923E1F0909161
+:103450000D019923C1F0982F9695969596959F30DA
+:1034600020F5E0910E01F0910F01E90FF11D877039
+:1034700021E030E001C0220F8A95EAF72095818192
+:1034800028232183089540910E0150910F0120E0DF
+:1034900030E0FA01E20FF31F9281981301C012820B
+:1034A0002F5F3F4F2E303105A1F7089581E090E066
+:1034B000E0910E01F0910F01E80FF91F10820196C3
+:1034C00080319105A9F708959091CC01982B9093A4
+:1034D000CC01089580959091CC0198239093CC01D4
+:1034E00008951092CC0108959091CB01982B909360
+:1034F000CB01089580959091CB0198239093CB01B7
+:1035000008951092CB0108959091CA01982B909341
+:10351000CA01089580959091CA0198239093CA0199
+:1035200008951092CA0108958093B90108951092E8
+:10353000B901089540910E0150910F0120E030E053
+:1035400080E0FA01E20FF31F918191118F5F2F5FED
+:103550003F4F2F303105A9F70895E0910E01F0910A
+:103560000F018091CC018083E0910E01F0910F0159
+:1035700080819091CB01892B8083E0910E01F091A5
+:103580000F0180819091CA01892B80839091B901AC
+:10359000992361F0E0910E01F0910F018081892B58
+:1035A00080830E949A1A81111092B90180910E01B4
+:1035B00090910F010C94F60ECF92DF92EF92FF9252
+:1035C0000F931F936C01EE24FF24C114D104E10476
+:1035D000F10421F46B017C0180E001C080E133271C
+:1035E0002F2D1E2D0D2D011511052105310519F069
+:1035F000885F6801790197018601A4E036952795D7
+:1036000017950795AA95D1F70115110521053105E3
+:1036100019F08C5F6801790197018601F2E0369517
+:10362000279517950795FA95D1F7011511052105ED
+:10363000310519F08E5F68017901B701A601769511
+:10364000679557954795452B462B472B09F08F5F7C
+:103650001F910F91FF90EF90DF90CF900895809190
+:10366000E401843021F11092CE0120E488E190E061
+:103670000FB6F894A895809360000FBE2093600069
+:1036800080E00E94EF0783B7817F846083BF83B7A8
+:10369000816083BF7894889583B78E7F83BF88E1EC
+:1036A0000FB6F89480936000109260000FBE0895EA
+:1036B00008950895CF930E94581B0E9423040E94EE
+:1036C000591BC0E08C2F0E941005811105C0CF5FEF
+:1036D000CE30C1F780E001C081E0CF9108950E9413
+:1036E0006D140E94EA0E0C94EF0782E084BD93E013
+:1036F00095BD9AEF97BD80936E0008952FB7F8940B
+:103700008091CF019091D001A091D101B091D201CF
+:103710002FBF0895CF92DF92EF92FF920F931F93E6
+:103720002FB7F8944091CF015091D0016091D10111
+:103730007091D2012FBF6A017B01EE24FF248C011E
+:1037400020E030E0C016D106E206F30610F4415046
+:103750005109481B590BCA011F910F91FF90EF901F
+:10376000DF90CF9008951F920F920FB60F92112401
+:103770008F939F93AF93BF938091CF019091D0018E
+:10378000A091D101B091D2010196A11DB11D8093EC
+:10379000CF019093D001A093D101B093D201BF91FA
+:1037A000AF919F918F910F900FBE0F901F90189522
+:1037B0000E94F00BF8942FEF87EA91E621508040A9
+:1037C0009040E1F700C0000087E090EBDC018093BF
+:1037D000EE019093EF01A093F001B093F1012CE082
+:1037E00088E190E00FB6F894A895809360000FBE32
+:1037F00020936000FFCFEF92FF920F931F93CF9320
+:10380000DF93E82EF12C8F2D0E941005C0E0D0E050
+:10381000082F10E098010C2E02C0359527950A94C8
+:10382000E2F720FD05C02196C630D10599F709C001
+:103830006C2F7F2D80E00E941805E812F4CF81E004
+:1038400005C0F3948EE0F812DECF80E0DF91CF91D7
+:103850001F910F91FF90EF900895CF93C82F8CE2A6
+:103860000E94FB1B882321F08C2FCF910C94FB1B13
+:1038700080E0CF910895CF930E94801D811102C0F6
+:103880000E94661DC5E6C15049F00E9423048FE3E3
+:103890009CE90197F1F700C00000F5CF89E20E9492
+:1038A0002D1C811111C18AE20E942D1C81110E94E0
+:1038B000661D85E00E942D1C81110E94D81B0E946C
+:1038C0008B1D8093CD0187E00E942D1C882399F1E8
+:1038D0008BE10E942D1C882351F09091CD0191FB2A
+:1038E000882780F921E0822780FB91F922C08EE0B1
+:1038F0000E942D1C882351F09091CD0192FB8827C6
+:1039000080F921E0822780FB92F913C080E10E94B8
+:103910002D1C9091CD01882341F093FB882780F9DD
+:1039200021E0822780FB93F904C0892F809580FBDA
+:1039300090F99093CD018091CD010E948F1D0E943E
+:103940009D1D8093ED0180EE0E942D1C882341F087
+:103950008091ED01982F909590FB80F98093ED0177
+:1039600089E30E942D1C882359F09091ED0191FB71
+:10397000882780F921E0822780FB91F99093ED015F
+:1039800082EE0E942D1C882359F09091ED0192FB4C
+:10399000882780F921E0822780FB92F99093ED013E
+:1039A00086EE0E942D1C882359F09091ED0193FB27
+:1039B000882780F921E0822780FB93F99093ED011D
+:1039C00083EE0E942D1C882359F09091ED0194FB09
+:1039D000882780F921E0822780FB94F99093ED01FC
+:1039E00085E30E942D1C882359F09091ED0195FBF1
+:1039F000882780F921E0822780FB95F99093ED01DB
+:103A000081E30E942D1C882359F09091ED0196FBD3
+:103A1000882780F921E0822780FB96F99093ED01B9
+:103A200081E10E942D1C882359F09091ED0197FBB4
+:103A3000882780F921E0822780FB97F99093ED0198
+:103A40008091ED010E94A11D8091ED0187FB8827E7
+:103A500080F980930D0187E20E942D1CC82F8EE112
+:103A60000E942D1C8111C2608FE10E942D1C8111CA
+:103A7000C46080E20E942D1C8111C86081E20E9416
+:103A80002D1C8111C06182E20E942D1C8111C06237
+:103A900083E20E942D1C8111C06484E20E942D1CCF
+:103AA000882311F0C06802C0CC2329F08C2F0E941B
+:103AB000981D6C2F03C00E94941D682F70E080E059
+:103AC00090E0CF910C946718CF9108956DEE7EEF42
+:103AD00080E090E00E94BE2360E082E090E00E94DF
+:103AE000AC2360E083E090E00E94AC2360E084E0DF
+:103AF00090E00E94AC2360E085E090E00C94AC2361
+:103B000080E090E00E94A62321E08D3E9E4F09F0C8
+:103B100020E0822F089582E090E00C949E23682F8D
+:103B200082E090E00C94AC2383E090E00C949E2320
+:103B3000682F83E090E00C94AC2384E090E00C9438
+:103B40009E23682F84E090E00C94AC238091D501F3
+:103B500080FF0BC06091130185E0689FB0011124C4
+:103B600075956795759567952AC081FF09C0609125
+:103B7000130185E0689FB0011124759567951FC0FA
+:103B800082FF07C06091130185E0689FB001112496
+:103B900016C04091D6014423C9F060911201461726
+:103BA00088F72091130185E0289F90011124429FFE
+:103BB000C001439F900D112470E00E947023603873
+:103BC000710540F46115710539F002C065E070E0DF
+:103BD000862F08958FE7089581E008958091D5019B
+:103BE00080FF08C06091110170E07595679575952B
+:103BF000679521C081FF06C06091110170E0759545
+:103C0000679519C082FF04C06091110170E010C077
+:103C10008091D6018823C1F0609110018617A0F72A
+:103C200090911101989FC001112470E00E947023AF
+:103C30006038710528F46115710521F0862F08950B
+:103C40008FE7089581E0089561E070E0F4CF803F50
+:103C500021F40E94A61D819504C0813F29F40E9491
+:103C6000A61D8093D9010895823F21F40E94A61DCC
+:103C7000819504C0833F29F40E94A61D8093D8013A
+:103C80000895893F19F40E94EE1D05C08A3F31F462
+:103C90000E94EE1D81958093DA0108958B3F21F4F7
+:103CA0000E94EE1D819504C08C3F29F40E94EE1DF8
+:103CB0008093DB010895843F21F48091D7018160D6
+:103CC00017C0853F21F48091D701826011C0863FE3
+:103CD00021F48091D70184600BC0873F21F480914B
+:103CE000D701886005C0883F31F48091D701806199
+:103CF0008093D70108958D3F21F48091D501816093
+:103D00000BC08E3F21F48091D501826005C08F3FAA
+:103D100029F48091D50184608093D5010895803F76
+:103D200039F48091D90187FF6CC01092D90169C024
+:103D3000813F29F48091D9011816BCF362C090919B
+:103D4000D801823F29F497FF5CC01092D80159C076
+:103D5000833F19F41916CCF354C0893F41F4809184
+:103D6000DA0118160CF04DC01092DA014AC08A3FF1
+:103D700029F48091DA0187FF44C0F6CF8B3F39F4F4
+:103D80008091DB0187FF3DC01092DB013AC08C3F80
+:103D900029F48091DB011816BCF333C0843F21F471
+:103DA0008091D7018E7F17C0853F21F48091D70184
+:103DB0008D7F11C0863F21F48091D7018B7F0BC08E
+:103DC000873F21F48091D701877F05C0883F31F478
+:103DD0008091D7018F7E8093D70113C08D3F21F44E
+:103DE0008091D5018E7F0BC08E3F21F48091D5014B
+:103DF0008D7F05C08F3F29F48091D5018B7F809303
+:103E0000D5018091D80181110EC08091D901811115
+:103E10000AC08091DA01811106C08091DB01811115
+:103E200002C01092D601089587ED91E00E94010F23
+:103E30000E947E1B9093D4018093D30108951F9319
+:103E4000CF93DF938091D3019091D4010E948A1B7C
+:103E50004091D601442321F02091140130E006C0A6
+:103E6000209115015AE0259F900111248217930794
+:103E700008F482C08091D8011091D901D091DA0163
+:103E8000C091DB01811107C0111105C0D11103C020
+:103E9000CC2309F471C04F3F19F04F5F4093D60116
+:103EA000181624F40E94A61D8093D8018091D80191
+:103EB00087FF05C00E94A61D81958093D801111629
+:103EC00024F40E94A61D8093D9018091D90187FF17
+:103ED00005C00E94A61D81958093D9016091D801EB
+:103EE000662339F11091D901112319F1772767FD64
+:103EF0007095872F972F0E94812223E333E343E3BA
+:103F00005FE30E94E5220E944E226093D801612F58
+:103F1000772767FD7095872F972F0E94812223E3D3
+:103F200033E343E35FE30E94E5220E944E22609365
+:103F3000D9011D1624F40E94EE1D8093DA018091B0
+:103F4000DA0187FF05C00E94EE1D81958093DA019A
+:103F50001C1624F40E94EE1D8093DB018091DB018E
+:103F600087FF05C00E94EE1D81958093DB01DF91E4
+:103F7000CF911F910C94141FDF91CF911F91089541
+:103F8000E7EDF1E085E0DF011D928A95E9F71092F7
+:103F9000D6011092D5010895833081F128F4813043
+:103FA00059F08230D1F00895853009F449C0B8F154
+:103FB000863009F456C0089520911501862F90E0AF
+:103FC000820F911D8F3F910520F4620F60931501C0
+:103FD00008958FEF80931501089520911401862F85
+:103FE00090E0820F911D8F3F910520F4620F609346
+:103FF000140108958FEF8093140108952091130107
+:10400000862F90E0820F911D8F3F910520F4620F63
+:104010006093130108958FEF809313010895209109
+:104020001201862F90E0820F911D8F3F910520F4A1
+:10403000620F6093120108958FEF8093120108952B
+:1040400020911101862F90E0820F911D8F3F9105E5
+:1040500020F4620F6093110108958FEF8093110196
+:10406000089520911001862F90E0820F911D8F3FBF
+:10407000910520F4620F6093100108958FEF8093F3
+:1040800010010895833011F128F4813049F0823015
+:1040900091F00895853081F120F18630C1F10895C5
+:1040A00080911501681720F4861B809315010895EF
+:1040B00010921501089580911401681720F4861B51
+:1040C00080931401089510921401089580911301B2
+:1040D000681720F4861B8093130108951092130132
+:1040E000089580911201681720F4861B80931201B5
+:1040F000089510921201089580911101681720F41B
+:10410000861B8093110108951092110108958091EA
+:104110001001681720F4861B8093100108951092F7
+:10412000100108958D3109F442C020F58E3009F454
+:1041300077C070F4873009F459C018F48630F1F173
+:1041400034C0883009F4A8C08B3009F4A5C02DC054
+:10415000863109F4A1C038F4803109F472C081318C
+:1041600009F479C022C0893109F496C08B3109F471
+:104170004DC01BC0853309F487C048F4873209F469
+:1041800083C008F473C0893209F47EC00EC0833442
+:1041900038F48A3308F068C0883309F47DC005C05C
+:1041A000833409F471C0883499F080E008950E9446
+:1041B00008220E94EA0E0E94EF076EC08091CD0196
+:1041C000817F8E7F8093CD0181E08093DD01089512
+:1041D0000E946D142FEF83ED90E3215080409040BA
+:1041E000E1F700C000000E94D81B56C09091CD019D
+:1041F000892F8095817080FB90F919F09660986006
+:104200001DC0997F977F9093CD0146C09091CD01BD
+:1042100091FB882780F921E0822780FB91F909C072
+:104220009091CD0192FB882780F921E0822780FBC5
+:1042300092F99093CD01882379F191609093CD010B
+:1042400008959091CD0193FB882780F921E0822782
+:1042500080FB93F9EECF0E946D1480910D0191E0E7
+:10426000892780930D0118C027EC01C023EE280F89
+:1042700061E070E080E090E004C0660F771F881F67
+:10428000991F2A95D2F704C061E070E080E090E0C9
+:104290000E9467180E946D1481E0089580E00895DF
+:1042A00080E00895CF93C82F8091DD01813079F0AF
+:1042B00018F08230D1F184C0A0910E01B0910F01AD
+:1042C0008C91813169F0823209F07CC009C0A091E3
+:1042D0000E01B0910F018C91813111F0823249F4BD
+:1042E0008C2F0E944E2181111DC08C2F0E94922084
+:1042F0001AC08C2F0E945021811114C0C43179F052
+:1043000048F4CB3079F0C03109F060C082E080938E
+:10431000DD0108C0C93219F0C83321F057C010922E
+:10432000DD0154C081E0817053C0C93289F118F5B4
+:10433000C43171F1A8F4C73009F046C08AE0809317
+:10434000150194E19093140193E0909313018093ED
+:10435000120188E08093110188E28093100134C03B
+:10436000CE51C63088F5EC2FF0E0E65DFE4F80813F
+:104370008093DC0129C0CE34E9F020F4CB3421F560
+:104380006AE013C0C13579F0C235F1F461E00DC0C7
+:104390008091DC01882319F01092DC0115C081E0C6
+:1043A0008093DD0115C061E006C08091DC010E94B0
+:1043B000CC1F0AC06AE08091DC010E94422004C048
+:1043C0001092DD0180E004C081E002C080E0ABCF4C
+:1043D000CF910895E1E8F0E080818860808380815A
+:1043E000816080838FB7F89493E09093890090ED7B
+:1043F000909388008FBF0895EFE6F0E0808182609F
+:1044000080830895EFE6F0E080818D7F80830895BA
+:10441000EFE6F0E0808192E08927808308951F9283
+:104420000F920FB60F9211242F933F934F935F93E8
+:104430006F937F938F939F93AF93BF93EF93FF936C
+:104440008091DE019091DF0101969093DF018093CE
+:10445000DE01811103C082E00E94EF07E091DF01DD
+:10446000E695E695F0E0E657FB4FE4918091DE019A
+:104470008E1303C080E00E94EF07FF91EF91BF9180
+:10448000AF919F918F917F916F915F914F913F91EC
+:104490002F910F900FBE0F901F90189504D0689425
+:1044A000B1118DC0089570D088F09F5790F0B92F4A
+:1044B0009927B751A0F0D1F0660F771F881F991F79
+:1044C0001AF0BA95C9F712C0B13081F077D0B1E0D7
+:1044D000089574C0672F782F8827B85F39F0B93FE7
+:1044E000CCF3869577956795B395D9F73EF490957B
+:1044F0008095709561957F4F8F4F9F4F0895E894F9
+:1045000009C097FB3EF490958095709561957F4F1B
+:104510008F4F9F4F9923A9F0F92F96E9BB279395C9
+:10452000F695879577956795B795F111F8CFFAF4D9
+:10453000BB0F11F460FF1BC06F5F7F4F8F4F9F4F0A
+:1045400016C0882311F096E911C0772321F09EE868
+:10455000872F762F05C0662371F096E8862F70E0CE
+:1045600060E02AF09A95660F771F881FDAF7880FA8
+:104570009695879597F9089557FD9058440F551FC4
+:1045800059F05F3F71F04795880F97FB991F61F0D5
+:104590009F3F79F087950895121613061406551F4C
+:1045A000F2CF4695F1DF08C0161617061806991FB8
+:1045B000F1CF86957105610508940895E894BB27AD
+:1045C00066277727CB0197F908950BD078C069D07B
+:1045D00028F06ED018F0952309F05AC05FC011245E
+:1045E000EECFCADFA0F3959FD1F3950F50E0551F92
+:1045F000629FF001729FBB27F00DB11D639FAA2738
+:10460000F00DB11DAA1F649F6627B00DA11D661F86
+:10461000829F2227B00DA11D621F739FB00DA11DA7
+:10462000621F839FA00D611D221F749F3327A00D61
+:10463000611D231F849F600D211D822F762F6A2FFD
+:1046400011249F5750408AF0E1F088234AF0EE0F82
+:10465000FF1FBB1F661F771F881F91505040A9F78F
+:104660009E3F510570F014C0AACF5F3FECF3983E17
+:10467000DCF3869577956795B795F795E7959F5FF6
+:10468000C1F7FE2B880F911D9695879597F9089590
+:1046900097F99F6780E870E060E008959FEF80ECF5
+:1046A000089500240A941616170618060906089598
+:1046B00000240A9412161306140605060895092EFE
+:1046C0000394000C11F4882352F0BB0F40F4BF2B6D
+:1046D00011F460FF04C06F5F7F4F8F4F9F4F0895AD
+:1046E00097FB072E16F4009407D077FD09D00E949F
+:1046F0008A2307FC05D03EF4909581959F4F08953D
+:10470000709561957F4F0895EE0FFF1F0590F4910E
+:10471000E02D0994AA1BBB1B51E107C0AA1FBB1FB8
+:10472000A617B70710F0A61BB70B881F991F5A953D
+:10473000A9F780959095BC01CD010895F999FECF18
+:1047400092BD81BDF89A992780B50895A8E1B0E09F
+:1047500042E050E00C94C623262FF999FECF92BD7B
+:1047600081BDF89A019700B4021639F01FBA20BD36
+:104770000FB6F894FA9AF99A0FBE08950196272F6A
+:104780000E94AD230C94AC23DC01CB01FC01F99910
+:10479000FECF06C0F2BDE1BDF89A319600B40D928D
+:0C47A00041505040B8F70895F894FFCF46
+:1047AC002002F1077E085B082708F4070101BA0113
+:1047BC0028080A03140A3F4D36394B04FE03C8037C
+:1047CC008F0322033B0354036D030102030405060C
+:0447DC0007080900C1
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/adnw/k_o_y/keymap.c b/keyboard/ergodox_ez/keymaps/adnw/k_o_y/keymap.c new file mode 100644 index 0000000000..e33037b330 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/adnw/k_o_y/keymap.c @@ -0,0 +1,185 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" +#include "keymap_extras/keymap_german.h" + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define MDIA 2 // media keys + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Del | K | . | O | , | Y | L1 | | L1 | V | G | C | L | ß | Z | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | BkSp | H | A | E | I | U |------| |------| D | T | R | N | S | F | + * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| + * | LShift |X/Ctrl| Q | Ä | Ü | Ö | | | | B | P | W | M | J | RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | App | LGui | | Alt |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * | Space|Enter |------| |------| Tab |RShift| + * | | | End | | PgDn | | | + * `--------------------' `----------------------' + */ +// 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_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, + KC_DELT, DE_K, DE_DOT, DE_O, DE_COMM,DE_Y, TG(SYMB), + KC_BSPC, DE_H, DE_A, DE_E, DE_I, DE_U, + KC_LSFT, CTL_T(DE_X), DE_Q, DE_AE, DE_UE, DE_OE, ALL_T(KC_NO), + LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT, + ALT_T(KC_APP), KC_LGUI, + KC_HOME, + KC_SPC,KC_ENT ,KC_END, + // right hand + KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + TG(SYMB), DE_V, DE_G, DE_C, DE_L, DE_SS, DE_Z, + DE_D, DE_T, DE_R, DE_N, LT(MDIA, DE_S), GUI_T(KC_F), + MEH_T(KC_NO),KC_B, KC_P, KC_W, KC_M, CTL_T(KC_J), KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, + KC_LALT, CTL_T(KC_ESC), + KC_PGUP, + KC_PGDN,KC_TAB, KC_RSFT + ), +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | . | 0 | = | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP( + // left hand + KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, + KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, + KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,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_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS +), +/* Keymap 2: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +[MDIA] = KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + // right hand + 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_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_WBAK +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +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) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +// 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); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + 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; + default: + // none + break; + } + +}; diff --git a/keyboard/ergodox_ez/keymaps/adnw/k_o_y/readme.md b/keyboard/ergodox_ez/keymaps/adnw/k_o_y/readme.md new file mode 100644 index 0000000000..f0dd3815c1 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/adnw/k_o_y/readme.md @@ -0,0 +1,7 @@ +# Basic implementation for k.o,y variant of the adnw layout + +adnw is a layout optimised for usage with german and english language +k.o,y is a variant of this layout +http://www.adnw.de/index.php?n=Main.SeitlicheNachbaranschl%C3%A4ge + +The os must use the de_DE layout diff --git a/keyboard/ergodox_ez/keymaps/algernon/COPYING b/keyboard/ergodox_ez/keymaps/algernon/COPYING new file mode 100644 index 0000000000..94a9ed024d --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/keyboard/ergodox_ez/keymaps/algernon/README.md b/keyboard/ergodox_ez/keymaps/algernon/README.md new file mode 100644 index 0000000000..b8578e438f --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/README.md @@ -0,0 +1,133 @@ +algernon's layout +======================= + +This is an unconventional layout for the ErgoDox EZ. For more details about the +history of the layout, see my +[blog posts about my ErgoDox journey][blog-ergodox]. + + [blog-ergodox]: https://asylum.madhouse-project.org/blog/tags/ergodox/ + +Some of the things in the layout only work when one uses Spacemacs and GNOME +under Linux. Your mileage may vary. + +## Base layer + +[](http://www.keyboard-layout-editor.com/#/gists/28f7eb305fdbff943613e1dc7aa9e82b) + +At its core, this is a Dvorak layout, with some minor changes (for example, `-` +being on the left half, and on the innermost key of the bottom row on the +right). The more interesting parts are how certain keys behave: + +* The keys on the number row double as function keys, when held for a bit longer + than an usual tap. This allows me to use the function keys without having to + switch layers. +* The `Shift`, `Alt`, and `Control` modifiers are one-shot. When tapped, they + are considered active for the next key press only. When double tapped, they + toggle on, until a third, single tap sometime later. When held, they act as + expected. My usual pattern is that I use these for the next keypress only, so + this behaviour is perfect. If I need them held, I'll just double-tap. +* The `GUI` key is special, because when I double-tap it, it sends `GUI + w`, + which pops up an application selector. It also switches to a one-shot layer, + where the number row on the left half turns into app selector macros, for the + most common things I usually want to switch to. Otherwise it behaves as on a + normal layout. +* The `ESC` key also doubles as a one-shot cancel key: if tapped while any of + the one-shot modifiers are in-flight (as in, single-tapped, and not expired + yet), it cancels all one-shot modifiers. Otherwise it sends the usual keycode. +* The **Emacs** and **Hun** layer keys are one-shot, the **1Hand** is a toggle. +* The **Lead** key allows me to type in a sequence of keys, and trigger some + actions: + - `LEAD u` enters unicode input mode, by sending the GTK+ key sequence that + does this. + - `LEAD l` uses the unicode input method to enter a `λ`. + - `LEAD s` does a lot of magic to type in a shruggie: `¯\_(ツ)_/¯` + - `LEAD w m` maximises the currently focused window. + +## Hungarian layer + +[](http://www.keyboard-layout-editor.com/#/gists/b160f6ec90d58c127c114c89f66e9dc9) + +On this layer, the accented characters are at the same position as their base +variant. For some, which can have other diatribes, the long one is on top, +short's on bottom. Tapping any of the accented characters takes us back to the +base layer. + +## Emacs layer + +[](http://www.keyboard-layout-editor.com/#/gists/c59c453f9fe1a3238ba1494e7e5c6892) + +This layer is primarily for navigating text - and for some mousing and other +things, because there was space. Most of the keys should be pretty +self-explanatory, except for a few: + +* There are three keys on the bottom row of the left side, that change how some + of the other keys - explained just below - work. The keys are for *Emacs + mode* (the default), *Terminal mode*, and *Traditional mode*, respectively. +* The *Visual mode* key (the top big key on the left side) sends the `v` key in + *Emacs mode*, to enter Visual mode in Spacemacs. In all other modes, it is a + no-op. +* The *Copy/Cut* key (the bottom big key on the left side) sends the copy + command on tap, the cut one when held for longer than a normal tap. The **copy + command** is `y` in *Emacs mode*, `Ctrl-Shift-c` in *Terminal mode*, and + `Ctrl-c` in *Traditional mode*. The **cut command** is `x` in *Emacs mode*, + `Ctrl-Shift-x` in *Terminal Mode* and `Ctrl-x` in *Traditional mode*. +* The *Paste/Delete* key (the leftmost key on the left thumb cluster) sends the + paste command on tap, the delete one when held longer than a normal tap. The + **paste command** is `p` in *Emacs mode*, `Ctrl-Shift-v` in *Terminal mode*, + and `Ctrl-v` in *Traditional mode*. The **delete command** is `d` in *Emacs + mode*, and `DEL` in the other two. +* The `A`, `I` and `R` keys will - after sending themselves - clear the layer + back to the base layer. This allows a quick escape from the layer. + +## One-handed layer + +[](http://www.keyboard-layout-editor.com/#/gists/edff2495135955b8963198dace7f7ece) + +The one-handed layer is used in situations where the right hand is occupied, by +mousing around, for example. Tapping the `OTHER` key switches which side is +active. For the most part, keys remain in their usual position. When the right +half is active, keys are mirrored to the left half. + +The differences are as follows: + +* The `ESC` key has been moved to the bottom row, so the `OTHER` key is easier + to tap. +* Most keys on the thumb cluster now have dual uses, and these do not change + when switching sides: + - The `Space`/`Backspace` key sends `Space` on tap, `Backspace` when held + for longer than a normal tap. + - The `Enter`/`Shift` key sends `Enter` on short-tap, `Shift` on long-tap. +* The `Apps`/`BASE` key can be used to go back to the base layer, by + long-tapping it. A short-tap will send the `App` key, as usual. + +# Building + +To make my workflow easier, this layout is maintained in +[its own repository][algernon:ez-layout]. To build it, you will need the +[QMK][qmk] firmware checked out, and this repo either checked out, or symlinked +to `keyboard/ergodox_ez/algernon`. One way to achieve that is this: + + [algernon:ez-layout]: https://github.com/algernon/ergodox-layout + [qmk]: https://github.com/jackhumbert/qmk_firmware + +``` +$ git clone https://github.com/jackhumbert/qmk_firmware.git +$ cd qmk_firmware/keyboard/ergodox_ez +$ git clone https://github.com/algernon/ergodox-layout.git keymaps/algernon +$ make KEYMAP=algernon +``` + +From time to time, updates may be submitted back to the QMK repository. If you +are reading it there, you can build the firmware like any other firmware +included with it (assuming you are in the root directory of the firmware): + +``` +$ cd keyboard/ergodox_ez +$ make KEYMAP=algernon +``` + +# License + +The layout, being a derivative of the original TMK firmware which is under the +GPL-2+, this layout is under the GPL as well, but GPL-3+, rather than the older +version. diff --git a/keyboard/ergodox_ez/keymaps/algernon/algernon.hex b/keyboard/ergodox_ez/keymaps/algernon/algernon.hex new file mode 100644 index 0000000000..85c46c2774 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/algernon.hex @@ -0,0 +1,1259 @@ +:100000000C941C040C9463040C9463040C9463041B
+:100010000C9463040C9463040C9463040C946304C4
+:100020000C9463040C9463040C94D7130C94A914DB
+:100030000C945F220C9463040C9463040C9463048A
+:100040000C9463040C9463040C9463040C94630494
+:100050000C9463040C94C7220C9463040C94630402
+:100060000C9463040C9463040C9463040C94630474
+:100070000C9463040C9463040C9463040C94630464
+:100080000C9463040C9463040C9463040C94630454
+:100090000C9463040C9463040C9463040C94630444
+:1000A0000C9463040C9463040C9463041C065805BC
+:1000B00066056D0577059B05D505A60586058D05A5
+:1000C00093050A0610061606330536053B053E0560
+:1000D0004105440547054C054F0553065A06610680
+:1000E00068066F0676067606760676067606760645
+:1000F000760676067606760676069106A8067A06CF
+:10010000CB06DD06210516153815261638152616D8
+:100110007D15A0152616F51508167E187E18AA1846
+:10012000AA18ED180D19681A681A1819681AC5194D
+:10013000C519591A681A681A621AD219D219D2192D
+:10014000D219D219D219D219D219D219D219D21957
+:10015000D219D219D219D219D219E319F019F719F3
+:10016000FE19081A0128022800012C022C00012A7D
+:10017000022A00016502650001150215010B020B40
+:10018000011C021C01170217010B020B01100210C7
+:100190000105020501120212011B021B012802289F
+:1001A0000001060206010B020B01150215011202E5
+:1001B000120110021001280228000117021701087D
+:1001C0000208011502150110021001280228000181
+:1001D00008020801100210010402040106020601CF
+:1001E0001602160128022800011602160106020650
+:1001F000011802180107020701060206010F020F8B
+:100200000112021201180218010702070128022830
+:100210000001040204000115021500010C020C008B
+:1002200001E40119021902E40001E401E5011902E7
+:100230001902E502E400011302130002E501300295
+:10024000300113021301E500014C024C00010702CA
+:10025000070001E40106020602E40001E401E501F1
+:1002600006020602E502E400011C021C0001E40192
+:100270001B021B02E40001E401E5011B021B02E575
+:1002800002E400011B021B00011902190000810495
+:100290008900C800220024002135002B002D00AE6B
+:1002A000004A0000001C303400040033004D002CD4
+:1002B000301D30360012001400510003201E30376C
+:1002C0000008000D0052002A001F30130018000E15
+:1002D000003302052020301C000C001B000000042D
+:1002E0002065002F0000002602000002206500307B
+:1002F0000000002702000003552130090007000517
+:100300000000002A3022300A000B0010002D0014DB
+:10031000502330060017001A0050002C002430151E
+:1003200000110019004F00280025300F0016001D95
+:10033000004B000120263038003100AD004E000097
+:10034000000100010001000100010000001B30015C
+:10035000000100010001000100173001000100014F
+:10036000000100010018300100010001000100013E
+:10037000001930010001000100010001001A3001E4
+:100380000001000100000001000100010000000167
+:100390000000000100010001000000010000000158
+:1003A0000000000100010001000000010000000148
+:1003B0000001000100010001000000010001000136
+:1003C0000001000100000001000100010001000126
+:1003D0000000000100010001000100010001000116
+:1003E0000001000100010000000000000000000109
+:1003F0000001000000000000000E300000010001BC
+:1004000000000015300F3013300100010000000023
+:1004100000103000000100010000001630113014FF
+:100420003000000100000000001230000000000158
+:1004300000010000000000000000000100010000B9
+:1004400000000000000000000000000000000000AC
+:10045000000000000000000000000000000000009C
+:10046000000000000000000000010001000000008A
+:10047000000000000001000100000000000000007A
+:10048000000100002000000000000000000100004A
+:1004900000FD00FE00FF00AE00083000001C300030
+:1004A000000D300000093001001D304A0050004DA1
+:1004B000000A3001001E30520051005100000006B9
+:1004C000301F304B004F004E000000010020300074
+:1004D000000B301B00000001000F08053000000772
+:1004E00030000001000F08F9000000FA00000001D0
+:1004F0000021302102070000000000F60022300138
+:1005000030F2000330A900AC002330F000F1001AF3
+:1005100000AA00F50024300230F3000430A800F4F3
+:100520000025300C30000000000000AB00263046F3
+:10053000000000AD000000000035002B002D00AED3
+:10054000004A0000001C303400040033004D002B32
+:10055000301D30360012001400510028301E303794
+:100560000008000D00520027301F30130018000E45
+:10057000002C30010020301C000C001B000000018A
+:100580000029302F000000260200000100000000BA
+:10059000000000000000000000000000000000005B
+:1005A000000000000000000000000000000000004B
+:1005B000000000000000000000000000000000003B
+:1005C000000000000000000000000000000000002B
+:1005D000000000000000000000000000000000001B
+:1005E00000263038003100AD004E00000025300FED
+:1005F0000016001D004B002A302430150011001990
+:10060000004F0028302330060017001A0050002742
+:100610003022300A000B0010002C3001002130097C
+:10062000000700050000000100293030000000270D
+:1006300002000001000000000000000000000000B7
+:1006400000000000000000000000000000000000AA
+:10065000000000000000000000000000000000009A
+:10066000000000000000000000000000000000008A
+:10067000000000000000000000000000000000007A
+:100680000000000000000000001603450072006733
+:10069000006F0044006F007800200045005A000001
+:1006A0000016034500720067006F0044006F007879
+:1006B00000200045005A0000000403090409026DEF
+:1006C00000040100A0FA090400000103010100096F
+:1006D0002111010001223F000705810308000A09DA
+:1006E0000401000103010200092111010001224D52
+:1006F000000705820308000A090402000103000044
+:1007000000092111010001223600070583030800BA
+:100710000A0904030001030000000921110100017E
+:1007200022390007058403100001120110010000A6
+:100730000008EDFE07130100010200010501090692
+:10074000A101050719E029E71500250195087501A4
+:100750008102050819012905950575019102950188
+:100760007503910105071900297715002501957872
+:1007700075018102C005010980A1018502160100F1
+:1007800026B7001A01002AB700751095018100C034
+:10079000050C0901A1018503160100269C021A011E
+:1007A000002A9C02751095018100C005010902A173
+:1007B000010901A100050919012905150025019567
+:1007C0000575018102950175038101050109300953
+:1007D000311581257F950275088106093815812517
+:1007E0007F950175088106050C0A38021581257F61
+:1007F000950175088106C0C005010906A10105071C
+:1008000019E029E715002501950875018102950178
+:1008100075088101050819012905950575019102E1
+:100820009501750391010507190029FF150025FFA2
+:10083000950675088100C00011241FBECFEFDAE0D5
+:10084000DEBFCDBF04B603FE27C080914402909165
+:100850004502A0914602B09147028730904BA740D5
+:10086000B04BD1F41092440210924502109246020D
+:100870001092470214BE84B7877F84BF0FB6F894E6
+:10088000A89580916000886180936000109260005C
+:100890000FBEE0E0FFE3099511E0A0E0B1E0E2E483
+:1008A000FEE402C005900D92A035B107D9F722E011
+:1008B000A0E5B1E001C01D92A434B207E1F70E94A7
+:1008C0001A110C941F270C940000FF920F931F9392
+:1008D000CF93DF93EB01F42EFC018281882309F48E
+:1008E00058C082E00E942B1FE0910E01F0910F0191
+:1008F000808181FF05C081EE0E940F1811E001C0C8
+:1009000010E00E94772181FF0AC00E941D20811102
+:1009100006C081EE0E940F1810E001E001C0012F17
+:100920000E94702186EE0E947B1786EE0E940F18AF
+:10093000C433F2E0DF0719F485EE0E947B178C2F99
+:100940000E947B178C2F0E940F18002341F0C433A4
+:1009500082E0D80759F085EE0E947B1707C0C433A8
+:10096000E2E0DE0719F485EE0E940F188F2D0E9439
+:100970007B178F2D0E940F18011103C0C433D24082
+:1009800019F485EE0E940F18112319F081EE0E94D0
+:100990007B1780E090E0DF91CF911F910F91FF9046
+:1009A00008950F931F93CF93DF931F92CDB7DEB7B8
+:1009B00024EE260FFC018281022F10E0882381F0B3
+:1009C0000E9491229801220F331F225E3D4FF901B0
+:1009D000918380830F90DF91CF911F910F910895A4
+:1009E000C801880F991F825E9D4FFC018081918113
+:1009F00069830E949D226981893C910510F0625EA5
+:100A000005C0663211F06E5F01C06EE2862F698309
+:100A10000E947B176981862F0F90DF91CF911F91E4
+:100A20000F910C940F18CF93DF93EC01462F50E0F9
+:100A30004D32510508F0EBC1FA01EA5AFF4F0C9410
+:100A4000CF268A81882369F00E947721882339F094
+:100A50000E941D20811103C00E947021D8C189E22B
+:100A600097C189E291C144E050E002C042E150E008
+:100A700064E370E018C048E050E0FACF48E150E08D
+:100A8000F7CF4CE050E0F4CF42E150E002C048E143
+:100A900050E064E372E007C042E150E002C048E188
+:100AA00050E06EE270E0CE01DF91CF910C946504CE
+:100AB0008A81882311F080EF14C080EF0E944924BE
+:100AC00082EF0E9449240E94CE24A1C18A818823FA
+:100AD00011F080EF10C080EF15C08A81882329F0C3
+:100AE00081EF0E94E12382EF09C081EFE7CF8A8185
+:100AF000882339F081EF0E94E12383EF0E94E123F4
+:100B0000E2CF81EF0E94492483EFDBCF8A818823E3
+:100B100009F47DC1109250017AC18A81882309F4B9
+:100B200076C181E005C08A81882309F470C182E022
+:100B3000809350016CC180915001811168C18A81FC
+:100B4000882309F464C188E892E063C18A8188231C
+:100B500039F00E9491229093600180935F0157C108
+:100B600080915F01909160010E949D22209150012F
+:100B7000893C910568F0213041F008F430C1223001
+:100B800009F045C18DE692E044C186E792E041C19B
+:100B9000213041F008F426C1223009F038C182E545
+:100BA00092E037C18BE592E034C18A81882339F025
+:100BB0000E949122909362018093610128C18091EB
+:100BC0006101909162010E949D2220915001893C17
+:100BD000910548F0222309F408C1233008F017C119
+:100BE00088E492E016C1213009F402C130F02230CD
+:100BF00009F00DC180E292E00CC1E0910E01F0918C
+:100C00000F01808185FFF7C085EE0E940F188BE3EE
+:100C100092E0FFC08A818111F1C00E94EB1EF7C0F3
+:100C20008A818823D1F386E192E0F3C08A81882308
+:100C3000A1F381E192E0EDC08A81882309F183EE7E
+:100C40000E947B178D81982F907F91F080FD10C0BE
+:100C500082958F7090E0029774F08AE10E947B1772
+:100C600081E00E940A1F63E081E00E94752003C0BA
+:100C70008D818F708D8310925E0110925D01C7C0CF
+:100C80008D8182958F7090E0029734F08AE10E9406
+:100C90000F1881E00E948C200E94912290935E01A7
+:100CA00080935D01B4C08A81882309F4B0C088EEC6
+:100CB00091E0AFC08A81882309F4A9C08FEC91E04C
+:100CC000A8C08A81882309F4A2C08AEB91E0A1C060
+:100CD0008A81882309F49BC081EA91E09AC08A81C5
+:100CE000882309F494C088E791E093C0CE010E9464
+:100CF000D1048DC08A81882339F00E94912290937B
+:100D00005C0180935B0183C080915B0190915C01E9
+:100D10000E949D22893C910508F07FCF83E791E0F6
+:100D200078C08A81882339F00E94912290935A01D9
+:100D3000809359016CC08091590190915A010E9491
+:100D40009D22893C910508F05CC089E691E061C074
+:100D50008A81882339F00E949122909358018093D0
+:100D6000570155C080915701909158010E949D22D2
+:100D7000893C910508F448C0E0910E01F0910F0103
+:100D8000808181FF04C081EE0E940F1840C081EE77
+:100D90000E947B173CC08A818823C9F184E00E94AD
+:100DA000F51E81E0809356010E9491229093550197
+:100DB00080935401259A2D9A2AC08A81882339F17B
+:100DC00085E00E94F51E81E0809353010E949122EC
+:100DD0009093520180935101279A2F9A18C083E86B
+:100DE00092E017C088E692E014C08DE492E011C052
+:100DF00089E292E00EC086E392E00BC08BE192E0C4
+:100E000008C08EE691E005C084E691E002C080E073
+:100E100090E0DF91CF9108958FE090E0909389006A
+:100E20008093880090938B0080938A0090938D002C
+:100E300080938C00569A5E9A259A2D9A269A2E9A1D
+:100E4000279A2F9A2FEF83ED90E321508040904016
+:100E5000E1F700C0000056985E9825982D982698D6
+:100E60002E9827982F98089584EE0E947B1785EE80
+:100E70000E947B1788E10E947B1788E10E940F186F
+:100E800085EE0E940F1884EE0C940F180F931F9399
+:100E9000CF93DF93EC018E0188819981009741F017
+:100EA0000E947B172296F80180810E940F18F3CFD1
+:100EB000DF91CF911F910F9108951F93CF93DF93EF
+:100EC000CDB7DEB76A970FB6F894DEBF0FBECDBFC1
+:100ED0006091EC017091ED018091EE019091EF0134
+:100EE0000E94CD21182F80915D0190915E010097A5
+:100EF00041F00E949D22893C910518F083EE0E94EA
+:100F00000F18143049F410925301123051F4269AFC
+:100F10002E9A279A2F9A0BC010925601153099F7E6
+:100F200006C0133021F4259A2D9A269A2E9A8CEF1A
+:100F3000810F823008F050C0269A2E9A8091560177
+:100F4000882319F180915401909155010E949D22AE
+:100F5000853F914048F0E0910E01F0910F018081B2
+:100F600081FD02C025982D988091540190915501E2
+:100F70000E949D22893E934040F0259A2D9A0E941E
+:100F800091229093550180935401809153018823BD
+:100F900019F180915101909152010E949D22853F4B
+:100FA000914048F0E0910E01F0910F01808180FDA9
+:100FB00002C027982F9880915101909152010E9470
+:100FC0009D22893E934040F0279A2F9A0E949122B9
+:100FD0009093520180935101E0910E01F0910F0125
+:100FE000808181FF09C08FEF90E09093890080930A
+:100FF0008800259A2D9A14C00E94772181FF04C091
+:101000000E941D20882379F38FE090E0909389005F
+:10101000809388008DEF810F823010F025982D98F5
+:10102000E0910E01F0910F01808182FF09C08FEFE6
+:1010300090E090938B0080938A00269A2E9A14C099
+:101040000E94772182FF04C00E941D20882379F32B
+:101050008FE090E090938B0080938A008EEF810F59
+:10106000843010F026982E98E0910E01F0910F0137
+:10107000808180FF09C08FEF90E090938D00809376
+:101080008C00279A2F9A14C00E94772180FF04C0F9
+:101090000E941D20882379F38FE090E090938D00CB
+:1010A00080938C00153021F0123011F027982F9882
+:1010B00080918C01882309F410C180918A0190915C
+:1010C0008B010E949D22893E934008F406C1109234
+:1010D0008C010E94CF0B80918401909185014897EB
+:1010E00071F48091860190918701892B41F4809160
+:1010F000880190918901892B11F40E943407809115
+:101100008401909185010F97D9F480918601909187
+:101110008701892BA9F48091880190918901892BFD
+:1011200079F40E9434078CE0E5E1F1E0DE011196EC
+:1011300001900D928A95E1F7CE0101960E94460733
+:101140008091840190918501469709F086C0809135
+:10115000860190918701892B09F07FC080918801D9
+:1011600090918901892B09F078C00E94340784E0AE
+:101170000E947B1784E00E940F1889E00E947B1771
+:1011800089E00E940F188CE20E947B178CE20E947B
+:101190000F1881E30E947B1781E30E940F1885EEF0
+:1011A0000E947B178DE20E947B178DE20E940F1830
+:1011B00086E20E947B1786E20E940F1885EE0E944D
+:1011C0000F180E94340780E20E947B1780E20E9481
+:1011D0000F1887E20E947B1787E20E940F1886E0B3
+:1011E0000E947B1786E00E940F1881E20E947B1705
+:1011F00081E20E940F188CE20E947B178CE20E9411
+:101200000F1885EE0E947B1787E20E947B1787E20A
+:101210000E940F188DE20E947B178DE20E940F182A
+:1012200085EE0E940F1888E30E947B1788E30E94D6
+:101230000F180E94340784E00E947B1784E00E940C
+:101240000F1889E00E947B1789E00E940F188CE23A
+:101250000E947B178CE20E940F188091840190916C
+:1012600085014A97D1F58091860190918701409739
+:10127000A1F58091880190918901892B71F582EE09
+:101280000E947B178BE30E947B178BE30E940F1851
+:1012900082EE0E940F188FEF93ED20E38150904073
+:1012A0002040E1F700C000008AE1E1E2F1E0DE0168
+:1012B000119601900D928A95E1F7CE0101960E9458
+:1012C000460783EE0E947B1782E50E947B1782E52A
+:1012D0000E940F1883EE0E940F186A960FB6F894BA
+:1012E000DEBF0FBECDBFDF91CF911F9108950C944B
+:1012F0005D0756985E9825982D9826982E982798E1
+:101300002F988FEF90E090938900809388009093BE
+:101310008B0080938A0090938D0080938C00259A97
+:101320002D9A2FEF80E792E0215080409040E1F726
+:1013300000C00000269A2E9A2FEF80E792E02150FD
+:1013400080409040E1F700C00000279A2F9A2FEFCD
+:1013500080E792E0215080409040E1F700C000001B
+:1013600025982D982FEF80E792E021508040904003
+:10137000E1F700C0000026982E982FEF80E792E05A
+:10138000215080409040E1F700C0000027982F983E
+:1013900056985E9825982D9826982E9827982F98DD
+:1013A000089589EA8093800089E0809381002498E1
+:1013B0002C983F988AB18F748AB96E98479A8BB1EE
+:1013C000806B8BB9769A0E9479090C940C0780E2A5
+:1013D000809300018091630181110EC00E94360A42
+:1013E00081E0809363012FEF83ED90E321508040F3
+:1013F0009040E1F700C0000080E40E943C0A809326
+:10140000000181112EC00E94660A809300018111A3
+:1014100028C00E94660A80930001811122C08FE3D8
+:101420000E94660A8093000181111BC00E945E0A1F
+:1014300080E40E943C0A80930001811112C08CE07C
+:101440000E94660A8093000181110BC00E94660A07
+:1014500080930001811105C08FE30E94660A80938A
+:1014600000010E945E0A8091000108951092B90067
+:101470008AE08093B800089594EA9093BC0090911C
+:10148000BC0097FFFCCF9091B900987F983021F075
+:10149000903111F081E008958093BB0084E880933F
+:1014A000BC008091BC0087FFFCCF8091B900887F91
+:1014B000883111F0803471F780E0089584E98093D9
+:1014C000BC008091BC0084FDFCCF08958093BB00DC
+:1014D00084E88093BC008091BC0087FFFCCF909192
+:1014E000B900987F81E0983209F480E0089584E89B
+:1014F0008093BC008091BC0087FFFCCF8091BB0033
+:10150000089580910001811115C080E40E943C0A79
+:101510008093000181110CC082E10E94660A8093D1
+:101520000001811105C08FEF0E94660A80930001BF
+:101530000E945E0A84B1807F84B985B1807F85B9BD
+:101540008AB1837F8AB98BB1837F8BB93E984698E5
+:1015500008950E94E709809300010E94810A80B3E8
+:101560008C7080BB81B3836F81BBA5E6B1E0E3E7FC
+:10157000F1E08EE08E0F11921D928E13FCCF0C9431
+:10158000D109BF92CF92DF92EF92FF920F931F93F8
+:10159000CF93DF9380910001882379F080916401DB
+:1015A0008F5F80936401811108C00E94E7098093D6
+:1015B0000001811102C00E94790905E611E0C0E036
+:1015C000D0E0DD24D39482E0C82EEE24E394F12C05
+:1015D000C730D10500F580910001811164C080E41D
+:1015E0000E943C0A80930001811112C082E10E9496
+:1015F000660A8093000181110BC0C7010C2E01C047
+:10160000880F0A94EAF780950E94660A8093000189
+:101610000E945E0A48C0CA30A1F028F4C83059F0D0
+:10162000C93061F005C0CC3089F070F0CD3089F060
+:10163000209A289810C0219A29980DC0229A2A9899
+:101640000AC0239A2B9807C0529A01C0539A5B98FC
+:1016500002C03E9A469890EA9A95F1F79FB179991F
+:1016600002C082E001C080E091709D25982B7C999A
+:1016700002C084E001C080E0892B7D9902C038E07F
+:1016800001C030E0832B7E9902C020E101C020E040
+:10169000822B9FB19095991F9927991F9295990F29
+:1016A000907E892B0FC080910001811149C080E498
+:1016B0000E943C0A80930001882379F1B12C0E949A
+:1016C0005E0A8B2DF8019081981719F08083C092E3
+:1016D00001010E94810A21960F5F1F4FCE30D10574
+:1016E00009F076CF80910101882361F181508093C8
+:1016F0000101882339F08FE99FE00197F1F700C0DD
+:10170000000020C0A3E7B1E0E5E6F1E0CF01825F91
+:1017100091919D938E13FCCF15C083E10E94660AC0
+:10172000809300018111CACF81E40E943C0A80931A
+:1017300000018111C3CF0E94770AB82EB094BFCFA9
+:1017400080E0C0CF0E94770981E0DF91CF911F91A7
+:101750000F91FF90EF90DF90CF90BF900895E82F0A
+:10176000F0E0ED58FE4F8081089508950F931F9388
+:10177000CF93DF93C3E7D1E010E00C2F025F899194
+:1017800090E00E94C121180F0C13F9CF812FDF9137
+:10179000CF911F910F91089581E0089508950895C4
+:1017A0000F931F93CF93DF938C01FC01C081D181F4
+:1017B000CE010E94C61FBE010E946F0CEC01F80111
+:1017C0008281882309F446C080918C0181111FC059
+:1017D000C431F0E5DF0709F04DC00E94CE0B81E077
+:1017E00080938C010E94912290938B0180938A01B7
+:1017F000109283011092850110928401109287014A
+:1018000010928601109289011092880161C0809126
+:101810008A0190918B010E949D22883E934070F432
+:1018200080918301E82FF0E0EE0FFF1FEC57FE4F91
+:10183000D183C0838F5F809383014AC0C43880E521
+:10184000D807B9F5F8018281882341F0109281010F
+:1018500082E01EC0C43880E5D80759F58091810127
+:10186000811106C086E20E947B1786E20E940F1853
+:1018700082E01CC0C438F0E5DF0741F3C538D0452D
+:10188000D9F4F8018281882331F01092820180E23C
+:101890000E9437181DC080918201811106C087E225
+:1018A0000E947B1787E20E940F1880E20E943E1878
+:1018B0000FC0C538D04529F381E080938101809322
+:1018C0008201C801DF91CF911F910F910C94CC0B35
+:1018D00080E0DF91CF911F910F910895089596E0D8
+:1018E000799FF001112494E5899FE00DF11D1124E9
+:1018F000E60FF11DEE0FFF1FE756FD4F8591949106
+:101900000895880F991FFC01E35FFE4F8591949124
+:101910000895880F991FFC01E357FD4F859194911D
+:1019200008950F931F93CF93DF93EC01811590439C
+:1019300050F5C11580E2D80708F0C3C0CB3BD105F4
+:1019400090F4C83AD10508F06AC0C53AD10508F04C
+:101950005BC0C430D10508F0D0C1219709F0CAC1DD
+:1019600001E010E00AC2CF3FD10511F008F0C5C177
+:10197000C03FD10508F0A2C0CE01805E9109089752
+:1019800008F4BBC1B7C1C13090E5D90709F4A2C0C2
+:1019900020F5C0318FE4D80770F4C11590E4D90761
+:1019A00008F094C0C11521E3D20708F0A3C1DD27D8
+:1019B0008E01106CE2C1C115D04509F09BC10E9497
+:1019C000CD1A8FEF94E32CE0815090402040E1F756
+:1019D00000C000000E94EC22D0C1C11597E5D907D4
+:1019E00058F4C03121E5D20708F01CC1C43180E5AC
+:1019F000D80708F475C07EC1CE019057811590417B
+:101A000008F078C1DF7073C1C53AD10509F477C118
+:101A1000C63AD10509F076C102E810E4AEC1C83A71
+:101A2000D10509F472C1C93AD10509F471C1CA3AA4
+:101A3000D10509F470C1CB3AD10509F46FC1CC3A94
+:101A4000D10509F46EC1CD3AD10509F46DC1C03B91
+:101A5000D10509F46CC1CE3AD10509F46BC1CF3A76
+:101A6000D10509F46AC1C13BD10509F469C1C23B82
+:101A7000D10509F468C1C33BD10509F467C1C43B72
+:101A8000D10509F466C1C53BD10509F465C1C63B62
+:101A9000D10509F464C1C73BD10509F463C1C83B52
+:101AA000D10509F462C1C93BD10509F461C1CA3B42
+:101AB000D10509F460C100E014E45FC18E01106536
+:101AC0005CC1CE019F700E94890C58C1DF708E01ED
+:101AD000106A53C180910E02816080930E024DC145
+:101AE0000E944323811102C00E9429230E94562391
+:101AF00090E09093440280934302C23080E5D8077F
+:101B000021F480914302816086C0C43090E5D907FA
+:101B100021F48091430282607EC0C63020E5D20766
+:101B200021F480914302846076C0C83080E5D807F4
+:101B300019F48091430227C0CA3090E5D90721F4F7
+:101B400080914302806167C0CC3020E5D20721F448
+:101B50008091430280625FC0CE3080E5D80721F4D7
+:101B600080914302806457C0C03190E5D90721F4C9
+:101B70008091430280684FC0C23120E5D20729F42A
+:101B8000809143028460886046C0C33080E5D807F6
+:101B900021F4809143028E7F3EC0C53090E5D90785
+:101BA00021F4809143028D7F36C0C73020E5D207F3
+:101BB00021F4809143028B7F2EC0C93080E5D80785
+:101BC00019F48091430226C0CB3090E5D90721F467
+:101BD000809143028F7E1FC0CD3020E5D20721F4D3
+:101BE000809143028F7D17C0CF3080E5D80721F464
+:101BF000809143028F7B0FC0C13190E5D90721F45A
+:101C0000809143028F7707C0C331D04531F4809172
+:101C100043028B7F877F80934302809143020E941F
+:101C20005A23ABC08D2F99278F709927813091054A
+:101C3000D9F49E012370332702C0880F991F2A957B
+:101C4000E2F79C688E0144E0000F111F4A95E1F70E
+:101C500000271370802B912B53E0CC0FDD1F5A957A
+:101C6000E1F7C076DD272FC08230910531F4DC2FFB
+:101C7000CC278E01016F106A80C08330910569F412
+:101C8000CE018370992701E010E002C0000F111F00
+:101C90008A95E2F7C8019C680FC084309105B9F4B9
+:101CA000CE018370992701E010E002C0000F111FE0
+:101CB0008A95E2F7C8019A6823E0CC0FDD1F2A95C8
+:101CC000E1F7C07ED7708C010C2B1D2B56C08530E0
+:101CD000910531F4DC2FCC278E01046F106A4DC0C2
+:101CE000069709F04AC0CF71DD27DC2FCC278E0183
+:101CF000106243C000E010E040C08E013EC001E829
+:101D000010E43BC003E810E438C002EE14E435C030
+:101D100009EE14E432C00AEE14E42FC005EB14E41B
+:101D20002CC006EB14E429C007EB14E426C00CEC2D
+:101D300014E423C00DEC14E420C003E815E41DC036
+:101D40000AE815E41AC002E915E417C004E915E42D
+:101D500014C001E216E411C003E216E40EC004E26E
+:101D600016E40BC005E216E408C006E216E405C05E
+:101D700007E216E402C00AE216E4C801DF91CF913F
+:101D80001F910F91089596E0799FF001112494E539
+:101D9000899FE00DF11D1124E60FF11DEE0FFF1FCD
+:101DA000E756FD4F85919491803E9105E0F4803C8B
+:101DB000910558F58133910509F46FC048F48932D3
+:101DC000910509F463C08A32910509F46DC072C0AF
+:101DD00089339105E9F082389105D1F08533910579
+:101DE00009F44DC067C0833E910581F138F4803E0F
+:101DF0009105B9F0823E9105D9F05CC0863E91050F
+:101E000061F1873E9105A1F155C00E94810C0895B2
+:101E10002091430220FD02C021FF4CC080EE90E0E3
+:101E200049C08091430280FFF9CF89E390E042C02E
+:101E30008091430282FF0EC08091430284FF03C061
+:101E400080E090E037C083EE90E034C080914302A0
+:101E500082FFF2CF82EE90E02DC08091430283FF9B
+:101E60000BC08091430284FDEBCF87EE90E022C04F
+:101E70008091430283FFF5CF86EE90E01BC08091F6
+:101E8000430285FF07C089E290E014C080914302BD
+:101E900085FFF9CF85E390E00DC08091430286FF76
+:101EA00007C08AE290E006C08091430286FFF9CF26
+:101EB00081E390E00E94910C089508950C945D0FC9
+:101EC00080919D010895CF93DF9300D01F92CDB7ED
+:101ED000DEB79C0180913A02843019F593E0998332
+:101EE0003B832A839093E9008FEF9091E800815023
+:101EF00095FD06C095ED9A95F1F700008111F5CF9B
+:101F00008091E80085FF0DC040E050E063E070E0A4
+:101F1000CE0101960E94C7118091E8008E778093D0
+:101F2000E8000F900F900F90DF91CF910895CF931D
+:101F3000DF9300D01F92CDB7DEB720913A02243054
+:101F400021F522E029839B838A8383E08093E90043
+:101F50008FEF9091E800815095FD06C095ED9A9520
+:101F6000F1F700008111F5CF8091E80085FF0DC0E9
+:101F700040E050E063E070E0CE0101960E94C7119E
+:101F80008091E8008E778093E8000F900F900F907B
+:101F9000DF91CF91089520913A022430F1F422E0AC
+:101FA0002093E9002FEF3091E800215035FD06C065
+:101FB00035ED3A95F1F700002111F5CF2091E800B9
+:101FC00025FF0BC040E050E065E070E00E94C711C3
+:101FD0008091E8008E778093E8000895CF93DF9397
+:101FE000EC0190913A02943009F046C080910C01C6
+:101FF0008823D9F080910D018823B9F09093E900EE
+:102000008FEF9091E800815095FD06C095E19A957B
+:10201000F1F700008111F5CF8091E80085FF2CC019
+:1020200040E050E060E170E017C081E08093E9009B
+:102030008FEF9091E800815095FD06C095ED9A953F
+:10204000F1F700008111F5CF8091E80085FF14C001
+:1020500040E050E068E070E0CE010E94C71180913E
+:10206000E8008E778093E80080E1FE01ADE8B1E002
+:1020700001900D928A95E1F7DF91CF9108958091BB
+:102080003902811109C00E945C130E94B91380912A
+:10209000E20084608093E20008951092390208956E
+:1020A000089508950C94592242E061EC81E00E9469
+:1020B000D61242E061EC82E00E94D61242E061EC6E
+:1020C00083E00E94D61242E161EC84E00C94D612C7
+:1020D00080913C02833009F455C030F4813071F0B6
+:1020E000823009F48EC008958A3009F47AC08B30AA
+:1020F00009F460C0893009F09CC020C080913B0287
+:10210000813A09F096C08091E800877F8093E800CB
+:1021100080913F0290914002892B21F460E18DE88B
+:1021200091E003C060E080E090E070E00E94121255
+:102130008091E8008B778093E800089580913B02BE
+:10214000813209F076C080913F0290914002009761
+:1021500019F0039709F06DC08091E800877F8093A4
+:10216000E8008091E80082FD05C080913A0281116B
+:10217000F8CF5FC08091F10080939D018091E800CD
+:102180008B7753C080913B02813A09F052C0809115
+:102190003F0290914002892B09F04BC08091E800EA
+:1021A000877F8093E8008091E80080FFFCCF8091DA
+:1021B0000C0136C080913B028132D9F580913F02FB
+:1021C00090914002892BA9F58091E800877F809348
+:1021D000E8000E940B1380913D0280930C010C9447
+:1021E000CD1A80913B02813221F58091E800877FF2
+:1021F0008093E8000E940B1380913E0280939E0121
+:10220000089580913B02813AA1F48091E800877F94
+:102210008093E8008091E80080FFFCCF80919E01D0
+:102220008093F1008091E8008E778093E8000C9411
+:102230000B13089584B7877F84BF0FB6F894A895D1
+:1022400080916000886180936000109260000FBEF2
+:1022500090E080E80FB6F89480936100909361005D
+:102260000FBE0E94AE160E945C130E94B9138091AB
+:10227000E20084608093E20078940E943F160E94FE
+:10228000B01682E091E00E945A1680913A028530A1
+:1022900069F40E941D22809138028823B1F30E94C4
+:1022A0004B22882391F30E94B111EFCF0E94B61602
+:1022B000ECCF292F332723303105C9F064F42130C6
+:1022C000310581F02230310509F043C08DE690E000
+:1022D0002DEB36E042C021323105F1F022323105DA
+:1022E00041F137C082E190E02AE237E036C0992719
+:1022F0008130910541F08230910541F0892B49F5FB
+:10230000E9EBF6E005C0E1EAF6E002C0E9E8F6E054
+:10231000849190E09F0121C06430D8F4E62FF0E072
+:10232000EE0FFF1FE95BFE4F2081318189E090E0D5
+:1023300014C0643070F470E0FB01EE0FFF1FE15C2D
+:10234000FE4F20813181FB01E55CFE4F808190E0F2
+:1023500004C080E090E020E030E0FA013183208387
+:10236000089580E189BD82E189BD09B400FEFDCFF9
+:102370008091D8008F7D8093D8008091E0008260AA
+:102380008093E0008091E00081FDFCCF0895CF9222
+:10239000DF92EF92FF920F931F93CF93DF93EC01A5
+:1023A0008B016A010E942A13811133C0C114D10428
+:1023B00039F0F60180819181081B190BC80FD91FD4
+:1023C000E12CF12C0115110519F18091E80085FD32
+:1023D00016C08091E8008E778093E800C114D10484
+:1023E00049F0F60180819181E80EF91EF182E082C8
+:1023F00085E00FC00E942A13882321F30AC0899127
+:102400008093F10001501109FFEFEF1AFF0ADACFB4
+:1024100080E0DF91CF911F910F91FF90EF90DF90BF
+:10242000CF9008952091410230914202261737073C
+:1024300048F06115710539F42091E8002E7720935A
+:10244000E80001C0B90140E061157105A9F12091D2
+:102450003A02222309F443C0253009F442C02091F6
+:10246000E80023FD40C02091E80022FD32C0209109
+:10247000E80020FFE9CF4091F3002091F20030E026
+:10248000342BFC01CF016115710559F0283031055D
+:1024900040F481918093F100615071092F5F3F4FAB
+:1024A000F1CF41E02830310509F040E02091E8000B
+:1024B0002E772093E800C8CF4111C9CF0AC0809180
+:1024C0003A02882361F0853061F08091E80083FD55
+:1024D0000AC08091E80082FFF2CF80E0089582E098
+:1024E000089583E0089581E008952091410230919C
+:1024F00042022617370748F06115710539F420911B
+:10250000E8002E772093E80001C0B901FC0120E02B
+:102510006115710591F180913A02882309F440C058
+:10252000853009F43FC08091E80083FD3DC0809173
+:10253000E80082FD2FC08091E80080FFE9CF209164
+:10254000F3008091F20090E0922B6115710559F033
+:102550008830910540F424912093F1003196615028
+:1025600071090196F2CF21E0089709F020E08091EF
+:10257000E8008E778093E800CBCF2111CCCF0AC042
+:1025800080913A02882361F0853061F08091E80003
+:1025900083FD0AC08091E80082FFF2CF80E00895B9
+:1025A00082E0089583E0089581E00895982F9730A0
+:1025B00058F59093E900981739F07091EC0020914C
+:1025C000ED005091F00003C0242F762F50E021FF42
+:1025D00019C03091EB003E7F3093EB003091ED005D
+:1025E0003D7F3093ED003091EB0031603093EB0094
+:1025F0007093EC002093ED005093F0002091EE00DA
+:1026000027FF07C09F5FD3CF8F708093E90081E0E1
+:10261000089580E0089580913B0287FF11C080916A
+:10262000E80082FD05C080913A028111F8CF11C007
+:102630008091E8008B770BC080913A02882349F0A3
+:102640008091E80080FFF8CF8091E8008E7780933A
+:10265000E80008952091E4003091E50095E640916E
+:10266000EC00842F817040FF22C08091E80080FD43
+:102670001CC080913A02882391F0853091F08091BE
+:10268000EB0085FD10C04091E4005091E500421739
+:10269000530729F39A01915011F784E0089582E0DD
+:1026A000089583E0089581E0089580E008954091C1
+:1026B000E80042FFDECF08950E94CA130E94D213A1
+:1026C000E0EEF0E0808181608083E8EDF0E08081E1
+:1026D0008F77808319BCA7EDB0E08C918E7F8C93AF
+:1026E00080818F7E80831092390208950F931F930B
+:1026F000CF93DF930E94CA130E94D213C8EDD0E09B
+:1027000088818F77888388818068888388818F7D9E
+:10271000888319BC10923A02109236021092380245
+:102720001092370200EE10E0F80180818B7F8083E9
+:1027300088818160888342E060E080E00E94D61258
+:10274000E1EEF0E080818E7F8083E2EEF0E0808138
+:1027500081608083808188608083F80180818E7FA2
+:102760008083888180618883DF91CF911F910F9151
+:102770000895E8EDF0E080818F7E8083E7EDF0E062
+:1027800080818160808384E082BF81E08093390210
+:102790000C947613E8EDF0E080818E7F80831092B8
+:1027A000E20008951092DA001092E10008951F925D
+:1027B0000F920FB60F9211242F933F934F935F9375
+:1027C0006F937F938F939F93AF93BF93EF93FF93F9
+:1027D0008091E10082FF0BC08091E20082FF07C080
+:1027E0008091E1008B7F8093E1000E943E168091F2
+:1027F000DA0080FF1FC08091D80080FF1BC080914D
+:10280000DA008E7F8093DA008091D90080FF0DC0BE
+:1028100080E189BD82E189BD09B400FEFDCF81E080
+:1028200080933A020E943F1005C019BC10923A02F0
+:102830000E944D108091E10080FF19C08091E2005C
+:1028400080FF15C08091E2008E7F8093E20080912E
+:10285000E20080618093E2008091D80080628093E2
+:10286000D80019BC85E080933A020E9451108091F3
+:10287000E10084FF30C08091E20084FF2CC080E141
+:1028800089BD82E189BD09B400FEFDCF8091D800E9
+:102890008F7D8093D8008091E1008F7E8093E1004E
+:1028A0008091E2008F7E8093E2008091E20081605F
+:1028B0008093E20080913602882311F084E007C003
+:1028C0008091E30087FD02C081E001C083E0809336
+:1028D0003A020E9452108091E10083FF29C080914A
+:1028E000E20083FF25C08091E100877F8093E100B3
+:1028F00082E080933A02109236028091E1008E7F4E
+:102900008093E1008091E2008E7F8093E2008091CD
+:10291000E20080618093E20042E060E080E00E949B
+:10292000D6128091F00088608093F0000E945010D1
+:10293000FF91EF91BF91AF919F918F917F916F9197
+:102940005F914F913F912F910F900FBE0F901F906D
+:1029500018951F920F920FB60F9211242F933F9349
+:102960004F935F936F937F938F939F93AF93BF9397
+:10297000CF93DF93EF93FF93C091E900CF708091E5
+:10298000EC00D82FD17080FDD0E81092E900809142
+:10299000F000877F8093F00078940E94ED141092ED
+:1029A000E9008091F00088608093F000CD2BCF701B
+:1029B000C093E900FF91EF91DF91CF91BF91AF916B
+:1029C0009F918F917F916F915F914F913F912F9147
+:1029D0000F900FBE0F901F9018951F93CF93DF930A
+:1029E000CDB7DEB7AA970FB6F894DEBF0FBECDBF46
+:1029F000EBE3F2E088E08E0F9091F10091938E135B
+:102A0000FBCF0E9468108091E80083FF1FC1809176
+:102A10003B0290913C02492F50E04A30510508F0AA
+:102A200015C1FA01ED57FF4F0C94CF26803881F085
+:102A3000823809F00BC180913F028F708093E900CA
+:102A40008091EB0085FB882780F91092E90006C091
+:102A50008091370290913802911182609091E80044
+:102A6000977F9093E8008093F1001092F100C8C026
+:102A7000282F2D7F09F0EAC0882319F0823061F0F9
+:102A8000E5C080913D02813009F0E0C0933009F04B
+:102A900080E0809338022BC080913D02811127C0D5
+:102AA00080913F028F7009F4D1C08093E90020919A
+:102AB000EB0020FF1CC0933021F48091EB0080627A
+:102AC00014C09091EB0090619093EB0021E030E016
+:102AD000A90102C0440F551F8A95E2F74093EA000E
+:102AE0001092EA008091EB0088608093EB001092D6
+:102AF000E9008091E800877F86C08111A7C010910E
+:102B00003D021F778091E3008078812B8093E30062
+:102B10008091E800877F8093E8000E940B138091EA
+:102B2000E80080FFFCCF8091E30080688093E300A1
+:102B3000111102C082E001C083E080933A0286C096
+:102B40008058823008F082C080913D0290913E0210
+:102B50008C3D53E0950779F583E08A838AE2898387
+:102B60004FB7F894DE01139620E03EE051E2E32FE8
+:102B7000F0E050935700E49120FF03C0E295EF701E
+:102B80003F5FEF708E2F90E0EA3010F0C79601C0E3
+:102B9000C0968D939D932F5F243149F74FBF80914D
+:102BA000E800877F8093E8006AE270E0CE0101963A
+:102BB0000E94121214C0AE014F5F5F4F60913F023E
+:102BC0000E945911BC01892B09F440C09091E80082
+:102BD000977F9093E80089819A810E947512809175
+:102BE000E8008B778093E80031C0803879F58091D8
+:102BF000E800877F8093E800809136028093F1009F
+:102C00008091E8008E778093E8000E940B131EC02D
+:102C100081111CC090913D029230C0F48091E80077
+:102C2000877F8093E800909336020E940B13809177
+:102C30003602811106C08091E30087FD02C081E069
+:102C400001C084E080933A020E9454108091E80011
+:102C500083FF0AC08091E800877F8093E80080911D
+:102C6000EB0080628093EB00AA960FB6F894DEBF6B
+:102C70000FBECDBFDF91CF911F9108950895CF93DF
+:102C800080913A028823A1F0C091E900CF70909121
+:102C9000EC00892F817090FD80E8C82B1092E9002C
+:102CA0008091E80083FD0E94ED14CF70C093E9008D
+:102CB000CF9108959093A4018093A3010895E0918A
+:102CC000A301F091A401309721F00190F081E02D53
+:102CD000099480E00895E091A301F091A401309758
+:102CE00021F00280F381E02D09940895E091A30181
+:102CF000F091A401309721F00480F581E02D099432
+:102D000008952091A1013091A2018217930771F0DB
+:102D10009093A2018093A101E091A301F091A401FD
+:102D2000309721F00680F781E02D099408952091D5
+:102D30009F013091A0018217930771F09093A00139
+:102D400080939F01E091A301F091A401309721F0BD
+:102D50000084F185E02D0994089508950C94AD1632
+:102D60000E9488220E94A90A0C940E239F92AF927F
+:102D7000BF92CF92DF92EF92FF920F931F93CF9368
+:102D8000DF9300D000D000D0CDB7DEB70E94C10ADB
+:102D90000DE010E0AA24A394B12C902E802F0E9465
+:102DA000AF0B98012A553E4F6901F901F080F826D2
+:102DB000A1F40150110988F78FEF89838A831B8260
+:102DC0000E9491228160782F9D838C8349815A8152
+:102DD0006B818D810E944D172FC090910E0291FF43
+:102DE00004C08E830E94B50B8E8125E030E0A501E2
+:102DF000022E01C0440F0A94EAF7E42E4F21C1F0DD
+:102E000029839A828E2191E009F490E09B830E94AD
+:102E100091228160782F9D838C8349815A816B81B7
+:102E20008D810E944D17F6018081E826E08204C062
+:102E300021503109E0F6BDCF0E94D9241091A5019F
+:102E40000E945F161817B9F00E945F168093A501C3
+:102E500026960FB6F894DEBF0FBECDBFDF91CF919F
+:102E60001F910F91FF90EF90DF90CF90BF90AF90A8
+:102E70009F900C945E0F26960FB6F894DEBF0FBE9F
+:102E8000CDBFDF91CF911F910F91FF90EF90DF9019
+:102E9000CF90BF90AF909F900895CF93DF93CDB721
+:102EA000DEB72B970FB6F894DEBF0FBECDBF4F83B2
+:102EB000588769877A878B87DE01119686E0FD0146
+:102EC00011928A95E9F785E0FE01379601900D92FF
+:102ED0008A95E1F749815A816B817C818D819E8140
+:102EE0000E946B1D2B960FB6F894DEBF0FBECDBFB0
+:102EF000DF91CF910895882309F490C09CEF980F3B
+:102F0000913A18F40E94AE200DC090E2980F9830CC
+:102F100058F4877091E001C0990F8A95EAF7892FDC
+:102F20000E9437210C948B219BE5980F933070F40D
+:102F3000853A29F0863A31F083E890E005C081E8CF
+:102F400090E002C082E890E00C94811698E5980F1A
+:102F5000933108F063C0883A39F1893A41F18A3AED
+:102F600049F18B3A51F18C3A59F18D3A61F1803B3C
+:102F700069F18E3A71F18F3A79F1813B81F1823BAF
+:102F800089F1833B91F1843B99F1853BA1F1863B2B
+:102F9000A9F1873BB1F1883BB9F1893BC1F18A3B8B
+:102FA000C9F180E090E038C082EE90E035C089EE53
+:102FB00090E032C08AEE90E02FC085EB90E02CC00C
+:102FC00086EB90E029C087EB90E026C08CEC90E087
+:102FD00023C08DEC90E020C083E891E01DC08AE81A
+:102FE00091E01AC082E991E017C084E991E014C031
+:102FF00081E292E011C083E292E00EC084E292E0AE
+:103000000BC085E292E008C086E292E005C087E24C
+:1030100092E002C08AE292E00C9497160895882309
+:1030200029F19CEF980F913A18F40E94F0200DC0FE
+:1030300090E2980F983058F4877091E001C0990F92
+:103040008A95EAF7892F0E943D210C948B219BE5FC
+:10305000980F933020F480E090E00C948116885A09
+:10306000833120F480E090E00C9497160895882333
+:1030700021F00E9437210C948B210895882321F0A0
+:103080000E943D210C948B2108958F929F92AF92C4
+:10309000BF92DF92EF92FF920F931F93CF93DF9334
+:1030A0007C01D62FC72FFC010281158112951F705C
+:1030B0000E944A20882319F082E00E948C2001118E
+:1030C0000E9454210E94A720882379F0002369F0F0
+:1030D00080E28D0F883048F082E00E948C200E94B0
+:1030E000A72091E0D82ED92601C0D12CEC2FE29553
+:1030F000EF70F0E0E357FF4F0C94CF268C2F807FCA
+:10310000CF70882311F0C295C07F002389F0CC23B3
+:1031100009F4C4C180E28D0F883020F48C2F0E9406
+:10312000372103C08C2F0E9447210E948B21B6C1FA
+:103130008D2F0E940F18CC2309F4CAC1D05E8C2FAA
+:10314000D83018F40E943D2102C00E944D210E94F7
+:103150008B21BEC18C2F807FCF70803211F0C29541
+:10316000C07FDD2319F0D13029F12DC0002381F07B
+:10317000112369F1113021F48C2F0E946721A8C11D
+:10318000123029F50E9470218C2F0E9417201FC039
+:10319000112369F0113041F40E9434218C2309F489
+:1031A00097C10E941A2003C0123009F491C10E94F5
+:1031B000702111C0002321F0123008F089C107C02E
+:1031C000111186C108C0002321F0111167C18C2F95
+:1031D000F1C011116AC18C2FF3C08C2F8695869592
+:1031E000837090E0009719F0019761F071C100239E
+:1031F00021F08D2F9C2F937002C080E090E00E9400
+:10320000811666C1002321F08D2F9C2F937002C080
+:1032100080E090E00E9497165BC18D2F002319F08B
+:103220000E94E12302C00E9449240E94CE2450C182
+:103230008C2F837009F050C001114AC18D2F8295E7
+:1032400086958770880F880F9D2F9F70892E912CEF
+:10325000A12CB12C082E04C0880C991CAA1CBB1CE4
+:103260000A94D2F7D4FF14C00FE010E020E030E061
+:10327000B901A80104C0440F551F661F771F8A9526
+:10328000D2F7CB01BA01609570958095909503C0F7
+:1032900060E070E0CB01C695C695C370D0E0C23047
+:1032A000D10561F0C330D10581F0682979298A29D7
+:1032B0009B29219771F00E94B31E0AC168297929C0
+:1032C0008A299B290E94CF1E03C10E94B31EC501FB
+:1032D000B4010E94971EFCC0002319F08C2F81704E
+:1032E00001C08695882309F4F3C08D2F82958695B9
+:1032F0008770880F880F9D2F9F70892E912CA12C8D
+:10330000B12C082E04C0880C991CAA1CBB1C0A9462
+:10331000D2F7D4FF14C00FE010E020E030E0B90194
+:10332000A80104C0440F551F661F771F8A95D2F766
+:10333000CB01BA01609570958095909503C060E0CF
+:1033400070E0CB01C695C695C3704C2F50E042305B
+:10335000510569F04330510589F0682979298A2996
+:103360009B294130510571F00E948D1FB1C0682921
+:1033700079298A299B290E94A91FAAC00E948D1F12
+:10338000C501B4010E94711FA3C08D2F90E0FC0104
+:10339000E05EF109E531F10508F07BC0E356FF4F2F
+:1033A0000C94CF26DF708C2F8F71002331F00E9498
+:1033B0000A1F8D2F0E9437188BC00E942B1F8D2F44
+:1033C0000E943E1885C0002339F0111181C08C2F56
+:1033D0008F710E94501F7CC0123008F079C0F7CF67
+:1033E000002339F08C2F8F710E940A1F71C00023B7
+:1033F000C9F38C2F8F710E942B1F6AC0002329F004
+:103400008C2F8F710E94F51E63C00E94EB1E60C05E
+:103410000023B9F00E9414200E943D210E94462002
+:10342000843029F40E9485208C2F8F7162C0123065
+:1034300008F06CC0CF718C2F0E940A1F63E08C2FA4
+:103440000DC00E9414200E9437211230A0F00E946B
+:1034500085200E941A2064E08C2F8F71DF91CF911C
+:103460001F910F91FF90EF90DF90BF90AF909F90D2
+:103470008F900C94752081E0DF91CF911F910F9177
+:10348000FF90EF90DF90BF90AF909F908F900C9443
+:103490008C20002339F0112309F4A4CF8D2F0E9432
+:1034A0007B1716C0112309F4A4CF8D2F0E940F188B
+:1034B0000FC04C2F4F706D2FC7010E9413050E9443
+:1034C0000F1E06C04C2F4F706D2FC7010E946E0C4F
+:1034D000DD20E1F00E94462080FD18C0F701128235
+:1034E0000E9440200E940A1FC7010E94921A0E9457
+:1034F0004020DF91CF911F910F91FF90EF90DF90CF
+:10350000BF90AF909F908F900C942B1FDF91CF9125
+:103510001F910F91FF90EF90DF90BF90AF909F9021
+:103520008F9008950F931F93CF93DF93EC018881C1
+:1035300099812B813C81232BB9F09F3F11F48F3F60
+:1035400099F0CE010E94D00B882371F068817981B7
+:103550008A810E9410208C010E94C51F0E948C1E2F
+:10356000B801CE010E944518DF91CF911F910F91B4
+:1035700008950E9454210E9464210E9426210E94E5
+:103580008B210E947E250E94CE2480E090E00E9444
+:10359000811680E090E00C9497160E9444210C94D0
+:1035A000B91A0E940520292F22952F7030E02C3067
+:1035B00031054CF42A3031056CF4225031092230A7
+:1035C0003105A8F407C02C30310569F02F303105E2
+:1035D00051F00DC0803F69F018F4803E40F409C0FE
+:1035E000843F29F406C093FB882780F9089580E082
+:1035F000089581E00895CF93DF9300D000D01F920B
+:10360000CDB7DEB70F900F900F900F900F90DF9116
+:10361000CF910895CF93DF9300D000D000D0CDB7E5
+:10362000DEB726960FB6F894DEBF0FBECDBFDF9192
+:10363000CF9108951F93CF93DF93C091B40116E00B
+:103640008091B501C81799F0D0E01C9FF0011D9F33
+:10365000F00D1124EA54FE4F408151816281738143
+:10366000848195810E940A1B2196C770E9CFDF9162
+:10367000CF911F9108954091E6015091E70160912B
+:10368000E8017091E9018091EA019091EB010C94BD
+:103690000A1B8091EB0182958F7009F054C08091D4
+:1036A000E801882309F44FC08091B401A091B501CD
+:1036B0006091E6017091E7014091E9015091EA01C2
+:1036C000B6E08A1709F43FC090E041155105C1F1F9
+:1036D0007F3F11F46F3FA1F1B89FF001B99FF00D4A
+:1036E0001124EA54FE4F218172132AC020816213F3
+:1036F00027C02281211124C023813481241735075A
+:1037000010F421503109241B350B283C3105C0F43D
+:103710002091EB012F7020612093EB0126E0289F80
+:10372000F001299FF00D1124E554FE4F80818F7028
+:103730008061808386EE91E00E94921A0C941A1B9D
+:1037400001968770BECF0895CF92DF92EF92FF92DD
+:103750000F931F93CF93DF93CDB7DEB762970FB66A
+:10376000F894DEBF0FBECDBF8C0185E0F801DE010D
+:103770001D9601900D928A95E1F7D8014C91119612
+:103780005C91119712966C9112971396CD90DC90E4
+:1037900014973091E6017091E7018091E9019091D1
+:1037A000EA01009709F46BC17F3F19F43F3F09F428
+:1037B00066C1E090E801EE2009F4C0C02091EB0161
+:1037C000C816D90628F0F601E81BF90BCF0104C092
+:1037D000809590958C0D9D1DFF24F394883C910558
+:1037E00078F0F12C207F09F0C6C07C2DD98AC88AD8
+:1037F00089890E94FB1A86EE91E00E94921AB1C05C
+:10380000822F807F09F046C0751314C0341312C094
+:10381000611110C02F7020612093EB010E943B1BAF
+:1038200086EE91E00E94921A8091EB01D8011596E4
+:103830008C932EC0CD2819F15F3F11F44F3FF9F062
+:10384000F62E61111CC08091B4012091B50136E0C3
+:10385000821709F45AC090E0389FF001399FF00DAB
+:103860001124EA54FE4F7181571306C0708147132B
+:1038700003C07281711103C001968770E9CFF62EE3
+:10388000662309F418C18091EB0181608093EB01FC
+:10389000F12C11C1751308C0341306C0611104C0A6
+:1038A0008091EB01D801C3C04D875E878D859E85D1
+:1038B0006A8B0E94D11A6A898823E1F16623D1F1CB
+:1038C0002091EB01822F82958F7090E0029774F027
+:1038D0008091E6019091E70198878F831986DB86B6
+:1038E000CA862C87CE0107960E94921A86E0F801BC
+:1038F000A6EEB1E001900D928A95E1F70E94491B76
+:103900000E943B1BFF24F394D6C04D875E878D85B4
+:103910009E850E940520292F22952F7030E02230AD
+:1039200031050CF0BCC09F7009F0B6C0805E8830D5
+:1039300008F4C1C0C8010E94921AE4CFC816D90683
+:1039400008F453C0F601E81BF90BCF01883C910540
+:1039500008F450C0F12C7C2DD98AC88A89890E942C
+:10396000FB1AE6EEF1E086E0DF011D928A95E9F7A9
+:103970000E943B1BA0C0751314C0341312C0611108
+:1039800010C08091EB01F8018583C8010E94921A52
+:1039900086E0E6EEF1E0DF011D928A95E9F7FE2C64
+:1039A0008AC04D875E878D859E856A8B0E94D11A5D
+:1039B0006A89882309F4BECF662309F4BBCF20911E
+:1039C000EB01822F82958F7090E002970CF48ECFDE
+:1039D0008091E6019091E7019A8389831B82DD82C1
+:1039E000CC822E83CE0101967FCF809590958C0D51
+:1039F0009D1DACCFF62E662309F49CCF75132EC007
+:103A000034132CC02091EB0120FD1FC0822F829522
+:103A10008F70D9F0D80115962C9315978F3049F0F7
+:103A20008F5F982F9295907F822F8F70892B15969C
+:103A30008C93C8010E94921A86E0F801A6EEB1E0CC
+:103A400001900D928A95E1F793CF86E0F801A6EEFA
+:103A5000B1E001900D928A95E1F72DC04D875E8708
+:103A60008D859E850E94D11A811140CF8091EB01F6
+:103A700081608093EB01C8010E94921A1CC06623EA
+:103A800009F458CF4D875E878D859E850E94D11A97
+:103A9000882309F44FCF2ACF811148CF0CC024309E
+:103AA00031050CF047CF9F7009F440CFF8019581A4
+:103AB000907F09F03BCF8F2D62960FB6F894DEBF52
+:103AC0000FBECDBFDF91CF911F910F91FF90EF906F
+:103AD000DF90CF9008951F93CF93DF93CDB7DEB7DC
+:103AE0002C970FB6F894DEBF0FBECDBF4F8358871B
+:103AF00069877A878B879C87CE0107960E94A41BD3
+:103B0000882369F08F8198852A853B85232BF1F1E5
+:103B10009F3F09F063C08F3F09F060C037C086E067
+:103B2000FE013796DE01119601900D928A95E1F71C
+:103B30006F817885EA85FB85309741F17F3F11F4ED
+:103B40006F3F21F12091B50130E0C90101968770E6
+:103B500099274091B40150E08417950709F447C0B4
+:103B600069837A83FD83EC8396E0929FD001939FD3
+:103B7000B00D1124AA54BE4FFE01319601900D9252
+:103B80009A95E1F78093B5010E941A1B16E0809187
+:103B9000B4019091B5018917C1F1189FC00111249A
+:103BA0008A549E4F0E94A41B882379F1E091B401AE
+:103BB0001E9FF0011124EA54FE4F40815181628121
+:103BC0007381848195810E940A1B8091B40190E0E9
+:103BD0000196877099278093B401D9CF4F8158857A
+:103BE00069857A858B859C850E940A1BCFCF0E94B0
+:103BF000CD1A1092B5011092B401E6EEF1E086E024
+:103C0000DF011D928A95E9F7C1CF2C960FB6F89483
+:103C1000DEBF0FBECDBFDF91CF911F910895EF9210
+:103C2000FF920F931F93CF93DF938C01892B09F49D
+:103C30006CC0F12CEE24E394E8012196F801849104
+:103C4000843740F4843008F051C0813081F08230F4
+:103C500019F15BC0853709F444C0A8F19CE7980FBF
+:103C6000903708F052C08F770E940F1841C00E5F46
+:103C70001F4FFE01C49180E28C0F883048F4C7705A
+:103C80008E2D01C0880FCA95EAF70E94572114C0F3
+:103C90008C2F0E947B172DC00E5F1F4FFE01C49119
+:103CA00080E28C0F883058F4C7708E2D01C0880FC9
+:103CB000CA95EAF70E945D210E948B211AC08C2FC1
+:103CC0000E940F1816C00E5F1F4FFE01C491CC2337
+:103CD00081F08FE99FE00197F1F700C00000C1502B
+:103CE000F6CF0E5F1F4FFE01F49003C00E947B17BA
+:103CF0008E018F2D882309F49FCFEFE9FFE03197E4
+:103D0000F1F700C000008150F5CFDF91CF911F91F6
+:103D10000F91FF90EF90089508956093F0017093D4
+:103D2000F1018093F2019093F3010C94B91A0F936F
+:103D30001F930091F0011091F1012091F201309157
+:103D4000F301DC01CB01802B912BA22BB32B8093B1
+:103D5000F0019093F101A093F201B093F3011F9150
+:103D60000F910C94B91A0F931F930091F0011091C9
+:103D7000F1012091F2013091F301DC01CB018023AC
+:103D80009123A223B3238093F0019093F101A09398
+:103D9000F201B093F3011F910F910C94B91A0F9394
+:103DA0001F930091F0011091F1012091F2013091E7
+:103DB000F301DC01CB0180279127A227B327809351
+:103DC000F0019093F101A093F201B093F3011F91E0
+:103DD0000F910C94B91A1092EC011092ED0110920F
+:103DE000EE011092EF010C94B91A41E050E060E04E
+:103DF00070E004C0440F551F661F771F8A95D2F7E5
+:103E00004093EC015093ED016093EE017093EF014C
+:103E10000C94B91A41E050E060E070E004C0440F37
+:103E2000551F661F771F8A95D2F78091EC019091FC
+:103E3000ED01A091EE01B091EF01482B592B6A2BB7
+:103E40007B2B4093EC015093ED016093EE01709356
+:103E5000EF010C94B91A41E050E060E070E004C05A
+:103E6000440F551F661F771F8A95D2F740955095CE
+:103E7000609570958091EC019091ED01A091EE011B
+:103E8000B091EF01482359236A237B234093EC012F
+:103E90005093ED016093EE017093EF010C94B91A09
+:103EA00041E050E060E070E004C0440F551F661F21
+:103EB000771F8A95D2F78091EC019091ED01A09146
+:103EC000EE01B091EF01482759276A277B274093DD
+:103ED000EC015093ED016093EE017093EF010C94AF
+:103EE000B91A0F931F930091EC011091ED012091ED
+:103EF000EE013091EF01DC01CB01802B912BA22B45
+:103F0000B32B8093EC019093ED01A093EE01B0935D
+:103F1000EF011F910F910C94B91A0F931F93009109
+:103F2000EC011091ED012091EE013091EF01DC01E7
+:103F3000CB0180239123A223B3238093EC019093A0
+:103F4000ED01A093EE01B093EF011F910F910C943E
+:103F5000B91A0F931F930091EC011091ED0120917C
+:103F6000EE013091EF01DC01CB0180279127A227E0
+:103F7000B3278093EC019093ED01A093EE01B093F1
+:103F8000EF011F910F910C94B91A0895CF92DF920F
+:103F9000EF92FF920F931F93CF93DF938C01C0900A
+:103FA000F001D090F101E090F201F090F3018091E6
+:103FB000EC019091ED01A091EE01B091EF01C82AC2
+:103FC000D92AEA2AFB2ACFE1D0E0D701C6010C2E7C
+:103FD00004C0B695A795979587950A94D2F780FF68
+:103FE00006C0B8018C2F0E94C30E019721F42197BF
+:103FF00060F780E001C08C2FDF91CF911F910F916E
+:10400000FF90EF90DF90CF900895CF93DF93EC0176
+:104010000E94C61FBE010E94C30EDF91CF9108957A
+:10402000CB010E94052008958091F90108958093A5
+:10403000F90108951092F90108950E9491222091AA
+:10404000F7013091F8018217930750F00E949122F6
+:104050002091F7013091F801821B930B9C010AC05B
+:104060000E9491222091F7013091F801209530951E
+:10407000280F391F81E0283B3B4008F480E0089579
+:104080008091F60185958595859508958091F60135
+:10409000877008950E9491222091F4013091F501DA
+:1040A00082179307A8F00E9491222091F401309189
+:1040B000F501821B930B883B9B4010F480E013C0FA
+:1040C0008091F60182FB882780F991E089270BC057
+:1040D0000E9491222091F4013091F50120953095B4
+:1040E000820F931FE8CF8170089598E0899F900117
+:1040F0001124262B2093F6010E940A1F0E94912270
+:104100009093F5018093F40108951092F6011092B6
+:10411000F5011092F40108952091F6018095822313
+:104120008093F601982F977089F430E0482F082E7D
+:10413000000C550B2417350749F085958595859515
+:104140000E942B1F1092F5011092F4010895909196
+:10415000F601977081E009F480E0089590910C01D8
+:10416000992321F090910D01911109C020910E0128
+:1041700030910F01F90132969FEF40E01FC0982F58
+:104180009695969596959F3050F5E0910E01F09199
+:104190000F01E90FF11D877021E030E0A90102C095
+:1041A000440F551F8A95E2F7CA019181892B8183BB
+:1041B00008959F3F39F04F5F4E3041F051915813B1
+:1041C000F8CF0DC05111F7CF942FF5CF9F3F39F0A5
+:1041D000F901E90FF11D97FDFA958283089508957D
+:1041E00090910C01992321F090910D01911109C03A
+:1041F00020910E0130910F01F9013296205F3F4F5F
+:104200001FC0982F9695969596959F30F0F4E09163
+:104210000E01F0910F01E90FF11D877021E030E0F0
+:10422000A90102C0440F551F8A95E2F7CA01809583
+:1042300091818923818308953196E217F30729F04C
+:1042400090819813F9CF1082F7CF089581E090E024
+:10425000E0910E01F0910F01E80FF91F1082019615
+:1042600080319105A9F7089580910D0208959091EC
+:104270000D02892B80930D020895809590910D0277
+:10428000892380930D02089510920D020895909154
+:104290000C02892B80930C020895809590910C025A
+:1042A000892380930C02089510920C020895909136
+:1042B0000B02892B80930B020895809590910B023D
+:1042C000892380930B02089510920B020895809326
+:1042D000FA010E9491229093F8018093F7010895CA
+:1042E0001092FA011092F8011092F701089580914E
+:1042F000FA01089580910E0190910F01FC01319611
+:104300009C01205F3F4F80E0919191118F5FE217F8
+:10431000F307D1F70895E0910E01F0910F0180911C
+:104320000D028083E0910E01F0910F019081809148
+:104330000C02892B8083E0910E01F0910F01908196
+:1043400080910B02892B80838091FA01882399F058
+:104350000E941D2081110E947021E0910E01F091B8
+:104360000F0190818091FA01892B80830E947A212C
+:1043700081110E94702180910E0190910F010C9487
+:104380006B1620E0009739F0AC01415051098423AD
+:1043900095232F5FF7CF822F0895CF92DF92EF9270
+:1043A000FF926C01EE24FF24C114D104E104F10456
+:1043B00021F0C701B60120E101C020E0C72ED82EB0
+:1043C000E92EFF24C114D104E104F10419F0285F9F
+:1043D000C701B6016B017C0154E0F694E794D794D1
+:1043E000C7945A95D1F7C114D104E104F10419F02E
+:1043F0002C5FC701B6016B017C0142E0F694E794A3
+:10440000D794C7944A95D1F7C114D104E104F104BB
+:1044100019F02E5FC701B601DC01CB01B695A79557
+:1044200097958795892B8A2B8B2B09F02F5F822FED
+:10443000FF90EF90DF90CF90089580913A02843002
+:1044400039F110920F0220E488E190E00FB6F89461
+:10445000A895809360000FBE2093600080E00E94CA
+:104460005E0F83B7817F846083BF83B7816083BF22
+:104470007894889583B78E7F83BF0FB6F894A895FC
+:1044800080916000886180936000109260000FBE90
+:104490000895089508950E9449220E94C10A0E9429
+:1044A0004A220E94B60B91E0811101C090E0892F51
+:1044B00008950E94CD1A0E945F160C945E0F1F9201
+:1044C0000F920FB60F9211248F939F93AF93BF93C8
+:1044D00080910F02811113C08091100290911102FE
+:1044E000A0911202B09113024196A11DB11D8093BB
+:1044F000100290931102A0931202B0931302BF9185
+:10450000AF919F918F910F900FBE0F901F901895B4
+:1045100082E084BD93E095BD9AEF97BD80936E00D5
+:1045200008952FB7F8948091100290911102A091F4
+:104530001202B09113022FBF0895CF92DF92EF9233
+:10454000FF920F931F932FB7F89440911002509150
+:10455000110260911202709113022FBF6A017B0158
+:10456000EE24FF248C0120E030E0C016D106E206E4
+:10457000F30610F4415051099A01281B390BC90167
+:104580001F910F91FF90EF90DF90CF9008951F92B1
+:104590000F920FB60F9211248F939F93AF93BF93F7
+:1045A0008091100290911102A0911202B091130219
+:1045B0000196A11DB11D8093100290931102A0934A
+:1045C0001202B0931302BF91AF919F918F910F9000
+:1045D0000FBE0F901F9018950E945C13F8942FEF58
+:1045E00087EA91E6215080409040E1F700C000004A
+:1045F00087E090EBDC018093440290934502A09306
+:104600004602B09347029CE088E10FB6F894A89563
+:10461000809360000FBE90936000FFCF0E94432301
+:10462000811102C00E9429230E944E2380930E0212
+:104630000E9456238093430287FB882780F980934A
+:104640000D010E945223682F70E080E090E00C94EE
+:104650008D1E6DEE7EEF80E090E00E94092760E005
+:1046600082E090E00E94F72660E083E090E00E9404
+:10467000F72660E084E090E00E94F72660E085E0A5
+:1046800090E00C94F72680E090E00E94F12621E073
+:104690008D3E9E4F09F020E0822F089582E090E049
+:1046A0000C94E92683E090E00C94E92684E090E005
+:1046B0000C94E926682F84E090E00C94F726809112
+:1046C000170280FF0BC06091130185E0689FB00165
+:1046D000112475956795759567952BC081FF09C065
+:1046E0006091130185E0689FB0011124759567956D
+:1046F00020C082FF07C06091130185E0689FB00170
+:10470000112417C0909118029923D1F060911201E1
+:10471000961788F72091130185E0289F90011124B6
+:10472000929FA001939F500D112470E0CA010E9436
+:10473000BB266038710540F46115710539F002C07F
+:1047400065E070E0862F08958FE7089581E0089571
+:104750008091170280FF08C06091110170E075958B
+:1047600067957595679521C081FF06C0609111011D
+:1047700070E07595679519C082FF04C060911101C2
+:1047800070E010C0909118029923C1F0609110015F
+:104790009617A0F780911101899FC001112470E044
+:1047A0000E94BB266038710528F46115710521F05F
+:1047B000862F08958FE7089581E0089561E070E005
+:1047C000F4CF803F21F40E945F23819504C0813F94
+:1047D00029F40E945F2380931B020895823F21F4F5
+:1047E0000E945F23819504C0833F29F40E945F23C8
+:1047F00080931A020895893F19F40E94A82305C0E6
+:104800008A3F31F40E94A823819580931C02089569
+:104810008B3F21F40E94A823819504C08C3F29F48A
+:104820000E94A82380931D020895843F21F4809163
+:104830001902816017C0853F21F4809119028260BE
+:1048400011C0863F21F48091190284600BC0873F1C
+:1048500021F480911902886005C0883F31F480916D
+:10486000190280618093190208958D3F21F480918F
+:10487000170281600BC08E3F21F480911702826085
+:1048800005C08F3F29F4809117028460809317023E
+:104890000895803F39F480911B0287FF6CC010920D
+:1048A0001B0269C0813F29F480911B021816BCF3DA
+:1048B00062C090911A02823F29F497FF5CC0109267
+:1048C0001A0259C0833F19F41916CCF354C0893F1A
+:1048D00041F480911C0218160CF04DC010921C027D
+:1048E0004AC08A3F29F480911C0287FF44C0F6CF5A
+:1048F0008B3F39F480911D0287FF3DC010921D024D
+:104900003AC08C3F29F480911D021816BCF333C0C5
+:10491000843F21F4809119028E7F17C0853F21F4D6
+:10492000809119028D7F11C0863F21F48091190278
+:104930008B7F0BC0873F21F480911902877F05C0D0
+:10494000883F31F4809119028F7E8093190213C041
+:104950008D3F21F4809117028E7F0BC08E3F21F492
+:10496000809117028D7F05C08F3F29F48091170237
+:104970008B7F8093170280911A0281110EC0809163
+:104980001B0281110AC080911C02811106C0809116
+:104990001D02811102C010921802089589E192E06F
+:1049A0000E9476160E949122909315028093140221
+:1049B00008951F93CF93DF93809114029091150275
+:1049C0000E949D22AC0190911802992321F0209120
+:1049D000140130E006C0209116028AE0289F900161
+:1049E00011244217530708F485C080911A02C09120
+:1049F0001B02D0911C0210911D02811107C0C11130
+:104A000075C0D11173C0111171C074C09F3F19F0EE
+:104A10009F5F90931802181624F40E945F238093DE
+:104A20001A0280911A0287FF05C00E945F238195B8
+:104A300080931A021C1624F40E945F2380931B02A9
+:104A400080911B0287FF05C00E945F2381958093A0
+:104A50001B0260911A02662331F1C0911B02CC2324
+:104A600011F1062E000C770B880B990B0E94C225C2
+:104A700023E333E343E35FE30E9426260E948A2573
+:104A800060931A026C2FCC0F770B880B990B0E9446
+:104A9000C22523E333E343E35FE30E9426260E941B
+:104AA0008A2560931B021D1624F40E94A82380937C
+:104AB0001C0280911C0287FF05C00E94A8238195DB
+:104AC00080931C02111624F40E94A82380931D02D7
+:104AD00080911D0287FF05C00E94A82381958093C5
+:104AE0001D02DF91CF911F910C94CE249F3F09F0BE
+:104AF0008FCF97CFDF91CF911F910895E9E1F2E039
+:104B000085E0DF011D928A95E9F710921802109254
+:104B1000170208950E9491256894B1110C942026E3
+:104B200008950E94052688F09F5798F0B92F99277D
+:104B3000B751B0F0E1F0660F771F881F991F1AF088
+:104B4000BA95C9F714C0B13091F00E941F26B1E0A8
+:104B500008950C941F26672F782F8827B85F39F0A7
+:104B6000B93FCCF3869577956795B395D9F73EF421
+:104B700090958095709561957F4F8F4F9F4F0895C9
+:104B8000E89409C097FB3EF49095809570956195E7
+:104B90007F4F8F4F9F4F9923A9F0F92F96E9BB279D
+:104BA0009395F695879577956795B795F111F8CF19
+:104BB000FAF4BB0F11F460FF1BC06F5F7F4F8F4F84
+:104BC0009F4F16C0882311F096E911C0772321F07A
+:104BD0009EE8872F762F05C0662371F096E8862F12
+:104BE00070E060E02AF09A95660F771F881FDAF769
+:104BF000880F9695879597F9089557FD9058440F1B
+:104C0000551F59F05F3F71F04795880F97FB991F2B
+:104C100061F09F3F79F087950895121613061406E8
+:104C2000551FF2CF4695F1DF08C016161706180675
+:104C3000991FF1CF86957105610508940895E89450
+:104C4000BB2766277727CB0197F908950E9439265D
+:104C50000C94AA260E949C2638F00E94A32620F0DD
+:104C6000952311F00C9493260C94992611240C94FE
+:104C700020260E94FD2570F3959FC1F3950F50E00B
+:104C8000551F629FF001729FBB27F00DB11D639FFE
+:104C9000AA27F00DB11DAA1F649F6627B00DA11DA4
+:104CA000661F829F2227B00DA11D621F739FB00D4A
+:104CB000A11D621F839FA00D611D221F749F3327BA
+:104CC000A00D611D231F849F600D211D822F762F53
+:104CD0006A2F11249F5750409AF0F1F088234AF030
+:104CE000EE0FFF1FBB1F661F771F881F915050409C
+:104CF000A9F79E3F510580F00C9493260C94202632
+:104D00005F3FE4F3983ED4F3869577956795B79522
+:104D1000F795E7959F5FC1F7FE2B880F911D96953C
+:104D2000879597F9089597F99F6780E870E060E0AC
+:104D300008959FEF80EC089500240A941616170634
+:104D400018060906089500240A941216130614067C
+:104D500005060895092E0394000C11F4882352F0DF
+:104D6000BB0F40F4BF2B11F460FF04C06F5F7F4F97
+:104D70008F4F9F4F089597FB072E16F4009407D08E
+:104D800077FD09D00E94D52607FC05D03EF490950A
+:104D900081959F4F0895709561957F4F0895EE0F0F
+:104DA000FF1F0590F491E02D0994AA1BBB1B51E154
+:104DB00007C0AA1FBB1FA617B70710F0A61BB70B8B
+:104DC000881F991F5A95A9F780959095BC01CD0130
+:104DD0000895F999FECF92BD81BDF89A992780B5C3
+:104DE0000895A8E1B0E042E050E00C941127262F8E
+:104DF000F999FECF92BD81BDF89A019700B40216D1
+:104E000039F01FBA20BD0FB6F894FA9AF99A0FBE7E
+:104E100008950196272F0E94F8260C94F726DC01AE
+:104E2000CB01FC01F999FECF06C0F2BDE1BDF89AB5
+:104E3000319600B40D9241505040B8F70895F8945F
+:024E4000FFCFA2
+:104E42002002600FEE0FCB0F970F630F0101FB01E2
+:104E52002808010214270020000500050028000090
+:104E620000100004001B002D0009001200060018AB
+:104E720000160008000700280000003F4D3639F8F0
+:104E820007AB0775073C07CF06E80601071A0700BC
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/algernon/config_user.h b/keyboard/ergodox_ez/keymaps/algernon/config_user.h new file mode 100644 index 0000000000..ee1d18de7f --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/config_user.h @@ -0,0 +1,27 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H 1 + +#include "config.h" + +#undef MOUSEKEY_TIME_TO_MAX +#undef MOUSEKEY_MAX_SPEED + +#define MOUSEKEY_TIME_TO_MAX 1 +#define MOUSEKEY_MAX_SPEED 2 + +#undef MOUSEKEY_DELAY +#define MOUSEKEY_DELAY 0 + +#undef MOUSEKEY_WHEEL_DELAY +#define MOUSEKEY_WHEEL_DELAY 0 + +#define ONESHOT_TAP_TOGGLE 2 +#define ONESHOT_TIMEOUT 3000 + +#undef LOCKING_SUPPORT_ENABLE +#undef LOCKING_RESYNC_ENABLE + +#undef LEADER_TIMEOUT +#define LEADER_TIMEOUT 1000 + +#endif diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/base-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/base-layer.png Binary files differnew file mode 100644 index 0000000000..e335859205 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/images/base-layer.png diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/emacs-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/emacs-layer.png Binary files differnew file mode 100644 index 0000000000..1aa23cc00e --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/images/emacs-layer.png diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/hun-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/hun-layer.png Binary files differnew file mode 100644 index 0000000000..3c76653921 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/images/hun-layer.png diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/one-handed-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/one-handed-layer.png Binary files differnew file mode 100644 index 0000000000..283559b3a9 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/images/one-handed-layer.png diff --git a/keyboard/ergodox_ez/keymaps/algernon/keymap.c b/keyboard/ergodox_ez/keymaps/algernon/keymap.c new file mode 100644 index 0000000000..7ded1e1aee --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/keymap.c @@ -0,0 +1,932 @@ +/* + * algernon's ErgoDox EZ layout, please see the README.md file! + */ + +#include "ergodox_ez.h" +#include "led.h" +#include "debug.h" +#include "action_layer.h" +#include "action_util.h" +#include "mousekey.h" +#include "timer.h" + +/* Layers */ + +#define BASE 0 // default layer +#define APPSEL 1 // application select layer +#define HUN 2 // Hungarian layer +#define EMACS 3 // (Spac)Emacs layer +#define OHLFT 4 // One-handed, left side +#define OHRGT 5 // One-handed, right side + +/* Macros */ + +#define A_GUI 0 // GUI magic +#define A_ESC 44 // OSM-clearing ESC + +#define A_MUL 1 // mouse up-left +#define A_MUR 2 // mouse up-right +#define A_MDL 3 // mouse down-left +#define A_MDR 4 // mouse down-right + +#define AE_VIS 5 // Visual mode +#define AE_PSTDEL 6 // Paste/Delete +#define AE_CPYC 7 // Copy/Cut +#define AE_EMACS 8 // Emacs copy & paste mode +#define AE_TERM 9 // Terminal copy & paste mode +#define AE_OTHER 10 // Other copy & paste mode +#define AE_INS 11 // Insert mode +#define AE_OVR 12 // Overwrite mode +#define AE_APPND 13 // Append + +#define HU_AA 14 // Á +#define HU_OO 15 // Ó +#define HU_EE 16 // É +#define HU_UU 17 // Ú +#define HU_II 18 // Í +#define HU_OE 19 // Ö +#define HU_UE 20 // Ü +#define HU_OEE 21 // Ő +#define HU_UEE 22 // Ű + +#define APP_SLK 23 // Slack +#define APP_EMCS 24 // Emacs +#define APP_TERM 25 // Terminal +#define APP_CHRM 26 // Chrome +#define APP_MSIC 27 // Music + +#define KF_1 28 // 1, F1 +#define KF_2 29 // 2, F2 +#define KF_3 30 // ... +#define KF_4 31 +#define KF_5 32 +#define KF_6 33 +#define KF_7 34 +#define KF_8 35 +#define KF_9 36 +#define KF_10 37 +#define KF_11 38 // =, F11 + +#define OH_BSSPC 39 +#define OH_ENTSFT 40 +#define OH_BASE 41 +#define OH_LEFT 42 +#define OH_RIGHT 43 + +/* Fn keys */ +#define F_BSE 0 +#define F_HUN 1 +#define F_GUI 2 +#define F_SFT 3 +#define F_ALT 4 +#define F_CTRL 5 + +/* States & timers */ + +uint8_t m_visual_state = 0; +static uint16_t m_cutdel_timer; +static uint16_t m_copypaste_timer; + +uint16_t gui_timer = 0; + +uint16_t kf_timers[12]; + +uint16_t oh_base_timer = 0; +uint16_t oh_bsspc_timer = 0; +uint16_t oh_entsft_timer = 0; + +#define OH_BLINK_INTERVAL 500 + +uint8_t oh_left_blink = 0; +uint16_t oh_left_blink_timer = 0; +uint8_t oh_right_blink = 0; +uint16_t oh_right_blink_timer = 0; + +enum { + CP_EMACS = 0, + CP_TERM = 1, + CP_OTHER = 2, +}; + +uint8_t cp_mode = CP_EMACS; + +/* The Keymap */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap 0: Base Layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Apps | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| = F11 | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | Tab | ' | , | . | P | Y | [ | | ] | F | G | C | R | L | / | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | - | A | O | E | U | I |------| |------| D | H | T | N | S | \ | + * |-----------+------+------+------+------+------| ( | | ) |------+------+------+------+------+-----------| + * | Play/Pause| ; | Q | J | K | X | | | | B | M | W | V | Z | Stop | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | Home | End | Down | Up | : | | - | Left | Right| PgUp | PgDn | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | LAlt | GUI | |EMACS | 1HND | + * ,------|------|------| |------+------+------. + * | | | Ctrl | | LEAD | | | + * |Backsp|LShift|------| |------| Enter| Space| + * | | | ESC | | HUN | | | + * `--------------------' `--------------------' + */ +[BASE] = KEYMAP( +// left hand + KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),KC_APP +,KC_TAB ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC +,KC_MINS ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I +,KC_MPLY ,KC_SCLN ,KC_Q ,KC_J ,KC_K ,KC_X ,KC_LPRN +,KC_HOME ,KC_END ,KC_DOWN ,KC_UP ,KC_COLN + + ,F(F_ALT),F(F_GUI) + ,F(F_CTRL) + ,KC_BSPC,F(F_SFT),M(A_ESC) + + // right hand + ,KC_APP ,M(KF_6),M(KF_7),M(KF_8),M(KF_9) ,M(KF_10) ,M(KF_11) + ,KC_RBRC ,KC_F ,KC_G ,KC_C ,KC_R ,KC_L ,KC_SLSH + ,KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_BSLS + ,KC_RPRN ,KC_B ,KC_M ,KC_W ,KC_V ,KC_Z ,KC_MSTP + ,KC_MINS,KC_LEFT,KC_RGHT ,KC_PGUP ,KC_PGDN + + ,OSL(EMACS),M(OH_LEFT) + ,KC_LEAD + ,F(F_HUN),KC_ENT ,KC_SPC + ), + +/* Keymap 1: Application select layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | |Music |Slack |Emacs |Term |Chrome| | | | | | | | | | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | | | | | | | | | | | | | | | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | | | | | | |------| |------| | | | | | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | | | | | | | | | | | | | | | | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ + +[APPSEL] = KEYMAP( +// left hand + KC_TRNS ,M(APP_MSIC),M(APP_SLK),M(APP_EMCS),M(APP_TERM),M(APP_CHRM),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_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_TRNS ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,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_TRNS + ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS + + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,KC_TRNS ,KC_TRNS ,KC_TRNS + ), + + +/* Keymap 2: Hungarian Layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | | | Ő | | Ű | | | | | | | | | | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | | Á | Ó | É | Ú | Í |------| |------| | | | | | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | | | Ö | | Ü | | | | | | | | | | | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | BASE | | | + * `--------------------' `--------------------' + */ + +[HUN] = KEYMAP( +// left hand + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_TRNS +,KC_NO ,KC_NO ,M(HU_OEE),KC_NO ,M(HU_UEE),KC_NO ,KC_NO +,KC_NO ,M(HU_AA),M(HU_OO) ,M(HU_EE),M(HU_UU) ,M(HU_II) +,KC_TRNS ,KC_NO ,M(HU_OE) ,KC_NO ,M(HU_UE) ,KC_NO ,KC_NO +,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_NO + + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,KC_TRNS ,KC_TRNS ,KC_TRNS + + // right hand + ,KC_TRNS ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS + + ,KC_NO ,KC_NO + ,KC_NO + ,F(F_BSE),KC_TRNS ,KC_TRNS + ), + +/* Keymap 3: Spacemacs layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | MS Slow | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |ScrLCK| |ScrLCK| 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | MS Normal | | Home | Up | PgUp | |Visual| |Scroll| $ |MsUpL | MsUp |MsUpR | R |PrintScreen| + * |-----------+------+------+------+------+------| Mode | | Up |------+------+------+------+------+-----------| + * | MS Fast |APPEND| Left | Down | Right| INS |------| |------| D |MsLeft| MsDn |MsRght| | | + * |-----------+------+------+------+------+------| Cut | |Scroll|------+------+------+------+------+-----------| + * | Play/Pause| | End | Down | PgDn | X | Copy | | Down | |MsDnL | W |MsDnR | | Stop | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * |EmacsM|TermM |OtherM| | | |Vol Up|Vol Dn| Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | Alt | GUI | | BASE | MClk | + * ,------|------|------| |------+------+------. + * |Delete| | Ctrl | | Prev |Left |Right | + * | |LShift|------| |------| Click| Click| + * |Paste | | ESC | | Next | | | + * `--------------------' `--------------------' + */ +[EMACS] = KEYMAP( +// left hand + KC_ACL0 ,M(KF_1) ,M(KF_2) ,M(KF_3) ,M(KF_4) ,M(KF_5) ,LGUI(KC_L) +,KC_ACL1 ,KC_NO ,KC_HOME ,KC_UP ,KC_PGUP ,KC_NO ,M(AE_VIS) +,KC_ACL2 ,M(AE_APPND) ,KC_LEFT ,KC_DOWN ,KC_RIGHT,M(AE_INS) +,KC_MPLY ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_X ,M(AE_CPYC) +,M(AE_EMACS),M(AE_TERM) ,M(AE_OTHER),KC_NO ,KC_NO + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,M(AE_PSTDEL),KC_TRNS ,KC_TRNS + + // right hand + ,LGUI(KC_L),M(KF_6) ,M(KF_7) ,M(KF_8) ,M(KF_9) ,M(KF_10) ,M(KF_11) + ,KC_WH_U ,KC_DLR ,M(A_MUL),KC_MS_U ,M(A_MUR),M(AE_OVR),KC_PSCR + ,KC_D ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO ,KC_NO + ,KC_WH_D ,KC_NO ,M(A_MDL),KC_W ,M(A_MDR),KC_NO ,KC_MSTP + ,KC_VOLU ,KC_VOLD ,KC_MUTE ,KC_NO ,KC_NO + + ,KC_TRNS ,KC_MS_BTN3 + ,KC_MPRV + ,KC_MNXT ,KC_BTN1 ,KC_BTN2 + ), + +/* Keymap 5: One-handed, left side + * + * ,-----------------------------------------------------. + * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |A BSE| + * |-----------+------+------+------+------+-------------| + * | Tab | ' | , | . | P | Y | [ | + * |-----------+------+------+------+------+------| | + * | - | A | O | E | U | I |------| + * |-----------+------+------+------+------+------| ( | + * | Play/Pause| ; | Q | J | K | X | | + * `-----------+------+------+------+------+-------------' + * | Home | End | Down | Up | ESC | + * `-----------------------------------' + * ,-------------. + * | LAlt | GUI | + * ,------|------|------| + * |BackSp|LShift| Ctrl | + * | | |------| + * |Space |Enter |OTHER | + * `--------------------' + */ +[OHLFT] = KEYMAP( +// left hand + KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3) ,M(KF_4) ,M(KF_5) ,M(OH_BASE) +,KC_TAB ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC +,KC_MINS ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I +,KC_MPLY ,KC_SCLN ,KC_Q ,KC_J ,KC_K ,KC_X ,KC_LPRN +,KC_HOME ,KC_END ,KC_DOWN ,KC_UP ,M(A_ESC) + + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,M(OH_BSSPC),M(OH_ENTSFT),M(OH_RIGHT) + + // right hand + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + + ,KC_NO ,KC_NO + ,KC_NO + ,KC_NO ,KC_NO ,KC_NO + ), + +/* Keymap 6: One-handed, right side + * + * ,-----------------------------------------------------. + * | = F11 | 0 F10| 9 F9 | 8 F8 | 7 F7 | 6 F6 |A BSE| + * |-----------+------+------+------+------+-------------| + * | / | L | R | C | G | F | ] | + * |-----------+------+------+------+------+------| | + * | \ | S | N | T | H | D |------| + * |-----------+------+------+------+------+------| ) | + * | Stop | Z | V | W | M | B | | + * `-----------+------+------+------+------+-------------' + * | PgDn | PgUp | Right| Left | ESC | + * `-----------------------------------' + * ,-------------. + * | LAlt | GUI | + * ,------|------|------| + * |BackSp|LShift| Ctrl | + * | | |------| + * |Space |Enter |OTHER | + * `--------------------' + */ +[OHRGT] = KEYMAP( +// left hand + M(KF_11) ,M(KF_10) ,M(KF_9) ,M(KF_8) ,M(KF_7) ,M(KF_6) ,M(OH_BASE) +,KC_SLSH ,KC_L ,KC_R ,KC_C ,KC_G ,KC_F ,KC_RBRC +,KC_BSLS ,KC_S ,KC_N ,KC_T ,KC_H ,KC_D +,KC_MSTP ,KC_Z ,KC_V ,KC_W ,KC_M ,KC_B ,KC_RPRN +,KC_PGDN ,KC_PGUP ,KC_RGHT ,KC_LEFT ,M(A_ESC) + + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,M(OH_BSSPC),M(OH_ENTSFT),M(OH_LEFT) + + // right hand + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + + ,KC_NO ,KC_NO + ,KC_NO + ,KC_NO ,KC_NO ,KC_NO + ), + +}; + +const uint16_t PROGMEM fn_actions[] = { + [F_BSE] = ACTION_LAYER_CLEAR(ON_PRESS) + ,[F_HUN] = ACTION_LAYER_INVERT(HUN, ON_PRESS) + ,[F_GUI] = ACTION_MACRO_TAP(A_GUI) + ,[F_SFT] = ACTION_MODS_ONESHOT (MOD_LSFT) + ,[F_ALT] = ACTION_MODS_ONESHOT (MOD_LALT) + ,[F_CTRL] = ACTION_MODS_ONESHOT (MOD_LCTL) +}; + +macro_t *ang_do_hun (keyrecord_t *record, uint16_t accent, uint16_t hun_char) +{ + uint8_t need_shift = 0; + uint8_t hold_shift = 0; + + if (!record->event.pressed) + return MACRO_NONE; + + layer_off (HUN); + + if (keyboard_report->mods & MOD_BIT (KC_LSFT)) { + hold_shift = 1; + need_shift = 1; + unregister_code (KC_LSFT); + } + if ((get_oneshot_mods () & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out ()) { + need_shift = 1; + hold_shift = 0; + unregister_code (KC_LSFT); + } + + clear_oneshot_mods (); + + register_code (KC_RALT); + unregister_code (KC_RALT); + if (accent == (KC_DQT)) { + register_code (KC_RSFT); + } + register_code (accent); + unregister_code (accent); + if (need_shift && accent != (KC_DQT)) { + register_code (KC_RSFT); + } else if (accent == (KC_DQT) && !need_shift) { + unregister_code (KC_RSFT); + } + register_code (hun_char); + unregister_code (hun_char); + if (need_shift || accent == (KC_DQT)) + unregister_code (KC_RSFT); + if (hold_shift) + register_code (KC_LSFT); + + return MACRO_NONE; +} + +void ang_handle_kf (keyrecord_t *record, uint8_t id) +{ + uint8_t code = id - KF_1; + + if (record->event.pressed) { + kf_timers[code] = timer_read (); + } else { + uint8_t kc; + + if (timer_elapsed (kf_timers[code]) > TAPPING_TERM) { + // Long press + kc = KC_F1 + code; + } else { + if (id == KF_11) + kc = KC_EQL; + else + kc = KC_1 + code; + } + + register_code (kc); + unregister_code (kc); + } +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case A_ESC: + if (record->event.pressed) { + if ((get_oneshot_mods ()) && !has_oneshot_mods_timed_out ()) { + clear_oneshot_mods (); + } else { + register_code (KC_ESC); + } + } else { + unregister_code (KC_ESC); + } + break; + + /* Hungarian layer */ + case HU_AA: + return ang_do_hun (record, KC_QUOT, KC_A); + case HU_OO: + return ang_do_hun (record, KC_QUOT, KC_O); + case HU_EE: + return ang_do_hun (record, KC_QUOT, KC_E); + case HU_UU: + return ang_do_hun (record, KC_QUOT, KC_U); + case HU_II: + return ang_do_hun (record, KC_QUOT, KC_I); + case HU_OE: + return ang_do_hun (record, KC_DQT, KC_O); + case HU_UE: + return ang_do_hun (record, KC_DQT, KC_U); + case HU_OEE: + return ang_do_hun (record, KC_EQL, KC_O); + case HU_UEE: + return ang_do_hun (record, KC_EQL, KC_U); + + /* Mouse movement */ + case A_MUL: + if (record->event.pressed) { + mousekey_on(KC_MS_UP); + mousekey_on(KC_MS_LEFT); + } else { + mousekey_off(KC_MS_UP); + mousekey_off(KC_MS_LEFT); + } + mousekey_send(); + break; + + case A_MUR: + if (record->event.pressed) { + mousekey_on(KC_MS_UP); + mousekey_on(KC_MS_RIGHT); + } else { + mousekey_off(KC_MS_UP); + mousekey_off(KC_MS_RIGHT); + } + mousekey_send(); + break; + + case A_MDL: + if (record->event.pressed) { + mousekey_on(KC_MS_DOWN); + mousekey_on(KC_MS_LEFT); + } else { + mousekey_off(KC_MS_DOWN); + mousekey_off(KC_MS_LEFT); + } + mousekey_send(); + break; + + case A_MDR: + if (record->event.pressed) { + mousekey_on(KC_MS_DOWN); + mousekey_on(KC_MS_RIGHT); + } else { + mousekey_off(KC_MS_DOWN); + mousekey_off(KC_MS_RIGHT); + } + mousekey_send(); + break; + + /* EMACS layer stuff */ + case AE_EMACS: + if (record->event.pressed) { + cp_mode = CP_EMACS; + } + break; + + case AE_TERM: + if (record->event.pressed) { + cp_mode = CP_TERM; + } + break; + + case AE_OTHER: + if (record->event.pressed) { + cp_mode = CP_OTHER; + } + break; + + case AE_VIS: + if (cp_mode == CP_EMACS && record->event.pressed) { + return MACRO(T(V), END); + } + break; + + case AE_CPYC: + if (record->event.pressed) { + m_copypaste_timer = timer_read (); + } else { + if (timer_elapsed (m_copypaste_timer) > TAPPING_TERM) { + // Long press: Cut + switch (cp_mode) { + case CP_EMACS: + return MACRO(T(X), END); + break; + case CP_TERM: + return MACRO(D(RCTRL), D(RSFT), T(X), U(RSFT), U(RCTRL), END); + break; + case CP_OTHER: + return MACRO(D(RCTRL), T(X), U(RCTRL), END); + break; + } + } else { + // Short press: Copy + switch (cp_mode) { + case CP_EMACS: + return MACRO(T(Y), END); + break; + case CP_TERM: + return MACRO(D(RCTRL), D(RSFT), T(C), U(RSFT), U(RCTRL), END); + break; + case CP_OTHER: + return MACRO(D(RCTRL), T(C), U(RCTRL), END); + break; + } + } + } + break; + + case AE_PSTDEL: + if (record->event.pressed) { + m_cutdel_timer = timer_read (); + } else { + if (timer_elapsed (m_cutdel_timer) > TAPPING_TERM) { + // Long press: Delete + switch (cp_mode) { + case CP_EMACS: + return MACRO(T(D), END); + break; + case CP_TERM: + case CP_OTHER: + return MACRO(T(DEL), END); + break; + } + } else { + // Short press: Paste + switch (cp_mode) { + case CP_EMACS: + if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { + unregister_code (KC_RSFT); + return MACRO(U(RSFT), T(RBRC), T(P), D(RSFT), END); + } + else + return MACRO(T(P), END); + break; + case CP_TERM: + return MACRO(D(RCTRL), D(RSFT), T(V), U(RSFT), U(RCTRL), END); + break; + case CP_OTHER: + return MACRO(D(RCTRL), T(V), U(RCTRL), END); + break; + } + } + } + break; + + case AE_INS: + if (record->event.pressed) { + return MACRO(T(I), END); + } else { + layer_clear(); + } + break; + + case AE_OVR: + if (record->event.pressed) { + return MACRO(T(R), END); + } else { + layer_clear(); + } + break; + + case AE_APPND: + if (record->event.pressed) { + return MACRO(T(A), END); + } else { + layer_clear(); + } + break; + + /* GUI & AppSel */ + case A_GUI: + if (record->event.pressed) { + register_code (KC_LGUI); + if (record->tap.count && !record->tap.interrupted) { + if (record->tap.count >= 2) { + register_code (KC_W); + layer_on (APPSEL); + set_oneshot_layer (APPSEL, ONESHOT_START); + } + } else { + record->tap.count = 0; + } + gui_timer = 0; + } else { + if (record->tap.count >= 2) + { + unregister_code (KC_W); + clear_oneshot_layer_state (ONESHOT_PRESSED); + } + gui_timer = timer_read (); + } + break; + + case APP_SLK: + if (record->event.pressed) + return MACRO(T(S), T(C), T(U), T(D), T(C), T(L), T(O), T(U), T(D), T(ENT), END); + break; + + case APP_EMCS: + if (record->event.pressed) + return MACRO(T(E), T(M), T(A), T(C), T(S), T(ENT), END); + break; + + case APP_TERM: + if (record->event.pressed) + return MACRO(T(T), T(E), T(R), T(M), T(ENT), END); + break; + + case APP_CHRM: + if (record->event.pressed) + return MACRO(T(C), T(H), T(R), T(O), T(M), T(ENT), END); + break; + + case APP_MSIC: + if (record->event.pressed) + return MACRO(T(R), T(H), T(Y), T(T), T(H), T(M), T(B), T(O), T(X), T(ENT), END); + break; + + /* Function keys */ + case KF_1 ... KF_11: + ang_handle_kf (record, id); + break; + + /* 1HAND layout */ + case OH_BASE: + if (record->event.pressed) { + oh_base_timer = timer_read (); + } else { + if (timer_elapsed (oh_base_timer) > TAPPING_TERM) { + layer_clear (); + } else { + return MACRO (T(APP), END); + } + } + break; + + case OH_BSSPC: + if (record->event.pressed) { + oh_bsspc_timer = timer_read (); + } else { + if (timer_elapsed (oh_bsspc_timer) > TAPPING_TERM) { + return MACRO (T(BSPC), END); + } else { + return MACRO (T(SPC), END); + } + } + break; + + case OH_ENTSFT: + if (record->event.pressed) { + oh_entsft_timer = timer_read (); + } else { + if (timer_elapsed (oh_entsft_timer) > TAPPING_TERM) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT)) + unregister_code (KC_LSFT); + else + register_code (KC_LSFT); + } else { + return MACRO (T(ENT), END); + } + } + break; + + case OH_LEFT: + if (record->event.pressed) { + layer_move (OHLFT); + oh_left_blink = 1; + oh_left_blink_timer = timer_read (); + ergodox_right_led_1_on (); + } + break; + + case OH_RIGHT: + if (record->event.pressed) { + layer_move (OHRGT); + oh_right_blink = 1; + oh_right_blink_timer = timer_read (); + ergodox_right_led_3_on (); + } + break; + } + return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + ergodox_led_all_set (LED_BRIGHTNESS_LO); + ergodox_led_all_on(); + _delay_ms(1000); + ergodox_led_all_off(); +}; + +LEADER_EXTERNS(); + +void ang_do_unicode (void) { + register_code (KC_RCTL); + register_code (KC_RSFT); + register_code (KC_U); + unregister_code (KC_U); + unregister_code (KC_RSFT); + unregister_code (KC_RCTL); +} + +void ang_tap (uint16_t codes[]) { + for (int i = 0; codes[i] != 0; i++) { + register_code (codes[i]); + unregister_code (codes[i]); + } +} + +#define TAP_ONCE(code) \ + register_code (code); \ + unregister_code (code) + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + uint8_t layer = biton32(layer_state); + + if (gui_timer && timer_elapsed (gui_timer) > TAPPING_TERM) + unregister_code (KC_LGUI); + + if (layer != OHLFT) + oh_left_blink = 0; + if (layer != OHRGT) + oh_right_blink = 0; + + if (layer == HUN) { + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + } else if (layer == EMACS) { + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + } + + if (layer == OHLFT || layer == OHRGT) { + ergodox_right_led_2_on(); + + if (oh_left_blink) { + if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL) { + if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) == 0) + ergodox_right_led_1_off (); + } + if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL * 2) { + ergodox_right_led_1_on (); + oh_left_blink_timer = timer_read (); + } + } + + if (oh_right_blink) { + if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL) { + if ((keyboard_report->mods & MOD_BIT(KC_LCTRL)) == 0) + ergodox_right_led_3_off (); + } + if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL * 2) { + ergodox_right_led_3_on (); + oh_right_blink_timer = timer_read (); + } + } + } + + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || + ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) { + ergodox_right_led_1_set (LED_BRIGHTNESS_HI); + ergodox_right_led_1_on (); + } else { + ergodox_right_led_1_set (LED_BRIGHTNESS_LO); + if (layer != OHLFT && layer != EMACS) + ergodox_right_led_1_off (); + } + + if (keyboard_report->mods & MOD_BIT(KC_LALT) || + ((get_oneshot_mods() & MOD_BIT(KC_LALT)) && !has_oneshot_mods_timed_out())) { + ergodox_right_led_2_set (LED_BRIGHTNESS_HI); + ergodox_right_led_2_on (); + } else { + ergodox_right_led_2_set (LED_BRIGHTNESS_LO); + if (layer != OHRGT && layer != HUN && layer != OHLFT && layer != EMACS) + ergodox_right_led_2_off (); + } + + if (keyboard_report->mods & MOD_BIT(KC_LCTRL) || + ((get_oneshot_mods() & MOD_BIT(KC_LCTRL)) && !has_oneshot_mods_timed_out())) { + ergodox_right_led_3_set (LED_BRIGHTNESS_HI); + ergodox_right_led_3_on (); + } else { + ergodox_right_led_3_set (LED_BRIGHTNESS_LO); + if (layer != OHRGT && layer != HUN) + ergodox_right_led_3_off (); + } + + LEADER_DICTIONARY() { + leading = false; + leader_end (); + + SEQ_ONE_KEY (KC_U) { + ang_do_unicode (); + } + + SEQ_ONE_KEY (KC_L) { + /* λ */ + ang_do_unicode (); + + uint16_t codes[] = {KC_0, KC_3, KC_B, KC_B, KC_ENT, 0}; + ang_tap (codes); + } + + SEQ_ONE_KEY (KC_S) { + ang_do_unicode (); TAP_ONCE (KC_A); TAP_ONCE (KC_F); TAP_ONCE (KC_SPC); + TAP_ONCE (KC_BSLS); + register_code (KC_RSFT); TAP_ONCE (KC_MINS); TAP_ONCE (KC_9); unregister_code (KC_RSFT); + ang_do_unicode (); TAP_ONCE (KC_3); TAP_ONCE (KC_0); TAP_ONCE (KC_C); TAP_ONCE (KC_4); TAP_ONCE (KC_SPC); + register_code (KC_RSFT); TAP_ONCE (KC_0); TAP_ONCE (KC_MINS); unregister_code (KC_RSFT); + TAP_ONCE (KC_SLSH); + ang_do_unicode (); TAP_ONCE (KC_A); TAP_ONCE (KC_F); TAP_ONCE (KC_SPC); + } + + SEQ_TWO_KEYS (KC_W, KC_M) { + register_code (KC_LALT); + register_code (KC_F2); + unregister_code (KC_F2); + unregister_code (KC_LALT); + + _delay_ms (1000); + + uint16_t codes[] = {KC_M, KC_A, KC_X, KC_MINS, KC_F, KC_O, KC_C, KC_U, KC_S, KC_E, KC_D, KC_ENT, 0}; + ang_tap (codes); + register_code (KC_LGUI); + register_code (KC_UP); + unregister_code (KC_UP); + unregister_code (KC_LGUI); + } + } +} diff --git a/keyboard/ergodox_ez/keymaps/algernon/makefile.mk b/keyboard/ergodox_ez/keymaps/algernon/makefile.mk new file mode 100644 index 0000000000..34e574220f --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/algernon/makefile.mk @@ -0,0 +1,4 @@ +BOOTMAGIC_ENABLE=no +COMMAND_ENABLE=no +SLEEP_LED_ENABLE=no +UNICODE_ENABLE=no diff --git a/keyboard/ergodox_ez/keymaps/dave/dave.hex b/keyboard/ergodox_ez/keymaps/dave/dave.hex index 363e7234d8..a1ba8b901d 100644 --- a/keyboard/ergodox_ez/keymaps/dave/dave.hex +++ b/keyboard/ergodox_ez/keymaps/dave/dave.hex @@ -1,1128 +1,1172 @@ -:100000000C9463020C94AA020C94AA020C94AA0207
-:100010000C94AA020C94AA020C94AA020C94AA02B0
-:100020000C94AA020C94AA020C94FF0B0C94D10C11
-:100030000C94AA020C94AA020C94AA020C94AA0290
-:100040000C94AA020C9445210C94AA020C94AA02C6
-:100050000C94AA020C94D71A0C94AA020C94AA022B
-:100060000C94AA020C94AA020C94AA020C94AA0260
-:100070000C94AA020C94AA020C94AA020C94AA0250
-:100080000C94AA020C94AA020C94AA020C94AA0240
-:100090000C94AA020C94AA020C94AA020C94AA0230
-:1000A0000C94AA020C94AA020C94AA023E0D600DB4
-:1000B000530E600D530EA50DC80D530E1D0E300EC0
-:1000C0001A111A11491149118C11C611D313D313E6
-:1000D000DF11D313D412D412A713D313D313BE1327
-:1000E00029002B00E000E100357100001E00140023
-:1000F00004001D006400E3001F001A0016001B002E
-:1001000000000252200008000700060000002C003A
-:100110002100150009001900E2001151220017000A
-:100120000A0005000000460023001C0000000B0030
-:100130000000650023000A000000050000004800E0
-:1001400024001C000B0011000000007525001800A1
-:100150000D001000E600115126000C000E003600C4
-:1001600000002C00270012000F0037002F00015262
-:100170002D001300330038003000E7002A0028006B
-:100180002800E500347100000100010001000100B9
-:100190000100000001001E022002220201000100F5
-:1001A00001001F02210223020100010001002F02B1
-:1001B00026022F000100010001003002270230005A
-:1001C000010012510100310235003502000001002A
-:1001D0000100010000000100000001000100010019
-:1001E0000000010000000100010001000100010009
-:1001F0000000010000005F005C0059006200125125
-:10020000540060005D005A0062000100550061006A
-:100210005E005B0063000100560057005700580065
-:10022000580001002E0032003400010001000000DF
-:100230000100010001000100010000003A004A0035
-:100240005000F400F20001003B0052005100F000A9
-:10025000F10001003C004D004F00F500F3000100EB
-:100260003D0049004C000100010010513E004B00D0
-:100270004E0001000000A5003F0001000000010049
-:1002800000004C05400001000000010000000100DA
-:1002900041000100010001000000010042000100D6
-:1002A000B600AC00AA001051430049004C00AE005B
-:1002B000A800010044000100B700AB00A900010044
-:1002C00045000100010001000100010001000100E2
-:1002D00001000100010000001603450072006700E4
-:1002E0006F0044006F007800200045005A000000B5
-:1002F00016034500720067006F0044006F0078002D
-:10030000200045005A0000000403090409026D00A2
-:10031000040100A0FA090400000103010100092101
-:1003200011010001223F000705810308000A0904AA
-:1003300001000103010200092111010001224D0009
-:100340000705820308000A090402000103000000F7
-:100350000921110100012236000705830308000A64
-:10036000090403000103000000092111010001221A
-:10037000390007058403100001120110010000007C
-:1003800008EDFE071301000102000105010906A1A5
-:1003900001050719E029E715002501950875018178
-:1003A0000205081901290595057501910295017548
-:1003B0000391010507190029771500250195787526
-:1003C000018102C005010980A101850216010026F4
-:1003D000B7001A01002AB700751095018100C00509
-:1003E0000C0901A1018503160100269C021A0100D7
-:1003F0002A9C02751095018100C005010902A10126
-:100400000901A10005091901290515002501950516
-:1004100075018102950175038101050109300931DA
-:100420001581257F95027508810609381581257F7C
-:10043000950175088106050C0A38021581257F95FE
-:100440000175088106C0C005010906A1010507194B
-:10045000E029E715002501950875018102950175D0
-:100460000881010508190129059505750191029575
-:1004700001750391010507190029FF150025FF9556
-:100480000675088100C000000000000000000000A8
-:1004900000010204060A0F17202C3A4A5D71879D5D
-:1004A000B3C7DAE9F5FCFFFCF5E9DAC7B39D87715C
-:1004B0005D4A3A2C20170F0A0604020100000000D2
-:1004C00000000000000011241FBECFEFDAE0DEBF05
-:1004D000CDBF04B603FE27C08091F1019091F201D7
-:1004E000A091F301B091F4018730904BA740B04B3D
-:1004F000D1F41092F1011092F2011092F3011092D6
-:10050000F40114BE84B7877F84BF0FB6F894A89512
-:1005100080916000886180936000109260000FBE3F
-:10052000E0E0FFE3099511E0A0E0B1E0ECE2F6E4E1
-:1005300002C005900D92A433B107D9F721E0A4E3DE
-:10054000B1E001C01D92A13FB207E1F70E94460948
-:100550000C9414230C94000061110BC0FC018281E7
-:10056000882321F085EE0E94B40F03C085EE0E941F
-:100570007C1080E090E0089508956091B50170913D
-:10058000B6018091B7019091B8010E94041A569863
-:100590005E98E5E3F1E065E070E031E0A1E0B0E015
-:1005A0004081831305C091E04F3F41F490E006C0C5
-:1005B00021E0411101C020E0922F9195940F90838A
-:1005C000992309F194B1AD01062E01C0440F0A949C
-:1005D000EAF7942B94B995B1492B45B9408150E085
-:1005E000313029F4509389004093880019C032308B
-:1005F00029F450938B0040938A0012C050938D00D1
-:1006000040938C000DC094B1AD01062E01C0440F83
-:100610000A94EAF74095942394B995B1492345B9D2
-:100620003F5F6F5F7F4F3196343009F0B9CF089547
-:100630000C94BD0256985E9825982D9826982E9871
-:1006400027982F988FEF90E09093890080938800EF
-:1006500090938B0080938A0090938D0080938C0000
-:10066000259A2D9A2FEF80E792E02150804090400C
-:10067000E1F700C00000269A2E9A2FEF80E792E063
-:10068000215080409040E1F700C00000279A2F9A47
-:100690002FEF80E792E0215080409040E1F700C0CA
-:1006A000000025982D982FEF80E792E021508040A0
-:1006B0009040E1F700C0000026982E982FEF80E7C9
-:1006C00092E0215080409040E1F700C00000279860
-:1006D0002F9856985E9825982D9826982E982798AA
-:1006E0002F98089589EA8093800089E080938100A3
-:1006F00024982C983F988AB18F748AB96E98479A3B
-:100700008BB1806B8BB9769A0E941A030C94BC0251
-:1007100080E2809300018091380181110EC00E9417
-:10072000D70381E0809338012FEF83ED90E32150D0
-:1007300080409040E1F700C0000080E40E94DD03AB
-:100740008093000181112EC00E9407048093000154
-:10075000811128C00E94070480930001811122C0EA
-:100760008FE30E9407048093000181111BC00E9447
-:10077000FF0380E40E94DD0380930001811112C019
-:100780008CE00E9407048093000181110BC00E943D
-:10079000070480930001811105C08FE30E940704C4
-:1007A000809300010E94FF03809100010895109240
-:1007B000B9008AE08093B800089594EA9093BC0051
-:1007C0009091BC0097FFFCCF9091B900987F983032
-:1007D00021F0903111F081E008958093BB0084E80E
-:1007E0008093BC008091BC0087FFFCCF8091B90052
-:1007F000887F883111F0803471F780E0089584E9B2
-:100800008093BC008091BC0084FDFCCF0895809350
-:10081000BB0084E88093BC008091BC0087FFFCCFC4
-:100820009091B900987F81E0983209F480E00895B2
-:1008300084E88093BC008091BC0087FFFCCF80914E
-:10084000BB00089580910001811115C080E40E94D1
-:10085000DD038093000181110CC082E10E94070436
-:1008600080930001811105C08FEF0E9407048093DF
-:1008700000010E94FF0384B1807F84B985B1807F2D
-:1008800085B98AB1837F8AB98BB1837F8BB93E9852
-:10089000469808950E948803809300010E942204D4
-:1008A00080B38C7080BB81B3836F81BBE8E4F1E0DF
-:1008B000AAE3B1E011921D9281E0E635F807D1F785
-:1008C0000C9472039F92AF92BF92CF92DF92EF92FD
-:1008D000FF920F931F93CF93DF93809100018823A2
-:1008E00079F0809139018F5F80933901811108C0BF
-:1008F0000E94880380930001811102C00E941A03A4
-:100900008AE3E82E81E0F82E8701C0E0D0E0BB2426
-:10091000B39492E0A92ECC24C394D12CC730D10536
-:1009200000F580910001811164C080E40E94DD0324
-:1009300080930001811112C082E10E94070480931C
-:10094000000181110BC0C6010C2E01C0880F0A9452
-:10095000EAF780950E940704809300010E94FF033C
-:1009600048C0CA30A1F028F4C83059F0C93061F04D
-:1009700005C0CC3089F070F0CD3089F0209A2898ED
-:1009800010C0219A29980DC0229A2A980AC0239A49
-:100990002B9807C0529A01C0539A5B9802C03E9AA6
-:1009A0004698E0EAEA95F1F78FB181708B25799945
-:1009B00002C032E001C030E0832B7C9902C034E0F9
-:1009C00001C030E0832B7D9902C028E001C020E007
-:1009D000822B7E9902C090E101C090E0892B9FB1EB
-:1009E0009095991F9927991F9295990F907E892B21
-:1009F0000FC08091000181114AC080E40E94DD0394
-:100A000080930001882381F1912C0E94FF03892D9E
-:100A1000D8019C91981719F08C93A09201010E9423
-:100A2000220421960F5F1F4FCE30D10509F076CFFB
-:100A300080910101882369F181508093010188230D
-:100A400039F0EFE9FFE03197F1F700C0000021C075
-:100A5000E8E4F1E0D7018D917D018193B8E4EB16D4
-:100A6000B1E0FB06B9F715C083E10E94070480934B
-:100A700000018111C9CF81E40E94DD038093000150
-:100A80008111C2CF0E941804982E9094BECF80E0AE
-:100A9000BFCF0E94180381E0DF91CF911F910F918A
-:100AA000FF90EF90DF90CF90BF90AF909F90089510
-:100AB000E82FF0E0E85BFE4F8081089508958B3BBE
-:100AC000910580F4883A910548F5853A9105D8F466
-:100AD0008430910508F0B2C0019709F06EC081E042
-:100AE00090E00895803E910508F467C0883E910526
-:100AF00008F4A4C09C01205F31092031310508F0C1
-:100B00005CC090650895853A910509F459C0863A0C
-:100B1000910509F058C082E890E40895883A91055B
-:100B200009F454C0893A910509F453C08A3A9105F1
-:100B300009F452C08B3A910509F451C08C3A9105E1
-:100B400009F450C08D3A910509F44FC0803B9105DE
-:100B500009F44EC08E3A910509F44DC08F3A9105C3
-:100B600009F44CC0813B910509F44BC0823B9105CF
-:100B700009F44AC0833B910509F449C0843B9105BF
-:100B800009F448C0853B910509F447C0863B9105AF
-:100B900009F446C0873B910509F445C0883B91059F
-:100BA00009F444C0893B910509F443C08A3B91058F
-:100BB00009F442C080E094E4089580E090E0089554
-:100BC00081E890E4089583E890E4089582EE94E447
-:100BD000089589EE94E408958AEE94E4089585EBEF
-:100BE00094E4089586EB94E4089587EB94E40895E3
-:100BF0008CEC94E408958DEC94E4089583E895E4F6
-:100C000008958AE895E4089582E995E4089584E9D1
-:100C100095E4089581E296E4089583E296E40895C8
-:100C200084E296E4089585E296E4089586E296E4E7
-:100C3000089587E296E408958AE296E40895089577
-:100C400024E5829FC0011124FC0126E0729FE00D83
-:100C5000F11D1124E60FF11DEE0FFF1FE052FF4FB3
-:100C6000859194910895880F991FFC01E05AF040F6
-:100C7000859194910895880F991FFC01E052FF4FD0
-:100C800085919491089524E5829FC0011124FC016F
-:100C900046E0749FE00DF11D1124E60FF11DEE0FEB
-:100CA000FF1FE052FF4F859194919C013A952115C9
-:100CB0004FE1340708F425C13F512115304120F49C
-:100CC0009F700E943B0608959C01305321153041CE
-:100CD00018F49927906C0895811520E5920769F41E
-:100CE0000E94F5134FEF84E39CE041508040904018
-:100CF000E1F700C000000C94FC1A813020E5920757
-:100D000031F48091D00181608093D00108959C01DD
-:100D100030552115304108F05CC0292F33272F7042
-:100D2000332721303105E9F4AC0164E0440F551F4D
-:100D30006A95E1F744275370BC016370772702C0BE
-:100D4000220F331F6A95E2F73C68242B352B73E0A2
-:100D5000880F991F7A95E1F780769927822B932B3C
-:100D600008952230310529F4982F8827816F906AE1
-:100D7000089523303105A1F4AC0133E0440F551F31
-:100D80003A95E1F7407E57708370992721E030E073
-:100D900002C0220F331F8A95E2F7C9019C6816C072
-:100DA0002430310531F5AC0123E0440F551F2A955D
-:100DB000E1F7407E57708370992721E030E002C050
-:100DC000220F331F8A95E2F7C9019A68842B952B6D
-:100DD00008959C0130572115304118F49F7090629E
-:100DE00008959C0130582115304118F49F70906A85
-:100DF0000895803E9105E0F4803C910558F58133DB
-:100E0000910509F46FC048F48932910509F463C073
-:100E10008A32910509F46DC072C089339105E9F0F9
-:100E200082389105D1F08533910509F44DC067C032
-:100E3000833E910581F138F4803E9105B9F0823E00
-:100E40009105D9F05CC0863E910561F1873E910520
-:100E5000A1F155C00E94330608952091E20120FDC2
-:100E600002C021FF4CC080EE90E049C08091E201B9
-:100E700080FFF9CF89E390E042C08091E20182FFD8
-:100E80000EC08091E20184FF03C080E090E037C093
-:100E900083EE90E034C08091E20182FFF2CF82EED7
-:100EA00090E02DC08091E20183FF0BC08091E201B0
-:100EB00084FDEBCF87EE90E022C08091E20183FFBA
-:100EC000F5CF86EE90E01BC08091E20185FF07C060
-:100ED00089E290E014C08091E20185FFF9CF85E3BB
-:100EE00090E00DC08091E20186FF07C08AE290E0A9
-:100EF00006C08091E20186FFF9CF81E390E00E9475
-:100F00005F0508950895809166010895CF93DF935A
-:100F100000D01F92CDB7DEB79C018091E8018430EC
-:100F200019F593E099833B832A839093E9008FEF2F
-:100F30009091E800815095FD06C095ED9A95F1F7E6
-:100F400000008111F5CF8091E80085FF0DC040E0E1
-:100F500050E063E070E0CE0101960E94F3098091B9
-:100F6000E8008E778093E8000F900F900F90DF914C
-:100F7000CF910895CF93DF9300D01F92CDB7DEB706
-:100F80002091E801243021F522E029839B838A8384
-:100F900083E08093E9008FEF9091E800815095FD08
-:100FA00006C095ED9A95F1F700008111F5CF80917B
-:100FB000E80085FF0DC040E050E063E070E0CE0146
-:100FC00001960E94F3098091E8008E778093E800F3
-:100FD0000F900F900F90DF91CF9108959C01809119
-:100FE000E8018430F9F482E08093E9009FEF80917A
-:100FF000E800915085FD06C085ED8A95F1F7000067
-:101000009111F5CF8091E80085FF0CC040E050E0E1
-:1010100065E070E0C9010E94F3098091E8008E77D5
-:101020008093E8000895CF93DF93EC018091E8016D
-:10103000843009F046C090910C019923D9F0909129
-:101040000D019923B9F08093E9008FEF9091E800AA
-:10105000815095FD06C095E19A95F1F70000811148
-:10106000F5CF8091E80085FF2CC040E050E060E1C2
-:1010700070E017C081E08093E9008FEF9091E80065
-:10108000815095FD06C095ED9A95F1F7000081110C
-:10109000F5CF8091E80085FF14C040E050E068E0A3
-:1010A00070E0CE010E94F3098091E8008E77809372
-:1010B000E80080E1FE01A6E5B1E001900D928A957D
-:1010C000E1F7DF91CF9108958091E701811109C087
-:1010D0000E94840B0E94E10B8091E2008460809367
-:1010E000E20008951092E701089508950C943221CA
-:1010F0000E94921A0E9438210E948C0E0C94820742
-:1011000042E061EC81E00E94FD0A42E061EC82E095
-:101110000E94FD0A42E061EC83E00E94FD0A42E188
-:1011200061EC84E00C94FD0A8091EA01833009F4BB
-:1011300055C030F4813071F0823009F48EC00895CA
-:101140008A3009F47AC08B3009F460C0893009F024
-:101150009CC020C08091E901813A09F096C080913D
-:10116000E800877F8093E8008091ED019091EE0187
-:10117000892B21F460E186E591E003C060E080E026
-:1011800090E070E00E943E0A8091E8008B778093A7
-:10119000E80008958091E901813209F076C08091DC
-:1011A000ED019091EE01009719F0039709F06DC0E1
-:1011B0008091E800877F8093E8008091E80082FDBD
-:1011C00005C08091E8018111F8CF5FC08091F100E6
-:1011D000809366018091E8008B7753C08091E9018C
-:1011E000813A09F052C08091ED019091EE01892B76
-:1011F00009F04BC08091E800877F8093E8008091E0
-:10120000E80080FFFCCF80910C0136C08091E9019D
-:101210008132D9F58091ED019091EE01892BA9F5EC
-:101220008091E800877F8093E8000E94320B8091D4
-:10123000EB0180930C010C94F5138091E90181324C
-:1012400021F58091E800877F8093E8000E94320BAF
-:101250008091EC018093670108958091E901813AC2
-:10126000A1F48091E800877F8093E8008091E800F6
-:1012700080FFFCCF809167018093F1008091E800AE
-:101280008E778093E8000C94320B089584B7877FA3
-:1012900084BF0FB6F894A895809160008861809310
-:1012A0006000109260000FBE90E080E80FB6F894E6
-:1012B00080936100909361000FBE0E94DB0E0E943C
-:1012C000840B0E94E10B8091E20084608093E20035
-:1012D00078940E946C0E0E94DD0E82E091E00E94E4
-:1012E000870E0E9420218091E801853069F40E94D8
-:1012F000541A8091E6018823B1F30E947E1A882354
-:1013000091F30E94DD09EFCF0E94E30EECCF292F6D
-:10131000332723303105C9F060F42130310581F0E5
-:101320002230310509F041C08DE690E02CE033E039
-:1013300040C021323105E1F02232310531F135C0B2
-:1013400082E190E029E733E034C0992781309105AC
-:1013500049F028F0029749F5E8EDF2E005C0E8E031
-:10136000F3E002C0E0EFF2E0849190E09F0121C041
-:101370006430D8F4E62FF0E0EE0FFF1FEE5DFE4F75
-:101380002081318189E090E014C0643070F470E015
-:10139000FB01EE0FFF1FE65EFE4F20813181FB0156
-:1013A000EA5EFE4F808190E004C080E090E020E0A3
-:1013B00030E0FA0131832083089580E189BD82E124
-:1013C00089BD09B400FEFDCF8091D8008F7D809348
-:1013D000D8008091E00082608093E0008091E0007E
-:1013E00081FDFCCF0895CF92DF92EF92FF920F9391
-:1013F0001F93CF93DF93EC018B016A010E94510B85
-:10140000811133C0C114D10439F0F601808191817A
-:10141000081B190BC80FD91FE12CF12C0115110560
-:1014200019F18091E80085FD16C08091E8008E7763
-:101430008093E800C114D10449F0F60180819181C4
-:10144000E80EF91EF182E08285E00FC00E94510B88
-:10145000882321F30AC089918093F100015011097A
-:10146000FFEFEF1AFF0ADACF80E0DF91CF911F91F3
-:101470000F91FF90EF90DF90CF9008952091EF01B2
-:101480003091F0012617370748F06115710539F4DE
-:101490002091E8002E772093E80001C0B901FC01FB
-:1014A00020E06115710579F18091E8018823F1F15F
-:1014B0008530F1F18091E80083FD3CC08091E80027
-:1014C00082FD2EC08091E80080FFEBCF2091F300D9
-:1014D0008091F20090E0922B6115710551F08830F7
-:1014E000910538F421912093F10061507109019622
-:1014F000F3CF21E0089709F020E08091E8008E7793
-:101500008093E800CECF2111CFCF0AC08091E801AF
-:10151000882361F0853061F08091E80083FD0AC086
-:101520008091E80082FFF2CF80E0089582E0089584
-:1015300083E0089581E008952091EF013091F0015A
-:101540002617370748F06115710539F42091E80036
-:101550002E772093E80001C0B901FC0120E061155D
-:10156000710591F18091E801882309F440C085302C
-:1015700009F43FC08091E80083FD3DC08091E80000
-:1015800082FD2FC08091E80080FFE9CF2091F30019
-:101590008091F20090E0922B6115710559F088302E
-:1015A000910540F424912093F10031966150710926
-:1015B0000196F2CF21E0089709F020E08091E80041
-:1015C0008E778093E800CBCF2111CCCF0AC08091D9
-:1015D000E801882361F0853061F08091E80083FDA7
-:1015E0000AC08091E80082FFF2CF80E0089582E097
-:1015F000089583E0089581E00895982F973068F565
-:101600009093E900981739F07091EC002091ED006B
-:101610005091F00003C0242F762F50E021FD02C02E
-:101620009F5FECCF3091EB003E7F3093EB00309129
-:10163000ED003D7F3093ED003091EB003160309351
-:10164000EB007093EC002093ED005093F00020919C
-:10165000EE0027FDE5CF80E008958F708093E900CC
-:1016600081E008958091E90187FF11C08091E80031
-:1016700082FD05C08091E8018111F8CF11C08091F1
-:10168000E8008B770BC08091E801882349F08091B6
-:10169000E80080FFF8CF8091E8008E778093E80023
-:1016A00008952091E4003091E50095E64091EC002A
-:1016B000842F817040FF23C08091E80080FD1DC011
-:1016C0008091E801882399F0853099F08091EB00B2
-:1016D00085FD11C04091E4005091E50024173507C5
-:1016E00029F3915011F09A01E1CF84E0089582E04E
-:1016F000089583E0089581E0089580E00895409181
-:10170000E80042FFDDCF08950E94F20B0E94FA0B21
-:10171000E0EEF0E0808181608083E8EDF0E08081A0
-:101720008F77808319BCA7EDB0E08C918E7F8C936E
-:1017300080818F7E80831092E70108950F931F931D
-:10174000CF93DF930E94F20B0E94FA0BC8EDD0E01A
-:1017500088818F77888388818068888388818F7D5E
-:10176000888319BC1092E8011092E4011092E601FE
-:101770001092E50100EE10E0F80180818B7F8083FC
-:1017800088818160888342E060E080E00E94FD0AF9
-:10179000E1EEF0E080818E7F8083E2EEF0E08081F8
-:1017A00081608083808188608083F80180818E7F62
-:1017B0008083888180618883DF91CF911F910F9111
-:1017C0000895E8EDF0E080818F7E8083E7EDF0E022
-:1017D00080818160808384E082BF81E08093E70123
-:1017E0000C949E0BE8EDF0E080818E7F8083109258
-:1017F000E20008951092DA001092E10008951F921D
-:101800000F920FB60F9211242F933F934F935F9334
-:101810006F937F938F939F93AF93BF93EF93FF93B8
-:101820008091E10082FF0BC08091E20082FF07C03F
-:101830008091E1008B7F8093E1000E946B0E80918C
-:10184000DA0080FF1FC08091D80080FF1BC080910C
-:10185000DA008E7F8093DA008091D90080FF0DC07E
-:1018600080E189BD82E189BD09B400FEFDCF81E040
-:101870008093E8010E94640805C019BC1092E80139
-:101880000E9472088091E10080FF19C08091E200FF
-:1018900080FF15C08091E2008E7F8093E2008091EE
-:1018A000E20080618093E2008091D80080628093A2
-:1018B000D80019BC85E08093E8010E9476088091E9
-:1018C000E10084FF30C08091E20084FF2CC080E101
-:1018D00089BD82E189BD09B400FEFDCF8091D800A9
-:1018E0008F7D8093D8008091E1008F7E8093E1000E
-:1018F0008091E2008F7E8093E2008091E20081601F
-:101900008093E2008091E401882311F084E007C015
-:101910008091E30087FD02C081E001C083E08093F5
-:10192000E8010E9478088091E10083FF29C080913E
-:10193000E20083FF25C08091E100877F8093E10072
-:1019400082E08093E8011092E4018091E1008E7FB3
-:101950008093E1008091E2008E7F8093E20080918D
-:10196000E20080618093E20042E060E080E00E945B
-:10197000FD0A8091F00088608093F0000E94750855
-:10198000FF91EF91BF91AF919F918F917F916F9157
-:101990005F914F913F912F910F900FBE0F901F902D
-:1019A00018951F920F920FB60F9211242F933F9309
-:1019B0004F935F936F937F938F939F93AF93BF9357
-:1019C000CF93DF93EF93FF93C091E900CF708091A5
-:1019D000EC00D82FD17080FDD0E81092E900809102
-:1019E000F000877F8093F00078940E94150D10928C
-:1019F000E9008091F00088608093F000CD2BCF70DB
-:101A0000C093E900FF91EF91DF91CF91BF91AF912A
-:101A10009F918F917F916F915F914F913F912F9106
-:101A20000F900FBE0F901F9018951F93CF93DF93C9
-:101A3000CDB7DEB7AA970FB6F894DEBF0FBECDBF05
-:101A4000E9EEF1E08091F100819321E0E13FF207BE
-:101A5000C9F70E9494088091E80083FF24C1809117
-:101A6000E9019091EA01492F50E04A30510508F010
-:101A70001AC1FA01EA5AFF4F0C94C922803881F04A
-:101A8000823809F010C18091ED018F708093E900D8
-:101A90008091EB0085FB882780F91092E90006C051
-:101AA0008091E5019091E601911182609091E800AA
-:101AB000977F9093E8008093F1001092F100C8C0E6
-:101AC000282F2D7F09F0EFC0882319F0823061F0B4
-:101AD000EAC08091EB01813009F0E5C0933009F054
-:101AE00080E08093E6012BC08091EB01811127C03B
-:101AF0008091ED018F7009F4D6C08093E9002091A8
-:101B0000EB0020FF1CC0933021F48091EB00806239
-:101B100014C09091EB0090619093EB0021E030E0D5
-:101B2000A90102C0440F551F8A95E2F74093EA00CD
-:101B30001092EA008091EB0088608093EB00109295
-:101B4000E9008091E800877F86C08111ACC01091C8
-:101B5000EB011F778091E3008078812B8093E30075
-:101B60008091E800877F8093E8000E94320B80918B
-:101B7000E80080FFFCCF8091E30080688093E30061
-:101B8000111102C082E001C083E08093E8018BC0A4
-:101B90008058823008F087C08091EB019091EC0171
-:101BA0008C3D53E0950779F583E08A838AE2898347
-:101BB0004FB7F894DE01139620E03EE051E2E32FA8
-:101BC000F0E050935700E49120FF03C0E295EF70DE
-:101BD0003F5FEF708E2F90E0EA3010F0C79601C0A3
-:101BE000C0968D939D932F5F243149F74FBF80910D
-:101BF000E800877F8093E8006AE270E0CE010196FA
-:101C00000E943E0A14C0AE014F5F5F4F6091ED012C
-:101C10000E948709BC01892B09F445C09091E80016
-:101C2000977F9093E80089819A810E949C0A809115
-:101C3000E8008B778093E80036C08038A1F580916A
-:101C4000E800877F8093E8008091E4018093F100B1
-:101C50008091E8008E778093E8000E94320B23C0C9
-:101C6000811121C08091EB019091EC01992702979D
-:101C7000D4F48091E800877F8093E8008091EB01A5
-:101C80008093E4010E94320B8091E401811106C02F
-:101C90008091E30087FD02C081E001C084E0809371
-:101CA000E8010E9480088091E80083FF0AC08091CB
-:101CB000E800877F8093E8008091EB00806280934A
-:101CC000EB00AA960FB6F894DEBF0FBECDBFDF9132
-:101CD000CF911F9108950895CF938091E8018823B3
-:101CE000A1F0C091E900CF709091EC00892F817034
-:101CF00090FD80E8C82B1092E9008091E80083FDF8
-:101D00000E94150DCF70C093E900CF910895909374
-:101D10006D0180936C010895E0916C01F0916D016B
-:101D2000309721F00190F081E02D099480E0089532
-:101D3000E0916C01F0916D01309721F00280F38108
-:101D4000E02D09940895E0916C01F0916D013097B8
-:101D500021F00480F581E02D0994089520916A0115
-:101D600030916B012817390771F090936B018093C4
-:101D70006A01E0916C01F0916D01309721F00680CD
-:101D8000F781E02D0994089520916801309169014F
-:101D90002817390771F09093690180936801E091E9
-:101DA0006C01F0916D01309721F00084F185E02DF8
-:101DB0000994089508950C94DA0E0E94981A0E94CE
-:101DC0004A040C945E1BCF92DF92EF92FF920F9326
-:101DD0001F93CF93DF93CDB7DEB72B970FB6F89451
-:101DE000DEBF0FBECDBF0E9462048FE6C82E81E029
-:101DF000D82E00E010E0E02E802F0E945805F6015A
-:101E000041916F01F82EF426B1F40F5F1F4F0E3091
-:101E1000110589F78FEF89838A831B820E94A11A9B
-:101E20008160782F9D838C8349815A816B818D815C
-:101E30000E94860F40C09091D00191FF04C08B8713
-:101E40000E945E058B8520E030E04F2D50E0922F00
-:101E5000BA01022E02C0759567950A94E2F760FFF9
-:101E600024C02E83EF8221E030E0690102C0CC0C57
-:101E7000DD1C9A95E2F790E08C219D21892B09F4D5
-:101E800020E028870E94A11A8160782F9A8789878D
-:101E90004E815F8168858A850E94860FF801E1592D
-:101EA000FE4F8081C826C08206C02F5F3F4F26307C
-:101EB000310569F6AACF0E94451E0E948C0E9091B2
-:101EC0006E018917A1F00E948C0E80936E012B96F3
-:101ED0000FB6F894DEBF0FBECDBFDF91CF911F913B
-:101EE0000F91FF90EF90DF90CF900C9482072B968C
-:101EF0000FB6F894DEBF0FBECDBFDF91CF911F911B
-:101F00000F91FF90EF90DF90CF900895CF93DF93E4
-:101F1000CDB7DEB72B970FB6F894DEBF0FBECDBF9F
-:101F20004F83588769877A878B87DE01119686E011
-:101F3000FD0111928A95E9F785E0FE01379601903F
-:101F40000D928A95E1F749815A816B817C818D815F
-:101F50009E810E9489162B960FB6F894DEBF0FBEA5
-:101F6000CDBFDF91CF910895CF93C82F882309F477
-:101F7000C1C0823859F40E948C0E81FDBBC089E338
-:101F80000E9426190E94DE1989E30CC0833879F477
-:101F90000E948C0E80FDAEC083E50E9426190E942F
-:101FA000DE1983E50E946519CF910C94DE198438FF
-:101FB00059F40E948C0E82FD9DC087E40E94261970
-:101FC0000E94DE1987E4EECF8CEF8C0F813A48F443
-:101FD0008C2F0E94852081118DC08C2F0E94261984
-:101FE000E3CF80E28C0F883048F4C77081E001C0F5
-:101FF000880FCA95EAF70E94A719D6CF8BE58C0FF8
-:10200000833078F4C53A29F0C63A31F083E890E09D
-:1020100005C081E890E002C082E890E0CF910C9486
-:10202000AE0E88E58C0F833108F064C0C83A39F1F0
-:10203000C93A41F1CA3A49F1CB3A51F1CC3A59F196
-:10204000CD3A61F1C03B69F1CE3A71F1CF3A79F105
-:10205000C13B81F1C23B89F1C33B91F1C43B99F192
-:10206000C53BA1F1C63BA9F1C73BB1F1C83BB9F1F2
-:10207000C93BC1F1CA3BC9F180E090E038C082EEB3
-:1020800090E035C089EE90E032C08AEE90E02FC03B
-:1020900085EB90E02CC086EB90E029C087EB90E0C8
-:1020A00026C08CEC90E023C08DEC90E020C083E84B
-:1020B00091E01DC08AE891E01AC082E991E017C062
-:1020C00084E991E014C081E292E011C083E292E0E1
-:1020D0000EC084E292E00BC085E292E008C086E286
-:1020E00092E005C087E292E002C08AE292E0CF91DE
-:1020F0000C94C40ECF910895882309F44BC0823804
-:1021000059F40E948C0E81FF45C089E30E94261974
-:102110000E94DE1989E30CC0833871F40E948C0E92
-:1021200080FF38C083E50E9426190E94DE1983E5EE
-:102130000E9465190C94DE19843859F40E948C0EA3
-:1021400082FF28C087E40E9426190E94DE1987E4D6
-:10215000EFCF9CEF980F913A58F390E2980F983098
-:1021600050F4877091E001C0990F8A95EAF7892FA2
-:102170000E94AD19DFCF9BE5980F933020F480E0EB
-:1021800090E00C94AE0E885A833120F480E090E009
-:102190000C94C40E0895882321F00E94A7190C9472
-:1021A000DE190895882321F00E94AD190C94DE19E0
-:1021B0000895BF92CF92DF92EF92FF920F931F93F9
-:1021C000CF93DF9300D000D000D0CDB7DEB77C0135
-:1021D00085E0F701DE01119601900D928A95E1F7F5
-:1021E000F70183819481892B09F4DDC2908181817B
-:1021F0008F3F19F49F3F09F4D6C2F7010281258170
-:1022000022952F7099838A8389819A812E830E94D7
-:10221000E518182FB92E0E94E4180E94AB17EB2D79
-:10222000E295EF704E2F50E0FA01E05AFF4F2E81F9
-:102230000C94C9228B2D807F9B2D9F70F92E8823B3
-:1022400019F0F29480EFF822002349F0FF2009F4FE
-:1022500057C28F2D0E94B7190E94DE1951C2812FDB
-:102260000E947C10FF2009F49EC28F2D0E94BD1990
-:1022700026960FB6F894DEBF0FBECDBFDF91CF918B
-:102280001F910F91FF90EF90DF90CF90BF900C9433
-:10229000DE193B2D307F8B2D8F70303211F08295FF
-:1022A000807F112319F0113021F12CC00023B9F0E7
-:1022B000222309F490C1213009F08DC126960FB672
-:1022C000F894DEBF0FBECDBFDF91CF911F910F916C
-:1022D000FF90EF90DF90CF90BF900C94C71922230E
-:1022E00019F0213009F45FC28E830E94CA198E81D1
-:1022F00086C1002321F0223008F055C26CC12111A3
-:1023000052C27DC1002321F0222309F464C1F8C127
-:10231000222309F474C109C28B2D8695869583709A
-:1023200019F08130D1F03FC2002321F0812F9B2D85
-:10233000937002C080E090E026960FB6F894DEBF5E
-:102340000FBECDBFDF91CF911F910F91FF90EF9006
-:10235000DF90CF90BF900C94AE0E002321F0812F20
-:102360009B2D937002C080E090E026960FB6F89403
-:10237000DEBF0FBECDBFDF91CF911F910F91FF90B8
-:10238000EF90DF90CF90BF900C94C40E812F00236C
-:1023900019F00E944D1D02C00E94B51D26960FB671
-:1023A000F894DEBF0FBECDBFDF91CF911F910F918B
-:1023B000FF90EF90DF90CF90BF900C943A1E8B2D42
-:1023C000837009F075C00111EEC1812F8295869549
-:1023D0008770880F880F912F9F70C92ED12CE12C08
-:1023E000F12C082E04C0CC0CDD1CEE1CFF1C0A9442
-:1023F000D2F714FF12C00FE010E020E030E004C07C
-:10240000000F111F221F331F8A95D2F7C901B8018F
-:10241000609570958095909503C060E070E0CB0169
-:102420004B2D4695469543704230C1F060F56C29BE
-:102430007D298E299F29413051F126960FB6F894B7
-:10244000DEBF0FBECDBFDF91CF911F910F91FF90E7
-:10245000EF90DF90CF90BF900C94D2176C297D291C
-:102460008E299F2926960FB6F894DEBF0FBECDBFEA
-:10247000DF91CF911F910F91FF90EF90DF90CF9060
-:10248000BF900C94EE170E94D217C701B601269692
-:102490000FB6F894DEBF0FBECDBFDF91CF911F9175
-:1024A0000F91FF90EF90DF90CF90BF900C94B617F4
-:1024B000002319F08B2D817001C08695882309F4C3
-:1024C00072C1812F829586958770880F880F912F12
-:1024D0009F70C92ED12CE12CF12C082E04C0CC0CFD
-:1024E000DD1CEE1CFF1C0A94D2F714FF12C00FE093
-:1024F00010E020E030E004C0000F111F221F331F46
-:102500008A95D2F7C901B80160957095809590952C
-:1025100003C060E070E0CB014B2D469546954370BB
-:102520004230C1F060F56C297D298E299F29413008
-:1025300051F126960FB6F894DEBF0FBECDBFDF91E6
-:10254000CF911F910F91FF90EF90DF90CF90BF90B0
-:102550000C94AC186C297D298E299F2926960FB6DC
-:10256000F894DEBF0FBECDBFDF91CF911F910F91C9
-:10257000FF90EF90DF90CF90BF900C94C8180E940E
-:10258000AC18C701B60126960FB6F894DEBF0FBE91
-:10259000CDBFDF91CF911F910F91FF90EF90DF9012
-:1025A000CF90BF900C949018103FD1F118F4103ECA
-:1025B00050F4A1C0123F09F463C008F44CC0133FAB
-:1025C00009F473C098C01F708B2D8F710023A1F088
-:1025D0000E942918812F26960FB6F894DEBF0FBEF1
-:1025E000CDBFDF91CF911F910F91FF90EF90DF90C2
-:1025F000CF90BF900C94CB100E944A18812F269642
-:102600000FB6F894DEBF0FBECDBFDF91CF911F9103
-:102610000F91FF90EF90DF90CF90BF900C94D2106D
-:102620000023A9F02111BFC08B2D8F7126960FB604
-:10263000F894DEBF0FBECDBFDF91CF911F910F91F8
-:10264000FF90EF90DF90CF90BF900C946F182230E6
-:1026500008F0A9C0E9CF0023A9F08B2D8F71269631
-:102660000FB6F894DEBF0FBECDBFDF91CF911F91A3
-:102670000F91FF90EF90DF90CF90BF900C942918AE
-:10268000002359F38B2D8F7126960FB6F894DEBF79
-:102690000FBECDBFDF91CF911F910F91FF90EF90B3
-:1026A000DF90CF90BF900C944A18002399F08B2DA7
-:1026B0008F7126960FB6F894DEBF0FBECDBFDF91A7
-:1026C000CF911F910F91FF90EF90DF90CF90BF902F
-:1026D0000C94141826960FB6F894DEBF0FBECDBF2B
-:1026E000DF91CF911F910F91FF90EF90DF90CF90EE
-:1026F000BF900C940A180023A9F0222309F4ADCF4F
-:10270000812F26960FB6F894DEBF0FBECDBFDF91A6
-:10271000CF911F910F91FF90EF90DF90CF90BF90DE
-:102720000C94B40F222309F4ADCF812F26960FB657
-:10273000F894DEBF0FBECDBFDF91CF911F910F91F7
-:10274000FF90EF90DF90CF90BF900C947C104B2DBA
-:102750004F70612FC7010E94AC0226960FB6F89405
-:10276000DEBF0FBECDBFDF91CF911F910F91FF90C4
-:10277000EF90DF90CF90BF900C942E174B2D4F70A1
-:10278000612FC70126960FB6F894DEBF0FBECDBFEE
-:10279000DF91CF911F910F91FF90EF90DF90CF903D
-:1027A000BF900C941F0626960FB6F894DEBF0FBE9E
-:1027B000CDBFDF91CF911F910F91FF90EF90DF90F0
-:1027C000CF90BF9008950E94C4190E9499190E9449
-:1027D000DE190E94EA1E0E943A1E80E090E00E94EC
-:1027E000AE0E80E090E00C94C40E0E94B4190C94DC
-:1027F000E3130E94E518292F22952F702C3030F416
-:102800002A3048F42250223078F405C02C3041F0B0
-:102810002F3031F009C0803E48F0803F29F406C0D7
-:1028200093FB882780F9089580E0089581E008955A
-:10283000CF93DF9300D000D01F92CDB7DEB70F90BB
-:102840000F900F900F900F90DF91CF910895CF933D
-:10285000DF9300D000D000D0CDB7DEB726960FB6FC
-:10286000F894DEBF0FBECDBFDF91CF9108951F93C7
-:10287000CF93DF93C0917D0116E080917E01C81750
-:1028800099F0D0E01C9FF0011D9FF00D1124E1583C
-:10289000FE4F4081518162817381848195810E94C4
-:1028A00027142196C770E9CFDF91CF911F9108952A
-:1028B0004091AF015091B0016091B1017091B201AE
-:1028C0008091B3019091B4010C9427148091B401CC
-:1028D00082958F7009F054C08091B101882309F46A
-:1028E0004FC080917D01A0917E014091B201509135
-:1028F000B3016091AF017091B001B6E08A1709F49D
-:102900003FC090E041155105C1F17F3F11F46F3F89
-:10291000A1F1B89FF001B99FF00D1124E158FE4FCD
-:10292000218127132AC02081261327C0228121114B
-:1029300024C0238134812417350710F42150310934
-:10294000241B350B283C3105C0F42091B4012F70B5
-:1029500020612093B40126E0289FF001299FF00D0B
-:102960001124EC57FE4F80818F70806180838FEA45
-:1029700091E00E94D9100C94371401968770BECF55
-:102980000895CF92DF92EF92FF920F931F93CF9310
-:10299000DF93CDB7DEB762970FB6F894DEBF0FBEF8
-:1029A000CDBF8C0185E0F801DE011D9601900D92EE
-:1029B0008A95E1F7D8014C9111965C911197129686
-:1029C0006C918091B2019091B301009709F475C1A7
-:1029D0003091AF017091B0017F3F19F43F3F09F48E
-:1029E0006CC1F801C380D480E090B101EE2009F4FD
-:1029F000BEC02091B401C816D90628F0D601A81B84
-:102A0000B90BCD0104C0809590958C0D9D1DFF24C0
-:102A1000F394883C910578F0F12C207F09F0C4C034
-:102A20007C2DD98AC88A89890E9418148FEA91E07E
-:102A30000E94D910AFC0822F807F09F045C0571384
-:102A400013C0431311C061110FC02F702061209378
-:102A5000B4010E9458148FEA91E00E94D91080912D
-:102A6000B401F80185832EC0CD2819F15F3F11F420
-:102A70004F3FF9F0F62E61111CC080917D0120912D
-:102A80007E0136E0821709F45BC090E0389FF001C8
-:102A9000399FF00D1124E158FE4F7181571306C084
-:102AA0007081471303C07281711103C00196877052
-:102AB000E9CFF62E662309F41CC18091B401816030
-:102AC0008093B401F12C15C1571309C0431307C0FB
-:102AD000611105C08091B401F8018583C8C04D879C
-:102AE0005E878D859E856A8B0E94F9136A8988238B
-:102AF000D1F16623C1F12091B401822F82958F70AC
-:102B000090E0029774F08091AF019091B0019887A6
-:102B10008F831986DB86CA862C87CE0107960E9492
-:102B2000D91086E0F801AFEAB1E001900D928A95E4
-:102B3000E1F70E9466140E945814FF24F394D9C050
-:102B40004D875E878D859E850E94E518292F2295E9
-:102B50002F70223008F0C1C09F7009F0BBC0805EAA
-:102B6000883008F4C6C0C8010E94D910E6CFC81644
-:102B7000D90608F453C0F601E81BF90BCF01883CD5
-:102B8000910508F450C0F12C7C2DD98AC88A898916
-:102B90000E941814EFEAF1E086E0DF011D928A95A9
-:102BA000E9F70E945814A5C0571314C0431312C06C
-:102BB000611110C08091B401F8018583C8010E94A1
-:102BC000D91086E0EFEAF1E0DF011D928A95E9F77E
-:102BD000FE2C8FC04D875E878D859E856A8B0E94F7
-:102BE000F9136A89882309F4BECF662309F4BBCFA1
-:102BF0002091B401822F82958F7090E002970CF49F
-:102C000090CF8091AF019091B0019A8389831B820C
-:102C1000DD82CC822E83CE01019681CF8095909566
-:102C20008C0D9D1DACCFF62E662309F49CCF571357
-:102C300033C0431331C02091B40120FD24C0822F42
-:102C400082958F70482F50E041155105E1F0D80171
-:102C500015962C9315974F30510549F08F5F982F9B
-:102C60009295907F822F8F70892B15968C93C80137
-:102C70000E94D91086E0F801AFEAB1E001900D9210
-:102C80008A95E1F78ECF86E0F801AFEAB1E00190D6
-:102C90000D928A95E1F72DC04D875E878D859E85C3
-:102CA0000E94F91381113DCF8091B401816080931E
-:102CB000B401C8010E94D9101CC0662309F453CF87
-:102CC0004D875E878D859E850E94F913882309F4C0
-:102CD0004ACF27CF811143CF0CC0243008F043CF17
-:102CE0009F7009F43CCFD80115969C91907F09F014
-:102CF00036CF8F2D62960FB6F894DEBF0FBECDBFD4
-:102D0000DF91CF911F910F91FF90EF90DF90CF90C7
-:102D100008951F93CF93DF93CDB7DEB72C970FB6EF
-:102D2000F894DEBF0FBECDBF4F83588769877A877F
-:102D30008B879C87CE0107960E94C114882371F06F
-:102D40008A859B85892B09F441C088858F3F09F0CE
-:102D500065C08F818F3F09F061C038C086E0FE01F9
-:102D60003796DE01119601900D928A95E1F76A85FA
-:102D70007B856115710551F1FF81E885EF3F11F405
-:102D8000FF3F21F120917E0130E0C901019687705B
-:102D9000992740917D0150E08417950709F447C0B9
-:102DA000F983EA837D836C8396E0929FD001939FA1
-:102DB000B00D1124A158BE4FFE01319601900D9225
-:102DC0009A95E1F780937E010E94371416E0809176
-:102DD0007D0190917E018917B9F1189FC0011124DE
-:102DE00081589E4F0E94C114882371F1E0917D01AA
-:102DF0001E9FF0011124E158FE4F408151816281F4
-:102E00007381848195810E94271480917D0190E0D7
-:102E100001968770992780937D01D9CF4F8158857E
-:102E200069857A858B859C850E942714CFCF0E9467
-:102E3000F51310927E0110927D01EFEAF1E086E039
-:102E4000DF011D928A95E9F72C960FB6F894DEBF44
-:102E50000FBECDBFDF91CF911F910895EF92FF92EA
-:102E60000F931F93CF93DF938C01892B09F46CC0D0
-:102E7000F12CEE24E394E8012196F8018491843743
-:102E800040F4843008F051C0813081F0823019F173
-:102E90005BC0853709F444C0A8F19CE7980F9037D0
-:102EA00008F052C08F770E947C1041C00E5F1F4F08
-:102EB000FE01849190E2980F983050F48770FE2DB7
-:102EC00001C0FF0F8A95EAF78F2F0E94B71914C02F
-:102ED0000E94B40F2DC00E5F1F4FFE01849190E23F
-:102EE000980F983060F48770FE2D01C0FF0F8A950F
-:102EF000EAF78F2F0E94BD190E94DE1919C00E94A7
-:102F00007C1016C00E5F1F4FFE01C491CC2381F0D0
-:102F10008FE99FE00197F1F700C00000C150F6CFA4
-:102F20000E5F1F4FFE01F49003C00E94B40F8E018C
-:102F30008F2D882309F49FCFEFE9FFE03197F1F758
-:102F400000C000008150F5CFDF91CF911F910F910C
-:102F5000FF90EF90089508956093B9017093BA01BE
-:102F60008093BB019093BC010C94E3130F931F93C8
-:102F70000091B9011091BA012091BB013091BC01BF
-:102F8000DC01CB01802B912BA22BB32B8093B901B9
-:102F90009093BA01A093BB01B093BC011F910F9114
-:102FA0000C94E3130F931F930091B9011091BA0190
-:102FB0002091BB013091BC01DC01CB018023912326
-:102FC000A223B3238093B9019093BA01A093BB01CC
-:102FD000B093BC011F910F910C94E3130F931F93B7
-:102FE0000091B9011091BA012091BB013091BC014F
-:102FF000DC01CB0180279127A227B3278093B90159
-:103000009093BA01A093BB01B093BC011F910F91A3
-:103010000C94E3131092B5011092B6011092B7010F
-:103020001092B8010C94E31341E050E060E070E0CE
-:1030300004C0440F551F661F771F8A95D2F740932F
-:10304000B5015093B6016093B7017093B8010C9429
-:10305000E31341E050E060E070E004C0440F551F0E
-:10306000661F771F8A95D2F78091B5019091B601BE
-:10307000A091B701B091B801482B592B6A2B7B2B3B
-:103080004093B5015093B6016093B7017093B801B6
-:103090000C94E31341E050E060E070E004C0440FA2
-:1030A000551F661F771F8A95D2F7409550956095FA
-:1030B00070958091B5019091B601A091B701B09142
-:1030C000B801482359236A237B234093B5015093C9
-:1030D000B6016093B7017093B8010C94E31341E01B
-:1030E00050E060E070E004C0440F551F661F771F7A
-:1030F0008A95D2F78091B5019091B601A091B70160
-:10310000B091B801482759276A277B274093B5011A
-:103110005093B6016093B7017093B8010C94E31318
-:103120000F931F930091B5011091B6012091B70143
-:103130003091B801DC01CB01802B912BA22BB32B5A
-:103140008093B5019093B601A093B701B093B801F5
-:103150001F910F910C94E3130F931F930091B501EE
-:103160001091B6012091B7013091B801DC01CB017B
-:1031700080239123A223B3238093B5019093B601BA
-:10318000A093B701B093B8011F910F910C94E31372
-:103190000F931F930091B5011091B6012091B701D3
-:1031A0003091B801DC01CB0180279127A227B327FA
-:1031B0008093B5019093B601A093B701B093B80185
-:1031C0001F910F910C94E3130895CF92DF92EF9229
-:1031D000FF920F931F93CF93DF938C01C090B501A3
-:1031E000D090B601E090B701F090B8018091B9019C
-:1031F0009091BA01A091BB01B091BC01C82AD92A13
-:10320000EA2AFB2ACFE1D0E0D701C6010C2E04C088
-:10321000B695A795979587950A94D2F780FF07C032
-:10322000B8018C2F0E9443068130910531F421971B
-:1032300058F7B80180E00E944306DF91CF911F91BB
-:103240000F91FF90EF90DF90CF90089590910C0137
-:103250009923F1F090910D019923D1F0982F969533
-:10326000969596959F3080F5E0910E01F0910F01B3
-:10327000E90FF11D877021E030E0A90102C0440F81
-:10328000551F8A95E2F7CA019181892B81830895A0
-:1032900020910E0130910F01F90132969FEF40E02D
-:1032A0005191851789F09F3F19F4511101C0942F56
-:1032B0004F5F4E30A9F79F3F39F0F901E90FF11D3B
-:1032C00097FDFA9582830895089590910C019923B2
-:1032D000F9F090910D019923D9F0982F9695969534
-:1032E00096959F3028F5E0910E01F0910F01E90FBE
-:1032F000F11D877021E030E0A90102C0440F551F85
-:103300008A95E2F7CA018095918189238183089586
-:1033100020910E0130910F01F9013296205F3F4F4D
-:103320009081891301C010823196E217F307C1F72B
-:10333000089581E090E0E0910E01F0910F01E80F17
-:10334000F91F1082019680319105A9F70895909197
-:10335000CF01892B8093CF01089580959091CF0163
-:1033600089238093CF0108951092CF010895909101
-:10337000CE01892B8093CE01089580959091CE0146
-:1033800089238093CE0108951092CE0108958093F1
-:10339000BD0108951092BD01089580910E01909194
-:1033A0000F01FC0131969C01205F3F4F80E091911D
-:1033B00091118F5FE217F307D1F70895E0910E01A5
-:1033C000F0910F018091CF018083E0910E01F09187
-:1033D0000F0190818091CE01892B80838091BD0166
-:1033E000882361F0E0910E01F0910F019081892B0B
-:1033F00080830E94CD1981111092BD0180910E0130
-:1034000090910F010C94980ECF92DF92EF92FF9261
-:103410006C01EE24FF24C114D104E104F10421F075
-:10342000C701B60120E101C020E0C72ED82EE92E49
-:10343000FF24C114D104E104F10419F0285FC7018D
-:10344000B6016B017C0154E0F694E794D794C794DD
-:103450005A95D1F7C114D104E104F10419F02C5F9D
-:10346000C701B6016B017C0142E0F694E794D79462
-:10347000C7944A95D1F7C114D104E104F10419F0BD
-:103480002E5FC701B601DC01CB01B695A7959795D4
-:103490008795892B8A2B8B2B09F02F5F822FFF902A
-:1034A000EF90DF90CF9008958091E801843011F182
-:1034B00020E488E190E00FB6F894A895809360002E
-:1034C0000FBE2093600083B7817F846083BF83B782
-:1034D000816083BF7894889583B78E7F83BF0FB652
-:1034E000F894A895809160008861809360001092A4
-:1034F00060000FBE089508950C947B1ACF930E942C
-:103500007C1A0E9462040E947B1AC0E08C2F0E94E9
-:103510005805811104C0CF5FCE30C1F701C081E0F2
-:10352000CF9108950E94F5130E948C0E0C9482078F
-:1035300082E084BD93E095BD9AEF97BD80936E00C5
-:1035400008952FB7F8948091D1019091D201A09164
-:10355000D301B091D4012FBF0895CF92DF92EF92A3
-:10356000FF920F931F932FB7F8944091D101509180
-:10357000D2016091D3017091D4012FBF6A017B0108
-:10358000EE24FF248C0120E030E0C016D106E206D4
-:10359000F30610F4415051099A01281B390BC90157
-:1035A0001F910F91FF90EF90DF90CF9008951F92A1
-:1035B0000F920FB60F9211248F939F93AF93BF93E7
-:1035C0008091D1019091D201A091D301B091D40109
-:1035D0000196A11DB11D8093D1019093D201A093BA
-:1035E000D301B093D401BF91AF919F918F910F9070
-:1035F0000FBE0F901F9018950E94840BF8942FEF28
-:1036000087EA91E6215080409040E1F700C0000039
-:1036100087E090EBDC018093F1019093F201A0939D
-:10362000F301B093F4019CE088E10FB6F894A895FB
-:10363000809360000FBE90936000FFCFEF92FF92E7
-:103640000F931F93CF93DF93D82FC0E08C2F0E944E
-:10365000580500E010E0E82EF12CC701002E02C052
-:10366000959587950A94E2F780FD06C00F5F1F4F7E
-:103670000630110591F709C0602F7C2F80E00E9471
-:1036800020068D13F3CF81E004C0CF5FCE30F1F67A
-:1036900080E0DF91CF911F910F91FF90EF900895FF
-:1036A000CF93C82F8CE20E941E1B882321F08C2F01
-:1036B000CF910C941E1B80E0CF910895CF930E9470
-:1036C000A51C811102C00E948B1CC5E6C15049F0A7
-:1036D0000E9462048FE39CE90197F1F700C00000AB
-:1036E000F5CF89E20E94501B811113C18AE20E942A
-:1036F000501B81110E948B1C85E00E94501B811180
-:103700000E94FC1A0E94B01C8093D00187E00E94A6
-:10371000501B8823A9F18BE10E94501B882351F094
-:103720008091D00181FB222720F991E0922790FB24
-:1037300081F90EC08EE00E94501B882361F08091B9
-:10374000D00182FB222720F991E0922790FB82F999
-:103750008093D00115C080E10E94501B9091D00150
-:10376000882341F093FB222720F981E0822780FB08
-:1037700093F904C0892F809580FB90F99093D00134
-:103780008091D0010E94B41C0E94C21C8093E2016F
-:1037900080EE0E94501B882341F08091E201982F17
-:1037A000909590FB80F98093E20189E30E94501B81
-:1037B000882359F08091E20181FB222720F991E0D2
-:1037C000922790FB81F98093E20182EE0E94501BC8
-:1037D000882359F08091E20182FB222720F991E0B1
-:1037E000922790FB82F98093E20186EE0E94501BA3
-:1037F000882359F08091E20183FB222720F991E090
-:10380000922790FB83F98093E20183EE0E94501B84
-:10381000882359F08091E20184FB222720F991E06E
-:10382000922790FB84F98093E20185E30E94501B6C
-:10383000882359F08091E20185FB222720F991E04D
-:10384000922790FB85F98093E20181E30E94501B4F
-:10385000882359F08091E20186FB222720F991E02C
-:10386000922790FB86F98093E20181E10E94501B30
-:10387000882359F08091E20187FB222720F991E00B
-:10388000922790FB87F98093E2018091E2010E94E8
-:10389000C61C8091E20187FB882780F980930D0187
-:1038A00087E20E94501BC82F8EE10E94501B81119D
-:1038B000C2608FE10E94501B8111C46080E20E94AF
-:1038C000501B8111C86081E20E94501B8111C061B0
-:1038D00082E20E94501B8111C06283E20E94501B51
-:1038E0008111C06484E20E94501B882311F0C068DB
-:1038F00002C0CC2329F08C2F0E94BD1C6C2F03C06A
-:103900000E94B91C682F70E080E090E0CF910C9489
-:10391000AC17CF9108956DEE7EEF80E090E00E94AD
-:10392000FF2260E082E090E00E94F12260E083E00C
-:1039300090E00E94F12260E084E090E00E94F12299
-:1039400060E085E090E00C94F12280E090E00E943D
-:10395000EB2221E08D3E9E4F09F020E0822F08955A
-:1039600082E090E00C94E322682F82E090E00C94D7
-:10397000F12283E090E00C94E322682F83E090E052
-:103980000C94F12284E090E00C94E322682F84E010
-:1039900090E00C94F1228091D70180FF0BC06091E0
-:1039A000130185E0689FB0011124759567957595A1
-:1039B00067952BC081FF09C06091130185E0689F66
-:1039C000B00111247595679520C082FF07C06091F2
-:1039D000130185E0689FB001112417C09091D801B0
-:1039E0009923D1F060911201961788F72091130165
-:1039F00085E0289F90011124929FA001939F500D74
-:103A0000112470E0CA010E94B5226038710540F4AB
-:103A10006115710519F406C065E070E0862F089500
-:103A20008FE7089581E008958091D70180FF08C055
-:103A30006091110170E0759567957595679521C046
-:103A400081FF06C06091110170E07595679519C0FE
-:103A500082FF04C06091110170E010C09091D80104
-:103A6000992399F0609110019617A0F780911101A8
-:103A7000899FC001112470E00E94B5226038710551
-:103A800040F46115710519F406C061E070E0862FFD
-:103A900008958FE7089581E00895803F21F40E9402
-:103AA000CB1C819504C0813F29F40E94CB1C8093DC
-:103AB000DB010895823F21F40E94CB1C819504C054
-:103AC000833F29F40E94CB1C8093DA010895893F3B
-:103AD00019F40E94141D05C08A3F31F40E94141D80
-:103AE00081958093DC0108958B3F21F40E94141D81
-:103AF000819504C08C3F29F40E94141D8093DD0140
-:103B00000895843F21F48091D901816017C0853FD9
-:103B100021F48091D901826011C0863F21F4809107
-:103B2000D90184600BC0873F21F48091D90188605E
-:103B300005C0883F31F48091D90180618093D9011B
-:103B400008958D3F21F48091D70181600BC08E3F95
-:103B500021F48091D701826005C08F3F29F48091C4
-:103B6000D70184608093D7010895803F39F4809114
-:103B7000DB0187FF6CC01092DB0169C0813F29F433
-:103B80008091DB011816BCF362C09091DA01823F8C
-:103B900029F497FF5CC01092DA0159C0833F19F4F1
-:103BA0001916CCF354C0893F41F48091DC011816FA
-:103BB0000CF04DC01092DC014AC08A3F29F480917C
-:103BC000DC0187FF44C0F6CF8B3F39F48091DD01E3
-:103BD00087FF3DC01092DD013AC08C3F29F48091EF
-:103BE000DD011816BCF333C0843F21F48091D90164
-:103BF0008E7F17C0853F21F48091D9018D7F11C040
-:103C0000863F21F48091D9018B7F0BC0873F21F43F
-:103C10008091D901877F05C0883F31F48091D90117
-:103C20008F7E8093D90113C08D3F21F48091D701FD
-:103C30008E7F0BC08E3F21F48091D7018D7F05C010
-:103C40008F3F29F48091D7018B7F8093D70180919A
-:103C5000DA0181110EC08091DB0181110AC08091CF
-:103C6000DC01811106C08091DD01811102C010923A
-:103C7000D801089589ED91E00E94A30E0E94A11A37
-:103C80009093D6018093D50108951F93CF93DF932E
-:103C90008091D5019091D6010E94AD1AAC0190910E
-:103CA000D801992321F02091140130E006C0209121
-:103CB00015018AE0289F900111244217530708F448
-:103CC00085C08091DA01C091DB01D091DC011091B7
-:103CD000DD01811107C0C11175C0D11173C011116F
-:103CE00071C074C09F3F19F09F5F9093D801181660
-:103CF00024F40E94CB1C8093DA018091DA0187FFC3
-:103D000005C00E94CB1C81958093DA011C1624F417
-:103D10000E94CB1C8093DB018091DB0187FF05C0F3
-:103D20000E94CB1C81958093DB016091DA016623B0
-:103D300031F1C091DB01CC2311F1062E000C770B81
-:103D4000880B990B0E94BC2123E333E343E35FE339
-:103D50000E9420220E9484216093DA016C2FCC0FF4
-:103D6000770B880B990B0E94BC2123E333E343E3D9
-:103D70005FE30E9420220E9484216093DB011D16D4
-:103D800024F40E94141D8093DC018091DC0187FFE4
-:103D900005C00E94141D81958093DC01111624F446
-:103DA0000E94141D8093DD018091DD0187FF05C015
-:103DB0000E94141D81958093DD01DF91CF911F91A9
-:103DC0000C943A1E9F3F09F08FCFA0CFDF91CF9187
-:103DD0001F910895E9EDF1E085E0DF011D928A95DC
-:103DE000E9F71092D8011092D7010895833081F13C
-:103DF00028F4813059F08230D1F00895853009F4EB
-:103E000049C0B8F1863009F456C008958091150173
-:103E1000262F30E0280F311D2F3F310524F4680F85
-:103E20006093150108958FEF809315010895809197
-:103E30001401262F30E0280F311D2F3F310524F4C7
-:103E4000680F6093140108958FEF80931401089513
-:103E500080911301262F30E0280F311D2F3F3105AF
-:103E600024F4680F6093130108958FEF809313017A
-:103E7000089580911201262F30E0280F311D2F3F29
-:103E8000310524F4680F6093120108958FEF809339
-:103E90001201089580911101262F30E0280F311D65
-:103EA0002F3F310524F4680F6093110108958FEFBF
-:103EB00080931101089580911001262F30E0280F82
-:103EC000311D2F3F310524F4680F609310010895D0
-:103ED0008FEF809310010895833011F128F4813021
-:103EE00049F0823091F00895853081F120F18630DB
-:103EF000C1F1089580911501681720F4861B809305
-:103F00001501089510921501089580911401681704
-:103F100020F4861B809314010895109214010895D3
-:103F200080911301681720F4861B80931301089574
-:103F300010921301089580911201681720F4861BD6
-:103F40008093120108951092120108958091110139
-:103F5000681720F4861B80931101089510921101B7
-:103F6000089580911001681720F4861B809310013A
-:103F700008951092100108950F931F938D3109F445
-:103F80006BC008F03FC08E3009F47DC0C0F48730AC
-:103F900009F46EC068F4863009F0AFC08091D0019A
-:103FA000817F8E7F8093D00181E08093DF01A6C066
-:103FB000883009F458C08B3009F49BC09EC086310C
-:103FC00009F497C078F4803109F470C0813109F0A8
-:103FD00094C00E94F51390910D0181E08927809390
-:103FE0000D0187C0893109F484C08B3109F085C087
-:103FF0008091D00181FB222720F991E0922790FB4C
-:1040000081F94AC0853309F45BC048F4873209F46A
-:1040100057C008F45AC0893209F452C06EC08334C4
-:1040200038F48A3308F067C0883309F462C065C089
-:10403000833409F445C0883409F05FC00E94F51349
-:104040000FEF13ED20E3015010402040E1F700C0D6
-:1040500000000E94FC1A4DC00E943E210E948C0E5E
-:104060000E94820746C00E94B01C0E94C21C41C030
-:104070009091D001892F817090FF12C0917F9E7F17
-:104080009093D0013BC08091D00182FB222720F980
-:1040900091E0922790FB82F98093D001992349F116
-:1040A0008091D00181608093D00123C08091D001A4
-:1040B00083FB222720F991E0922790FB83F9ECCF34
-:1040C00061E070E080E090E010C08D5141E050E090
-:1040D00060E070E08A019B0104C0000F111F221FE5
-:1040E000331F8A95D2F7C901B8010E94AC170E940C
-:1040F000F51381E003C08953E9CF80E01F910F9150
-:10410000089580E008950C948120CF93C82F80916A
-:10411000DF01813079F018F08230E9F187C0E09159
-:104120000E01F0910F018081813169F0823209F036
-:104130007FC009C0E0910E01F0910F0180818131B3
-:1041400011F0823261F48C2F0E948320811104C00F
-:104150008C2F0E94BC1F1DC081E090E01AC08C2FE4
-:104160000E948120811114C0C43179F048F4CB3011
-:1041700079F0C03109F060C082E08093DF0108C0AF
-:10418000C93219F0C83321F057C01092DF0154C072
-:1041900081E0817053C0C93289F118F5C43171F1E1
-:1041A000A8F4C73009F046C08AE08093150194E175
-:1041B0009093140193E0909313018093120188E08F
-:1041C0008093110188E28093100134C0CE51C63033
-:1041D00088F5EC2FF0E0E65DFE4F80818093DE01F4
-:1041E00029C0CE34E9F020F4CB3421F56AE013C0C5
-:1041F000C13579F0C235F1F461E00DC08091DE0186
-:10420000882319F01092DE0115C081E08093DF0150
-:1042100015C061E006C08091DE010E94F61E0AC052
-:104220006AE08091DE010E946C1F04C01092DF01E1
-:1042300080E004C081E002C080E0ABCFCF91089560
-:10424000E1E8F0E080818860808380818160808304
-:104250008FB7F89493E09093890090ED9093880045
-:104260008FBF0895EFE6F0E080818260808308953B
-:10427000EFE6F0E080818D7F80830895EFE6F0E047
-:10428000908182E08927808308951F920F920FB654
-:104290000F9211242F933F934F935F936F937F93CC
-:1042A0008F939F93AF93BF93EF93FF938091E00120
-:1042B0009091E10101969093E1018093E0018111D9
-:1042C00003C082E00E948207E091E101E695E69555
-:1042D000F0E0EA57FB4FE4918091E0018E1303C0B8
-:1042E00080E00E948207FF91EF91BF91AF919F9173
-:1042F0008F917F916F915F914F913F912F910F908F
-:104300000FBE0F901F9018950E948B216894B111D9
-:104310000C941A2208950E94FF2188F09F5798F06C
-:10432000B92F9927B751B0F0E1F0660F771F881FBA
-:10433000991F1AF0BA95C9F714C0B13091F00E94D4
-:104340001922B1E008950C941922672F782F88273D
-:10435000B85F39F0B93FCCF3869577956795B395FB
-:10436000D9F73EF490958095709561957F4F8F4F6A
-:104370009F4F0895E89409C097FB3EF4909580956F
-:10438000709561957F4F8F4F9F4F9923A9F0F92F1B
-:1043900096E9BB279395F695879577956795B79599
-:1043A000F111F8CFFAF4BB0F11F460FF1BC06F5F7F
-:1043B0007F4F8F4F9F4F16C0882311F096E911C091
-:1043C000772321F09EE8872F762F05C0662371F0B2
-:1043D00096E8862F70E060E02AF09A95660F771FC6
-:1043E000881FDAF7880F9695879597F9089557FDF6
-:1043F0009058440F551F59F05F3F71F04795880F53
-:1044000097FB991F61F09F3F79F0879508951216E9
-:1044100013061406551FF2CF4695F1DF08C0161695
-:1044200017061806991FF1CF869571056105089446
-:104430000895E894BB2766277727CB0197F908955D
-:104440000E9433220C94A4220E94962238F00E94EB
-:104450009D2220F0952311F00C948D220C94932230
-:1044600011240C941A220E94F72170F3959FC1F336
-:10447000950F50E0551F629FF001729FBB27F00D12
-:10448000B11D639FAA27F00DB11DAA1F649F662767
-:10449000B00DA11D661F829F2227B00DA11D621FB6
-:1044A000739FB00DA11D621F839FA00D611D221F70
-:1044B000749F3327A00D611D231F849F600D211D54
-:1044C000822F762F6A2F11249F5750409AF0F1F0D7
-:1044D00088234AF0EE0FFF1FBB1F661F771F881F40
-:1044E00091505040A9F79E3F510580F00C948D22C9
-:1044F0000C941A225F3FE4F3983ED4F386957795A7
-:104500006795B795F795E7959F5FC1F7FE2B880FE5
-:10451000911D9695879597F9089597F99F6780E87B
-:1045200070E060E008959FEF80EC089500240A9405
-:104530001616170618060906089500240A9412167E
-:104540001306140605060895092E0394000C11F4B1
-:10455000882352F0BB0F40F4BF2B11F460FF04C05E
-:104560006F5F7F4F8F4F9F4F089597FB072E16F475
-:10457000009407D077FD09D00E94CF2207FC05D018
-:104580003EF4909581959F4F0895709561957F4F6A
-:104590000895EE0FFF1F0590F491E02D0994AA1BDA
-:1045A000BB1B51E107C0AA1FBB1FA617B70710F01E
-:1045B000A61BB70B881F991F5A95A9F78095909550
-:1045C000BC01CD010895F999FECF92BD81BDF89A45
-:1045D000992780B50895A8E1B0E042E050E00C943E
-:1045E0000623262FF999FECF1FBA92BD81BD20BDAB
-:1045F0000FB6F894FA9AF99A0FBE019608950E94A0
-:10460000F122272F0C94F222DC01CB01FC01F99955
-:10461000FECF06C0F2BDE1BDF89A319600B40D920E
-:0C46200041505040B8F70895F894FFCFC7
-:10462C00200283071308EE07BA0786070101BE01B3
-:10463C0028080A03140A3F4D36394704FA03C40309
-:10464C008B031E03370350036903010203040506A1
-:04465C000708090042
+:100000000C9478020C94BF020C94BF020C94BF02B3
+:100010000C94BF020C94BF020C94BF020C94BF025C
+:100020000C94BF020C94BF020C94C10D0C94930E5F
+:100030000C94BF020C94BF020C94BF020C94BF023C
+:100040000C94BF020C949F220C94BF020C94BF022C
+:100050000C94BF020C94331C0C94BF020C94BF028E
+:100060000C94BF020C94BF020C94BF020C94BF020C
+:100070000C94BF020C94BF020C94BF020C94BF02FC
+:100080000C94BF020C94BF020C94BF020C94BF02EC
+:100090000C94BF020C94BF020C94BF020C94BF02DC
+:1000A0000C94BF020C94BF020C94BF02000F220FED
+:1000B0001010220F1010670F8A0F1010DF0FF20FB1
+:1000C000C112C112F012F0122613461377147714DE
+:1000D00051137714011401146814771477147114F0
+:1000E0000E140E140E140E140E140E140E140E1400
+:1000F0000E140E140E140E140E140E140E140E14F0
+:1001000020142D1434143B14451429002B00E00056
+:10011000E100357100001E00140004001D006400A1
+:10012000E3001F001A0016001B000000025220000E
+:1001300008000700060000002C002100150009003F
+:100140001900E2001151220017000A00050000000A
+:10015000460023001C0000000B00000046002300A6
+:100160000A00000005000000007524001C000B00C0
+:10017000110000000075250018000D001000E600B9
+:10018000115126000C000E0036002F002C00270015
+:1001900012000F003700300001522D001300330011
+:1001A00038000000E7002A0028002800E50034712C
+:1001B0000000010001000100010001000000010039
+:1001C0001E02200222020100010001001F02210282
+:1001D00023020100010001002F0226022F0001006E
+:1001E000010001003002270230000100125101001D
+:1001F000310235003502000001000100010000005D
+:1002000001000000010001000100000001000000E9
+:1002100001000100010001000100000001000000D8
+:100220005F005C00590062001251540060005D00E4
+:100230005A0062000100550061005E005B0063002F
+:1002400001005600570057005800580001002E00CA
+:100250003200340001000100000001000100010033
+:100260000100010000003A004A005000F400F200D2
+:1002700001003B0052005100F000F10001003C0081
+:100280004D004F00F500F30001003D0049004C0017
+:100290000100010010513E004B004E000100000023
+:1002A00001003F00010000000100000001004000CB
+:1002B00001000000010000000100410001000100F8
+:1002C00001000000010042000100B600AC00AA00DD
+:1002D0001051430049004C00AE00A800010044004A
+:1002E0000100B700AB00A9000100450001000100BA
+:1002F00001000100010001000100010001000100F6
+:10030000000016034500720067006F0044006F0094
+:100310007800200045005A000000160345007200D6
+:1003200067006F0044006F007800200045005A000D
+:1003300000000403090409026D00040100A0FA0989
+:100340000400000103010100092111010001223F05
+:10035000000705810308000A0904010001030102E6
+:1003600000092111010001224D0007058203080048
+:100370000A09040200010300000009211101000123
+:100380002236000705830308000A0904030001035D
+:100390000000000921110100012239000705840332
+:1003A0001000011201100100000008EDFE0713010A
+:1003B000000102000105010906A101050719E02954
+:1003C000E715002501950875018102050819012925
+:1003D00005950575019102950175039101050719B0
+:1003E00000297715002501957875018102C0050166
+:1003F0000980A101850216010026B7001A01002A12
+:10040000B700751095018100C0050C0901A1018597
+:1004100003160100269C021A01002A9C0275109501
+:10042000018100C005010902A1010901A10005091E
+:100430001901290515002501950575018102950110
+:10044000750381010501093009311581257F950268
+:100450007508810609381581257F95017508810683
+:10046000050C0A38021581257F950175088106C0A3
+:10047000C005010906A101050719E029E7150025B6
+:10048000019508750181029501750881010508191A
+:1004900001290595057501910295017503910105E5
+:1004A00007190029FF150025FF950675088100C072
+:1004B0000000000000000000000000010204060A25
+:1004C0000F17202C3A4A5D71879DB3C7DAE9F5FC16
+:1004D000FFFCF5E9DAC7B39D87715D4A3A2C201716
+:1004E0000F0A0604020100000000000000000000E6
+:1004F00011241FBECFEFDAE0DEBFCDBF04B603FE8E
+:1005000027C08091FF0190910002A0910102B0915B
+:1005100002028730904BA740B04BD1F41092FF01FC
+:1005200010920002109201021092020214BE84B7CF
+:10053000877F84BF0FB6F894A8958091600088618A
+:1005400080936000109260000FBEE0E0FFE3099529
+:1005500011E0A0E0B1E0EAEEF8E402C005900D92EF
+:10056000A433B107D9F721E0A4E3B1E001C01D92A3
+:10057000AF3FB207E1F70E94020B0C9473240C9476
+:10058000000061110BC0FC018281882321F085EEFF
+:100590000E94651103C085EE0E942D1280E090E05C
+:1005A00008950895EF92FF921F93CF93DF93609188
+:1005B000C1017091C2018091C3019091C4010E9458
+:1005C000621B56985E9821E030E0E82FF0E0AF0122
+:1005D0004C5C5E4F7A01A1E0B0E0122F821308C09C
+:1005E000AF01E701988161E09F3F69F460E00BC0D3
+:1005F000A901B9016C5C7E4FEB01988161E091111A
+:1006000001C060E06195960FBA016C5C7E4FEB0112
+:1006100098834C5F5F4F992321F194B1ED0102C0A3
+:10062000CC0FDD1F4A95E2F7AE019C2B94B995B132
+:10063000492B45B9EB01488150E02130310529F4BF
+:1006400050938900409388001AC0123029F45093C7
+:100650008B0040938A0013C050938D0040938C0010
+:100660000EC094B1BD0102C0660F771F4A95E2F734
+:10067000AB014095942394B995B1492345B92F5FB7
+:100680003F4F2430310509F0A8CFDF91CF911F9162
+:10069000FF90EF9008950C94D20256985E9825989A
+:1006A0002D9826982E9827982F988FEF90E090936A
+:1006B00089008093880090938B0080938A009093A8
+:1006C0008D0080938C00259A2D9A2FEF80E792E081
+:1006D000215080409040E1F700C00000269A2E9AF9
+:1006E0002FEF80E792E0215080409040E1F700C07A
+:1006F0000000279A2F9A2FEF80E792E02150804048
+:100700009040E1F700C0000025982D982FEF80E77A
+:1007100092E0215080409040E1F700C00000269810
+:100720002E982FEF80E792E0215080409040E1F733
+:1007300000C0000027982F9856985E9825982D980D
+:1007400026982E9827982F98089589EA80938000FC
+:1007500089E08093810024982C983F988AB18F7407
+:100760008AB96E98479A8BB1806B8BB9769A0E9442
+:100770004D030C94D10280E28093000180913801F6
+:1007800081110EC00E940A0481E0809338012FEF8E
+:1007900083ED90E3215080409040E1F700C00000DD
+:1007A00080E40E9410048093000181112EC00E94F9
+:1007B0003A0480930001811128C00E943A0480937A
+:1007C0000001811122C08FE30E943A04809300014E
+:1007D00081111BC00E94320480E40E9410048093A7
+:1007E0000001811112C08CE00E943A048093000144
+:1007F00081110BC00E943A0480930001811105C051
+:100800008FE30E943A04809300010E943204809199
+:10081000000108951092B9008AE08093B80008950D
+:1008200094EA9093BC009091BC0097FFFCCF90910C
+:10083000B900987F983021F0903111F081E008954F
+:100840008093BB0084E88093BC008091BC0087FF4C
+:10085000FCCF8091B900887F883111F0803471F726
+:1008600080E0089584E98093BC008091BC0084FD01
+:10087000FCCF08958093BB0084E88093BC008091F6
+:10088000BC0087FFFCCF9091B900987F81E098323F
+:1008900009F480E0089584E88093BC008091BC0056
+:1008A00087FFFCCF8091BB000895809100018111EA
+:1008B00015C080E40E9410048093000181110CC0D7
+:1008C00082E10E943A0480930001811105C08FEFFC
+:1008D0000E943A04809300010E94320484B1807F18
+:1008E00084B985B1807F85B98AB1837F8AB98BB19C
+:1008F000837F8BB93E98469808950E94BB038093EE
+:1009000000010E94550480B38C7080BB81B3836F5B
+:1009100081BBAAE3B1E0E8E4F1E08EE08E0F119232
+:100920001D928E13FCCF0C94A503BF92CF92DF9241
+:10093000EF92FF920F931F93CF93DF93809100016B
+:10094000882379F0809139018F5F8093390181117B
+:1009500008C00E94BB0380930001811102C00E9465
+:100960004D030AE311E0C0E0D0E0DD24D39482E03F
+:10097000C82EEE24E394F12CC730D10500F5809108
+:100980000001811164C080E40E9410048093000182
+:10099000811112C082E10E943A048093000181110A
+:1009A0000BC0C7010C2E01C0880F0A94EAF780958E
+:1009B0000E943A04809300010E94320448C0CA3069
+:1009C000A1F028F4C83059F0C93061F005C0CC302E
+:1009D00089F070F0CD3089F0209A289810C0219AC3
+:1009E00029980DC0229A2A980AC0239A2B9807C0EA
+:1009F000529A01C0539A5B9802C03E9A469890EA78
+:100A00009A95F1F79FB1799902C082E001C080E028
+:100A100091709D25982B7C9902C084E001C080E0F4
+:100A2000892B7D9902C038E001C030E0832B7E998C
+:100A300002C020E101C020E0822B9FB19095991F58
+:100A40009927991F9295990F907E892B0FC08091BD
+:100A50000001811149C080E40E94100480930001CC
+:100A6000882379F1B12C0E9432048B2DF8019081FA
+:100A7000981719F08083C09201010E9455042196B5
+:100A80000F5F1F4FCE30D10509F076CF8091010165
+:100A9000882361F1815080930101882339F08FE927
+:100AA0009FE00197F1F700C0000020C0A8E4B1E08A
+:100AB000EAE3F1E0CF01825F91919D938E13FCCF29
+:100AC00015C083E10E943A04809300018111CACFCE
+:100AD00081E40E941004809300018111C3CF0E9421
+:100AE0004B04B82EB094BFCF80E0C0CF0E944B0320
+:100AF00081E0DF91CF911F910F91FF90EF90DF90F8
+:100B0000CF90BF900895E82FF0E0E85BFE4F808122
+:100B1000089508950F931F93CF93DF93C8E4D1E016
+:100B200010E00C2F025F899190E00E94561B180F75
+:100B30000C13F9CF812FDF91CF911F910F91089561
+:100B400081E0089581E008950C94A20508950F9323
+:100B50001F93CF93DF938C01FC01C081D181CE0123
+:100B60000E94DB19BE010E945006EC01B8010E94F0
+:100B7000A405882309F48DC0F8018281882309F433
+:100B80004AC08091610181111FC0C431F0E5DF07C7
+:100B900009F051C00E94A60581E0809361010E9486
+:100BA000FD1B9093600180935F0110925801109299
+:100BB0005A011092590110925C0110925B0110923F
+:100BC0005E0110925D0165C080915F0190916001AE
+:100BD0000E94091C883C910570F480915801E82F0F
+:100BE000F0E0EE0FFF1FE75AFE4FD183C0838F5F07
+:100BF000809358014EC0C43880E5D80721F0C5382D
+:100C0000D04501F13AC0F8018281882341F0109269
+:100C1000560182E01EC0C438E0E5DE0759F5809138
+:100C20005601811106C086E20E94651186E20E948B
+:100C30002D1282E01CC0C438F0E5DF0741F3C5384F
+:100C4000D045D9F4F8018281882331F01092570100
+:100C500080E20E947C121DC080915701811106C064
+:100C600087E20E94651187E20E942D1280E20E94B5
+:100C700083120FC0C538D04529F381E08093560117
+:100C800080935701C801DF91CF911F910F910C9470
+:100C9000A00580E0DF91CF911F910F9108950895F5
+:100CA00096E0799FF001112494E5899FE00DF11DF4
+:100CB0001124E60FF11DEE0FFF1FE65FFE4F859139
+:100CC00094910895880F991FFC01E657F040859193
+:100CD00094910895880F991FFC01E65FFE4F85915E
+:100CE000949108950F931F93CF93DF93EC01811597
+:100CF000904350F5C11580E2D80708F0C3C0CB3B44
+:100D0000D10590F4C83AD10508F06AC0C53AD105BA
+:100D100008F05BC0C430D10508F0D0C1219709F0BC
+:100D2000CAC101E010E00AC2CF3FD10511F008F0BE
+:100D3000C5C1C03FD10508F0A2C0CE01805E9109B7
+:100D4000089708F4BBC1B7C1C13090E5D90709F4D1
+:100D5000A2C020F5C0318FE4D80770F4C11590E42B
+:100D6000D90708F094C0C11521E3D20708F0A3C148
+:100D7000DD278E01106CE2C1C115D04509F09BC181
+:100D80000E94E2148FEF94E32CE0815090402040C9
+:100D9000E1F700C000000E94581CD0C1C11597E5C2
+:100DA000D90758F4C03121E5D20708F01CC1C4317D
+:100DB00080E5D80708F475C07EC1CE019057811533
+:100DC000904108F078C1DF7073C1C53AD10509F4CC
+:100DD00077C1C63AD10509F076C102E810E4AEC188
+:100DE000C83AD10509F472C1C93AD10509F471C1F3
+:100DF000CA3AD10509F470C1CB3AD10509F46FC1E3
+:100E0000CC3AD10509F46EC1CD3AD10509F46DC1D2
+:100E1000C03BD10509F46CC1CE3AD10509F46BC1D0
+:100E2000CF3AD10509F46AC1C13BD10509F469C1C2
+:100E3000C23BD10509F468C1C33BD10509F467C1C0
+:100E4000C43BD10509F466C1C53BD10509F465C1B0
+:100E5000C63BD10509F464C1C73BD10509F463C1A0
+:100E6000C83BD10509F462C1C93BD10509F461C190
+:100E7000CA3BD10509F460C100E014E45FC18E01F2
+:100E800010655CC1CE019F700E946A0658C1DF7078
+:100E90008E01106A53C18091DE0181608093DE0172
+:100EA0004DC10E94FD1D811102C00E94E31D0E94E0
+:100EB0001A1E90E09093FF018093FE01C23080E5FE
+:100EC000D80721F48091FE01816086C0C43090E58E
+:100ED000D90721F48091FE0182607EC0C63020E5F2
+:100EE000D20721F48091FE01846076C0C83080E58D
+:100EF000D80719F48091FE0127C0CA3090E5D907C0
+:100F000021F48091FE01806167C0CC3020E5D207DA
+:100F100021F48091FE0180625FC0CE3080E5D80769
+:100F200021F48091FE01806457C0C03190E5D9075B
+:100F300021F48091FE0180684FC0C23120E5D207C4
+:100F400029F48091FE018460886046C0C33080E54A
+:100F5000D80721F48091FE018E7F3EC0C53090E518
+:100F6000D90721F48091FE018D7F36C0C73020E57E
+:100F7000D20721F48091FE018B7F2EC0C93080E51D
+:100F8000D80719F48091FE0126C0CB3090E5D9072F
+:100F900021F48091FE018F7E1FC0CD3020E5D20765
+:100FA00021F48091FE018F7D17C0CF3080E5D807F6
+:100FB00021F48091FE018F7B0FC0C13190E5D907EC
+:100FC00021F48091FE018F7707C0C331D04531F401
+:100FD0008091FE018B7F877F8093FE018091FE01CF
+:100FE0000E941E1EABC08D2F99278F7099278130CC
+:100FF0009105D9F49E012370332702C0880F991FF1
+:101000002A95E2F79C688E0144E0000F111F4A9573
+:10101000E1F700271370802B912B53E0CC0FDD1FDD
+:101020005A95E1F7C076DD272FC08230910531F463
+:10103000DC2FCC278E01016F106A80C083309105B0
+:1010400069F4CE018370992701E010E002C0000F1F
+:10105000111F8A95E2F7C8019C680FC08430910582
+:10106000B9F4CE018370992701E010E002C0000FAF
+:10107000111F8A95E2F7C8019A6823E0CC0FDD1FA3
+:101080002A95E1F7C07ED7708C010C2B1D2B56C022
+:101090008530910531F4DC2FCC278E01046F106A66
+:1010A0004DC0069709F04AC0CF71DD27DC2FCC2751
+:1010B0008E01106243C000E010E040C08E013EC0CF
+:1010C00001E810E43BC003E810E438C002EE14E489
+:1010D00035C009EE14E432C00AEE14E42FC005EB6B
+:1010E00014E42CC006EB14E429C007EB14E426C07A
+:1010F0000CEC14E423C00DEC14E420C003E815E468
+:101100001DC00AE815E41AC002E915E417C004E995
+:1011100015E414C001E216E411C003E216E40EC0A7
+:1011200004E216E40BC005E216E408C006E216E489
+:1011300005C007E216E402C00AE216E4C801DF9126
+:10114000CF911F910F91089596E0799FF00111249E
+:1011500094E5899FE00DF11D1124E60FF11DEE0FBE
+:10116000FF1FE65FFE4F85919491803E9105E0F46C
+:10117000803C910558F58133910509F46FC048F41E
+:101180008932910509F463C08A32910509F46DC072
+:1011900072C089339105E9F082389105D1F0853329
+:1011A000910509F44DC067C0833E910581F138F483
+:1011B000803E9105B9F0823E9105D9F05CC0863E33
+:1011C000910561F1873E9105A1F155C00E9462062B
+:1011D00008952091FE0120FD02C021FF4CC080EE49
+:1011E00090E049C08091FE0180FFF9CF89E390E053
+:1011F00042C08091FE0182FF0EC08091FE0184FFFB
+:1012000003C080E090E037C083EE90E034C080916E
+:10121000FE0182FFF2CF82EE90E02DC08091FE01B0
+:1012200083FF0BC08091FE0184FDEBCF87EE90E041
+:1012300022C08091FE0183FFF5CF86EE90E01BC0B7
+:101240008091FE0185FF07C089E290E014C0809183
+:10125000FE0185FFF9CF85E390E00DC08091FE018E
+:1012600086FF07C08AE290E006C08091FE0186FFFB
+:10127000F9CF81E390E00E947206089508950C94DE
+:101280003E09809172010895CF93DF9300D01F92A1
+:10129000CDB7DEB79C018091F501843019F593E05C
+:1012A00099833B832A839093E9008FEF9091E80024
+:1012B000815095FD06C095ED9A95F1F700008111DA
+:1012C000F5CF8091E80085FF0DC040E050E063E07D
+:1012D00070E0CE0101960E94B10B8091E8008E77FC
+:1012E0008093E8000F900F900F90DF91CF910895B9
+:1012F000CF93DF9300D01F92CDB7DEB72091F501D9
+:10130000243021F522E029839B838A8383E0809324
+:10131000E9008FEF9091E800815095FD06C095EDB2
+:101320009A95F1F700008111F5CF8091E80085FFD3
+:101330000DC040E050E063E070E0CE0101960E94F5
+:10134000B10B8091E8008E778093E8000F900F90AA
+:101350000F90DF91CF9108952091F5012430F1F4A1
+:1013600022E02093E9002FEF3091E800215035FD75
+:1013700006C035ED3A95F1F700002111F5CF209127
+:10138000E80025FF0BC040E050E065E070E00E94FF
+:10139000B10B8091E8008E778093E8000895CF9399
+:1013A000DF93EC019091F501943009F046C08091F3
+:1013B0000C018823D9F080910D018823B9F0909316
+:1013C000E9008FEF9091E800815095FD06C095E10E
+:1013D0009A95F1F700008111F5CF8091E80085FF23
+:1013E0002CC040E050E060E170E017C081E08093E5
+:1013F000E9008FEF9091E800815095FD06C095EDD2
+:101400009A95F1F700008111F5CF8091E80085FFF2
+:1014100014C040E050E068E070E0CE010E94B10BE3
+:101420008091E8008E778093E80080E1FE01A2E6DB
+:10143000B1E001900D928A95E1F7DF91CF91089587
+:101440008091F401811109C00E94460D0E94A30DF4
+:101450008091E20084608093E20008951092F4018C
+:10146000089508950C948C220E94EE1B0E949222F3
+:101470000E9449100C943F0942E061EC81E00E9417
+:10148000C00C42E061EC82E00E94C00C42E061ECE2
+:1014900083E00E94C00C42E161EC84E00C94C00C3B
+:1014A0008091F701833009F455C030F4813071F038
+:1014B000823009F48EC008958A3009F47AC08B30E6
+:1014C00009F460C0893009F09CC020C08091F60109
+:1014D000813A09F096C08091E800877F8093E80008
+:1014E0008091FA019091FB01892B21F460E182E661
+:1014F00091E003C060E080E090E070E00E94FC0BAF
+:101500008091E8008B778093E80008958091F60140
+:10151000813209F076C08091FA019091FB01009729
+:1015200019F0039709F06DC08091E800877F8093E0
+:10153000E8008091E80082FD05C08091F5018111ED
+:10154000F8CF5FC08091F100809372018091E80034
+:101550008B7753C08091F601813A09F052C0809197
+:10156000FA019091FB01892B09F04BC08091E800B2
+:10157000877F8093E8008091E80080FFFCCF809116
+:101580000C0136C08091F6018132D9F58091FA01C3
+:101590009091FB01892BA9F58091E800877F8093CA
+:1015A000E8000E94F50C8091F80180930C010C94E6
+:1015B000E2148091F601813221F58091E800877F65
+:1015C0008093E8000E94F50C8091F90180937301EB
+:1015D00008958091F601813AA1F48091E800877F17
+:1015E0008093E8008091E80080FFFCCF8091730138
+:1015F0008093F1008091E8008E778093E8000C944E
+:10160000F50C089584B7877F84BF0FB6F894A8952A
+:1016100080916000886180936000109260000FBE2E
+:1016200090E080E80FB6F894809361009093610099
+:101630000FBE0E9498100E94460D0E94A30D80913B
+:10164000E20084608093E20078940E9429100E9456
+:101650009A1082E091E00E9444100E947A228091C8
+:10166000F501853069F40E94B21B8091F301882353
+:10167000B1F30E94E01B882391F30E949B0BEFCFF4
+:101680000E94A010ECCF292F332723303105C9F059
+:1016900064F42130310581F02230310509F043C076
+:1016A0008DE690E026E333E042C021323105F1F0CF
+:1016B0002232310541F137C082E190E023EA33E084
+:1016C00036C099278130910541F08230910541F073
+:1016D000892B49F5E2E3F3E005C0EAE1F3E002C05B
+:1016E000E2E0F3E0849190E09F0121C06430D8F4FF
+:1016F000E62FF0E0EE0FFF1FEE5DFE4F20813181FF
+:1017000089E090E014C0643070F470E0FB01EE0FEB
+:10171000FF1FE65EFE4F20813181FB01EA5EFE4F36
+:10172000808190E004C080E090E020E030E0FA01A9
+:1017300031832083089580E189BD82E189BD09B4A8
+:1017400000FEFDCF8091D8008F7D8093D8008091DE
+:10175000E00082608093E0008091E00081FDFCCF9A
+:101760000895CF92DF92EF92FF920F931F93CF9342
+:10177000DF93EC018B016A010E94140D811133C0CB
+:10178000C114D10439F0F60180819181081B190B35
+:10179000C80FD91FE12CF12C0115110519F1809109
+:1017A000E80085FD16C08091E8008E778093E80000
+:1017B000C114D10449F0F60180819181E80EF91E2F
+:1017C000F182E08285E00FC00E94140D882321F38E
+:1017D0000AC089918093F10001501109FFEFEF1ABF
+:1017E000FF0ADACF80E0DF91CF911F910F91FF9038
+:1017F000EF90DF90CF9008952091FC013091FD0192
+:101800002617370748F06115710539F42091E80073
+:101810002E772093E80001C0B90140E06115710501
+:10182000A9F12091F501222309F443C0253009F4E0
+:1018300042C02091E80023FD40C02091E80022FD35
+:1018400032C02091E80020FFE9CF4091F3002091C1
+:10185000F20030E0342BFC01CF016115710559F025
+:101860002830310540F481918093F1006150710975
+:101870002F5F3F4FF1CF41E02830310509F040E0C4
+:101880002091E8002E772093E800C8CF4111C9CFFE
+:101890000AC08091F501882361F0853061F0809164
+:1018A000E80083FD0AC08091E80082FFF2CF80E06B
+:1018B000089582E0089583E0089581E008952091DD
+:1018C000FC013091FD012617370748F061157105BD
+:1018D00039F42091E8002E772093E80001C0B90187
+:1018E000FC0120E06115710591F18091F5018823DB
+:1018F00009F440C0853009F43FC08091E80083FDC1
+:101900003DC08091E80082FD2FC08091E80080FFFB
+:10191000E9CF2091F3008091F20090E0922B6115C5
+:10192000710559F08830910540F424912093F1001D
+:101930003196615071090196F2CF21E0089709F0C4
+:1019400020E08091E8008E778093E800CBCF2111D2
+:10195000CCCF0AC08091F501882361F0853061F019
+:101960008091E80083FD0AC08091E80082FFF2CFF9
+:1019700080E0089582E0089583E0089581E008956D
+:10198000982F973058F59093E900981739F0709197
+:10199000EC002091ED005091F00003C0242F762F31
+:1019A00050E021FF19C03091EB003E7F3093EB00F7
+:1019B0003091ED003D7F3093ED003091EB003160D0
+:1019C0003093EB007093EC002093ED005093F00007
+:1019D0002091EE0027FF07C09F5FD3CF8F708093C9
+:1019E000E90081E0089580E008958091F60187FF85
+:1019F00011C08091E80082FD05C08091F501811140
+:101A0000F8CF11C08091E8008B770BC08091F50171
+:101A1000882349F08091E80080FFF8CF8091E800AA
+:101A20008E778093E80008952091E4003091E500DE
+:101A300095E64091EC00842F817040FF22C0809198
+:101A4000E80080FD1CC08091F501882391F085306D
+:101A500091F08091EB0085FD10C04091E400509121
+:101A6000E5004217530729F39A01915011F784E0DA
+:101A7000089582E0089583E0089581E0089580E06C
+:101A800008954091E80042FFDECF08950E94B40D12
+:101A90000E94BC0DE0EEF0E0808181608083E8ED83
+:101AA000F0E080818F77808319BCA7EDB0E08C9146
+:101AB0008E7F8C9380818F7E80831092F4010895B5
+:101AC0000F931F93CF93DF930E94B40D0E94BC0D20
+:101AD000C8EDD0E088818F7788838881806888838B
+:101AE00088818F7D888319BC1092F5011092F101D5
+:101AF0001092F3011092F20100EE10E0F8018081E3
+:101B00008B7F808388818160888342E060E080E011
+:101B10000E94C00CE1EEF0E080818E7F8083E2EED7
+:101B2000F0E0808181608083808188608083F8011B
+:101B300080818E7F8083888180618883DF91CF91CF
+:101B40001F910F910895E8EDF0E080818F7E8083F2
+:101B5000E7EDF0E080818160808384E082BF81E0F6
+:101B60008093F4010C94600DE8EDF0E080818E7FAD
+:101B700080831092E20008951092DA001092E10042
+:101B800008951F920F920FB60F9211242F933F9337
+:101B90004F935F936F937F938F939F93AF93BF9375
+:101BA000EF93FF938091E10082FF0BC08091E200F0
+:101BB00082FF07C08091E1008B7F8093E1000E944B
+:101BC00028108091DA0080FF1FC08091D80080FF2C
+:101BD0001BC08091DA008E7F8093DA008091D9005B
+:101BE00080FF0DC080E189BD82E189BD09B400FE9E
+:101BF000FDCF81E08093F5010E94200A05C019BC49
+:101C00001092F5010E942E0A8091E10080FF19C018
+:101C10008091E20080FF15C08091E2008E7F80936A
+:101C2000E2008091E20080618093E2008091D80020
+:101C300080628093D80019BC85E08093F5010E94F2
+:101C4000320A8091E10084FF30C08091E20084FF7D
+:101C50002CC080E189BD82E189BD09B400FEFDCFC1
+:101C60008091D8008F7D8093D8008091E1008F7E95
+:101C70008093E1008091E2008F7E8093E20080916A
+:101C8000E20081608093E2008091F101882311F0ED
+:101C900084E007C08091E30087FD02C081E001C0BD
+:101CA00083E08093F5010E94340A8091E10083FF74
+:101CB00029C08091E20083FF25C08091E100877FE9
+:101CC0008093E10082E08093F5011092F101809110
+:101CD000E1008E7F8093E1008091E2008E7F80930F
+:101CE000E2008091E20080618093E20042E060E0E7
+:101CF00080E00E94C00C8091F00088608093F0002A
+:101D00000E94310AFF91EF91BF91AF919F918F9106
+:101D10007F916F915F914F913F912F910F900FBEE7
+:101D20000F901F9018951F920F920FB60F921124CB
+:101D30002F933F934F935F936F937F938F939F93D3
+:101D4000AF93BF93CF93DF93EF93FF93C091E900DD
+:101D5000CF708091EC00D82FD17080FDD0E8109228
+:101D6000E9008091F000877F8093F00078940E94D2
+:101D7000D70E1092E9008091F00088608093F00007
+:101D8000CD2BCF70C093E900FF91EF91DF91CF9100
+:101D9000BF91AF919F918F917F916F915F914F9183
+:101DA0003F912F910F900FBE0F901F9018951F938A
+:101DB000CF93DF93CDB7DEB7AA970FB6F894DEBF07
+:101DC0000FBECDBFE6EFF1E088E08E0F9091F100FD
+:101DD00091938E13FBCF0E94500A8091E80083FFFD
+:101DE0001FC18091F6019091F701492F50E04A30D0
+:101DF000510508F015C1FA01EA5AFF4F0C9423244B
+:101E0000803881F0823809F00BC18091FA018F701F
+:101E10008093E9008091EB0085FB882780F9109280
+:101E2000E90006C08091F2019091F3019111826066
+:101E30009091E800977F9093E8008093F1001092D2
+:101E4000F100C8C0282F2D7F09F0EAC0882319F0BF
+:101E5000823061F0E5C08091F801813009F0E0C086
+:101E6000933009F080E08093F3012BC08091F8015A
+:101E7000811127C08091FA018F7009F4D1C080933D
+:101E8000E9002091EB0020FF1CC0933021F48091E9
+:101E9000EB00806214C09091EB0090619093EB0096
+:101EA00021E030E0A90102C0440F551F8A95E2F7F6
+:101EB0004093EA001092EA008091EB0088608093E2
+:101EC000EB001092E9008091E800877F86C08111C5
+:101ED000A7C01091F8011F778091E3008078812BD3
+:101EE0008093E3008091E800877F8093E8000E9460
+:101EF000F50C8091E80080FFFCCF8091E3008068C2
+:101F00008093E300111102C082E001C083E080935E
+:101F1000F50186C08058823008F082C08091F801B7
+:101F20009091F9018C3D53E0950779F583E08A8320
+:101F30008AE289834FB7F894DE01139620E03EE0F1
+:101F400051E2E32FF0E050935700E49120FF03C0EB
+:101F5000E295EF703F5FEF708E2F90E0EA3010F067
+:101F6000C79601C0C0968D939D932F5F243149F78A
+:101F70004FBF8091E800877F8093E8006AE270E0BD
+:101F8000CE0101960E94FC0B14C0AE014F5F5F4F63
+:101F90006091FA010E94430BBC01892B09F440C0F7
+:101FA0009091E800977F9093E80089819A810E9440
+:101FB0005F0C8091E8008B778093E80031C0803817
+:101FC00079F58091E800877F8093E8008091F101A6
+:101FD0008093F1008091E8008E778093E8000E9462
+:101FE000F50C1EC081111CC09091F8019230C0F414
+:101FF0008091E800877F8093E8009093F1010E9430
+:10200000F50C8091F101811106C08091E30087FDFC
+:1020100002C081E001C084E08093F5010E943C0A87
+:102020008091E80083FF0AC08091E800877F809359
+:10203000E8008091EB0080628093EB00AA960FB6D7
+:10204000F894DEBF0FBECDBFDF91CF911F910895F1
+:102050000895CF938091F5018823A1F0C091E90004
+:10206000CF709091EC00892F817090FD80E8C82B93
+:102070001092E9008091E80083FD0E94D70ECF7096
+:10208000C093E900CF9108959093790180937801EE
+:102090000895E0917801F0917901309721F0019055
+:1020A000F081E02D099480E00895E0917801F091AD
+:1020B0007901309721F00280F381E02D0994089591
+:1020C000E0917801F0917901309721F00480F58159
+:1020D000E02D0994089520917601309177018217BF
+:1020E000930771F09093770180937601E0917801E6
+:1020F000F0917901309721F00680F781E02D099465
+:10210000089520917401309175018217930771F041
+:102110009093750180937401E0917801F0917901B9
+:10212000309721F00084F185E02D099408950895F9
+:102130000C9497100E94F41B0E947D040C94B61C12
+:102140009F92AF92BF92CF92DF92EF92FF920F9346
+:102150001F93CF93DF9300D000D000D0CDB7DEB770
+:102160000E9495040DE010E0AA24A394B12C902EB7
+:10217000802F0E948305980125583E4F6901F9017F
+:10218000F080F826A1F40150110988F78FEF8983B8
+:102190008A831B820E94FD1B8160782F9D838C8324
+:1021A00049815A816B818D810E9437112FC0909196
+:1021B000DE0191FF04C08E830E9489058E8125E097
+:1021C00030E0A501022E01C0440F0A94EAF7E42E84
+:1021D0004F21C1F029839A828E2191E009F490E089
+:1021E0009B830E94FD1B8160782F9D838C83498196
+:1021F0005A816B818D810E943711F6018081E8261A
+:10220000E08204C021503109E0F6BDCF0E949D1F3D
+:1022100010917A010E9449101817B9F00E944910D4
+:1022200080937A0126960FB6F894DEBF0FBECDBF1D
+:10223000DF91CF911F910F91FF90EF90DF90CF90A2
+:10224000BF90AF909F900C943F0926960FB6F894DC
+:10225000DEBF0FBECDBFDF91CF911F910F91FF90D9
+:10226000EF90DF90CF90BF90AF909F900895CF9365
+:10227000DF93CDB7DEB72B970FB6F894DEBF0FBE56
+:10228000CDBF4F83588769877A878B87DE01119688
+:1022900086E0FD0111928A95E9F785E0FE01379607
+:1022A00001900D928A95E1F749815A816B817C8179
+:1022B0008D819E810E9480172B960FB6F894DEBF09
+:1022C0000FBECDBFDF91CF910895CF93882309F43E
+:1022D000C2C0C82F823859F40E94491081FDBBC08A
+:1022E00089E30E945A1A0E94271B89E30CC0833895
+:1022F00079F40E94491080FDAEC083E50E945A1A0D
+:102300000E94271B83E50E949C1ACF910C94271BE7
+:10231000843859F40E94491082FD9DC087E40E94D0
+:102320005A1A0E94271B87E4EECF8CEF8C0F813A5C
+:1023300048F48C2F0E94DF2181118DC08C2F0E94C8
+:102340005A1AE3CF80E28C0F883048F4C77081E0DE
+:1023500001C0880FCA95EAF70E94E01AD6CF8BE534
+:102360008C0F833078F4C53A29F0C63A31F083E80F
+:1023700090E005C081E890E002C082E890E0CF9153
+:102380000C946B1088E58C0F833108F064C0C83A58
+:1023900039F1C93A41F1CA3A49F1CB3A51F1CC3A53
+:1023A00059F1CD3A61F1C03B69F1CE3A71F1CF3AC2
+:1023B00079F1C13B81F1C23B89F1C33B91F1C43B4F
+:1023C00099F1C53BA1F1C63BA9F1C73BB1F1C83BAF
+:1023D000B9F1C93BC1F1CA3BC9F180E090E038C016
+:1023E00082EE90E035C089EE90E032C08AEE90E057
+:1023F0002FC085EB90E02CC086EB90E029C087EBE6
+:1024000090E026C08CEC90E023C08DEC90E020C0E2
+:1024100083E891E01DC08AE891E01AC082E991E06A
+:1024200017C084E991E014C081E292E011C083E218
+:1024300092E00EC084E292E00BC085E292E008C018
+:1024400086E292E005C087E292E002C08AE292E072
+:10245000CF910C948110CF910895882309F44BC03B
+:10246000823859F40E94491081FF45C089E30E94D7
+:102470005A1A0E94271B89E30CC0833871F40E940A
+:10248000491080FF38C083E50E945A1A0E94271B1A
+:1024900083E50E949C1A0C94271B843859F40E94EF
+:1024A000491082FF28C087E40E945A1A0E94271B05
+:1024B00087E4EFCF9CEF980F913A58F390E2980F92
+:1024C000983050F4877091E001C0990F8A95EAF72F
+:1024D000892F0E94E61ADFCF9BE5980F933020F4F6
+:1024E00080E090E00C946B10885A833120F480E0F7
+:1024F00090E00C9481100895882321F00E94E01A46
+:102500000C94271B0895882321F00E94E61A0C944E
+:10251000271B08957F928F929F92AF92BF92CF9286
+:10252000DF92EF92FF920F931F93CF93DF931F924F
+:10253000CDB7DEB77C01C62E772EFC010581029552
+:102540000F70128111110E94FD1A0E94531A8823E4
+:1025500079F0112369F080E28C0D883048F082E038
+:102560000E943C1A0E94531A91E0D82ED92601C02D
+:10257000D12CE72DE295EF70F0E0E05AFF4F0C947C
+:102580002324872D807F072D0F70882311F002955B
+:10259000007F112389F0002309F490C180E28C0DA3
+:1025A000883020F4802F0E94E01A03C0802F0E9400
+:1025B000F01A0E94271B82C18C2D0E942D1200232D
+:1025C00009F495C180E28C0D883020F4802F0E94A0
+:1025D000E61A03C0802F0E94F61A0E94271B87C1AB
+:1025E000972D907F872D8F70903211F08295807F8C
+:1025F000CC2021F0F1E0CF16B1F01EC0112349F03C
+:10260000002309F414C1013009F011C10E94101B0C
+:102610006EC1002319F0013009F469C189830E9459
+:10262000131B89810AC1112321F0023008F05FC118
+:10263000FEC001115CC101C1112321F0002309F486
+:10264000F6C03CC1002309F4F8C03EC1872D869531
+:102650008695837090E0009719F0019761F047C16B
+:10266000112321F08C2D972D937002C080E090E013
+:102670000E946B103CC1112321F08C2D972D93707B
+:1026800002C080E090E00E94811031C18C2D1123A6
+:1026900019F00E94A51E02C00E940D1F0E94921FE9
+:1026A00026C1872D837009F052C0111120C18C2DD5
+:1026B000829586958770880F880F9C2D9F70892E34
+:1026C000912CA12CB12C082E04C0880C991CAA1C9A
+:1026D000BB1C0A94D2F7C4FE14C00FE010E020E047
+:1026E00030E0B901A80104C0440F551F661F771FD1
+:1026F0008A95D2F7CB01BA01609570958095909537
+:1027000003C060E070E0CB01272D2695269523704D
+:1027100030E02230310569F02330310589F0682935
+:1027200079298A299B292130310571F00E94C81826
+:10273000DEC0682979298A299B290E94E418D7C01C
+:102740000E94C818C501B4010E94AC18D0C0112362
+:1027500019F0872D817001C08695882309F4C7C0C0
+:102760008C2D829586958770880F880F9C2D9F7081
+:10277000892E912CA12CB12C082E04C0880C991CF8
+:10278000AA1CBB1C0A94D2F7C4FE14C00FE010E0D0
+:1027900020E030E0B901A80104C0440F551F661FB6
+:1027A000771F8A95D2F7CB01BA0160957095809515
+:1027B000909503C060E070E0CB01272D269526950B
+:1027C0002370422F50E04230510569F043305105EB
+:1027D00089F0682979298A299B294130510571F0AE
+:1027E0000E94A21984C0682979298A299B290E94FC
+:1027F000BE197DC00E94A219C501B4010E948619AC
+:1028000076C08C2D90E0FC01E05EF109E531F10528
+:1028100008F050C0E059FF4F0C9423240C2D0F708A
+:10282000872D8F71112331F00E941F19802F0E9474
+:102830007C125DC00E944019802F0E94831257C0F5
+:10284000112339F0011153C0872D8F710E94651932
+:102850004EC0023008F04BC0F7CF112339F0872D5E
+:102860008F710E941F1943C01123C9F3872D8F71E7
+:102870000E9440193CC0112329F0872D8F710E94BE
+:102880000A1935C00E94001932C0112351F0172DCA
+:102890001F71812F0E941F1963E0812F0E94331A3C
+:1028A00026C081E00E943C1A023008F182E00E94BA
+:1028B0003C1A1DC0112331F0002389F28C2D0E9497
+:1028C000651115C0002391F28C2D0E942D120FC0AE
+:1028D000472D4F706C2DC7010E94C1020E94241821
+:1028E00006C0472D4F706C2DC7010E944F06DD209A
+:1028F000F9F00E942F1A80FD1BC0F70112820E947E
+:10290000291A0E941F19C7010E94A7140E94291AA0
+:102910000F90DF91CF911F910F91FF90EF90DF907B
+:10292000CF90BF90AF909F908F907F900C94401964
+:102930000F90DF91CF911F910F91FF90EF90DF905B
+:10294000CF90BF90AF909F908F907F9008950F93FE
+:102950001F93CF93DF93EC01888199812B813C8178
+:10296000232BB9F09F3F11F48F3F99F0CE010E94C5
+:10297000A705882371F0688179818A810E94251AD0
+:102980008C010E94DA190E94A118B801CE010E94A0
+:102990008A12DF91CF911F910F9108950E94FD1A25
+:1029A0000E940D1B0E94D21A0E94271B0E944220E7
+:1029B0000E94921F80E090E00E946B1080E090E007
+:1029C0000C9481100E94ED1A0C94CE140E941A1AD5
+:1029D000292F22952F7030E02C3031054CF42A300D
+:1029E00031056CF42250310922303105A8F407C0BA
+:1029F0002C30310569F02F30310551F00DC0803F8A
+:102A000069F018F4803E40F409C0843F29F406C000
+:102A100093FB882780F9089580E0089581E0089568
+:102A2000CF93DF9300D000D01F92CDB7DEB70F90C9
+:102A30000F900F900F900F90DF91CF910895CF934B
+:102A4000DF9300D000D000D0CDB7DEB726960FB60A
+:102A5000F894DEBF0FBECDBFDF91CF9108951F93D5
+:102A6000CF93DF93C091890116E080918A01C81746
+:102A700099F0D0E01C9FF0011D9FF00D1124E55747
+:102A8000FE4F4081518162817381848195810E94D2
+:102A90001F152196C770E9CFDF91CF911F9108953F
+:102AA0004091BB015091BC016091BD017091BE018C
+:102AB0008091BF019091C0010C941F158091C001BD
+:102AC00082958F7009F054C08091BD01882309F46C
+:102AD0004FC080918901A0918A016091BB017091E2
+:102AE000BC014091BE015091BF01B6E08A1709F4C4
+:102AF0003FC090E041155105C1F17F3F11F46F3F98
+:102B0000A1F1B89FF001B99FF00D1124E557FE4FD8
+:102B1000218172132AC02081621327C022812111D2
+:102B200024C0238134812417350710F42150310942
+:102B3000241B350B283C3105C0F42091C0012F70B7
+:102B400020612093C00126E0289FF001299FF00D0D
+:102B50001124E057FE4F80818F70806180838BEB62
+:102B600091E00E94A7140C942F1501968770BECF98
+:102B70000895CF92DF92EF92FF920F931F93CF931E
+:102B8000DF93CDB7DEB762970FB6F894DEBF0FBE06
+:102B9000CDBF8C0185E0F801DE011D9601900D92FC
+:102BA0008A95E1F7D8014C9111965C911197129694
+:102BB0006C9112971396CD90DC9014973091BB01D5
+:102BC0007091BC018091BE019091BF01009709F402
+:102BD0006BC17F3F19F43F3F09F466C1E090BD012E
+:102BE000EE2009F4C0C02091C001C816D90628F013
+:102BF000F601E81BF90BCF0104C0809590958C0D70
+:102C00009D1DFF24F394883C910578F0F12C207FE2
+:102C100009F0C6C07C2DD98AC88A89890E941015FE
+:102C20008BEB91E00E94A714B1C0822F807F09F046
+:102C300046C0751314C0341312C0611110C02F7038
+:102C400020612093C0010E9450158BEB91E00E94FF
+:102C5000A7148091C001D80115968C932EC0CD2861
+:102C600019F15F3F11F44F3FF9F0F62E61111CC0CE
+:102C70008091890120918A0136E0821709F45AC0B7
+:102C800090E0389FF001399FF00D1124E557FE4F79
+:102C90007181571306C07081471303C0728171118F
+:102CA00003C001968770E9CFF62E662309F418C198
+:102CB0008091C00181608093C001F12C11C1751316
+:102CC00008C0341306C0611104C08091C001D8014E
+:102CD000C3C04D875E878D859E856A8B0E94E614F2
+:102CE0006A898823E1F16623D1F12091C001822F06
+:102CF00082958F7090E0029774F08091BB01909163
+:102D0000BC0198878F831986DB86CA862C87CE0103
+:102D100007960E94A71486E0F801ABEBB1E00190A2
+:102D20000D928A95E1F70E945E150E945015FF24CE
+:102D3000F394D6C04D875E878D859E850E941A1AB2
+:102D4000292F22952F7030E0223031050CF0BCC0C5
+:102D50009F7009F0B6C0805E883008F4C1C0C80119
+:102D60000E94A714E4CFC816D90608F453C0F60190
+:102D7000E81BF90BCF01883C910508F450C0F12CF9
+:102D80007C2DD98AC88A89890E941015EBEBF1E065
+:102D900086E0DF011D928A95E9F70E945015A0C0D8
+:102DA000751314C0341312C0611110C08091C0019A
+:102DB000F8018583C8010E94A71486E0EBEBF1E0DF
+:102DC000DF011D928A95E9F7FE2C8AC04D875E8748
+:102DD0008D859E856A8B0E94E6146A89882309F492
+:102DE000BECF662309F4BBCF2091C001822F82950C
+:102DF0008F7090E002970CF48ECF8091BB01909180
+:102E0000BC019A8389831B82DD82CC822E83CE0112
+:102E100001967FCF809590958C0D9D1DACCFF62EA1
+:102E2000662309F49CCF75132EC034132CC0209157
+:102E3000C00120FD1FC0822F82958F70D9F0D8016C
+:102E400015962C9315978F3049F08F5F982F929598
+:102E5000907F822F8F70892B15968C93C8010E94CA
+:102E6000A71486E0F801ABEBB1E001900D928A95D2
+:102E7000E1F793CF86E0F801ABEBB1E001900D9262
+:102E80008A95E1F72DC04D875E878D859E850E94CE
+:102E9000E614811140CF8091C00181608093C00110
+:102EA000C8010E94A7141CC0662309F458CF4D879F
+:102EB0005E878D859E850E94E614882309F44FCF96
+:102EC0002ACF811148CF0CC0243031050CF047CFF8
+:102ED0009F7009F440CFF8019581907F09F03BCFB6
+:102EE0008F2D62960FB6F894DEBF0FBECDBFDF9177
+:102EF000CF911F910F91FF90EF90DF90CF900895A9
+:102F00001F93CF93DF93CDB7DEB72C970FB6F8940E
+:102F1000DEBF0FBECDBF4F83588769877A878B8707
+:102F20009C87CE0107960E94B915882369F08F818E
+:102F300098852A853B85232BF1F19F3F09F063C0DB
+:102F40008F3F09F060C037C086E0FE013796DE0192
+:102F5000119601900D928A95E1F76F817885EA8547
+:102F6000FB85309741F17F3F11F46F3F21F12091B4
+:102F70008A0130E0C9010196877099274091890143
+:102F800050E08417950709F447C069837A83FD836D
+:102F9000EC8396E0929FD001939FB00D1124A5572A
+:102FA000BE4FFE01319601900D929A95E1F7809304
+:102FB0008A010E942F1516E08091890190918A0163
+:102FC0008917C1F1189FC001112485579E4F0E9497
+:102FD000B915882379F1E09189011E9FF001112430
+:102FE000E557FE4F408151816281738184819581D3
+:102FF0000E941F158091890190E0019687709927A2
+:1030000080938901D9CF4F81588569857A858B85D1
+:103010009C850E941F15CFCF0E94E21410928A0156
+:1030200010928901EBEBF1E086E0DF011D928A95B9
+:10303000E9F7C1CF2C960FB6F894DEBF0FBECDBF17
+:10304000DF91CF911F910895EF92FF920F931F93FD
+:10305000CF93DF938C01892B09F46CC0F12CEE2403
+:10306000E394E8012196F8018491843740F4843098
+:1030700008F051C0813081F0823019F15BC0853792
+:1030800009F444C0A8F19CE7980F903708F052C0AB
+:103090008F770E942D1241C00E5F1F4FFE01C49119
+:1030A00080E28C0F883048F4C7708E2D01C0880FE5
+:1030B000CA95EAF70E94001B14C08C2F0E9465116C
+:1030C0002DC00E5F1F4FFE01C49180E28C0F88302F
+:1030D00058F4C7708E2D01C0880FCA95EAF70E9478
+:1030E000061B0E94271B1AC08C2F0E942D1216C08F
+:1030F0000E5F1F4FFE01C491CC2381F08FE99FE04A
+:103100000197F1F700C00000C150F6CF0E5F1F4FCE
+:10311000FE01F49003C00E9465118E018F2D88235B
+:1031200009F49FCFEFE9FFE03197F1F700C000000D
+:103130008150F5CFDF91CF911F910F91FF90EF90CC
+:10314000089508956093C5017093C6018093C701E7
+:103150009093C8010C94CE140F931F930091C50156
+:103160001091C6012091C7013091C801DC01CB014B
+:10317000802B912BA22BB32B8093C5019093C6017A
+:10318000A093C701B093C8011F910F910C94CE1466
+:103190000F931F930091C5011091C6012091C701A3
+:1031A0003091C801DC01CB0180239123A223B323FA
+:1031B0008093C5019093C601A093C701B093C80145
+:1031C0001F910F910C94CE140F931F930091C50182
+:1031D0001091C6012091C7013091C801DC01CB01DB
+:1031E00080279127A227B3278093C5019093C6011A
+:1031F000A093C701B093C8011F910F910C94CE14F6
+:103200001092C1011092C2011092C3011092C40128
+:103210000C94CE1441E050E060E070E004C0440F34
+:10322000551F661F771F8A95D2F74093C1015093AF
+:10323000C2016093C3017093C4010C94CE1441E0A9
+:1032400050E060E070E004C0440F551F661F771F18
+:103250008A95D2F78091C1019091C201A091C301DA
+:10326000B091C401482B592B6A2B7B2B4093C10191
+:103270005093C2016093C3017093C4010C94CE14A7
+:1032800041E050E060E070E004C0440F551F661F4D
+:10329000771F8A95D2F740955095609570958091EB
+:1032A000C1019091C201A091C301B091C401482312
+:1032B00059236A237B234093C1015093C201609339
+:1032C000C3017093C4010C94CE1441E050E060E05F
+:1032D00070E004C0440F551F661F771F8A95D2F710
+:1032E0008091C1019091C201A091C301B091C4012C
+:1032F000482759276A277B274093C1015093C20171
+:103300006093C3017093C4010C94CE140F931F9368
+:103310000091C1011091C2012091C3013091C401FB
+:10332000DC01CB01802B912BA22BB32B8093C1010D
+:103330009093C201A093C301B093C4011F910F9158
+:103340000C94CE140F931F930091C1011091C201F0
+:103350002091C3013091C401DC01CB018023912372
+:10336000A223B3238093C1019093C201A093C30110
+:10337000B093C4011F910F910C94CE140F931F931F
+:103380000091C1011091C2012091C3013091C4018B
+:10339000DC01CB0180279127A227B3278093C101AD
+:1033A0009093C201A093C301B093C4011F910F91E8
+:1033B0000C94CE140895CF92DF92EF92FF920F9368
+:1033C0001F93CF93DF938C01C090C501D090C601AD
+:1033D000E090C701F090C8018091C1019091C201B5
+:1033E000A091C301B091C401C82AD92AEA2AFB2AB4
+:1033F000CFE1D0E0D701C6010C2E04C0B695A79549
+:10340000979587950A94D2F780FF06C0B8018C2F54
+:103410000E94A408019721F4219760F780E001C081
+:103420008C2FDF91CF911F910F91FF90EF90DF9044
+:10343000CF900895CF93DF93EC010E94DB19BE017A
+:103440000E94A408DF91CF910895CB010E941A1A1F
+:1034500008958091C90185958595859508958091F8
+:10346000C9018770089598E0899F90011124262B47
+:103470002093C9010C941F192091C90180958223C2
+:103480008093C901982F977069F430E0482F082E77
+:10349000000C550B2417350729F0859585958595E2
+:1034A0000C94401908959091C901977081E009F436
+:1034B00080E0089590910C01992321F090910D01E5
+:1034C000911109C020910E0130910F01F90132963E
+:1034D0009FEF40E01FC0982F9695969596959F3048
+:1034E00050F5E0910E01F0910F01E90FF11D877089
+:1034F00021E030E0A90102C0440F551F8A95E2F790
+:10350000CA019181892B818308959F3F39F04F5FD4
+:103510004E3041F051915813F8CF0DC05111F7CFF3
+:10352000942FF5CF9F3F39F0F901E90FF11D97FD79
+:10353000FA9582830895089590910C01992321F0C2
+:1035400090910D01911109C020910E0130910F0150
+:10355000F9013296205F3F4F1FC0982F96959695A0
+:1035600096959F30F0F4E0910E01F0910F01E90F74
+:10357000F11D877021E030E0A90102C0440F551F02
+:103580008A95E2F7CA018095918189238183089504
+:103590003196E217F30729F090819813F9CF108242
+:1035A000F7CF089581E090E0E0910E01F0910F01D6
+:1035B000E80FF91F1082019680319105A9F708954F
+:1035C0009091DD01892B8093DD0108958095909184
+:1035D000DD0189238093DD0108951092DD010895B6
+:1035E0009091DC01892B8093DC0108958095909166
+:1035F000DC0189238093DC0108951092DC01089599
+:103600009091DB01892B8093DB0108958095909147
+:10361000DB0189238093DB0108951092DB0108957B
+:103620008093CA0108951092CA01089580910E01F5
+:1036300090910F01FC0131969C01205F3F4F80E08B
+:10364000919191118F5FE217F307D1F70895E091FF
+:103650000E01F0910F018091DD018083E0910E0158
+:10366000F0910F0190818091DC01892B8083E091A2
+:103670000E01F0910F0190818091DB01892B8083F5
+:103680008091CA01882361F0E0910E01F0910F0151
+:103690009081892B80830E94161B81111092CA0190
+:1036A00080910E0190910F010C94551020E000972D
+:1036B00039F0AC0141505109842395232F5FF7CF96
+:1036C000822F0895CF92DF92EF92FF926C01EE2449
+:1036D000FF24C114D104E104F10421F0C701B601B3
+:1036E00020E101C020E0C72ED82EE92EFF24C1140E
+:1036F000D104E104F10419F0285FC701B6016B01A0
+:103700007C0154E0F694E794D794C7945A95D1F786
+:10371000C114D104E104F10419F02C5FC701B60112
+:103720006B017C0142E0F694E794D794C7944A95E4
+:10373000D1F7C114D104E104F10419F02E5FC701DF
+:10374000B601DC01CB01B695A79597958795892B96
+:103750008A2B8B2B09F02F5F822FFF90EF90DF9049
+:10376000CF9008958091F501843039F11092DF01F6
+:1037700020E488E190E00FB6F894A895809360006B
+:103780000FBE2093600080E00E943F0983B7817FD5
+:10379000846083BF83B7816083BF7894889583B743
+:1037A0008E7F83BF0FB6F894A895809160008861E2
+:1037B00080936000109260000FBE089508950895F0
+:1037C0000E94DE1B0E9495040E94DF1B0E948A0556
+:1037D00091E0811101C090E0892F08950E94E214C8
+:1037E0000E9449100C943F0982E084BD93E095BD8E
+:1037F0009AEF97BD80936E0008952FB7F89480914B
+:10380000E0019091E101A091E201B091E3012FBFAD
+:103810000895CF92DF92EF92FF920F931F932FB7ED
+:10382000F8944091E0015091E1016091E2017091C2
+:10383000E3012FBF6A017B01EE24FF248C0120E00D
+:1038400030E0C016D106E206F30610F441505109EB
+:103850009A01281B390BC9011F910F91FF90EF901E
+:10386000DF90CF9008951F920F920FB60F92112400
+:103870008F939F93AF93BF938091E0019091E1016B
+:10388000A091E201B091E3010196A11DB11D8093C9
+:10389000E0019093E101A093E201B093E301BF91B5
+:1038A000AF919F918F910F900FBE0F901F90189521
+:1038B0000E94460DF8942FEF87EA91E62150804050
+:1038C0009040E1F700C0000087E090EBDC018093BE
+:1038D000FF0190930002A0930102B09302029CE0CA
+:1038E00088E10FB6F894A895809360000FBE90937E
+:1038F0006000FFCFEF92FF920F931F93CF93DF9360
+:10390000D82FCDE08C2F0E94830505E010E0E82E33
+:10391000F12CC701002E02C0959587950A94E2F715
+:1039200080FF09C0602F7C2F80E00E945006D813D2
+:1039300002C081E006C00150110958F7C15010F7CC
+:1039400080E0DF91CF911F910F91FF90EF9008954C
+:10395000CF93C82F8CE20E947A1C882321F08C2FF1
+:10396000CF910C947A1C80E0CF910895CF930E9460
+:10397000FD1D811102C00E94E31DC5E6C15049F042
+:103980000E9495048FE39CE90197F1F700C00000C5
+:10399000F5CF89E20E94A81C811113C18AE20E941E
+:1039A000A81C81110E94E31D85E00E94A81C8111C2
+:1039B0000E94581C0E94081E8093DE0187E00E942E
+:1039C000A81C8823A9F18BE10E94A81C882351F030
+:1039D0008091DE0181FB222720F991E0922790FB64
+:1039E00081F90EC08EE00E94A81C882361F08091AE
+:1039F000DE0182FB222720F991E0922790FB82F9D9
+:103A00008093DE0115C080E10E94A81C9091DE0128
+:103A1000882341F093FB222720F981E0822780FB55
+:103A200093F904C0892F809580FB90F99093DE0173
+:103A30008091DE010E940C1E0E941A1E8093FE01DE
+:103A400080EE0E94A81C882341F08091FE01982FEF
+:103A5000909590FB80F98093FE0189E30E94A81C59
+:103A6000882359F08091FE0181FB222720F991E003
+:103A7000922790FB81F98093FE0182EE0E94A81CA0
+:103A8000882359F08091FE0182FB222720F991E0E2
+:103A9000922790FB82F98093FE0186EE0E94A81C7B
+:103AA000882359F08091FE0183FB222720F991E0C1
+:103AB000922790FB83F98093FE0183EE0E94A81C5D
+:103AC000882359F08091FE0184FB222720F991E0A0
+:103AD000922790FB84F98093FE0185E30E94A81C45
+:103AE000882359F08091FE0185FB222720F991E07F
+:103AF000922790FB85F98093FE0181E30E94A81C28
+:103B0000882359F08091FE0186FB222720F991E05D
+:103B1000922790FB86F98093FE0181E10E94A81C08
+:103B2000882359F08091FE0187FB222720F991E03C
+:103B3000922790FB87F98093FE018091FE010E94FD
+:103B40001E1E8091FE0187FB882780F980930D015E
+:103B500087E20E94A81CC82F8EE10E94A81C811138
+:103B6000C2608FE10E94A81C8111C46080E20E94A3
+:103B7000A81C8111C86081E20E94A81C8111C0614B
+:103B800082E20E94A81C8111C06283E20E94A81CEC
+:103B90008111C06484E20E94A81C882311F0C068CF
+:103BA00002C0CC2329F08C2F0E94151E6C2F03C05D
+:103BB0000E94111E682F70E080E090E0CF910C947D
+:103BC000A218CF9108956DEE7EEF80E090E00E9404
+:103BD0005D2460E082E090E00E944B2460E083E09E
+:103BE00090E00E944B2460E084E090E00E944B242F
+:103BF00060E085E090E00C944B2480E090E00E942F
+:103C0000452421E08D3E9E4F09F020E0822F08954B
+:103C100082E090E00C943D24682F82E090E00C94C8
+:103C20004B2483E090E00C943D24682F83E090E0E7
+:103C30000C944B2484E090E00C943D24682F84E0A5
+:103C400090E00C944B248091E60180FF0BC06091C2
+:103C5000130185E0689FB0011124759567957595EE
+:103C600067952BC081FF09C06091130185E0689FB3
+:103C7000B00111247595679520C082FF07C060913F
+:103C8000130185E0689FB001112417C09091E701EE
+:103C90009923D1F060911201961788F720911301B2
+:103CA00085E0289F90011124929FA001939F500DC1
+:103CB000112470E0CA010E940F246038710540F49D
+:103CC0006115710539F002C065E070E0862F089536
+:103CD0008FE7089581E008958091E60180FF08C094
+:103CE0006091110170E0759567957595679521C094
+:103CF00081FF06C06091110170E07595679519C04C
+:103D000082FF04C06091110170E010C09091E70142
+:103D10009923C1F0609110019617A0F780911101CD
+:103D2000899FC001112470E00E940F246038710542
+:103D300028F46115710521F0862F08958FE7089505
+:103D400081E0089561E070E0F4CF803F21F40E94AB
+:103D5000231E819504C0813F29F40E94231E809375
+:103D6000EA010895823F21F40E94231E819504C038
+:103D7000833F29F40E94231E8093E9010895893F1F
+:103D800019F40E946C1E05C08A3F31F40E946C1E1B
+:103D900081958093EB0108958B3F21F40E946C1E66
+:103DA000819504C08C3F29F40E946C1E8093EC0125
+:103DB0000895843F21F48091E801816017C0853F18
+:103DC00021F48091E801826011C0863F21F4809146
+:103DD000E80184600BC0873F21F48091E80188608E
+:103DE00005C0883F31F48091E80180618093E8014B
+:103DF00008958D3F21F48091E60181600BC08E3FD4
+:103E000021F48091E601826005C08F3F29F4809102
+:103E1000E60184608093E6010895803F39F4809143
+:103E2000EA0187FF6CC01092EA0169C0813F29F462
+:103E30008091EA011816BCF362C09091E901823FBB
+:103E400029F497FF5CC01092E90159C0833F19F42F
+:103E50001916CCF354C0893F41F48091EB01181638
+:103E60000CF04DC01092EB014AC08A3F29F48091BA
+:103E7000EB0187FF44C0F6CF8B3F39F48091EC0112
+:103E800087FF3DC01092EC013AC08C3F29F480912D
+:103E9000EC011816BCF333C0843F21F48091E80193
+:103EA0008E7F17C0853F21F48091E8018D7F11C07E
+:103EB000863F21F48091E8018B7F0BC0873F21F47E
+:103EC0008091E801877F05C0883F31F48091E80147
+:103ED0008F7E8093E80113C08D3F21F48091E6012D
+:103EE0008E7F0BC08E3F21F48091E6018D7F05C04F
+:103EF0008F3F29F48091E6018B7F8093E6018091CA
+:103F0000E90181110EC08091EA0181110AC08091FE
+:103F1000EB01811106C08091EC01811102C0109269
+:103F2000E701089588EE91E00E9460100E94FD1B59
+:103F30009093E5018093E40108951F93CF93DF935D
+:103F40008091E4019091E5010E94091CAC019091DF
+:103F5000E701992321F02091140130E006C020915F
+:103F600015018AE0289F900111244217530708F495
+:103F700085C08091E901C091EA01D091EB011091D7
+:103F8000EC01811107C0C11175C0D11173C01111AD
+:103F900071C074C09F3F19F09F5F9093E70118169E
+:103FA00024F40E94231E8093E9018091E90187FF98
+:103FB00005C00E94231E81958093E9011C1624F4FC
+:103FC0000E94231E8093EA018091EA0187FF05C0C9
+:103FD0000E94231E81958093EA016091E901662386
+:103FE00031F1C091EA01CC2311F1062E000C770BC0
+:103FF000880B990B0E94162323E333E343E35FE32B
+:104000000E947A230E94DE226093E9016C2FCC0F7C
+:10401000770B880B990B0E94162323E333E343E3CA
+:104020005FE30E947A230E94DE226093EA011D165C
+:1040300024F40E946C1E8093EB018091EB0187FFBA
+:1040400005C00E946C1E81958093EB01111624F42B
+:104050000E946C1E8093EC018091EC0187FF05C0EB
+:104060000E946C1E81958093EC01DF91CF911F918E
+:104070000C94921F9F3F09F08FCF97CFDF91CF9184
+:104080001F910895E8EEF1E085E0DF011D928A9529
+:10409000E9F71092E7011092E6010895833081F16B
+:1040A00028F4813059F08230D1F00895853009F438
+:1040B00049C0B8F1863009F456C0089580911501C1
+:1040C000262F30E0280F311D2F3F310524F4680FD3
+:1040D0006093150108958FEF8093150108958091E5
+:1040E0001401262F30E0280F311D2F3F310524F415
+:1040F000680F6093140108958FEF80931401089561
+:1041000080911301262F30E0280F311D2F3F3105FC
+:1041100024F4680F6093130108958FEF80931301C7
+:10412000089580911201262F30E0280F311D2F3F76
+:10413000310524F4680F6093120108958FEF809386
+:104140001201089580911101262F30E0280F311DB2
+:104150002F3F310524F4680F6093110108958FEF0C
+:1041600080931101089580911001262F30E0280FCF
+:10417000311D2F3F310524F4680F6093100108951D
+:104180008FEF809310010895833011F128F481306E
+:1041900049F0823091F00895853081F120F1863028
+:1041A000C1F1089580911501681720F4861B809352
+:1041B0001501089510921501089580911401681752
+:1041C00020F4861B80931401089510921401089521
+:1041D00080911301681720F4861B809313010895C2
+:1041E00010921301089580911201681720F4861B24
+:1041F0008093120108951092120108958091110187
+:10420000681720F4861B8093110108951092110104
+:10421000089580911001681720F4861B8093100187
+:1042200008951092100108950F931F938D3109F492
+:104230006BC008F03FC08E3009F47FC0C0F48730F7
+:1042400009F469C068F4863009F0B1C08091DE01DC
+:10425000817F8E7F8093DE0181E08093EE01A8C094
+:10426000883009F4A2C08B3009F49FC0A0C0863109
+:1042700009F49BC078F4803109F472C0813109F0EF
+:1042800096C00E94E21490910D0181E089278093ED
+:104290000D018BC0893109F488C08B3109F087C0CA
+:1042A0008091DE0181FB222720F991E0922790FB8B
+:1042B00081F94CC0853309F470C048F4873209F4A1
+:1042C0006CC008F459C0893209F467C070C08334E7
+:1042D00038F48A3308F04EC0883309F466C067C0EA
+:1042E000833409F45AC0883409F061C00E94E21492
+:1042F0000FEF13ED20E3015010402040E1F700C024
+:1043000000000E94581C51C00E9498220E9449102F
+:104310000E943F094AC09091DE01892F80958170EB
+:1043200080FB90F929F0966098609093DE0140C080
+:10433000997F977F9093DE0138C08091DE0182FBE8
+:10434000222720F991E0922790FB82F98093DE01E9
+:10435000992359F18091DE0181608093DE0125C0AF
+:104360008091DE0183FB222720F991E0922790FBC8
+:1043700083F9ECCF895301C08D5141E050E060E0FA
+:1043800070E08A019B0104C0000F111F221F331F20
+:104390008A95D2F7C901B80104C061E070E080E0FD
+:1043A00090E00E94A2180E94E21481E001C080E027
+:1043B0001F910F91089580E0089580E00895CF93B4
+:1043C000C82F8091EE01813079F018F08230E9F148
+:1043D00087C0E0910E01F0910F018081813169F079
+:1043E000823209F07FC009C0E0910E01F0910F0107
+:1043F0008081813111F0823261F48C2F0E94DB21A7
+:10440000811104C08C2F0E9414211DC081E090E016
+:104410001AC08C2F0E94DD21811114C0C43179F0A3
+:1044200048F4CB3079F0C03109F060C082E080936D
+:10443000EE0108C0C93219F0C83321F057C01092FC
+:10444000EE0154C081E0817053C0C93289F118F582
+:10445000C43171F1A8F4C73009F046C08AE08093F6
+:10446000150194E19093140193E0909313018093CC
+:10447000120188E08093110188E28093100134C01A
+:10448000CE51C63088F5EC2FF0E0E65DFE4F80811E
+:104490008093ED0129C0CE34E9F020F4CB3421F52E
+:1044A0006AE013C0C13579F0C235F1F461E00DC0A6
+:1044B0008091ED01882319F01092ED0115C081E083
+:1044C0008093EE0115C061E006C08091ED010E946D
+:1044D0004E200AC06AE08091ED010E94C42004C011
+:1044E0001092EE0180E004C081E002C080E0ABCF1A
+:1044F000CF910895E1E8F0E0808188608083808139
+:10450000816080838FB7F89493E09093890090ED59
+:10451000909388008FBF0895EFE6F0E0808182607D
+:1045200080830895EFE6F0E080818D7F8083089599
+:10453000EFE6F0E0908182E08927808308951F9262
+:104540000F920FB60F9211242F933F934F935F93C7
+:104550006F937F938F939F93AF93BF93EF93FF934B
+:104560008091EF019091F00101969093F00180937A
+:10457000EF01811103C082E00E943F09E091F00148
+:10458000E695E695F0E0E055FB4FE4918091EF0170
+:104590008E1303C080E00E943F09FF91EF91BF910D
+:1045A000AF919F918F917F916F915F914F913F91CB
+:1045B0002F910F900FBE0F901F9018950E94E5222B
+:1045C0006894B1110C94742308950E94592388F0C3
+:1045D0009F5798F0B92F9927B751B0F0E1F0660FC7
+:1045E000771F881F991F1AF0BA95C9F714C0B13008
+:1045F00091F00E947323B1E008950C947323672F08
+:10460000782F8827B85F39F0B93FCCF38695779536
+:104610006795B395D9F73EF490958095709561951F
+:104620007F4F8F4F9F4F0895E89409C097FB3EF44A
+:1046300090958095709561957F4F8F4F9F4F9923EF
+:10464000A9F0F92F96E9BB279395F695879577956D
+:104650006795B795F111F8CFFAF4BB0F11F460FF2D
+:104660001BC06F5F7F4F8F4F9F4F16C0882311F085
+:1046700096E911C0772321F09EE8872F762F05C099
+:10468000662371F096E8862F70E060E02AF09A9534
+:10469000660F771F881FDAF7880F9695879597F929
+:1046A000089557FD9058440F551F59F05F3F71F022
+:1046B0004795880F97FB991F61F09F3F79F0879589
+:1046C0000895121613061406551FF2CF4695F1DF12
+:1046D00008C0161617061806991FF1CF86957105A2
+:1046E000610508940895E894BB2766277727CB01D6
+:1046F00097F908950E948D230C94FE230E94F023C5
+:1047000038F00E94F72320F0952311F00C94E72352
+:104710000C94ED2311240C9474230E94512370F304
+:10472000959FC1F3950F50E0551F629FF001729F56
+:10473000BB27F00DB11D639FAA27F00DB11DAA1F65
+:10474000649F6627B00DA11D661F829F2227B00DB2
+:10475000A11D621F739FB00DA11D621F839FA00D3D
+:10476000611D221F749F3327A00D611D231F849F8D
+:10477000600D211D822F762F6A2F11249F575040E4
+:104780009AF0F1F088234AF0EE0FFF1FBB1F661F5F
+:10479000771F881F91505040A9F79E3F510580F028
+:1047A0000C94E7230C9474235F3FE4F3983ED4F316
+:1047B000869577956795B795F795E7959F5FC1F7CC
+:1047C000FE2B880F911D9695879597F9089597F977
+:1047D0009F6780E870E060E008959FEF80EC0895A7
+:1047E00000240A94161617061806090608950024D0
+:1047F0000A9412161306140605060895092E03944A
+:10480000000C11F4882352F0BB0F40F4BF2B11F4BD
+:1048100060FF04C06F5F7F4F8F4F9F4F089597FBDE
+:10482000072E16F4009407D077FD09D00E942924A2
+:1048300007FC05D03EF4909581959F4F08957095A3
+:1048400061957F4F0895EE0FFF1F0590F491E02DC5
+:104850000994AA1BBB1B51E107C0AA1FBB1FA617C7
+:10486000B70710F0A61BB70B881F991F5A95A9F719
+:1048700080959095BC01CD010895F999FECF92BD28
+:1048800081BDF89A992780B50895A8E1B0E042E08B
+:1048900050E00C946524262FF999FECF92BD81BD7E
+:1048A000F89A019700B4021639F01FBA20BD0FB66E
+:1048B000F894FA9AF99A0FBE08950196272F0E944C
+:1048C0004C240C944B24DC01CB01FC01F999FECF64
+:1048D00006C0F2BDE1BDF89A319600B40D92415088
+:0A48E0005040B8F70895F894FFCF98
+:1048EA0020024109CF09AC09780944090101CB0129
+:1048FA0028080A03140A3F4D363971042404EE03CA
+:10490A00B503480361037A0393030102030405060E
+:04491A000708090081
:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/dave/keymap.c b/keyboard/ergodox_ez/keymaps/dave/keymap.c index 3ac2842fbf..e9480af3e9 100644 --- a/keyboard/ergodox_ez/keymaps/dave/keymap.c +++ b/keyboard/ergodox_ez/keymaps/dave/keymap.c @@ -3,8 +3,8 @@ #include "action_layer.h" #define BASE 0 // default layer -#define PROG 1 // symbols -#define NAVI 2 // navigation keys +#define PROG 1 // programming +#define NAVI 2 // navigation const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer @@ -18,16 +18,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| H | | B |------+------+------+------+------+--------| * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |`/Ctrl| \ | | | LAlt | | RAlt | | [ | ] |'/Ctrl| + * |`/Ctrl| \ | | | LAlt | | RAlt | [ | ] | |'/Ctrl| * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * | PrtS | Apps | | Paus | CtAl | + * | PrtS | PrtS | | CtAl | CtAl | * ,------+------+------| |------+------+------. * | | | L1 | | L1 | | | * | Spce | ~L2 +------| |------+ ~L1 | Spce | * | | | LGui | | RGui | | | * `--------------------' `--------------------' */ +// 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_6, @@ -35,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_H, CTL_T(KC_GRV),KC_NUBS,KC_NO, KC_NO, KC_LALT, - KC_PSCREEN, KC_APP, + KC_PSCREEN, KC_PSCREEN, TO(PROG, ON_PRESS), KC_SPC, MO(NAVI), KC_LGUI, // right hand @@ -43,8 +45,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_G, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENTER, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENTER, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, - KC_RALT,KC_NO, KC_LBRC,KC_RBRC, CTL_T(KC_QUOT), - KC_PAUS, MT(0x5, KC_NO), + KC_RALT,KC_LBRC,KC_RBRC,KC_NO, CTL_T(KC_QUOT), + MT(0x5, KC_NO), MT(0x5, KC_NO), TO(PROG, ON_PRESS), KC_RGUI, MO(PROG), KC_SPC ), @@ -70,6 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ +// PROGRAMMING [PROG] = KEYMAP( // left hand KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -105,20 +108,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | MsLt | MsDn | MsRt | | |VolDn | Mute |VolUp | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * | Powr | Log | | | | + * | | | | | | * ,------|------|------| |------+------+------. * | | | L0 | | L0 | | | * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ +// NAVIGATION [NAVI] = KEYMAP( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_HOME, KC_UP, KC_END, KC_INS, KC_PGUP, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DELT, KC_PGDN, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, - KC_PWR, LCTL(LALT(KC_DELT)), + KC_TRNS, KC_TRNS, TO(BASE, ON_PRESS), KC_TRNS, KC_TRNS, KC_TRNS, // right hand diff --git a/keyboard/ergodox_ez/keymaps/dave/readme.md b/keyboard/ergodox_ez/keymaps/dave/readme.md new file mode 100644 index 0000000000..aa0f9bd192 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/dave/readme.md @@ -0,0 +1,38 @@ +This keymap is my preferred layout (after a certain amount of experimentation). +The rationale behind the design is as follows: + +I grew up typing from a very early age and thus never learned the "correct" way +to touch type (essentially, I'm self-taught). As a, result my fingers don't +tend to stay on the "home keys" and occasionally my right hand wants to type +keys that are on the left of the keyboard, and vice versa. + +Hence, despite liking the idea of split keyboards in principle, I've never been +able to get on with them because the split simply doesn't work with my style of +typing. The Ergodox solves this neatly by virtue of having a few extra keys in +the "middle" of the keyboard which I can utilise for deliberate redundancy. +Thus in this keymap there are two "6" keys (one on the left, one on the right) +and likewise Y, H, G, and B are all duplicated to enable one-handed patterns +that I use frequently (e.g. "byobu" with the right hand, "yes" with the left, +etc.). + +I occasionally use the numeric pad for data entry, thus this is duplicated +under the natural home position of the right hand in layer 1 (activated by +holding one of the right thumb buttons), while the cursor keys are duplicated +under the classic WASD gaming layout of the left hand in layer 2 (activated by +holding one of the left thumb buttons). Various other useful keys also appear +in these layers (brackets and symbols for coding in layer 1, navigation and +F-keys in layer 2, etc.). + +Finally, modifier keys like Ctrl, Shift, and Alt, along with Backspace and +Enter are all in traditional locations in an effort to reuse existing muscle +memory as much as possible (keys like =, #, and ' are in layer 1). The layout +maps are in the comments of keymap_dave.c so I won't bother duplicating them +here. + +Oh, and the LEDs are rather pimped ... because I could! + +Anyway, although I'm sure this keymap won't be to many people's taste you might +find some interesting ideas in here for your own layouts. Do tweet me +(@waveform80) if you have any questions / suggestions / bugs. + +Dave. diff --git a/keyboard/ergodox_ez/keymaps/default_osx/keymap.c b/keyboard/ergodox_ez/keymaps/default_osx/keymap.c index 81b49ceff9..c57ffbb889 100644 --- a/keyboard/ergodox_ez/keymaps/default_osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/default_osx/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [BASE] = KEYMAP( // layer 0 : default // left hand KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, - KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), + KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT, @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_SPC,KC_BSPC,KC_END, // right hand KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),KC_LGUI, MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ // MEDIA AND MOUSE -KEYMAP( +[MDIA] = KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, diff --git a/keyboard/ergodox_ez/keymaps/dvorak_spanish/README.md b/keyboard/ergodox_ez/keymaps/dvorak_spanish/README.md new file mode 100644 index 0000000000..e075e3cd7d --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/dvorak_spanish/README.md @@ -0,0 +1,99 @@ +# Ergodox Spanish Dvorak Layout + * See spanish dvorak layout [here](http://djelibeibi.unex.es/dvorak/) + * Software layout must be set to SPANISH QWERTY to work properly + +## Keymap Layers + - L0: spanish dvorak with some customizations (see layout below) + - L1: auxiliary keys (includes qwerty shortcuts, numpad...) + - L2: qwerty layout with customizations + + +### Keymap 0: Base layer +Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively + +<pre><code> + +,--------------------------------------------------. ,--------------------------------------------------. +| \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' | +|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| +| F1/~L1 | . | , | Ñ | P | Y |MEH_T | | L1 | F | G | C | H | L |ALL_T/+ | +|--------+------+------+------+------+------| DEL | | ~L1 |------+------+------+------+------+--------| +|Esc/Ctrl| A | O | E | U | I |------| |------| D | R | T | N | S |'/RCtrl | +|--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------| +| {/LSft | - | Q | J | K | X | | | | B | M | W | V | Z | }/RSft | +'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' + |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT| + '----------------------------------' '----------------------------------' + ,-------------. ,-------------. + |F5/CAG|F6/~L1| |F7/~L1|F8/CAG| + ,------|------|------| |------+--------+------. + | | |F4/CA | |F11/CA| | | + | ENTER| TAB |------| |------| BSPC | SPACE| + | | |F3/SA | |F12/SA| | | + '--------------------' '----------------------' + CAG = CTRL-ALT-GUI + CA = CTRL-ALT + SA = SHIFT-ALT + +</pre></code> + +### Keymap 1: Aux layer + +<pre><code> + +,--------------------------------------------------. ,--------------------------------------------------. +| | F1 | F2 | F3 | F4 | F5 | SLEEP| | PWR | F6 | F7 | F8 | F9 | F10 | F11 | +|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| +| | < | > | MsUp | | | | | ~L0 | | 7 | 8 | 9 | * | '^ | +|--------+------+------+------+------+------| | | |------+------+------+------+------+--------| +| | |MsLeft|MsDown|MsRght| |------| |------| | 4 | 5 | 6 | + | Ç | +|--------+------+------+------+------+------| | |PSCR |------+------+------+------+------+--------| +|CAPSLOCK| | | | | | | | | | 1 | 2 | 3 | / | | +'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' + |CTRL-S|CTRL-Z|CTRL-X|CTRL-C|CTRL-V| | | . | 0 | = | | + '----------------------------------' '----------------------------------' + ,-------------. ,-------------. + | | | | | Play | + ,------|------|------| |------+------+------. + | | | | | VolUp| | | + | Lclk | Rclk |------| |------| Prev | Next | + | | | L2 | | VolDn| | | + '--------------------' '--------------------' + +</pre></code> + +### Keymap 2: QWERTY layer + +<pre><code> + +,--------------------------------------------------. ,--------------------------------------------------. +| \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' | +|--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| +| TRANS | Q | W | E | R | T |MEH_T | | TRANS| Y | U | I | O | P |ALL_T/+ | +|--------+------+------+------+------+------| DEL | | |------+------+------+------+------+--------| +|Esc/Ctrl| A | S | D | F | G |------| |------| H | J | K | L | Ñ |'/RCtrl | +|--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------| +| {/LSft | Z | X | C | V | B | | | | N | M | , | . | - | }/RSft | +'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------' + |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT| + '----------------------------------' '----------------------------------' + ,-------------. ,-------------. + |F5/CAG| TRANS| | TRANS|F8/CAG| + ,------|------|------| |------+--------+------. + | | |F4/CA | |F11/CA| | | + | ENTER| TAB |------| |------| BSPC | SPACE| + | | | TRANS| |F12/SA| | | + '--------------------' '----------------------' + CAG = CTRL-ALT-GUI + CA = CTRL-ALT + SA = SHIFT-ALT + +</pre></code> + + +## Generation of .hex file +> [Download scripts from here](https://github.com/johgh/keyboard/tree/master/ergodox) + +> Execute install.sh and generate.sh scripts. + +> Flash with `teensy_loader` binary (should be installed from previous step) diff --git a/keyboard/ergodox_ez/keymaps/dvorak_spanish/dvorak_spanish.hex b/keyboard/ergodox_ez/keymaps/dvorak_spanish/dvorak_spanish.hex new file mode 100644 index 0000000000..9d41778092 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/dvorak_spanish/dvorak_spanish.hex @@ -0,0 +1,5371 @@ + + + + +<!DOCTYPE html> +<html lang="en" class=" is-copy-enabled is-u2f-enabled"> + <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# object: http://ogp.me/ns/object# article: http://ogp.me/ns/article# profile: http://ogp.me/ns/profile#"> + <meta charset='utf-8'> + + <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/frameworks-3514e6d8825ab9f55728f0030acba498e5da5b85ebc8abc35f0f466ac9d2bdda.css" integrity="sha256-NRTm2IJaufVXKPADCsukmOXaW4XryKvDXw9GasnSvdo=" media="all" rel="stylesheet" /> + <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/github-92b560dee7dafd08f0965a6d49e5e4298b3d856899681b308fd7809d9c35367b.css" integrity="sha256-krVg3ufa/QjwllptSeXkKYs9hWiZaBswj9eAnZw1Nns=" media="all" rel="stylesheet" /> + + + + + + <link as="script" href="https://assets-cdn.github.com/assets/frameworks-ea5bbb2a837377ffde53e1099e5909c8df4d36cc5e90c05aeb3694b157df7e4d.js" rel="preload" /> + + <link as="script" href="https://assets-cdn.github.com/assets/github-391829145dbc07158dde112aa636b7ac8b58f7726527ce710bd56118ae1d2f57.js" rel="preload" /> + + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta http-equiv="Content-Language" content="en"> + <meta name="viewport" content="width=device-width"> + + + <title>keyboard/dvorak_spanish.hex at master · johgh/keyboard</title> + <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub"> + <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub"> + <link rel="apple-touch-icon" href="/apple-touch-icon.png"> + <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png"> + <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png"> + <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png"> + <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png"> + <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png"> + <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png"> + <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png"> + <link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png"> + <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png"> + <meta property="fb:app_id" content="1401488693436528"> + + <meta content="https://avatars0.githubusercontent.com/u/8402706?v=3&s=400" name="twitter:image:src" /><meta content="@github" name="twitter:site" /><meta content="summary" name="twitter:card" /><meta content="johgh/keyboard" name="twitter:title" /><meta content="My keyboard layouts" name="twitter:description" /> + <meta content="https://avatars0.githubusercontent.com/u/8402706?v=3&s=400" property="og:image" /><meta content="GitHub" property="og:site_name" /><meta content="object" property="og:type" /><meta content="johgh/keyboard" property="og:title" /><meta content="https://github.com/johgh/keyboard" property="og:url" /><meta content="My keyboard layouts" property="og:description" /> + <meta name="browser-stats-url" content="https://api.github.com/_private/browser/stats"> + <meta name="browser-errors-url" content="https://api.github.com/_private/browser/errors"> + <link rel="assets" href="https://assets-cdn.github.com/"> + <link rel="web-socket" href="wss://live.github.com/_sockets/ODQwMjcwNjplYzk1N2I2ZWI2ZmQ4NDkxYzYwOGYyNTI5NTU2ZGU4MDo5NzUzYjgxYzU5YjA2Y2E3NWRkMzFkYmU1NGVmNzVjNWZiNjhkOTc2ZDNmYmQ2MjA3YTEyNmUwZjJhMGJiYWM1--b3bf68e80e5b864f72da0ef5dee160dae6a5eb69"> + <meta name="pjax-timeout" content="1000"> + <link rel="sudo-modal" href="/sessions/sudo_modal"> + + <meta name="msapplication-TileImage" content="/windows-tile.png"> + <meta name="msapplication-TileColor" content="#ffffff"> + <meta name="selected-link" value="repo_source" data-pjax-transient> + + <meta name="google-site-verification" content="KT5gs8h0wvaagLKAVWq8bbeNwnZZK1r1XQysX3xurLU"> +<meta name="google-site-verification" content="ZzhVyEFwb7w3e0-uOTltm8Jsck2F5StVihD0exw2fsA"> + <meta name="google-analytics" content="UA-3769691-2"> + +<meta content="collector.githubapp.com" name="octolytics-host" /><meta content="github" name="octolytics-app-id" /><meta content="2F3F4253:55E8:1DFD2F84:574C7A03" name="octolytics-dimension-request_id" /><meta content="8402706" name="octolytics-actor-id" /><meta content="johgh" name="octolytics-actor-login" /><meta content="c7f8908bf6490d3f8a93067aaad799b39f00fe93f431d2c8e1af7a284d27053c" name="octolytics-actor-hash" /> +<meta content="/<user-name>/<repo-name>/blob/show" data-pjax-transient="true" name="analytics-location" /> + + + + <meta class="js-ga-set" name="dimension1" content="Logged In"> + + + + <meta name="hostname" content="github.com"> + <meta name="user-login" content="johgh"> + + <meta name="expected-hostname" content="github.com"> + <meta name="js-proxy-site-detection-payload" content="NzY3MTQyZDM1NGNkODk4MGRiNjE4YmFjMjhlMTJiYzU2ODgzYThiYjE1ZWVlN2Q0NDcwZTg5MjQyNWVhZGRlM3x7InJlbW90ZV9hZGRyZXNzIjoiNDcuNjMuNjYuODMiLCJyZXF1ZXN0X2lkIjoiMkYzRjQyNTM6NTVFODoxREZEMkY4NDo1NzRDN0EwMyIsInRpbWVzdGFtcCI6MTQ2NDYyOTc3MH0="> + + + <link rel="mask-icon" href="https://assets-cdn.github.com/pinned-octocat.svg" color="#4078c0"> + <link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico"> + + <meta name="html-safe-nonce" content="96bc37131ccc1986c2a0d20d90faf397412de2be"> + <meta content="28f444bd9d5d742a073b405185ff204d5126d5a2" name="form-nonce" /> + + <meta http-equiv="x-pjax-version" content="e7cec84ad9772b41eb2a7820f7affce2"> + + + + <meta name="description" content="My keyboard layouts"> + <meta name="go-import" content="github.com/johgh/keyboard git https://github.com/johgh/keyboard.git"> + + <meta content="8402706" name="octolytics-dimension-user_id" /><meta content="johgh" name="octolytics-dimension-user_login" /><meta content="58259078" name="octolytics-dimension-repository_id" /><meta content="johgh/keyboard" name="octolytics-dimension-repository_nwo" /><meta content="true" name="octolytics-dimension-repository_public" /><meta content="false" name="octolytics-dimension-repository_is_fork" /><meta content="58259078" name="octolytics-dimension-repository_network_root_id" /><meta content="johgh/keyboard" name="octolytics-dimension-repository_network_root_nwo" /> + <link href="https://github.com/johgh/keyboard/commits/master.atom" rel="alternate" title="Recent Commits to keyboard:master" type="application/atom+xml"> + + + <link rel="canonical" href="https://github.com/johgh/keyboard/blob/master/ergodox/dvorak_spanish/dvorak_spanish.hex" data-pjax-transient> + </head> + + + <body class="logged-in env-production linux vis-public page-blob"> + <div id="js-pjax-loader-bar" class="pjax-loader-bar"></div> + <a href="#start-of-content" tabindex="1" class="accessibility-aid js-skip-to-content">Skip to content</a> + + + + + + + + <div class="header header-logged-in true" role="banner"> + <div class="container clearfix"> + + <a class="header-logo-invertocat" href="https://github.com/" data-hotkey="g d" aria-label="Homepage" data-ga-click="Header, go to dashboard, icon:logo"> + <svg aria-hidden="true" class="octicon octicon-mark-github" height="28" version="1.1" viewBox="0 0 16 16" width="28"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59 0.4 0.07 0.55-0.17 0.55-0.38 0-0.19-0.01-0.82-0.01-1.49-2.01 0.37-2.53-0.49-2.69-0.94-0.09-0.23-0.48-0.94-0.82-1.13-0.28-0.15-0.68-0.52-0.01-0.53 0.63-0.01 1.08 0.58 1.23 0.82 0.72 1.21 1.87 0.87 2.33 0.66 0.07-0.52 0.28-0.87 0.51-1.07-1.78-0.2-3.64-0.89-3.64-3.95 0-0.87 0.31-1.59 0.82-2.15-0.08-0.2-0.36-1.02 0.08-2.12 0 0 0.67-0.21 2.2 0.82 0.64-0.18 1.32-0.27 2-0.27 0.68 0 1.36 0.09 2 0.27 1.53-1.04 2.2-0.82 2.2-0.82 0.44 1.1 0.16 1.92 0.08 2.12 0.51 0.56 0.82 1.27 0.82 2.15 0 3.07-1.87 3.75-3.65 3.95 0.29 0.25 0.54 0.73 0.54 1.48 0 1.07-0.01 1.93-0.01 2.2 0 0.21 0.15 0.46 0.55 0.38C13.71 14.53 16 11.53 16 8 16 3.58 12.42 0 8 0z"></path></svg> +</a> + + + <div class="header-search scoped-search site-scoped-search js-site-search" role="search"> + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/search" class="js-site-search-form" data-scoped-search-url="/johgh/keyboard/search" data-unscoped-search-url="/search" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /></div> + <label class="form-control header-search-wrapper js-chromeless-input-container"> + <div class="header-search-scope">This repository</div> + <input type="text" + class="form-control header-search-input js-site-search-focus js-site-search-field is-clearable" + data-hotkey="s" + name="q" + placeholder="Search" + aria-label="Search this repository" + data-unscoped-placeholder="Search GitHub" + data-scoped-placeholder="Search" + tabindex="1" + autocapitalize="off"> + </label> +</form></div> + + + <ul class="header-nav left" role="navigation"> + <li class="header-nav-item"> + <a href="/pulls" class="js-selected-navigation-item header-nav-link" data-ga-click="Header, click, Nav menu - item:pulls context:user" data-hotkey="g p" data-selected-links="/pulls /pulls/assigned /pulls/mentioned /pulls"> + Pull requests +</a> </li> + <li class="header-nav-item"> + <a href="/issues" class="js-selected-navigation-item header-nav-link" data-ga-click="Header, click, Nav menu - item:issues context:user" data-hotkey="g i" data-selected-links="/issues /issues/assigned /issues/mentioned /issues"> + Issues +</a> </li> + <li class="header-nav-item"> + <a class="header-nav-link" href="https://gist.github.com/" data-ga-click="Header, go to gist, text:gist">Gist</a> + </li> + </ul> + + +<ul class="header-nav user-nav right" id="user-links"> + <li class="header-nav-item"> + + <a href="/notifications" aria-label="You have no unread notifications" class="header-nav-link notification-indicator tooltipped tooltipped-s js-socket-channel js-notification-indicator" data-channel="notification-changed-v2:8402706" data-ga-click="Header, go to notifications, icon:read" data-hotkey="g n"> + <span class="mail-status "></span> + <svg aria-hidden="true" class="octicon octicon-bell" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M14 12v1H0v-1l0.73-0.58c0.77-0.77 0.81-2.55 1.19-4.42 0.77-3.77 4.08-5 4.08-5 0-0.55 0.45-1 1-1s1 0.45 1 1c0 0 3.39 1.23 4.16 5 0.38 1.88 0.42 3.66 1.19 4.42l0.66 0.58z m-7 4c1.11 0 2-0.89 2-2H5c0 1.11 0.89 2 2 2z"></path></svg> +</a> + </li> + + <li class="header-nav-item dropdown js-menu-container"> + <a class="header-nav-link tooltipped tooltipped-s js-menu-target" href="/new" + aria-label="Create new…" + data-ga-click="Header, create new, icon:add"> + <svg aria-hidden="true" class="octicon octicon-plus left" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M12 9H7v5H5V9H0V7h5V2h2v5h5v2z"></path></svg> + <span class="dropdown-caret"></span> + </a> + + <div class="dropdown-menu-content js-menu-content"> + <ul class="dropdown-menu dropdown-menu-sw"> + +<a class="dropdown-item" href="/new" data-ga-click="Header, create new repository"> + New repository +</a> + + <a class="dropdown-item" href="/new/import" data-ga-click="Header, import a repository"> + Import repository + </a> + + + <a class="dropdown-item" href="/organizations/new" data-ga-click="Header, create new organization"> + New organization + </a> + + + + <div class="dropdown-divider"></div> + <div class="dropdown-header"> + <span title="johgh/keyboard">This repository</span> + </div> + <a class="dropdown-item" href="/johgh/keyboard/issues/new" data-ga-click="Header, create new issue"> + New issue + </a> + <a class="dropdown-item" href="/johgh/keyboard/settings/collaboration" data-ga-click="Header, create new collaborator"> + New collaborator + </a> + + </ul> + </div> + </li> + + <li class="header-nav-item dropdown js-menu-container"> + <a class="header-nav-link name tooltipped tooltipped-sw js-menu-target" href="/johgh" + aria-label="View profile and more" + data-ga-click="Header, show menu, icon:avatar"> + <img alt="@johgh" class="avatar" height="20" src="https://avatars0.githubusercontent.com/u/8402706?v=3&s=40" width="20" /> + <span class="dropdown-caret"></span> + </a> + + <div class="dropdown-menu-content js-menu-content"> + <div class="dropdown-menu dropdown-menu-sw"> + <div class=" dropdown-header header-nav-current-user css-truncate"> + Signed in as <strong class="css-truncate-target">johgh</strong> + + </div> + + + <div class="dropdown-divider"></div> + + <a class="dropdown-item" href="/johgh" data-ga-click="Header, go to profile, text:your profile"> + Your profile + </a> + <a class="dropdown-item" href="/stars" data-ga-click="Header, go to starred repos, text:your stars"> + Your stars + </a> + <a class="dropdown-item" href="/explore" data-ga-click="Header, go to explore, text:explore"> + Explore + </a> + <a class="dropdown-item" href="/integrations" data-ga-click="Header, go to integrations, text:integrations"> + Integrations + </a> + <a class="dropdown-item" href="https://help.github.com" data-ga-click="Header, go to help, text:help"> + Help + </a> + + + <div class="dropdown-divider"></div> + + <a class="dropdown-item" href="/settings/profile" data-ga-click="Header, go to settings, icon:settings"> + Settings + </a> + + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/logout" class="logout-form" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="+XodOWOKV2qhNVaih0sfooP0Lk1Hb8ZAjBSaV905IlPw0ey4dZ5MbzXx+FxqBR0EBSVq6fDwao88f69abdVTfQ==" /></div> + <button class="dropdown-item dropdown-signout" data-ga-click="Header, sign out, icon:logout"> + Sign out + </button> +</form> + </div> + </div> + </li> +</ul> + + + + </div> +</div> + + + + + + <div id="start-of-content" class="accessibility-aid"></div> + + <div id="js-flash-container"> +</div> + + + <div role="main" class="main-content"> + <div itemscope itemtype="http://schema.org/SoftwareSourceCode"> + <div id="js-repo-pjax-container" data-pjax-container> + +<div class="pagehead repohead instapaper_ignore readability-menu experiment-repo-nav"> + <div class="container repohead-details-container"> + + + +<ul class="pagehead-actions"> + + <li> + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/notifications/subscribe" class="js-social-container" data-autosubmit="true" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="f797ztd5TsuzQ5g9R6knDUTPO2IVEFpEIeU+5aa6U2NuHB5HDPxoXez+Ele95bMWYaRLcKkoQK+H44xomAgfJA==" /></div> <input class="form-control" id="repository_id" name="repository_id" type="hidden" value="58259078" /> + + <div class="select-menu js-menu-container js-select-menu"> + <a href="/johgh/keyboard/subscription" + class="btn btn-sm btn-with-count select-menu-button js-menu-target" role="button" tabindex="0" aria-haspopup="true" + data-ga-click="Repository, click Watch settings, action:blob#show"> + <span class="js-select-button"> + <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6c4.94 0 7.94-6 7.94-6S13 2 8.06 2z m-0.06 10c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4z m2-4c0 1.11-0.89 2-2 2s-2-0.89-2-2 0.89-2 2-2 2 0.89 2 2z"></path></svg> + Unwatch + </span> + </a> + <a class="social-count js-social-count" href="/johgh/keyboard/watchers"> + 1 + </a> + + <div class="select-menu-modal-holder"> + <div class="select-menu-modal subscription-menu-modal js-menu-content" aria-hidden="true"> + <div class="select-menu-header js-navigation-enable" tabindex="-1"> + <svg aria-label="Close" class="octicon octicon-x js-menu-close" height="16" role="img" version="1.1" viewBox="0 0 12 16" width="12"><path d="M7.48 8l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75-1.48-1.48 3.75-3.75L0.77 4.25l1.48-1.48 3.75 3.75 3.75-3.75 1.48 1.48-3.75 3.75z"></path></svg> + <span class="select-menu-title">Notifications</span> + </div> + + <div class="select-menu-list js-navigation-container" role="menu"> + + <div class="select-menu-item js-navigation-item " role="menuitem" tabindex="0"> + <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M12 5L4 13 0 9l1.5-1.5 2.5 2.5 6.5-6.5 1.5 1.5z"></path></svg> + <div class="select-menu-item-text"> + <input id="do_included" name="do" type="radio" value="included" /> + <span class="select-menu-item-heading">Not watching</span> + <span class="description">Be notified when participating or @mentioned.</span> + <span class="js-select-button-text hidden-select-button-text"> + <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6c4.94 0 7.94-6 7.94-6S13 2 8.06 2z m-0.06 10c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4z m2-4c0 1.11-0.89 2-2 2s-2-0.89-2-2 0.89-2 2-2 2 0.89 2 2z"></path></svg> + Watch + </span> + </div> + </div> + + <div class="select-menu-item js-navigation-item selected" role="menuitem" tabindex="0"> + <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M12 5L4 13 0 9l1.5-1.5 2.5 2.5 6.5-6.5 1.5 1.5z"></path></svg> + <div class="select-menu-item-text"> + <input checked="checked" id="do_subscribed" name="do" type="radio" value="subscribed" /> + <span class="select-menu-item-heading">Watching</span> + <span class="description">Be notified of all conversations.</span> + <span class="js-select-button-text hidden-select-button-text"> + <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6c4.94 0 7.94-6 7.94-6S13 2 8.06 2z m-0.06 10c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4z m2-4c0 1.11-0.89 2-2 2s-2-0.89-2-2 0.89-2 2-2 2 0.89 2 2z"></path></svg> + Unwatch + </span> + </div> + </div> + + <div class="select-menu-item js-navigation-item " role="menuitem" tabindex="0"> + <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M12 5L4 13 0 9l1.5-1.5 2.5 2.5 6.5-6.5 1.5 1.5z"></path></svg> + <div class="select-menu-item-text"> + <input id="do_ignore" name="do" type="radio" value="ignore" /> + <span class="select-menu-item-heading">Ignoring</span> + <span class="description">Never be notified.</span> + <span class="js-select-button-text hidden-select-button-text"> + <svg aria-hidden="true" class="octicon octicon-mute" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M8 2.81v10.38c0 0.67-0.81 1-1.28 0.53L3 10H1c-0.55 0-1-0.45-1-1V7c0-0.55 0.45-1 1-1h2l3.72-3.72c0.47-0.47 1.28-0.14 1.28 0.53z m7.53 3.22l-1.06-1.06-1.97 1.97-1.97-1.97-1.06 1.06 1.97 1.97-1.97 1.97 1.06 1.06 1.97-1.97 1.97 1.97 1.06-1.06-1.97-1.97 1.97-1.97z"></path></svg> + Stop ignoring + </span> + </div> + </div> + + </div> + + </div> + </div> + </div> +</form> + </li> + + <li> + + <div class="js-toggler-container js-social-container starring-container "> + + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/unstar" class="starred" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="9A6+ZzRASK6KFvr/l3mD5fdqF6wAutGyXcHd/9130Jyt/nJTM2+0QZbzPe1wh8z3boeD9BwofxkUcUFuamo4Vg==" /></div> + <button + class="btn btn-sm btn-with-count js-toggler-target" + aria-label="Unstar this repository" title="Unstar johgh/keyboard" + data-ga-click="Repository, click unstar button, action:blob#show; text:Unstar"> + <svg aria-hidden="true" class="octicon octicon-star" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M14 6l-4.9-0.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14l4.33-2.33 4.33 2.33L10.4 9.26 14 6z"></path></svg> + Unstar + </button> + <a class="social-count js-social-count" href="/johgh/keyboard/stargazers"> + 0 + </a> +</form> + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/star" class="unstarred" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" data-remote="true" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="CAPVEEQSSx3LaHYWOp68GDX/WuflV61vhOh8IuCmd964inwPxiXoLYYiUTnlqzXaEt30NeCFUneoxaosn8Etgw==" /></div> + <button + class="btn btn-sm btn-with-count js-toggler-target" + aria-label="Star this repository" title="Star johgh/keyboard" + data-ga-click="Repository, click star button, action:blob#show; text:Star"> + <svg aria-hidden="true" class="octicon octicon-star" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M14 6l-4.9-0.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14l4.33-2.33 4.33 2.33L10.4 9.26 14 6z"></path></svg> + Star + </button> + <a class="social-count js-social-count" href="/johgh/keyboard/stargazers"> + 0 + </a> +</form> </div> + + </li> + + <li> + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/fork" class="btn-with-count" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="TkLrGh7KM4+GzHjrSCT3n2kES2RQWpBwpod3gLNn1itfZMlNQss5N6fBtlSb7wTp6cdW2i9jN0j7FSK5k3ClmQ==" /></div> + <button + type="submit" + class="btn btn-sm btn-with-count" + data-ga-click="Repository, show fork modal, action:blob#show; text:Fork" + title="Fork your own copy of johgh/keyboard to your account" + aria-label="Fork your own copy of johgh/keyboard to your account"> + <svg aria-hidden="true" class="octicon octicon-repo-forked" height="16" version="1.1" viewBox="0 0 10 16" width="10"><path d="M8 1c-1.11 0-2 0.89-2 2 0 0.73 0.41 1.38 1 1.72v1.28L5 8 3 6v-1.28c0.59-0.34 1-0.98 1-1.72 0-1.11-0.89-2-2-2S0 1.89 0 3c0 0.73 0.41 1.38 1 1.72v1.78l3 3v1.78c-0.59 0.34-1 0.98-1 1.72 0 1.11 0.89 2 2 2s2-0.89 2-2c0-0.73-0.41-1.38-1-1.72V9.5l3-3V4.72c0.59-0.34 1-0.98 1-1.72 0-1.11-0.89-2-2-2zM2 4.2c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2z m3 10c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2z m3-10c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2z"></path></svg> + Fork + </button> +</form> + <a href="/johgh/keyboard/network" class="social-count"> + 0 + </a> + </li> +</ul> + + <h1 class="entry-title public "> + <svg aria-hidden="true" class="octicon octicon-repo" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M4 9h-1v-1h1v1z m0-3h-1v1h1v-1z m0-2h-1v1h1v-1z m0-2h-1v1h1v-1z m8-1v12c0 0.55-0.45 1-1 1H6v2l-1.5-1.5-1.5 1.5V14H1c-0.55 0-1-0.45-1-1V1C0 0.45 0.45 0 1 0h10c0.55 0 1 0.45 1 1z m-1 10H1v2h2v-1h3v1h5V11z m0-10H2v9h9V1z"></path></svg> + <span class="author" itemprop="author"><a href="/johgh" class="url fn" rel="author">johgh</a></span><!-- +--><span class="path-divider">/</span><!-- +--><strong itemprop="name"><a href="/johgh/keyboard" data-pjax="#js-repo-pjax-container">keyboard</a></strong> + +</h1> + + </div> + <div class="container"> + +<nav class="reponav js-repo-nav js-sidenav-container-pjax" + itemscope + itemtype="http://schema.org/BreadcrumbList" + role="navigation" + data-pjax="#js-repo-pjax-container"> + + <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement"> + <a href="/johgh/keyboard" aria-selected="true" class="js-selected-navigation-item selected reponav-item" data-hotkey="g c" data-selected-links="repo_source repo_downloads repo_commits repo_releases repo_tags repo_branches /johgh/keyboard" itemprop="url"> + <svg aria-hidden="true" class="octicon octicon-code" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M9.5 3l-1.5 1.5 3.5 3.5L8 11.5l1.5 1.5 4.5-5L9.5 3zM4.5 3L0 8l4.5 5 1.5-1.5L2.5 8l3.5-3.5L4.5 3z"></path></svg> + <span itemprop="name">Code</span> + <meta itemprop="position" content="1"> +</a> </span> + + <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement"> + <a href="/johgh/keyboard/issues" class="js-selected-navigation-item reponav-item" data-hotkey="g i" data-selected-links="repo_issues repo_labels repo_milestones /johgh/keyboard/issues" itemprop="url"> + <svg aria-hidden="true" class="octicon octicon-issue-opened" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7S10.14 13.7 7 13.7 1.3 11.14 1.3 8s2.56-5.7 5.7-5.7m0-1.3C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7S10.86 1 7 1z m1 3H6v5h2V4z m0 6H6v2h2V10z"></path></svg> + <span itemprop="name">Issues</span> + <span class="counter">0</span> + <meta itemprop="position" content="2"> +</a> </span> + + <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement"> + <a href="/johgh/keyboard/pulls" class="js-selected-navigation-item reponav-item" data-hotkey="g p" data-selected-links="repo_pulls /johgh/keyboard/pulls" itemprop="url"> + <svg aria-hidden="true" class="octicon octicon-git-pull-request" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M11 11.28c0-1.73 0-6.28 0-6.28-0.03-0.78-0.34-1.47-0.94-2.06s-1.28-0.91-2.06-0.94c0 0-1.02 0-1 0V0L4 3l3 3V4h1c0.27 0.02 0.48 0.11 0.69 0.31s0.3 0.42 0.31 0.69v6.28c-0.59 0.34-1 0.98-1 1.72 0 1.11 0.89 2 2 2s2-0.89 2-2c0-0.73-0.41-1.38-1-1.72z m-1 2.92c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2zM4 3c0-1.11-0.89-2-2-2S0 1.89 0 3c0 0.73 0.41 1.38 1 1.72 0 1.55 0 5.56 0 6.56-0.59 0.34-1 0.98-1 1.72 0 1.11 0.89 2 2 2s2-0.89 2-2c0-0.73-0.41-1.38-1-1.72V4.72c0.59-0.34 1-0.98 1-1.72z m-0.8 10c0 0.66-0.55 1.2-1.2 1.2s-1.2-0.55-1.2-1.2 0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2z m-1.2-8.8c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2z"></path></svg> + <span itemprop="name">Pull requests</span> + <span class="counter">0</span> + <meta itemprop="position" content="3"> +</a> </span> + + <a href="/johgh/keyboard/wiki" class="js-selected-navigation-item reponav-item" data-hotkey="g w" data-selected-links="repo_wiki /johgh/keyboard/wiki"> + <svg aria-hidden="true" class="octicon octicon-book" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M2 5h4v1H2v-1z m0 3h4v-1H2v1z m0 2h4v-1H2v1z m11-5H9v1h4v-1z m0 2H9v1h4v-1z m0 2H9v1h4v-1z m2-6v9c0 0.55-0.45 1-1 1H8.5l-1 1-1-1H1c-0.55 0-1-0.45-1-1V3c0-0.55 0.45-1 1-1h5.5l1 1 1-1h5.5c0.55 0 1 0.45 1 1z m-8 0.5l-0.5-0.5H1v9h6V3.5z m7-0.5H8.5l-0.5 0.5v8.5h6V3z"></path></svg> + Wiki +</a> + + <a href="/johgh/keyboard/pulse" class="js-selected-navigation-item reponav-item" data-selected-links="pulse /johgh/keyboard/pulse"> + <svg aria-hidden="true" class="octicon octicon-pulse" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M11.5 8L8.8 5.4 6.6 8.5 5.5 1.6 2.38 8H0V10h3.6L4.5 8.2l0.9 5.4L9 8.5l1.6 1.5H14V8H11.5z"></path></svg> + Pulse +</a> + <a href="/johgh/keyboard/graphs" class="js-selected-navigation-item reponav-item" data-selected-links="repo_graphs repo_contributors /johgh/keyboard/graphs"> + <svg aria-hidden="true" class="octicon octicon-graph" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M16 14v1H0V0h1v14h15z m-11-1H3V8h2v5z m4 0H7V3h2v10z m4 0H11V6h2v7z"></path></svg> + Graphs +</a> + <a href="/johgh/keyboard/settings" class="js-selected-navigation-item reponav-item" data-selected-links="repo_settings repo_branch_settings hooks /johgh/keyboard/settings"> + <svg aria-hidden="true" class="octicon octicon-gear" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M14 8.77V7.17l-1.94-0.64-0.45-1.09 0.88-1.84-1.13-1.13-1.81 0.91-1.09-0.45-0.69-1.92H6.17l-0.63 1.94-1.11 0.45-1.84-0.88-1.13 1.13 0.91 1.81-0.45 1.09L0 7.23v1.59l1.94 0.64 0.45 1.09-0.88 1.84 1.13 1.13 1.81-0.91 1.09 0.45 0.69 1.92h1.59l0.63-1.94 1.11-0.45 1.84 0.88 1.13-1.13-0.92-1.81 0.47-1.09 1.92-0.69zM7 11c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3z"></path></svg> + Settings +</a> +</nav> + + </div> +</div> + +<div class="container new-discussion-timeline experiment-repo-nav"> + <div class="repository-content"> + + + +<a href="/johgh/keyboard/blob/ab4c46c678233f6082bb057e59bd1facade3e5a3/ergodox/dvorak_spanish/dvorak_spanish.hex" class="hidden js-permalink-shortcut" data-hotkey="y">Permalink</a> + +<!-- blob contrib key: blob_contributors:v21:3c9a595e7cf64fe08b296fdf57e4ba32 --> + +<div class="file-navigation js-zeroclipboard-container"> + +<div class="select-menu branch-select-menu js-menu-container js-select-menu left"> + <button class="btn btn-sm select-menu-button js-menu-target css-truncate" data-hotkey="w" + title="master" + type="button" aria-label="Switch branches or tags" tabindex="0" aria-haspopup="true"> + <i>Branch:</i> + <span class="js-select-button css-truncate-target">master</span> + </button> + + <div class="select-menu-modal-holder js-menu-content js-navigation-container" data-pjax aria-hidden="true"> + + <div class="select-menu-modal"> + <div class="select-menu-header"> + <svg aria-label="Close" class="octicon octicon-x js-menu-close" height="16" role="img" version="1.1" viewBox="0 0 12 16" width="12"><path d="M7.48 8l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75-1.48-1.48 3.75-3.75L0.77 4.25l1.48-1.48 3.75 3.75 3.75-3.75 1.48 1.48-3.75 3.75z"></path></svg> + <span class="select-menu-title">Switch branches/tags</span> + </div> + + <div class="select-menu-filters"> + <div class="select-menu-text-filter"> + <input type="text" aria-label="Find or create a branch…" id="context-commitish-filter-field" class="form-control js-filterable-field js-navigation-enable" placeholder="Find or create a branch…"> + </div> + <div class="select-menu-tabs"> + <ul> + <li class="select-menu-tab"> + <a href="#" data-tab-filter="branches" data-filter-placeholder="Find or create a branch…" class="js-select-menu-tab" role="tab">Branches</a> + </li> + <li class="select-menu-tab"> + <a href="#" data-tab-filter="tags" data-filter-placeholder="Find a tag…" class="js-select-menu-tab" role="tab">Tags</a> + </li> + </ul> + </div> + </div> + + <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="branches" role="menu"> + + <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring"> + + + <a class="select-menu-item js-navigation-item js-navigation-open selected" + href="/johgh/keyboard/blob/master/ergodox/dvorak_spanish/dvorak_spanish.hex" + data-name="master" + data-skip-pjax="true" + rel="nofollow"> + <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M12 5L4 13 0 9l1.5-1.5 2.5 2.5 6.5-6.5 1.5 1.5z"></path></svg> + <span class="select-menu-item-text css-truncate-target js-select-menu-filter-text" title="master"> + master + </span> + </a> + </div> + + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/branches" class="js-create-branch select-menu-item select-menu-new-item-form js-navigation-item js-new-item-form" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="eqr2+jkq/i0OVGOdWjBeradS5NuV5Awtfm3VeKOA1dzLRV3xH1xNXVEbNlekX7TJtQx/gDTpucEMsJBUR96nIA==" /></div> + <svg aria-hidden="true" class="octicon octicon-git-branch select-menu-item-icon" height="16" version="1.1" viewBox="0 0 10 16" width="10"><path d="M10 5c0-1.11-0.89-2-2-2s-2 0.89-2 2c0 0.73 0.41 1.38 1 1.72v0.3c-0.02 0.52-0.23 0.98-0.63 1.38s-0.86 0.61-1.38 0.63c-0.83 0.02-1.48 0.16-2 0.45V4.72c0.59-0.34 1-0.98 1-1.72 0-1.11-0.89-2-2-2S0 1.89 0 3c0 0.73 0.41 1.38 1 1.72v6.56C0.41 11.63 0 12.27 0 13c0 1.11 0.89 2 2 2s2-0.89 2-2c0-0.53-0.2-1-0.53-1.36 0.09-0.06 0.48-0.41 0.59-0.47 0.25-0.11 0.56-0.17 0.94-0.17 1.05-0.05 1.95-0.45 2.75-1.25s1.2-1.98 1.25-3.02h-0.02c0.61-0.36 1.02-1 1.02-1.73zM2 1.8c0.66 0 1.2 0.55 1.2 1.2s-0.55 1.2-1.2 1.2-1.2-0.55-1.2-1.2 0.55-1.2 1.2-1.2z m0 12.41c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2z m6-8c-0.66 0-1.2-0.55-1.2-1.2s0.55-1.2 1.2-1.2 1.2 0.55 1.2 1.2-0.55 1.2-1.2 1.2z"></path></svg> + <div class="select-menu-item-text"> + <span class="select-menu-item-heading">Create branch: <span class="js-new-item-name"></span></span> + <span class="description">from ‘master’</span> + </div> + <input type="hidden" name="name" id="name" class="js-new-item-value"> + <input type="hidden" name="branch" id="branch" value="master"> + <input type="hidden" name="path" id="path" value="ergodox/dvorak_spanish/dvorak_spanish.hex"> +</form> + </div> + + <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="tags"> + <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring"> + + + </div> + + <div class="select-menu-no-results">Nothing to show</div> + </div> + + </div> + </div> +</div> + + <div class="btn-group right"> + <a href="/johgh/keyboard/find/master" + class="js-pjax-capture-input btn btn-sm" + data-pjax + data-hotkey="t"> + Find file + </a> + <button aria-label="Copy file path to clipboard" class="js-zeroclipboard btn btn-sm zeroclipboard-button tooltipped tooltipped-s" data-copied-hint="Copied!" type="button">Copy path</button> + </div> + <div class="breadcrumb js-zeroclipboard-target"> + <span class="repo-root js-repo-root"><span class="js-path-segment"><a href="/johgh/keyboard"><span>keyboard</span></a></span></span><span class="separator">/</span><span class="js-path-segment"><a href="/johgh/keyboard/tree/master/ergodox"><span>ergodox</span></a></span><span class="separator">/</span><span class="js-path-segment"><a href="/johgh/keyboard/tree/master/ergodox/dvorak_spanish"><span>dvorak_spanish</span></a></span><span class="separator">/</span><strong class="final-path">dvorak_spanish.hex</strong> + </div> +</div> + +<include-fragment class="commit-tease" src="/johgh/keyboard/contributors/master/ergodox/dvorak_spanish/dvorak_spanish.hex"> + <div> + Fetching contributors… + </div> + + <div class="commit-tease-contributors"> + <img alt="" class="loader-loading left" height="16" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-32-EAF2F5.gif" width="16" /> + <span class="loader-error">Cannot retrieve contributors at this time</span> + </div> +</include-fragment> +<div class="file"> + <div class="file-header"> + <div class="file-actions"> + + <div class="btn-group"> + <a href="/johgh/keyboard/raw/master/ergodox/dvorak_spanish/dvorak_spanish.hex" class="btn btn-sm " id="raw-url">Raw</a> + <a href="/johgh/keyboard/blame/master/ergodox/dvorak_spanish/dvorak_spanish.hex" class="btn btn-sm js-update-url-with-hash">Blame</a> + <a href="/johgh/keyboard/commits/master/ergodox/dvorak_spanish/dvorak_spanish.hex" class="btn btn-sm " rel="nofollow">History</a> + </div> + + + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/edit/master/ergodox/dvorak_spanish/dvorak_spanish.hex" class="inline-form js-update-url-with-hash" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="mBXUFIbsdwQ12m5mU+yedoFFa8YgpdxmzXk1dlfq1kh0C66VRpqfqiN2C7erMu+s584jhyOYVPRmEEJ8ZlRmjw==" /></div> + <button class="btn-octicon tooltipped tooltipped-nw" type="submit" + aria-label="Edit this file" data-hotkey="e" data-disable-with> + <svg aria-hidden="true" class="octicon octicon-pencil" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path d="M0 12v3h3l8-8-3-3L0 12z m3 2H1V12h1v1h1v1z m10.3-9.3l-1.3 1.3-3-3 1.3-1.3c0.39-0.39 1.02-0.39 1.41 0l1.59 1.59c0.39 0.39 0.39 1.02 0 1.41z"></path></svg> + </button> +</form> <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="/johgh/keyboard/delete/master/ergodox/dvorak_spanish/dvorak_spanish.hex" class="inline-form" data-form-nonce="28f444bd9d5d742a073b405185ff204d5126d5a2" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="EK6jR4ODlaPp5/jn2atxuOqb22Or3H/UxxumUc4sjbGX1M3680KVs3VMgkwrfWaeZk9Qhd9vqD3sI7bJpiKXIw==" /></div> + <button class="btn-octicon btn-octicon-danger tooltipped tooltipped-nw" type="submit" + aria-label="Delete this file" data-disable-with> + <svg aria-hidden="true" class="octicon octicon-trashcan" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M10 2H8c0-0.55-0.45-1-1-1H4c-0.55 0-1 0.45-1 1H1c-0.55 0-1 0.45-1 1v1c0 0.55 0.45 1 1 1v9c0 0.55 0.45 1 1 1h7c0.55 0 1-0.45 1-1V5c0.55 0 1-0.45 1-1v-1c0-0.55-0.45-1-1-1z m-1 12H2V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9z m1-10H1v-1h9v1z"></path></svg> + </button> +</form> </div> + + <div class="file-info"> + 1172 lines (1171 sloc) + <span class="file-info-divider"></span> + 51.4 KB + </div> +</div> + + + + <div itemprop="text" class="blob-wrapper data type-text"> + <table class="highlight tab-size js-file-line-container" data-tab-size="8"> + <tr> + <td id="L1" class="blob-num js-line-number" data-line-number="1"></td> + <td id="LC1" class="blob-code blob-code-inner js-file-line">:100000000C9465020C94AC020C94AC020C94AC02FF
</td> + </tr> + <tr> + <td id="L2" class="blob-num js-line-number" data-line-number="2"></td> + <td id="LC2" class="blob-code blob-code-inner js-file-line">:100010000C94AC020C94AC020C94AC020C94AC02A8
</td> + </tr> + <tr> + <td id="L3" class="blob-num js-line-number" data-line-number="3"></td> + <td id="LC3" class="blob-code blob-code-inner js-file-line">:100020000C94AC020C94AC020C94FC0C0C94CE0D11
</td> + </tr> + <tr> + <td id="L4" class="blob-num js-line-number" data-line-number="4"></td> + <td id="LC4" class="blob-code blob-code-inner js-file-line">:100030000C94AC020C94AC020C94AC020C94AC0288
</td> + </tr> + <tr> + <td id="L5" class="blob-num js-line-number" data-line-number="5"></td> + <td id="LC5" class="blob-code blob-code-inner js-file-line">:100040000C94AC020C949A220C94AC020C94AC026A
</td> + </tr> + <tr> + <td id="L6" class="blob-num js-line-number" data-line-number="6"></td> + <td id="LC6" class="blob-code blob-code-inner js-file-line">:100050000C94AC020C942A1C0C94AC020C94AC02D0
</td> + </tr> + <tr> + <td id="L7" class="blob-num js-line-number" data-line-number="7"></td> + <td id="LC7" class="blob-code blob-code-inner js-file-line">:100060000C94AC020C94AC020C94AC020C94AC0258
</td> + </tr> + <tr> + <td id="L8" class="blob-num js-line-number" data-line-number="8"></td> + <td id="LC8" class="blob-code blob-code-inner js-file-line">:100070000C94AC020C94AC020C94AC020C94AC0248
</td> + </tr> + <tr> + <td id="L9" class="blob-num js-line-number" data-line-number="9"></td> + <td id="LC9" class="blob-code blob-code-inner js-file-line">:100080000C94AC020C94AC020C94AC020C94AC0238
</td> + </tr> + <tr> + <td id="L10" class="blob-num js-line-number" data-line-number="10"></td> + <td id="LC10" class="blob-code blob-code-inner js-file-line">:100090000C94AC020C94AC020C94AC020C94AC0228
</td> + </tr> + <tr> + <td id="L11" class="blob-num js-line-number" data-line-number="11"></td> + <td id="LC11" class="blob-code blob-code-inner js-file-line">:1000A0000C94AC020C94AC020C94AC023B0E5D0EB2
</td> + </tr> + <tr> + <td id="L12" class="blob-num js-line-number" data-line-number="12"></td> + <td id="LC12" class="blob-code blob-code-inner js-file-line">:1000B0004B0F5D0E4B0FA20EC50E4B0F1A0F2D0FDF
</td> + </tr> + <tr> + <td id="L13" class="blob-num js-line-number" data-line-number="13"></td> + <td id="LC13" class="blob-code blob-code-inner js-file-line">:1000C00019121912561256129912D712F014F0146E
</td> + </tr> + <tr> + <td id="L14" class="blob-num js-line-number" data-line-number="14"></td> + <td id="LC14" class="blob-code blob-code-inner js-file-line">:1000D000F012F014F113F113C414F014F014DB1443
</td> + </tr> + <tr> + <td id="L15" class="blob-num js-line-number" data-line-number="15"></td> + <td id="LC15" class="blob-code blob-code-inner js-file-line">:1000E0000000F0A135003A81297100300230000093
</td> + </tr> + <tr> + <td id="L16" class="blob-num js-line-number" data-line-number="16"></td> + <td id="LC16" class="blob-code blob-code-inner js-file-line">:1000F0001E003700040038004A003C761F0036001E
</td> + </tr> + <tr> + <td id="L17" class="blob-num js-line-number" data-line-number="17"></td> + <td id="LC17" class="blob-code blob-code-inner js-file-line">:10010000120014004E002B002000330008000D00E8
</td> + </tr> + <tr> + <td id="L18" class="blob-num js-line-number" data-line-number="18"></td> + <td id="LC18" class="blob-code blob-code-inner js-file-line">:100110004B0028002100130018000E004D003D7513
</td> + </tr> + <tr> + <td id="L19" class="blob-num js-line-number" data-line-number="19"></td> + <td id="LC19" class="blob-code blob-code-inner js-file-line">:1001200022001C000C001B0000003E7D64004C7788
</td> + </tr> + <tr> + <td id="L20" class="blob-num js-line-number" data-line-number="20"></td> + <td id="LC20" class="blob-code blob-code-inner js-file-line">:100130000000E30000003F812E00C1000000E60047
</td> + </tr> + <tr> + <td id="L21" class="blob-num js-line-number" data-line-number="21"></td> + <td id="LC21" class="blob-code blob-code-inner js-file-line">:100140000000408123000900070005000000417DF8
</td> + </tr> + <tr> + <td id="L22" class="blob-num js-line-number" data-line-number="22"></td> + <td id="LC22" class="blob-code blob-code-inner js-file-line">:1001500024000A0015001000500044752500060018
</td> + </tr> + <tr> + <td id="L23" class="blob-num js-line-number" data-line-number="23"></td> + <td id="LC23" class="blob-code blob-code-inner js-file-line">:1001600017001A0051002C0026000B001100190086
</td> + </tr> + <tr> + <td id="L24" class="blob-num js-line-number" data-line-number="24"></td> + <td id="LC24" class="blob-code blob-code-inner js-file-line">:1001700052002A0027000F0016001D004F00457690
</td> + </tr> + <tr> + <td id="L25" class="blob-num js-line-number" data-line-number="25"></td> + <td id="LC25" class="blob-code blob-code-inner js-file-line">:100180002D00307F34710130033000000000010089
</td> + </tr> + <tr> + <td id="L26" class="blob-num js-line-number" data-line-number="26"></td> + <td id="LC26" class="blob-code blob-code-inner js-file-line">:1001900000000430160100003A0064000000000076
</td> + </tr> + <tr> + <td id="L27" class="blob-num js-line-number" data-line-number="27"></td> + <td id="LC27" class="blob-code blob-code-inner js-file-line">:1001A0001D0102543B006402F20000001B01F50037
</td> + </tr> + <tr> + <td id="L28" class="blob-num js-line-number" data-line-number="28"></td> + <td id="LC28" class="blob-code blob-code-inner js-file-line">:1001B0003C00F000F10000000601F4003D000000EA
</td> + </tr> + <tr> + <td id="L29" class="blob-num js-line-number" data-line-number="29"></td> + <td id="LC29" class="blob-code blob-code-inner js-file-line">:1001C000F3000000190100003E00000000000000E4
</td> + </tr> + <tr> + <td id="L30" class="blob-num js-line-number" data-line-number="30"></td> + <td id="LC30" class="blob-code blob-code-inner js-file-line">:1001D00000000000A6000000000000000000010078
</td> + </tr> + <tr> + <td id="L31" class="blob-num js-line-number" data-line-number="31"></td> + <td id="LC31" class="blob-code blob-code-inner js-file-line">:1001E000A500010000004600000001003F000000E3
</td> + </tr> + <tr> + <td id="L32" class="blob-num js-line-number" data-line-number="32"></td> + <td id="LC32" class="blob-code blob-code-inner js-file-line">:1001F000000000000000AE004000240021001E00AE
</td> + </tr> + <tr> + <td id="L33" class="blob-num js-line-number" data-line-number="33"></td> + <td id="LC33" class="blob-code blob-code-inner js-file-line">:100200000000A9004100250022001F003700AB00BC
</td> + </tr> + <tr> + <td id="L34" class="blob-num js-line-number" data-line-number="34"></td> + <td id="LC34" class="blob-code blob-code-inner js-file-line">:1002100042002600230020002700AC0043005500C8
</td> + </tr> + <tr> + <td id="L35" class="blob-num js-line-number" data-line-number="35"></td> + <td id="LC35" class="blob-code blob-code-inner js-file-line">:10022000570054006700AA0044002F00310000006E
</td> + </tr> + <tr> + <td id="L36" class="blob-num js-line-number" data-line-number="36"></td> + <td id="LC36" class="blob-code blob-code-inner js-file-line">:10023000000000003500010029710030023000008C
</td> + </tr> + <tr> + <td id="L37" class="blob-num js-line-number" data-line-number="37"></td> + <td id="LC37" class="blob-code blob-code-inner js-file-line">:100240001E00140004001D004A0001001F001A00D7
</td> + </tr> + <tr> + <td id="L38" class="blob-num js-line-number" data-line-number="38"></td> + <td id="LC38" class="blob-code blob-code-inner js-file-line">:1002500016001B004E002B002000080007000600BF
</td> + </tr> + <tr> + <td id="L39" class="blob-num js-line-number" data-line-number="39"></td> + <td id="LC39" class="blob-code blob-code-inner js-file-line">:100260004B00280021001500090019004D003D75C4
</td> + </tr> + <tr> + <td id="L40" class="blob-num js-line-number" data-line-number="40"></td> + <td id="LC40" class="blob-code blob-code-inner js-file-line">:10027000220017000A00050000003E7D64004C7754
</td> + </tr> + <tr> + <td id="L41" class="blob-num js-line-number" data-line-number="41"></td> + <td id="LC41" class="blob-code blob-code-inner js-file-line">:100280000000E300000001002E0001000000E60075
</td> + </tr> + <tr> + <td id="L42" class="blob-num js-line-number" data-line-number="42"></td> + <td id="LC42" class="blob-code blob-code-inner js-file-line">:100290000000010023001C000B0011000000417D44
</td> + </tr> + <tr> + <td id="L43" class="blob-num js-line-number" data-line-number="43"></td> + <td id="LC43" class="blob-code blob-code-inner js-file-line">:1002A000240018000D0010005000447525000C00BB
</td> + </tr> + <tr> + <td id="L44" class="blob-num js-line-number" data-line-number="44"></td> + <td id="LC44" class="blob-code blob-code-inner js-file-line">:1002B0000E00360051002C00260012000F003700FF
</td> + </tr> + <tr> + <td id="L45" class="blob-num js-line-number" data-line-number="45"></td> + <td id="LC45" class="blob-code blob-code-inner js-file-line">:1002C00052002A0027001300330038004F00457603
</td> + </tr> + <tr> + <td id="L46" class="blob-num js-line-number" data-line-number="46"></td> + <td id="LC46" class="blob-code blob-code-inner js-file-line">:1002D0002D00307F347101300330000016034500DB
</td> + </tr> + <tr> + <td id="L47" class="blob-num js-line-number" data-line-number="47"></td> + <td id="LC47" class="blob-code blob-code-inner js-file-line">:1002E000720067006F0044006F0078002000450036
</td> + </tr> + <tr> + <td id="L48" class="blob-num js-line-number" data-line-number="48"></td> + <td id="LC48" class="blob-code blob-code-inner js-file-line">:1002F0005A00000016034500720067006F004400BA
</td> + </tr> + <tr> + <td id="L49" class="blob-num js-line-number" data-line-number="49"></td> + <td id="LC49" class="blob-code blob-code-inner js-file-line">:100300006F007800200045005A0000000403090433
</td> + </tr> + <tr> + <td id="L50" class="blob-num js-line-number" data-line-number="50"></td> + <td id="LC50" class="blob-code blob-code-inner js-file-line">:1003100009026D00040100A0FA09040000010301B4
</td> + </tr> + <tr> + <td id="L51" class="blob-num js-line-number" data-line-number="51"></td> + <td id="LC51" class="blob-code blob-code-inner js-file-line">:100320000100092111010001223F00070581030896
</td> + </tr> + <tr> + <td id="L52" class="blob-num js-line-number" data-line-number="52"></td> + <td id="LC52" class="blob-code blob-code-inner js-file-line">:10033000000A090401000103010200092111010062
</td> + </tr> + <tr> + <td id="L53" class="blob-num js-line-number" data-line-number="53"></td> + <td id="LC53" class="blob-code blob-code-inner js-file-line">:1003400001224D000705820308000A09040200018A
</td> + </tr> + <tr> + <td id="L54" class="blob-num js-line-number" data-line-number="54"></td> + <td id="LC54" class="blob-code blob-code-inner js-file-line">:100350000300000009211101000122360007058376
</td> + </tr> + <tr> + <td id="L55" class="blob-num js-line-number" data-line-number="55"></td> + <td id="LC55" class="blob-code blob-code-inner js-file-line">:100360000308000A09040300010300000009211129
</td> + </tr> + <tr> + <td id="L56" class="blob-num js-line-number" data-line-number="56"></td> + <td id="LC56" class="blob-code blob-code-inner js-file-line">:100370000100012239000705840310000112011059
</td> + </tr> + <tr> + <td id="L57" class="blob-num js-line-number" data-line-number="57"></td> + <td id="LC57" class="blob-code blob-code-inner js-file-line">:100380000100000008EDFE07130100010200010555
</td> + </tr> + <tr> + <td id="L58" class="blob-num js-line-number" data-line-number="58"></td> + <td id="LC58" class="blob-code blob-code-inner js-file-line">:10039000010906A101050719E029E71500250195C6
</td> + </tr> + <tr> + <td id="L59" class="blob-num js-line-number" data-line-number="59"></td> + <td id="LC59" class="blob-code blob-code-inner js-file-line">:1003A0000875018102050819012905950575019156
</td> + </tr> + <tr> + <td id="L60" class="blob-num js-line-number" data-line-number="60"></td> + <td id="LC60" class="blob-code blob-code-inner js-file-line">:1003B000029501750391010507190029771500259C
</td> + </tr> + <tr> + <td id="L61" class="blob-num js-line-number" data-line-number="61"></td> + <td id="LC61" class="blob-code blob-code-inner js-file-line">:1003C00001957875018102C005010980A1018502AE
</td> + </tr> + <tr> + <td id="L62" class="blob-num js-line-number" data-line-number="62"></td> + <td id="LC62" class="blob-code blob-code-inner js-file-line">:1003D00016010026B7001A01002AB7007510950112
</td> + </tr> + <tr> + <td id="L63" class="blob-num js-line-number" data-line-number="63"></td> + <td id="LC63" class="blob-code blob-code-inner js-file-line">:1003E0008100C0050C0901A1018503160100269CAE
</td> + </tr> + <tr> + <td id="L64" class="blob-num js-line-number" data-line-number="64"></td> + <td id="LC64" class="blob-code blob-code-inner js-file-line">:1003F000021A01002A9C02751095018100C00501B6
</td> + </tr> + <tr> + <td id="L65" class="blob-num js-line-number" data-line-number="65"></td> + <td id="LC65" class="blob-code blob-code-inner js-file-line">:100400000902A1010901A100050919012905150029
</td> + </tr> + <tr> + <td id="L66" class="blob-num js-line-number" data-line-number="66"></td> + <td id="LC66" class="blob-code blob-code-inner js-file-line">:10041000250195057501810295017503810105018D
</td> + </tr> + <tr> + <td id="L67" class="blob-num js-line-number" data-line-number="67"></td> + <td id="LC67" class="blob-code blob-code-inner js-file-line">:10042000093009311581257F950275088106093843
</td> + </tr> + <tr> + <td id="L68" class="blob-num js-line-number" data-line-number="68"></td> + <td id="LC68" class="blob-code blob-code-inner js-file-line">:100430001581257F950175088106050C0A3802157E
</td> + </tr> + <tr> + <td id="L69" class="blob-num js-line-number" data-line-number="69"></td> + <td id="LC69" class="blob-code blob-code-inner js-file-line">:1004400081257F950175088106C0C005010906A1B7
</td> + </tr> + <tr> + <td id="L70" class="blob-num js-line-number" data-line-number="70"></td> + <td id="LC70" class="blob-code blob-code-inner js-file-line">:1004500001050719E029E7150025019508750181B7
</td> + </tr> + <tr> + <td id="L71" class="blob-num js-line-number" data-line-number="71"></td> + <td id="LC71" class="blob-code blob-code-inner js-file-line">:100460000295017508810105081901290595057591
</td> + </tr> + <tr> + <td id="L72" class="blob-num js-line-number" data-line-number="72"></td> + <td id="LC72" class="blob-code blob-code-inner js-file-line">:100470000191029501750391010507190029FF15E6
</td> + </tr> + <tr> + <td id="L73" class="blob-num js-line-number" data-line-number="73"></td> + <td id="LC73" class="blob-code blob-code-inner js-file-line">:100480000025FF950675088100C0000000000000EF
</td> + </tr> + <tr> + <td id="L74" class="blob-num js-line-number" data-line-number="74"></td> + <td id="LC74" class="blob-code blob-code-inner js-file-line">:100490000000000000010204060A0F17202C3A4A4F
</td> + </tr> + <tr> + <td id="L75" class="blob-num js-line-number" data-line-number="75"></td> + <td id="LC75" class="blob-code blob-code-inner js-file-line">:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2
</td> + </tr> + <tr> + <td id="L76" class="blob-num js-line-number" data-line-number="76"></td> + <td id="LC76" class="blob-code blob-code-inner js-file-line">:1004B000B39D87715D4A3A2C20170F0A060402018A
</td> + </tr> + <tr> + <td id="L77" class="blob-num js-line-number" data-line-number="77"></td> + <td id="LC77" class="blob-code blob-code-inner js-file-line">:1004C0000000000000000000000011241FBECFEF5C
</td> + </tr> + <tr> + <td id="L78" class="blob-num js-line-number" data-line-number="78"></td> + <td id="LC78" class="blob-code blob-code-inner js-file-line">:1004D000DAE0DEBFCDBF04B603FE27C08091F00195
</td> + </tr> + <tr> + <td id="L79" class="blob-num js-line-number" data-line-number="79"></td> + <td id="LC79" class="blob-code blob-code-inner js-file-line">:1004E0009091F101A091F201B091F3018730904B0E
</td> + </tr> + <tr> + <td id="L80" class="blob-num js-line-number" data-line-number="80"></td> + <td id="LC80" class="blob-code blob-code-inner js-file-line">:1004F000A740B04BD1F41092F0011092F10110928C
</td> + </tr> + <tr> + <td id="L81" class="blob-num js-line-number" data-line-number="81"></td> + <td id="LC81" class="blob-code blob-code-inner js-file-line">:10050000F2011092F30114BE84B7877F84BF0FB647
</td> + </tr> + <tr> + <td id="L82" class="blob-num js-line-number" data-line-number="82"></td> + <td id="LC82" class="blob-code blob-code-inner js-file-line">:10051000F894A895809160008861809360001092A3
</td> + </tr> + <tr> + <td id="L83" class="blob-num js-line-number" data-line-number="83"></td> + <td id="LC83" class="blob-code blob-code-inner js-file-line">:1005200060000FBEE0E0FFE3099511E0A0E0B1E05C
</td> + </tr> + <tr> + <td id="L84" class="blob-num js-line-number" data-line-number="84"></td> + <td id="LC84" class="blob-code blob-code-inner js-file-line">:10053000E0EEF8E402C005900D92A433B107D9F7BC
</td> + </tr> + <tr> + <td id="L85" class="blob-num js-line-number" data-line-number="85"></td> + <td id="LC85" class="blob-code blob-code-inner js-file-line">:1005400021E0A4E3B1E001C01D92A03FB207E1F7B2
</td> + </tr> + <tr> + <td id="L86" class="blob-num js-line-number" data-line-number="86"></td> + <td id="LC86" class="blob-code blob-code-inner js-file-line">:100550000E943D0A0C946E240C940000FC01623051
</td> + </tr> + <tr> + <td id="L87" class="blob-num js-line-number" data-line-number="87"></td> + <td id="LC87" class="blob-code blob-code-inner js-file-line">:1005600009F445C028F4662351F0613041F182C09E
</td> + </tr> + <tr> + <td id="L88" class="blob-num js-line-number" data-line-number="88"></td> + <td id="LC88" class="blob-code blob-code-inner js-file-line">:10057000633009F45BC0643009F472C07BC08281CF
</td> + </tr> + <tr> + <td id="L89" class="blob-num js-line-number" data-line-number="89"></td> + <td id="LC89" class="blob-code blob-code-inner js-file-line">:10058000882341F00E94F41B90933501809334013D
</td> + </tr> + <tr> + <td id="L90" class="blob-num js-line-number" data-line-number="90"></td> + <td id="LC90" class="blob-code blob-code-inner js-file-line">:1005900085EE6AC085EE0E947511809134019091BC
</td> + </tr> + <tr> + <td id="L91" class="blob-num js-line-number" data-line-number="91"></td> + <td id="LC91" class="blob-code blob-code-inner js-file-line">:1005A00035010E94001C8F3591050CF063C086EE6A
</td> + </tr> + <tr> + <td id="L92" class="blob-num js-line-number" data-line-number="92"></td> + <td id="LC92" class="blob-code blob-code-inner js-file-line">:1005B0000E94AD1084E30E94AD1084E34DC082819F
</td> + </tr> + <tr> + <td id="L93" class="blob-num js-line-number" data-line-number="93"></td> + <td id="LC93" class="blob-code blob-code-inner js-file-line">:1005C0008111E0CF85EE0E947511809134019091E8
</td> + </tr> + <tr> + <td id="L94" class="blob-num js-line-number" data-line-number="94"></td> + <td id="LC94" class="blob-code blob-code-inner js-file-line">:1005D00035010E94001C8F3591050CF04BC086EE52
</td> + </tr> + <tr> + <td id="L95" class="blob-num js-line-number" data-line-number="95"></td> + <td id="LC95" class="blob-code blob-code-inner js-file-line">:1005E0000E94AD1081E30E94AD1081E335C082818D
</td> + </tr> + <tr> + <td id="L96" class="blob-num js-line-number" data-line-number="96"></td> + <td id="LC96" class="blob-code blob-code-inner js-file-line">:1005F000882341F00E94F41B9093350180933401CD
</td> + </tr> + <tr> + <td id="L97" class="blob-num js-line-number" data-line-number="97"></td> + <td id="LC97" class="blob-code blob-code-inner js-file-line">:1006000082EE32C082EE0E94751180913401909189
</td> + </tr> + <tr> + <td id="L98" class="blob-num js-line-number" data-line-number="98"></td> + <td id="LC98" class="blob-code blob-code-inner js-file-line">:1006100035010E94001C8F35910564F586EE0E941D
</td> + </tr> + <tr> + <td id="L99" class="blob-num js-line-number" data-line-number="99"></td> + <td id="LC99" class="blob-code blob-code-inner js-file-line">:10062000AD108FE20E94AD108FE216C08281811161
</td> + </tr> + <tr> + <td id="L100" class="blob-num js-line-number" data-line-number="100"></td> + <td id="LC100" class="blob-code blob-code-inner js-file-line">:10063000E1CF82EE0E9475118091340190913501D5
</td> + </tr> + <tr> + <td id="L101" class="blob-num js-line-number" data-line-number="101"></td> + <td id="LC101" class="blob-code blob-code-inner js-file-line">:100640000E94001C8F359105ACF486EE0E94AD101F
</td> + </tr> + <tr> + <td id="L102" class="blob-num js-line-number" data-line-number="102"></td> + <td id="LC102" class="blob-code blob-code-inner js-file-line">:1006500080E30E94AD1080E30E94751186EE08C011
</td> + </tr> + <tr> + <td id="L103" class="blob-num js-line-number" data-line-number="103"></td> + <td id="LC103" class="blob-code blob-code-inner js-file-line">:100660008281882321F089E30E94AD1003C089E3D1
</td> + </tr> + <tr> + <td id="L104" class="blob-num js-line-number" data-line-number="104"></td> + <td id="LC104" class="blob-code blob-code-inner js-file-line">:100670000E94751180E090E0089508956091B301A3
</td> + </tr> + <tr> + <td id="L105" class="blob-num js-line-number" data-line-number="105"></td> + <td id="LC105" class="blob-code blob-code-inner js-file-line">:100680007091B4018091B5019091B6010E94531B05
</td> + </tr> + <tr> + <td id="L106" class="blob-num js-line-number" data-line-number="106"></td> + <td id="LC106" class="blob-code blob-code-inner js-file-line">:1006900056985E9825982D9826982E9827982F98EA
</td> + </tr> + <tr> + <td id="L107" class="blob-num js-line-number" data-line-number="107"></td> + <td id="LC107" class="blob-code blob-code-inner js-file-line">:1006A000813029F0823029F4269A2E9A02C0279AA6
</td> + </tr> + <tr> + <td id="L108" class="blob-num js-line-number" data-line-number="108"></td> + <td id="LC108" class="blob-code blob-code-inner js-file-line">:1006B0002F9A0E94840F81FF02C0259A2D9A0895D7
</td> + </tr> + <tr> + <td id="L109" class="blob-num js-line-number" data-line-number="109"></td> + <td id="LC109" class="blob-code blob-code-inner js-file-line">:1006C0000C943E0356985E9825982D9826982E985F
</td> + </tr> + <tr> + <td id="L110" class="blob-num js-line-number" data-line-number="110"></td> + <td id="LC110" class="blob-code blob-code-inner js-file-line">:1006D00027982F988FEF90E090938900809388005F
</td> + </tr> + <tr> + <td id="L111" class="blob-num js-line-number" data-line-number="111"></td> + <td id="LC111" class="blob-code blob-code-inner js-file-line">:1006E00090938B0080938A0090938D0080938C0070
</td> + </tr> + <tr> + <td id="L112" class="blob-num js-line-number" data-line-number="112"></td> + <td id="LC112" class="blob-code blob-code-inner js-file-line">:1006F000259A2D9A2FEF80E792E02150804090407C
</td> + </tr> + <tr> + <td id="L113" class="blob-num js-line-number" data-line-number="113"></td> + <td id="LC113" class="blob-code blob-code-inner js-file-line">:10070000E1F700C00000269A2E9A2FEF80E792E0D2
</td> + </tr> + <tr> + <td id="L114" class="blob-num js-line-number" data-line-number="114"></td> + <td id="LC114" class="blob-code blob-code-inner js-file-line">:10071000215080409040E1F700C00000279A2F9AB6
</td> + </tr> + <tr> + <td id="L115" class="blob-num js-line-number" data-line-number="115"></td> + <td id="LC115" class="blob-code blob-code-inner js-file-line">:100720002FEF80E792E0215080409040E1F700C039
</td> + </tr> + <tr> + <td id="L116" class="blob-num js-line-number" data-line-number="116"></td> + <td id="LC116" class="blob-code blob-code-inner js-file-line">:10073000000025982D982FEF80E792E0215080400F
</td> + </tr> + <tr> + <td id="L117" class="blob-num js-line-number" data-line-number="117"></td> + <td id="LC117" class="blob-code blob-code-inner js-file-line">:100740009040E1F700C0000026982E982FEF80E738
</td> + </tr> + <tr> + <td id="L118" class="blob-num js-line-number" data-line-number="118"></td> + <td id="LC118" class="blob-code blob-code-inner js-file-line">:1007500092E0215080409040E1F700C000002798CF
</td> + </tr> + <tr> + <td id="L119" class="blob-num js-line-number" data-line-number="119"></td> + <td id="LC119" class="blob-code blob-code-inner js-file-line">:100760002F9856985E9825982D9826982E98279819
</td> + </tr> + <tr> + <td id="L120" class="blob-num js-line-number" data-line-number="120"></td> + <td id="LC120" class="blob-code blob-code-inner js-file-line">:100770002F98089589EA8093800089E08093810012
</td> + </tr> + <tr> + <td id="L121" class="blob-num js-line-number" data-line-number="121"></td> + <td id="LC121" class="blob-code blob-code-inner js-file-line">:1007800024982C983F988AB18F748AB96E98479AAA
</td> + </tr> + <tr> + <td id="L122" class="blob-num js-line-number" data-line-number="122"></td> + <td id="LC122" class="blob-code blob-code-inner js-file-line">:100790008BB1806B8BB9769A0E9462030C943D03F7
</td> + </tr> + <tr> + <td id="L123" class="blob-num js-line-number" data-line-number="123"></td> + <td id="LC123" class="blob-code blob-code-inner js-file-line">:1007A00080E2809300018091360181110EC00E9489
</td> + </tr> + <tr> + <td id="L124" class="blob-num js-line-number" data-line-number="124"></td> + <td id="LC124" class="blob-code blob-code-inner js-file-line">:1007B0001F0481E0809336012FEF83ED90E32150F9
</td> + </tr> + <tr> + <td id="L125" class="blob-num js-line-number" data-line-number="125"></td> + <td id="LC125" class="blob-code blob-code-inner js-file-line">:1007C00080409040E1F700C0000080E40E942504D2
</td> + </tr> + <tr> + <td id="L126" class="blob-num js-line-number" data-line-number="126"></td> + <td id="LC126" class="blob-code blob-code-inner js-file-line">:1007D0008093000181112EC00E944F04809300017C
</td> + </tr> + <tr> + <td id="L127" class="blob-num js-line-number" data-line-number="127"></td> + <td id="LC127" class="blob-code blob-code-inner js-file-line">:1007E000811128C00E944F0480930001811122C012
</td> + </tr> + <tr> + <td id="L128" class="blob-num js-line-number" data-line-number="128"></td> + <td id="LC128" class="blob-code blob-code-inner js-file-line">:1007F0008FE30E944F048093000181111BC00E946F
</td> + </tr> + <tr> + <td id="L129" class="blob-num js-line-number" data-line-number="129"></td> + <td id="LC129" class="blob-code blob-code-inner js-file-line">:10080000470480E40E94250480930001811112C0F6
</td> + </tr> + <tr> + <td id="L130" class="blob-num js-line-number" data-line-number="130"></td> + <td id="LC130" class="blob-code blob-code-inner js-file-line">:100810008CE00E944F048093000181110BC00E9464
</td> + </tr> + <tr> + <td id="L131" class="blob-num js-line-number" data-line-number="131"></td> + <td id="LC131" class="blob-code blob-code-inner js-file-line">:100820004F0480930001811105C08FE30E944F04A3
</td> + </tr> + <tr> + <td id="L132" class="blob-num js-line-number" data-line-number="132"></td> + <td id="LC132" class="blob-code blob-code-inner js-file-line">:10083000809300010E944704809100010895109266
</td> + </tr> + <tr> + <td id="L133" class="blob-num js-line-number" data-line-number="133"></td> + <td id="LC133" class="blob-code blob-code-inner js-file-line">:10084000B9008AE08093B800089594EA9093BC00C0
</td> + </tr> + <tr> + <td id="L134" class="blob-num js-line-number" data-line-number="134"></td> + <td id="LC134" class="blob-code blob-code-inner js-file-line">:100850009091BC0097FFFCCF9091B900987F9830A1
</td> + </tr> + <tr> + <td id="L135" class="blob-num js-line-number" data-line-number="135"></td> + <td id="LC135" class="blob-code blob-code-inner js-file-line">:1008600021F0903111F081E008958093BB0084E87D
</td> + </tr> + <tr> + <td id="L136" class="blob-num js-line-number" data-line-number="136"></td> + <td id="LC136" class="blob-code blob-code-inner js-file-line">:100870008093BC008091BC0087FFFCCF8091B900C1
</td> + </tr> + <tr> + <td id="L137" class="blob-num js-line-number" data-line-number="137"></td> + <td id="LC137" class="blob-code blob-code-inner js-file-line">:10088000887F883111F0803471F780E0089584E921
</td> + </tr> + <tr> + <td id="L138" class="blob-num js-line-number" data-line-number="138"></td> + <td id="LC138" class="blob-code blob-code-inner js-file-line">:100890008093BC008091BC0084FDFCCF08958093C0
</td> + </tr> + <tr> + <td id="L139" class="blob-num js-line-number" data-line-number="139"></td> + <td id="LC139" class="blob-code blob-code-inner js-file-line">:1008A000BB0084E88093BC008091BC0087FFFCCF34
</td> + </tr> + <tr> + <td id="L140" class="blob-num js-line-number" data-line-number="140"></td> + <td id="LC140" class="blob-code blob-code-inner js-file-line">:1008B0009091B900987F81E0983209F480E0089522
</td> + </tr> + <tr> + <td id="L141" class="blob-num js-line-number" data-line-number="141"></td> + <td id="LC141" class="blob-code blob-code-inner js-file-line">:1008C00084E88093BC008091BC0087FFFCCF8091BE
</td> + </tr> + <tr> + <td id="L142" class="blob-num js-line-number" data-line-number="142"></td> + <td id="LC142" class="blob-code blob-code-inner js-file-line">:1008D000BB00089580910001811115C080E40E9441
</td> + </tr> + <tr> + <td id="L143" class="blob-num js-line-number" data-line-number="143"></td> + <td id="LC143" class="blob-code blob-code-inner js-file-line">:1008E00025048093000181110CC082E10E944F0415
</td> + </tr> + <tr> + <td id="L144" class="blob-num js-line-number" data-line-number="144"></td> + <td id="LC144" class="blob-code blob-code-inner js-file-line">:1008F00080930001811105C08FEF0E944F04809307
</td> + </tr> + <tr> + <td id="L145" class="blob-num js-line-number" data-line-number="145"></td> + <td id="LC145" class="blob-code blob-code-inner js-file-line">:1009000000010E94470484B1807F84B985B1807F53
</td> + </tr> + <tr> + <td id="L146" class="blob-num js-line-number" data-line-number="146"></td> + <td id="LC146" class="blob-code blob-code-inner js-file-line">:1009100085B98AB1837F8AB98BB1837F8BB93E98C1
</td> + </tr> + <tr> + <td id="L147" class="blob-num js-line-number" data-line-number="147"></td> + <td id="LC147" class="blob-code blob-code-inner js-file-line">:10092000469808950E94D003809300010E946A04B3
</td> + </tr> + <tr> + <td id="L148" class="blob-num js-line-number" data-line-number="148"></td> + <td id="LC148" class="blob-code blob-code-inner js-file-line">:1009300080B38C7080BB81B3836F81BBA8E3B1E0CF
</td> + </tr> + <tr> + <td id="L149" class="blob-num js-line-number" data-line-number="149"></td> + <td id="LC149" class="blob-code blob-code-inner js-file-line">:10094000E6E4F1E08EE08E0F11921D928E13FCCF43
</td> + </tr> + <tr> + <td id="L150" class="blob-num js-line-number" data-line-number="150"></td> + <td id="LC150" class="blob-code blob-code-inner js-file-line">:100950000C94BA03BF92CF92DF92EF92FF920F9363
</td> + </tr> + <tr> + <td id="L151" class="blob-num js-line-number" data-line-number="151"></td> + <td id="LC151" class="blob-code blob-code-inner js-file-line">:100960001F93CF93DF9380910001882379F08091CA
</td> + </tr> + <tr> + <td id="L152" class="blob-num js-line-number" data-line-number="152"></td> + <td id="LC152" class="blob-code blob-code-inner js-file-line">:1009700037018F5F80933701811108C00E94D00337
</td> + </tr> + <tr> + <td id="L153" class="blob-num js-line-number" data-line-number="153"></td> + <td id="LC153" class="blob-code blob-code-inner js-file-line">:1009800080930001811102C00E94620308E311E01C
</td> + </tr> + <tr> + <td id="L154" class="blob-num js-line-number" data-line-number="154"></td> + <td id="LC154" class="blob-code blob-code-inner js-file-line">:10099000C0E0D0E0DD24D39482E0C82EEE24E394BE
</td> + </tr> + <tr> + <td id="L155" class="blob-num js-line-number" data-line-number="155"></td> + <td id="LC155" class="blob-code blob-code-inner js-file-line">:1009A000F12CC730D10500F580910001811164C0A0
</td> + </tr> + <tr> + <td id="L156" class="blob-num js-line-number" data-line-number="156"></td> + <td id="LC156" class="blob-code blob-code-inner js-file-line">:1009B00080E40E94250480930001811112C082E12D
</td> + </tr> + <tr> + <td id="L157" class="blob-num js-line-number" data-line-number="157"></td> + <td id="LC157" class="blob-code blob-code-inner js-file-line">:1009C0000E944F048093000181110BC0C7010C2EBF
</td> + </tr> + <tr> + <td id="L158" class="blob-num js-line-number" data-line-number="158"></td> + <td id="LC158" class="blob-code blob-code-inner js-file-line">:1009D00001C0880F0A94EAF780950E944F04809323
</td> + </tr> + <tr> + <td id="L159" class="blob-num js-line-number" data-line-number="159"></td> + <td id="LC159" class="blob-code blob-code-inner js-file-line">:1009E00000010E94470448C0CA30A1F028F4C83072
</td> + </tr> + <tr> + <td id="L160" class="blob-num js-line-number" data-line-number="160"></td> + <td id="LC160" class="blob-code blob-code-inner js-file-line">:1009F00059F0C93061F005C0CC3089F070F0CD30CD
</td> + </tr> + <tr> + <td id="L161" class="blob-num js-line-number" data-line-number="161"></td> + <td id="LC161" class="blob-code blob-code-inner js-file-line">:100A000089F0209A289810C0219A29980DC0229A1E
</td> + </tr> + <tr> + <td id="L162" class="blob-num js-line-number" data-line-number="162"></td> + <td id="LC162" class="blob-code blob-code-inner js-file-line">:100A10002A980AC0239A2B9807C0529A01C0539A69
</td> + </tr> + <tr> + <td id="L163" class="blob-num js-line-number" data-line-number="163"></td> + <td id="LC163" class="blob-code blob-code-inner js-file-line">:100A20005B9802C03E9A469890EA9A95F1F79FB17A
</td> + </tr> + <tr> + <td id="L164" class="blob-num js-line-number" data-line-number="164"></td> + <td id="LC164" class="blob-code blob-code-inner js-file-line">:100A3000799902C082E001C080E091709D25982BD9
</td> + </tr> + <tr> + <td id="L165" class="blob-num js-line-number" data-line-number="165"></td> + <td id="LC165" class="blob-code blob-code-inner js-file-line">:100A40007C9902C084E001C080E0892B7D9902C0BE
</td> + </tr> + <tr> + <td id="L166" class="blob-num js-line-number" data-line-number="166"></td> + <td id="LC166" class="blob-code blob-code-inner js-file-line">:100A500038E001C030E0832B7E9902C020E101C064
</td> + </tr> + <tr> + <td id="L167" class="blob-num js-line-number" data-line-number="167"></td> + <td id="LC167" class="blob-code blob-code-inner js-file-line">:100A600020E0822B9FB19095991F9927991F92950D
</td> + </tr> + <tr> + <td id="L168" class="blob-num js-line-number" data-line-number="168"></td> + <td id="LC168" class="blob-code blob-code-inner js-file-line">:100A7000990F907E892B0FC080910001811149C090
</td> + </tr> + <tr> + <td id="L169" class="blob-num js-line-number" data-line-number="169"></td> + <td id="LC169" class="blob-code blob-code-inner js-file-line">:100A800080E40E94250480930001882379F1B12C31
</td> + </tr> + <tr> + <td id="L170" class="blob-num js-line-number" data-line-number="170"></td> + <td id="LC170" class="blob-code blob-code-inner js-file-line">:100A90000E9447048B2DF8019081981719F08083EC
</td> + </tr> + <tr> + <td id="L171" class="blob-num js-line-number" data-line-number="171"></td> + <td id="LC171" class="blob-code blob-code-inner js-file-line">:100AA000C09201010E946A0421960F5F1F4FCE3051
</td> + </tr> + <tr> + <td id="L172" class="blob-num js-line-number" data-line-number="172"></td> + <td id="LC172" class="blob-code blob-code-inner js-file-line">:100AB000D10509F076CF80910101882361F1815041
</td> + </tr> + <tr> + <td id="L173" class="blob-num js-line-number" data-line-number="173"></td> + <td id="LC173" class="blob-code blob-code-inner js-file-line">:100AC00080930101882339F08FE99FE00197F1F7C6
</td> + </tr> + <tr> + <td id="L174" class="blob-num js-line-number" data-line-number="174"></td> + <td id="LC174" class="blob-code blob-code-inner js-file-line">:100AD00000C0000020C0A6E4B1E0E8E3F1E0CF01EF
</td> + </tr> + <tr> + <td id="L175" class="blob-num js-line-number" data-line-number="175"></td> + <td id="LC175" class="blob-code blob-code-inner js-file-line">:100AE000825F91919D938E13FCCF15C083E10E948C
</td> + </tr> + <tr> + <td id="L176" class="blob-num js-line-number" data-line-number="176"></td> + <td id="LC176" class="blob-code blob-code-inner js-file-line">:100AF0004F04809300018111CACF81E40E94250434
</td> + </tr> + <tr> + <td id="L177" class="blob-num js-line-number" data-line-number="177"></td> + <td id="LC177" class="blob-code blob-code-inner js-file-line">:100B0000809300018111C3CF0E946004B82EB0947D
</td> + </tr> + <tr> + <td id="L178" class="blob-num js-line-number" data-line-number="178"></td> + <td id="LC178" class="blob-code blob-code-inner js-file-line">:100B1000BFCF80E0C0CF0E94600381E0DF91CF9122
</td> + </tr> + <tr> + <td id="L179" class="blob-num js-line-number" data-line-number="179"></td> + <td id="LC179" class="blob-code blob-code-inner js-file-line">:100B20001F910F91FF90EF90DF90CF90BF900895AD
</td> + </tr> + <tr> + <td id="L180" class="blob-num js-line-number" data-line-number="180"></td> + <td id="LC180" class="blob-code blob-code-inner js-file-line">:100B3000E82FF0E0EA5BFE4F808108950895089564
</td> + </tr> + <tr> + <td id="L181" class="blob-num js-line-number" data-line-number="181"></td> + <td id="LC181" class="blob-code blob-code-inner js-file-line">:100B400096E0799FF001112494E5899FE00DF11D55
</td> + </tr> + <tr> + <td id="L182" class="blob-num js-line-number" data-line-number="182"></td> + <td id="LC182" class="blob-code blob-code-inner js-file-line">:100B50001124E60FF11DEE0FFF1FEC51FF4F8591A1
</td> + </tr> + <tr> + <td id="L183" class="blob-num js-line-number" data-line-number="183"></td> + <td id="LC183" class="blob-code blob-code-inner js-file-line">:100B600094910895880F991FFC01E05AF0408591F7
</td> + </tr> + <tr> + <td id="L184" class="blob-num js-line-number" data-line-number="184"></td> + <td id="LC184" class="blob-code blob-code-inner js-file-line">:100B700094910895880F991FFC01E052FF4F8591D1
</td> + </tr> + <tr> + <td id="L185" class="blob-num js-line-number" data-line-number="185"></td> + <td id="LC185" class="blob-code blob-code-inner js-file-line">:100B8000949108950F931F93CF93DF93EC018115F8
</td> + </tr> + <tr> + <td id="L186" class="blob-num js-line-number" data-line-number="186"></td> + <td id="LC186" class="blob-code blob-code-inner js-file-line">:100B9000904350F5C11580E2D80708F0B3C0CB3BB5
</td> + </tr> + <tr> + <td id="L187" class="blob-num js-line-number" data-line-number="187"></td> + <td id="LC187" class="blob-code blob-code-inner js-file-line">:100BA000D10590F4C83AD10508F05AC0C53AD1052C
</td> + </tr> + <tr> + <td id="L188" class="blob-num js-line-number" data-line-number="188"></td> + <td id="LC188" class="blob-code blob-code-inner js-file-line">:100BB00008F04BC0C430D10508F0BBC1219709F043
</td> + </tr> + <tr> + <td id="L189" class="blob-num js-line-number" data-line-number="189"></td> + <td id="LC189" class="blob-code blob-code-inner js-file-line">:100BC000B5C101E010E0F5C1CF3FD10511F008F04B
</td> + </tr> + <tr> + <td id="L190" class="blob-num js-line-number" data-line-number="190"></td> + <td id="LC190" class="blob-code blob-code-inner js-file-line">:100BD000B0C1C03FD10508F092C0CE01805E91093E
</td> + </tr> + <tr> + <td id="L191" class="blob-num js-line-number" data-line-number="191"></td> + <td id="LC191" class="blob-code blob-code-inner js-file-line">:100BE000089708F4A6C1A2C1C11591E5D907A8F4D8
</td> + </tr> + <tr> + <td id="L192" class="blob-num js-line-number" data-line-number="192"></td> + <td id="LC192" class="blob-code blob-code-inner js-file-line">:100BF000C23020E5D20708F09EC0C11580E5D807B5
</td> + </tr> + <tr> + <td id="L193" class="blob-num js-line-number" data-line-number="193"></td> + <td id="LC193" class="blob-code blob-code-inner js-file-line">:100C000009F485C008F091C0C11520E4D20708F0AE
</td> + </tr> + <tr> + <td id="L194" class="blob-num js-line-number" data-line-number="194"></td> + <td id="LC194" class="blob-code blob-code-inner js-file-line">:100C10008DC1DD278E01106CCCC1C11580E8D807CD
</td> + </tr> + <tr> + <td id="L195" class="blob-num js-line-number" data-line-number="195"></td> + <td id="LC195" class="blob-code blob-code-inner js-file-line">:100C200058F4C11590E7D90708F07CC1C11520E63A
</td> + </tr> + <tr> + <td id="L196" class="blob-num js-line-number" data-line-number="196"></td> + <td id="LC196" class="blob-code blob-code-inner js-file-line">:100C3000D20708F422C17AC1C11580E9D80708F0AB
</td> + </tr> + <tr> + <td id="L197" class="blob-num js-line-number" data-line-number="197"></td> + <td id="LC197" class="blob-code blob-code-inner js-file-line">:100C400075C1DF708E01106AB4C1C53AD10509F4CF
</td> + </tr> + <tr> + <td id="L198" class="blob-num js-line-number" data-line-number="198"></td> + <td id="LC198" class="blob-code blob-code-inner js-file-line">:100C500072C1C63AD10509F071C102E810E4A9C118
</td> + </tr> + <tr> + <td id="L199" class="blob-num js-line-number" data-line-number="199"></td> + <td id="LC199" class="blob-code blob-code-inner js-file-line">:100C6000C83AD10509F46DC1C93AD10509F46CC17E
</td> + </tr> + <tr> + <td id="L200" class="blob-num js-line-number" data-line-number="200"></td> + <td id="LC200" class="blob-code blob-code-inner js-file-line">:100C7000CA3AD10509F46BC1CB3AD10509F46AC16E
</td> + </tr> + <tr> + <td id="L201" class="blob-num js-line-number" data-line-number="201"></td> + <td id="LC201" class="blob-code blob-code-inner js-file-line">:100C8000CC3AD10509F469C1CD3AD10509F468C15E
</td> + </tr> + <tr> + <td id="L202" class="blob-num js-line-number" data-line-number="202"></td> + <td id="LC202" class="blob-code blob-code-inner js-file-line">:100C9000C03BD10509F467C1CE3AD10509F466C15C
</td> + </tr> + <tr> + <td id="L203" class="blob-num js-line-number" data-line-number="203"></td> + <td id="LC203" class="blob-code blob-code-inner js-file-line">:100CA000CF3AD10509F465C1C13BD10509F464C14E
</td> + </tr> + <tr> + <td id="L204" class="blob-num js-line-number" data-line-number="204"></td> + <td id="LC204" class="blob-code blob-code-inner js-file-line">:100CB000C23BD10509F463C1C33BD10509F462C14C
</td> + </tr> + <tr> + <td id="L205" class="blob-num js-line-number" data-line-number="205"></td> + <td id="LC205" class="blob-code blob-code-inner js-file-line">:100CC000C43BD10509F461C1C53BD10509F460C13C
</td> + </tr> + <tr> + <td id="L206" class="blob-num js-line-number" data-line-number="206"></td> + <td id="LC206" class="blob-code blob-code-inner js-file-line">:100CD000C63BD10509F45FC1C73BD10509F45EC12C
</td> + </tr> + <tr> + <td id="L207" class="blob-num js-line-number" data-line-number="207"></td> + <td id="LC207" class="blob-code blob-code-inner js-file-line">:100CE000C83BD10509F45DC1C93BD10509F45CC11C
</td> + </tr> + <tr> + <td id="L208" class="blob-num js-line-number" data-line-number="208"></td> + <td id="LC208" class="blob-code blob-code-inner js-file-line">:100CF000CA3BD10509F45BC100E014E45AC18E017E
</td> + </tr> + <tr> + <td id="L209" class="blob-num js-line-number" data-line-number="209"></td> + <td id="LC209" class="blob-code blob-code-inner js-file-line">:100D0000106557C1CE019F700E94BA0553C10E9461
</td> + </tr> + <tr> + <td id="L210" class="blob-num js-line-number" data-line-number="210"></td> + <td id="LC210" class="blob-code blob-code-inner js-file-line">:100D100014159FEF24E38CE0915020408040E1F7D0
</td> + </tr> + <tr> + <td id="L211" class="blob-num js-line-number" data-line-number="211"></td> + <td id="LC211" class="blob-code blob-code-inner js-file-line">:100D200000C000000E944F1C44C18091CF0181602F
</td> + </tr> + <tr> + <td id="L212" class="blob-num js-line-number" data-line-number="212"></td> + <td id="LC212" class="blob-code blob-code-inner js-file-line">:100D30008093CF013EC10E94F81D811102C00E9424
</td> + </tr> + <tr> + <td id="L213" class="blob-num js-line-number" data-line-number="213"></td> + <td id="LC213" class="blob-code blob-code-inner js-file-line">:100D4000DE1D0E94151E90E09093F0018093EF014C
</td> + </tr> + <tr> + <td id="L214" class="blob-num js-line-number" data-line-number="214"></td> + <td id="LC214" class="blob-code blob-code-inner js-file-line">:100D5000C23090E5D90721F48091EF01816086C00F
</td> + </tr> + <tr> + <td id="L215" class="blob-num js-line-number" data-line-number="215"></td> + <td id="LC215" class="blob-code blob-code-inner js-file-line">:100D6000C43020E5D20721F48091EF0182607EC07B
</td> + </tr> + <tr> + <td id="L216" class="blob-num js-line-number" data-line-number="216"></td> + <td id="LC216" class="blob-code blob-code-inner js-file-line">:100D7000C63080E5D80721F48091EF01846076C009
</td> + </tr> + <tr> + <td id="L217" class="blob-num js-line-number" data-line-number="217"></td> + <td id="LC217" class="blob-code blob-code-inner js-file-line">:100D8000C83090E5D90719F48091EF0127C0CA3027
</td> + </tr> + <tr> + <td id="L218" class="blob-num js-line-number" data-line-number="218"></td> + <td id="LC218" class="blob-code blob-code-inner js-file-line">:100D900020E5D20721F48091EF01806167C0CC305B
</td> + </tr> + <tr> + <td id="L219" class="blob-num js-line-number" data-line-number="219"></td> + <td id="LC219" class="blob-code blob-code-inner js-file-line">:100DA00080E5D80721F48091EF0180625FC0CE30EA
</td> + </tr> + <tr> + <td id="L220" class="blob-num js-line-number" data-line-number="220"></td> + <td id="LC220" class="blob-code blob-code-inner js-file-line">:100DB00090E5D90721F48091EF01806457C0C031DC
</td> + </tr> + <tr> + <td id="L221" class="blob-num js-line-number" data-line-number="221"></td> + <td id="LC221" class="blob-code blob-code-inner js-file-line">:100DC00020E5D20721F48091EF0180684FC0C23145
</td> + </tr> + <tr> + <td id="L222" class="blob-num js-line-number" data-line-number="222"></td> + <td id="LC222" class="blob-code blob-code-inner js-file-line">:100DD00080E5D80729F48091EF018460886046C0DF
</td> + </tr> + <tr> + <td id="L223" class="blob-num js-line-number" data-line-number="223"></td> + <td id="LC223" class="blob-code blob-code-inner js-file-line">:100DE000C33090E5D90721F48091EF018E7F3EC09A
</td> + </tr> + <tr> + <td id="L224" class="blob-num js-line-number" data-line-number="224"></td> + <td id="LC224" class="blob-code blob-code-inner js-file-line">:100DF000C53020E5D20721F48091EF018D7F36C008
</td> + </tr> + <tr> + <td id="L225" class="blob-num js-line-number" data-line-number="225"></td> + <td id="LC225" class="blob-code blob-code-inner js-file-line">:100E0000C73080E5D80721F48091EF018B7F2EC099
</td> + </tr> + <tr> + <td id="L226" class="blob-num js-line-number" data-line-number="226"></td> + <td id="LC226" class="blob-code blob-code-inner js-file-line">:100E1000C93090E5D90719F48091EF0126C0CB3095
</td> + </tr> + <tr> + <td id="L227" class="blob-num js-line-number" data-line-number="227"></td> + <td id="LC227" class="blob-code blob-code-inner js-file-line">:100E200020E5D20721F48091EF018F7E1FC0CD30E5
</td> + </tr> + <tr> + <td id="L228" class="blob-num js-line-number" data-line-number="228"></td> + <td id="LC228" class="blob-code blob-code-inner js-file-line">:100E300080E5D80721F48091EF018F7D17C0CF3076
</td> + </tr> + <tr> + <td id="L229" class="blob-num js-line-number" data-line-number="229"></td> + <td id="LC229" class="blob-code blob-code-inner js-file-line">:100E400090E5D90721F48091EF018F7B0FC0C1316C
</td> + </tr> + <tr> + <td id="L230" class="blob-num js-line-number" data-line-number="230"></td> + <td id="LC230" class="blob-code blob-code-inner js-file-line">:100E500020E5D20721F48091EF018F7707C0C331DD
</td> + </tr> + <tr> + <td id="L231" class="blob-num js-line-number" data-line-number="231"></td> + <td id="LC231" class="blob-code blob-code-inner js-file-line">:100E6000D04531F48091EF018B7F877F8093EF0134
</td> + </tr> + <tr> + <td id="L232" class="blob-num js-line-number" data-line-number="232"></td> + <td id="LC232" class="blob-code blob-code-inner js-file-line">:100E70008091EF010E94191E9CC08D2F99278F70C1
</td> + </tr> + <tr> + <td id="L233" class="blob-num js-line-number" data-line-number="233"></td> + <td id="LC233" class="blob-code blob-code-inner js-file-line">:100E8000992781309105D9F49E012370332702C040
</td> + </tr> + <tr> + <td id="L234" class="blob-num js-line-number" data-line-number="234"></td> + <td id="LC234" class="blob-code blob-code-inner js-file-line">:100E9000880F991F2A95E2F79C688E0144E0000FA5
</td> + </tr> + <tr> + <td id="L235" class="blob-num js-line-number" data-line-number="235"></td> + <td id="LC235" class="blob-code blob-code-inner js-file-line">:100EA000111F4A95E1F700271370802B912B53E017
</td> + </tr> + <tr> + <td id="L236" class="blob-num js-line-number" data-line-number="236"></td> + <td id="LC236" class="blob-code blob-code-inner js-file-line">:100EB000CC0FDD1F5A95E1F7C076DD272FC08230B9
</td> + </tr> + <tr> + <td id="L237" class="blob-num js-line-number" data-line-number="237"></td> + <td id="LC237" class="blob-code blob-code-inner js-file-line">:100EC000910531F4DC2FCC278E01016F106A71C0BF
</td> + </tr> + <tr> + <td id="L238" class="blob-num js-line-number" data-line-number="238"></td> + <td id="LC238" class="blob-code blob-code-inner js-file-line">:100ED0008330910569F4CE018370992701E010E019
</td> + </tr> + <tr> + <td id="L239" class="blob-num js-line-number" data-line-number="239"></td> + <td id="LC239" class="blob-code blob-code-inner js-file-line">:100EE00002C0000F111F8A95E2F7C8019C680FC06D
</td> + </tr> + <tr> + <td id="L240" class="blob-num js-line-number" data-line-number="240"></td> + <td id="LC240" class="blob-code blob-code-inner js-file-line">:100EF000049709F05EC0CE018370992701E010E0ED
</td> + </tr> + <tr> + <td id="L241" class="blob-num js-line-number" data-line-number="241"></td> + <td id="LC241" class="blob-code blob-code-inner js-file-line">:100F000002C0000F111F8A95E2F7C8019A6823E01A
</td> + </tr> + <tr> + <td id="L242" class="blob-num js-line-number" data-line-number="242"></td> + <td id="LC242" class="blob-code blob-code-inner js-file-line">:100F1000CC0FDD1F2A95E1F7C07ED7708C010C2B1A
</td> + </tr> + <tr> + <td id="L243" class="blob-num js-line-number" data-line-number="243"></td> + <td id="LC243" class="blob-code blob-code-inner js-file-line">:100F20001D2B47C0DF708E01106243C000E010E04F
</td> + </tr> + <tr> + <td id="L244" class="blob-num js-line-number" data-line-number="244"></td> + <td id="LC244" class="blob-code blob-code-inner js-file-line">:100F300040C08E013EC001E810E43BC003E810E46D
</td> + </tr> + <tr> + <td id="L245" class="blob-num js-line-number" data-line-number="245"></td> + <td id="LC245" class="blob-code blob-code-inner js-file-line">:100F400038C002EE14E435C009EE14E432C00AEEF3
</td> + </tr> + <tr> + <td id="L246" class="blob-num js-line-number" data-line-number="246"></td> + <td id="LC246" class="blob-code blob-code-inner js-file-line">:100F500014E42FC005EB14E42CC006EB14E429C004
</td> + </tr> + <tr> + <td id="L247" class="blob-num js-line-number" data-line-number="247"></td> + <td id="LC247" class="blob-code blob-code-inner js-file-line">:100F600007EB14E426C00CEC14E423C00DEC14E4ED
</td> + </tr> + <tr> + <td id="L248" class="blob-num js-line-number" data-line-number="248"></td> + <td id="LC248" class="blob-code blob-code-inner js-file-line">:100F700020C003E815E41DC00AE815E41AC002E920
</td> + </tr> + <tr> + <td id="L249" class="blob-num js-line-number" data-line-number="249"></td> + <td id="LC249" class="blob-code blob-code-inner js-file-line">:100F800015E417C004E915E414C001E216E411C029
</td> + </tr> + <tr> + <td id="L250" class="blob-num js-line-number" data-line-number="250"></td> + <td id="LC250" class="blob-code blob-code-inner js-file-line">:100F900003E216E40EC004E216E40BC005E216E418
</td> + </tr> + <tr> + <td id="L251" class="blob-num js-line-number" data-line-number="251"></td> + <td id="LC251" class="blob-code blob-code-inner js-file-line">:100FA00008C006E216E405C007E216E402C00AE241
</td> + </tr> + <tr> + <td id="L252" class="blob-num js-line-number" data-line-number="252"></td> + <td id="LC252" class="blob-code blob-code-inner js-file-line">:100FB00016E4C801DF91CF911F910F91089596E03B
</td> + </tr> + <tr> + <td id="L253" class="blob-num js-line-number" data-line-number="253"></td> + <td id="LC253" class="blob-code blob-code-inner js-file-line">:100FC000799FF001112494E5899FE00DF11D112412
</td> + </tr> + <tr> + <td id="L254" class="blob-num js-line-number" data-line-number="254"></td> + <td id="LC254" class="blob-code blob-code-inner js-file-line">:100FD000E60FF11DEE0FFF1FEC51FF4F859194912D
</td> + </tr> + <tr> + <td id="L255" class="blob-num js-line-number" data-line-number="255"></td> + <td id="LC255" class="blob-code blob-code-inner js-file-line">:100FE000803E9105E0F4803C910558F581339105F0
</td> + </tr> + <tr> + <td id="L256" class="blob-num js-line-number" data-line-number="256"></td> + <td id="LC256" class="blob-code blob-code-inner js-file-line">:100FF00009F46FC048F48932910509F463C08A325C
</td> + </tr> + <tr> + <td id="L257" class="blob-num js-line-number" data-line-number="257"></td> + <td id="LC257" class="blob-code blob-code-inner js-file-line">:10100000910509F46DC072C089339105E9F0823809
</td> + </tr> + <tr> + <td id="L258" class="blob-num js-line-number" data-line-number="258"></td> + <td id="LC258" class="blob-code blob-code-inner js-file-line">:101010009105D1F08533910509F44DC067C0833E39
</td> + </tr> + <tr> + <td id="L259" class="blob-num js-line-number" data-line-number="259"></td> + <td id="LC259" class="blob-code blob-code-inner js-file-line">:10102000910581F138F4803E9105B9F0823E910539
</td> + </tr> + <tr> + <td id="L260" class="blob-num js-line-number" data-line-number="260"></td> + <td id="LC260" class="blob-code blob-code-inner js-file-line">:10103000D9F05CC0863E910561F1873E9105A1F132
</td> + </tr> + <tr> + <td id="L261" class="blob-num js-line-number" data-line-number="261"></td> + <td id="LC261" class="blob-code blob-code-inner js-file-line">:1010400055C00E94B20508952091EF0120FD02C015
</td> + </tr> + <tr> + <td id="L262" class="blob-num js-line-number" data-line-number="262"></td> + <td id="LC262" class="blob-code blob-code-inner js-file-line">:1010500021FF4CC080EE90E049C08091EF0180FFFD
</td> + </tr> + <tr> + <td id="L263" class="blob-num js-line-number" data-line-number="263"></td> + <td id="LC263" class="blob-code blob-code-inner js-file-line">:10106000F9CF89E390E042C08091EF0182FF0EC08A
</td> + </tr> + <tr> + <td id="L264" class="blob-num js-line-number" data-line-number="264"></td> + <td id="LC264" class="blob-code blob-code-inner js-file-line">:101070008091EF0184FF03C080E090E037C083EEF1
</td> + </tr> + <tr> + <td id="L265" class="blob-num js-line-number" data-line-number="265"></td> + <td id="LC265" class="blob-code blob-code-inner js-file-line">:1010800090E034C08091EF0182FFF2CF82EE90E0D9
</td> + </tr> + <tr> + <td id="L266" class="blob-num js-line-number" data-line-number="266"></td> + <td id="LC266" class="blob-code blob-code-inner js-file-line">:101090002DC08091EF0183FF0BC08091EF0184FD93
</td> + </tr> + <tr> + <td id="L267" class="blob-num js-line-number" data-line-number="267"></td> + <td id="LC267" class="blob-code blob-code-inner js-file-line">:1010A000EBCF87EE90E022C08091EF0183FFF5CF78
</td> + </tr> + <tr> + <td id="L268" class="blob-num js-line-number" data-line-number="268"></td> + <td id="LC268" class="blob-code blob-code-inner js-file-line">:1010B00086EE90E01BC08091EF0185FF07C089E2BA
</td> + </tr> + <tr> + <td id="L269" class="blob-num js-line-number" data-line-number="269"></td> + <td id="LC269" class="blob-code blob-code-inner js-file-line">:1010C00090E014C08091EF0185FFF9CF85E390E0B7
</td> + </tr> + <tr> + <td id="L270" class="blob-num js-line-number" data-line-number="270"></td> + <td id="LC270" class="blob-code blob-code-inner js-file-line">:1010D0000DC08091EF0186FF07C08AE290E006C054
</td> + </tr> + <tr> + <td id="L271" class="blob-num js-line-number" data-line-number="271"></td> + <td id="LC271" class="blob-code blob-code-inner js-file-line">:1010E0008091EF0186FFF9CF81E390E00E94C20575
</td> + </tr> + <tr> + <td id="L272" class="blob-num js-line-number" data-line-number="272"></td> + <td id="LC272" class="blob-code blob-code-inner js-file-line">:1010F000089508950C947908809164010895CF9320
</td> + </tr> + <tr> + <td id="L273" class="blob-num js-line-number" data-line-number="273"></td> + <td id="LC273" class="blob-code blob-code-inner js-file-line">:10110000DF9300D01F92CDB7DEB79C018091E6013E
</td> + </tr> + <tr> + <td id="L274" class="blob-num js-line-number" data-line-number="274"></td> + <td id="LC274" class="blob-code blob-code-inner js-file-line">:10111000843019F593E099833B832A839093E90007
</td> + </tr> + <tr> + <td id="L275" class="blob-num js-line-number" data-line-number="275"></td> + <td id="LC275" class="blob-code blob-code-inner js-file-line">:101120008FEF9091E800815095FD06C095ED9A955E
</td> + </tr> + <tr> + <td id="L276" class="blob-num js-line-number" data-line-number="276"></td> + <td id="LC276" class="blob-code blob-code-inner js-file-line">:10113000F1F700008111F5CF8091E80085FF0DC027
</td> + </tr> + <tr> + <td id="L277" class="blob-num js-line-number" data-line-number="277"></td> + <td id="LC277" class="blob-code blob-code-inner js-file-line">:1011400040E050E063E070E0CE0101960E94EC0ABE
</td> + </tr> + <tr> + <td id="L278" class="blob-num js-line-number" data-line-number="278"></td> + <td id="LC278" class="blob-code blob-code-inner js-file-line">:101150008091E8008E778093E8000F900F900F90B9
</td> + </tr> + <tr> + <td id="L279" class="blob-num js-line-number" data-line-number="279"></td> + <td id="LC279" class="blob-code blob-code-inner js-file-line">:10116000DF91CF910895CF93DF9300D01F92CDB739
</td> + </tr> + <tr> + <td id="L280" class="blob-num js-line-number" data-line-number="280"></td> + <td id="LC280" class="blob-code blob-code-inner js-file-line">:10117000DEB72091E601243021F522E029839B830C
</td> + </tr> + <tr> + <td id="L281" class="blob-num js-line-number" data-line-number="281"></td> + <td id="LC281" class="blob-code blob-code-inner js-file-line">:101180008A8383E08093E9008FEF9091E80081509B
</td> + </tr> + <tr> + <td id="L282" class="blob-num js-line-number" data-line-number="282"></td> + <td id="LC282" class="blob-code blob-code-inner js-file-line">:1011900095FD06C095ED9A95F1F700008111F5CF08
</td> + </tr> + <tr> + <td id="L283" class="blob-num js-line-number" data-line-number="283"></td> + <td id="LC283" class="blob-code blob-code-inner js-file-line">:1011A0008091E80085FF0DC040E050E063E070E012
</td> + </tr> + <tr> + <td id="L284" class="blob-num js-line-number" data-line-number="284"></td> + <td id="LC284" class="blob-code blob-code-inner js-file-line">:1011B000CE0101960E94EC0A8091E8008E77809320
</td> + </tr> + <tr> + <td id="L285" class="blob-num js-line-number" data-line-number="285"></td> + <td id="LC285" class="blob-code blob-code-inner js-file-line">:1011C000E8000F900F900F90DF91CF91089520913C
</td> + </tr> + <tr> + <td id="L286" class="blob-num js-line-number" data-line-number="286"></td> + <td id="LC286" class="blob-code blob-code-inner js-file-line">:1011D000E6012430F1F422E02093E9002FEF309172
</td> + </tr> + <tr> + <td id="L287" class="blob-num js-line-number" data-line-number="287"></td> + <td id="LC287" class="blob-code blob-code-inner js-file-line">:1011E000E800215035FD06C035ED3A95F1F70000D5
</td> + </tr> + <tr> + <td id="L288" class="blob-num js-line-number" data-line-number="288"></td> + <td id="LC288" class="blob-code blob-code-inner js-file-line">:1011F0002111F5CF2091E80025FF0BC040E050E021
</td> + </tr> + <tr> + <td id="L289" class="blob-num js-line-number" data-line-number="289"></td> + <td id="LC289" class="blob-code blob-code-inner js-file-line">:1012000065E070E00E94EC0A8091E8008E778093A0
</td> + </tr> + <tr> + <td id="L290" class="blob-num js-line-number" data-line-number="290"></td> + <td id="LC290" class="blob-code blob-code-inner js-file-line">:10121000E8000895CF93DF93EC019091E6019430BC
</td> + </tr> + <tr> + <td id="L291" class="blob-num js-line-number" data-line-number="291"></td> + <td id="LC291" class="blob-code blob-code-inner js-file-line">:1012200009F046C080910C018823D9F080910D010E
</td> + </tr> + <tr> + <td id="L292" class="blob-num js-line-number" data-line-number="292"></td> + <td id="LC292" class="blob-code blob-code-inner js-file-line">:101230008823B9F09093E9008FEF9091E8008150F6
</td> + </tr> + <tr> + <td id="L293" class="blob-num js-line-number" data-line-number="293"></td> + <td id="LC293" class="blob-code blob-code-inner js-file-line">:1012400095FD06C095E19A95F1F700008111F5CF63
</td> + </tr> + <tr> + <td id="L294" class="blob-num js-line-number" data-line-number="294"></td> + <td id="LC294" class="blob-code blob-code-inner js-file-line">:101250008091E80085FF2CC040E050E060E170E044
</td> + </tr> + <tr> + <td id="L295" class="blob-num js-line-number" data-line-number="295"></td> + <td id="LC295" class="blob-code blob-code-inner js-file-line">:1012600017C081E08093E9008FEF9091E8008150F2
</td> + </tr> + <tr> + <td id="L296" class="blob-num js-line-number" data-line-number="296"></td> + <td id="LC296" class="blob-code blob-code-inner js-file-line">:1012700095FD06C095ED9A95F1F700008111F5CF27
</td> + </tr> + <tr> + <td id="L297" class="blob-num js-line-number" data-line-number="297"></td> + <td id="LC297" class="blob-code blob-code-inner js-file-line">:101280008091E80085FF14C040E050E068E070E025
</td> + </tr> + <tr> + <td id="L298" class="blob-num js-line-number" data-line-number="298"></td> + <td id="LC298" class="blob-code blob-code-inner js-file-line">:10129000CE010E94EC0A8091E8008E778093E800EE
</td> + </tr> + <tr> + <td id="L299" class="blob-num js-line-number" data-line-number="299"></td> + <td id="LC299" class="blob-code blob-code-inner js-file-line">:1012A00080E1FE01A4E5B1E001900D928A95E1F79D
</td> + </tr> + <tr> + <td id="L300" class="blob-num js-line-number" data-line-number="300"></td> + <td id="LC300" class="blob-code blob-code-inner js-file-line">:1012B000DF91CF9108958091E501811109C00E94CD
</td> + </tr> + <tr> + <td id="L301" class="blob-num js-line-number" data-line-number="301"></td> + <td id="LC301" class="blob-code blob-code-inner js-file-line">:1012C000810C0E94DE0C8091E20084608093E20039
</td> + </tr> + <tr> + <td id="L302" class="blob-num js-line-number" data-line-number="302"></td> + <td id="LC302" class="blob-code blob-code-inner js-file-line">:1012D00008951092E501089508950C9487220E94C4
</td> + </tr> + <tr> + <td id="L303" class="blob-num js-line-number" data-line-number="303"></td> + <td id="LC303" class="blob-code blob-code-inner js-file-line">:1012E000E51B0E948D220E94840F0C947A0842E034
</td> + </tr> + <tr> + <td id="L304" class="blob-num js-line-number" data-line-number="304"></td> + <td id="LC304" class="blob-code blob-code-inner js-file-line">:1012F00061EC81E00E94FB0B42E061EC82E00E9425
</td> + </tr> + <tr> + <td id="L305" class="blob-num js-line-number" data-line-number="305"></td> + <td id="LC305" class="blob-code blob-code-inner js-file-line">:10130000FB0B42E061EC83E00E94FB0B42E161ECED
</td> + </tr> + <tr> + <td id="L306" class="blob-num js-line-number" data-line-number="306"></td> + <td id="LC306" class="blob-code blob-code-inner js-file-line">:1013100084E00C94FB0B8091E801833009F455C004
</td> + </tr> + <tr> + <td id="L307" class="blob-num js-line-number" data-line-number="307"></td> + <td id="LC307" class="blob-code blob-code-inner js-file-line">:1013200030F4813071F0823009F48EC008958A3033
</td> + </tr> + <tr> + <td id="L308" class="blob-num js-line-number" data-line-number="308"></td> + <td id="LC308" class="blob-code blob-code-inner js-file-line">:1013300009F47AC08B3009F460C0893009F09CC090
</td> + </tr> + <tr> + <td id="L309" class="blob-num js-line-number" data-line-number="309"></td> + <td id="LC309" class="blob-code blob-code-inner js-file-line">:1013400020C08091E701813A09F096C08091E800C1
</td> + </tr> + <tr> + <td id="L310" class="blob-num js-line-number" data-line-number="310"></td> + <td id="LC310" class="blob-code blob-code-inner js-file-line">:10135000877F8093E8008091EB019091EC01892BCD
</td> + </tr> + <tr> + <td id="L311" class="blob-num js-line-number" data-line-number="311"></td> + <td id="LC311" class="blob-code blob-code-inner js-file-line">:1013600021F460E184E591E003C060E080E090E07A
</td> + </tr> + <tr> + <td id="L312" class="blob-num js-line-number" data-line-number="312"></td> + <td id="LC312" class="blob-code blob-code-inner js-file-line">:1013700070E00E94370B8091E8008B778093E80043
</td> + </tr> + <tr> + <td id="L313" class="blob-num js-line-number" data-line-number="313"></td> + <td id="LC313" class="blob-code blob-code-inner js-file-line">:1013800008958091E701813209F076C08091EB01E8
</td> + </tr> + <tr> + <td id="L314" class="blob-num js-line-number" data-line-number="314"></td> + <td id="LC314" class="blob-code blob-code-inner js-file-line">:101390009091EC01009719F0039709F06DC08091CE
</td> + </tr> + <tr> + <td id="L315" class="blob-num js-line-number" data-line-number="315"></td> + <td id="LC315" class="blob-code blob-code-inner js-file-line">:1013A000E800877F8093E8008091E80082FD05C017
</td> + </tr> + <tr> + <td id="L316" class="blob-num js-line-number" data-line-number="316"></td> + <td id="LC316" class="blob-code blob-code-inner js-file-line">:1013B0008091E6018111F8CF5FC08091F1008093A8
</td> + </tr> + <tr> + <td id="L317" class="blob-num js-line-number" data-line-number="317"></td> + <td id="LC317" class="blob-code blob-code-inner js-file-line">:1013C00064018091E8008B7753C08091E701813AF6
</td> + </tr> + <tr> + <td id="L318" class="blob-num js-line-number" data-line-number="318"></td> + <td id="LC318" class="blob-code blob-code-inner js-file-line">:1013D00009F052C08091EB019091EC01892B09F04A
</td> + </tr> + <tr> + <td id="L319" class="blob-num js-line-number" data-line-number="319"></td> + <td id="LC319" class="blob-code blob-code-inner js-file-line">:1013E0004BC08091E800877F8093E8008091E800FF
</td> + </tr> + <tr> + <td id="L320" class="blob-num js-line-number" data-line-number="320"></td> + <td id="LC320" class="blob-code blob-code-inner js-file-line">:1013F00080FFFCCF80910C0136C08091E7018132E3
</td> + </tr> + <tr> + <td id="L321" class="blob-num js-line-number" data-line-number="321"></td> + <td id="LC321" class="blob-code blob-code-inner js-file-line">:10140000D9F58091EB019091EC01892BA9F58091A0
</td> + </tr> + <tr> + <td id="L322" class="blob-num js-line-number" data-line-number="322"></td> + <td id="LC322" class="blob-code blob-code-inner js-file-line">:10141000E800877F8093E8000E94300C8091E9010A
</td> + </tr> + <tr> + <td id="L323" class="blob-num js-line-number" data-line-number="323"></td> + <td id="LC323" class="blob-code blob-code-inner js-file-line">:1014200080930C010C9414158091E701813221F511
</td> + </tr> + <tr> + <td id="L324" class="blob-num js-line-number" data-line-number="324"></td> + <td id="LC324" class="blob-code blob-code-inner js-file-line">:101430008091E800877F8093E8000E94300C8091C3
</td> + </tr> + <tr> + <td id="L325" class="blob-num js-line-number" data-line-number="325"></td> + <td id="LC325" class="blob-code blob-code-inner js-file-line">:10144000EA018093650108958091E701813AA1F452
</td> + </tr> + <tr> + <td id="L326" class="blob-num js-line-number" data-line-number="326"></td> + <td id="LC326" class="blob-code blob-code-inner js-file-line">:101450008091E800877F8093E8008091E80080FF1A
</td> + </tr> + <tr> + <td id="L327" class="blob-num js-line-number" data-line-number="327"></td> + <td id="LC327" class="blob-code blob-code-inner js-file-line">:10146000FCCF809165018093F1008091E8008E7738
</td> + </tr> + <tr> + <td id="L328" class="blob-num js-line-number" data-line-number="328"></td> + <td id="LC328" class="blob-code blob-code-inner js-file-line">:101470008093E8000C94300C089584B7877F84BF74
</td> + </tr> + <tr> + <td id="L329" class="blob-num js-line-number" data-line-number="329"></td> + <td id="LC329" class="blob-code blob-code-inner js-file-line">:101480000FB6F894A8958091600088618093600001
</td> + </tr> + <tr> + <td id="L330" class="blob-num js-line-number" data-line-number="330"></td> + <td id="LC330" class="blob-code blob-code-inner js-file-line">:10149000109260000FBE90E080E80FB6F894809341
</td> + </tr> + <tr> + <td id="L331" class="blob-num js-line-number" data-line-number="331"></td> + <td id="LC331" class="blob-code blob-code-inner js-file-line">:1014A0006100909361000FBE0E94D30F0E94810CD7
</td> + </tr> + <tr> + <td id="L332" class="blob-num js-line-number" data-line-number="332"></td> + <td id="LC332" class="blob-code blob-code-inner js-file-line">:1014B0000E94DE0C8091E20084608093E2007894C8
</td> + </tr> + <tr> + <td id="L333" class="blob-num js-line-number" data-line-number="333"></td> + <td id="LC333" class="blob-code blob-code-inner js-file-line">:1014C0000E94640F0E94D50F82E091E00E947F0F7E
</td> + </tr> + <tr> + <td id="L334" class="blob-num js-line-number" data-line-number="334"></td> + <td id="LC334" class="blob-code blob-code-inner js-file-line">:1014D0000E9475228091E601853069F40E94A31B69
</td> + </tr> + <tr> + <td id="L335" class="blob-num js-line-number" data-line-number="335"></td> + <td id="LC335" class="blob-code blob-code-inner js-file-line">:1014E0008091E4018823B1F30E94D11B882391F3FA
</td> + </tr> + <tr> + <td id="L336" class="blob-num js-line-number" data-line-number="336"></td> + <td id="LC336" class="blob-code blob-code-inner js-file-line">:1014F0000E94D60AEFCF0E94DB0FECCF292F3327B3
</td> + </tr> + <tr> + <td id="L337" class="blob-num js-line-number" data-line-number="337"></td> + <td id="LC337" class="blob-code blob-code-inner js-file-line">:1015000023303105C9F064F42130310581F02230F7
</td> + </tr> + <tr> + <td id="L338" class="blob-num js-line-number" data-line-number="338"></td> + <td id="LC338" class="blob-code blob-code-inner js-file-line">:10151000310509F043C08DE690E020E133E042C0A0
</td> + </tr> + <tr> + <td id="L339" class="blob-num js-line-number" data-line-number="339"></td> + <td id="LC339" class="blob-code blob-code-inner js-file-line">:1015200021323105F1F02232310541F137C082E13B
</td> + </tr> + <tr> + <td id="L340" class="blob-num js-line-number" data-line-number="340"></td> + <td id="LC340" class="blob-code blob-code-inner js-file-line">:1015300090E02DE733E036C099278130910541F0E6
</td> + </tr> + <tr> + <td id="L341" class="blob-num js-line-number" data-line-number="341"></td> + <td id="LC341" class="blob-code blob-code-inner js-file-line">:101540008230910541F0892B49F5ECE0F3E005C0CC
</td> + </tr> + <tr> + <td id="L342" class="blob-num js-line-number" data-line-number="342"></td> + <td id="LC342" class="blob-code blob-code-inner js-file-line">:10155000E4EFF2E002C0ECEDF2E0849190E09F0154
</td> + </tr> + <tr> + <td id="L343" class="blob-num js-line-number" data-line-number="343"></td> + <td id="LC343" class="blob-code blob-code-inner js-file-line">:1015600021C06430D8F4E62FF0E0EE0FFF1FEE5DEF
</td> + </tr> + <tr> + <td id="L344" class="blob-num js-line-number" data-line-number="344"></td> + <td id="LC344" class="blob-code blob-code-inner js-file-line">:10157000FE4F2081318189E090E014C0643070F426
</td> + </tr> + <tr> + <td id="L345" class="blob-num js-line-number" data-line-number="345"></td> + <td id="LC345" class="blob-code blob-code-inner js-file-line">:1015800070E0FB01EE0FFF1FE65EFE4F2081318110
</td> + </tr> + <tr> + <td id="L346" class="blob-num js-line-number" data-line-number="346"></td> + <td id="LC346" class="blob-code blob-code-inner js-file-line">:10159000FB01EA5EFE4F808190E004C080E090E0B5
</td> + </tr> + <tr> + <td id="L347" class="blob-num js-line-number" data-line-number="347"></td> + <td id="LC347" class="blob-code blob-code-inner js-file-line">:1015A00020E030E0FA0131832083089580E189BD95
</td> + </tr> + <tr> + <td id="L348" class="blob-num js-line-number" data-line-number="348"></td> + <td id="LC348" class="blob-code blob-code-inner js-file-line">:1015B00082E189BD09B400FEFDCF8091D8008F7D06
</td> + </tr> + <tr> + <td id="L349" class="blob-num js-line-number" data-line-number="349"></td> + <td id="LC349" class="blob-code blob-code-inner js-file-line">:1015C0008093D8008091E00082608093E000809159
</td> + </tr> + <tr> + <td id="L350" class="blob-num js-line-number" data-line-number="350"></td> + <td id="LC350" class="blob-code blob-code-inner js-file-line">:1015D000E00081FDFCCF0895CF92DF92EF92FF9261
</td> + </tr> + <tr> + <td id="L351" class="blob-num js-line-number" data-line-number="351"></td> + <td id="LC351" class="blob-code blob-code-inner js-file-line">:1015E0000F931F93CF93DF93EC018B016A010E944D
</td> + </tr> + <tr> + <td id="L352" class="blob-num js-line-number" data-line-number="352"></td> + <td id="LC352" class="blob-code blob-code-inner js-file-line">:1015F0004F0C811133C0C114D10439F0F601808140
</td> + </tr> + <tr> + <td id="L353" class="blob-num js-line-number" data-line-number="353"></td> + <td id="LC353" class="blob-code blob-code-inner js-file-line">:101600009181081B190BC80FD91FE12CF12C011572
</td> + </tr> + <tr> + <td id="L354" class="blob-num js-line-number" data-line-number="354"></td> + <td id="LC354" class="blob-code blob-code-inner js-file-line">:10161000110519F18091E80085FD16C08091E80060
</td> + </tr> + <tr> + <td id="L355" class="blob-num js-line-number" data-line-number="355"></td> + <td id="LC355" class="blob-code blob-code-inner js-file-line">:101620008E778093E800C114D10449F0F6018081DF
</td> + </tr> + <tr> + <td id="L356" class="blob-num js-line-number" data-line-number="356"></td> + <td id="LC356" class="blob-code blob-code-inner js-file-line">:101630009181E80EF91EF182E08285E00FC00E94E0
</td> + </tr> + <tr> + <td id="L357" class="blob-num js-line-number" data-line-number="357"></td> + <td id="LC357" class="blob-code blob-code-inner js-file-line">:101640004F0C882321F30AC089918093F100015047
</td> + </tr> + <tr> + <td id="L358" class="blob-num js-line-number" data-line-number="358"></td> + <td id="LC358" class="blob-code blob-code-inner js-file-line">:101650001109FFEFEF1AFF0ADACF80E0DF91CF9197
</td> + </tr> + <tr> + <td id="L359" class="blob-num js-line-number" data-line-number="359"></td> + <td id="LC359" class="blob-code blob-code-inner js-file-line">:101660001F910F91FF90EF90DF90CF900895209100
</td> + </tr> + <tr> + <td id="L360" class="blob-num js-line-number" data-line-number="360"></td> + <td id="LC360" class="blob-code blob-code-inner js-file-line">:10167000ED013091EE012617370748F0611571052D
</td> + </tr> + <tr> + <td id="L361" class="blob-num js-line-number" data-line-number="361"></td> + <td id="LC361" class="blob-code blob-code-inner js-file-line">:1016800039F42091E8002E772093E80001C0B901D9
</td> + </tr> + <tr> + <td id="L362" class="blob-num js-line-number" data-line-number="362"></td> + <td id="LC362" class="blob-code blob-code-inner js-file-line">:1016900040E061157105A9F12091E601222309F4CA
</td> + </tr> + <tr> + <td id="L363" class="blob-num js-line-number" data-line-number="363"></td> + <td id="LC363" class="blob-code blob-code-inner js-file-line">:1016A00043C0253009F442C02091E80023FD40C02A
</td> + </tr> + <tr> + <td id="L364" class="blob-num js-line-number" data-line-number="364"></td> + <td id="LC364" class="blob-code blob-code-inner js-file-line">:1016B0002091E80022FD32C02091E80020FFE9CF10
</td> + </tr> + <tr> + <td id="L365" class="blob-num js-line-number" data-line-number="365"></td> + <td id="LC365" class="blob-code blob-code-inner js-file-line">:1016C0004091F3002091F20030E0342BFC01CF0177
</td> + </tr> + <tr> + <td id="L366" class="blob-num js-line-number" data-line-number="366"></td> + <td id="LC366" class="blob-code blob-code-inner js-file-line">:1016D0006115710559F02830310540F481918093EE
</td> + </tr> + <tr> + <td id="L367" class="blob-num js-line-number" data-line-number="367"></td> + <td id="LC367" class="blob-code blob-code-inner js-file-line">:1016E000F100615071092F5F3F4FF1CF41E0283089
</td> + </tr> + <tr> + <td id="L368" class="blob-num js-line-number" data-line-number="368"></td> + <td id="LC368" class="blob-code blob-code-inner js-file-line">:1016F000310509F040E02091E8002E772093E800C2
</td> + </tr> + <tr> + <td id="L369" class="blob-num js-line-number" data-line-number="369"></td> + <td id="LC369" class="blob-code blob-code-inner js-file-line">:10170000C8CF4111C9CF0AC08091E601882361F09A
</td> + </tr> + <tr> + <td id="L370" class="blob-num js-line-number" data-line-number="370"></td> + <td id="LC370" class="blob-code blob-code-inner js-file-line">:10171000853061F08091E80083FD0AC08091E80087
</td> + </tr> + <tr> + <td id="L371" class="blob-num js-line-number" data-line-number="371"></td> + <td id="LC371" class="blob-code blob-code-inner js-file-line">:1017200082FFF2CF80E0089582E0089583E008957B
</td> + </tr> + <tr> + <td id="L372" class="blob-num js-line-number" data-line-number="372"></td> + <td id="LC372" class="blob-code blob-code-inner js-file-line">:1017300081E008952091ED013091EE0126173707E1
</td> + </tr> + <tr> + <td id="L373" class="blob-num js-line-number" data-line-number="373"></td> + <td id="LC373" class="blob-code blob-code-inner js-file-line">:1017400048F06115710539F42091E8002E77209357
</td> + </tr> + <tr> + <td id="L374" class="blob-num js-line-number" data-line-number="374"></td> + <td id="LC374" class="blob-code blob-code-inner js-file-line">:10175000E80001C0B901FC0120E06115710591F1BB
</td> + </tr> + <tr> + <td id="L375" class="blob-num js-line-number" data-line-number="375"></td> + <td id="LC375" class="blob-code blob-code-inner js-file-line">:101760008091E601882309F440C0853009F43FC028
</td> + </tr> + <tr> + <td id="L376" class="blob-num js-line-number" data-line-number="376"></td> + <td id="LC376" class="blob-code blob-code-inner js-file-line">:101770008091E80083FD3DC08091E80082FD2FC08C
</td> + </tr> + <tr> + <td id="L377" class="blob-num js-line-number" data-line-number="377"></td> + <td id="LC377" class="blob-code blob-code-inner js-file-line">:101780008091E80080FFE9CF2091F3008091F20082
</td> + </tr> + <tr> + <td id="L378" class="blob-num js-line-number" data-line-number="378"></td> + <td id="LC378" class="blob-code blob-code-inner js-file-line">:1017900090E0922B6115710559F08830910540F465
</td> + </tr> + <tr> + <td id="L379" class="blob-num js-line-number" data-line-number="379"></td> + <td id="LC379" class="blob-code blob-code-inner js-file-line">:1017A00024912093F1003196615071090196F2CF96
</td> + </tr> + <tr> + <td id="L380" class="blob-num js-line-number" data-line-number="380"></td> + <td id="LC380" class="blob-code blob-code-inner js-file-line">:1017B00021E0089709F020E08091E8008E7780937F
</td> + </tr> + <tr> + <td id="L381" class="blob-num js-line-number" data-line-number="381"></td> + <td id="LC381" class="blob-code blob-code-inner js-file-line">:1017C000E800CBCF2111CCCF0AC08091E60188235D
</td> + </tr> + <tr> + <td id="L382" class="blob-num js-line-number" data-line-number="382"></td> + <td id="LC382" class="blob-code blob-code-inner js-file-line">:1017D00061F0853061F08091E80083FD0AC080915E
</td> + </tr> + <tr> + <td id="L383" class="blob-num js-line-number" data-line-number="383"></td> + <td id="LC383" class="blob-code blob-code-inner js-file-line">:1017E000E80082FFF2CF80E0089582E0089583E070
</td> + </tr> + <tr> + <td id="L384" class="blob-num js-line-number" data-line-number="384"></td> + <td id="LC384" class="blob-code blob-code-inner js-file-line">:1017F000089581E00895982F973058F59093E90067
</td> + </tr> + <tr> + <td id="L385" class="blob-num js-line-number" data-line-number="385"></td> + <td id="LC385" class="blob-code blob-code-inner js-file-line">:10180000981739F07091EC002091ED005091F000A4
</td> + </tr> + <tr> + <td id="L386" class="blob-num js-line-number" data-line-number="386"></td> + <td id="LC386" class="blob-code blob-code-inner js-file-line">:1018100003C0242F762F50E021FF19C03091EB0038
</td> + </tr> + <tr> + <td id="L387" class="blob-num js-line-number" data-line-number="387"></td> + <td id="LC387" class="blob-code blob-code-inner js-file-line">:101820003E7F3093EB003091ED003D7F3093ED0033
</td> + </tr> + <tr> + <td id="L388" class="blob-num js-line-number" data-line-number="388"></td> + <td id="LC388" class="blob-code blob-code-inner js-file-line">:101830003091EB0031603093EB007093EC0020931B
</td> + </tr> + <tr> + <td id="L389" class="blob-num js-line-number" data-line-number="389"></td> + <td id="LC389" class="blob-code blob-code-inner js-file-line">:10184000ED005093F0002091EE0027FF07C09F5F4E
</td> + </tr> + <tr> + <td id="L390" class="blob-num js-line-number" data-line-number="390"></td> + <td id="LC390" class="blob-code blob-code-inner js-file-line">:10185000D3CF8F708093E90081E0089580E00895F0
</td> + </tr> + <tr> + <td id="L391" class="blob-num js-line-number" data-line-number="391"></td> + <td id="LC391" class="blob-code blob-code-inner js-file-line">:101860008091E70187FF11C08091E80082FD05C0EB
</td> + </tr> + <tr> + <td id="L392" class="blob-num js-line-number" data-line-number="392"></td> + <td id="LC392" class="blob-code blob-code-inner js-file-line">:101870008091E6018111F8CF11C08091E8008B774B
</td> + </tr> + <tr> + <td id="L393" class="blob-num js-line-number" data-line-number="393"></td> + <td id="LC393" class="blob-code blob-code-inner js-file-line">:101880000BC08091E601882349F08091E80080FF39
</td> + </tr> + <tr> + <td id="L394" class="blob-num js-line-number" data-line-number="394"></td> + <td id="LC394" class="blob-code blob-code-inner js-file-line">:10189000F8CF8091E8008E778093E800089520913A
</td> + </tr> + <tr> + <td id="L395" class="blob-num js-line-number" data-line-number="395"></td> + <td id="LC395" class="blob-code blob-code-inner js-file-line">:1018A000E4003091E50095E64091EC00842F8170D2
</td> + </tr> + <tr> + <td id="L396" class="blob-num js-line-number" data-line-number="396"></td> + <td id="LC396" class="blob-code blob-code-inner js-file-line">:1018B00040FF22C08091E80080FD1CC08091E601BD
</td> + </tr> + <tr> + <td id="L397" class="blob-num js-line-number" data-line-number="397"></td> + <td id="LC397" class="blob-code blob-code-inner js-file-line">:1018C000882391F0853091F08091EB0085FD10C068
</td> + </tr> + <tr> + <td id="L398" class="blob-num js-line-number" data-line-number="398"></td> + <td id="LC398" class="blob-code blob-code-inner js-file-line">:1018D0004091E4005091E5004217530729F39A0123
</td> + </tr> + <tr> + <td id="L399" class="blob-num js-line-number" data-line-number="399"></td> + <td id="LC399" class="blob-code blob-code-inner js-file-line">:1018E000915011F784E0089582E0089583E008950F
</td> + </tr> + <tr> + <td id="L400" class="blob-num js-line-number" data-line-number="400"></td> + <td id="LC400" class="blob-code blob-code-inner js-file-line">:1018F00081E0089580E008954091E80042FFDECF46
</td> + </tr> + <tr> + <td id="L401" class="blob-num js-line-number" data-line-number="401"></td> + <td id="LC401" class="blob-code blob-code-inner js-file-line">:1019000008950E94EF0C0E94F70CE0EEF0E0808159
</td> + </tr> + <tr> + <td id="L402" class="blob-num js-line-number" data-line-number="402"></td> + <td id="LC402" class="blob-code blob-code-inner js-file-line">:1019100081608083E8EDF0E080818F77808319BC5F
</td> + </tr> + <tr> + <td id="L403" class="blob-num js-line-number" data-line-number="403"></td> + <td id="LC403" class="blob-code blob-code-inner js-file-line">:10192000A7EDB0E08C918E7F8C9380818F7E808339
</td> + </tr> + <tr> + <td id="L404" class="blob-num js-line-number" data-line-number="404"></td> + <td id="LC404" class="blob-code blob-code-inner js-file-line">:101930001092E50108950F931F93CF93DF930E94B8
</td> + </tr> + <tr> + <td id="L405" class="blob-num js-line-number" data-line-number="405"></td> + <td id="LC405" class="blob-code blob-code-inner js-file-line">:10194000EF0C0E94F70CC8EDD0E088818F77888378
</td> + </tr> + <tr> + <td id="L406" class="blob-num js-line-number" data-line-number="406"></td> + <td id="LC406" class="blob-code blob-code-inner js-file-line">:1019500088818068888388818F7D888319BC1092F4
</td> + </tr> + <tr> + <td id="L407" class="blob-num js-line-number" data-line-number="407"></td> + <td id="LC407" class="blob-code blob-code-inner js-file-line">:10196000E6011092E2011092E4011092E30100EE10
</td> + </tr> + <tr> + <td id="L408" class="blob-num js-line-number" data-line-number="408"></td> + <td id="LC408" class="blob-code blob-code-inner js-file-line">:1019700010E0F80180818B7F80838881816088837B
</td> + </tr> + <tr> + <td id="L409" class="blob-num js-line-number" data-line-number="409"></td> + <td id="LC409" class="blob-code blob-code-inner js-file-line">:1019800042E060E080E00E94FB0BE1EEF0E080814D
</td> + </tr> + <tr> + <td id="L410" class="blob-num js-line-number" data-line-number="410"></td> + <td id="LC410" class="blob-code blob-code-inner js-file-line">:101990008E7F8083E2EEF0E08081816080838081B1
</td> + </tr> + <tr> + <td id="L411" class="blob-num js-line-number" data-line-number="411"></td> + <td id="LC411" class="blob-code blob-code-inner js-file-line">:1019A00088608083F80180818E7F80838881806158
</td> + </tr> + <tr> + <td id="L412" class="blob-num js-line-number" data-line-number="412"></td> + <td id="LC412" class="blob-code blob-code-inner js-file-line">:1019B0008883DF91CF911F910F910895E8EDF0E0BA
</td> + </tr> + <tr> + <td id="L413" class="blob-num js-line-number" data-line-number="413"></td> + <td id="LC413" class="blob-code blob-code-inner js-file-line">:1019C00080818F7E8083E7EDF0E08081816080837D
</td> + </tr> + <tr> + <td id="L414" class="blob-num js-line-number" data-line-number="414"></td> + <td id="LC414" class="blob-code blob-code-inner js-file-line">:1019D00084E082BF81E08093E5010C949B0CE8EDEC
</td> + </tr> + <tr> + <td id="L415" class="blob-num js-line-number" data-line-number="415"></td> + <td id="LC415" class="blob-code blob-code-inner js-file-line">:1019E000F0E080818E7F80831092E2000895109253
</td> + </tr> + <tr> + <td id="L416" class="blob-num js-line-number" data-line-number="416"></td> + <td id="LC416" class="blob-code blob-code-inner js-file-line">:1019F000DA001092E10008951F920F920FB60F9235
</td> + </tr> + <tr> + <td id="L417" class="blob-num js-line-number" data-line-number="417"></td> + <td id="LC417" class="blob-code blob-code-inner js-file-line">:101A000011242F933F934F935F936F937F938F9303
</td> + </tr> + <tr> + <td id="L418" class="blob-num js-line-number" data-line-number="418"></td> + <td id="LC418" class="blob-code blob-code-inner js-file-line">:101A10009F93AF93BF93EF93FF938091E10082FF79
</td> + </tr> + <tr> + <td id="L419" class="blob-num js-line-number" data-line-number="419"></td> + <td id="LC419" class="blob-code blob-code-inner js-file-line">:101A20000BC08091E20082FF07C08091E1008B7FB4
</td> + </tr> + <tr> + <td id="L420" class="blob-num js-line-number" data-line-number="420"></td> + <td id="LC420" class="blob-code blob-code-inner js-file-line">:101A30008093E1000E94630F8091DA0080FF1FC055
</td> + </tr> + <tr> + <td id="L421" class="blob-num js-line-number" data-line-number="421"></td> + <td id="LC421" class="blob-code blob-code-inner js-file-line">:101A40008091D80080FF1BC08091DA008E7F809348
</td> + </tr> + <tr> + <td id="L422" class="blob-num js-line-number" data-line-number="422"></td> + <td id="LC422" class="blob-code blob-code-inner js-file-line">:101A5000DA008091D90080FF0DC080E189BD82E16C
</td> + </tr> + <tr> + <td id="L423" class="blob-num js-line-number" data-line-number="423"></td> + <td id="LC423" class="blob-code blob-code-inner js-file-line">:101A600089BD09B400FEFDCF81E08093E6010E94AC
</td> + </tr> + <tr> + <td id="L424" class="blob-num js-line-number" data-line-number="424"></td> + <td id="LC424" class="blob-code blob-code-inner js-file-line">:101A70005B0905C019BC1092E6010E9469098091BA
</td> + </tr> + <tr> + <td id="L425" class="blob-num js-line-number" data-line-number="425"></td> + <td id="LC425" class="blob-code blob-code-inner js-file-line">:101A8000E10080FF19C08091E20080FF15C08091C5
</td> + </tr> + <tr> + <td id="L426" class="blob-num js-line-number" data-line-number="426"></td> + <td id="LC426" class="blob-code blob-code-inner js-file-line">:101A9000E2008E7F8093E2008091E200806180937B
</td> + </tr> + <tr> + <td id="L427" class="blob-num js-line-number" data-line-number="427"></td> + <td id="LC427" class="blob-code blob-code-inner js-file-line">:101AA000E2008091D80080628093D80019BC85E064
</td> + </tr> + <tr> + <td id="L428" class="blob-num js-line-number" data-line-number="428"></td> + <td id="LC428" class="blob-code blob-code-inner js-file-line">:101AB0008093E6010E946D098091E10084FF30C0AF
</td> + </tr> + <tr> + <td id="L429" class="blob-num js-line-number" data-line-number="429"></td> + <td id="LC429" class="blob-code blob-code-inner js-file-line">:101AC0008091E20084FF2CC080E189BD82E189BD64
</td> + </tr> + <tr> + <td id="L430" class="blob-num js-line-number" data-line-number="430"></td> + <td id="LC430" class="blob-code blob-code-inner js-file-line">:101AD00009B400FEFDCF8091D8008F7D8093D8009F
</td> + </tr> + <tr> + <td id="L431" class="blob-num js-line-number" data-line-number="431"></td> + <td id="LC431" class="blob-code blob-code-inner js-file-line">:101AE0008091E1008F7E8093E1008091E2008F7E03
</td> + </tr> + <tr> + <td id="L432" class="blob-num js-line-number" data-line-number="432"></td> + <td id="LC432" class="blob-code blob-code-inner js-file-line">:101AF0008093E2008091E20081608093E200809117
</td> + </tr> + <tr> + <td id="L433" class="blob-num js-line-number" data-line-number="433"></td> + <td id="LC433" class="blob-code blob-code-inner js-file-line">:101B0000E201882311F084E007C08091E30087FDA3
</td> + </tr> + <tr> + <td id="L434" class="blob-num js-line-number" data-line-number="434"></td> + <td id="LC434" class="blob-code blob-code-inner js-file-line">:101B100002C081E001C083E08093E6010E946F096A
</td> + </tr> + <tr> + <td id="L435" class="blob-num js-line-number" data-line-number="435"></td> + <td id="LC435" class="blob-code blob-code-inner js-file-line">:101B20008091E10083FF29C08091E20083FF25C0FE
</td> + </tr> + <tr> + <td id="L436" class="blob-num js-line-number" data-line-number="436"></td> + <td id="LC436" class="blob-code blob-code-inner js-file-line">:101B30008091E100877F8093E10082E08093E6015D
</td> + </tr> + <tr> + <td id="L437" class="blob-num js-line-number" data-line-number="437"></td> + <td id="LC437" class="blob-code blob-code-inner js-file-line">:101B40001092E2018091E1008E7F8093E10080910C
</td> + </tr> + <tr> + <td id="L438" class="blob-num js-line-number" data-line-number="438"></td> + <td id="LC438" class="blob-code blob-code-inner js-file-line">:101B5000E2008E7F8093E2008091E20080618093BA
</td> + </tr> + <tr> + <td id="L439" class="blob-num js-line-number" data-line-number="439"></td> + <td id="LC439" class="blob-code blob-code-inner js-file-line">:101B6000E20042E060E080E00E94FB0B8091F00028
</td> + </tr> + <tr> + <td id="L440" class="blob-num js-line-number" data-line-number="440"></td> + <td id="LC440" class="blob-code blob-code-inner js-file-line">:101B700088608093F0000E946C09FF91EF91BF9103
</td> + </tr> + <tr> + <td id="L441" class="blob-num js-line-number" data-line-number="441"></td> + <td id="LC441" class="blob-code blob-code-inner js-file-line">:101B8000AF919F918F917F916F915F914F913F9115
</td> + </tr> + <tr> + <td id="L442" class="blob-num js-line-number" data-line-number="442"></td> + <td id="LC442" class="blob-code blob-code-inner js-file-line">:101B90002F910F900FBE0F901F9018951F920F92CC
</td> + </tr> + <tr> + <td id="L443" class="blob-num js-line-number" data-line-number="443"></td> + <td id="LC443" class="blob-code blob-code-inner js-file-line">:101BA0000FB60F9211242F933F934F935F936F9330
</td> + </tr> + <tr> + <td id="L444" class="blob-num js-line-number" data-line-number="444"></td> + <td id="LC444" class="blob-code blob-code-inner js-file-line">:101BB0007F938F939F93AF93BF93CF93DF93EF93D5
</td> + </tr> + <tr> + <td id="L445" class="blob-num js-line-number" data-line-number="445"></td> + <td id="LC445" class="blob-code blob-code-inner js-file-line">:101BC000FF93C091E900CF708091EC00D82FD170C5
</td> + </tr> + <tr> + <td id="L446" class="blob-num js-line-number" data-line-number="446"></td> + <td id="LC446" class="blob-code blob-code-inner js-file-line">:101BD00080FDD0E81092E9008091F000877F80932B
</td> + </tr> + <tr> + <td id="L447" class="blob-num js-line-number" data-line-number="447"></td> + <td id="LC447" class="blob-code blob-code-inner js-file-line">:101BE000F00078940E94120E1092E9008091F000AB
</td> + </tr> + <tr> + <td id="L448" class="blob-num js-line-number" data-line-number="448"></td> + <td id="LC448" class="blob-code blob-code-inner js-file-line">:101BF00088608093F000CD2BCF70C093E900FF91F7
</td> + </tr> + <tr> + <td id="L449" class="blob-num js-line-number" data-line-number="449"></td> + <td id="LC449" class="blob-code blob-code-inner js-file-line">:101C0000EF91DF91CF91BF91AF919F918F917F9194
</td> + </tr> + <tr> + <td id="L450" class="blob-num js-line-number" data-line-number="450"></td> + <td id="LC450" class="blob-code blob-code-inner js-file-line">:101C10006F915F914F913F912F910F900FBE0F9059
</td> + </tr> + <tr> + <td id="L451" class="blob-num js-line-number" data-line-number="451"></td> + <td id="LC451" class="blob-code blob-code-inner js-file-line">:101C20001F9018951F93CF93DF93CDB7DEB7AA9778
</td> + </tr> + <tr> + <td id="L452" class="blob-num js-line-number" data-line-number="452"></td> + <td id="LC452" class="blob-code blob-code-inner js-file-line">:101C30000FB6F894DEBF0FBECDBFE7EEF1E088E04F
</td> + </tr> + <tr> + <td id="L453" class="blob-num js-line-number" data-line-number="453"></td> + <td id="LC453" class="blob-code blob-code-inner js-file-line">:101C40008E0F9091F10091938E13FBCF0E948B0920
</td> + </tr> + <tr> + <td id="L454" class="blob-num js-line-number" data-line-number="454"></td> + <td id="LC454" class="blob-code blob-code-inner js-file-line">:101C50008091E80083FF1FC18091E7019091E80126
</td> + </tr> + <tr> + <td id="L455" class="blob-num js-line-number" data-line-number="455"></td> + <td id="LC455" class="blob-code blob-code-inner js-file-line">:101C6000492F50E04A30510508F015C1FA01EA5AEF
</td> + </tr> + <tr> + <td id="L456" class="blob-num js-line-number" data-line-number="456"></td> + <td id="LC456" class="blob-code blob-code-inner js-file-line">:101C7000FF4F0C941E24803881F0823809F00BC18C
</td> + </tr> + <tr> + <td id="L457" class="blob-num js-line-number" data-line-number="457"></td> + <td id="LC457" class="blob-code blob-code-inner js-file-line">:101C80008091EB018F708093E9008091EB0085FBE0
</td> + </tr> + <tr> + <td id="L458" class="blob-num js-line-number" data-line-number="458"></td> + <td id="LC458" class="blob-code blob-code-inner js-file-line">:101C9000882780F91092E90006C08091E3019091B5
</td> + </tr> + <tr> + <td id="L459" class="blob-num js-line-number" data-line-number="459"></td> + <td id="LC459" class="blob-code blob-code-inner js-file-line">:101CA000E401911182609091E800977F9093E800A1
</td> + </tr> + <tr> + <td id="L460" class="blob-num js-line-number" data-line-number="460"></td> + <td id="LC460" class="blob-code blob-code-inner js-file-line">:101CB0008093F1001092F100C8C0282F2D7F09F009
</td> + </tr> + <tr> + <td id="L461" class="blob-num js-line-number" data-line-number="461"></td> + <td id="LC461" class="blob-code blob-code-inner js-file-line">:101CC000EAC0882319F0823061F0E5C08091E90113
</td> + </tr> + <tr> + <td id="L462" class="blob-num js-line-number" data-line-number="462"></td> + <td id="LC462" class="blob-code blob-code-inner js-file-line">:101CD000813009F0E0C0933009F080E08093E401A6
</td> + </tr> + <tr> + <td id="L463" class="blob-num js-line-number" data-line-number="463"></td> + <td id="LC463" class="blob-code blob-code-inner js-file-line">:101CE0002BC08091E901811127C08091EB018F7099
</td> + </tr> + <tr> + <td id="L464" class="blob-num js-line-number" data-line-number="464"></td> + <td id="LC464" class="blob-code blob-code-inner js-file-line">:101CF00009F4D1C08093E9002091EB0020FF1CC0C3
</td> + </tr> + <tr> + <td id="L465" class="blob-num js-line-number" data-line-number="465"></td> + <td id="LC465" class="blob-code blob-code-inner js-file-line">:101D0000933021F48091EB00806214C09091EB003D
</td> + </tr> + <tr> + <td id="L466" class="blob-num js-line-number" data-line-number="466"></td> + <td id="LC466" class="blob-code blob-code-inner js-file-line">:101D100090619093EB0021E030E0A90102C0440FF4
</td> + </tr> + <tr> + <td id="L467" class="blob-num js-line-number" data-line-number="467"></td> + <td id="LC467" class="blob-code blob-code-inner js-file-line">:101D2000551F8A95E2F74093EA001092EA008091ED
</td> + </tr> + <tr> + <td id="L468" class="blob-num js-line-number" data-line-number="468"></td> + <td id="LC468" class="blob-code blob-code-inner js-file-line">:101D3000EB0088608093EB001092E9008091E8004E
</td> + </tr> + <tr> + <td id="L469" class="blob-num js-line-number" data-line-number="469"></td> + <td id="LC469" class="blob-code blob-code-inner js-file-line">:101D4000877F86C08111A7C01091E9011F7780911C
</td> + </tr> + <tr> + <td id="L470" class="blob-num js-line-number" data-line-number="470"></td> + <td id="LC470" class="blob-code blob-code-inner js-file-line">:101D5000E3008078812B8093E3008091E800877F07
</td> + </tr> + <tr> + <td id="L471" class="blob-num js-line-number" data-line-number="471"></td> + <td id="LC471" class="blob-code blob-code-inner js-file-line">:101D60008093E8000E94300C8091E80080FFFCCF57
</td> + </tr> + <tr> + <td id="L472" class="blob-num js-line-number" data-line-number="472"></td> + <td id="LC472" class="blob-code blob-code-inner js-file-line">:101D70008091E30080688093E300111102C082E04B
</td> + </tr> + <tr> + <td id="L473" class="blob-num js-line-number" data-line-number="473"></td> + <td id="LC473" class="blob-code blob-code-inner js-file-line">:101D800001C083E08093E60186C08058823008F06D
</td> + </tr> + <tr> + <td id="L474" class="blob-num js-line-number" data-line-number="474"></td> + <td id="LC474" class="blob-code blob-code-inner js-file-line">:101D900082C08091E9019091EA018C3D53E0950762
</td> + </tr> + <tr> + <td id="L475" class="blob-num js-line-number" data-line-number="475"></td> + <td id="LC475" class="blob-code blob-code-inner js-file-line">:101DA00079F583E08A838AE289834FB7F894DE016C
</td> + </tr> + <tr> + <td id="L476" class="blob-num js-line-number" data-line-number="476"></td> + <td id="LC476" class="blob-code blob-code-inner js-file-line">:101DB000139620E03EE051E2E32FF0E0509357000D
</td> + </tr> + <tr> + <td id="L477" class="blob-num js-line-number" data-line-number="477"></td> + <td id="LC477" class="blob-code blob-code-inner js-file-line">:101DC000E49120FF03C0E295EF703F5FEF708E2F2C
</td> + </tr> + <tr> + <td id="L478" class="blob-num js-line-number" data-line-number="478"></td> + <td id="LC478" class="blob-code blob-code-inner js-file-line">:101DD00090E0EA3010F0C79601C0C0968D939D93B5
</td> + </tr> + <tr> + <td id="L479" class="blob-num js-line-number" data-line-number="479"></td> + <td id="LC479" class="blob-code blob-code-inner js-file-line">:101DE0002F5F243149F74FBF8091E800877F8093B0
</td> + </tr> + <tr> + <td id="L480" class="blob-num js-line-number" data-line-number="480"></td> + <td id="LC480" class="blob-code blob-code-inner js-file-line">:101DF000E8006AE270E0CE0101960E94370B14C041
</td> + </tr> + <tr> + <td id="L481" class="blob-num js-line-number" data-line-number="481"></td> + <td id="LC481" class="blob-code blob-code-inner js-file-line">:101E0000AE014F5F5F4F6091EB010E947E0ABC0103
</td> + </tr> + <tr> + <td id="L482" class="blob-num js-line-number" data-line-number="482"></td> + <td id="LC482" class="blob-code blob-code-inner js-file-line">:101E1000892B09F440C09091E800977F9093E800E7
</td> + </tr> + <tr> + <td id="L483" class="blob-num js-line-number" data-line-number="483"></td> + <td id="LC483" class="blob-code blob-code-inner js-file-line">:101E200089819A810E949A0B8091E8008B77809338
</td> + </tr> + <tr> + <td id="L484" class="blob-num js-line-number" data-line-number="484"></td> + <td id="LC484" class="blob-code blob-code-inner js-file-line">:101E3000E80031C0803879F58091E800877F809391
</td> + </tr> + <tr> + <td id="L485" class="blob-num js-line-number" data-line-number="485"></td> + <td id="LC485" class="blob-code blob-code-inner js-file-line">:101E4000E8008091E2018093F1008091E8008E77B4
</td> + </tr> + <tr> + <td id="L486" class="blob-num js-line-number" data-line-number="486"></td> + <td id="LC486" class="blob-code blob-code-inner js-file-line">:101E50008093E8000E94300C1EC081111CC090913C
</td> + </tr> + <tr> + <td id="L487" class="blob-num js-line-number" data-line-number="487"></td> + <td id="LC487" class="blob-code blob-code-inner js-file-line">:101E6000E9019230C0F48091E800877F8093E80018
</td> + </tr> + <tr> + <td id="L488" class="blob-num js-line-number" data-line-number="488"></td> + <td id="LC488" class="blob-code blob-code-inner js-file-line">:101E70009093E2010E94300C8091E201811106C032
</td> + </tr> + <tr> + <td id="L489" class="blob-num js-line-number" data-line-number="489"></td> + <td id="LC489" class="blob-code blob-code-inner js-file-line">:101E80008091E30087FD02C081E001C084E080937F
</td> + </tr> + <tr> + <td id="L490" class="blob-num js-line-number" data-line-number="490"></td> + <td id="LC490" class="blob-code blob-code-inner js-file-line">:101E9000E6010E9477098091E80083FF0AC08091E3
</td> + </tr> + <tr> + <td id="L491" class="blob-num js-line-number" data-line-number="491"></td> + <td id="LC491" class="blob-code blob-code-inner js-file-line">:101EA000E800877F8093E8008091EB008062809358
</td> + </tr> + <tr> + <td id="L492" class="blob-num js-line-number" data-line-number="492"></td> + <td id="LC492" class="blob-code blob-code-inner js-file-line">:101EB000EB00AA960FB6F894DEBF0FBECDBFDF9140
</td> + </tr> + <tr> + <td id="L493" class="blob-num js-line-number" data-line-number="493"></td> + <td id="LC493" class="blob-code blob-code-inner js-file-line">:101EC000CF911F9108950895CF938091E6018823C3
</td> + </tr> + <tr> + <td id="L494" class="blob-num js-line-number" data-line-number="494"></td> + <td id="LC494" class="blob-code blob-code-inner js-file-line">:101ED000A1F0C091E900CF709091EC00892F817042
</td> + </tr> + <tr> + <td id="L495" class="blob-num js-line-number" data-line-number="495"></td> + <td id="LC495" class="blob-code blob-code-inner js-file-line">:101EE00090FD80E8C82B1092E9008091E80083FD06
</td> + </tr> + <tr> + <td id="L496" class="blob-num js-line-number" data-line-number="496"></td> + <td id="LC496" class="blob-code blob-code-inner js-file-line">:101EF0000E94120ECF70C093E900CF910895909385
</td> + </tr> + <tr> + <td id="L497" class="blob-num js-line-number" data-line-number="497"></td> + <td id="LC497" class="blob-code blob-code-inner js-file-line">:101F00006B0180936A010895E0916A01F0916B0181
</td> + </tr> + <tr> + <td id="L498" class="blob-num js-line-number" data-line-number="498"></td> + <td id="LC498" class="blob-code blob-code-inner js-file-line">:101F1000309721F00190F081E02D099480E0089540
</td> + </tr> + <tr> + <td id="L499" class="blob-num js-line-number" data-line-number="499"></td> + <td id="LC499" class="blob-code blob-code-inner js-file-line">:101F2000E0916A01F0916B01309721F00280F3811A
</td> + </tr> + <tr> + <td id="L500" class="blob-num js-line-number" data-line-number="500"></td> + <td id="LC500" class="blob-code blob-code-inner js-file-line">:101F3000E02D09940895E0916A01F0916B013097CA
</td> + </tr> + <tr> + <td id="L501" class="blob-num js-line-number" data-line-number="501"></td> + <td id="LC501" class="blob-code blob-code-inner js-file-line">:101F400021F00480F581E02D099408952091680125
</td> + </tr> + <tr> + <td id="L502" class="blob-num js-line-number" data-line-number="502"></td> + <td id="LC502" class="blob-code blob-code-inner js-file-line">:101F5000309169018217930771F090936901809322
</td> + </tr> + <tr> + <td id="L503" class="blob-num js-line-number" data-line-number="503"></td> + <td id="LC503" class="blob-code blob-code-inner js-file-line">:101F60006801E0916A01F0916B01309721F00680E1
</td> + </tr> + <tr> + <td id="L504" class="blob-num js-line-number" data-line-number="504"></td> + <td id="LC504" class="blob-code blob-code-inner js-file-line">:101F7000F781E02D09940895209166013091670161
</td> + </tr> + <tr> + <td id="L505" class="blob-num js-line-number" data-line-number="505"></td> + <td id="LC505" class="blob-code blob-code-inner js-file-line">:101F80008217930771F09093670180936601E09147
</td> + </tr> + <tr> + <td id="L506" class="blob-num js-line-number" data-line-number="506"></td> + <td id="LC506" class="blob-code blob-code-inner js-file-line">:101F90006A01F0916B01309721F00084F185E02D0A
</td> + </tr> + <tr> + <td id="L507" class="blob-num js-line-number" data-line-number="507"></td> + <td id="LC507" class="blob-code blob-code-inner js-file-line">:101FA0000994089508950C94D20F0E94EB1B0E948F
</td> + </tr> + <tr> + <td id="L508" class="blob-num js-line-number" data-line-number="508"></td> + <td id="LC508" class="blob-code blob-code-inner js-file-line">:101FB00092040C94B11CCF92DF92EF92FF920F9398
</td> + </tr> + <tr> + <td id="L509" class="blob-num js-line-number" data-line-number="509"></td> + <td id="LC509" class="blob-code blob-code-inner js-file-line">:101FC0001F93CF93DF93CDB7DEB72B970FB6F8945F
</td> + </tr> + <tr> + <td id="L510" class="blob-num js-line-number" data-line-number="510"></td> + <td id="LC510" class="blob-code blob-code-inner js-file-line">:101FD000DEBF0FBECDBF0E94AA048DE6C82E81E0F1
</td> + </tr> + <tr> + <td id="L511" class="blob-num js-line-number" data-line-number="511"></td> + <td id="LC511" class="blob-code blob-code-inner js-file-line">:101FE000D82E00E010E0E02E802F0E949805F60128
</td> + </tr> + <tr> + <td id="L512" class="blob-num js-line-number" data-line-number="512"></td> + <td id="LC512" class="blob-code blob-code-inner js-file-line">:101FF00041916F01F42EF826B1F40F5F1F4F0E30A0
</td> + </tr> + <tr> + <td id="L513" class="blob-num js-line-number" data-line-number="513"></td> + <td id="LC513" class="blob-code blob-code-inner js-file-line">:10200000110589F78FEF89838A831B820E94F41B55
</td> + </tr> + <tr> + <td id="L514" class="blob-num js-line-number" data-line-number="514"></td> + <td id="LC514" class="blob-code blob-code-inner js-file-line">:102010008160782F9D838C8349815A816B818D816A
</td> + </tr> + <tr> + <td id="L515" class="blob-num js-line-number" data-line-number="515"></td> + <td id="LC515" class="blob-code blob-code-inner js-file-line">:102020000E947E1040C09091CF0191FF04C08B8729
</td> + </tr> + <tr> + <td id="L516" class="blob-num js-line-number" data-line-number="516"></td> + <td id="LC516" class="blob-code blob-code-inner js-file-line">:102030000E949E058B8520E030E04F2D50E0922FCE
</td> + </tr> + <tr> + <td id="L517" class="blob-num js-line-number" data-line-number="517"></td> + <td id="LC517" class="blob-code blob-code-inner js-file-line">:10204000BA01022E02C0759567950A94E2F760FF07
</td> + </tr> + <tr> + <td id="L518" class="blob-num js-line-number" data-line-number="518"></td> + <td id="LC518" class="blob-code blob-code-inner js-file-line">:1020500024C02E83EF8221E030E0690102C0CC0C65
</td> + </tr> + <tr> + <td id="L519" class="blob-num js-line-number" data-line-number="519"></td> + <td id="LC519" class="blob-code blob-code-inner js-file-line">:10206000DD1C9A95E2F790E08C219D21892B09F4E3
</td> + </tr> + <tr> + <td id="L520" class="blob-num js-line-number" data-line-number="520"></td> + <td id="LC520" class="blob-code blob-code-inner js-file-line">:1020700020E028870E94F41B8160782F9A87898747
</td> + </tr> + <tr> + <td id="L521" class="blob-num js-line-number" data-line-number="521"></td> + <td id="LC521" class="blob-code blob-code-inner js-file-line">:102080004E815F8168858A850E947E10F801E35940
</td> + </tr> + <tr> + <td id="L522" class="blob-num js-line-number" data-line-number="522"></td> + <td id="LC522" class="blob-code blob-code-inner js-file-line">:10209000FE4F8081C826C08206C02F5F3F4F26308A
</td> + </tr> + <tr> + <td id="L523" class="blob-num js-line-number" data-line-number="523"></td> + <td id="LC523" class="blob-code blob-code-inner js-file-line">:1020A000310569F6AACF0E94981F10916C010E9419
</td> + </tr> + <tr> + <td id="L524" class="blob-num js-line-number" data-line-number="524"></td> + <td id="LC524" class="blob-code blob-code-inner js-file-line">:1020B000840F1817A1F00E94840F80936C012B9657
</td> + </tr> + <tr> + <td id="L525" class="blob-num js-line-number" data-line-number="525"></td> + <td id="LC525" class="blob-code blob-code-inner js-file-line">:1020C0000FB6F894DEBF0FBECDBFDF91CF911F9149
</td> + </tr> + <tr> + <td id="L526" class="blob-num js-line-number" data-line-number="526"></td> + <td id="LC526" class="blob-code blob-code-inner js-file-line">:1020D0000F91FF90EF90DF90CF900C947A082B96A1
</td> + </tr> + <tr> + <td id="L527" class="blob-num js-line-number" data-line-number="527"></td> + <td id="LC527" class="blob-code blob-code-inner js-file-line">:1020E0000FB6F894DEBF0FBECDBFDF91CF911F9129
</td> + </tr> + <tr> + <td id="L528" class="blob-num js-line-number" data-line-number="528"></td> + <td id="LC528" class="blob-code blob-code-inner js-file-line">:1020F0000F91FF90EF90DF90CF900895CF93DF93F3
</td> + </tr> + <tr> + <td id="L529" class="blob-num js-line-number" data-line-number="529"></td> + <td id="LC529" class="blob-code blob-code-inner js-file-line">:10210000CDB7DEB72B970FB6F894DEBF0FBECDBFAD
</td> + </tr> + <tr> + <td id="L530" class="blob-num js-line-number" data-line-number="530"></td> + <td id="LC530" class="blob-code blob-code-inner js-file-line">:102110004F83588769877A878B87DE01119686E01F
</td> + </tr> + <tr> + <td id="L531" class="blob-num js-line-number" data-line-number="531"></td> + <td id="LC531" class="blob-code blob-code-inner js-file-line">:10212000FD0111928A95E9F785E0FE01379601904D
</td> + </tr> + <tr> + <td id="L532" class="blob-num js-line-number" data-line-number="532"></td> + <td id="LC532" class="blob-code blob-code-inner js-file-line">:102130000D928A95E1F749815A816B817C818D816D
</td> + </tr> + <tr> + <td id="L533" class="blob-num js-line-number" data-line-number="533"></td> + <td id="LC533" class="blob-code blob-code-inner js-file-line">:102140009E810E94AE172B960FB6F894DEBF0FBE8D
</td> + </tr> + <tr> + <td id="L534" class="blob-num js-line-number" data-line-number="534"></td> + <td id="LC534" class="blob-code blob-code-inner js-file-line">:10215000CDBFDF91CF9108950895CF93882309F4DF
</td> + </tr> + <tr> + <td id="L535" class="blob-num js-line-number" data-line-number="535"></td> + <td id="LC535" class="blob-code blob-code-inner js-file-line">:10216000C2C0C82F823859F40E94840F81FDBBC0C1
</td> + </tr> + <tr> + <td id="L536" class="blob-num js-line-number" data-line-number="536"></td> + <td id="LC536" class="blob-code blob-code-inner js-file-line">:1021700089E30E94571A0E94241B89E30CC083380C
</td> + </tr> + <tr> + <td id="L537" class="blob-num js-line-number" data-line-number="537"></td> + <td id="LC537" class="blob-code blob-code-inner js-file-line">:1021800079F40E94840F80FDAEC083E50E94571A47
</td> + </tr> + <tr> + <td id="L538" class="blob-num js-line-number" data-line-number="538"></td> + <td id="LC538" class="blob-code blob-code-inner js-file-line">:102190000E94241B83E50E94991ACF910C94241B62
</td> + </tr> + <tr> + <td id="L539" class="blob-num js-line-number" data-line-number="539"></td> + <td id="LC539" class="blob-code blob-code-inner js-file-line">:1021A000843859F40E94840F82FD9DC087E40E9408
</td> + </tr> + <tr> + <td id="L540" class="blob-num js-line-number" data-line-number="540"></td> + <td id="LC540" class="blob-code blob-code-inner js-file-line">:1021B000571A0E94241B87E4EECF8CEF8C0F813AD4
</td> + </tr> + <tr> + <td id="L541" class="blob-num js-line-number" data-line-number="541"></td> + <td id="LC541" class="blob-code blob-code-inner js-file-line">:1021C00048F48C2F0E94DA2181118DC08C2F0E943F
</td> + </tr> + <tr> + <td id="L542" class="blob-num js-line-number" data-line-number="542"></td> + <td id="LC542" class="blob-code blob-code-inner js-file-line">:1021D000571AE3CF80E28C0F883048F4C77081E053
</td> + </tr> + <tr> + <td id="L543" class="blob-num js-line-number" data-line-number="543"></td> + <td id="LC543" class="blob-code blob-code-inner js-file-line">:1021E00001C0880FCA95EAF70E94DD1AD6CF8BE5A9
</td> + </tr> + <tr> + <td id="L544" class="blob-num js-line-number" data-line-number="544"></td> + <td id="LC544" class="blob-code blob-code-inner js-file-line">:1021F0008C0F833078F4C53A29F0C63A31F083E881
</td> + </tr> + <tr> + <td id="L545" class="blob-num js-line-number" data-line-number="545"></td> + <td id="LC545" class="blob-code blob-code-inner js-file-line">:1022000090E005C081E890E002C082E890E0CF91C4
</td> + </tr> + <tr> + <td id="L546" class="blob-num js-line-number" data-line-number="546"></td> + <td id="LC546" class="blob-code blob-code-inner js-file-line">:102210000C94A60F88E58C0F833108F064C0C83A8F
</td> + </tr> + <tr> + <td id="L547" class="blob-num js-line-number" data-line-number="547"></td> + <td id="LC547" class="blob-code blob-code-inner js-file-line">:1022200039F1C93A41F1CA3A49F1CB3A51F1CC3AC4
</td> + </tr> + <tr> + <td id="L548" class="blob-num js-line-number" data-line-number="548"></td> + <td id="LC548" class="blob-code blob-code-inner js-file-line">:1022300059F1CD3A61F1C03B69F1CE3A71F1CF3A33
</td> + </tr> + <tr> + <td id="L549" class="blob-num js-line-number" data-line-number="549"></td> + <td id="LC549" class="blob-code blob-code-inner js-file-line">:1022400079F1C13B81F1C23B89F1C33B91F1C43BC0
</td> + </tr> + <tr> + <td id="L550" class="blob-num js-line-number" data-line-number="550"></td> + <td id="LC550" class="blob-code blob-code-inner js-file-line">:1022500099F1C53BA1F1C63BA9F1C73BB1F1C83B20
</td> + </tr> + <tr> + <td id="L551" class="blob-num js-line-number" data-line-number="551"></td> + <td id="LC551" class="blob-code blob-code-inner js-file-line">:10226000B9F1C93BC1F1CA3BC9F180E090E038C087
</td> + </tr> + <tr> + <td id="L552" class="blob-num js-line-number" data-line-number="552"></td> + <td id="LC552" class="blob-code blob-code-inner js-file-line">:1022700082EE90E035C089EE90E032C08AEE90E0C8
</td> + </tr> + <tr> + <td id="L553" class="blob-num js-line-number" data-line-number="553"></td> + <td id="LC553" class="blob-code blob-code-inner js-file-line">:102280002FC085EB90E02CC086EB90E029C087EB57
</td> + </tr> + <tr> + <td id="L554" class="blob-num js-line-number" data-line-number="554"></td> + <td id="LC554" class="blob-code blob-code-inner js-file-line">:1022900090E026C08CEC90E023C08DEC90E020C054
</td> + </tr> + <tr> + <td id="L555" class="blob-num js-line-number" data-line-number="555"></td> + <td id="LC555" class="blob-code blob-code-inner js-file-line">:1022A00083E891E01DC08AE891E01AC082E991E0DC
</td> + </tr> + <tr> + <td id="L556" class="blob-num js-line-number" data-line-number="556"></td> + <td id="LC556" class="blob-code blob-code-inner js-file-line">:1022B00017C084E991E014C081E292E011C083E28A
</td> + </tr> + <tr> + <td id="L557" class="blob-num js-line-number" data-line-number="557"></td> + <td id="LC557" class="blob-code blob-code-inner js-file-line">:1022C00092E00EC084E292E00BC085E292E008C08A
</td> + </tr> + <tr> + <td id="L558" class="blob-num js-line-number" data-line-number="558"></td> + <td id="LC558" class="blob-code blob-code-inner js-file-line">:1022D00086E292E005C087E292E002C08AE292E0E4
</td> + </tr> + <tr> + <td id="L559" class="blob-num js-line-number" data-line-number="559"></td> + <td id="LC559" class="blob-code blob-code-inner js-file-line">:1022E000CF910C94BC0FCF910895882309F44BC073
</td> + </tr> + <tr> + <td id="L560" class="blob-num js-line-number" data-line-number="560"></td> + <td id="LC560" class="blob-code blob-code-inner js-file-line">:1022F000823859F40E94840F81FF45C089E30E940F
</td> + </tr> + <tr> + <td id="L561" class="blob-num js-line-number" data-line-number="561"></td> + <td id="LC561" class="blob-code blob-code-inner js-file-line">:10230000571A0E94241B89E30CC0833871F40E9481
</td> + </tr> + <tr> + <td id="L562" class="blob-num js-line-number" data-line-number="562"></td> + <td id="LC562" class="blob-code blob-code-inner js-file-line">:10231000840F80FF38C083E50E94571A0E94241B57
</td> + </tr> + <tr> + <td id="L563" class="blob-num js-line-number" data-line-number="563"></td> + <td id="LC563" class="blob-code blob-code-inner js-file-line">:1023200083E50E94991A0C94241B843859F40E9466
</td> + </tr> + <tr> + <td id="L564" class="blob-num js-line-number" data-line-number="564"></td> + <td id="LC564" class="blob-code blob-code-inner js-file-line">:10233000840F82FF28C087E40E94571A0E94241B42
</td> + </tr> + <tr> + <td id="L565" class="blob-num js-line-number" data-line-number="565"></td> + <td id="LC565" class="blob-code blob-code-inner js-file-line">:1023400087E4EFCF9CEF980F913A58F390E2980F03
</td> + </tr> + <tr> + <td id="L566" class="blob-num js-line-number" data-line-number="566"></td> + <td id="LC566" class="blob-code blob-code-inner js-file-line">:10235000983050F4877091E001C0990F8A95EAF7A0
</td> + </tr> + <tr> + <td id="L567" class="blob-num js-line-number" data-line-number="567"></td> + <td id="LC567" class="blob-code blob-code-inner js-file-line">:10236000892F0E94E31ADFCF9BE5980F933020F46A
</td> + </tr> + <tr> + <td id="L568" class="blob-num js-line-number" data-line-number="568"></td> + <td id="LC568" class="blob-code blob-code-inner js-file-line">:1023700080E090E00C94A60F885A833120F480E02E
</td> + </tr> + <tr> + <td id="L569" class="blob-num js-line-number" data-line-number="569"></td> + <td id="LC569" class="blob-code blob-code-inner js-file-line">:1023800090E00C94BC0F0895882321F00E94DD1A80
</td> + </tr> + <tr> + <td id="L570" class="blob-num js-line-number" data-line-number="570"></td> + <td id="LC570" class="blob-code blob-code-inner js-file-line">:102390000C94241B0895882321F00E94E31A0C94C6
</td> + </tr> + <tr> + <td id="L571" class="blob-num js-line-number" data-line-number="571"></td> + <td id="LC571" class="blob-code blob-code-inner js-file-line">:1023A000241B0895BF92CF92DF92EF92FF920F937A
</td> + </tr> + <tr> + <td id="L572" class="blob-num js-line-number" data-line-number="572"></td> + <td id="LC572" class="blob-code blob-code-inner js-file-line">:1023B0001F93CF93DF9300D000D000D0CDB7DEB70E
</td> + </tr> + <tr> + <td id="L573" class="blob-num js-line-number" data-line-number="573"></td> + <td id="LC573" class="blob-code blob-code-inner js-file-line">:1023C00025E0FC01DE01119601900D922A95E1F7BE
</td> + </tr> + <tr> + <td id="L574" class="blob-num js-line-number" data-line-number="574"></td> + <td id="LC574" class="blob-code blob-code-inner js-file-line">:1023D000FC01D08011810281258122952F704381DB
</td> + </tr> + <tr> + <td id="L575" class="blob-num js-line-number" data-line-number="575"></td> + <td id="LC575" class="blob-code blob-code-inner js-file-line">:1023E0005481452B09F4FCC21F3F21F4FFEFDF1697
</td> + </tr> + <tr> + <td id="L576" class="blob-num js-line-number" data-line-number="576"></td> + <td id="LC576" class="blob-code blob-code-inner js-file-line">:1023F00009F4F6C27C012E830E94AC10D9821A83A4
</td> + </tr> + <tr> + <td id="L577" class="blob-num js-line-number" data-line-number="577"></td> + <td id="LC577" class="blob-code blob-code-inner js-file-line">:1024000069817A81802F0E94531A182FB92E0E9459
</td> + </tr> + <tr> + <td id="L578" class="blob-num js-line-number" data-line-number="578"></td> + <td id="LC578" class="blob-code blob-code-inner js-file-line">:10241000081A0E94CF182E81002319F00E94FA1A80
</td> + </tr> + <tr> + <td id="L579" class="blob-num js-line-number" data-line-number="579"></td> + <td id="LC579" class="blob-code blob-code-inner js-file-line">:102420002E81EB2DE295EF70F0E0E05AFF4F0C9417
</td> + </tr> + <tr> + <td id="L580" class="blob-num js-line-number" data-line-number="580"></td> + <td id="LC580" class="blob-code blob-code-inner js-file-line">:102430001E248B2D807F9B2D9F70F92E882319F0F1
</td> + </tr> + <tr> + <td id="L581" class="blob-num js-line-number" data-line-number="581"></td> + <td id="LC581" class="blob-code blob-code-inner js-file-line">:10244000F29480EFF822002389F0FF2009F475C28E
</td> + </tr> + <tr> + <td id="L582" class="blob-num js-line-number" data-line-number="582"></td> + <td id="LC582" class="blob-code blob-code-inner js-file-line">:1024500080E2810F883020F48F2D0E94DD1A03C0A6
</td> + </tr> + <tr> + <td id="L583" class="blob-num js-line-number" data-line-number="583"></td> + <td id="LC583" class="blob-code blob-code-inner js-file-line">:102460008F2D0E94ED1A0E94241B67C2812F0E94AB
</td> + </tr> + <tr> + <td id="L584" class="blob-num js-line-number" data-line-number="584"></td> + <td id="LC584" class="blob-code blob-code-inner js-file-line">:102470007511FF2009F4B4C2105E8F2D183018F4C6
</td> + </tr> + <tr> + <td id="L585" class="blob-num js-line-number" data-line-number="585"></td> + <td id="LC585" class="blob-code blob-code-inner js-file-line">:102480000E94E31A02C00E94F31A26960FB6F8942F
</td> + </tr> + <tr> + <td id="L586" class="blob-num js-line-number" data-line-number="586"></td> + <td id="LC586" class="blob-code blob-code-inner js-file-line">:10249000DEBF0FBECDBFDF91CF911F910F91FF9097
</td> + </tr> + <tr> + <td id="L587" class="blob-num js-line-number" data-line-number="587"></td> + <td id="LC587" class="blob-code blob-code-inner js-file-line">:1024A000EF90DF90CF90BF900C94241B3B2D307F9A
</td> + </tr> + <tr> + <td id="L588" class="blob-num js-line-number" data-line-number="588"></td> + <td id="LC588" class="blob-code blob-code-inner js-file-line">:1024B0008B2D8F70303211F08295807F112319F0AF
</td> + </tr> + <tr> + <td id="L589" class="blob-num js-line-number" data-line-number="589"></td> + <td id="LC589" class="blob-code blob-code-inner js-file-line">:1024C000113021F12CC00023B9F0222309F4A0C15E
</td> + </tr> + <tr> + <td id="L590" class="blob-num js-line-number" data-line-number="590"></td> + <td id="LC590" class="blob-code blob-code-inner js-file-line">:1024D000213009F09DC126960FB6F894DEBF0FBEDD
</td> + </tr> + <tr> + <td id="L591" class="blob-num js-line-number" data-line-number="591"></td> + <td id="LC591" class="blob-code blob-code-inner js-file-line">:1024E000CDBFDF91CF911F910F91FF90EF90DF90C3
</td> + </tr> + <tr> + <td id="L592" class="blob-num js-line-number" data-line-number="592"></td> + <td id="LC592" class="blob-code blob-code-inner js-file-line">:1024F000CF90BF900C940D1B222319F0213009F4CA
</td> + </tr> + <tr> + <td id="L593" class="blob-num js-line-number" data-line-number="593"></td> + <td id="LC593" class="blob-code blob-code-inner js-file-line">:102500006FC28E830E94101B8E8196C1002321F022
</td> + </tr> + <tr> + <td id="L594" class="blob-num js-line-number" data-line-number="594"></td> + <td id="LC594" class="blob-code blob-code-inner js-file-line">:10251000223008F065C27CC1211162C28DC1002346
</td> + </tr> + <tr> + <td id="L595" class="blob-num js-line-number" data-line-number="595"></td> + <td id="LC595" class="blob-code blob-code-inner js-file-line">:1025200021F0222309F474C108C2222309F484C1D2
</td> + </tr> + <tr> + <td id="L596" class="blob-num js-line-number" data-line-number="596"></td> + <td id="LC596" class="blob-code blob-code-inner js-file-line">:1025300019C22B2D26952695237030E021153105E3
</td> + </tr> + <tr> + <td id="L597" class="blob-num js-line-number" data-line-number="597"></td> + <td id="LC597" class="blob-code blob-code-inner js-file-line">:1025400021F021303105D1F04BC2002321F0812F41
</td> + </tr> + <tr> + <td id="L598" class="blob-num js-line-number" data-line-number="598"></td> + <td id="LC598" class="blob-code blob-code-inner js-file-line">:102550009B2D937002C080E090E026960FB6F89411
</td> + </tr> + <tr> + <td id="L599" class="blob-num js-line-number" data-line-number="599"></td> + <td id="LC599" class="blob-code blob-code-inner js-file-line">:10256000DEBF0FBECDBFDF91CF911F910F91FF90C6
</td> + </tr> + <tr> + <td id="L600" class="blob-num js-line-number" data-line-number="600"></td> + <td id="LC600" class="blob-code blob-code-inner js-file-line">:10257000EF90DF90CF90BF900C94A60F002321F036
</td> + </tr> + <tr> + <td id="L601" class="blob-num js-line-number" data-line-number="601"></td> + <td id="LC601" class="blob-code blob-code-inner js-file-line">:10258000812F9B2D937002C080E090E026960FB6BD
</td> + </tr> + <tr> + <td id="L602" class="blob-num js-line-number" data-line-number="602"></td> + <td id="LC602" class="blob-code blob-code-inner js-file-line">:10259000F894DEBF0FBECDBFDF91CF911F910F9199
</td> + </tr> + <tr> + <td id="L603" class="blob-num js-line-number" data-line-number="603"></td> + <td id="LC603" class="blob-code blob-code-inner js-file-line">:1025A000FF90EF90DF90CF90BF900C94BC0F812FE5
</td> + </tr> + <tr> + <td id="L604" class="blob-num js-line-number" data-line-number="604"></td> + <td id="LC604" class="blob-code blob-code-inner js-file-line">:1025B000002319F00E94A01E02C00E94081F269648
</td> + </tr> + <tr> + <td id="L605" class="blob-num js-line-number" data-line-number="605"></td> + <td id="LC605" class="blob-code blob-code-inner js-file-line">:1025C0000FB6F894DEBF0FBECDBFDF91CF911F9144
</td> + </tr> + <tr> + <td id="L606" class="blob-num js-line-number" data-line-number="606"></td> + <td id="LC606" class="blob-code blob-code-inner js-file-line">:1025D0000F91FF90EF90DF90CF90BF900C948D1FE4
</td> + </tr> + <tr> + <td id="L607" class="blob-num js-line-number" data-line-number="607"></td> + <td id="LC607" class="blob-code blob-code-inner js-file-line">:1025E0008B2D837009F07BC00111FAC1812F829578
</td> + </tr> + <tr> + <td id="L608" class="blob-num js-line-number" data-line-number="608"></td> + <td id="LC608" class="blob-code blob-code-inner js-file-line">:1025F00086958770880F880F912F9F70C92ED12CD8
</td> + </tr> + <tr> + <td id="L609" class="blob-num js-line-number" data-line-number="609"></td> + <td id="LC609" class="blob-code blob-code-inner js-file-line">:10260000E12CF12C082E04C0CC0CDD1CEE1CFF1CB0
</td> + </tr> + <tr> + <td id="L610" class="blob-num js-line-number" data-line-number="610"></td> + <td id="LC610" class="blob-code blob-code-inner js-file-line">:102610000A94D2F714FF12C04FE050E060E070E07F
</td> + </tr> + <tr> + <td id="L611" class="blob-num js-line-number" data-line-number="611"></td> + <td id="LC611" class="blob-code blob-code-inner js-file-line">:1026200004C0440F551F661F771F8A95D2F7CB0150
</td> + </tr> + <tr> + <td id="L612" class="blob-num js-line-number" data-line-number="612"></td> + <td id="LC612" class="blob-code blob-code-inner js-file-line">:10263000BA01609570958095909503C060E070E058
</td> + </tr> + <tr> + <td id="L613" class="blob-num js-line-number" data-line-number="613"></td> + <td id="LC613" class="blob-code blob-code-inner js-file-line">:10264000CB012B2D269526952370422F50E042304A
</td> + </tr> + <tr> + <td id="L614" class="blob-num js-line-number" data-line-number="614"></td> + <td id="LC614" class="blob-code blob-code-inner js-file-line">:102650005105D9F04330510569F16C297D298E2946
</td> + </tr> + <tr> + <td id="L615" class="blob-num js-line-number" data-line-number="615"></td> + <td id="LC615" class="blob-code blob-code-inner js-file-line">:102660009F294130510551F126960FB6F894DEBFEF
</td> + </tr> + <tr> + <td id="L616" class="blob-num js-line-number" data-line-number="616"></td> + <td id="LC616" class="blob-code blob-code-inner js-file-line">:102670000FBECDBFDF91CF911F910F91FF90EF90D3
</td> + </tr> + <tr> + <td id="L617" class="blob-num js-line-number" data-line-number="617"></td> + <td id="LC617" class="blob-code blob-code-inner js-file-line">:10268000DF90CF90BF900C94F6186C297D298E298D
</td> + </tr> + <tr> + <td id="L618" class="blob-num js-line-number" data-line-number="618"></td> + <td id="LC618" class="blob-code blob-code-inner js-file-line">:102690009F2926960FB6F894DEBF0FBECDBFDF91FF
</td> + </tr> + <tr> + <td id="L619" class="blob-num js-line-number" data-line-number="619"></td> + <td id="LC619" class="blob-code blob-code-inner js-file-line">:1026A000CF911F910F91FF90EF90DF90CF90BF904F
</td> + </tr> + <tr> + <td id="L620" class="blob-num js-line-number" data-line-number="620"></td> + <td id="LC620" class="blob-code blob-code-inner js-file-line">:1026B0000C9412190E94F618C701B60126960FB69F
</td> + </tr> + <tr> + <td id="L621" class="blob-num js-line-number" data-line-number="621"></td> + <td id="LC621" class="blob-code blob-code-inner js-file-line">:1026C000F894DEBF0FBECDBFDF91CF911F910F9168
</td> + </tr> + <tr> + <td id="L622" class="blob-num js-line-number" data-line-number="622"></td> + <td id="LC622" class="blob-code blob-code-inner js-file-line">:1026D000FF90EF90DF90CF90BF900C94DA1800231A
</td> + </tr> + <tr> + <td id="L623" class="blob-num js-line-number" data-line-number="623"></td> + <td id="LC623" class="blob-code blob-code-inner js-file-line">:1026E00019F08B2D817001C08695882309F478C17B
</td> + </tr> + <tr> + <td id="L624" class="blob-num js-line-number" data-line-number="624"></td> + <td id="LC624" class="blob-code blob-code-inner js-file-line">:1026F000812F829586958770880F880F912F9F7004
</td> + </tr> + <tr> + <td id="L625" class="blob-num js-line-number" data-line-number="625"></td> + <td id="LC625" class="blob-code blob-code-inner js-file-line">:10270000C92ED12CE12CF12C082E04C0CC0CDD1CE0
</td> + </tr> + <tr> + <td id="L626" class="blob-num js-line-number" data-line-number="626"></td> + <td id="LC626" class="blob-code blob-code-inner js-file-line">:10271000EE1CFF1C0A94D2F714FF12C04FE050E0E9
</td> + </tr> + <tr> + <td id="L627" class="blob-num js-line-number" data-line-number="627"></td> + <td id="LC627" class="blob-code blob-code-inner js-file-line">:1027200060E070E004C0440F551F661F771F8A9554
</td> + </tr> + <tr> + <td id="L628" class="blob-num js-line-number" data-line-number="628"></td> + <td id="LC628" class="blob-code blob-code-inner js-file-line">:10273000D2F7CB01BA01609570958095909503C052
</td> + </tr> + <tr> + <td id="L629" class="blob-num js-line-number" data-line-number="629"></td> + <td id="LC629" class="blob-code blob-code-inner js-file-line">:1027400060E070E0CB012B2D269526952370422F5B
</td> + </tr> + <tr> + <td id="L630" class="blob-num js-line-number" data-line-number="630"></td> + <td id="LC630" class="blob-code blob-code-inner js-file-line">:1027500050E042305105D9F04330510569F16C2900
</td> + </tr> + <tr> + <td id="L631" class="blob-num js-line-number" data-line-number="631"></td> + <td id="LC631" class="blob-code blob-code-inner js-file-line">:102760007D298E299F294130510551F126960FB6BA
</td> + </tr> + <tr> + <td id="L632" class="blob-num js-line-number" data-line-number="632"></td> + <td id="LC632" class="blob-code blob-code-inner js-file-line">:10277000F894DEBF0FBECDBFDF91CF911F910F91B7
</td> + </tr> + <tr> + <td id="L633" class="blob-num js-line-number" data-line-number="633"></td> + <td id="LC633" class="blob-code blob-code-inner js-file-line">:10278000FF90EF90DF90CF90BF900C94D0196C2900
</td> + </tr> + <tr> + <td id="L634" class="blob-num js-line-number" data-line-number="634"></td> + <td id="LC634" class="blob-code blob-code-inner js-file-line">:102790007D298E299F2926960FB6F894DEBF0FBE9D
</td> + </tr> + <tr> + <td id="L635" class="blob-num js-line-number" data-line-number="635"></td> + <td id="LC635" class="blob-code blob-code-inner js-file-line">:1027A000CDBFDF91CF911F910F91FF90EF90DF9000
</td> + </tr> + <tr> + <td id="L636" class="blob-num js-line-number" data-line-number="636"></td> + <td id="LC636" class="blob-code blob-code-inner js-file-line">:1027B000CF90BF900C94EC190E94D019C701B601BC
</td> + </tr> + <tr> + <td id="L637" class="blob-num js-line-number" data-line-number="637"></td> + <td id="LC637" class="blob-code blob-code-inner js-file-line">:1027C00026960FB6F894DEBF0FBECDBFDF91CF9136
</td> + </tr> + <tr> + <td id="L638" class="blob-num js-line-number" data-line-number="638"></td> + <td id="LC638" class="blob-code blob-code-inner js-file-line">:1027D0001F910F91FF90EF90DF90CF90BF900C94DE
</td> + </tr> + <tr> + <td id="L639" class="blob-num js-line-number" data-line-number="639"></td> + <td id="LC639" class="blob-code blob-code-inner js-file-line">:1027E000B419103FD1F118F4103E50F4A1C0123FBB
</td> + </tr> + <tr> + <td id="L640" class="blob-num js-line-number" data-line-number="640"></td> + <td id="LC640" class="blob-code blob-code-inner js-file-line">:1027F00009F463C008F44CC0133F09F473C098C0D7
</td> + </tr> + <tr> + <td id="L641" class="blob-num js-line-number" data-line-number="641"></td> + <td id="LC641" class="blob-code blob-code-inner js-file-line">:102800001F708B2D8F710023A1F00E944D19812F15
</td> + </tr> + <tr> + <td id="L642" class="blob-num js-line-number" data-line-number="642"></td> + <td id="LC642" class="blob-code blob-code-inner js-file-line">:1028100026960FB6F894DEBF0FBECDBFDF91CF91E5
</td> + </tr> + <tr> + <td id="L643" class="blob-num js-line-number" data-line-number="643"></td> + <td id="LC643" class="blob-code blob-code-inner js-file-line">:102820001F910F91FF90EF90DF90CF90BF900C948D
</td> + </tr> + <tr> + <td id="L644" class="blob-num js-line-number" data-line-number="644"></td> + <td id="LC644" class="blob-code blob-code-inner js-file-line">:10283000C4110E946E19812F26960FB6F894DEBF40
</td> + </tr> + <tr> + <td id="L645" class="blob-num js-line-number" data-line-number="645"></td> + <td id="LC645" class="blob-code blob-code-inner js-file-line">:102840000FBECDBFDF91CF911F910F91FF90EF9001
</td> + </tr> + <tr> + <td id="L646" class="blob-num js-line-number" data-line-number="646"></td> + <td id="LC646" class="blob-code blob-code-inner js-file-line">:10285000DF90CF90BF900C94CB110023A9F02111F1
</td> + </tr> + <tr> + <td id="L647" class="blob-num js-line-number" data-line-number="647"></td> + <td id="LC647" class="blob-code blob-code-inner js-file-line">:10286000BFC08B2D8F7126960FB6F894DEBF0FBEBA
</td> + </tr> + <tr> + <td id="L648" class="blob-num js-line-number" data-line-number="648"></td> + <td id="LC648" class="blob-code blob-code-inner js-file-line">:10287000CDBFDF91CF911F910F91FF90EF90DF902F
</td> + </tr> + <tr> + <td id="L649" class="blob-num js-line-number" data-line-number="649"></td> + <td id="LC649" class="blob-code blob-code-inner js-file-line">:10288000CF90BF900C949319223008F0A9C0E9CFE3
</td> + </tr> + <tr> + <td id="L650" class="blob-num js-line-number" data-line-number="650"></td> + <td id="LC650" class="blob-code blob-code-inner js-file-line">:102890000023A9F08B2D8F7126960FB6F894DEBF1A
</td> + </tr> + <tr> + <td id="L651" class="blob-num js-line-number" data-line-number="651"></td> + <td id="LC651" class="blob-code blob-code-inner js-file-line">:1028A0000FBECDBFDF91CF911F910F91FF90EF90A1
</td> + </tr> + <tr> + <td id="L652" class="blob-num js-line-number" data-line-number="652"></td> + <td id="LC652" class="blob-code blob-code-inner js-file-line">:1028B000DF90CF90BF900C944D19002359F38B2DCE
</td> + </tr> + <tr> + <td id="L653" class="blob-num js-line-number" data-line-number="653"></td> + <td id="LC653" class="blob-code blob-code-inner js-file-line">:1028C0008F7126960FB6F894DEBF0FBECDBFDF9195
</td> + </tr> + <tr> + <td id="L654" class="blob-num js-line-number" data-line-number="654"></td> + <td id="LC654" class="blob-code blob-code-inner js-file-line">:1028D000CF911F910F91FF90EF90DF90CF90BF901D
</td> + </tr> + <tr> + <td id="L655" class="blob-num js-line-number" data-line-number="655"></td> + <td id="LC655" class="blob-code blob-code-inner js-file-line">:1028E0000C946E19002399F08B2D8F7126960FB6DC
</td> + </tr> + <tr> + <td id="L656" class="blob-num js-line-number" data-line-number="656"></td> + <td id="LC656" class="blob-code blob-code-inner js-file-line">:1028F000F894DEBF0FBECDBFDF91CF911F910F9136
</td> + </tr> + <tr> + <td id="L657" class="blob-num js-line-number" data-line-number="657"></td> + <td id="LC657" class="blob-code blob-code-inner js-file-line">:10290000FF90EF90DF90CF90BF900C9438192696EF
</td> + </tr> + <tr> + <td id="L658" class="blob-num js-line-number" data-line-number="658"></td> + <td id="LC658" class="blob-code blob-code-inner js-file-line">:102910000FB6F894DEBF0FBECDBFDF91CF911F91F0
</td> + </tr> + <tr> + <td id="L659" class="blob-num js-line-number" data-line-number="659"></td> + <td id="LC659" class="blob-code blob-code-inner js-file-line">:102920000F91FF90EF90DF90CF90BF900C942E19F5
</td> + </tr> + <tr> + <td id="L660" class="blob-num js-line-number" data-line-number="660"></td> + <td id="LC660" class="blob-code blob-code-inner js-file-line">:102930000023A9F0222309F4ADCF812F26960FB6EC
</td> + </tr> + <tr> + <td id="L661" class="blob-num js-line-number" data-line-number="661"></td> + <td id="LC661" class="blob-code blob-code-inner js-file-line">:10294000F894DEBF0FBECDBFDF91CF911F910F91E5
</td> + </tr> + <tr> + <td id="L662" class="blob-num js-line-number" data-line-number="662"></td> + <td id="LC662" class="blob-code blob-code-inner js-file-line">:10295000FF90EF90DF90CF90BF900C94AD102223AA
</td> + </tr> + <tr> + <td id="L663" class="blob-num js-line-number" data-line-number="663"></td> + <td id="LC663" class="blob-code blob-code-inner js-file-line">:1029600009F4ADCF812F26960FB6F894DEBF0FBEC7
</td> + </tr> + <tr> + <td id="L664" class="blob-num js-line-number" data-line-number="664"></td> + <td id="LC664" class="blob-code blob-code-inner js-file-line">:10297000CDBFDF91CF911F910F91FF90EF90DF902E
</td> + </tr> + <tr> + <td id="L665" class="blob-num js-line-number" data-line-number="665"></td> + <td id="LC665" class="blob-code blob-code-inner js-file-line">:10298000CF90BF900C9475114B2D4F70612FC701E4
</td> + </tr> + <tr> + <td id="L666" class="blob-num js-line-number" data-line-number="666"></td> + <td id="LC666" class="blob-code blob-code-inner js-file-line">:102990000E94AE0226960FB6F894DEBF0FBECDBFE2
</td> + </tr> + <tr> + <td id="L667" class="blob-num js-line-number" data-line-number="667"></td> + <td id="LC667" class="blob-code blob-code-inner js-file-line">:1029A000DF91CF911F910F91FF90EF90DF90CF902B
</td> + </tr> + <tr> + <td id="L668" class="blob-num js-line-number" data-line-number="668"></td> + <td id="LC668" class="blob-code blob-code-inner js-file-line">:1029B000BF900C9452184B2D4F70612FC701269673
</td> + </tr> + <tr> + <td id="L669" class="blob-num js-line-number" data-line-number="669"></td> + <td id="LC669" class="blob-code blob-code-inner js-file-line">:1029C0000FB6F894DEBF0FBECDBFDF91CF911F9140
</td> + </tr> + <tr> + <td id="L670" class="blob-num js-line-number" data-line-number="670"></td> + <td id="LC670" class="blob-code blob-code-inner js-file-line">:1029D0000F91FF90EF90DF90CF90BF900C949F05E8
</td> + </tr> + <tr> + <td id="L671" class="blob-num js-line-number" data-line-number="671"></td> + <td id="LC671" class="blob-code blob-code-inner js-file-line">:1029E00026960FB6F894DEBF0FBECDBFDF91CF9114
</td> + </tr> + <tr> + <td id="L672" class="blob-num js-line-number" data-line-number="672"></td> + <td id="LC672" class="blob-code blob-code-inner js-file-line">:1029F0001F910F91FF90EF90DF90CF90BF900895BF
</td> + </tr> + <tr> + <td id="L673" class="blob-num js-line-number" data-line-number="673"></td> + <td id="LC673" class="blob-code blob-code-inner js-file-line">:102A00000E94FA1A0E940A1B0E94CF1A0E94241BDD
</td> + </tr> + <tr> + <td id="L674" class="blob-num js-line-number" data-line-number="674"></td> + <td id="LC674" class="blob-code blob-code-inner js-file-line">:102A10000E943D200E948D1F80E090E00E94A60F42
</td> + </tr> + <tr> + <td id="L675" class="blob-num js-line-number" data-line-number="675"></td> + <td id="LC675" class="blob-code blob-code-inner js-file-line">:102A200080E090E00C94BC0F0E94EA1A0C94001510
</td> + </tr> + <tr> + <td id="L676" class="blob-num js-line-number" data-line-number="676"></td> + <td id="LC676" class="blob-code blob-code-inner js-file-line">:102A30000E94481A292F22952F7030E02C30310542
</td> + </tr> + <tr> + <td id="L677" class="blob-num js-line-number" data-line-number="677"></td> + <td id="LC677" class="blob-code blob-code-inner js-file-line">:102A40004CF42A3031056CF4225031092230310522
</td> + </tr> + <tr> + <td id="L678" class="blob-num js-line-number" data-line-number="678"></td> + <td id="LC678" class="blob-code blob-code-inner js-file-line">:102A500088F407C02C30310549F02F30310531F0B2
</td> + </tr> + <tr> + <td id="L679" class="blob-num js-line-number" data-line-number="679"></td> + <td id="LC679" class="blob-code blob-code-inner js-file-line">:102A600009C0803E48F0803F29F406C093FB8827C8
</td> + </tr> + <tr> + <td id="L680" class="blob-num js-line-number" data-line-number="680"></td> + <td id="LC680" class="blob-code blob-code-inner js-file-line">:102A700080F9089580E0089581E00895CF93DF9371
</td> + </tr> + <tr> + <td id="L681" class="blob-num js-line-number" data-line-number="681"></td> + <td id="LC681" class="blob-code blob-code-inner js-file-line">:102A800000D000D01F92CDB7DEB70F900F900F90FF
</td> + </tr> + <tr> + <td id="L682" class="blob-num js-line-number" data-line-number="682"></td> + <td id="LC682" class="blob-code blob-code-inner js-file-line">:102A90000F900F90DF91CF910895CF93DF9300D0E7
</td> + </tr> + <tr> + <td id="L683" class="blob-num js-line-number" data-line-number="683"></td> + <td id="LC683" class="blob-code blob-code-inner js-file-line">:102AA00000D000D0CDB7DEB726960FB6F894DEBFC3
</td> + </tr> + <tr> + <td id="L684" class="blob-num js-line-number" data-line-number="684"></td> + <td id="LC684" class="blob-code blob-code-inner js-file-line">:102AB0000FBECDBFDF91CF9108951F93CF93DF93CA
</td> + </tr> + <tr> + <td id="L685" class="blob-num js-line-number" data-line-number="685"></td> + <td id="LC685" class="blob-code blob-code-inner js-file-line">:102AC000C0917B0116E080917C01C81799F0D0E09D
</td> + </tr> + <tr> + <td id="L686" class="blob-num js-line-number" data-line-number="686"></td> + <td id="LC686" class="blob-code blob-code-inner js-file-line">:102AD0001C9FF0011D9FF00D1124E358FE4F408113
</td> + </tr> + <tr> + <td id="L687" class="blob-num js-line-number" data-line-number="687"></td> + <td id="LC687" class="blob-code blob-code-inner js-file-line">:102AE000518162817381848195810E944D15219667
</td> + </tr> + <tr> + <td id="L688" class="blob-num js-line-number" data-line-number="688"></td> + <td id="LC688" class="blob-code blob-code-inner js-file-line">:102AF000C770E9CFDF91CF911F9108954091AD014B
</td> + </tr> + <tr> + <td id="L689" class="blob-num js-line-number" data-line-number="689"></td> + <td id="LC689" class="blob-code blob-code-inner js-file-line">:102B00005091AE016091AF017091B0018091B1011F
</td> + </tr> + <tr> + <td id="L690" class="blob-num js-line-number" data-line-number="690"></td> + <td id="LC690" class="blob-code blob-code-inner js-file-line">:102B10009091B2010C944D158091B20182958F7005
</td> + </tr> + <tr> + <td id="L691" class="blob-num js-line-number" data-line-number="691"></td> + <td id="LC691" class="blob-code blob-code-inner js-file-line">:102B200009F054C08091AF01882309F44FC080910F
</td> + </tr> + <tr> + <td id="L692" class="blob-num js-line-number" data-line-number="692"></td> + <td id="LC692" class="blob-code blob-code-inner js-file-line">:102B30007B01A0917C016091AD017091AE0140914B
</td> + </tr> + <tr> + <td id="L693" class="blob-num js-line-number" data-line-number="693"></td> + <td id="LC693" class="blob-code blob-code-inner js-file-line">:102B4000B0015091B101B6E08A1709F43FC090E09E
</td> + </tr> + <tr> + <td id="L694" class="blob-num js-line-number" data-line-number="694"></td> + <td id="LC694" class="blob-code blob-code-inner js-file-line">:102B500041155105C1F17F3F11F46F3FA1F1B89FBD
</td> + </tr> + <tr> + <td id="L695" class="blob-num js-line-number" data-line-number="695"></td> + <td id="LC695" class="blob-code blob-code-inner js-file-line">:102B6000F001B99FF00D1124E358FE4F218172133B
</td> + </tr> + <tr> + <td id="L696" class="blob-num js-line-number" data-line-number="696"></td> + <td id="LC696" class="blob-code blob-code-inner js-file-line">:102B70002AC02081621327C02281211124C0238111
</td> + </tr> + <tr> + <td id="L697" class="blob-num js-line-number" data-line-number="697"></td> + <td id="LC697" class="blob-code blob-code-inner js-file-line">:102B800034812417350710F421503109241B350BEB
</td> + </tr> + <tr> + <td id="L698" class="blob-num js-line-number" data-line-number="698"></td> + <td id="LC698" class="blob-code blob-code-inner js-file-line">:102B9000283C3105C0F42091B2012F7020612093B0
</td> + </tr> + <tr> + <td id="L699" class="blob-num js-line-number" data-line-number="699"></td> + <td id="LC699" class="blob-code blob-code-inner js-file-line">:102BA000B20126E0289FF001299FF00D1124EE5775
</td> + </tr> + <tr> + <td id="L700" class="blob-num js-line-number" data-line-number="700"></td> + <td id="LC700" class="blob-code blob-code-inner js-file-line">:102BB000FE4F80818F70806180838DEA91E00E945A
</td> + </tr> + <tr> + <td id="L701" class="blob-num js-line-number" data-line-number="701"></td> + <td id="LC701" class="blob-code blob-code-inner js-file-line">:102BC000D2110C945D1501968770BECF0895CF92F7
</td> + </tr> + <tr> + <td id="L702" class="blob-num js-line-number" data-line-number="702"></td> + <td id="LC702" class="blob-code blob-code-inner js-file-line">:102BD000DF92EF92FF920F931F93CF93DF93CDB7C6
</td> + </tr> + <tr> + <td id="L703" class="blob-num js-line-number" data-line-number="703"></td> + <td id="LC703" class="blob-code blob-code-inner js-file-line">:102BE000DEB762970FB6F894DEBF0FBECDBF8C0183
</td> + </tr> + <tr> + <td id="L704" class="blob-num js-line-number" data-line-number="704"></td> + <td id="LC704" class="blob-code blob-code-inner js-file-line">:102BF00085E0F801DE011D9601900D928A95E1F7BE
</td> + </tr> + <tr> + <td id="L705" class="blob-num js-line-number" data-line-number="705"></td> + <td id="LC705" class="blob-code blob-code-inner js-file-line">:102C0000D8014C9111965C91119712966C91129784
</td> + </tr> + <tr> + <td id="L706" class="blob-num js-line-number" data-line-number="706"></td> + <td id="LC706" class="blob-code blob-code-inner js-file-line">:102C10001396CD90DC9014973091AD017091AE0178
</td> + </tr> + <tr> + <td id="L707" class="blob-num js-line-number" data-line-number="707"></td> + <td id="LC707" class="blob-code blob-code-inner js-file-line">:102C20008091B0019091B101009709F46BC17F3F91
</td> + </tr> + <tr> + <td id="L708" class="blob-num js-line-number" data-line-number="708"></td> + <td id="LC708" class="blob-code blob-code-inner js-file-line">:102C300019F43F3F09F466C1E090AF01EE2009F4BA
</td> + </tr> + <tr> + <td id="L709" class="blob-num js-line-number" data-line-number="709"></td> + <td id="LC709" class="blob-code blob-code-inner js-file-line">:102C4000C0C02091B201C816D90628F0F601E81BD1
</td> + </tr> + <tr> + <td id="L710" class="blob-num js-line-number" data-line-number="710"></td> + <td id="LC710" class="blob-code blob-code-inner js-file-line">:102C5000F90BCF0104C0809590958C0D9D1DFF242C
</td> + </tr> + <tr> + <td id="L711" class="blob-num js-line-number" data-line-number="711"></td> + <td id="LC711" class="blob-code blob-code-inner js-file-line">:102C6000F394883C910578F0F12C207F09F0C6C0E0
</td> + </tr> + <tr> + <td id="L712" class="blob-num js-line-number" data-line-number="712"></td> + <td id="LC712" class="blob-code blob-code-inner js-file-line">:102C70007C2DD98AC88A89890E943E158DEA91E007
</td> + </tr> + <tr> + <td id="L713" class="blob-num js-line-number" data-line-number="713"></td> + <td id="LC713" class="blob-code blob-code-inner js-file-line">:102C80000E94D211B1C0822F807F09F046C0751317
</td> + </tr> + <tr> + <td id="L714" class="blob-num js-line-number" data-line-number="714"></td> + <td id="LC714" class="blob-code blob-code-inner js-file-line">:102C900014C0341312C0611110C02F702061209332
</td> + </tr> + <tr> + <td id="L715" class="blob-num js-line-number" data-line-number="715"></td> + <td id="LC715" class="blob-code blob-code-inner js-file-line">:102CA000B2010E947E158DEA91E00E94D2118091BE
</td> + </tr> + <tr> + <td id="L716" class="blob-num js-line-number" data-line-number="716"></td> + <td id="LC716" class="blob-code blob-code-inner js-file-line">:102CB000B201D80115968C932EC0CD2819F15F3F33
</td> + </tr> + <tr> + <td id="L717" class="blob-num js-line-number" data-line-number="717"></td> + <td id="LC717" class="blob-code blob-code-inner js-file-line">:102CC00011F44F3FF9F0F62E61111CC080917B0189
</td> + </tr> + <tr> + <td id="L718" class="blob-num js-line-number" data-line-number="718"></td> + <td id="LC718" class="blob-code blob-code-inner js-file-line">:102CD00020917C0136E0821709F45AC090E0389FB9
</td> + </tr> + <tr> + <td id="L719" class="blob-num js-line-number" data-line-number="719"></td> + <td id="LC719" class="blob-code blob-code-inner js-file-line">:102CE000F001399FF00D1124E358FE4F7181571305
</td> + </tr> + <tr> + <td id="L720" class="blob-num js-line-number" data-line-number="720"></td> + <td id="LC720" class="blob-code blob-code-inner js-file-line">:102CF00006C07081471303C07281711103C0019631
</td> + </tr> + <tr> + <td id="L721" class="blob-num js-line-number" data-line-number="721"></td> + <td id="LC721" class="blob-code blob-code-inner js-file-line">:102D00008770E9CFF62E662309F418C18091B201CD
</td> + </tr> + <tr> + <td id="L722" class="blob-num js-line-number" data-line-number="722"></td> + <td id="LC722" class="blob-code blob-code-inner js-file-line">:102D100081608093B201F12C11C1751308C0341386
</td> + </tr> + <tr> + <td id="L723" class="blob-num js-line-number" data-line-number="723"></td> + <td id="LC723" class="blob-code blob-code-inner js-file-line">:102D200006C0611104C08091B201D801C3C04D87B3
</td> + </tr> + <tr> + <td id="L724" class="blob-num js-line-number" data-line-number="724"></td> + <td id="LC724" class="blob-code blob-code-inner js-file-line">:102D30005E878D859E856A8B0E9418156A89882317
</td> + </tr> + <tr> + <td id="L725" class="blob-num js-line-number" data-line-number="725"></td> + <td id="LC725" class="blob-code blob-code-inner js-file-line">:102D4000E1F16623D1F12091B201822F82958F703B
</td> + </tr> + <tr> + <td id="L726" class="blob-num js-line-number" data-line-number="726"></td> + <td id="LC726" class="blob-code blob-code-inner js-file-line">:102D500090E0029774F08091AD019091AE01988758
</td> + </tr> + <tr> + <td id="L727" class="blob-num js-line-number" data-line-number="727"></td> + <td id="LC727" class="blob-code blob-code-inner js-file-line">:102D60008F831986DB86CA862C87CE0107960E9440
</td> + </tr> + <tr> + <td id="L728" class="blob-num js-line-number" data-line-number="728"></td> + <td id="LC728" class="blob-code blob-code-inner js-file-line">:102D7000D21186E0F801ADEAB1E001900D928A959A
</td> + </tr> + <tr> + <td id="L729" class="blob-num js-line-number" data-line-number="729"></td> + <td id="LC729" class="blob-code blob-code-inner js-file-line">:102D8000E1F70E948C150E947E15FF24F394D6C0B3
</td> + </tr> + <tr> + <td id="L730" class="blob-num js-line-number" data-line-number="730"></td> + <td id="LC730" class="blob-code blob-code-inner js-file-line">:102D90004D875E878D859E850E94481A292F229532
</td> + </tr> + <tr> + <td id="L731" class="blob-num js-line-number" data-line-number="731"></td> + <td id="LC731" class="blob-code blob-code-inner js-file-line">:102DA0002F7030E0223031050CF0BCC09F7009F06C
</td> + </tr> + <tr> + <td id="L732" class="blob-num js-line-number" data-line-number="732"></td> + <td id="LC732" class="blob-code blob-code-inner js-file-line">:102DB000B6C0805E883008F4C1C0C8010E94D2113C
</td> + </tr> + <tr> + <td id="L733" class="blob-num js-line-number" data-line-number="733"></td> + <td id="LC733" class="blob-code blob-code-inner js-file-line">:102DC000E4CFC816D90608F453C0F601E81BF90B86
</td> + </tr> + <tr> + <td id="L734" class="blob-num js-line-number" data-line-number="734"></td> + <td id="LC734" class="blob-code blob-code-inner js-file-line">:102DD000CF01883C910508F450C0F12C7C2DD98A94
</td> + </tr> + <tr> + <td id="L735" class="blob-num js-line-number" data-line-number="735"></td> + <td id="LC735" class="blob-code blob-code-inner js-file-line">:102DE000C88A89890E943E15EDEAF1E086E0DF019C
</td> + </tr> + <tr> + <td id="L736" class="blob-num js-line-number" data-line-number="736"></td> + <td id="LC736" class="blob-code blob-code-inner js-file-line">:102DF0001D928A95E9F70E947E15A0C0751314C034
</td> + </tr> + <tr> + <td id="L737" class="blob-num js-line-number" data-line-number="737"></td> + <td id="LC737" class="blob-code blob-code-inner js-file-line">:102E0000341312C0611110C08091B201F8018583A2
</td> + </tr> + <tr> + <td id="L738" class="blob-num js-line-number" data-line-number="738"></td> + <td id="LC738" class="blob-code blob-code-inner js-file-line">:102E1000C8010E94D21186E0EDEAF1E0DF011D92C7
</td> + </tr> + <tr> + <td id="L739" class="blob-num js-line-number" data-line-number="739"></td> + <td id="LC739" class="blob-code blob-code-inner js-file-line">:102E20008A95E9F7FE2C8AC04D875E878D859E8541
</td> + </tr> + <tr> + <td id="L740" class="blob-num js-line-number" data-line-number="740"></td> + <td id="LC740" class="blob-code blob-code-inner js-file-line">:102E30006A8B0E9418156A89882309F4BECF66231D
</td> + </tr> + <tr> + <td id="L741" class="blob-num js-line-number" data-line-number="741"></td> + <td id="LC741" class="blob-code blob-code-inner js-file-line">:102E400009F4BBCF2091B201822F82958F7090E060
</td> + </tr> + <tr> + <td id="L742" class="blob-num js-line-number" data-line-number="742"></td> + <td id="LC742" class="blob-code blob-code-inner js-file-line">:102E500002970CF48ECF8091AD019091AE019A83D0
</td> + </tr> + <tr> + <td id="L743" class="blob-num js-line-number" data-line-number="743"></td> + <td id="LC743" class="blob-code blob-code-inner js-file-line">:102E600089831B82DD82CC822E83CE0101967FCFA7
</td> + </tr> + <tr> + <td id="L744" class="blob-num js-line-number" data-line-number="744"></td> + <td id="LC744" class="blob-code blob-code-inner js-file-line">:102E7000809590958C0D9D1DACCFF62E662309F4A0
</td> + </tr> + <tr> + <td id="L745" class="blob-num js-line-number" data-line-number="745"></td> + <td id="LC745" class="blob-code blob-code-inner js-file-line">:102E80009CCF75132EC034132CC02091B20120FDAD
</td> + </tr> + <tr> + <td id="L746" class="blob-num js-line-number" data-line-number="746"></td> + <td id="LC746" class="blob-code blob-code-inner js-file-line">:102E90001FC0822F82958F70D9F0D80115962C9380
</td> + </tr> + <tr> + <td id="L747" class="blob-num js-line-number" data-line-number="747"></td> + <td id="LC747" class="blob-code blob-code-inner js-file-line">:102EA00015978F3049F08F5F982F9295907F822FE2
</td> + </tr> + <tr> + <td id="L748" class="blob-num js-line-number" data-line-number="748"></td> + <td id="LC748" class="blob-code blob-code-inner js-file-line">:102EB0008F70892B15968C93C8010E94D21186E0E1
</td> + </tr> + <tr> + <td id="L749" class="blob-num js-line-number" data-line-number="749"></td> + <td id="LC749" class="blob-code blob-code-inner js-file-line">:102EC000F801ADEAB1E001900D928A95E1F793CF58
</td> + </tr> + <tr> + <td id="L750" class="blob-num js-line-number" data-line-number="750"></td> + <td id="LC750" class="blob-code blob-code-inner js-file-line">:102ED00086E0F801ADEAB1E001900D928A95E1F744
</td> + </tr> + <tr> + <td id="L751" class="blob-num js-line-number" data-line-number="751"></td> + <td id="LC751" class="blob-code blob-code-inner js-file-line">:102EE0002DC04D875E878D859E850E9418158111A6
</td> + </tr> + <tr> + <td id="L752" class="blob-num js-line-number" data-line-number="752"></td> + <td id="LC752" class="blob-code blob-code-inner js-file-line">:102EF00040CF8091B20181608093B201C8010E94ED
</td> + </tr> + <tr> + <td id="L753" class="blob-num js-line-number" data-line-number="753"></td> + <td id="LC753" class="blob-code blob-code-inner js-file-line">:102F0000D2111CC0662309F458CF4D875E878D858A
</td> + </tr> + <tr> + <td id="L754" class="blob-num js-line-number" data-line-number="754"></td> + <td id="LC754" class="blob-code blob-code-inner js-file-line">:102F10009E850E941815882309F44FCF2ACF81116E
</td> + </tr> + <tr> + <td id="L755" class="blob-num js-line-number" data-line-number="755"></td> + <td id="LC755" class="blob-code blob-code-inner js-file-line">:102F200048CF0CC0243031050CF047CF9F7009F416
</td> + </tr> + <tr> + <td id="L756" class="blob-num js-line-number" data-line-number="756"></td> + <td id="LC756" class="blob-code blob-code-inner js-file-line">:102F300040CFF8019581907F09F03BCF8F2D6296AD
</td> + </tr> + <tr> + <td id="L757" class="blob-num js-line-number" data-line-number="757"></td> + <td id="LC757" class="blob-code blob-code-inner js-file-line">:102F40000FB6F894DEBF0FBECDBFDF91CF911F91BA
</td> + </tr> + <tr> + <td id="L758" class="blob-num js-line-number" data-line-number="758"></td> + <td id="LC758" class="blob-code blob-code-inner js-file-line">:102F50000F91FF90EF90DF90CF9008951F93CF9344
</td> + </tr> + <tr> + <td id="L759" class="blob-num js-line-number" data-line-number="759"></td> + <td id="LC759" class="blob-code blob-code-inner js-file-line">:102F6000DF93CDB7DEB72C970FB6F894DEBF0FBE58
</td> + </tr> + <tr> + <td id="L760" class="blob-num js-line-number" data-line-number="760"></td> + <td id="LC760" class="blob-code blob-code-inner js-file-line">:102F7000CDBF4F83588769877A878B879C87CE011F
</td> + </tr> + <tr> + <td id="L761" class="blob-num js-line-number" data-line-number="761"></td> + <td id="LC761" class="blob-code blob-code-inner js-file-line">:102F800007960E94E715882369F08F8198852A8526
</td> + </tr> + <tr> + <td id="L762" class="blob-num js-line-number" data-line-number="762"></td> + <td id="LC762" class="blob-code blob-code-inner js-file-line">:102F90003B85232BF1F19F3F09F063C08F3F09F080
</td> + </tr> + <tr> + <td id="L763" class="blob-num js-line-number" data-line-number="763"></td> + <td id="LC763" class="blob-code blob-code-inner js-file-line">:102FA00060C037C086E0FE013796DE0111960190C1
</td> + </tr> + <tr> + <td id="L764" class="blob-num js-line-number" data-line-number="764"></td> + <td id="LC764" class="blob-code blob-code-inner js-file-line">:102FB0000D928A95E1F76F817885EA85FB853097D8
</td> + </tr> + <tr> + <td id="L765" class="blob-num js-line-number" data-line-number="765"></td> + <td id="LC765" class="blob-code blob-code-inner js-file-line">:102FC00041F17F3F11F46F3F21F120917C0130E00E
</td> + </tr> + <tr> + <td id="L766" class="blob-num js-line-number" data-line-number="766"></td> + <td id="LC766" class="blob-code blob-code-inner js-file-line">:102FD000C90101968770992740917B0150E08417C1
</td> + </tr> + <tr> + <td id="L767" class="blob-num js-line-number" data-line-number="767"></td> + <td id="LC767" class="blob-code blob-code-inner js-file-line">:102FE000950709F447C069837A83FD83EC8396E0F3
</td> + </tr> + <tr> + <td id="L768" class="blob-num js-line-number" data-line-number="768"></td> + <td id="LC768" class="blob-code blob-code-inner js-file-line">:102FF000929FD001939FB00D1124A358BE4FFE01A4
</td> + </tr> + <tr> + <td id="L769" class="blob-num js-line-number" data-line-number="769"></td> + <td id="LC769" class="blob-code blob-code-inner js-file-line">:10300000319601900D929A95E1F780937C010E9490
</td> + </tr> + <tr> + <td id="L770" class="blob-num js-line-number" data-line-number="770"></td> + <td id="LC770" class="blob-code blob-code-inner js-file-line">:103010005D1516E080917B0190917C018917C1F1CB
</td> + </tr> + <tr> + <td id="L771" class="blob-num js-line-number" data-line-number="771"></td> + <td id="LC771" class="blob-code blob-code-inner js-file-line">:10302000189FC001112483589E4F0E94E7158823E2
</td> + </tr> + <tr> + <td id="L772" class="blob-num js-line-number" data-line-number="772"></td> + <td id="LC772" class="blob-code blob-code-inner js-file-line">:1030300079F1E0917B011E9FF0011124E358FE4FCE
</td> + </tr> + <tr> + <td id="L773" class="blob-num js-line-number" data-line-number="773"></td> + <td id="LC773" class="blob-code blob-code-inner js-file-line">:103040004081518162817381848195810E944D15F7
</td> + </tr> + <tr> + <td id="L774" class="blob-num js-line-number" data-line-number="774"></td> + <td id="LC774" class="blob-code blob-code-inner js-file-line">:1030500080917B0190E001968770992780937B0196
</td> + </tr> + <tr> + <td id="L775" class="blob-num js-line-number" data-line-number="775"></td> + <td id="LC775" class="blob-code blob-code-inner js-file-line">:10306000D9CF4F81588569857A858B859C850E944B
</td> + </tr> + <tr> + <td id="L776" class="blob-num js-line-number" data-line-number="776"></td> + <td id="LC776" class="blob-code blob-code-inner js-file-line">:103070004D15CFCF0E94141510927C0110927B0148
</td> + </tr> + <tr> + <td id="L777" class="blob-num js-line-number" data-line-number="777"></td> + <td id="LC777" class="blob-code blob-code-inner js-file-line">:10308000EDEAF1E086E0DF011D928A95E9F7C1CF14
</td> + </tr> + <tr> + <td id="L778" class="blob-num js-line-number" data-line-number="778"></td> + <td id="LC778" class="blob-code blob-code-inner js-file-line">:103090002C960FB6F894DEBF0FBECDBFDF91CF9157
</td> + </tr> + <tr> + <td id="L779" class="blob-num js-line-number" data-line-number="779"></td> + <td id="LC779" class="blob-code blob-code-inner js-file-line">:1030A0001F910895EF92FF920F931F93CF93DF9399
</td> + </tr> + <tr> + <td id="L780" class="blob-num js-line-number" data-line-number="780"></td> + <td id="LC780" class="blob-code blob-code-inner js-file-line">:1030B0008C01892B09F46CC0F12CEE24E394E80117
</td> + </tr> + <tr> + <td id="L781" class="blob-num js-line-number" data-line-number="781"></td> + <td id="LC781" class="blob-code blob-code-inner js-file-line">:1030C0002196F8018491843740F4843008F051C08F
</td> + </tr> + <tr> + <td id="L782" class="blob-num js-line-number" data-line-number="782"></td> + <td id="LC782" class="blob-code blob-code-inner js-file-line">:1030D000813081F0823019F15BC0853709F444C03A
</td> + </tr> + <tr> + <td id="L783" class="blob-num js-line-number" data-line-number="783"></td> + <td id="LC783" class="blob-code blob-code-inner js-file-line">:1030E000A8F19CE7980F903708F052C08F770E94A4
</td> + </tr> + <tr> + <td id="L784" class="blob-num js-line-number" data-line-number="784"></td> + <td id="LC784" class="blob-code blob-code-inner js-file-line">:1030F000751141C00E5F1F4FFE01C49180E28C0F1D
</td> + </tr> + <tr> + <td id="L785" class="blob-num js-line-number" data-line-number="785"></td> + <td id="LC785" class="blob-code blob-code-inner js-file-line">:10310000883048F4C7708E2D01C0880FCA95EAF741
</td> + </tr> + <tr> + <td id="L786" class="blob-num js-line-number" data-line-number="786"></td> + <td id="LC786" class="blob-code blob-code-inner js-file-line">:103110000E94FD1A14C08C2F0E94AD102DC00E5FAE
</td> + </tr> + <tr> + <td id="L787" class="blob-num js-line-number" data-line-number="787"></td> + <td id="LC787" class="blob-code blob-code-inner js-file-line">:103120001F4FFE01C49180E28C0F883058F4C770A5
</td> + </tr> + <tr> + <td id="L788" class="blob-num js-line-number" data-line-number="788"></td> + <td id="LC788" class="blob-code blob-code-inner js-file-line">:103130008E2D01C0880FCA95EAF70E94031B0E94DA
</td> + </tr> + <tr> + <td id="L789" class="blob-num js-line-number" data-line-number="789"></td> + <td id="LC789" class="blob-code blob-code-inner js-file-line">:10314000241B1AC08C2F0E94751116C00E5F1F4FD2
</td> + </tr> + <tr> + <td id="L790" class="blob-num js-line-number" data-line-number="790"></td> + <td id="LC790" class="blob-code blob-code-inner js-file-line">:10315000FE01C491CC2381F08FE99FE00197F1F744
</td> + </tr> + <tr> + <td id="L791" class="blob-num js-line-number" data-line-number="791"></td> + <td id="LC791" class="blob-code blob-code-inner js-file-line">:1031600000C00000C150F6CF0E5F1F4FFE01F4906B
</td> + </tr> + <tr> + <td id="L792" class="blob-num js-line-number" data-line-number="792"></td> + <td id="LC792" class="blob-code blob-code-inner js-file-line">:1031700003C00E94AD108E018F2D882309F49FCFCC
</td> + </tr> + <tr> + <td id="L793" class="blob-num js-line-number" data-line-number="793"></td> + <td id="LC793" class="blob-code blob-code-inner js-file-line">:10318000EFE9FFE03197F1F700C000008150F5CF83
</td> + </tr> + <tr> + <td id="L794" class="blob-num js-line-number" data-line-number="794"></td> + <td id="LC794" class="blob-code blob-code-inner js-file-line">:10319000DF91CF911F910F91FF90EF9008950895C7
</td> + </tr> + <tr> + <td id="L795" class="blob-num js-line-number" data-line-number="795"></td> + <td id="LC795" class="blob-code blob-code-inner js-file-line">:1031A0006093B7017093B8018093B9019093BA010D
</td> + </tr> + <tr> + <td id="L796" class="blob-num js-line-number" data-line-number="796"></td> + <td id="LC796" class="blob-code blob-code-inner js-file-line">:1031B0000C9400150F931F930091B7011091B80163
</td> + </tr> + <tr> + <td id="L797" class="blob-num js-line-number" data-line-number="797"></td> + <td id="LC797" class="blob-code blob-code-inner js-file-line">:1031C0002091B9013091BA01DC01CB01802B912B08
</td> + </tr> + <tr> + <td id="L798" class="blob-num js-line-number" data-line-number="798"></td> + <td id="LC798" class="blob-code blob-code-inner js-file-line">:1031D000A22BB32B8093B7019093B801A093B901B0
</td> + </tr> + <tr> + <td id="L799" class="blob-num js-line-number" data-line-number="799"></td> + <td id="LC799" class="blob-code blob-code-inner js-file-line">:1031E000B093BA011F910F910C9400150F931F9388
</td> + </tr> + <tr> + <td id="L800" class="blob-num js-line-number" data-line-number="800"></td> + <td id="LC800" class="blob-code blob-code-inner js-file-line">:1031F0000091B7011091B8012091B9013091BA0145
</td> + </tr> + <tr> + <td id="L801" class="blob-num js-line-number" data-line-number="801"></td> + <td id="LC801" class="blob-code blob-code-inner js-file-line">:10320000DC01CB0180239123A223B3238093B70158
</td> + </tr> + <tr> + <td id="L802" class="blob-num js-line-number" data-line-number="802"></td> + <td id="LC802" class="blob-code blob-code-inner js-file-line">:103210009093B801A093B901B093BA011F910F9197
</td> + </tr> + <tr> + <td id="L803" class="blob-num js-line-number" data-line-number="803"></td> + <td id="LC803" class="blob-code blob-code-inner js-file-line">:103220000C9400150F931F930091B7011091B801F2
</td> + </tr> + <tr> + <td id="L804" class="blob-num js-line-number" data-line-number="804"></td> + <td id="LC804" class="blob-code blob-code-inner js-file-line">:103230002091B9013091BA01DC01CB01802791279F
</td> + </tr> + <tr> + <td id="L805" class="blob-num js-line-number" data-line-number="805"></td> + <td id="LC805" class="blob-code blob-code-inner js-file-line">:10324000A227B3278093B7019093B801A093B90147
</td> + </tr> + <tr> + <td id="L806" class="blob-num js-line-number" data-line-number="806"></td> + <td id="LC806" class="blob-code blob-code-inner js-file-line">:10325000B093BA011F910F910C9400151092B30115
</td> + </tr> + <tr> + <td id="L807" class="blob-num js-line-number" data-line-number="807"></td> + <td id="LC807" class="blob-code blob-code-inner js-file-line">:103260001092B4011092B5011092B6010C940015A1
</td> + </tr> + <tr> + <td id="L808" class="blob-num js-line-number" data-line-number="808"></td> + <td id="LC808" class="blob-code blob-code-inner js-file-line">:1032700041E050E060E070E004C0440F551F661F5D
</td> + </tr> + <tr> + <td id="L809" class="blob-num js-line-number" data-line-number="809"></td> + <td id="LC809" class="blob-code blob-code-inner js-file-line">:10328000771F8A95D2F74093B3015093B4016093AE
</td> + </tr> + <tr> + <td id="L810" class="blob-num js-line-number" data-line-number="810"></td> + <td id="LC810" class="blob-code blob-code-inner js-file-line">:10329000B5017093B6010C94001541E050E060E078
</td> + </tr> + <tr> + <td id="L811" class="blob-num js-line-number" data-line-number="811"></td> + <td id="LC811" class="blob-code blob-code-inner js-file-line">:1032A00070E004C0440F551F661F771F8A95D2F740
</td> + </tr> + <tr> + <td id="L812" class="blob-num js-line-number" data-line-number="812"></td> + <td id="LC812" class="blob-code blob-code-inner js-file-line">:1032B0008091B3019091B401A091B501B091B60194
</td> + </tr> + <tr> + <td id="L813" class="blob-num js-line-number" data-line-number="813"></td> + <td id="LC813" class="blob-code blob-code-inner js-file-line">:1032C000482B592B6A2B7B2B4093B3015093B401AD
</td> + </tr> + <tr> + <td id="L814" class="blob-num js-line-number" data-line-number="814"></td> + <td id="LC814" class="blob-code blob-code-inner js-file-line">:1032D0006093B5017093B6010C94001541E050E085
</td> + </tr> + <tr> + <td id="L815" class="blob-num js-line-number" data-line-number="815"></td> + <td id="LC815" class="blob-code blob-code-inner js-file-line">:1032E00060E070E004C0440F551F661F771F8A9589
</td> + </tr> + <tr> + <td id="L816" class="blob-num js-line-number" data-line-number="816"></td> + <td id="LC816" class="blob-code blob-code-inner js-file-line">:1032F000D2F740955095609570958091B30190916B
</td> + </tr> + <tr> + <td id="L817" class="blob-num js-line-number" data-line-number="817"></td> + <td id="LC817" class="blob-code blob-code-inner js-file-line">:10330000B401A091B501B091B601482359236A23B5
</td> + </tr> + <tr> + <td id="L818" class="blob-num js-line-number" data-line-number="818"></td> + <td id="LC818" class="blob-code blob-code-inner js-file-line">:103310007B234093B3015093B4016093B501709344
</td> + </tr> + <tr> + <td id="L819" class="blob-num js-line-number" data-line-number="819"></td> + <td id="LC819" class="blob-code blob-code-inner js-file-line">:10332000B6010C94001541E050E060E070E004C08C
</td> + </tr> + <tr> + <td id="L820" class="blob-num js-line-number" data-line-number="820"></td> + <td id="LC820" class="blob-code blob-code-inner js-file-line">:10333000440F551F661F771F8A95D2F78091B301FE
</td> + </tr> + <tr> + <td id="L821" class="blob-num js-line-number" data-line-number="821"></td> + <td id="LC821" class="blob-code blob-code-inner js-file-line">:103340009091B401A091B501B091B60148275927D9
</td> + </tr> + <tr> + <td id="L822" class="blob-num js-line-number" data-line-number="822"></td> + <td id="LC822" class="blob-code blob-code-inner js-file-line">:103350006A277B274093B3015093B4016093B50172
</td> + </tr> + <tr> + <td id="L823" class="blob-num js-line-number" data-line-number="823"></td> + <td id="LC823" class="blob-code blob-code-inner js-file-line">:103360007093B6010C9400150F931F930091B30155
</td> + </tr> + <tr> + <td id="L824" class="blob-num js-line-number" data-line-number="824"></td> + <td id="LC824" class="blob-code blob-code-inner js-file-line">:103370001091B4012091B5013091B601DC01CB016F
</td> + </tr> + <tr> + <td id="L825" class="blob-num js-line-number" data-line-number="825"></td> + <td id="LC825" class="blob-code blob-code-inner js-file-line">:10338000802B912BA22BB32B8093B3019093B4018C
</td> + </tr> + <tr> + <td id="L826" class="blob-num js-line-number" data-line-number="826"></td> + <td id="LC826" class="blob-code blob-code-inner js-file-line">:10339000A093B501B093B6011F910F910C94001545
</td> + </tr> + <tr> + <td id="L827" class="blob-num js-line-number" data-line-number="827"></td> + <td id="LC827" class="blob-code blob-code-inner js-file-line">:1033A0000F931F930091B3011091B4012091B501C7
</td> + </tr> + <tr> + <td id="L828" class="blob-num js-line-number" data-line-number="828"></td> + <td id="LC828" class="blob-code blob-code-inner js-file-line">:1033B0003091B601DC01CB0180239123A223B323FA
</td> + </tr> + <tr> + <td id="L829" class="blob-num js-line-number" data-line-number="829"></td> + <td id="LC829" class="blob-code blob-code-inner js-file-line">:1033C0008093B3019093B401A093B501B093B6017B
</td> + </tr> + <tr> + <td id="L830" class="blob-num js-line-number" data-line-number="830"></td> + <td id="LC830" class="blob-code blob-code-inner js-file-line">:1033D0001F910F910C9400150F931F930091B3014F
</td> + </tr> + <tr> + <td id="L831" class="blob-num js-line-number" data-line-number="831"></td> + <td id="LC831" class="blob-code blob-code-inner js-file-line">:1033E0001091B4012091B5013091B601DC01CB01FF
</td> + </tr> + <tr> + <td id="L832" class="blob-num js-line-number" data-line-number="832"></td> + <td id="LC832" class="blob-code blob-code-inner js-file-line">:1033F00080279127A227B3278093B3019093B4012C
</td> + </tr> + <tr> + <td id="L833" class="blob-num js-line-number" data-line-number="833"></td> + <td id="LC833" class="blob-code blob-code-inner js-file-line">:10340000A093B501B093B6011F910F910C940015D4
</td> + </tr> + <tr> + <td id="L834" class="blob-num js-line-number" data-line-number="834"></td> + <td id="LC834" class="blob-code blob-code-inner js-file-line">:103410000895CF92DF92EF92FF920F931F93CF9375
</td> + </tr> + <tr> + <td id="L835" class="blob-num js-line-number" data-line-number="835"></td> + <td id="LC835" class="blob-code blob-code-inner js-file-line">:10342000DF938C01C090B701D090B801E090B90152
</td> + </tr> + <tr> + <td id="L836" class="blob-num js-line-number" data-line-number="836"></td> + <td id="LC836" class="blob-code blob-code-inner js-file-line">:10343000F090BA018091B3019091B401A091B501CF
</td> + </tr> + <tr> + <td id="L837" class="blob-num js-line-number" data-line-number="837"></td> + <td id="LC837" class="blob-code blob-code-inner js-file-line">:10344000B091B601C82AD92AEA2AFB2ACFE1D0E0F6
</td> + </tr> + <tr> + <td id="L838" class="blob-num js-line-number" data-line-number="838"></td> + <td id="LC838" class="blob-code blob-code-inner js-file-line">:10345000D701C6010C2E04C0B695A7959795879500
</td> + </tr> + <tr> + <td id="L839" class="blob-num js-line-number" data-line-number="839"></td> + <td id="LC839" class="blob-code blob-code-inner js-file-line">:103460000A94D2F780FF06C0B8018C2F0E94DF07B4
</td> + </tr> + <tr> + <td id="L840" class="blob-num js-line-number" data-line-number="840"></td> + <td id="LC840" class="blob-code blob-code-inner js-file-line">:10347000019721F4219760F780E001C08C2FDF9144
</td> + </tr> + <tr> + <td id="L841" class="blob-num js-line-number" data-line-number="841"></td> + <td id="LC841" class="blob-code blob-code-inner js-file-line">:10348000CF911F910F91FF90EF90DF90CF90089513
</td> + </tr> + <tr> + <td id="L842" class="blob-num js-line-number" data-line-number="842"></td> + <td id="LC842" class="blob-code blob-code-inner js-file-line">:10349000CF93DF93EC010E94091ABE010E94DF075F
</td> + </tr> + <tr> + <td id="L843" class="blob-num js-line-number" data-line-number="843"></td> + <td id="LC843" class="blob-code blob-code-inner js-file-line">:1034A000DF91CF910895CB010E94481A0895909121
</td> + </tr> + <tr> + <td id="L844" class="blob-num js-line-number" data-line-number="844"></td> + <td id="LC844" class="blob-code blob-code-inner js-file-line">:1034B0000C01992321F090910D01911109C02091E7
</td> + </tr> + <tr> + <td id="L845" class="blob-num js-line-number" data-line-number="845"></td> + <td id="LC845" class="blob-code blob-code-inner js-file-line">:1034C0000E0130910F01F90132969FEF40E01FC0CD
</td> + </tr> + <tr> + <td id="L846" class="blob-num js-line-number" data-line-number="846"></td> + <td id="LC846" class="blob-code blob-code-inner js-file-line">:1034D000982F9695969596959F3050F5E0910E0110
</td> + </tr> + <tr> + <td id="L847" class="blob-num js-line-number" data-line-number="847"></td> + <td id="LC847" class="blob-code blob-code-inner js-file-line">:1034E000F0910F01E90FF11D877021E030E0A90193
</td> + </tr> + <tr> + <td id="L848" class="blob-num js-line-number" data-line-number="848"></td> + <td id="LC848" class="blob-code blob-code-inner js-file-line">:1034F00002C0440F551F8A95E2F7CA019181892BBA
</td> + </tr> + <tr> + <td id="L849" class="blob-num js-line-number" data-line-number="849"></td> + <td id="LC849" class="blob-code blob-code-inner js-file-line">:10350000818308959F3F39F04F5F4E3041F05191D4
</td> + </tr> + <tr> + <td id="L850" class="blob-num js-line-number" data-line-number="850"></td> + <td id="LC850" class="blob-code blob-code-inner js-file-line">:103510005813F8CF0DC05111F7CF942FF5CF9F3F1F
</td> + </tr> + <tr> + <td id="L851" class="blob-num js-line-number" data-line-number="851"></td> + <td id="LC851" class="blob-code blob-code-inner js-file-line">:1035200039F0F901E90FF11D97FDFA9582830895AD
</td> + </tr> + <tr> + <td id="L852" class="blob-num js-line-number" data-line-number="852"></td> + <td id="LC852" class="blob-code blob-code-inner js-file-line">:10353000089590910C01992321F090910D01911122
</td> + </tr> + <tr> + <td id="L853" class="blob-num js-line-number" data-line-number="853"></td> + <td id="LC853" class="blob-code blob-code-inner js-file-line">:1035400009C020910E0130910F01F9013296205FE0
</td> + </tr> + <tr> + <td id="L854" class="blob-num js-line-number" data-line-number="854"></td> + <td id="LC854" class="blob-code blob-code-inner js-file-line">:103550003F4F1FC0982F9695969596959F30F0F403
</td> + </tr> + <tr> + <td id="L855" class="blob-num js-line-number" data-line-number="855"></td> + <td id="LC855" class="blob-code blob-code-inner js-file-line">:10356000E0910E01F0910F01E90FF11D877021E04C
</td> + </tr> + <tr> + <td id="L856" class="blob-num js-line-number" data-line-number="856"></td> + <td id="LC856" class="blob-code blob-code-inner js-file-line">:1035700030E0A90102C0440F551F8A95E2F7CA0145
</td> + </tr> + <tr> + <td id="L857" class="blob-num js-line-number" data-line-number="857"></td> + <td id="LC857" class="blob-code blob-code-inner js-file-line">:10358000809591818923818308953196E217F3070D
</td> + </tr> + <tr> + <td id="L858" class="blob-num js-line-number" data-line-number="858"></td> + <td id="LC858" class="blob-code blob-code-inner js-file-line">:1035900029F090819813F9CF1082F7CF089581E038
</td> + </tr> + <tr> + <td id="L859" class="blob-num js-line-number" data-line-number="859"></td> + <td id="LC859" class="blob-code blob-code-inner js-file-line">:1035A00090E0E0910E01F0910F01E80FF91F1082F9
</td> + </tr> + <tr> + <td id="L860" class="blob-num js-line-number" data-line-number="860"></td> + <td id="LC860" class="blob-code blob-code-inner js-file-line">:1035B000019680319105A9F708959091CE01892B4C
</td> + </tr> + <tr> + <td id="L861" class="blob-num js-line-number" data-line-number="861"></td> + <td id="LC861" class="blob-code blob-code-inner js-file-line">:1035C0008093CE01089580959091CE0189238093B8
</td> + </tr> + <tr> + <td id="L862" class="blob-num js-line-number" data-line-number="862"></td> + <td id="LC862" class="blob-code blob-code-inner js-file-line">:1035D000CE0108951092CE0108959091CD01892BCE
</td> + </tr> + <tr> + <td id="L863" class="blob-num js-line-number" data-line-number="863"></td> + <td id="LC863" class="blob-code blob-code-inner js-file-line">:1035E0008093CD01089580959091CD01892380939A
</td> + </tr> + <tr> + <td id="L864" class="blob-num js-line-number" data-line-number="864"></td> + <td id="LC864" class="blob-code blob-code-inner js-file-line">:1035F000CD0108951092CD0108959091CC01892BB1
</td> + </tr> + <tr> + <td id="L865" class="blob-num js-line-number" data-line-number="865"></td> + <td id="LC865" class="blob-code blob-code-inner js-file-line">:103600008093CC01089580959091CC01892380937B
</td> + </tr> + <tr> + <td id="L866" class="blob-num js-line-number" data-line-number="866"></td> + <td id="LC866" class="blob-code blob-code-inner js-file-line">:10361000CC0108951092CC0108958093BB010895C8
</td> + </tr> + <tr> + <td id="L867" class="blob-num js-line-number" data-line-number="867"></td> + <td id="LC867" class="blob-code blob-code-inner js-file-line">:103620001092BB01089580910E0190910F01FC0151
</td> + </tr> + <tr> + <td id="L868" class="blob-num js-line-number" data-line-number="868"></td> + <td id="LC868" class="blob-code blob-code-inner js-file-line">:1036300031969C01205F3F4F80E0919191118F5F07
</td> + </tr> + <tr> + <td id="L869" class="blob-num js-line-number" data-line-number="869"></td> + <td id="LC869" class="blob-code blob-code-inner js-file-line">:10364000E217F307D1F70895E0910E01F0910F0111
</td> + </tr> + <tr> + <td id="L870" class="blob-num js-line-number" data-line-number="870"></td> + <td id="LC870" class="blob-code blob-code-inner js-file-line">:103650008091CE018083E0910E01F0910F01908165
</td> + </tr> + <tr> + <td id="L871" class="blob-num js-line-number" data-line-number="871"></td> + <td id="LC871" class="blob-code blob-code-inner js-file-line">:103660008091CD01892B8083E0910E01F0910F01B3
</td> + </tr> + <tr> + <td id="L872" class="blob-num js-line-number" data-line-number="872"></td> + <td id="LC872" class="blob-code blob-code-inner js-file-line">:1036700090818091CC01892B80838091BB0188232C
</td> + </tr> + <tr> + <td id="L873" class="blob-num js-line-number" data-line-number="873"></td> + <td id="LC873" class="blob-code blob-code-inner js-file-line">:1036800061F0E0910E01F0910F019081892B808310
</td> + </tr> + <tr> + <td id="L874" class="blob-num js-line-number" data-line-number="874"></td> + <td id="LC874" class="blob-code blob-code-inner js-file-line">:103690000E94131B81111092BB0180910E01909129
</td> + </tr> + <tr> + <td id="L875" class="blob-num js-line-number" data-line-number="875"></td> + <td id="LC875" class="blob-code blob-code-inner js-file-line">:1036A0000F010C94900FCF92DF92EF92FF926C017A
</td> + </tr> + <tr> + <td id="L876" class="blob-num js-line-number" data-line-number="876"></td> + <td id="LC876" class="blob-code blob-code-inner js-file-line">:1036B000EE24FF24C114D104E104F10421F0C70178
</td> + </tr> + <tr> + <td id="L877" class="blob-num js-line-number" data-line-number="877"></td> + <td id="LC877" class="blob-code blob-code-inner js-file-line">:1036C000B60120E101C020E0C72ED82EE92EFF244C
</td> + </tr> + <tr> + <td id="L878" class="blob-num js-line-number" data-line-number="878"></td> + <td id="LC878" class="blob-code blob-code-inner js-file-line">:1036D000C114D104E104F10419F0285FC701B60157
</td> + </tr> + <tr> + <td id="L879" class="blob-num js-line-number" data-line-number="879"></td> + <td id="LC879" class="blob-code blob-code-inner js-file-line">:1036E0006B017C0154E0F694E794D794C7945A9503
</td> + </tr> + <tr> + <td id="L880" class="blob-num js-line-number" data-line-number="880"></td> + <td id="LC880" class="blob-code blob-code-inner js-file-line">:1036F000D1F7C114D104E104F10419F02C5FC70122
</td> + </tr> + <tr> + <td id="L881" class="blob-num js-line-number" data-line-number="881"></td> + <td id="LC881" class="blob-code blob-code-inner js-file-line">:10370000B6016B017C0142E0F694E794D794C7942C
</td> + </tr> + <tr> + <td id="L882" class="blob-num js-line-number" data-line-number="882"></td> + <td id="LC882" class="blob-code blob-code-inner js-file-line">:103710004A95D1F7C114D104E104F10419F02E5FE8
</td> + </tr> + <tr> + <td id="L883" class="blob-num js-line-number" data-line-number="883"></td> + <td id="LC883" class="blob-code blob-code-inner js-file-line">:10372000C701B601DC01CB01B695A79597958795A2
</td> + </tr> + <tr> + <td id="L884" class="blob-num js-line-number" data-line-number="884"></td> + <td id="LC884" class="blob-code blob-code-inner js-file-line">:10373000892B8A2B8B2B09F02F5F822FFF90EF9024
</td> + </tr> + <tr> + <td id="L885" class="blob-num js-line-number" data-line-number="885"></td> + <td id="LC885" class="blob-code blob-code-inner js-file-line">:10374000DF90CF9008958091E601843039F1109296
</td> + </tr> + <tr> + <td id="L886" class="blob-num js-line-number" data-line-number="886"></td> + <td id="LC886" class="blob-code blob-code-inner js-file-line">:10375000D00120E488E190E00FB6F894A89580931A
</td> + </tr> + <tr> + <td id="L887" class="blob-num js-line-number" data-line-number="887"></td> + <td id="LC887" class="blob-code blob-code-inner js-file-line">:1037600060000FBE2093600080E00E947A0883B75B
</td> + </tr> + <tr> + <td id="L888" class="blob-num js-line-number" data-line-number="888"></td> + <td id="LC888" class="blob-code blob-code-inner js-file-line">:10377000817F846083BF83B7816083BF789488959D
</td> + </tr> + <tr> + <td id="L889" class="blob-num js-line-number" data-line-number="889"></td> + <td id="LC889" class="blob-code blob-code-inner js-file-line">:1037800083B78E7F83BF0FB6F894A89580916000B1
</td> + </tr> + <tr> + <td id="L890" class="blob-num js-line-number" data-line-number="890"></td> + <td id="LC890" class="blob-code blob-code-inner js-file-line">:10379000886180936000109260000FBE08950895C4
</td> + </tr> + <tr> + <td id="L891" class="blob-num js-line-number" data-line-number="891"></td> + <td id="LC891" class="blob-code blob-code-inner js-file-line">:1037A0000895CF930E94CF1B0E94AA040E94D01BB1
</td> + </tr> + <tr> + <td id="L892" class="blob-num js-line-number" data-line-number="892"></td> + <td id="LC892" class="blob-code blob-code-inner js-file-line">:1037B000C0E08C2F0E949805811104C0CF5FCE30ED
</td> + </tr> + <tr> + <td id="L893" class="blob-num js-line-number" data-line-number="893"></td> + <td id="LC893" class="blob-code blob-code-inner js-file-line">:1037C000C1F701C081E0CF9108950E9414150E94B5
</td> + </tr> + <tr> + <td id="L894" class="blob-num js-line-number" data-line-number="894"></td> + <td id="LC894" class="blob-code blob-code-inner js-file-line">:1037D000840F0C947A0882E084BD93E095BD9AEF43
</td> + </tr> + <tr> + <td id="L895" class="blob-num js-line-number" data-line-number="895"></td> + <td id="LC895" class="blob-code blob-code-inner js-file-line">:1037E00097BD80936E0008952FB7F8948091D10112
</td> + </tr> + <tr> + <td id="L896" class="blob-num js-line-number" data-line-number="896"></td> + <td id="LC896" class="blob-code blob-code-inner js-file-line">:1037F0009091D201A091D301B091D4012FBF08952F
</td> + </tr> + <tr> + <td id="L897" class="blob-num js-line-number" data-line-number="897"></td> + <td id="LC897" class="blob-code blob-code-inner js-file-line">:10380000CF92DF92EF92FF920F931F932FB7F8940E
</td> + </tr> + <tr> + <td id="L898" class="blob-num js-line-number" data-line-number="898"></td> + <td id="LC898" class="blob-code blob-code-inner js-file-line">:103810004091D1015091D2016091D3017091D401B6
</td> + </tr> + <tr> + <td id="L899" class="blob-num js-line-number" data-line-number="899"></td> + <td id="LC899" class="blob-code blob-code-inner js-file-line">:103820002FBF6A017B01EE24FF248C0120E030E0F1
</td> + </tr> + <tr> + <td id="L900" class="blob-num js-line-number" data-line-number="900"></td> + <td id="LC900" class="blob-code blob-code-inner js-file-line">:10383000C016D106E206F30610F4415051099A0170
</td> + </tr> + <tr> + <td id="L901" class="blob-num js-line-number" data-line-number="901"></td> + <td id="LC901" class="blob-code blob-code-inner js-file-line">:10384000281B390BC9011F910F91FF90EF90DF905A
</td> + </tr> + <tr> + <td id="L902" class="blob-num js-line-number" data-line-number="902"></td> + <td id="LC902" class="blob-code blob-code-inner js-file-line">:10385000CF9008951F920F920FB60F9211248F935D
</td> + </tr> + <tr> + <td id="L903" class="blob-num js-line-number" data-line-number="903"></td> + <td id="LC903" class="blob-code blob-code-inner js-file-line">:103860009F93AF93BF938091D1019091D201A0918A
</td> + </tr> + <tr> + <td id="L904" class="blob-num js-line-number" data-line-number="904"></td> + <td id="LC904" class="blob-code blob-code-inner js-file-line">:10387000D301B091D4010196A11DB11D8093D10156
</td> + </tr> + <tr> + <td id="L905" class="blob-num js-line-number" data-line-number="905"></td> + <td id="LC905" class="blob-code blob-code-inner js-file-line">:103880009093D201A093D301B093D401BF91AF9193
</td> + </tr> + <tr> + <td id="L906" class="blob-num js-line-number" data-line-number="906"></td> + <td id="LC906" class="blob-code blob-code-inner js-file-line">:103890009F918F910F900FBE0F901F9018950E94CF
</td> + </tr> + <tr> + <td id="L907" class="blob-num js-line-number" data-line-number="907"></td> + <td id="LC907" class="blob-code blob-code-inner js-file-line">:1038A000810CF8942FEF87EA91E6215080409040F8
</td> + </tr> + <tr> + <td id="L908" class="blob-num js-line-number" data-line-number="908"></td> + <td id="LC908" class="blob-code blob-code-inner js-file-line">:1038B000E1F700C0000087E090EBDC018093F001AD
</td> + </tr> + <tr> + <td id="L909" class="blob-num js-line-number" data-line-number="909"></td> + <td id="LC909" class="blob-code blob-code-inner js-file-line">:1038C0009093F101A093F201B093F3019CE088E1A1
</td> + </tr> + <tr> + <td id="L910" class="blob-num js-line-number" data-line-number="910"></td> + <td id="LC910" class="blob-code blob-code-inner js-file-line">:1038D0000FB6F894A895809360000FBE9093600097
</td> + </tr> + <tr> + <td id="L911" class="blob-num js-line-number" data-line-number="911"></td> + <td id="LC911" class="blob-code blob-code-inner js-file-line">:1038E000FFCFEF92FF920F931F93CF93DF93D82FC9
</td> + </tr> + <tr> + <td id="L912" class="blob-num js-line-number" data-line-number="912"></td> + <td id="LC912" class="blob-code blob-code-inner js-file-line">:1038F000C0E08C2F0E94980500E010E0E82EF12C2B
</td> + </tr> + <tr> + <td id="L913" class="blob-num js-line-number" data-line-number="913"></td> + <td id="LC913" class="blob-code blob-code-inner js-file-line">:10390000C701002E02C0959587950A94E2F780FDC5
</td> + </tr> + <tr> + <td id="L914" class="blob-num js-line-number" data-line-number="914"></td> + <td id="LC914" class="blob-code blob-code-inner js-file-line">:1039100006C00F5F1F4F0630110591F709C0602FD9
</td> + </tr> + <tr> + <td id="L915" class="blob-num js-line-number" data-line-number="915"></td> + <td id="LC915" class="blob-code blob-code-inner js-file-line">:103920007C2F80E00E94A005D813F3CF81E004C073
</td> + </tr> + <tr> + <td id="L916" class="blob-num js-line-number" data-line-number="916"></td> + <td id="LC916" class="blob-code blob-code-inner js-file-line">:10393000CF5FCE30F1F680E0DF91CF911F910F91F4
</td> + </tr> + <tr> + <td id="L917" class="blob-num js-line-number" data-line-number="917"></td> + <td id="LC917" class="blob-code blob-code-inner js-file-line">:10394000FF90EF900895CF93C82F8CE20E94711CD6
</td> + </tr> + <tr> + <td id="L918" class="blob-num js-line-number" data-line-number="918"></td> + <td id="LC918" class="blob-code blob-code-inner js-file-line">:10395000882321F08C2FCF910C94711C80E0CF91A3
</td> + </tr> + <tr> + <td id="L919" class="blob-num js-line-number" data-line-number="919"></td> + <td id="LC919" class="blob-code blob-code-inner js-file-line">:103960000895CF930E94F81D811102C00E94DE1DB0
</td> + </tr> + <tr> + <td id="L920" class="blob-num js-line-number" data-line-number="920"></td> + <td id="LC920" class="blob-code blob-code-inner js-file-line">:10397000C5E6C15049F00E94AA048FE39CE9019773
</td> + </tr> + <tr> + <td id="L921" class="blob-num js-line-number" data-line-number="921"></td> + <td id="LC921" class="blob-code blob-code-inner js-file-line">:10398000F1F700C00000F5CF89E20E94A31C81116D
</td> + </tr> + <tr> + <td id="L922" class="blob-num js-line-number" data-line-number="922"></td> + <td id="LC922" class="blob-code blob-code-inner js-file-line">:1039900013C18AE20E94A31C81110E94DE1D85E0F2
</td> + </tr> + <tr> + <td id="L923" class="blob-num js-line-number" data-line-number="923"></td> + <td id="LC923" class="blob-code blob-code-inner js-file-line">:1039A0000E94A31C81110E944F1C0E94031E809341
</td> + </tr> + <tr> + <td id="L924" class="blob-num js-line-number" data-line-number="924"></td> + <td id="LC924" class="blob-code blob-code-inner js-file-line">:1039B000CF0187E00E94A31C8823A9F18BE10E941C
</td> + </tr> + <tr> + <td id="L925" class="blob-num js-line-number" data-line-number="925"></td> + <td id="LC925" class="blob-code blob-code-inner js-file-line">:1039C000A31C882351F08091CF0181FB222720F98D
</td> + </tr> + <tr> + <td id="L926" class="blob-num js-line-number" data-line-number="926"></td> + <td id="LC926" class="blob-code blob-code-inner js-file-line">:1039D00091E0922790FB81F90EC08EE00E94A31C1B
</td> + </tr> + <tr> + <td id="L927" class="blob-num js-line-number" data-line-number="927"></td> + <td id="LC927" class="blob-code blob-code-inner js-file-line">:1039E000882361F08091CF0182FB222720F991E0AA
</td> + </tr> + <tr> + <td id="L928" class="blob-num js-line-number" data-line-number="928"></td> + <td id="LC928" class="blob-code blob-code-inner js-file-line">:1039F000922790FB82F98093CF0115C080E10E944D
</td> + </tr> + <tr> + <td id="L929" class="blob-num js-line-number" data-line-number="929"></td> + <td id="LC929" class="blob-code blob-code-inner js-file-line">:103A0000A31C9091CF01882341F093FB222720F93A
</td> + </tr> + <tr> + <td id="L930" class="blob-num js-line-number" data-line-number="930"></td> + <td id="LC930" class="blob-code blob-code-inner js-file-line">:103A100081E0822780FB93F904C0892F809580FB89
</td> + </tr> + <tr> + <td id="L931" class="blob-num js-line-number" data-line-number="931"></td> + <td id="LC931" class="blob-code blob-code-inner js-file-line">:103A200090F99093CF018091CF010E94071E0E94D0
</td> + </tr> + <tr> + <td id="L932" class="blob-num js-line-number" data-line-number="932"></td> + <td id="LC932" class="blob-code blob-code-inner js-file-line">:103A3000151E8093EF0180EE0E94A31C882341F0A5
</td> + </tr> + <tr> + <td id="L933" class="blob-num js-line-number" data-line-number="933"></td> + <td id="LC933" class="blob-code blob-code-inner js-file-line">:103A40008091EF01982F909590FB80F98093EF0182
</td> + </tr> + <tr> + <td id="L934" class="blob-num js-line-number" data-line-number="934"></td> + <td id="LC934" class="blob-code blob-code-inner js-file-line">:103A500089E30E94A31C882359F08091EF0181FB28
</td> + </tr> + <tr> + <td id="L935" class="blob-num js-line-number" data-line-number="935"></td> + <td id="LC935" class="blob-code blob-code-inner js-file-line">:103A6000222720F991E0922790FB81F98093EF01C2
</td> + </tr> + <tr> + <td id="L936" class="blob-num js-line-number" data-line-number="936"></td> + <td id="LC936" class="blob-code blob-code-inner js-file-line">:103A700082EE0E94A31C882359F08091EF0182FB03
</td> + </tr> + <tr> + <td id="L937" class="blob-num js-line-number" data-line-number="937"></td> + <td id="LC937" class="blob-code blob-code-inner js-file-line">:103A8000222720F991E0922790FB82F98093EF01A1
</td> + </tr> + <tr> + <td id="L938" class="blob-num js-line-number" data-line-number="938"></td> + <td id="LC938" class="blob-code blob-code-inner js-file-line">:103A900086EE0E94A31C882359F08091EF0183FBDE
</td> + </tr> + <tr> + <td id="L939" class="blob-num js-line-number" data-line-number="939"></td> + <td id="LC939" class="blob-code blob-code-inner js-file-line">:103AA000222720F991E0922790FB83F98093EF0180
</td> + </tr> + <tr> + <td id="L940" class="blob-num js-line-number" data-line-number="940"></td> + <td id="LC940" class="blob-code blob-code-inner js-file-line">:103AB00083EE0E94A31C882359F08091EF0184FBC0
</td> + </tr> + <tr> + <td id="L941" class="blob-num js-line-number" data-line-number="941"></td> + <td id="LC941" class="blob-code blob-code-inner js-file-line">:103AC000222720F991E0922790FB84F98093EF015F
</td> + </tr> + <tr> + <td id="L942" class="blob-num js-line-number" data-line-number="942"></td> + <td id="LC942" class="blob-code blob-code-inner js-file-line">:103AD00085E30E94A31C882359F08091EF0185FBA8
</td> + </tr> + <tr> + <td id="L943" class="blob-num js-line-number" data-line-number="943"></td> + <td id="LC943" class="blob-code blob-code-inner js-file-line">:103AE000222720F991E0922790FB85F98093EF013E
</td> + </tr> + <tr> + <td id="L944" class="blob-num js-line-number" data-line-number="944"></td> + <td id="LC944" class="blob-code blob-code-inner js-file-line">:103AF00081E30E94A31C882359F08091EF0186FB8B
</td> + </tr> + <tr> + <td id="L945" class="blob-num js-line-number" data-line-number="945"></td> + <td id="LC945" class="blob-code blob-code-inner js-file-line">:103B0000222720F991E0922790FB86F98093EF011C
</td> + </tr> + <tr> + <td id="L946" class="blob-num js-line-number" data-line-number="946"></td> + <td id="LC946" class="blob-code blob-code-inner js-file-line">:103B100081E10E94A31C882359F08091EF0187FB6B
</td> + </tr> + <tr> + <td id="L947" class="blob-num js-line-number" data-line-number="947"></td> + <td id="LC947" class="blob-code blob-code-inner js-file-line">:103B2000222720F991E0922790FB87F98093EF01FB
</td> + </tr> + <tr> + <td id="L948" class="blob-num js-line-number" data-line-number="948"></td> + <td id="LC948" class="blob-code blob-code-inner js-file-line">:103B30008091EF010E94191E8091EF0187FB882779
</td> + </tr> + <tr> + <td id="L949" class="blob-num js-line-number" data-line-number="949"></td> + <td id="LC949" class="blob-code blob-code-inner js-file-line">:103B400080F980930D0187E20E94A31CC82F8EE1AB
</td> + </tr> + <tr> + <td id="L950" class="blob-num js-line-number" data-line-number="950"></td> + <td id="LC950" class="blob-code blob-code-inner js-file-line">:103B50000E94A31C8111C2608FE10E94A31C8111ED
</td> + </tr> + <tr> + <td id="L951" class="blob-num js-line-number" data-line-number="951"></td> + <td id="LC951" class="blob-code blob-code-inner js-file-line">:103B6000C46080E20E94A31C8111C86081E20E94AF
</td> + </tr> + <tr> + <td id="L952" class="blob-num js-line-number" data-line-number="952"></td> + <td id="LC952" class="blob-code blob-code-inner js-file-line">:103B7000A31C8111C06182E20E94A31C8111C0625A
</td> + </tr> + <tr> + <td id="L953" class="blob-num js-line-number" data-line-number="953"></td> + <td id="LC953" class="blob-code blob-code-inner js-file-line">:103B800083E20E94A31C8111C06484E20E94A31CF2
</td> + </tr> + <tr> + <td id="L954" class="blob-num js-line-number" data-line-number="954"></td> + <td id="LC954" class="blob-code blob-code-inner js-file-line">:103B9000882311F0C06802C0CC2329F08C2F0E942A
</td> + </tr> + <tr> + <td id="L955" class="blob-num js-line-number" data-line-number="955"></td> + <td id="LC955" class="blob-code blob-code-inner js-file-line">:103BA000101E6C2F03C00E940C1E682F70E080E076
</td> + </tr> + <tr> + <td id="L956" class="blob-num js-line-number" data-line-number="956"></td> + <td id="LC956" class="blob-code blob-code-inner js-file-line">:103BB00090E0CF910C94D018CF9108956DEE7EEFE8
</td> + </tr> + <tr> + <td id="L957" class="blob-num js-line-number" data-line-number="957"></td> + <td id="LC957" class="blob-code blob-code-inner js-file-line">:103BC00080E090E00E94582460E082E090E00E9453
</td> + </tr> + <tr> + <td id="L958" class="blob-num js-line-number" data-line-number="958"></td> + <td id="LC958" class="blob-code blob-code-inner js-file-line">:103BD000462460E083E090E00E94462460E084E0B8
</td> + </tr> + <tr> + <td id="L959" class="blob-num js-line-number" data-line-number="959"></td> + <td id="LC959" class="blob-code blob-code-inner js-file-line">:103BE00090E00E94462460E085E090E00C9446243A
</td> + </tr> + <tr> + <td id="L960" class="blob-num js-line-number" data-line-number="960"></td> + <td id="LC960" class="blob-code blob-code-inner js-file-line">:103BF00080E090E00E94402421E08D3E9E4F09F03D
</td> + </tr> + <tr> + <td id="L961" class="blob-num js-line-number" data-line-number="961"></td> + <td id="LC961" class="blob-code blob-code-inner js-file-line">:103C000020E0822F089582E090E00C943824682F01
</td> + </tr> + <tr> + <td id="L962" class="blob-num js-line-number" data-line-number="962"></td> + <td id="LC962" class="blob-code blob-code-inner js-file-line">:103C100082E090E00C94462483E090E00C943824F9
</td> + </tr> + <tr> + <td id="L963" class="blob-num js-line-number" data-line-number="963"></td> + <td id="LC963" class="blob-code blob-code-inner js-file-line">:103C2000682F83E090E00C94462484E090E00C94AC
</td> + </tr> + <tr> + <td id="L964" class="blob-num js-line-number" data-line-number="964"></td> + <td id="LC964" class="blob-code blob-code-inner js-file-line">:103C30003824682F84E090E00C9446248091D701CA
</td> + </tr> + <tr> + <td id="L965" class="blob-num js-line-number" data-line-number="965"></td> + <td id="LC965" class="blob-code blob-code-inner js-file-line">:103C400080FF0BC06091130185E0689FB0011124D3
</td> + </tr> + <tr> + <td id="L966" class="blob-num js-line-number" data-line-number="966"></td> + <td id="LC966" class="blob-code blob-code-inner js-file-line">:103C500075956795759567952BC081FF09C0609133
</td> + </tr> + <tr> + <td id="L967" class="blob-num js-line-number" data-line-number="967"></td> + <td id="LC967" class="blob-code blob-code-inner js-file-line">:103C6000130185E0689FB00111247595679520C008
</td> + </tr> + <tr> + <td id="L968" class="blob-num js-line-number" data-line-number="968"></td> + <td id="LC968" class="blob-code blob-code-inner js-file-line">:103C700082FF07C06091130185E0689FB0011124A5
</td> + </tr> + <tr> + <td id="L969" class="blob-num js-line-number" data-line-number="969"></td> + <td id="LC969" class="blob-code blob-code-inner js-file-line">:103C800017C09091D8019923D1F060911201961735
</td> + </tr> + <tr> + <td id="L970" class="blob-num js-line-number" data-line-number="970"></td> + <td id="LC970" class="blob-code blob-code-inner js-file-line">:103C900088F72091130185E0289F90011124929FBD
</td> + </tr> + <tr> + <td id="L971" class="blob-num js-line-number" data-line-number="971"></td> + <td id="LC971" class="blob-code blob-code-inner js-file-line">:103CA000A001939F500D112470E0CA010E940A24C4
</td> + </tr> + <tr> + <td id="L972" class="blob-num js-line-number" data-line-number="972"></td> + <td id="LC972" class="blob-code blob-code-inner js-file-line">:103CB0006038710540F46115710539F002C065E0A6
</td> + </tr> + <tr> + <td id="L973" class="blob-num js-line-number" data-line-number="973"></td> + <td id="LC973" class="blob-code blob-code-inner js-file-line">:103CC00070E0862F08958FE7089581E00895809130
</td> + </tr> + <tr> + <td id="L974" class="blob-num js-line-number" data-line-number="974"></td> + <td id="LC974" class="blob-code blob-code-inner js-file-line">:103CD000D70180FF08C06091110170E0759567956C
</td> + </tr> + <tr> + <td id="L975" class="blob-num js-line-number" data-line-number="975"></td> + <td id="LC975" class="blob-code blob-code-inner js-file-line">:103CE0007595679521C081FF06C06091110170E054
</td> + </tr> + <tr> + <td id="L976" class="blob-num js-line-number" data-line-number="976"></td> + <td id="LC976" class="blob-code blob-code-inner js-file-line">:103CF0007595679519C082FF04C06091110170E04D
</td> + </tr> + <tr> + <td id="L977" class="blob-num js-line-number" data-line-number="977"></td> + <td id="LC977" class="blob-code blob-code-inner js-file-line">:103D000010C09091D8019923C1F0609110019617CD
</td> + </tr> + <tr> + <td id="L978" class="blob-num js-line-number" data-line-number="978"></td> + <td id="LC978" class="blob-code blob-code-inner js-file-line">:103D1000A0F780911101899FC001112470E00E94D9
</td> + </tr> + <tr> + <td id="L979" class="blob-num js-line-number" data-line-number="979"></td> + <td id="LC979" class="blob-code blob-code-inner js-file-line">:103D20000A246038710528F46115710521F0862F89
</td> + </tr> + <tr> + <td id="L980" class="blob-num js-line-number" data-line-number="980"></td> + <td id="LC980" class="blob-code blob-code-inner js-file-line">:103D300008958FE7089581E0089561E070E0F4CF81
</td> + </tr> + <tr> + <td id="L981" class="blob-num js-line-number" data-line-number="981"></td> + <td id="LC981" class="blob-code blob-code-inner js-file-line">:103D4000803F21F40E941E1E819504C0813F29F40A
</td> + </tr> + <tr> + <td id="L982" class="blob-num js-line-number" data-line-number="982"></td> + <td id="LC982" class="blob-code blob-code-inner js-file-line">:103D50000E941E1E8093DB010895823F21F40E9481
</td> + </tr> + <tr> + <td id="L983" class="blob-num js-line-number" data-line-number="983"></td> + <td id="LC983" class="blob-code blob-code-inner js-file-line">:103D60001E1E819504C0833F29F40E941E1E80936D
</td> + </tr> + <tr> + <td id="L984" class="blob-num js-line-number" data-line-number="984"></td> + <td id="LC984" class="blob-code blob-code-inner js-file-line">:103D7000DA010895893F19F40E94671E05C08A3F41
</td> + </tr> + <tr> + <td id="L985" class="blob-num js-line-number" data-line-number="985"></td> + <td id="LC985" class="blob-code blob-code-inner js-file-line">:103D800031F40E94671E81958093DC0108958B3F7A
</td> + </tr> + <tr> + <td id="L986" class="blob-num js-line-number" data-line-number="986"></td> + <td id="LC986" class="blob-code blob-code-inner js-file-line">:103D900021F40E94671E819504C08C3F29F40E9483
</td> + </tr> + <tr> + <td id="L987" class="blob-num js-line-number" data-line-number="987"></td> + <td id="LC987" class="blob-code blob-code-inner js-file-line">:103DA000671E8093DD010895843F21F48091D9013D
</td> + </tr> + <tr> + <td id="L988" class="blob-num js-line-number" data-line-number="988"></td> + <td id="LC988" class="blob-code blob-code-inner js-file-line">:103DB000816017C0853F21F48091D901826011C0D4
</td> + </tr> + <tr> + <td id="L989" class="blob-num js-line-number" data-line-number="989"></td> + <td id="LC989" class="blob-code blob-code-inner js-file-line">:103DC000863F21F48091D90184600BC0873F21F4A4
</td> + </tr> + <tr> + <td id="L990" class="blob-num js-line-number" data-line-number="990"></td> + <td id="LC990" class="blob-code blob-code-inner js-file-line">:103DD0008091D901886005C0883F31F48091D90174
</td> + </tr> + <tr> + <td id="L991" class="blob-num js-line-number" data-line-number="991"></td> + <td id="LC991" class="blob-code blob-code-inner js-file-line">:103DE00080618093D90108958D3F21F48091D7019E
</td> + </tr> + <tr> + <td id="L992" class="blob-num js-line-number" data-line-number="992"></td> + <td id="LC992" class="blob-code blob-code-inner js-file-line">:103DF00081600BC08E3F21F48091D701826005C0A5
</td> + </tr> + <tr> + <td id="L993" class="blob-num js-line-number" data-line-number="993"></td> + <td id="LC993" class="blob-code blob-code-inner js-file-line">:103E00008F3F29F48091D70184608093D701089572
</td> + </tr> + <tr> + <td id="L994" class="blob-num js-line-number" data-line-number="994"></td> + <td id="LC994" class="blob-code blob-code-inner js-file-line">:103E1000803F39F48091DB0187FF6CC01092DB0199
</td> + </tr> + <tr> + <td id="L995" class="blob-num js-line-number" data-line-number="995"></td> + <td id="LC995" class="blob-code blob-code-inner js-file-line">:103E200069C0813F29F48091DB011816BCF362C0A0
</td> + </tr> + <tr> + <td id="L996" class="blob-num js-line-number" data-line-number="996"></td> + <td id="LC996" class="blob-code blob-code-inner js-file-line">:103E30009091DA01823F29F497FF5CC01092DA0179
</td> + </tr> + <tr> + <td id="L997" class="blob-num js-line-number" data-line-number="997"></td> + <td id="LC997" class="blob-code blob-code-inner js-file-line">:103E400059C0833F19F41916CCF354C0893F41F48B
</td> + </tr> + <tr> + <td id="L998" class="blob-num js-line-number" data-line-number="998"></td> + <td id="LC998" class="blob-code blob-code-inner js-file-line">:103E50008091DC0118160CF04DC01092DC014AC0B4
</td> + </tr> + <tr> + <td id="L999" class="blob-num js-line-number" data-line-number="999"></td> + <td id="LC999" class="blob-code blob-code-inner js-file-line">:103E60008A3F29F48091DC0187FF44C0F6CF8B3F65
</td> + </tr> + <tr> + <td id="L1000" class="blob-num js-line-number" data-line-number="1000"></td> + <td id="LC1000" class="blob-code blob-code-inner js-file-line">:103E700039F48091DD0187FF3DC01092DD013AC029
</td> + </tr> + <tr> + <td id="L1001" class="blob-num js-line-number" data-line-number="1001"></td> + <td id="LC1001" class="blob-code blob-code-inner js-file-line">:103E80008C3F29F48091DD011816BCF333C0843FC8
</td> + </tr> + <tr> + <td id="L1002" class="blob-num js-line-number" data-line-number="1002"></td> + <td id="LC1002" class="blob-code blob-code-inner js-file-line">:103E900021F48091D9018E7F17C0853F21F4809154
</td> + </tr> + <tr> + <td id="L1003" class="blob-num js-line-number" data-line-number="1003"></td> + <td id="LC1003" class="blob-code blob-code-inner js-file-line">:103EA000D9018D7F11C0863F21F48091D9018B7F8C
</td> + </tr> + <tr> + <td id="L1004" class="blob-num js-line-number" data-line-number="1004"></td> + <td id="LC1004" class="blob-code blob-code-inner js-file-line">:103EB0000BC0873F21F48091D901877F05C0883FDF
</td> + </tr> + <tr> + <td id="L1005" class="blob-num js-line-number" data-line-number="1005"></td> + <td id="LC1005" class="blob-code blob-code-inner js-file-line">:103EC00031F48091D9018F7E8093D90113C08D3F49
</td> + </tr> + <tr> + <td id="L1006" class="blob-num js-line-number" data-line-number="1006"></td> + <td id="LC1006" class="blob-code blob-code-inner js-file-line">:103ED00021F48091D7018E7F0BC08E3F21F4809119
</td> + </tr> + <tr> + <td id="L1007" class="blob-num js-line-number" data-line-number="1007"></td> + <td id="LC1007" class="blob-code blob-code-inner js-file-line">:103EE000D7018D7F05C08F3F29F48091D7018B7F4B
</td> + </tr> + <tr> + <td id="L1008" class="blob-num js-line-number" data-line-number="1008"></td> + <td id="LC1008" class="blob-code blob-code-inner js-file-line">:103EF0008093D7018091DA0181110EC08091DB019E
</td> + </tr> + <tr> + <td id="L1009" class="blob-num js-line-number" data-line-number="1009"></td> + <td id="LC1009" class="blob-code blob-code-inner js-file-line">:103F000081110AC08091DC01811106C08091DD0120
</td> + </tr> + <tr> + <td id="L1010" class="blob-num js-line-number" data-line-number="1010"></td> + <td id="LC1010" class="blob-code blob-code-inner js-file-line">:103F1000811102C01092D801089589ED91E00E94AC
</td> + </tr> + <tr> + <td id="L1011" class="blob-num js-line-number" data-line-number="1011"></td> + <td id="LC1011" class="blob-code blob-code-inner js-file-line">:103F20009B0F0E94F41B9093D6018093D5010895B6
</td> + </tr> + <tr> + <td id="L1012" class="blob-num js-line-number" data-line-number="1012"></td> + <td id="LC1012" class="blob-code blob-code-inner js-file-line">:103F30001F93CF93DF938091D5019091D6010E947A
</td> + </tr> + <tr> + <td id="L1013" class="blob-num js-line-number" data-line-number="1013"></td> + <td id="LC1013" class="blob-code blob-code-inner js-file-line">:103F4000001CAC019091D801992321F0209114011B
</td> + </tr> + <tr> + <td id="L1014" class="blob-num js-line-number" data-line-number="1014"></td> + <td id="LC1014" class="blob-code blob-code-inner js-file-line">:103F500030E006C0209115018AE0289F90011124CD
</td> + </tr> + <tr> + <td id="L1015" class="blob-num js-line-number" data-line-number="1015"></td> + <td id="LC1015" class="blob-code blob-code-inner js-file-line">:103F60004217530708F485C08091DA01C091DB0144
</td> + </tr> + <tr> + <td id="L1016" class="blob-num js-line-number" data-line-number="1016"></td> + <td id="LC1016" class="blob-code blob-code-inner js-file-line">:103F7000D091DC011091DD01811107C0C11175C024
</td> + </tr> + <tr> + <td id="L1017" class="blob-num js-line-number" data-line-number="1017"></td> + <td id="LC1017" class="blob-code blob-code-inner js-file-line">:103F8000D11173C0111171C074C09F3F19F09F5FB0
</td> + </tr> + <tr> + <td id="L1018" class="blob-num js-line-number" data-line-number="1018"></td> + <td id="LC1018" class="blob-code blob-code-inner js-file-line">:103F90009093D801181624F40E941E1E8093DA0113
</td> + </tr> + <tr> + <td id="L1019" class="blob-num js-line-number" data-line-number="1019"></td> + <td id="LC1019" class="blob-code blob-code-inner js-file-line">:103FA0008091DA0187FF05C00E941E1E81958093D3
</td> + </tr> + <tr> + <td id="L1020" class="blob-num js-line-number" data-line-number="1020"></td> + <td id="LC1020" class="blob-code blob-code-inner js-file-line">:103FB000DA011C1624F40E941E1E8093DB018091FE
</td> + </tr> + <tr> + <td id="L1021" class="blob-num js-line-number" data-line-number="1021"></td> + <td id="LC1021" class="blob-code blob-code-inner js-file-line">:103FC000DB0187FF05C00E941E1E81958093DB01E7
</td> + </tr> + <tr> + <td id="L1022" class="blob-num js-line-number" data-line-number="1022"></td> + <td id="LC1022" class="blob-code blob-code-inner js-file-line">:103FD0006091DA01662331F1C091DB01CC2311F14C
</td> + </tr> + <tr> + <td id="L1023" class="blob-num js-line-number" data-line-number="1023"></td> + <td id="LC1023" class="blob-code blob-code-inner js-file-line">:103FE000062E000C770B880B990B0E94112323E3FC
</td> + </tr> + <tr> + <td id="L1024" class="blob-num js-line-number" data-line-number="1024"></td> + <td id="LC1024" class="blob-code blob-code-inner js-file-line">:103FF00033E343E35FE30E9475230E94D922609379
</td> + </tr> + <tr> + <td id="L1025" class="blob-num js-line-number" data-line-number="1025"></td> + <td id="LC1025" class="blob-code blob-code-inner js-file-line">:10400000DA016C2FCC0F770B880B990B0E941123D0
</td> + </tr> + <tr> + <td id="L1026" class="blob-num js-line-number" data-line-number="1026"></td> + <td id="LC1026" class="blob-code blob-code-inner js-file-line">:1040100023E333E343E35FE30E9475230E94D92245
</td> + </tr> + <tr> + <td id="L1027" class="blob-num js-line-number" data-line-number="1027"></td> + <td id="LC1027" class="blob-code blob-code-inner js-file-line">:104020006093DB011D1624F40E94671E8093DC015F
</td> + </tr> + <tr> + <td id="L1028" class="blob-num js-line-number" data-line-number="1028"></td> + <td id="LC1028" class="blob-code blob-code-inner js-file-line">:104030008091DC0187FF05C00E94671E81958093F7
</td> + </tr> + <tr> + <td id="L1029" class="blob-num js-line-number" data-line-number="1029"></td> + <td id="LC1029" class="blob-code blob-code-inner js-file-line">:10404000DC01111624F40E94671E8093DD0180912B
</td> + </tr> + <tr> + <td id="L1030" class="blob-num js-line-number" data-line-number="1030"></td> + <td id="LC1030" class="blob-code blob-code-inner js-file-line">:10405000DD0187FF05C00E94671E81958093DD0109
</td> + </tr> + <tr> + <td id="L1031" class="blob-num js-line-number" data-line-number="1031"></td> + <td id="LC1031" class="blob-code blob-code-inner js-file-line">:10406000DF91CF911F910C948D1F9F3F09F08FCF4F
</td> + </tr> + <tr> + <td id="L1032" class="blob-num js-line-number" data-line-number="1032"></td> + <td id="LC1032" class="blob-code blob-code-inner js-file-line">:1040700097CFDF91CF911F910895E9EDF1E085E0B1
</td> + </tr> + <tr> + <td id="L1033" class="blob-num js-line-number" data-line-number="1033"></td> + <td id="LC1033" class="blob-code blob-code-inner js-file-line">:10408000DF011D928A95E9F71092D8011092D701AD
</td> + </tr> + <tr> + <td id="L1034" class="blob-num js-line-number" data-line-number="1034"></td> + <td id="LC1034" class="blob-code blob-code-inner js-file-line">:104090000895833081F128F4813059F08230D1F0D5
</td> + </tr> + <tr> + <td id="L1035" class="blob-num js-line-number" data-line-number="1035"></td> + <td id="LC1035" class="blob-code blob-code-inner js-file-line">:1040A0000895853009F449C0B8F1863009F456C046
</td> + </tr> + <tr> + <td id="L1036" class="blob-num js-line-number" data-line-number="1036"></td> + <td id="LC1036" class="blob-code blob-code-inner js-file-line">:1040B000089580911501262F30E0280F311D2F3FE4
</td> + </tr> + <tr> + <td id="L1037" class="blob-num js-line-number" data-line-number="1037"></td> + <td id="LC1037" class="blob-code blob-code-inner js-file-line">:1040C000310524F4680F6093150108958FEF8093F4
</td> + </tr> + <tr> + <td id="L1038" class="blob-num js-line-number" data-line-number="1038"></td> + <td id="LC1038" class="blob-code blob-code-inner js-file-line">:1040D0001501089580911401262F30E0280F311D1D
</td> + </tr> + <tr> + <td id="L1039" class="blob-num js-line-number" data-line-number="1039"></td> + <td id="LC1039" class="blob-code blob-code-inner js-file-line">:1040E0002F3F310524F4680F6093140108958FEF7A
</td> + </tr> + <tr> + <td id="L1040" class="blob-num js-line-number" data-line-number="1040"></td> + <td id="LC1040" class="blob-code blob-code-inner js-file-line">:1040F00080931401089580911301262F30E0280F3A
</td> + </tr> + <tr> + <td id="L1041" class="blob-num js-line-number" data-line-number="1041"></td> + <td id="LC1041" class="blob-code blob-code-inner js-file-line">:10410000311D2F3F310524F4680F6093130108958A
</td> + </tr> + <tr> + <td id="L1042" class="blob-num js-line-number" data-line-number="1042"></td> + <td id="LC1042" class="blob-code blob-code-inner js-file-line">:104110008FEF80931301089580911201262F30E0D4
</td> + </tr> + <tr> + <td id="L1043" class="blob-num js-line-number" data-line-number="1043"></td> + <td id="LC1043" class="blob-code blob-code-inner js-file-line">:10412000280F311D2F3F310524F4680F60931201D1
</td> + </tr> + <tr> + <td id="L1044" class="blob-num js-line-number" data-line-number="1044"></td> + <td id="LC1044" class="blob-code blob-code-inner js-file-line">:1041300008958FEF80931201089580911101262F29
</td> + </tr> + <tr> + <td id="L1045" class="blob-num js-line-number" data-line-number="1045"></td> + <td id="LC1045" class="blob-code blob-code-inner js-file-line">:1041400030E0280F311D2F3F310524F4680F6093B4
</td> + </tr> + <tr> + <td id="L1046" class="blob-num js-line-number" data-line-number="1046"></td> + <td id="LC1046" class="blob-code blob-code-inner js-file-line">:10415000110108958FEF809311010895809110014E
</td> + </tr> + <tr> + <td id="L1047" class="blob-num js-line-number" data-line-number="1047"></td> + <td id="LC1047" class="blob-code blob-code-inner js-file-line">:10416000262F30E0280F311D2F3F310524F4680F32
</td> + </tr> + <tr> + <td id="L1048" class="blob-num js-line-number" data-line-number="1048"></td> + <td id="LC1048" class="blob-code blob-code-inner js-file-line">:104170006093100108958FEF8093100108958330AC
</td> + </tr> + <tr> + <td id="L1049" class="blob-num js-line-number" data-line-number="1049"></td> + <td id="LC1049" class="blob-code blob-code-inner js-file-line">:1041800011F128F4813049F0823091F008958530A2
</td> + </tr> + <tr> + <td id="L1050" class="blob-num js-line-number" data-line-number="1050"></td> + <td id="LC1050" class="blob-code blob-code-inner js-file-line">:1041900081F120F18630C1F10895809115016817F1
</td> + </tr> + <tr> + <td id="L1051" class="blob-num js-line-number" data-line-number="1051"></td> + <td id="LC1051" class="blob-code blob-code-inner js-file-line">:1041A00020F4861B8093150108951092150108953F
</td> + </tr> + <tr> + <td id="L1052" class="blob-num js-line-number" data-line-number="1052"></td> + <td id="LC1052" class="blob-code blob-code-inner js-file-line">:1041B00080911401681720F4861B809314010895E0
</td> + </tr> + <tr> + <td id="L1053" class="blob-num js-line-number" data-line-number="1053"></td> + <td id="LC1053" class="blob-code blob-code-inner js-file-line">:1041C00010921401089580911301681720F4861B42
</td> + </tr> + <tr> + <td id="L1054" class="blob-num js-line-number" data-line-number="1054"></td> + <td id="LC1054" class="blob-code blob-code-inner js-file-line">:1041D00080931301089510921301089580911201A4
</td> + </tr> + <tr> + <td id="L1055" class="blob-num js-line-number" data-line-number="1055"></td> + <td id="LC1055" class="blob-code blob-code-inner js-file-line">:1041E000681720F4861B8093120108951092120123
</td> + </tr> + <tr> + <td id="L1056" class="blob-num js-line-number" data-line-number="1056"></td> + <td id="LC1056" class="blob-code blob-code-inner js-file-line">:1041F000089580911101681720F4861B80931101A6
</td> + </tr> + <tr> + <td id="L1057" class="blob-num js-line-number" data-line-number="1057"></td> + <td id="LC1057" class="blob-code blob-code-inner js-file-line">:10420000089510921101089580911001681720F40B
</td> + </tr> + <tr> + <td id="L1058" class="blob-num js-line-number" data-line-number="1058"></td> + <td id="LC1058" class="blob-code blob-code-inner js-file-line">:10421000861B8093100108951092100108950F934A
</td> + </tr> + <tr> + <td id="L1059" class="blob-num js-line-number" data-line-number="1059"></td> + <td id="LC1059" class="blob-code blob-code-inner js-file-line">:104220001F938D3109F46BC008F03FC08E3009F444
</td> + </tr> + <tr> + <td id="L1060" class="blob-num js-line-number" data-line-number="1060"></td> + <td id="LC1060" class="blob-code blob-code-inner js-file-line">:104230007FC0C0F4873009F469C068F4863009F0A3
</td> + </tr> + <tr> + <td id="L1061" class="blob-num js-line-number" data-line-number="1061"></td> + <td id="LC1061" class="blob-code blob-code-inner js-file-line">:10424000B1C08091CF01817F8E7F8093CF0181E0CB
</td> + </tr> + <tr> + <td id="L1062" class="blob-num js-line-number" data-line-number="1062"></td> + <td id="LC1062" class="blob-code blob-code-inner js-file-line">:104250008093DF01A8C0883009F4A2C08B3009F434
</td> + </tr> + <tr> + <td id="L1063" class="blob-num js-line-number" data-line-number="1063"></td> + <td id="LC1063" class="blob-code blob-code-inner js-file-line">:104260009FC0A0C0863109F49BC078F4803109F466
</td> + </tr> + <tr> + <td id="L1064" class="blob-num js-line-number" data-line-number="1064"></td> + <td id="LC1064" class="blob-code blob-code-inner js-file-line">:1042700072C0813109F096C00E94141590910D0111
</td> + </tr> + <tr> + <td id="L1065" class="blob-num js-line-number" data-line-number="1065"></td> + <td id="LC1065" class="blob-code blob-code-inner js-file-line">:1042800081E0892780930D018BC0893109F488C0B2
</td> + </tr> + <tr> + <td id="L1066" class="blob-num js-line-number" data-line-number="1066"></td> + <td id="LC1066" class="blob-code blob-code-inner js-file-line">:104290008B3109F087C08091CF0181FB222720F963
</td> + </tr> + <tr> + <td id="L1067" class="blob-num js-line-number" data-line-number="1067"></td> + <td id="LC1067" class="blob-code blob-code-inner js-file-line">:1042A00091E0922790FB81F94CC0853309F470C0EE
</td> + </tr> + <tr> + <td id="L1068" class="blob-num js-line-number" data-line-number="1068"></td> + <td id="LC1068" class="blob-code blob-code-inner js-file-line">:1042B00048F4873209F46CC008F459C0893209F413
</td> + </tr> + <tr> + <td id="L1069" class="blob-num js-line-number" data-line-number="1069"></td> + <td id="LC1069" class="blob-code blob-code-inner js-file-line">:1042C00067C070C0833438F48A3308F04EC0883336
</td> + </tr> + <tr> + <td id="L1070" class="blob-num js-line-number" data-line-number="1070"></td> + <td id="LC1070" class="blob-code blob-code-inner js-file-line">:1042D00009F466C067C0833409F45AC0883409F011
</td> + </tr> + <tr> + <td id="L1071" class="blob-num js-line-number" data-line-number="1071"></td> + <td id="LC1071" class="blob-code blob-code-inner js-file-line">:1042E00061C00E9414150FEF13ED20E30150104040
</td> + </tr> + <tr> + <td id="L1072" class="blob-num js-line-number" data-line-number="1072"></td> + <td id="LC1072" class="blob-code blob-code-inner js-file-line">:1042F0002040E1F700C000000E944F1C51C00E9406
</td> + </tr> + <tr> + <td id="L1073" class="blob-num js-line-number" data-line-number="1073"></td> + <td id="LC1073" class="blob-code blob-code-inner js-file-line">:1043000093220E94840F0E947A084AC09091CF01A4
</td> + </tr> + <tr> + <td id="L1074" class="blob-num js-line-number" data-line-number="1074"></td> + <td id="LC1074" class="blob-code blob-code-inner js-file-line">:10431000892F8095817080FB90F929F096609860D4
</td> + </tr> + <tr> + <td id="L1075" class="blob-num js-line-number" data-line-number="1075"></td> + <td id="LC1075" class="blob-code blob-code-inner js-file-line">:104320009093CF0140C0997F977F9093CF0138C081
</td> + </tr> + <tr> + <td id="L1076" class="blob-num js-line-number" data-line-number="1076"></td> + <td id="LC1076" class="blob-code blob-code-inner js-file-line">:104330008091CF0182FB222720F991E0922790FB08
</td> + </tr> + <tr> + <td id="L1077" class="blob-num js-line-number" data-line-number="1077"></td> + <td id="LC1077" class="blob-code blob-code-inner js-file-line">:1043400082F98093CF01992359F18091CF01816047
</td> + </tr> + <tr> + <td id="L1078" class="blob-num js-line-number" data-line-number="1078"></td> + <td id="LC1078" class="blob-code blob-code-inner js-file-line">:104350008093CF0125C08091CF0183FB222720F9D4
</td> + </tr> + <tr> + <td id="L1079" class="blob-num js-line-number" data-line-number="1079"></td> + <td id="LC1079" class="blob-code blob-code-inner js-file-line">:1043600091E0922790FB83F9ECCF895301C08D51E6
</td> + </tr> + <tr> + <td id="L1080" class="blob-num js-line-number" data-line-number="1080"></td> + <td id="LC1080" class="blob-code blob-code-inner js-file-line">:1043700041E050E060E070E08A019B0104C0000F62
</td> + </tr> + <tr> + <td id="L1081" class="blob-num js-line-number" data-line-number="1081"></td> + <td id="LC1081" class="blob-code blob-code-inner js-file-line">:10438000111F221F331F8A95D2F7C901B80104C03B
</td> + </tr> + <tr> + <td id="L1082" class="blob-num js-line-number" data-line-number="1082"></td> + <td id="LC1082" class="blob-code blob-code-inner js-file-line">:1043900061E070E080E090E00E94D0180E94141567
</td> + </tr> + <tr> + <td id="L1083" class="blob-num js-line-number" data-line-number="1083"></td> + <td id="LC1083" class="blob-code blob-code-inner js-file-line">:1043A00081E001C080E01F910F91089580E00895A1
</td> + </tr> + <tr> + <td id="L1084" class="blob-num js-line-number" data-line-number="1084"></td> + <td id="LC1084" class="blob-code blob-code-inner js-file-line">:1043B00080E00895CF93C82F8091DF01813079F09C
</td> + </tr> + <tr> + <td id="L1085" class="blob-num js-line-number" data-line-number="1085"></td> + <td id="LC1085" class="blob-code blob-code-inner js-file-line">:1043C00018F08230E9F187C0E0910E01F0910F0101
</td> + </tr> + <tr> + <td id="L1086" class="blob-num js-line-number" data-line-number="1086"></td> + <td id="LC1086" class="blob-code blob-code-inner js-file-line">:1043D0008081813169F0823209F07FC009C0E091AB
</td> + </tr> + <tr> + <td id="L1087" class="blob-num js-line-number" data-line-number="1087"></td> + <td id="LC1087" class="blob-code blob-code-inner js-file-line">:1043E0000E01F0910F018081813111F0823261F470
</td> + </tr> + <tr> + <td id="L1088" class="blob-num js-line-number" data-line-number="1088"></td> + <td id="LC1088" class="blob-code blob-code-inner js-file-line">:1043F0008C2F0E94D621811104C08C2F0E940F2186
</td> + </tr> + <tr> + <td id="L1089" class="blob-num js-line-number" data-line-number="1089"></td> + <td id="LC1089" class="blob-code blob-code-inner js-file-line">:104400001DC081E090E01AC08C2F0E94D82181113C
</td> + </tr> + <tr> + <td id="L1090" class="blob-num js-line-number" data-line-number="1090"></td> + <td id="LC1090" class="blob-code blob-code-inner js-file-line">:1044100014C0C43179F048F4CB3079F0C03109F0E0
</td> + </tr> + <tr> + <td id="L1091" class="blob-num js-line-number" data-line-number="1091"></td> + <td id="LC1091" class="blob-code blob-code-inner js-file-line">:1044200060C082E08093DF0108C0C93219F0C83350
</td> + </tr> + <tr> + <td id="L1092" class="blob-num js-line-number" data-line-number="1092"></td> + <td id="LC1092" class="blob-code blob-code-inner js-file-line">:1044300021F057C01092DF0154C081E0817053C059
</td> + </tr> + <tr> + <td id="L1093" class="blob-num js-line-number" data-line-number="1093"></td> + <td id="LC1093" class="blob-code blob-code-inner js-file-line">:10444000C93289F118F5C43171F1A8F4C73009F007
</td> + </tr> + <tr> + <td id="L1094" class="blob-num js-line-number" data-line-number="1094"></td> + <td id="LC1094" class="blob-code blob-code-inner js-file-line">:1044500046C08AE08093150194E19093140193E0A3
</td> + </tr> + <tr> + <td id="L1095" class="blob-num js-line-number" data-line-number="1095"></td> + <td id="LC1095" class="blob-code blob-code-inner js-file-line">:10446000909313018093120188E08093110188E2F8
</td> + </tr> + <tr> + <td id="L1096" class="blob-num js-line-number" data-line-number="1096"></td> + <td id="LC1096" class="blob-code blob-code-inner js-file-line">:104470008093100134C0CE51C63088F5EC2FF0E0A7
</td> + </tr> + <tr> + <td id="L1097" class="blob-num js-line-number" data-line-number="1097"></td> + <td id="LC1097" class="blob-code blob-code-inner js-file-line">:10448000E65DFE4F80818093DE0129C0CE34E9F0E5
</td> + </tr> + <tr> + <td id="L1098" class="blob-num js-line-number" data-line-number="1098"></td> + <td id="LC1098" class="blob-code blob-code-inner js-file-line">:1044900020F4CB3421F56AE013C0C13579F0C23580
</td> + </tr> + <tr> + <td id="L1099" class="blob-num js-line-number" data-line-number="1099"></td> + <td id="LC1099" class="blob-code blob-code-inner js-file-line">:1044A000F1F461E00DC08091DE01882319F01092D3
</td> + </tr> + <tr> + <td id="L1100" class="blob-num js-line-number" data-line-number="1100"></td> + <td id="LC1100" class="blob-code blob-code-inner js-file-line">:1044B000DE0115C081E08093DF0115C061E006C018
</td> + </tr> + <tr> + <td id="L1101" class="blob-num js-line-number" data-line-number="1101"></td> + <td id="LC1101" class="blob-code blob-code-inner js-file-line">:1044C0008091DE010E9449200AC06AE08091DE01ED
</td> + </tr> + <tr> + <td id="L1102" class="blob-num js-line-number" data-line-number="1102"></td> + <td id="LC1102" class="blob-code blob-code-inner js-file-line">:1044D0000E94BF2004C01092DF0180E004C081E090
</td> + </tr> + <tr> + <td id="L1103" class="blob-num js-line-number" data-line-number="1103"></td> + <td id="LC1103" class="blob-code blob-code-inner js-file-line">:1044E00002C080E0ABCFCF910895E1E8F0E0808199
</td> + </tr> + <tr> + <td id="L1104" class="blob-num js-line-number" data-line-number="1104"></td> + <td id="LC1104" class="blob-code blob-code-inner js-file-line">:1044F000886080838081816080838FB7F89493E0A7
</td> + </tr> + <tr> + <td id="L1105" class="blob-num js-line-number" data-line-number="1105"></td> + <td id="LC1105" class="blob-code blob-code-inner js-file-line">:104500009093890090ED909388008FBF0895EFE617
</td> + </tr> + <tr> + <td id="L1106" class="blob-num js-line-number" data-line-number="1106"></td> + <td id="LC1106" class="blob-code blob-code-inner js-file-line">:10451000F0E08081826080830895EFE6F0E08081A2
</td> + </tr> + <tr> + <td id="L1107" class="blob-num js-line-number" data-line-number="1107"></td> + <td id="LC1107" class="blob-code blob-code-inner js-file-line">:104520008D7F80830895EFE6F0E0908182E0892717
</td> + </tr> + <tr> + <td id="L1108" class="blob-num js-line-number" data-line-number="1108"></td> + <td id="LC1108" class="blob-code blob-code-inner js-file-line">:10453000808308951F920F920FB60F9211242F932C
</td> + </tr> + <tr> + <td id="L1109" class="blob-num js-line-number" data-line-number="1109"></td> + <td id="LC1109" class="blob-code blob-code-inner js-file-line">:104540003F934F935F936F937F938F939F93AF931B
</td> + </tr> + <tr> + <td id="L1110" class="blob-num js-line-number" data-line-number="1110"></td> + <td id="LC1110" class="blob-code blob-code-inner js-file-line">:10455000BF93EF93FF938091E0019091E101019669
</td> + </tr> + <tr> + <td id="L1111" class="blob-num js-line-number" data-line-number="1111"></td> + <td id="LC1111" class="blob-code blob-code-inner js-file-line">:104560009093E1018093E001811103C082E00E94F9
</td> + </tr> + <tr> + <td id="L1112" class="blob-num js-line-number" data-line-number="1112"></td> + <td id="LC1112" class="blob-code blob-code-inner js-file-line">:104570007A08E091E101E695E695F0E0E657FB4F19
</td> + </tr> + <tr> + <td id="L1113" class="blob-num js-line-number" data-line-number="1113"></td> + <td id="LC1113" class="blob-code blob-code-inner js-file-line">:10458000E4918091E0018E1303C080E00E947A08DC
</td> + </tr> + <tr> + <td id="L1114" class="blob-num js-line-number" data-line-number="1114"></td> + <td id="LC1114" class="blob-code blob-code-inner js-file-line">:10459000FF91EF91BF91AF919F918F917F916F911B
</td> + </tr> + <tr> + <td id="L1115" class="blob-num js-line-number" data-line-number="1115"></td> + <td id="LC1115" class="blob-code blob-code-inner js-file-line">:1045A0005F914F913F912F910F900FBE0F901F90F1
</td> + </tr> + <tr> + <td id="L1116" class="blob-num js-line-number" data-line-number="1116"></td> + <td id="LC1116" class="blob-code blob-code-inner js-file-line">:1045B00018950E94E0226894B1110C946F2308951D
</td> + </tr> + <tr> + <td id="L1117" class="blob-num js-line-number" data-line-number="1117"></td> + <td id="LC1117" class="blob-code blob-code-inner js-file-line">:1045C0000E94542388F09F5798F0B92F9927B7512C
</td> + </tr> + <tr> + <td id="L1118" class="blob-num js-line-number" data-line-number="1118"></td> + <td id="LC1118" class="blob-code blob-code-inner js-file-line">:1045D000B0F0E1F0660F771F881F991F1AF0BA95A7
</td> + </tr> + <tr> + <td id="L1119" class="blob-num js-line-number" data-line-number="1119"></td> + <td id="LC1119" class="blob-code blob-code-inner js-file-line">:1045E000C9F714C0B13091F00E946E23B1E0089574
</td> + </tr> + <tr> + <td id="L1120" class="blob-num js-line-number" data-line-number="1120"></td> + <td id="LC1120" class="blob-code blob-code-inner js-file-line">:1045F0000C946E23672F782F8827B85F39F0B93F66
</td> + </tr> + <tr> + <td id="L1121" class="blob-num js-line-number" data-line-number="1121"></td> + <td id="LC1121" class="blob-code blob-code-inner js-file-line">:10460000CCF3869577956795B395D9F73EF4909559
</td> + </tr> + <tr> + <td id="L1122" class="blob-num js-line-number" data-line-number="1122"></td> + <td id="LC1122" class="blob-code blob-code-inner js-file-line">:104610008095709561957F4F8F4F9F4F0895E894D7
</td> + </tr> + <tr> + <td id="L1123" class="blob-num js-line-number" data-line-number="1123"></td> + <td id="LC1123" class="blob-code blob-code-inner js-file-line">:1046200009C097FB3EF490958095709561957F4FFA
</td> + </tr> + <tr> + <td id="L1124" class="blob-num js-line-number" data-line-number="1124"></td> + <td id="LC1124" class="blob-code blob-code-inner js-file-line">:104630008F4F9F4F9923A9F0F92F96E9BB279395A8
</td> + </tr> + <tr> + <td id="L1125" class="blob-num js-line-number" data-line-number="1125"></td> + <td id="LC1125" class="blob-code blob-code-inner js-file-line">:10464000F695879577956795B795F111F8CFFAF4B8
</td> + </tr> + <tr> + <td id="L1126" class="blob-num js-line-number" data-line-number="1126"></td> + <td id="LC1126" class="blob-code blob-code-inner js-file-line">:10465000BB0F11F460FF1BC06F5F7F4F8F4F9F4FE9
</td> + </tr> + <tr> + <td id="L1127" class="blob-num js-line-number" data-line-number="1127"></td> + <td id="LC1127" class="blob-code blob-code-inner js-file-line">:1046600016C0882311F096E911C0772321F09EE847
</td> + </tr> + <tr> + <td id="L1128" class="blob-num js-line-number" data-line-number="1128"></td> + <td id="LC1128" class="blob-code blob-code-inner js-file-line">:10467000872F762F05C0662371F096E8862F70E0AD
</td> + </tr> + <tr> + <td id="L1129" class="blob-num js-line-number" data-line-number="1129"></td> + <td id="LC1129" class="blob-code blob-code-inner js-file-line">:1046800060E02AF09A95660F771F881FDAF7880F87
</td> + </tr> + <tr> + <td id="L1130" class="blob-num js-line-number" data-line-number="1130"></td> + <td id="LC1130" class="blob-code blob-code-inner js-file-line">:104690009695879597F9089557FD9058440F551FA3
</td> + </tr> + <tr> + <td id="L1131" class="blob-num js-line-number" data-line-number="1131"></td> + <td id="LC1131" class="blob-code blob-code-inner js-file-line">:1046A00059F05F3F71F04795880F97FB991F61F0B4
</td> + </tr> + <tr> + <td id="L1132" class="blob-num js-line-number" data-line-number="1132"></td> + <td id="LC1132" class="blob-code blob-code-inner js-file-line">:1046B0009F3F79F087950895121613061406551F2B
</td> + </tr> + <tr> + <td id="L1133" class="blob-num js-line-number" data-line-number="1133"></td> + <td id="LC1133" class="blob-code blob-code-inner js-file-line">:1046C000F2CF4695F1DF08C0161617061806991F97
</td> + </tr> + <tr> + <td id="L1134" class="blob-num js-line-number" data-line-number="1134"></td> + <td id="LC1134" class="blob-code blob-code-inner js-file-line">:1046D000F1CF86957105610508940895E894BB278C
</td> + </tr> + <tr> + <td id="L1135" class="blob-num js-line-number" data-line-number="1135"></td> + <td id="LC1135" class="blob-code blob-code-inner js-file-line">:1046E00066277727CB0197F908950E9488230C94B9
</td> + </tr> + <tr> + <td id="L1136" class="blob-num js-line-number" data-line-number="1136"></td> + <td id="LC1136" class="blob-code blob-code-inner js-file-line">:1046F000F9230E94EB2338F00E94F22320F0952347
</td> + </tr> + <tr> + <td id="L1137" class="blob-num js-line-number" data-line-number="1137"></td> + <td id="LC1137" class="blob-code blob-code-inner js-file-line">:1047000011F00C94E2230C94E82311240C946F23F1
</td> + </tr> + <tr> + <td id="L1138" class="blob-num js-line-number" data-line-number="1138"></td> + <td id="LC1138" class="blob-code blob-code-inner js-file-line">:104710000E944C2370F3959FC1F3950F50E0551FF5
</td> + </tr> + <tr> + <td id="L1139" class="blob-num js-line-number" data-line-number="1139"></td> + <td id="LC1139" class="blob-code blob-code-inner js-file-line">:10472000629FF001729FBB27F00DB11D639FAA2706
</td> + </tr> + <tr> + <td id="L1140" class="blob-num js-line-number" data-line-number="1140"></td> + <td id="LC1140" class="blob-code blob-code-inner js-file-line">:10473000F00DB11DAA1F649F6627B00DA11D661F55
</td> + </tr> + <tr> + <td id="L1141" class="blob-num js-line-number" data-line-number="1141"></td> + <td id="LC1141" class="blob-code blob-code-inner js-file-line">:10474000829F2227B00DA11D621F739FB00DA11D76
</td> + </tr> + <tr> + <td id="L1142" class="blob-num js-line-number" data-line-number="1142"></td> + <td id="LC1142" class="blob-code blob-code-inner js-file-line">:10475000621F839FA00D611D221F749F3327A00D30
</td> + </tr> + <tr> + <td id="L1143" class="blob-num js-line-number" data-line-number="1143"></td> + <td id="LC1143" class="blob-code blob-code-inner js-file-line">:10476000611D231F849F600D211D822F762F6A2FCC
</td> + </tr> + <tr> + <td id="L1144" class="blob-num js-line-number" data-line-number="1144"></td> + <td id="LC1144" class="blob-code blob-code-inner js-file-line">:1047700011249F5750409AF0F1F088234AF0EE0F31
</td> + </tr> + <tr> + <td id="L1145" class="blob-num js-line-number" data-line-number="1145"></td> + <td id="LC1145" class="blob-code blob-code-inner js-file-line">:10478000FF1FBB1F661F771F881F91505040A9F75E
</td> + </tr> + <tr> + <td id="L1146" class="blob-num js-line-number" data-line-number="1146"></td> + <td id="LC1146" class="blob-code blob-code-inner js-file-line">:104790009E3F510580F00C94E2230C946F235F3F01
</td> + </tr> + <tr> + <td id="L1147" class="blob-num js-line-number" data-line-number="1147"></td> + <td id="LC1147" class="blob-code blob-code-inner js-file-line">:1047A000E4F3983ED4F3869577956795B795F7959A
</td> + </tr> + <tr> + <td id="L1148" class="blob-num js-line-number" data-line-number="1148"></td> + <td id="LC1148" class="blob-code blob-code-inner js-file-line">:1047B000E7959F5FC1F7FE2B880F911D9695879512
</td> + </tr> + <tr> + <td id="L1149" class="blob-num js-line-number" data-line-number="1149"></td> + <td id="LC1149" class="blob-code blob-code-inner js-file-line">:1047C00097F9089597F99F6780E870E060E0089591
</td> + </tr> + <tr> + <td id="L1150" class="blob-num js-line-number" data-line-number="1150"></td> + <td id="LC1150" class="blob-code blob-code-inner js-file-line">:1047D0009FEF80EC089500240A9416161706180619
</td> + </tr> + <tr> + <td id="L1151" class="blob-num js-line-number" data-line-number="1151"></td> + <td id="LC1151" class="blob-code blob-code-inner js-file-line">:1047E0000906089500240A941216130614060506F5
</td> + </tr> + <tr> + <td id="L1152" class="blob-num js-line-number" data-line-number="1152"></td> + <td id="LC1152" class="blob-code blob-code-inner js-file-line">:1047F0000895092E0394000C11F4882352F0BB0F86
</td> + </tr> + <tr> + <td id="L1153" class="blob-num js-line-number" data-line-number="1153"></td> + <td id="LC1153" class="blob-code blob-code-inner js-file-line">:1048000040F4BF2B11F460FF04C06F5F7F4F8F4FE8
</td> + </tr> + <tr> + <td id="L1154" class="blob-num js-line-number" data-line-number="1154"></td> + <td id="LC1154" class="blob-code blob-code-inner js-file-line">:104810009F4F089597FB072E16F4009407D077FD5D
</td> + </tr> + <tr> + <td id="L1155" class="blob-num js-line-number" data-line-number="1155"></td> + <td id="LC1155" class="blob-code blob-code-inner js-file-line">:1048200009D00E94242407FC05D03EF49095819580
</td> + </tr> + <tr> + <td id="L1156" class="blob-num js-line-number" data-line-number="1156"></td> + <td id="LC1156" class="blob-code blob-code-inner js-file-line">:104830009F4F0895709561957F4F0895EE0FFF1F6C
</td> + </tr> + <tr> + <td id="L1157" class="blob-num js-line-number" data-line-number="1157"></td> + <td id="LC1157" class="blob-code blob-code-inner js-file-line">:104840000590F491E02D0994AA1BBB1B51E107C010
</td> + </tr> + <tr> + <td id="L1158" class="blob-num js-line-number" data-line-number="1158"></td> + <td id="LC1158" class="blob-code blob-code-inner js-file-line">:10485000AA1FBB1FA617B70710F0A61BB70B881F10
</td> + </tr> + <tr> + <td id="L1159" class="blob-num js-line-number" data-line-number="1159"></td> + <td id="LC1159" class="blob-code blob-code-inner js-file-line">:10486000991F5A95A9F780959095BC01CD0108959F
</td> + </tr> + <tr> + <td id="L1160" class="blob-num js-line-number" data-line-number="1160"></td> + <td id="LC1160" class="blob-code blob-code-inner js-file-line">:10487000F999FECF92BD81BDF89A992780B5089528
</td> + </tr> + <tr> + <td id="L1161" class="blob-num js-line-number" data-line-number="1161"></td> + <td id="LC1161" class="blob-code blob-code-inner js-file-line">:10488000A8E1B0E042E050E00C946024262FF999B2
</td> + </tr> + <tr> + <td id="L1162" class="blob-num js-line-number" data-line-number="1162"></td> + <td id="LC1162" class="blob-code blob-code-inner js-file-line">:10489000FECF92BD81BDF89A019700B4021639F09F
</td> + </tr> + <tr> + <td id="L1163" class="blob-num js-line-number" data-line-number="1163"></td> + <td id="LC1163" class="blob-code blob-code-inner js-file-line">:1048A0001FBA20BD0FB6F894FA9AF99A0FBE089570
</td> + </tr> + <tr> + <td id="L1164" class="blob-num js-line-number" data-line-number="1164"></td> + <td id="LC1164" class="blob-code blob-code-inner js-file-line">:1048B0000196272F0E9447240C944624DC01CB014B
</td> + </tr> + <tr> + <td id="L1165" class="blob-num js-line-number" data-line-number="1165"></td> + <td id="LC1165" class="blob-code blob-code-inner js-file-line">:1048C000FC01F999FECF06C0F2BDE1BDF89A319620
</td> + </tr> + <tr> + <td id="L1166" class="blob-num js-line-number" data-line-number="1166"></td> + <td id="LC1166" class="blob-code blob-code-inner js-file-line">:1048D00000B40D9241505040B8F70895F894FFCFBE
</td> + </tr> + <tr> + <td id="L1167" class="blob-num js-line-number" data-line-number="1167"></td> + <td id="LC1167" class="blob-code blob-code-inner js-file-line">:1048E00020027C080A09E708B3087F080101BC011F
</td> + </tr> + <tr> + <td id="L1168" class="blob-num js-line-number" data-line-number="1168"></td> + <td id="LC1168" class="blob-code blob-code-inner js-file-line">:1048F00028080A03140A3F4D36394B04FE03C80347
</td> + </tr> + <tr> + <td id="L1169" class="blob-num js-line-number" data-line-number="1169"></td> + <td id="LC1169" class="blob-code blob-code-inner js-file-line">:104900008F0322033B0354036D03010203040506D6
</td> + </tr> + <tr> + <td id="L1170" class="blob-num js-line-number" data-line-number="1170"></td> + <td id="LC1170" class="blob-code blob-code-inner js-file-line">:04491000070809008B
</td> + </tr> + <tr> + <td id="L1171" class="blob-num js-line-number" data-line-number="1171"></td> + <td id="LC1171" class="blob-code blob-code-inner js-file-line">:00000001FF
</td> + </tr> +</table> + + </div> + +</div> + +<button type="button" data-facebox="#jump-to-line" data-facebox-class="linejump" data-hotkey="l" class="hidden">Jump to Line</button> +<div id="jump-to-line" style="display:none"> + <!-- </textarea> --><!-- '"` --><form accept-charset="UTF-8" action="" class="js-jump-to-line-form" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /></div> + <input class="form-control linejump-input js-jump-to-line-field" type="text" placeholder="Jump to line…" aria-label="Jump to line" autofocus> + <button type="submit" class="btn">Go</button> +</form></div> + + </div> + <div class="modal-backdrop"></div> +</div> + + + </div> + </div> + + </div> + + <div class="container site-footer-container"> + <div class="site-footer" role="contentinfo"> + <ul class="site-footer-links right"> + <li><a href="https://status.github.com/" data-ga-click="Footer, go to status, text:status">Status</a></li> + <li><a href="https://developer.github.com" data-ga-click="Footer, go to api, text:api">API</a></li> + <li><a href="https://training.github.com" data-ga-click="Footer, go to training, text:training">Training</a></li> + <li><a href="https://shop.github.com" data-ga-click="Footer, go to shop, text:shop">Shop</a></li> + <li><a href="https://github.com/blog" data-ga-click="Footer, go to blog, text:blog">Blog</a></li> + <li><a href="https://github.com/about" data-ga-click="Footer, go to about, text:about">About</a></li> + + </ul> + + <a href="https://github.com" aria-label="Homepage" class="site-footer-mark" title="GitHub"> + <svg aria-hidden="true" class="octicon octicon-mark-github" height="24" version="1.1" viewBox="0 0 16 16" width="24"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59 0.4 0.07 0.55-0.17 0.55-0.38 0-0.19-0.01-0.82-0.01-1.49-2.01 0.37-2.53-0.49-2.69-0.94-0.09-0.23-0.48-0.94-0.82-1.13-0.28-0.15-0.68-0.52-0.01-0.53 0.63-0.01 1.08 0.58 1.23 0.82 0.72 1.21 1.87 0.87 2.33 0.66 0.07-0.52 0.28-0.87 0.51-1.07-1.78-0.2-3.64-0.89-3.64-3.95 0-0.87 0.31-1.59 0.82-2.15-0.08-0.2-0.36-1.02 0.08-2.12 0 0 0.67-0.21 2.2 0.82 0.64-0.18 1.32-0.27 2-0.27 0.68 0 1.36 0.09 2 0.27 1.53-1.04 2.2-0.82 2.2-0.82 0.44 1.1 0.16 1.92 0.08 2.12 0.51 0.56 0.82 1.27 0.82 2.15 0 3.07-1.87 3.75-3.65 3.95 0.29 0.25 0.54 0.73 0.54 1.48 0 1.07-0.01 1.93-0.01 2.2 0 0.21 0.15 0.46 0.55 0.38C13.71 14.53 16 11.53 16 8 16 3.58 12.42 0 8 0z"></path></svg> +</a> + <ul class="site-footer-links"> + <li>© 2016 <span title="0.18057s from github-fe155-cp1-prd.iad.github.net">GitHub</span>, Inc.</li> + <li><a href="https://github.com/site/terms" data-ga-click="Footer, go to terms, text:terms">Terms</a></li> + <li><a href="https://github.com/site/privacy" data-ga-click="Footer, go to privacy, text:privacy">Privacy</a></li> + <li><a href="https://github.com/security" data-ga-click="Footer, go to security, text:security">Security</a></li> + <li><a href="https://github.com/contact" data-ga-click="Footer, go to contact, text:contact">Contact</a></li> + <li><a href="https://help.github.com" data-ga-click="Footer, go to help, text:help">Help</a></li> + </ul> + </div> +</div> + + + + + + <div id="ajax-error-message" class="ajax-error-message flash flash-error"> + <svg aria-hidden="true" class="octicon octicon-alert" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M15.72 12.5l-6.85-11.98C8.69 0.21 8.36 0.02 8 0.02s-0.69 0.19-0.87 0.5l-6.85 11.98c-0.18 0.31-0.18 0.69 0 1C0.47 13.81 0.8 14 1.15 14h13.7c0.36 0 0.69-0.19 0.86-0.5S15.89 12.81 15.72 12.5zM9 12H7V10h2V12zM9 9H7V5h2V9z"></path></svg> + <button type="button" class="flash-close js-flash-close js-ajax-error-dismiss" aria-label="Dismiss error"> + <svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M7.48 8l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75-1.48-1.48 3.75-3.75L0.77 4.25l1.48-1.48 3.75 3.75 3.75-3.75 1.48 1.48-3.75 3.75z"></path></svg> + </button> + Something went wrong with that request. Please try again. + </div> + + + + <script crossorigin="anonymous" integrity="sha256-6lu7KoNzd//eU+EJnlkJyN9NNsxekMBa6zaUsVfffk0=" src="https://assets-cdn.github.com/assets/frameworks-ea5bbb2a837377ffde53e1099e5909c8df4d36cc5e90c05aeb3694b157df7e4d.js"></script> + <script async="async" crossorigin="anonymous" integrity="sha256-ORgpFF28BxWN3hEqpja3rItY93JlJ85xC9VhGK4dL1c=" src="https://assets-cdn.github.com/assets/github-391829145dbc07158dde112aa636b7ac8b58f7726527ce710bd56118ae1d2f57.js"></script> + + + + + + + <div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner hidden"> + <svg aria-hidden="true" class="octicon octicon-alert" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path d="M15.72 12.5l-6.85-11.98C8.69 0.21 8.36 0.02 8 0.02s-0.69 0.19-0.87 0.5l-6.85 11.98c-0.18 0.31-0.18 0.69 0 1C0.47 13.81 0.8 14 1.15 14h13.7c0.36 0 0.69-0.19 0.86-0.5S15.89 12.81 15.72 12.5zM9 12H7V10h2V12zM9 9H7V5h2V9z"></path></svg> + <span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span> + <span class="signed-out-tab-flash">You signed out in another tab or window. <a href="">Reload</a> to refresh your session.</span> + </div> + <div class="facebox" id="facebox" style="display:none;"> + <div class="facebox-popup"> + <div class="facebox-content" role="dialog" aria-labelledby="facebox-header" aria-describedby="facebox-description"> + </div> + <button type="button" class="facebox-close js-facebox-close" aria-label="Close modal"> + <svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M7.48 8l3.75 3.75-1.48 1.48-3.75-3.75-3.75 3.75-1.48-1.48 3.75-3.75L0.77 4.25l1.48-1.48 3.75 3.75 3.75-3.75 1.48 1.48-3.75 3.75z"></path></svg> + </button> + </div> +</div> + + </body> +</html> + diff --git a/keyboard/ergodox_ez/keymaps/dvorak_spanish/keymap.c b/keyboard/ergodox_ez/keymaps/dvorak_spanish/keymap.c new file mode 100755 index 0000000000..33a0480c94 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/dvorak_spanish/keymap.c @@ -0,0 +1,284 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +/****************************************************************************************** + * SPANISH DVORAK LAYOUT (see http://djelibeibi.unex.es/dvorak/) + * Layer 1: auxiliary keys + * Layer 2: full qwerty layout + ****************************************************************************************** + * IMPORTANT: Software layout must be set to SPANISH QWERTY to work properly + *****************************************************************************************/ + +// LAYERS +#define BASE 0 // dvorak layout (default) +#define AUX 1 // auxiliary keys +#define QWERTY 2 // qwerty layout + +// MACROS +#define OBRACE 0 // key { or shift +#define CBRACE 1 // key } or shift +#define OBRACK 2 // key [ or left alt +#define CBRACK 3 // key ] or left alt +#define CAPS 4 // caps lock + +// LEDS +#define USB_LED_NUM_LOCK 0 +#define USB_LED_CAPS_LOCK 1 +#define USB_LED_SCROLL_LOCK 2 +#define USB_LED_COMPOSE 3 +#define USB_LED_KANA 4 + +// TIMERS +#define KEY_TAP_FAST 85 +#define KEY_TAP_SLOW 95 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Base layer + * Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | F1/~L1 | . | , | Ñ | P | Y |MEH_T | | L1 | F | G | C | H | L |ALL_T/+ | + * |--------+------+------+------+------+------| DEL | | ~L1 |------+------+------+------+------+--------| + * |Esc/Ctrl| A | O | E | U | I |------| |------| D | R | T | N | S |'/RCtrl | + * |--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------| + * | {/LSft | - | Q | J | K | X | | | | B | M | W | V | Z | }/RSft | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT| + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * |F5/CAG|F6/~L1| |F7/~L1|F8/CAG| + * ,------|------|------| |------+--------+------. + * | | |F4/CA | |F11/CA| | | + * | ENTER| TAB |------| |------| BSPC | SPACE| + * | | |F3/SA | |F12/SA| | | + * `--------------------' `----------------------' + * CAG = CTRL-ALT-GUI + * CA = CTRL-ALT + * SA = SHIFT-ALT + * + */ +[BASE] = KEYMAP( + // left hand + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NONUS_BSLASH, + LT(AUX, KC_F1), KC_DOT, KC_COMM,KC_SCLN,KC_P, KC_Y, MEH_T(KC_DEL), + CTL_T(KC_ESC), KC_A, KC_O, KC_E, KC_U, KC_I, + M(OBRACE), KC_SLSH,KC_Q, KC_J, KC_K, KC_X, KC_LGUI, + M(OBRACK), KC_HOME,KC_PGDN,KC_PGUP,KC_END, + LCAG_T(KC_F5), LT(AUX, KC_F6), + MT(MOD_LALT | MOD_LCTL, KC_F4), + KC_ENT,KC_TAB,MT((MOD_LALT | MOD_LSFT), KC_F3), + // right hand + KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, + KC_FN1, KC_F, KC_G, KC_C, KC_H, KC_L, ALL_T(KC_RBRACKET), + KC_D, KC_R, KC_T, KC_N, KC_S, CTL_T(KC_QUOTE), + KC_RALT, KC_B, KC_M, KC_W, KC_V, KC_Z, M(CBRACE), + KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,M(CBRACK), + LT(AUX, KC_F7), LCAG_T(KC_F8), + MT(MOD_LALT | MOD_LCTL, KC_F11), + MT(MOD_LALT | MOD_LSFT, KC_F12),KC_BSPC, KC_SPC + ), +/* Keymap 1: Aux layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | SLEEP | PWR | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | < | > | MsUp | | | | | ~L0 | | 7 | 8 | 9 | * | `^ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | 4 | 5 | 6 | + | Ç | + * |--------+------+------+------+------+------| | |PSCR |------+------+------+------+------+--------| + * |CAPSLOCK| | | | | | | | | | 1 | 2 | 3 | / | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |CTRL-S|CTRL-Z|CTRL-X|CTRL-C|CTRL-V| | | . | 0 | = | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | Play | + * ,------|------|------| |------+------+------. + * | | | | | VolUp| | | + * | Lclk | Rclk |------| |------| Prev | Next | + * | | | L2 | | VolDn| | | + * `--------------------' `--------------------' + */ +[AUX] = KEYMAP( + // left hand + KC_NO , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_SLEP, + KC_TRNS, KC_NONUS_BSLASH, LSFT(KC_NONUS_BSLASH), KC_MS_U, KC_NO, KC_NO, KC_NO, + KC_NO , KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO , + M(CAPS), KC_NO, KC_NO , KC_NO , KC_NO , KC_NO , KC_NO, + LCTL(KC_S), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), + KC_NO , KC_TRNS, + KC_NO, + KC_BTN1, KC_BTN2, TG(QWERTY), + // right hand + KC_PWR, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_NO, KC_7, KC_8, KC_9, KC_PAST, KC_LBRACKET, + KC_NO, KC_4, KC_5, KC_6, KC_PPLS, KC_BSLASH, + KC_PSCR, KC_NO, KC_1, KC_2, KC_3, KC_PSLS, KC_NO, + KC_NO ,KC_DOT, KC_0, KC_PEQL, KC_NO, + KC_TRNS, KC_MPLY, + KC_VOLU, + KC_VOLD, KC_MPRV, KC_MNXT +), +/* Keymap 2: QWERTY layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | \ | 1 | 2 | 3 | 4 | 5 | <> | | ¡ | 6 | 7 | 8 | 9 | 0 | ' | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | TRANS | Q | W | E | R | T |MEH_T | | TRANS| Y | U | I | O | P |ALL_T/+ | + * |--------+------+------+------+------+------| DEL | | |------+------+------+------+------+--------| + * |Esc/Ctrl| A | S | D | F | G |------| |------| H | J | K | L | Ñ |'/RCtrl | + * |--------+------+------+------+------+------| LGUI | | RALT |------+------+------+------+------+--------| + * | {/LSft | Z | X | C | V | B | | | | N | M | , | . | - | }/RSft | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |[/LALT| HOME |PGDOWN| PGUP | END | | LEFT | DOWN | UP |RIGHT |]/LALT| + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * |F5/CAG| TRANS| | TRANS|F8/CAG| + * ,------|------|------| |------+--------+------. + * | | |F4/CA | |F11/CA| | | + * | ENTER| TAB |------| |------| BSPC | SPACE| + * | | | TRANS| |F12/SA| | | + * `--------------------' `----------------------' + * CAG = CTRL-ALT-GUI + * CA = CTRL-ALT + * SA = SHIFT-ALT + * + */ +[QWERTY] = KEYMAP( + // left hand + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NONUS_BSLASH, + KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, MEH_T(KC_DEL), + CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, + M(OBRACE), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, + M(OBRACK), KC_HOME,KC_PGDN,KC_PGUP,KC_END, + LCAG_T(KC_F5), KC_TRNS, + MT(MOD_LALT | MOD_LCTL, KC_F4), + KC_ENT,KC_TAB,KC_TRNS, + // right hand + KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, + KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, ALL_T(KC_RBRACKET), + KC_H, KC_J, KC_K, KC_L, KC_SCLN,CTL_T(KC_QUOTE), + KC_RALT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,M(CBRACE), + KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,M(CBRACK), + KC_TRNS, LCAG_T(KC_F8), + MT(MOD_LALT | MOD_LCTL, KC_F11), + MT(MOD_LALT | MOD_LSFT, KC_F12),KC_BSPC, KC_SPC +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(AUX) // FN1 - Momentary Layer 1 (Aux) +}; + +static uint16_t key_timer; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case OBRACE: { + if (record->event.pressed) { + key_timer = timer_read(); + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { + register_code(KC_RALT); + register_code(KC_QUOTE); + unregister_code(KC_QUOTE); + unregister_code(KC_RALT); + } + } + break; + } + case CBRACE: { + if (record->event.pressed) { + key_timer = timer_read(); + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { + register_code(KC_RALT); + register_code(KC_BSLS); + unregister_code(KC_BSLS); + unregister_code(KC_RALT); + } + } + break; + } + case OBRACK: { + if (record->event.pressed) { + key_timer = timer_read(); + register_code(KC_LALT); + } else { + unregister_code(KC_LALT); + if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { + register_code(KC_RALT); + register_code(KC_LBRACKET); + unregister_code(KC_LBRACKET); + unregister_code(KC_RALT); + } + } + break; + } + case CBRACK: { + if (record->event.pressed) { + key_timer = timer_read(); + register_code(KC_LALT); + } else { + unregister_code(KC_LALT); + if (timer_elapsed(key_timer) < KEY_TAP_SLOW) { + register_code(KC_RALT); + register_code(KC_RBRACKET); + unregister_code(KC_RBRACKET); + unregister_code(KC_RALT); + } + } + break; + } + case CAPS: { + if (record->event.pressed) { + register_code(KC_CAPSLOCK); + } else { + unregister_code(KC_CAPSLOCK); + } + break; + } + } + return MACRO_NONE; +}; + +// 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); + + 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_3_on(); + break; + case 2: + ergodox_right_led_2_on(); + break; + default: + // none + break; + } + + // Turn the caps lock led on + if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) { + ergodox_right_led_1_on(); + } + +} + diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h b/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h new file mode 100644 index 0000000000..d19c2783c3 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/config_user.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "config.h" +#define ONESHOT_TAP_TOGGLE 2 +#define ONESHOT_TIMEOUT 3000 + +#endif diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex index ab32e94dd2..5e010380c6 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/erez_experimental.hex @@ -1,1159 +1,1107 @@ -:100000000C9465020C94A9020C94A9020C94A90208
-:100010000C94A9020C94A9020C94A9020C94A902B4
-:100020000C94A9020C94A9020C94A00C0C94720DCF
-:100030000C94A9020C94A9020C94A9020C94A90294
-:100040000C94A9020C9446220C94A9020C94A902C7
-:100050000C94A9020C94EA1B0C94A9020C94A9021A
-:100060000C94A9020C94A9020C94A9020C94A90264
-:100070000C94A9020C94A9020C94A9020C94A90254
-:100080000C94A9020C94A9020C94A9020C94A90244
-:100090000C94A9020C94A9020C94A9020C94A90234
-:1000A0000C94A9020C94A9020C94A902D70DF90D85
-:1000B000E40EF90DE40E3B0E5E0EE40EB30EC60E1A
-:1000C000C011C0110112011243127F127F147F145C
-:1000D00097127F148E138E1359147F147F146D148E
-:1000E0000000F0A12E004C002A00003035810000F5
-:1000F0001E00140004001D7134004D001F001A0082
-:1001000016001B00E104C1002000080007000600E3
-:1001100050002C0021001500090019004F004A0072
-:10012000220017000A000500000065745000015409
-:1001300000002F7F0000E3004F00015400003077E3
-:100140000000E20023001C000B00110000002971D8
-:10015000240018000D74100052004B0025000C0004
-:100160000E00360051002800260012000F00370054
-:100170002F002B81270013003382387130004E008E
-:100180002D003100347801302D0000000100010005
-:1001900001000100010000003A001E0022002602BA
-:1001A000010001003B001F002300270201000100A5
-:1001B0003C00200024002F004B0101003D002100E5
-:1001C000250030004E0101003E00010026002700FE
-:1001D000000001000100010000000100000001001A
-:1001E0000100010000000100000001003F000100CB
-:1001F0002402310200000100400022022D022602EA
-:100200000100010041002E002D0027020100010025
-:1002100042001F0213002000010001004300010002
-:100220002E02010001000100440045000100010010
-:1002300001000000010001000100010001000000B8
-:1002400001000100010001000100010001000100A6
-:10025000F2000100010001000100F000F1000100C6
-:10026000F400010001000100F3000100F5000100AD
-:100270000100010001000100000001000100010077
-:100280000000010000000100010001000000010069
-:100290000000010001000100010001000000010058
-:1002A0000100010001000100A9000100010001009E
-:1002B0000100AC00AA00B600010001000100AB0083
-:1002C000A80001000100010001000100010001007F
-:1002D00001000100AE00010001000000160345000E
-:1002E000720067006F0044006F0078002000450036
-:1002F0005A00000016034500720067006F004400BA
-:100300006F007800200045005A0000000403090433
-:1003100009026D00040100A0FA09040000010301B4
-:100320000100092111010001223F00070581030896
-:10033000000A090401000103010200092111010062
-:1003400001224D000705820308000A09040200018A
-:100350000300000009211101000122360007058376
-:100360000308000A09040300010300000009211129
-:100370000100012239000705840310000112011059
-:100380000100000008EDFE07130100010200010555
-:10039000010906A101050719E029E71500250195C6
-:1003A0000875018102050819012905950575019156
-:1003B000029501750391010507190029771500259C
-:1003C00001957875018102C005010980A1018502AE
-:1003D00016010026B7001A01002AB7007510950112
-:1003E0008100C0050C0901A1018503160100269CAE
-:1003F000021A01002A9C02751095018100C00501B6
-:100400000902A1010901A100050919012905150029
-:10041000250195057501810295017503810105018D
-:10042000093009311581257F950275088106093843
-:100430001581257F950175088106050C0A3802157E
-:1004400081257F950175088106C0C005010906A1B7
-:1004500001050719E029E7150025019508750181B7
-:100460000295017508810105081901290595057591
-:100470000191029501750391010507190029FF15E6
-:100480000025FF950675088100C0000000000000EF
-:100490000000000000010204060A0F17202C3A4A4F
-:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2
-:1004B000B39D87715D4A3A2C20170F0A060402018A
-:1004C0000000000000000000000011241FBECFEF5C
-:1004D000DAE0DEBFCDBF04B603FE24C08091F00198
-:1004E0009091F101A091F201B091F3018730904B0E
-:1004F000A740B04BB9F41092F0011092F1011092A4
-:10050000F2011092F30114BE84B7877F84BF88E1A3
-:100510000FB6F89480936000109260000FBEE0E088
-:10052000FFE3099511E0A0E0B1E0EAE1F8E402C0E0
-:1005300005900D92A433B107D9F711E0A4E3B1E01F
-:1005400001C01D92A03FB107E1F70E94E6090C949B
-:100550000B240C940000662319F06130F1F03DC0CB
-:10056000FC018281882341F00E94B51B90933501E4
-:100570008093340181EE1CC080913401909135014B
-:100580000E94C11B8634910534F486E20E94481013
-:1005900086E20E94101181EE1EC0FC018281882338
-:1005A00051F00E94B51B909335018093340185EE84
-:1005B0000E94481012C080913401909135010E9430
-:1005C000C11B8634910534F487E20E94481087E20B
-:1005D0000E94101185EE0E94101180E090E00895B5
-:1005E00008956091B3017091B4018091B50190912B
-:1005F000B6010E94131B56985E9825982D98269850
-:100600002E9827982F98813019F0823021F0089584
-:10061000259A2D9A0895269A2E9A08950C94F102FF
-:1006200056985E9825982D9826982E9827982F985A
-:100630008FEF90E0909389008093880090938B00D7
-:1006400080938A0090938D0080938C00259A2D9A38
-:100650002FEF80E792E0215080409040E1F700C00A
-:100660000000269A2E9A2FEF80E792E021508040DA
-:100670009040E1F700C00000279A2F9A2FEF80E703
-:1006800092E0215080409040E1F700C000002598A2
-:100690002D982FEF80E792E0215080409040E1F7C5
-:1006A00000C0000026982E982FEF80E792E021509E
-:1006B00080409040E1F700C0000027982F9856989E
-:1006C0005E9825982D9826982E9827982F9808950B
-:1006D00089EA8093800089E08093810024982C9897
-:1006E0003F988AB18F748AB96E98479A8BB1806BA4
-:1006F0008BB9769A0E9410030C94F00280E28093EA
-:1007000000018091360181110EC00E94CD0381E06D
-:10071000809336012FEF83ED90E32150804090408D
-:10072000E1F700C0000080E40E94D3038093000141
-:1007300081112EC00E94FD0380930001811128C009
-:100740000E94FD0380930001811122C08FE30E946B
-:10075000FD038093000181111BC00E94F50380E41A
-:100760000E94D30380930001811112C08CE00E948B
-:10077000FD038093000181110BC00E94FD03809353
-:100780000001811105C08FE30E94FD0380930001E9
-:100790000E94F5038091000108951092B9008AE04B
-:1007A0008093B800089594EA9093BC009091BC00A7
-:1007B00097FFFCCF9091B900987F983021F090314D
-:1007C00011F081E008958093BB0084E88093BC0021
-:1007D0008091BC0087FFFCCF8091B900887F883171
-:1007E00011F0803471F780E0089584E98093BC00B3
-:1007F0008091BC0084FDFCCF08958093BB0084E809
-:100800008093BC008091BC0087FFFCCF9091B90021
-:10081000987F81E0983209F480E0089584E880931D
-:10082000BC008091BC0087FFFCCF8091BB00089585
-:1008300080910001811115C080E40E94D303809350
-:10084000000181110CC082E10E94FD038093000130
-:10085000811105C08FEF0E94FD03809300010E946B
-:10086000F50384B1807F84B985B1807F85B98AB171
-:10087000837F8AB98BB1837F8BB93E984698089560
-:100880000E947E03809300010E94180480B38C7044
-:1008900080BB81B3836F81BBE6E4F1E0A8E3B1E004
-:1008A00011921D9281E0E435F807D1F70C946803AA
-:1008B000BF92CF92DF92EF92FF920F931F93CF934D
-:1008C000DF9380910001882379F0809137018F5F59
-:1008D00080933701811108C00E947E03809300013C
-:1008E000811102C00E94100308E311E0C0E0D0E0D3
-:1008F000DD24D39482E0C82EEE24E394F12CC7309B
-:1009000000F580910001811162C080E40E94D30350
-:1009100080930001811112C082E10E94FD03809347
-:10092000000181110BC0C7010C2E01C0880F0A9471
-:10093000EAF780950E94FD03809300010E94F50371
-:1009400046C0CA30A1F028F4C83059F0C93061F06F
-:1009500005C0CC3089F070F0CD3089F0209A28980D
-:1009600010C0219A29980DC0229A2A980AC0239A69
-:100970002B9807C0529A01C0539A5B9802C03E9AC6
-:100980004698E0EAEA95F1F78FB179995AC092E07A
-:1009900081708D25892B7C9B02C090E001C094E082
-:1009A000892B7D9B02C090E001C098E0892B7E9B43
-:1009B00002C090E001C090E1892B9FB19095991FF2
-:1009C0009927991F9295990F907E892B0FC080913E
-:1009D000000181114BC080E40E94D3038093000189
-:1009E000882389F1B12C0E94F5038B2DF8019081A9
-:1009F000981719F08083C09201010E941804219673
-:100A00000F5F1F4FCE30D10509F079CF80910101E2
-:100A1000882371F1815080930101882339F08FE997
-:100A20009FE00197F1F700C0000022C0A6E4B1E00A
-:100A3000E8E3F1E081918D9391E0E634F907D1F795
-:100A400017C090E0A5CF83E10E94FD0380930001D1
-:100A50008111C8CF81E40E94D303809300018111EA
-:100A6000C1CF0E940E04B82EB094BDCF80E0BECF9F
-:100A70000E940E0381E0DF91CF911F910F91FF90B3
-:100A8000EF90DF90CF90BF900895E82FF0E0EA5B01
-:100A9000FE4F808108950895089596E0799FF001B2
-:100AA000112494E5899FE00DF11D1124E60FF11D3D
-:100AB000EE0FFF1FEC51FF4F859194910895880F21
-:100AC000991F805A9040FC01859194910895880F58
-:100AD000991F80529F4FFC018591949108950F9327
-:100AE0001F93CF93DF93EC01811520E3920730F53C
-:100AF000811530E2930708F0B1C08B3B910588F473
-:100B0000883A910508F058C0853A910508F049C027
-:100B10008430910508F043C08130910509F4B2C1D9
-:100B2000AEC18F3F910509F0D0F5803F910508F0E7
-:100B300092C0805E9109089790F1A1C1C11581E52D
-:100B4000D807A8F4C23090E5D90708F09FC0C115B6
-:100B500020E5D20709F486C008F092C0C11580E4F0
-:100B6000D80708F08CC18E011127106CCCC1C115BB
-:100B700090E8D90758F4C11520E7D20708F07BC1E7
-:100B8000C11530E6D30708F423C179C1C11580E946
-:100B9000D80708F074C18E011F70106AB4C18E01AD
-:100BA000B2C1853A910509F470C1863A910509F4FC
-:100BB0006FC103E810E4A7C1883A910509F46BC13D
-:100BC000893A910509F46AC18A3A910509F469C123
-:100BD0008B3A910509F468C18C3A910509F467C113
-:100BE0008D3A910509F466C1803B910509F465C110
-:100BF0008E3A910509F464C18F3A910509F463C1F5
-:100C0000813B910509F462C1823B910509F461C100
-:100C1000833B910509F460C1843B910509F45FC1F0
-:100C2000853B910509F45EC1863B910509F45DC1E0
-:100C3000873B910509F45CC1883B910509F45BC1D0
-:100C4000893B910509F45AC18A3B910509F059C1C4
-:100C50000AE216E458C18C01106555C19F700E94CC
-:100C6000670552C10E94A2149FEF24E33CE091501B
-:100C700020403040E1F700C000000E940F1C43C13B
-:100C80008091CF0181608093CF013DC10E94B71D4B
-:100C9000811102C00E949D1D0E94D41D90E090937E
-:100CA000F0018093EF01C23080E5D80721F48091F4
-:100CB000EF01816086C0C43090E5D90721F48091AE
-:100CC000EF0182607EC0C63020E5D20721F480911A
-:100CD000EF01846076C0C83030E5D30719F4809105
-:100CE000EF0127C0CA3080E5D80721F48091EF01D9
-:100CF000806167C0CC3090E5D90721F48091EF0185
-:100D000080625FC0CE3020E5D20721F48091EF01F0
-:100D1000806457C0C03130E5D30721F48091EF01E2
-:100D200080684FC0C23180E5D80729F48091EF0177
-:100D30008460886046C0C33090E5D90721F4809173
-:100D4000EF018E7F3EC0C53020E5D20721F48091AF
-:100D5000EF018D7F36C0C73030E5D30721F4809195
-:100D6000EF018B7F2EC0C93080E5D80719F4809140
-:100D7000EF0126C0CB3090E5D90721F48091EF0137
-:100D80008F7E1FC0CD3020E5D20721F48091EF0186
-:100D90008F7D17C0CF3030E5D30721F48091EF016C
-:100DA0008F7B0FC0C13180E5D80721F48091EF011E
-:100DB0008F7707C0C331D04531F48091EF018B7F2D
-:100DC000877F8093EF018091EF010E94D81D9BC027
-:100DD0008D2F99278F70992781309105E9F48E0125
-:100DE000037011279C0102C0220F331F0A95E2F7FE
-:100DF00089011C68CE0164E0880F991F6A95E1F7AC
-:100E000088279370082B192B73E0CC0FDD1F7A9580
-:100E1000E1F7C076DD272CC08230910529F41C2F24
-:100E20000027016F106A6FC08330910561F4CE0115
-:100E30008370992701E010E002C0000F111F8A950E
-:100E4000E2F71C680EC0049709F05DC0CE01837004
-:100E5000992701E010E002C0000F111F8A95E2F708
-:100E60001A6843E0CC0FDD1F4A95E1F7C07ED770CA
-:100E70000C2B1D2B48C08E011F70106244C000E077
-:100E800010E041C001E010E03EC001E810E43BC0CA
-:100E900002E810E438C002EE14E435C009EE14E4B0
-:100EA00032C00AEE14E42FC005EB14E42CC006EBAC
-:100EB00014E429C007EB14E426C00CEC14E423C0AE
-:100EC0000DEC14E420C003E815E41DC00AE815E4A5
-:100ED0001AC002E915E417C004E915E414C001E2E0
-:100EE00016E411C003E216E40EC004E216E40BC0DF
-:100EF00005E216E408C006E216E405C007E216E4BF
-:100F000002C000E014E4C801DF91CF911F910F915E
-:100F1000089596E0799FF001112494E5899FE00DF2
-:100F2000F11D1124E60FF11DEE0FFF1FEC51FF4FD5
-:100F300085919491803E9105E0F4803C910558F5AF
-:100F40008133910509F46FC048F48932910509F4A1
-:100F500063C08A32910509F46DC072C0893391056E
-:100F6000E9F082389105D1F08533910509F44DC03F
-:100F700067C0833E910581F138F4803E9105B9F058
-:100F8000823E9105D9F05CC0863E910561F1873EB5
-:100F90009105A1F155C00E945F0508952091EF01D0
-:100FA00020FD02C021FF4CC080EE90E049C080913E
-:100FB000EF0180FFF9CF89E390E042C08091EF011B
-:100FC00082FF0EC08091EF0184FF03C080E090E0BB
-:100FD00037C083EE90E034C08091EF0182FFF2CF02
-:100FE00082EE90E02DC08091EF0183FF0BC08091D5
-:100FF000EF0184FDEBCF87EE90E022C08091EF01FE
-:1010000083FFF5CF86EE90E01BC08091EF0185FF56
-:1010100007C089E290E014C08091EF0185FFF9CF0D
-:1010200085E390E00DC08091EF0186FF07C08AE262
-:1010300090E006C08091EF0186FFF9CF81E390E058
-:101040000E946F05089508950C942308809164010F
-:101050000895CF93DF9300D01F92CDB7DEB72091D4
-:10106000E601243019F523E029839B838A832093AA
-:10107000E9008FEF9091E800815095FD06C095ED55
-:101080009A95F1F700008111F5CF8091E80085FF76
-:101090000DC040E050E063E070E0CE0101960E9498
-:1010A000930A8091E8008E778093E8000F900F906C
-:1010B0000F90DF91CF910895CF93DF9300D01F92CF
-:1010C000CDB7DEB72091E601243021F522E0298357
-:1010D0009B838A8383E08093E9008FEF9091E800FF
-:1010E000815095FD06C095ED9A95F1F700008111AC
-:1010F000F5CF8091E80085FF0DC040E050E063E04F
-:1011000070E0CE0101960E94930A8091E8008E77EC
-:101110008093E8000F900F900F90DF91CF9108958A
-:101120002091E6012430F1F422E02093E9002FEF32
-:101130003091E800215035FD06C035ED3A95F1F7C4
-:1011400000002111F5CF2091E80025FF0BC040E001
-:1011500050E065E070E00E94930A8091E8008E778D
-:101160008093E8000895CF93DF93EC018091E6012E
-:10117000843009F046C090910C019923D9F09091E8
-:101180000D019923B9F08093E9008FEF9091E80069
-:10119000815095FD06C095E19A95F1F70000811107
-:1011A000F5CF8091E80085FF2CC040E050E060E181
-:1011B00070E017C081E08093E9008FEF9091E80024
-:1011C000815095FD06C095ED9A95F1F700008111CB
-:1011D000F5CF8091E80085FF14C040E050E068E062
-:1011E00070E0CE010E94930A8091E8008E77809390
-:1011F000E80080E1FE01A4E5B1E001900D928A953E
-:10120000E1F7DF91CF9108958091E501811109C047
-:101210000E94250C0E94820C8091E20084608093E1
-:10122000E20008951092E501089508950C94332288
-:101230000E94A61B0E9439220E941F0F0C942408B2
-:1012400042E061EC81E00E949F0B42E061EC82E0B1
-:101250000E949F0B42E061EC83E00E949F0B42E101
-:1012600061EC84E00C949F0B8091E801833009F4D9
-:1012700055C030F4813071F0823009F48EC0089589
-:101280008A3009F47AC08B3009F460C0893009F0E3
-:101290009CC020C08091E701813A09F096C08091FE
-:1012A000E800877F8093E8008091EB019091EC014A
-:1012B000892B21F060E080E090E003C060E184E5EC
-:1012C00091E070E00E94DC0A8091E8008B778093C7
-:1012D000E80008958091E701813209F076C080919D
-:1012E000EB019091EC01009719F0039709F06DC0A4
-:1012F0008091E800877F8093E8008091E80082FD7C
-:1013000005C08091E6018111F8CF5FC08091F100A6
-:10131000809364018091E8008B7753C08091E7014E
-:10132000813A09F052C08091EB019091EC01892B38
-:1013300009F04BC08091E800877F8093E80080919E
-:10134000E80080FFFCCF80910C0136C08091E7015E
-:101350008132D9F58091EB019091EC01892BA9F5AF
-:101360008091E800877F8093E8000E94D40B8091F1
-:10137000E90180930C010C94A2148091E701813261
-:1013800021F58091E800877F8093E8000E94D40BCC
-:101390008091EA018093650108958091E701813A87
-:1013A000A1F48091E800877F8093E8008091E800B5
-:1013B00080FFFCCF809165018093F1008091E8006F
-:1013C0008E778093E8000C94D40B089584B7877FC0
-:1013D00084BF88E10FB6F89480936000109260009B
-:1013E0000FBE90E080E80FB6F89480936100909370
-:1013F00061000FBE0E946E0F0E94250C0E94820C9D
-:101400008091E20084608093E20078940E94FD0E57
-:101410000E94700F82E091E00E941A0F0E94212228
-:101420008091E601853069F40E94661B8091E40199
-:101430008823B1F30E94911B882391F30E947D0AB7
-:10144000EFCF0E94760FECCF292F332723303105C1
-:10145000A9F06CF42130310509F442C02230310585
-:1014600009F043C08DE690E020E133E042C0213234
-:101470003105C9F02232310519F137C09927813081
-:10148000910541F08230910541F0892B71F5ECE036
-:10149000F3E005C0E4EFF2E002C0ECEDF2E084918D
-:1014A00090E09F0126C0643000F5E62FF0E0EE0FDB
-:1014B000FF1FEE5DFE4F2081318189E090E019C071
-:1014C000643098F4E62FF0E0DF01AA0FBB1FA65EA0
-:1014D000BE4F2D913C91EA5EFE4F808190E009C0A5
-:1014E00082E190E02DE733E004C080E090E020E06E
-:1014F00030E0FA0131832083089580E189BD82E1E3
-:1015000089BD09B400FEFDCF8091D8008F7D809306
-:10151000D8008091E00082608093E0008091E0003C
-:1015200081FDFCCF0895CF92DF92EF92FF920F934F
-:101530001F93CF93DF937C018B01EA010E94F50B8F
-:10154000811131C0209731F088819981081B190BD6
-:10155000E80EF91EC12CD12C0115110519F180914D
-:10156000E80085FD14C08091E8008E778093E80044
-:10157000209741F0888199818C0D9D1D99838883E6
-:1015800085E011C00E94F50B882331F30CC0F701F0
-:1015900081917F018093F10001501109FFEFCF1A73
-:1015A000DF0ADACF80E0DF91CF911F910F91FF909A
-:1015B000EF90DF90CF9008952091ED013091EE01F2
-:1015C0002617370748F06115710539F42091E800B6
-:1015D0002E772093E80001C0B901FC0120E06115DD
-:1015E0007105B9F18091E601882309F440C0853086
-:1015F00009F43FC08091E80083FD3DC08091E80080
-:1016000082FF06C08091E80082FF26C080E0089536
-:101610008091E80080FFE3CF2091F3008091F200F9
-:1016200090E0922B6115710551F08830910538F4E6
-:1016300021912093F100615071090196F3CF21E0CF
-:10164000089709F020E08091E8008E778093E80009
-:10165000C6CF2111C7CFD6CF8091E601882339F0BC
-:10166000853039F08091E80083FFCCCF04C082E060
-:10167000089583E0089581E008952091ED0130916F
-:10168000EE012617370748F06115710539F42091EE
-:10169000E8002E772093E80001C0B901FC0120E0AA
-:1016A00061157105C1F18091E601882309F441C0FB
-:1016B000853009F440C08091E80083FD3EC08091F0
-:1016C000E80082FF06C08091E80082FF27C080E02A
-:1016D00008958091E80080FFE3CF2091F30080918E
-:1016E000F20090E0922B6115710559F08830910558
-:1016F00040F424912093F1003196615071090196D4
-:10170000F2CF21E0089709F020E08091E8008E7781
-:101710008093E800C5CF2111C6CFD5CF8091E601D7
-:10172000882339F0853039F08091E80083FFCBCFF2
-:1017300004C082E0089583E0089581E00895982F21
-:10174000973058F59093E900981739F07091EC00B4
-:101750002091ED005091F00003C0242F762F50E02F
-:1017600021FF19C03091EB003E7F3093EB003091A8
-:10177000ED003D7F3093ED003091EB003160309310
-:10178000EB007093EC002093ED005093F00020915B
-:10179000EE0027FF07C09F5FD3CF8F708093E900D3
-:1017A00081E0089580E008958091E70187FD05C0FC
-:1017B0008091E80080FF0EC012C08091E80082FD99
-:1017C00005C08091E6018111F8CF08958091E8006D
-:1017D0008B7708C08091E6018111EACF089580914E
-:1017E000E8008E778093E80008958091E40090915E
-:1017F000E50045E62091EC0020FF21C02091E800A3
-:1018000020FD21C02091E601222389F0253089F0B6
-:101810002091EB0025FD0FC02091E4003091E50000
-:101820002817390739F3415041F0C901E3CF82E06D
-:10183000089583E0089581E0089584E0089520915B
-:10184000E80022FFDFCF80E008950E94930C0E9401
-:101850009B0CE0EEF0E0808181608083E8EDF0E0B9
-:1018600080818F77808319BCA7EDB0E08C918E7F4B
-:101870008C9380818F7E80831092E50108950F9371
-:101880001F93CF93DF930E94930C0E949B0CC8ED93
-:10189000D0E088818F778883888180688883888179
-:1018A0008F7D888319BC1092E6011092E20110929C
-:1018B000E4011092E30100EE10E0F80180818B7FDB
-:1018C000808388818160888342E060E080E00E94BC
-:1018D0009F0BE1EEF0E080818E7F8083E2EEF0E00E
-:1018E000808181608083808188608083F80180812D
-:1018F0008E7F8083888180618883DF91CF911F9163
-:101900000F910895E8EDF0E080818F7E8083E7ED10
-:10191000F0E080818160808384E082BF81E08093F9
-:10192000E5010C943F0CE8EDF0E080818E7F808330
-:101930001092E20008951092DA001092E1000895EA
-:101940001F920F920FB60F9211242F933F934F9334
-:101950005F936F937F938F939F93AF93BF93EF9317
-:10196000FF938091E10082FF0BC08091E20082FF33
-:1019700007C08091E1008B7F8093E1000E94FC0E04
-:101980008091DA0080FF1FC08091D80080FF1BC0CB
-:101990008091DA008E7F8093DA008091D90080FFF9
-:1019A0000DC080E189BD82E189BD09B400FEFDCF93
-:1019B00081E08093E6010E94040905C019BC1092E1
-:1019C000E6010E9412098091E10080FF19C0809118
-:1019D000E20080FF15C08091E2008E7F8093E200DC
-:1019E0008091E20080618093E2008091D800806263
-:1019F0008093D80019BC85E08093E6010E94160907
-:101A00008091E10084FF30C08091E20084FF2CC00F
-:101A100080E189BD82E189BD09B400FEFDCF8091DE
-:101A2000D8008F7D8093D8008091E1008F7E8093D5
-:101A3000E1008091E2008F7E8093E2008091E200DD
-:101A400081608093E2008091E201882311F084E0BC
-:101A500007C08091E30087FF02C083E001C081E0FE
-:101A60008093E6010E9418098091E10083FF29C05C
-:101A70008091E20083FF25C08091E100877F809301
-:101A8000E10082E08093E6011092E2018091E100A2
-:101A90008E7F8093E1008091E2008E7F8093E20050
-:101AA0008091E20080618093E20042E060E080E0AB
-:101AB0000E949F0B8091F00088608093F0000E944C
-:101AC0001509FF91EF91BF91AF919F918F917F91F8
-:101AD0006F915F914F913F912F910F900FBE0F909B
-:101AE0001F9018951F920F920FB60F9211242F93EB
-:101AF0003F934F935F936F937F938F939F93AF9396
-:101B0000BF93CF93EF93FF93C091E900CF70809183
-:101B1000EC001092E9008091F000877F8093F00044
-:101B200078940E94AE0D1092E9008091F0008860D8
-:101B30008093F000C093E900FF91EF91CF91BF91A6
-:101B4000AF919F918F917F916F915F914F913F9155
-:101B50002F910F900FBE0F901F9018951F93CF934A
-:101B6000DF93CDB7DEB7AA970FB6F894DEBF0FBEEE
-:101B7000CDBFE7EEF1E08091F100819321E0EF3EEF
-:101B8000F207C9F70E9434098091E80083FF1CC165
-:101B90002091E7013091E801832F90E08A30910590
-:101BA00008F012C1FC01EA5AFF4F0C94BB23203805
-:101BB00081F0223809F008C18091EB018F70809389
-:101BC000E9008091EB0085FB882780F91092E900FD
-:101BD00006C08091E3019091E4019111826090919F
-:101BE000E800977F9093E8008093F1001092F10055
-:101BF000C5C0822F8D7F09F0E7C0222319F0223063
-:101C000061F0E2C08091E901813009F0DDC033303C
-:101C100009F080E08093E40128C08091E9018111FE
-:101C200024C02091EB012F7009F4CEC02093E9006D
-:101C30008091EB0080FF19C08091EB00333011F4EC
-:101C4000806211C080618093EB0081E090E0022E01
-:101C500001C0880F0A94EAF78093EA001092EA0024
-:101C60008091EB0088608093EB001092E9008091F6
-:101C7000E800877F86C02111A7C01091E9011F7776
-:101C80008091E3008078812B8093E3008091E800CD
-:101C9000877F8093E8000E94D40B8091E80080FF4A
-:101CA000FCCF8091E30080688093E300112311F062
-:101CB00083E001C082E08093E60186C02058223094
-:101CC00008F082C08091E9019091EA018C3D23E007
-:101CD000920779F583E08A838AE289834FB7F89483
-:101CE000DE01139620E03EE051E2E32FF0E0509356
-:101CF0005700E49120FF03C0E295EF703F5FEF7063
-:101D00008E2F90E0EA3010F0C79601C0C0968D93F8
-:101D10009D932F5F243149F74FBF8091E800877F63
-:101D20008093E8006AE270E0CE0101960E94DC0A2E
-:101D300014C0AE014F5F5F4F6091EB010E94240A17
-:101D4000009709F441C02091E800277F2093E80024
-:101D5000BC0189819A810E943D0B8091E8008B77BC
-:101D60008093E80031C0203879F58091E800877FC2
-:101D70008093E8008091E2018093F1008091E80077
-:101D80008E778093E8000E94D40B1EC021111CC0E6
-:101D90009091E9019230C0F48091E800877F8093B0
-:101DA000E8009093E2010E94D40B8091E20181113E
-:101DB00004C08091E30087FF02C084E001C081E09D
-:101DC0008093E6010E9420098091E80083FF0AC009
-:101DD0008091E800877F8093E8008091EB0080622B
-:101DE0008093EB00AA960FB6F894DEBF0FBECDBF6E
-:101DF000DF91CF911F9108950895CF938091E601CF
-:101E00008823B1F08091E9008F709091EC0090FFF1
-:101E100002C090E801C090E0C92FC82B1092E900E1
-:101E20008091E80083FD0E94AE0DCF70C093E90061
-:101E3000CF91089590936B0180936A010895E0918A
-:101E40006A01F0916B01309721F00190F081E02D53
-:101E5000099480E00895E0916A01F0916B01309758
-:101E600021F00280F381E02D09940895E0916A0148
-:101E7000F0916B01309721F00480F581E02D0994F9
-:101E8000089520916801309169018217930771F0DC
-:101E90009093690180936801E0916A01F0916B0170
-:101EA000309721F00680F781E02D09940895209164
-:101EB0006601309167018217930771F09093670173
-:101EC00080936601E0916A01F0916B01309721F0F7
-:101ED0000084F185E02D0994089508950C946D0F08
-:101EE0000E94AC1B0E9440040C94721CCF92DF92A3
-:101EF000EF92FF920F931F93CF93DF93CDB7DEB78F
-:101F00002B970FB6F894DEBF0FBECDBF0E945804CA
-:101F10003DE6E32E31E0F32E00E010E0C02E802FEE
-:101F20000E944505F701D1907F01D826B1F40F5FDB
-:101F30001F4F0E30110591F78FEF89838A831B8223
-:101F40000E94B51B8160782F9D838C8349815A81C3
-:101F50006B818D810E94191041C09091CF0191FF3A
-:101F600004C08B870E944B058B8520E030E04D2D0F
-:101F700050E0922FBA01022E02C0759567950A941F
-:101F8000E2F760FF25C02E83CF82EE24E394F12C8C
-:101F900002C0EE0CFF1C9A95E2F790E08E219F2183
-:101FA00021E0892B09F420E028870E94B51B81607D
-:101FB000782F9A8789874E815F8168858A850E94FC
-:101FC0001910F801E359FE4F80818E25808306C0E9
-:101FD0002F5F3F4F2630310561F6A9CF0E94561F73
-:101FE00010916C010E941F0F1817A1F00E941F0F83
-:101FF00080936C012B960FB6F894DEBF0FBECDBF59
-:10200000DF91CF911F910F91FF90EF90DF90CF90D4
-:102010000C9424082B960FB6F894DEBF0FBECDBFEC
-:10202000DF91CF911F910F91FF90EF90DF90CF90B4
-:102030000895CF93DF93CDB7DEB72B970FB6F89403
-:10204000DEBF0FBECDBF4F83588769877A878B87E6
-:10205000DE01119686E0FD0111928A95E9F785E08F
-:10206000FE01379601900D928A95E1F749815A81D8
-:102070006B817C818D819E810E946E172B960FB69D
-:10208000F894DEBF0FBECDBFDF91CF9108950895C4
-:10209000CF93C82F882309F4C1C0823859F40E9415
-:1020A0001F0F81FDBBC089E30E941A1A0E94E41A27
-:1020B00089E30CC0833879F40E941F0F80FDAEC005
-:1020C00083E50E941A1A0E94E41A83E50E945A1AB4
-:1020D000CF910C94E41A843859F40E941F0F82FDAA
-:1020E0009DC087E40E941A1A0E94E41A87E4EECF8A
-:1020F0008CEF8C0F813A48F48C2F0E94892181113A
-:102100008DC08C2F0E941A1AE3CF80E28C0F88308A
-:1021100048F4C77081E001C0880FCA95EAF70E94B1
-:102120009B1AD6CF8BE58C0F833078F4C53A29F013
-:10213000C63A31F482E890E005C081E890E002C040
-:1021400083E890E0CF910C94410F88E58C0F8331A8
-:1021500008F064C0C83A39F1C93A41F1CA3A49F1C4
-:10216000CB3A51F1CC3A59F1CD3A61F1C03B69F12A
-:10217000CE3A71F1CF3A79F1C13B81F1C23B89F19D
-:10218000C33B91F1C43B99F1C53BA1F1C63BA9F119
-:10219000C73BB1F1C83BB9F1C93BC1F1CA3BC9F575
-:1021A0008AE292E038C082EE90E035C089EE90E09D
-:1021B00032C08AEE90E02FC085EB90E02CC086EB19
-:1021C00090E029C087EB90E026C08CEC90E023C023
-:1021D0008DEC90E020C083E891E01DC08AE891E09A
-:1021E0001AC082E991E017C084E991E014C081E24D
-:1021F00092E011C083E292E00EC084E292E00BC054
-:1022000085E292E008C086E292E005C087E292E0B3
-:1022100002C080E090E0CF910C94570FCF910895C9
-:10222000882309F44BC0823859F40E941F0F81FFA4
-:1022300045C089E30E941A1A0E94E41A89E30CC07F
-:10224000833871F40E941F0F80FF38C083E50E941D
-:102250001A1A0E94E41A83E50E945A1A0C94E41A8E
-:10226000843859F40E941F0F82FF28C087E40E941F
-:102270001A1A0E94E41A87E4EFCF9CEF980F913A64
-:1022800058F390E2980F983050F4877091E001C0B5
-:10229000990F8A95EAF7892F0E94A11ADFCF9BE553
-:1022A000980F933020F480E090E00C94410F885A0E
-:1022B000833120F480E090E00C94570F0895882338
-:1022C00021F00E949B1A0C94E41A0895882321F0AF
-:1022D0000E94A11A0C94E41A0895CF92DF92EF9213
-:1022E000FF920F931F93CF93DF93CDB7DEB728975D
-:1022F0000FB6F894DEBF0FBECDBF8C0185E0F801AC
-:10230000DE01119601900D928A95E1F7F801D080D7
-:10231000E180F280558152955F7023813481232BB7
-:1023200039F0FFEFEF1206C081E0DF1203C003C0F7
-:1023300081E001C080E080FDE2C2C8015F830E94AD
-:102340004710D982EA8269817A818F2D0E94161AFC
-:102350009E8388870E94CA190E949D184E815F81C2
-:102360006885FF2029F00E94B81A68855F814E8138
-:10237000E42FE295EF70F0E0E05AFF4F0C94BB239E
-:10238000842F807F142F1F70882311F01295107FE7
-:10239000FF20B1F0112309F467C280E2860F883074
-:1023A00028F4812F68870E949B1A04C0812F6887B8
-:1023B0000E94AB1A688568870E94E41A688554C237
-:1023C000862F68870E9410116885112309F497C22F
-:1023D000605E812F683018F40E94A11A02C00E942A
-:1023E000B11A28960FB6F894DEBF0FBECDBFDF91AD
-:1023F000CF911F910F91FF90EF90DF90CF900C94B1
-:10240000E41A242F207F842F8F70203211F08295C0
-:10241000807F662319F0613019F12BC0FF20B1F0E5
-:10242000552309F493C1513009F090C128960FB695
-:10243000F894DEBF0FBECDBFDF91CF911F910F91FA
-:10244000FF90EF90DF90CF900C94CB1A552319F0AA
-:10245000513009F454C28E830E94CE1A8E8189C1F4
-:10246000FF2021F0523008F04AC270C1511147C21A
-:1024700080C1FF2021F0552309F468C1F5C155231F
-:1024800009F477C105C2242F26952695237030E0E4
-:102490002115310521F021303105C9F030C2FF206E
-:1024A00021F0862F942F937002C080E090E0289650
-:1024B0000FB6F894DEBF0FBECDBFDF91CF911F9155
-:1024C0000F91FF90EF90DF90CF900C94410FFF2081
-:1024D00021F0862F942F937002C080E090E0289620
-:1024E0000FB6F894DEBF0FBECDBFDF91CF911F9125
-:1024F0000F91FF90EF90DF90CF900C94570F862FA5
-:10250000FF2019F00E945E1E02C00E94C61E28967F
-:102510000FB6F894DEBF0FBECDBFDF91CF911F91F4
-:102520000F91FF90EF90DF90CF900C944B1F842F72
-:10253000837009F076C0F110E2C1262F229526950E
-:102540002770220F220F862F8F70C82ED12CE12CDE
-:10255000F12C022E04C0CC0CDD1CEE1CFF1C0A94D6
-:10256000D2F764FF10C06FE070E080E090E004C03C
-:10257000660F771F881F991F2A95D2F7609570956F
-:102580008095909503C060E070E0CB01242F2695E4
-:1025900026952370422F50E042305105D1F0433050
-:1025A000510559F16C297D298E299F29413051050A
-:1025B00041F128960FB6F894DEBF0FBECDBFDF9174
-:1025C000CF911F910F91FF90EF90DF90CF900C94DF
-:1025D000C2186C297D298E299F2928960FB6F89458
-:1025E000DEBF0FBECDBFDF91CF911F910F91FF9046
-:1025F000EF90DF90CF900C94DC180E94C218C701B6
-:10260000B60128960FB6F894DEBF0FBECDBFDF919E
-:10261000CF911F910F91FF90EF90DF90CF900C948E
-:10262000A818FF2019F0842F817001C08695882397
-:1026300009F465C1262F229526952770220F220FB7
-:10264000862F8F70C82ED12CE12CF12C022E04C0C5
-:10265000CC0CDD1CEE1CFF1C0A94D2F764FF10C0EA
-:102660006FE070E080E090E004C0660F771F881F85
-:10267000991F2A95D2F7609570958095909503C023
-:1026800060E070E0CB01242F269526952370422F21
-:1026900050E042305105D1F04330510559F16C29D9
-:1026A0007D298E299F294130510541F128960FB689
-:1026B000F894DEBF0FBECDBFDF91CF911F910F9178
-:1026C000FF90EF90DF90CF900C9496196C297D29A4
-:1026D0008E299F2928960FB6F894DEBF0FBECDBF76
-:1026E000DF91CF911F910F91FF90EF90DF90CF90EE
-:1026F0000C94B0190E949619C701B60128960FB61E
-:10270000F894DEBF0FBECDBFDF91CF911F910F9127
-:10271000FF90EF90DF90CF900C947C19603FC9F14F
-:1027200018F4603E50F49BC0623F09F460C008F4A6
-:102730004AC0633F09F46FC092C0162F1F70842FE8
-:102740008F71FF2099F00E941519812F28960FB6DE
-:10275000F894DEBF0FBECDBFDF91CF911F910F91D7
-:10276000FF90EF90DF90CF900C945F110E9436198C
-:10277000812F28960FB6F894DEBF0FBECDBFDF9134
-:10278000CF911F910F91FF90EF90DF90CF900C941D
-:102790006611FF20A1F05111B2C0842F8F712896CD
-:1027A0000FB6F894DEBF0FBECDBFDF91CF911F9162
-:1027B0000F91FF90EF90DF90CF900C945B19523007
-:1027C00008F09DC0EACFFF20A1F0842F8F712896DA
-:1027D0000FB6F894DEBF0FBECDBFDF91CF911F9132
-:1027E0000F91FF90EF90DF90CF900C941519FF2080
-:1027F00061F3842F8F7128960FB6F894DEBF0FBE59
-:10280000CDBFDF91CF911F910F91FF90EF90DF909F
-:10281000CF900C943619FF2091F0842F8F71289659
-:102820000FB6F894DEBF0FBECDBFDF91CF911F91E1
-:102830000F91FF90EF90DF90CF900C9400192896A5
-:102840000FB6F894DEBF0FBECDBFDF91CF911F91C1
-:102850000F91FF90EF90DF90CF900C94F618FF202F
-:10286000A1F0552309F4B1CF862F28960FB6F8941E
-:10287000DEBF0FBECDBFDF91CF911F910F91FF90B3
-:10288000EF90DF90CF900C944810552309F4B1CF0E
-:10289000862F28960FB6F894DEBF0FBECDBFDF910E
-:1028A000CF911F910F91FF90EF90DF90CF900C94FC
-:1028B00010114F70C8010E94AB0228960FB6F89411
-:1028C000DEBF0FBECDBFDF91CF911F910F91FF9063
-:1028D000EF90DF90CF900C941B184F70C801289692
-:1028E0000FB6F894DEBF0FBECDBFDF91CF911F9121
-:1028F0000F91FF90EF90DF90CF900C944C052896AD
-:102900000FB6F894DEBF0FBECDBFDF91CF911F9100
-:102910000F91FF90EF90DF90CF9008950E94B81A2A
-:102920000E94C81A0E948D1A0E94E41A0E94F71F82
-:102930000E944B1F80E090E00E94410F80E090E0F9
-:102940000C94570F0E94A81A0C948E140E940B1A14
-:10295000292F22952F7030E02C3031054CF42A308D
-:1029600031056CF4225031092230310590F407C052
-:102970002C30310551F02F30310539F00AC0803E3E
-:1029800010F0803F31F481E0089593FB882780F9AF
-:10299000089580E00895CF93DF9300D000D01F9278
-:1029A000CDB7DEB70F900F900F900F900F90DF9183
-:1029B000CF910895CF93DF9300D000D000D0CDB752
-:1029C000DEB726960FB6F894DEBF0FBECDBFDF91FF
-:1029D000CF9108951F93CF93DF93C0917B0116E0B1
-:1029E00080917C01C81799F0D0E01C9FF0011D9FD9
-:1029F000F00D1124E358FE4F4081518162817381B3
-:102A0000848195810E94DA142196C770E9CFDF9105
-:102A1000CF911F9108954091AD015091AE01609109
-:102A2000AF017091B0018091B1019091B2010C940D
-:102A3000DA14CF938091B20182958F7009F05FC054
-:102A40008091AF01882309F45AC020917B01A091A5
-:102A50007C016091AD017091AE018091B0019091C7
-:102A6000B10131E06F3F09F030E0B32FC6E02A1723
-:102A700009F445C0009721F07F3F21F44B2F03C09C
-:102A800041E001C040E030E040FD35C0C29FF001B0
-:102A9000C39FF00D1124E358FE4F418174132BC0E6
-:102AA0004081641328C04281411125C04381548173
-:102AB0004817590710F441505109481B590B483C1D
-:102AC0005105C8F48091B2018F7080618093B2018A
-:102AD00086E0829FF001839FF00D1124EE57FE4F98
-:102AE00080818F70806180838DEA91E00E946D11FA
-:102AF000CF910C94EA142F5F3F4F2770B8CFCF913E
-:102B00000895CF92DF92EF92FF920F931F93CF938E
-:102B1000DF93CDB7DEB762970FB6F894DEBF0FBE76
-:102B2000CDBF8C0185E0F801DE011D9601900D926C
-:102B30008A95E1F7D8014C9111965C911197129604
-:102B40006C9112971396ED90FC9014977091AD01D3
-:102B5000E091AE012091B0013091B1012115310514
-:102B600031F0EF3F31F481E07F3F19F403C081E0A1
-:102B700001C080E0B82FB170CB2E80FD6CC1D09029
-:102B8000AF01DD2009F4F5C0F091B201E216F306C1
-:102B900038F0C701821B930B883C910548F09BC01D
-:102BA000209530952E0D3F1D283C310508F093C02F
-:102BB0008F2F807F09F052C0E51314C0741312C028
-:102BC000D62E61110FC0FF70F061F093B2010E9428
-:102BD0000B158DEA91E00E946D118091B201F80110
-:102BE00085836CC1EF2831F05F3F31F481E04F3FC6
-:102BF00019F403C081E001C080E080FD03C081E0E2
-:102C0000862701C080E0F82FF170FF2E80FF1CC0E6
-:102C100080917B0120917C0136E0821709F428C164
-:102C200090E0389FF001399FF00D1124E358FE4FDA
-:102C30007181571306C07081471303C072816713F7
-:102C400003C001968770E9CFD62E662309F436C1FA
-:102C50008091B20181608093B20153C0E51308C036
-:102C6000741306C0611104C0D8011596FC93AEC060
-:102C70004D875E878D859E856A8B0E94A6146A8922
-:102C8000882329F1D62E662311F12091B201822FDB
-:102C900082958F7090E002970CF460C08091AD0136
-:102CA0009091AE0198878F831986FB86EA862C87E0
-:102CB000CE01079651C0E51731F14D875E878D85AE
-:102CC0009E856A8B0E94A6146A8981112EC0C80154
-:102CD0000E946D11A4C08F2F807F69F77E2DF98A25
-:102CE000E88A89890E94CB148DEA91E00E946D11D7
-:102CF000EDEAF1E086E0DF011D928A95E9F70E9496
-:102D00000B15D12CDBC07413D8CF6111D6CFD801ED
-:102D10001596FC93C8010E946D11EDEAF1E086E082
-:102D2000DF011D928A95E9F7C9C0D62E662379F294
-:102D30002091B201822F82958F7090E0029774F0FB
-:102D40008091AD019091AE019A8389831B82FD82AF
-:102D5000EC822E83CE0101960E946D1186E0F8016F
-:102D6000ADEAB1E001900D928A95E1F70E94191544
-:102D70006FC0E216F30628F0C701821B930B9C017B
-:102D800004C0209530952E0D3F1D283C310508F0DC
-:102D900052C0D62E662309F49ACFE5132CC07413C3
-:102DA0002AC08091B20180FD1DC0982F92959F701E
-:102DB000C9F0D80115968C9315979F3039F09F5F15
-:102DC0009295907F8F70892B15968C93C8010E94E5
-:102DD0006D1186E0F801ADEAB1E001900D928A959F
-:102DE000E1F736C086E0F801ADEAB1E001900D925E
-:102DF0008A95E1F763C04D875E878D859E850E9429
-:102E0000A614882379F086E0F801ADEAB1E00190DC
-:102E10000D928A95E1F70E9419150E940B15DD2489
-:102E2000D3944CC08091B20181608093B201C801FB
-:102E30000E946D1143C07E2DF98AE88A89890E941B
-:102E4000CB14EDEAF1E086E0DF011D928A95E9F707
-:102E50000E940B1533C0662309F439CF4D875E8776
-:102E60008D859E850E94A614882309F430CFCBCF90
-:102E70004D875E878D859E850E940B1A292F22958E
-:102E80002F7030E0223031052CF49F7041F0811119
-:102E900006C00CC0243031052CF49F7049F4805ECC
-:102EA000883020F0C8010E946D11CF2CDC2C06C0A8
-:102EB000D80115969C91907F91F7F8CF8D2D629651
-:102EC0000FB6F894DEBF0FBECDBFDF91CF911F913B
-:102ED0000F91FF90EF90DF90CF9008951F93CF93C5
-:102EE000DF93CDB7DEB72C970FB6F894DEBF0FBED9
-:102EF000CDBF4F83588769877A878B879C87CE01A0
-:102F000007960E9481158823C1F02F8138858A8514
-:102F10009B85892B31F03F3F11F080E003C02F3FAC
-:102F2000E1F781E0811147C04F81588569857A8535
-:102F30008B859C850E94DA143EC086E0FE013796A0
-:102F4000DE01119601900D928A95E1F7FF81E885E7
-:102F50004A855B854115510531F0EF3F31F481E041
-:102F6000FF3F19F403C081E001C080E080FD23C071
-:102F700020917C0130E0C90101968770992760910A
-:102F80007B0170E086179707F1F1F983EA835D838F
-:102F90004C8396E0929FD001939FB00D1124A358CB
-:102FA000BE4FFE01319601900D929A95E1F7809304
-:102FB0007C010E94EA1416E080917B0190917C01D3
-:102FC000891779F1189FC001112483589E4F0E94E0
-:102FD0008115882331F1E0917B011E9FF0011124BE
-:102FE000E358FE4F408151816281738184819581D4
-:102FF0000E94DA1480917B0190E0019687709927F6
-:1030000080937B01D9CF0E94A21410927C01109270
-:103010007B01EDEAF1E086E0DF011D928A95E9F798
-:10302000CACF2C960FB6F894DEBF0FBECDBFDF918E
-:10303000CF911F910895EF92FF920F931F93CF931B
-:10304000DF939C01009709F471C0F12CEE24E39406
-:10305000E9012196F9018491843740F4843008F025
-:1030600056C0813081F0823021F160C0853709F48B
-:1030700049C0C0F19CE7980F903708F057C08F7790
-:103080000E94101146C089010E5F1F4FFE018491FE
-:1030900090E2980F983050F48770FE2D01C0FF0F1A
-:1030A0008A95EAF78F2F0E94BB1A15C00E9448101C
-:1030B00014C089010E5F1F4FFE01849190E2980FAA
-:1030C000983068F48770FE2D01C0FF0F8A95EAF7EB
-:1030D0008F2F0E94C11A0E94E41AE8011AC00E94B0
-:1030E0001011FBCF2E5F3F4FFE01C491CC2341F066
-:1030F0008FE99FE00197F1F700C00000C150F6CFC3
-:10310000E90107C0FE01F490E901229602C00E9485
-:1031100048108F2D882341F0EFE9FFE03197F1F758
-:1031200000C000008150F6CF9E0192CFDF91CF9179
-:103130001F910F91FF90EF90089508956093B7014C
-:103140007093B8018093B9019093BA010C948E14D6
-:103150000F931F930091B7011091B8012091B9010D
-:103160003091BA01062B172B282B392B0093B7016E
-:103170001093B8012093B9013093BA011F910F91B8
-:103180000C948E140F931F930091B7011091B80106
-:103190002091B9013091BA0106231723282339233E
-:1031A0000093B7011093B8012093B9013093BA018D
-:1031B0001F910F910C948E140F931F930091B701E0
-:1031C0001091B8012091B9013091BA010627172753
-:1031D000282739270093B7011093B8012093B9012C
-:1031E0003093BA011F910F910C948E141092B30179
-:1031F0001092B4011092B5011092B6010C948E1485
-:1032000041E050E060E070E004C0440F551F661FCD
-:10321000771F8A95D2F74093B3015093B40160931E
-:10322000B5017093B6010C948E1441E050E060E05B
-:1032300070E004C0440F551F661F771F8A95D2F7B0
-:103240008091B3019091B401A091B501B091B60104
-:10325000842B952BA62BB72B8093B3019093B401AD
-:10326000A093B501B093B6010C948E1441E050E0E8
-:1032700060E070E004C0440F551F661F771F8A95F9
-:10328000D2F740955095609570958091B3019091DB
-:10329000B401A091B501B091B60184239523A62372
-:1032A000B7238093B3019093B401A093B501B09379
-:1032B000B6010C948E1441E050E060E070E004C070
-:1032C000440F551F661F771F8A95D2F78091B3016F
-:1032D0009091B401A091B501B091B60184279527D2
-:1032E000A627B7278093B3019093B401A093B501AB
-:1032F000B093B6010C948E140F931F930091B301F9
-:103300001091B4012091B5013091B601062B172B15
-:10331000282B392B0093B3011093B4012093B501EE
-:103320003093B6011F910F910C948E140F931F933D
-:103330000091B3011091B4012091B5013091B60113
-:1033400006231723282339230093B3011093B401D4
-:103350002093B5013093B6011F910F910C948E14F8
-:103360000F931F930091B3011091B4012091B50107
-:103370003091B60106271727282739270093B30174
-:103380001093B4012093B5013093B6011F910F91B2
-:103390000C948E140895CF92DF92EF92FF920F93C8
-:1033A0001F93CF93DF93EC01C090B701D090B80189
-:1033B000E090B901F090BA018091B3019091B4010D
-:1033C000A091B501B091B601C82AD92AEA2AFB2AF0
-:1033D0000FE110E0B701A601002E04C076956795B5
-:1033E000579547950A94D2F740FD05C00150110941
-:1033F00088F780E007C0BE01802F0E9489070197EF
-:10340000A9F3802FDF91CF911F910F91FF90EF9043
-:10341000DF90CF900895CF93DF93EC010E94CB19FA
-:10342000BE010E948907DF91CF910895CB010E94D0
-:103430000B1A089590910C019923D9F090910D01E8
-:103440009923B9F0982F9695969596959F3088F583
-:10345000E0910E01F0910F01E90FF11D877021E05D
-:1034600030E001C0220F8A95EAF78181822B8183A7
-:10347000089540910E0150910F0120E030E09FEF40
-:10348000FA01E20FF31F6281681799F09F3F19F468
-:10349000611101C0922F2F5F3F4F2E30310581F710
-:1034A0009F3F39F0FA01E90FF11D97FDFA958283EC
-:1034B0000895089590910C019923E1F090910D01E8
-:1034C0009923C1F0982F9695969596959F3020F563
-:1034D000E0910E01F0910F01E90FF11D877021E0DD
-:1034E00030E001C0220F8A95EAF7209581812823D8
-:1034F0002183089540910E0150910F0120E030E0AA
-:10350000FA01E20FF31F9281981301C012822F5F1C
-:103510003F4F2E303105A1F7089581E090E0E09112
-:103520000E01F0910F01E80FF91F10820196803112
-:103530009105A9F708959091CE01982B9093CE0113
-:10354000089580959091CE0198239093CE0108958F
-:103550001092CE0108959091CD01982B9093CD01BA
-:10356000089580959091CD0198239093CD01089571
-:103570001092CD0108959091CC01982B9093CC019D
-:10358000089580959091CC0198239093CC01089553
-:103590001092CC0108958093BB0108951092BB0155
-:1035A000089540910E0150910F0120E030E080E03D
-:1035B000FA01E20FF31F918191118F5F2F5F3F4F4F
-:1035C0002F303105A9F70895E0910E01F0910F0118
-:1035D0008091CE018083E0910E01F0910F018081F6
-:1035E0009091CD01892B8083E0910E01F0910F0124
-:1035F00080819091CC01892B80839091BB0199238C
-:1036000061F0E0910E01F0910F018081892B8083A0
-:103610000E94D11A81111092BB0180910E019091EC
-:103620000F010C942B0FCF92DF92EF92FF920F932A
-:103630001F936C01EE24FF24C114D104E104F104B2
-:1036400021F46B017C0180E001C080E133272F2D44
-:103650001E2D0D2D011511052105310519F0885F6D
-:103660006801790197018601A4E0369527951795A1
-:103670000795AA95D1F7011511052105310519F016
-:103680008C5F6801790197018601F2E036952795F4
-:1036900017950795FA95D1F7011511052105310503
-:1036A00019F08E5F68017901B701A60176956795DB
-:1036B00057954795452B462B472B09F08F5F1F9158
-:1036C0000F91FF90EF90DF90CF9008958091E601E9
-:1036D000843021F11092D00120E488E190E00FB60F
-:1036E000F894A895809360000FBE2093600080E05E
-:1036F0000E94240883B7817F846083BF83B7816081
-:1037000083BF7894889583B78E7F83BF88E10FB697
-:10371000F89480936000109260000FBE08950895A1
-:103720000895CF930E948F1B0E9458040E94901B03
-:10373000C0E08C2F0E944505811105C0CF5FCE30BF
-:10374000C1F780E001C081E0CF9108950E94A214EA
-:103750000E941F0F0C94240882E084BD93E095BD65
-:103760009AEF97BD80936E0008952FB7F8948091DB
-:10377000D1019091D201A091D301B091D4012FBF7A
-:103780000895CF92DF92EF92FF920F931F932FB77E
-:10379000F8944091D1015091D2016091D301709180
-:1037A000D4012FBF6A017B01EE24FF248C0120E0AD
-:1037B00030E0C016D106E206F30610F4415051097C
-:1037C000481B590BCA011F910F91FF90EF90DF909A
-:1037D000CF9008951F920F920FB60F9211248F93DE
-:1037E0009F93AF93BF938091D1019091D201A0910B
-:1037F000D301B091D4010196A11DB11D8093D101D7
-:103800009093D201A093D301B093D401BF91AF9113
-:103810009F918F910F900FBE0F901F9018950E944F
-:10382000250CF8942FEF87EA91E6215080409040D4
-:10383000E1F700C0000087E090EBDC018093F0012D
-:103840009093F101A093F201B093F3012CE088E191
-:1038500090E00FB6F894A895809360000FBE209377
-:103860006000FFCFEF92FF920F931F93CF93DF93F0
-:10387000E82EF12C8F2D0E944505C0E0D0E0082FE6
-:1038800010E098010C2E02C0359527950A94E2F7B6
-:1038900020FD05C02196C630D10599F709C06C2FCF
-:1038A0007F2D80E00E944D05E812F4CF81E005C035
-:1038B000F3948EE0F812DECF80E0DF91CF911F917C
-:1038C0000F91FF90EF900895CF93C82F8CE20E9444
-:1038D000321C882321F08C2FCF910C94321C80E075
-:1038E000CF910895CF930E94B71D811102C00E940D
-:1038F0009D1DC5E6C15049F00E9458048FE39CE924
-:103900000197F1F700C00000F5CF89E20E94641C26
-:10391000811111C18AE20E94641C81110E949D1DC7
-:1039200085E00E94641C81110E940F1C0E94C21D30
-:103930008093CF0187E00E94641C882399F18BE17A
-:103940000E94641C882351F09091CF0191FB88273D
-:1039500080F921E0822780FB91F922C08EE00E944D
-:10396000641C882351F09091CF0192FB882780F945
-:1039700021E0822780FB92F913C080E10E94641C41
-:103980009091CF01882341F093FB882780F921E0B3
-:10399000822780FB93F904C0892F809580FB90F9E2
-:1039A0009093CF018091CF010E94C61D0E94D41D2B
-:1039B0008093EF0180EE0E94641C882341F0809187
-:1039C000EF01982F909590FB80F98093EF0189E3A8
-:1039D0000E94641C882359F09091EF0191FB882785
-:1039E00080F921E0822780FB91F99093EF0182EE2C
-:1039F0000E94641C882359F09091EF0192FB882764
-:103A000080F921E0822780FB92F99093EF0186EE06
-:103A10000E94641C882359F09091EF0193FB882742
-:103A200080F921E0822780FB93F99093EF0183EEE8
-:103A30000E94641C882359F09091EF0194FB882721
-:103A400080F921E0822780FB94F99093EF0185E3D0
-:103A50000E94641C882359F09091EF0195FB882700
-:103A600080F921E0822780FB95F99093EF0181E3B3
-:103A70000E94641C882359F09091EF0196FB8827DF
-:103A800080F921E0822780FB96F99093EF0181E194
-:103A90000E94641C882359F09091EF0197FB8827BE
-:103AA00080F921E0822780FB97F99093EF018091C4
-:103AB000EF010E94D81D8091EF0187FB882780F9D4
-:103AC00080930D0187E20E94641CC82F8EE10E9442
-:103AD000641C8111C2608FE10E94641C8111C4606A
-:103AE00080E20E94641C8111C86081E20E94641C13
-:103AF0008111C06182E20E94641C8111C06283E274
-:103B00000E94641C8111C06484E20E94641C8823AA
-:103B100011F0C06802C0CC2329F08C2F0E94CF1D69
-:103B20006C2F03C00E94CB1D682F70E080E090E0F6
-:103B3000CF910C949E18CF9108956DEE7EEF80E0AA
-:103B400090E00E94F52360E082E090E00E94E32391
-:103B500060E083E090E00E94E32360E084E090E096
-:103B60000E94E32360E085E090E00C94E32380E092
-:103B700090E00E94DD2321E08D3E9E4F09F020E081
-:103B8000822F089582E090E00C94D523682F82E084
-:103B900090E00C94E32383E090E00C94D523682F0D
-:103BA00083E090E00C94E32384E090E00C94D52330
-:103BB000682F84E090E00C94E3238091D70180FF8C
-:103BC0000BC06091130185E0689FB00111247595C9
-:103BD0006795759567952AC081FF09C060911301AB
-:103BE00085E0689FB0011124759567951FC082FF1D
-:103BF00007C06091130185E0689FB001112416C0D1
-:103C00004091D8014423C9F060911201461788F70A
-:103C10002091130185E0289F90011124429FC0014B
-:103C2000439F900D112470E00E94A7236038710516
-:103C300040F46115710539F002C065E070E0862F2F
-:103C400008958FE7089581E008958091D70180FF5E
-:103C500008C06091110170E075956795759567953D
-:103C600021C081FF06C06091110170E075956795D4
-:103C700019C082FF04C06091110170E010C08091F2
-:103C8000D8018823C1F0609110018617A0F79091A8
-:103C90001101989FC001112470E00E94A723603891
-:103CA000710528F46115710521F0862F08958FE7BD
-:103CB000089581E0089561E070E0F4CF803F21F441
-:103CC0000E94DD1D819504C0813F29F40E94DD1D05
-:103CD0008093DB010895823F21F40E94DD1D8195D0
-:103CE00004C0833F29F40E94DD1D8093DA0108950A
-:103CF000893F19F40E94251E05C08A3F31F40E94B5
-:103D0000251E81958093DC0108958B3F21F40E944C
-:103D1000251E819504C08C3F29F40E94251E8093A6
-:103D2000DD010895843F21F48091D901816017C09D
-:103D3000853F21F48091D901826011C0863F21F432
-:103D40008091D90184600BC0873F21F48091D90113
-:103D5000886005C0883F31F48091D90180618093EB
-:103D6000D90108958D3F21F48091D70181600BC066
-:103D70008E3F21F48091D701826005C08F3F29F4E6
-:103D80008091D70184608093D7010895803F39F4F2
-:103D90008091DB0187FF6CC01092DB0169C0813F1D
-:103DA00029F48091DB011816BCF362C09091DA010E
-:103DB000823F29F497FF5CC01092DA0159C0833F1B
-:103DC00019F41916CCF354C0893F41F48091DC01F9
-:103DD00018160CF04DC01092DC014AC08A3F29F43D
-:103DE0008091DC0187FF44C0F6CF8B3F39F480918E
-:103DF000DD0187FF3DC01092DD013AC08C3F29F400
-:103E00008091DD011816BCF333C0843F21F480910A
-:103E1000D9018E7F17C0853F21F48091D9018D7F14
-:103E200011C0863F21F48091D9018B7F0BC0873F61
-:103E300021F48091D901877F05C0883F31F48091BA
-:103E4000D9018F7E8093D90113C08D3F21F48091D9
-:103E5000D7018E7F0BC08E3F21F48091D7018D7FDB
-:103E600005C08F3F29F48091D7018B7F8093D701C4
-:103E70008091DA0181110EC08091DB0181110AC0AD
-:103E80008091DC01811106C08091DD01811102C0A9
-:103E90001092D801089589ED91E00E94360F0E949A
-:103EA000B51B9093D6018093D50108951F93CF93AE
-:103EB000DF938091D5019091D6010E94C11B409162
-:103EC000D801442321F02091140130E006C0209154
-:103ED00015015AE0259F900111248217930708F4D9
-:103EE00082C08091DA011091DB01D091DC01C09198
-:103EF000DD01811107C0111105C0D11103C0CC2310
-:103F000009F471C04F3F19F04F5F4093D801181664
-:103F100024F40E94DD1D8093DA018091DA0187FF8D
-:103F200005C00E94DD1D81958093DA01111624F4ED
-:103F30000E94DD1D8093DB018091DB0187FF05C0BE
-:103F40000E94DD1D81958093DB016091DA0166237B
-:103F500039F11091DB01112319F1772767FD709575
-:103F6000872F972F0E94B82223E333E343E35FE3D5
-:103F70000E941C230E9485226093DA01612F77271B
-:103F800067FD7095872F972F0E94B82223E333E3B4
-:103F900043E35FE30E941C230E9485226093DB01C0
-:103FA0001D1624F40E94251E8093DC018091DC0103
-:103FB00087FF05C00E94251E81958093DC011C1699
-:103FC00024F40E94251E8093DD018091DD0187FF8E
-:103FD00005C00E94251E81958093DD01DF91CF9160
-:103FE0001F910C944B1FDF91CF911F910895E9ED24
-:103FF000F1E085E0DF011D928A95E9F71092D80182
-:104000001092D7010895833081F128F4813059F05E
-:104010008230D1F00895853009F449C0B8F1863076
-:1040200009F456C0089520911501862F90E0820F63
-:10403000911D8F3F910520F4620F60931501089543
-:104040008FEF80931501089520911401862F90E041
-:10405000820F911D8F3F910520F4620F6093140130
-:1040600008958FEF80931401089520911301862FF6
-:1040700090E0820F911D8F3F910520F4620F6093B5
-:10408000130108958FEF8093130108952091120179
-:10409000862F90E0820F911D8F3F910520F4620FD3
-:1040A0006093120108958FEF80931201089520917B
-:1040B0001101862F90E0820F911D8F3F910520F412
-:1040C000620F6093110108958FEF8093110108959D
-:1040D00020911001862F90E0820F911D8F3F910556
-:1040E00020F4620F6093100108958FEF8093100108
-:1040F0000895833011F128F4813049F0823091F035
-:104100000895853081F120F18630C1F108958091C4
-:104110001501681720F4861B8093150108951092ED
-:104120001501089580911401681720F4861B80936F
-:1041300014010895109214010895809113016817D5
-:1041400020F4861B809313010895109213010895A3
-:1041500080911201681720F4861B80931201089544
-:1041600010921201089580911101681720F4861BA6
-:10417000809311010895109211010895809110010A
-:10418000681720F4861B8093100108951092100187
-:1041900008958D3109F442C020F58E3009F477C0BE
-:1041A00070F4873009F459C018F48630F1F134C046
-:1041B000883009F4A8C08B3009F4A5C02DC0863121
-:1041C00009F4A1C038F4803109F472C0813109F4D6
-:1041D00079C022C0893109F496C08B3109F44DC0F1
-:1041E0001BC0853309F487C048F4873209F483C0C3
-:1041F00008F473C0893209F47EC00EC0833438F4E9
-:104200008A3308F068C0883309F47DC005C0833460
-:1042100009F471C0883499F080E008950E943F222B
-:104220000E941F0F0E9424086EC08091CF01817FE1
-:104230008E7F8093CF0181E08093DF0108950E94FB
-:10424000A2142FEF83ED90E3215080409040E1F7DE
-:1042500000C000000E940F1C56C09091CF01892F12
-:104260008095817080FB90F919F0966098601DC070
-:10427000997F977F9093CF0146C09091CF0191FB9A
-:10428000882780F921E0822780FB91F909C090916D
-:10429000CF0192FB882780F921E0822780FB92F9E9
-:1042A0009093CF01882379F191609093CF01089585
-:1042B0009091CF0193FB882780F921E0822780FB32
-:1042C00093F9EECF0E94A21480910D0191E089270D
-:1042D00080930D0118C027EC01C023EE280F61E088
-:1042E00070E080E090E004C0660F771F881F991F80
-:1042F0002A95D2F704C061E070E080E090E00E946F
-:104300009E180E94A21481E0089580E0089580E044
-:104310000895CF93C82F8091DF01813079F018F094
-:104320008230D1F184C0A0910E01B0910F018C9127
-:10433000813169F0823209F07CC009C0A0910E0180
-:10434000B0910F018C91813111F0823249F48C2FA0
-:104350000E94852181111DC08C2F0E94C9201AC086
-:104360008C2F0E948721811114C0C43179F048F448
-:10437000CB3079F0C03109F060C082E08093DF017A
-:1043800008C0C93219F0C83321F057C01092DF01BC
-:1043900054C081E0817053C0C93289F118F5C4312D
-:1043A00071F1A8F4C73009F046C08AE08093150186
-:1043B00094E19093140193E0909313018093120180
-:1043C00088E08093110188E28093100134C0CE51BF
-:1043D000C63088F5EC2FF0E0E65DFE4F80818093DB
-:1043E000DE0129C0CE34E9F020F4CB3421F56AE0B7
-:1043F00013C0C13579F0C235F1F461E00DC0809190
-:10440000DE01882319F01092DE0115C081E080934F
-:10441000DF0115C061E006C08091DE010E9403202B
-:104420000AC06AE08091DE010E94792004C01092E7
-:10443000DF0180E004C081E002C080E0ABCFCF911B
-:104440000895E1E8F0E08081886080838081816068
-:1044500080838FB7F89493E09093890090ED9093C8
-:1044600088008FBF0895EFE6F0E08081826080834E
-:104470000895EFE6F0E080818D7F80830895EFE678
-:10448000F0E0808192E08927808308951F920F9247
-:104490000FB60F9211242F933F934F935F936F9317
-:1044A0007F938F939F93AF93BF93EF93FF938091ED
-:1044B000E0019091E10101969093E1018093E00188
-:1044C000811103C082E00E942408E091E101E69599
-:1044D000E695F0E0E657FB4FE4918091E0018E1302
-:1044E00003C080E00E942408FF91EF91BF91AF913B
-:1044F0009F918F917F916F915F914F913F912F91FC
-:104500000F900FBE0F901F90189504D06894B111B2
-:104510008DC0089570D088F09F5790F0B92F9927DB
-:10452000B751A0F0D1F0660F771F881F991F1AF0BE
-:10453000BA95C9F712C0B13081F077D0B1E00895D3
-:1045400074C0672F782F8827B85F39F0B93FCCF354
-:10455000869577956795B395D9F73EF490958095B4
-:10456000709561957F4F8F4F9F4F0895E89409C0D4
-:1045700097FB3EF490958095709561957F4F8F4F96
-:104580009F4F9923A9F0F92F96E9BB279395F695AC
-:10459000879577956795B795F111F8CFFAF4BB0F2A
-:1045A00011F460FF1BC06F5F7F4F8F4F9F4F16C08E
-:1045B000882311F096E911C0772321F09EE8872F18
-:1045C000762F05C0662371F096E8862F70E060E0D4
-:1045D0002AF09A95660F771F881FDAF7880F96954D
-:1045E000879597F9089557FD9058440F551F59F036
-:1045F0005F3F71F04795880F97FB991F61F09F3FD0
-:1046000079F087950895121613061406551FF2CFF8
-:104610004695F1DF08C0161617061806991FF1CF48
-:1046200086957105610508940895E894BB2766276F
-:104630007727CB0197F908950BD078C069D028F07F
-:104640006ED018F0952309F05AC05FC01124EECF48
-:10465000CADFA0F3959FD1F3950F50E0551F629FDD
-:10466000F001729FBB27F00DB11D639FAA27F00DCB
-:10467000B11DAA1F649F6627B00DA11D661F829FF2
-:104680002227B00DA11D621F739FB00DA11D621FD7
-:10469000839FA00D611D221F749F3327A00D611DF4
-:1046A000231F849F600D211D822F762F6A2F1124D6
-:1046B0009F5750408AF0E1F088234AF0EE0FFF1F29
-:1046C000BB1F661F771F881F91505040A9F79E3F60
-:1046D000510570F014C0AACF5F3FECF3983EDCF3B5
-:1046E000869577956795B795F795E7959F5FC1F79D
-:1046F000FE2B880F911D9695879597F9089597F948
-:104700009F6780E870E060E008959FEF80EC089577
-:1047100000240A94161617061806090608950024A0
-:104720000A9412161306140605060895092E03941A
-:10473000000C11F4882352F0BB0F40F4BF2B11F48E
-:1047400060FF04C06F5F7F4F8F4F9F4F089597FBAF
-:10475000072E16F4009407D077FD09D00E94C123DC
-:1047600007FC05D03EF4909581959F4F0895709574
-:1047700061957F4F0895EE0FFF1F0590F491E02D96
-:104780000994AA1BBB1B51E107C0AA1FBB1FA61798
-:10479000B70710F0A61BB70B881F991F5A95A9F7EA
-:1047A00080959095BC01CD010895F999FECF92BDF9
-:1047B00081BDF89A992780B50895A8E1B0E042E05C
-:1047C00050E00C94FD23262FF999FECF92BD81BDB8
-:1047D000F89A019700B4021639F01FBA20BD0FB63F
-:1047E000F894FA9AF99A0FBE08950196272F0E941D
-:1047F000E4230C94E323DC01CB01FC01F999FECF07
-:1048000006C0F2BDE1BDF89A319600B40D92415058
-:0A4810005040B8F70895F894FFCF68
-:10481A0020022608B30890085C0829080101BC0197
-:10482A0028080A03140A3F4D36394B04FE03C8030D
-:10483A008F0322033B0354036D030102030405069D
-:04484A000708090052
+:100000000C945C020C94A0020C94A0020C94A0022C
+:100010000C94A0020C94A0020C94A0020C94A002D8
+:100020000C94A0020C94A0020C945C0D0C942E0E67
+:100030000C946C1C0C94A0020C94A0020C94A002D2
+:100040000C94A0020C94A0020C94A0020C94A002A8
+:100050000C94A0020C94D31C0C94A0020C94A0024B
+:100060000C94A0020C94A0020C94A0020C94A00288
+:100070000C94A0020C94A0020C94A0020C94A00278
+:100080000C94A0020C94A0020C94A0020C94A00268
+:100090000C94A0020C94A0020C94A0020C94A00258
+:1000A0000C94A0020C94A0020C94A002930EB50E26
+:1000B000A00FB50EA00FF70E1A0FA00F6F0F820F33
+:1000C0004E124E127D127D12C412E6123E143E14E0
+:1000D000F1123E14981398132F143E143E14381442
+:1000E000A513A513A513A513A513A513A513A51350
+:1000F000A513A513A513A513A513A513A513A51340
+:10010000B713C413CB13D213DC130000F0A100C843
+:1001100001C82E004C002A008450354100001E000A
+:10012000140004001D7134004D001F001A00160059
+:100130001B00E104145020000800070006005000D6
+:100140002C0021001500090019004F004A00220070
+:1001500017000A00050000006574500001540000FB
+:100160002F7F0000E3004F000154000030770000B3
+:10017000E20023001C000B00110000002971240084
+:1001800018000D74100052004B0025000C000E00EA
+:10019000360051002800260012000F0037002F0003
+:1001A0002B41270013003342387130004E002D00E0
+:1001B0003100347885502D4100000100010001001C
+:1001C0000100010000003A0001001E0023000100B0
+:1001D00001003B0001001F002400010001003C0061
+:1001E0000100200025004B0101003D00010021001D
+:1001F00026004E0101003E00010022002700000001
+:1002000001000100010000000100000001000100E8
+:10021000010000000100000001003F000100240275
+:10022000310200000100400001002D021F02010008
+:100230000100410001002D002E00010001004200DC
+:1002400001001300220201000100430001002E0200
+:10025000010001000100440045000100010001000F
+:100260000000010001000100010001000000010088
+:1002700001004B00010001000100010001004A00E3
+:10028000010001000100010001004D00010001001A
+:100290000100010001004E00010001000100010009
+:1002A0000100010001000000010001000100000048
+:1002B0000100000001000100010000000100000039
+:1002C0000100010001000100010000000100010027
+:1002D000010001000100A90001000100010001006E
+:1002E000AC00AA00B600010001000100AB00A800AC
+:1002F00001000100010001000100010001000100F6
+:100300000100AE000100010000001603450072006C
+:1003100067006F0044006F007800200045005A001D
+:10032000000016034500720067006F0044006F0074
+:100330007800200045005A00000004030904090267
+:100340006D00040100A0FA0904000001030101008E
+:10035000092111010001223F000705810308000A5D
+:100360000904010001030102000921110100012219
+:100370004D000705820308000A090402000103007A
+:10038000000009211101000122360007058303083E
+:10039000000A090403000103000000092111010003
+:1003A0000122390007058403100001120110010029
+:1003B000000008EDFE07130100010200010501091C
+:1003C00006A101050719E029E71500250195087523
+:1003D000018102050819012905950575019102950C
+:1003E000017503910105071900297715002501956D
+:1003F0007875018102C005010980A10185021601FD
+:100400000026B7001A01002AB70075109501810077
+:10041000C0050C0901A1018503160100269C021AE2
+:1004200001002A9C02751095018100C00501090296
+:10043000A1010901A10005091901290515002501DE
+:10044000950575018102950175038101050109304A
+:1004500009311581257F95027508810609381581B6
+:10046000257F950175088106050C0A38021581253E
+:100470007F950175088106C0C005010906A1010527
+:100480000719E029E71500250195087501810295F6
+:100490000175088101050819012905950575019166
+:1004A000029501750391010507190029FF15002523
+:1004B000FF950675088100C011241FBECFEFDAE05A
+:1004C000DEBFCDBF04B603FE24C08091F30190913E
+:1004D000F401A091F501B091F6018730904BA7404F
+:1004E000B04BB9F41092F3011092F4011092F5019F
+:1004F0001092F60114BE84B7877F84BF88E10FB6DF
+:10050000F89480936000109260000FBEE0E0FFE37B
+:10051000099511E0A0E0B1E0E4EEF4E402C005903A
+:100520000D92AA32B107D9F711E0AAE2B1E001C0F9
+:100530001D92A33FB107E1F70E94A40A0C94702218
+:100540000C94000080E090E0089508956091B4015B
+:100550007091B5018091B6019091B7010E94DA1BAC
+:1005600056985E9825982D9826982E9827982F981B
+:10057000813029F0823029F4269A2E9A02C0259AD9
+:100580002D9A80915401882309F450C08091520122
+:10059000909153010E94AA1C8D3291400CF446C0E8
+:1005A000109254010E946C0580914C0190914D0174
+:1005B0004A97C1F480914E0190914F01892B91F49B
+:1005C0008091500190915101892B61F482EE0E943B
+:1005D000FA108DE30E94FA108DE30E94B71182EEAB
+:1005E0000E94B71180914C0190914D014297F1F416
+:1005F00080914E0190914F01892BC1F4809150015F
+:1006000090915101892B91F480EE0E94FA1081EEB5
+:100610000E94FA1082E10E94FA1082E10E94B71152
+:1006200081EE0E94B71180EE0C94B71108950C94DE
+:10063000A60256985E9825982D9826982E98279869
+:100640002F988FEF90E0909389008093880090938B
+:100650008B0080938A0090938D0080938C00259A64
+:100660002D9A2FEF80E792E0215080409040E1F7F3
+:1006700000C00000269A2E9A2FEF80E792E02150CA
+:1006800080409040E1F700C00000279A2F9A2FEF9A
+:1006900080E792E0215080409040E1F700C00000E8
+:1006A00025982D982FEF80E792E0215080409040D0
+:1006B000E1F700C0000026982E982FEF80E792E027
+:1006C000215080409040E1F700C0000027982F980B
+:1006D00056985E9825982D9826982E9827982F98AA
+:1006E000089589EA8093800089E0809381002498AE
+:1006F0002C983F988AB18F748AB96E98479A8BB1BB
+:10070000806B8BB9769A0E9419030C94A50280E243
+:100710008093000180912A0181110EC00E94D603AE
+:1007200081E080932A012FEF83ED90E321508040F8
+:100730009040E1F700C0000080E40E94DC03809359
+:10074000000181112EC00E940604809300018111D6
+:1007500028C00E94060480930001811122C08FE30B
+:100760000E9406048093000181111BC00E94FE03B9
+:1007700080E40E94DC0380930001811112C08CE0B0
+:100780000E9406048093000181110BC00E940604A0
+:1007900080930001811105C08FE30E9406048093BD
+:1007A00000010E94FE038091000108951092B9009B
+:1007B0008AE08093B800089594EA9093BC009091E9
+:1007C000BC0097FFFCCF9091B900987F983021F042
+:1007D000903111F081E008958093BB0084E880930C
+:1007E000BC008091BC0087FFFCCF8091B900887F5E
+:1007F000883111F0803471F780E0089584E98093A6
+:10080000BC008091BC0084FDFCCF08958093BB00A8
+:1008100084E88093BC008091BC0087FFFCCF90915E
+:10082000B900987F81E0983209F480E0089584E867
+:100830008093BC008091BC0087FFFCCF8091BB00FF
+:10084000089580910001811115C080E40E94DC03AD
+:100850008093000181110CC082E10E940604809304
+:100860000001811105C08FEF0E94060480930001F2
+:100870000E94FE0384B1807F84B985B1807F85B9F1
+:100880008AB1837F8AB98BB1837F8BB93E984698B2
+:1008900008950E948703809300010E94210480B381
+:1008A0008C7080BB81B3836F81BBEAE3F1E0ACE283
+:1008B000B1E011921D9281E0E834F807D1F70C9471
+:1008C0007103BF92CF92DF92EF92FF920F931F932B
+:1008D000CF93DF9380910001882379F080912B01E1
+:1008E0008F5F80932B01811108C00E948703809342
+:1008F0000001811102C00E9419030CE211E0C0E066
+:10090000D0E0DD24D39482E0C82EEE24E394F12CD1
+:10091000C73000F580910001811162C080E40E941F
+:10092000DC0380930001811112C082E10E94060461
+:100930008093000181110BC0C7010C2E01C0880FEC
+:100940000A94EAF780950E940604809300010E94B1
+:10095000FE0346C0CA30A1F028F4C83059F0C930AF
+:1009600061F005C0CC3089F070F0CD3089F0209A6C
+:10097000289810C0219A29980DC0229A2A980AC056
+:10098000239A2B9807C0529A01C0539A5B9802C0D1
+:100990003E9A4698E0EAEA95F1F78FB179995AC004
+:1009A00092E081708D25892B7C9B02C090E001C074
+:1009B00094E0892B7D9B02C090E001C098E0892BD8
+:1009C0007E9B02C090E001C090E1892B9FB1909581
+:1009D000991F9927991F9295990F907E892B0FC087
+:1009E0008091000181114BC080E40E94DC03809360
+:1009F0000001882389F1B12C0E94FE038B2DF801A0
+:100A00009081981719F08083C09201010E942104FF
+:100A100021960F5F1F4FCE30D10509F079CF80911D
+:100A20000101882371F1815080930101882339F0FD
+:100A30008FE99FE00197F1F700C0000022C0AAE310
+:100A4000B1E0ECE2F1E081918D9391E0EA33F907B6
+:100A5000D1F717C090E0A5CF83E10E9406048093F0
+:100A600000018111C8CF81E40E94DC038093000162
+:100A70008111C1CF0E941704B82EB094BDCF80E081
+:100A8000BECF0E94170381E0DF91CF911F910F919C
+:100A9000FF90EF90DF90CF90BF900895E82FF0E0A7
+:100AA000E65CFE4F8081089508951F93CF93DF93F6
+:100AB000CAE3D1E010E0899190E00E94CE1B180FAC
+:100AC00081E0C834D807B9F7812FDF91CF911F910A
+:100AD000089581E00895089508950F931F93CF938B
+:100AE000DF93EC0108811981C8010E94D719B80170
+:100AF0000E94FC058C018A818823C9F180915401F0
+:100B000081111EC0043180E5180789F50E946B052C
+:100B100081E0809354010E949E1C90935301809326
+:100B2000520110924B0110924D0110924C01109203
+:100B30004F0110924E01109251011092500155C078
+:100B400080915201909153010E94AA1C883C91050A
+:100B500070F480914B01E82FF0E0EE0FFF1FE45B93
+:100B6000FE4F118300838F5F80934B013EC004389A
+:100B700080E5180721F005381045A1F02AC08A81C8
+:100B8000882321F01092480182E012C08091480130
+:100B9000811106C086E20E94FA1086E20E94B71117
+:100BA00082E014C08A81882331F01092490180E2EA
+:100BB0000E9406121AC080914901811106C087E285
+:100BC0000E94FA1087E20E94B71180E20E940D1283
+:100BD0000CC081E08093480180934901CE01DF91F0
+:100BE000CF911F910F910C94690580E0DF91CF9117
+:100BF0001F910F910895089596E0799FF0011124B7
+:100C000094E5899FE00DF11D1124E60FF11DEE0F13
+:100C1000FF1FEE5EFE4F859194910895880F991FF6
+:100C200086579040FC01859194910895880F991FF3
+:100C3000865F9E4FFC018591949108950F931F93B9
+:100C4000CF93DF93EC01811520E3920740F58115E6
+:100C500030E2930708F0C4C08B3B910588F4883AD2
+:100C6000910508F06BC0853A910508F05CC08430AE
+:100C7000910508F056C08130910509F4C8C1C4C17E
+:100C80008F3F910511F008F04CC0803F910508F0AE
+:100C9000A4C0805E9109089708F443C0B5C1C13073
+:100CA00080E5D80709F4A4C020F5C0312FE4D207AD
+:100CB00070F4C11530E4D30708F096C0C11581E384
+:100CC000D80708F0A1C18E011127106CE1C1C11530
+:100CD000D04509F099C10E94AA143FEF84E39CE03B
+:100CE000315080409040E1F700C000000E94F81CA5
+:100CF000CFC1C11527E5D20758F4C03131E5D3077C
+:100D000008F01EC1C43180E5D80708F477C07CC163
+:100D1000CE0190578115904108F076C18E011F7069
+:100D200071C18E01B5C1853A910509F473C1863A46
+:100D3000910509F472C103E810E4AAC1883A91054B
+:100D400009F46EC1893A910509F46DC18A3A910599
+:100D500009F46CC18B3A910509F46BC18C3A910589
+:100D600009F46AC18D3A910509F469C1803B910586
+:100D700009F468C18E3A910509F467C18F3A91056B
+:100D800009F466C1813B910509F465C1823B910577
+:100D900009F464C1833B910509F463C1843B910567
+:100DA00009F462C1853B910509F461C1863B910557
+:100DB00009F460C1873B910509F45FC1883B910547
+:100DC00009F45EC1893B910509F45DC18A3B910537
+:100DD00009F05CC10AE216E45BC18C01106558C1E0
+:100DE0009F700E94160655C18E011F70106A50C177
+:100DF0008091D60181608093D6014AC10E949E1ED7
+:100E0000811102C00E94841E0E94BB1E90E090933C
+:100E1000F3018093F201C23020E5D20721F48091E2
+:100E2000F201816086C0C43030E5D30721F480919F
+:100E3000F20182607EC0C63080E5D80721F480913F
+:100E4000F201846076C0C83090E5D90719F480912A
+:100E5000F20127C0CA3020E5D20721F48091F201C7
+:100E6000806167C0CC3030E5D30721F48091F20176
+:100E700080625FC0CE3080E5D80721F48091F20116
+:100E8000806457C0C03190E5D90721F48091F20108
+:100E900080684FC0C23120E5D20729F48091F20169
+:100EA0008460886046C0C33030E5D30721F4809168
+:100EB000F2018E7F3EC0C53080E5D80721F48091D5
+:100EC000F2018D7F36C0C73090E5D90721F48091BB
+:100ED000F2018B7F2EC0C93020E5D20719F4809132
+:100EE000F20126C0CB3030E5D30721F48091F20126
+:100EF0008F7E1FC0CD3080E5D80721F48091F201AC
+:100F00008F7D17C0CF3090E5D90721F48091F20191
+:100F10008F7B0FC0C13120E5D20721F48091F2010F
+:100F20008F7707C0C331D04531F48091F2018B7FB8
+:100F3000877F8093F2018091F2010E94BF1EA8C0BA
+:100F40008D2F99278F70992781309105E9F48E01B3
+:100F5000037011279C0102C0220F331F0A95E2F78C
+:100F600089011C68CE01E4E0880F991FEA95E1F73A
+:100F700088279370082B192BF3E0CC0FDD1FFA950F
+:100F8000E1F7C076DD272CC08230910529F41C2FB3
+:100F90000027016F106A7CC08330910561F4CE0197
+:100FA0008370992701E010E002C0000F111F8A959D
+:100FB000E2F71C680EC084309105A9F4CE0183705D
+:100FC000992701E010E002C0000F111F8A95E2F797
+:100FD0001A6863E0CC0FDD1F6A95E1F7C07ED77019
+:100FE0000C2B1D2B55C08530910529F41C2F002793
+:100FF000046F106A4DC0069709F04AC0CF71DD2713
+:101000001C2F0027106244C000E010E041C001E046
+:1010100010E03EC001E810E43BC002E810E438C034
+:1010200002EE14E435C009EE14E432C00AEE14E412
+:101030002FC005EB14E42CC006EB14E429C007EB29
+:1010400014E426C00CEC14E423C00DEC14E420C01E
+:1010500003E815E41DC00AE815E41AC002E915E426
+:1010600017C004E915E414C001E216E411C003E25C
+:1010700016E40EC004E216E40BC005E216E408C054
+:1010800006E216E405C007E216E402C000E014E43C
+:10109000C801DF91CF911F910F91089596E0799F3C
+:1010A000F001112494E5899FE00DF11D1124E60F54
+:1010B000F11DEE0FFF1FEE5EFE4F85919491803E75
+:1010C0009105E0F4803C910558F58133910509F4D0
+:1010D0006FC048F48932910509F463C08A329105E2
+:1010E00009F46DC072C089339105E9F08238910529
+:1010F000D1F08533910509F44DC067C0833E910559
+:1011000081F138F4803E9105B9F0823E9105D9F025
+:101110005CC0863E910561F1873E9105A1F155C005
+:101120000E940E0608952091F20120FD02C021FFC9
+:101130004CC080EE90E049C08091F20180FFF9CF71
+:1011400089E390E042C08091F20182FF0EC080915D
+:10115000F20184FF03C080E090E037C083EE90E0AE
+:1011600034C08091F20182FFF2CF82EE90E02DC078
+:101170008091F20183FF0BC08091F20184FDEBCFDF
+:1011800087EE90E022C08091F20183FFF5CF86EEDA
+:1011900090E01BC08091F20185FF07C089E290E0DA
+:1011A00014C08091F20185FFF9CF85E390E00DC076
+:1011B0008091F20186FF07C08AE290E006C080912C
+:1011C000F20186FFF9CF81E390E00E941E060895A8
+:1011D00008950C94E808809165010895CF93DF93FA
+:1011E00000D01F92CDB7DEB72091E901243019F568
+:1011F00023E029839B838A832093E9008FEF9091DA
+:10120000E800815095FD06C095ED9A95F1F7000034
+:101210008111F5CF8091E80085FF0DC040E050E0DE
+:1012200063E070E0CE0101960E944F0B8091E800D0
+:101230008E778093E8000F900F900F90DF91CF9101
+:101240000895CF93DF9300D01F92CDB7DEB72091E2
+:10125000E901243021F522E029839B838A8383E0FE
+:101260008093E9008FEF9091E800815095FD06C0D2
+:1012700095ED9A95F1F700008111F5CF8091E80086
+:1012800085FF0DC040E050E063E070E0CE010196C4
+:101290000E944F0B8091E8008E778093E8000F90BA
+:1012A0000F900F90DF91CF9108952091E9012430A4
+:1012B000F1F422E02093E9002FEF3091E800215073
+:1012C00035FD06C035ED3A95F1F700002111F5CF57
+:1012D0002091E80025FF0BC040E050E065E070E0A1
+:1012E0000E944F0B8091E8008E778093E80008956C
+:1012F000CF93DF93EC018091E901843009F046C07F
+:1013000090910C019923D9F090910D019923B9F096
+:101310008093E9008FEF9091E800815095FD06C021
+:1013200095E19A95F1F700008111F5CF8091E800E1
+:1013300085FF2CC040E050E060E170E017C081E024
+:101340008093E9008FEF9091E800815095FD06C0F1
+:1013500095ED9A95F1F700008111F5CF8091E800A5
+:1013600085FF14C040E050E068E070E0CE010E94CC
+:101370004F0B8091E8008E778093E80080E1FE01BA
+:10138000A5E5B1E001900D928A95E1F7DF91CF914B
+:1013900008958091E801811109C00E94E10C0E942A
+:1013A0003E0D8091E20084608093E20008951092E7
+:1013B000E8010895089508950C94661C42E061ECDC
+:1013C00081E00E945B0C42E061EC82E00E945B0CD9
+:1013D00042E061EC83E00E945B0C42E161EC84E05E
+:1013E0000C945B0C8091EB01833009F455C030F410
+:1013F000813071F0823009F48EC008958A3009F48A
+:101400007AC08B3009F460C0893009F09CC020C0DC
+:101410008091EA01813A09F096C08091E800877FC7
+:101420008093E8008091EE019091EF01892B21F0EB
+:1014300060E080E090E003C060E185E591E070E06D
+:101440000E94980B8091E8008B778093E8000895C4
+:101450008091EA01813209F076C08091EE0190918D
+:10146000EF01009719F0039709F06DC08091E80033
+:10147000877F8093E8008091E80082FD05C080911D
+:10148000E9018111F8CF5FC08091F100809365017F
+:101490008091E8008B7753C08091EA01813A09F08E
+:1014A00052C08091EE019091EF01892B09F04BC061
+:1014B0008091E800877F8093E8008091E80080FFBA
+:1014C000FCCF80910C0136C08091EA018132D9F5C0
+:1014D0008091EE019091EF01892BA9F58091E800B0
+:1014E000877F8093E8000E94900C8091EC018093AC
+:1014F0000C010C94AA148091EA01813221F58091AB
+:10150000E800877F8093E8000E94900C8091ED01B5
+:101510008093660108958091EA01813AA1F4809157
+:10152000E800877F8093E8008091E80080FFFCCF8F
+:10153000809166018093F1008091E8008E7780931E
+:10154000E8000C94900C089584B7877F84BF88E1ED
+:101550000FB6F89480936000109260000FBE90E088
+:1015600080E80FB6F89480936100909361000FBEFD
+:101570000E942A100E94E10C0E943E0D8091E20020
+:1015800084608093E20078940E94B90F0E942C102E
+:1015900082E091E00E94D60F8091E901853069F4E4
+:1015A0000E942D1C8091E7018823B1F30E94581CF2
+:1015B000882391F30E94390BEFCF0E943210ECCFB9
+:1015C000292F332723303105A9F06CF42130310560
+:1015D00009F442C02230310509F043C08DE690E0A5
+:1015E0002EE333E042C021323105C9F02232310509
+:1015F00019F137C099278130910541F0823091056A
+:1016000041F0892B71F5EAE3F3E005C0E2E2F3E093
+:1016100002C0EAE0F3E0849190E09F0126C06430CC
+:1016200000F5E62FF0E0EE0FFF1FEE5DFE4F20818C
+:10163000318189E090E019C0643098F4E62FF0E041
+:10164000DF01AA0FBB1FA65EBE4F2D913C91EA5E43
+:10165000FE4F808190E009C082E190E02BEA33E008
+:1016600004C080E090E020E030E0FA013183208384
+:10167000089580E189BD82E189BD09B400FEFDCFF6
+:101680008091D8008F7D8093D8008091E0008260A7
+:101690008093E0008091E00081FDFCCF0895CF921F
+:1016A000DF92EF92FF920F931F93CF93DF937C0112
+:1016B0008B01EA010E94B10C811131C0209731F0F9
+:1016C00088819981081B190BE80EF91EC12CD12CB9
+:1016D0000115110519F18091E80085FD14C0809174
+:1016E000E8008E778093E800209741F08881998107
+:1016F0008C0D9D1D9983888385E011C00E94B10CDB
+:10170000882331F30CC0F70181917F018093F100B0
+:1017100001501109FFEFCF1ADF0ADACF80E0DF9125
+:10172000CF911F910F91FF90EF90DF90CF90089590
+:101730002091F0013091F1012617370748F061152B
+:10174000710539F42091E8002E772093E80001C05C
+:10175000B901FC0120E061157105B9F18091E90141
+:10176000882309F440C0853009F43FC08091E80027
+:1017700083FD3DC08091E80082FF06C08091E800B3
+:1017800082FF26C080E008958091E80080FFE3CFCB
+:101790002091F3008091F20090E0922B6115710589
+:1017A00051F08830910538F421912093F100615077
+:1017B00071090196F3CF21E0089709F020E08091AC
+:1017C000E8008E778093E800C6CF2111C7CFD6CF2F
+:1017D0008091E901882339F0853039F08091E80063
+:1017E00083FFCCCF04C082E0089583E0089581E0B8
+:1017F00008952091F0013091F1012617370748F044
+:101800006115710539F42091E8002E772093E800E6
+:1018100001C0B901FC0120E061157105C1F18091A1
+:10182000E901882309F441C0853009F440C0809162
+:10183000E80083FD3EC08091E80082FF06C08091F1
+:10184000E80082FF27C080E008958091E80080FFD3
+:10185000E3CF2091F3008091F20090E0922B61158C
+:10186000710559F08830910540F424912093F100DE
+:101870003196615071090196F2CF21E0089709F085
+:1018800020E08091E8008E778093E800C5CF211199
+:10189000C6CFD5CF8091E901882339F0853039F062
+:1018A0008091E80083FFCBCF04C082E0089583E0FD
+:1018B000089581E00895982F973058F59093E900A6
+:1018C000981739F07091EC002091ED005091F000E4
+:1018D00003C0242F762F50E021FF19C03091EB0078
+:1018E0003E7F3093EB003091ED003D7F3093ED0073
+:1018F0003091EB0031603093EB007093EC0020935B
+:10190000ED005093F0002091EE0027FF07C09F5F8D
+:10191000D3CF8F708093E90081E0089580E008952F
+:101920008091EA0187FD05C08091E80080FF0EC02C
+:1019300012C08091E80082FD05C08091E90181110B
+:10194000F8CF08958091E8008B7708C08091E90175
+:101950008111EACF08958091E8008E778093E800A6
+:1019600008958091E4009091E50045E62091EC0017
+:1019700020FF21C02091E80020FD21C02091E90135
+:10198000222389F0253089F02091EB0025FD0FC03E
+:101990002091E4003091E5002817390739F34150D0
+:1019A00041F0C901E3CF82E0089583E0089581E02A
+:1019B000089584E008952091E80022FFDFCF80E0C1
+:1019C00008950E944F0D0E94570DE0EEF0E08081D7
+:1019D00081608083E8EDF0E080818F77808319BC9F
+:1019E000A7EDB0E08C918E7F8C9380818F7E808379
+:1019F0001092E80108950F931F93CF93DF930E94F5
+:101A00004F0D0E94570DC8EDD0E088818F778883F5
+:101A100088818068888388818F7D888319BC109233
+:101A2000E9011092E5011092E7011092E60100EE43
+:101A300010E0F80180818B7F8083888181608883BA
+:101A400042E060E080E00E945B0CE1EEF0E080812B
+:101A50008E7F8083E2EEF0E08081816080838081F0
+:101A600088608083F80180818E7F80838881806197
+:101A70008883DF91CF911F910F910895E8EDF0E0F9
+:101A800080818F7E8083E7EDF0E0808181608083BC
+:101A900084E082BF81E08093E8010C94FB0CE8EDC8
+:101AA000F0E080818E7F80831092E2000895109292
+:101AB000DA001092E10008951F920F920FB60F9274
+:101AC00011242F933F934F935F936F937F938F9343
+:101AD0009F93AF93BF93EF93FF938091E10082FFB9
+:101AE0000BC08091E20082FF07C08091E1008B7FF4
+:101AF0008093E1000E94B80F8091DA0080FF1FC040
+:101B00008091D80080FF1BC08091DA008E7F809387
+:101B1000DA008091D90080FF0DC080E189BD82E1AB
+:101B200089BD09B400FEFDCF81E08093E9010E94E8
+:101B3000C90905C019BC1092E9010E94D70980911A
+:101B4000E10080FF19C08091E20080FF15C0809104
+:101B5000E2008E7F8093E2008091E20080618093BA
+:101B6000E2008091D80080628093D80019BC85E0A3
+:101B70008093E9010E94DB098091E10084FF30C07D
+:101B80008091E20084FF2CC080E189BD82E189BDA3
+:101B900009B400FEFDCF8091D8008F7D8093D800DE
+:101BA0008091E1008F7E8093E1008091E2008F7E42
+:101BB0008093E2008091E20081608093E200809156
+:101BC000E501882311F084E007C08091E30087FFDE
+:101BD00002C083E001C081E08093E9010E94DC093A
+:101BE0008091E10083FF29C08091E20083FF25C03E
+:101BF0008091E100877F8093E10082E08093E9019A
+:101C00001092E5018091E1008E7F8093E100809148
+:101C1000E2008E7F8093E2008091E20080618093F9
+:101C2000E20042E060E080E00E945B0C8091F00006
+:101C300088608093F0000E94DA09FF91EF91BF91D4
+:101C4000AF919F918F917F916F915F914F913F9154
+:101C50002F910F900FBE0F901F9018951F920F920B
+:101C60000FB60F9211242F933F934F935F936F936F
+:101C70007F938F939F93AF93BF93CF93EF93FF93F4
+:101C8000C091E900CF708091EC001092E900809142
+:101C9000F000877F8093F00078940E946A0E109283
+:101CA000E9008091F00088608093F000C093E90023
+:101CB000FF91EF91CF91BF91AF919F918F917F91C4
+:101CC0006F915F914F913F912F910F900FBE0F90A9
+:101CD0001F9018951F93CF93DF93CDB7DEB7AA97C8
+:101CE0000FB6F894DEBF0FBECDBFEAEEF1E08091F3
+:101CF000F100819321E0E23FF207C9F70E94F20967
+:101D00008091E80083FF1CC12091EA013091EB0132
+:101D1000832F90E08A30910508F012C1FC01EA5A45
+:101D2000FF4F0C942022203881F0223809F008C19E
+:101D30008091EE018F708093E9008091EB0085FB2C
+:101D4000882780F91092E90006C08091E601909101
+:101D5000E701911182609091E800977F9093E800ED
+:101D60008093F1001092F100C5C0822F8D7F09F0A1
+:101D7000E7C0222319F0223061F0E2C08091EC012B
+:101D8000813009F0DDC0333009F080E08093E70155
+:101D900028C08091EC01811124C02091EE012F70A8
+:101DA00009F4CEC02093E9008091EB0080FF19C0B8
+:101DB0008091EB00333011F4806211C08061809318
+:101DC000EB0081E090E0022E01C0880F0A94EAF750
+:101DD0008093EA001092EA008091EB008860809383
+:101DE000EB001092E9008091E800877F86C0211106
+:101DF000A7C01091EC011F778091E3008078812BC0
+:101E00008093E3008091E800877F8093E8000E9440
+:101E1000900C8091E80080FFFCCF8091E300806807
+:101E20008093E300112311F083E001C082E08093EE
+:101E3000E90186C02058223008F082C08091EC0170
+:101E40009091ED018C3D23E0920779F583E08A8340
+:101E50008AE289834FB7F894DE01139620E03EE0D2
+:101E600051E2E32FF0E050935700E49120FF03C0CC
+:101E7000E295EF703F5FEF708E2F90E0EA3010F048
+:101E8000C79601C0C0968D939D932F5F243149F76B
+:101E90004FBF8091E800877F8093E8006AE270E09E
+:101EA000CE0101960E94980B14C0AE014F5F5F4FA8
+:101EB0006091EE010E94E00A009709F441C0209170
+:101EC000E800277F2093E800BC0189819A810E9465
+:101ED000F90B8091E8008B778093E80031C02038BF
+:101EE00079F58091E800877F8093E8008091E50193
+:101EF0008093F1008091E8008E778093E8000E9443
+:101F0000900C1EC021111CC09091EC019230C0F4C5
+:101F10008091E800877F8093E8009093E5010E941C
+:101F2000900C8091E501811104C08091E30087FF4E
+:101F300002C084E001C081E08093E9010E94DE09D3
+:101F40008091E80083FF0AC08091E800877F80933A
+:101F5000E8008091EB0080628093EB00AA960FB6B8
+:101F6000F894DEBF0FBECDBFDF91CF911F910895D2
+:101F70000895CF938091E9018823B1F08091E90021
+:101F80008F709091EC0090FF02C090E801C090E04B
+:101F9000C92FC82B1092E9008091E80083FD0E94B0
+:101FA0006A0ECF70C093E900CF91089590936C01B1
+:101FB00080936B010895E0916B01F0916C01309773
+:101FC00021F00190F081E02D099480E00895E091E6
+:101FD0006B01F0916C01309721F00280F381E02DCC
+:101FE00009940895E0916B01F0916C01309721F014
+:101FF0000480F581E02D09940895209169013091C4
+:102000006A018217930771F090936A0180936901C6
+:10201000E0916B01F0916C01309721F00680F7811F
+:10202000E02D09940895209167013091680182178D
+:10203000930771F09093680180936701E0916B01C1
+:10204000F0916C01309721F00084F185E02D099426
+:10205000089508950C9429100E94951C0E9449042B
+:102060000C94591D9F92AF92BF92CF92DF92EF9244
+:10207000FF920F931F93CF93DF9300D000D000D037
+:10208000CDB7DEB70E9461048CE7E82E81E0F82E20
+:102090000DE010E0CC24C394D12C902E802F0E9410
+:1020A0004E05F701B2907F01B826A1F40150110945
+:1020B000A0F78FEF89838A831B820E949E1C816018
+:1020C000782F9D838C8349815A816B818D810E94F9
+:1020D000CC1031C09091D60191FF04C08E830E9434
+:1020E00054058E8125E030E0A601022E01C0440F88
+:1020F0000A94EAF7A42E4B21D1F029839A828A21EF
+:1021000091E009F490E09B830E949E1C8160782FEF
+:102110009D838C8349815A816B818D810E94CC1073
+:10212000F801E259FE4F80818A25808304C0215046
+:102130003109D0F6BBCF0E943D2010916D010E9465
+:10214000DB0F1817B9F00E94DB0F80936D01269604
+:102150000FB6F894DEBF0FBECDBFDF91CF911F91B8
+:102160000F91FF90EF90DF90CF90BF90AF909F9036
+:102170000C94E90826960FB6F894DEBF0FBECDBFCB
+:10218000DF91CF911F910F91FF90EF90DF90CF9053
+:10219000BF90AF909F900895CF93DF93CDB7DEB7F8
+:1021A0002B970FB6F894DEBF0FBECDBF4F83588775
+:1021B00069877A878B87DE01119686E0FD0111928F
+:1021C0008A95E9F785E0FE01379601900D928A9590
+:1021D000E1F749815A816B817C818D819E810E94CA
+:1021E0007A172B960FB6F894DEBF0FBECDBFDF91E6
+:1021F000CF910895882309F4B9C0823859F40E9418
+:10220000DB0F81FDB3C089E30E94C11A0E94981BB5
+:1022100089E30CC0833871F40E94DB0F80FDA6C0F7
+:1022200083E50E94C11A0E94981B83E50E94011B4E
+:102230000C94981B843859F40E94DB0F82FD96C0E1
+:1022400087E40E94C11A0E94981B87E4EFCF9CEF9D
+:10225000980F913A18F40E94C11AEACF90E2980FB1
+:10226000983050F4877091E001C0990F8A95EAF791
+:10227000892F0E94451BDCCF9BE5980F933070F4AB
+:10228000853A29F0863A31F482E890E005C081E889
+:1022900090E002C083E890E00C94FD0F98E5980F61
+:1022A000933108F063C0883A39F1893A41F18A3AAA
+:1022B00049F18B3A51F18C3A59F18D3A61F1803BF9
+:1022C00069F18E3A71F18F3A79F1813B81F1823B6C
+:1022D00089F1833B91F1843B99F1853BA1F1863BE8
+:1022E000A9F1873BB1F1883BB9F1893BC1F18A3B48
+:1022F000C9F58AE292E038C082EE90E035C089EEFE
+:1023000090E032C08AEE90E02FC085EB90E02CC0C8
+:1023100086EB90E029C087EB90E026C08CEC90E043
+:1023200023C08DEC90E020C083E891E01DC08AE8D6
+:1023300091E01AC082E991E017C084E991E014C0ED
+:1023400081E292E011C083E292E00EC084E292E06A
+:102350000BC085E292E008C086E292E005C087E209
+:1023600092E002C080E090E00C941310089588235E
+:1023700009F44BC0823859F40E94DB0F81FF45C03D
+:1023800089E30E94C11A0E94981B89E30CC083381C
+:1023900071F40E94DB0F80FF38C083E50E94C11AF0
+:1023A0000E94981B83E50E94011B0C94981B8438A3
+:1023B00059F40E94DB0F82FF28C087E40E94C11AF3
+:1023C0000E94981B87E4EFCF9CEF980F913A58F347
+:1023D00090E2980F983050F4877091E001C0990F07
+:1023E0008A95EAF7892F0E944B1BDFCF9BE5980F58
+:1023F000933020F480E090E00C94FD0F885A8331F4
+:1024000020F480E090E00C9413100895882321F0CC
+:102410000E94451B0C94981B0895882321F00E946C
+:102420004B1B0C94981B08958F929F92AF92BF9272
+:10243000CF92DF92EF92FF920F931F93CF93DF9390
+:102440004C01A62EC72FFC01E280D581D295DF700A
+:102450000E945C1A882319F082E00E949F1AE11002
+:102460000E94621B0E94BA1A882379F0EE2069F05C
+:1024700080E28A0D883048F082E00E949F1A0E9414
+:10248000BA1ABB24B394B82601C0B12CEC2FE29544
+:10249000EF70F0E0E05AFF4F0C9420228C2F807FE9
+:1024A0001C2F1F70882311F01295107FEE2089F0E9
+:1024B000112309F4C9C180E28A0D883020F4812FEC
+:1024C0000E94451B03C0812F0E94551B0E94981B30
+:1024D000BBC18A2D0E94B711112309F4CFC180E23C
+:1024E0008A0D883020F4812F0E944B1B03C0812F5E
+:1024F0000E945B1B0E94981BC1C18C2F807F1C2FE8
+:102500001F70803211F01295107FAA2021F0F1E0A7
+:10251000AF1639F12FC0EE2091F0DD2309F41DC173
+:10252000D13021F4812F0E94751BA8C1D23009F04F
+:1025300014C10E947E1B812F0E94291A0EC1DD2327
+:1025400069F0D13041F40E94421B812309F496C105
+:102550000E942C1A03C0D23009F490C10E947E1B45
+:1025600002C1EE2021F0D23008F088C1F6C0D111AE
+:1025700085C1F9C0EE2021F0DD2309F4EEC064C16D
+:10258000DD2309F4F0C067C12C2F26952695237012
+:1025900030E02115310521F02130310561F06EC1A7
+:1025A000EE2021F08A2D9C2F937002C080E090E0F5
+:1025B0000E94FD0F63C1EE2021F08A2D9C2F9370A5
+:1025C00002C080E090E00E94131058C18A2DEE20D6
+:1025D00019F00E94451F02C00E94AD1F0E943220C8
+:1025E0004DC18C2F837009F04EC0E11047C12A2DD8
+:1025F000229526952770220F220F8A2D8F70C82EC4
+:10260000D12CE12CF12C022E04C0CC0CDD1CEE1CD4
+:10261000FF1C0A94D2F7A4FE10C06FE070E080E0C7
+:1026200090E004C0660F771F881F991F2A95D2F784
+:10263000609570958095909503C060E070E0CB0147
+:102640002C2F26952695237030E02230310569F035
+:102650002330310589F06C297D298E299F2921306D
+:10266000310571F00E94CE1809C16C297D298E298F
+:102670009F290E94E81802C10E94CE18C701B60126
+:102680000E94B418FBC0EE2019F08C2F817001C09D
+:102690008695882309F4F2C02A2D22952695277065
+:1026A000220F220F8A2D8F70C82ED12CE12CF12CF5
+:1026B000022E04C0CC0CDD1CEE1CFF1C0A94D2F7C9
+:1026C000A4FE10C06FE070E080E090E004C0660FF0
+:1026D000771F881F991F2A95D2F76095709580956E
+:1026E000909503C060E070E0CB012C2F26952695D5
+:1026F000237030E02230310569F02330310589F054
+:102700006C297D298E299F292130310571F00E9485
+:10271000A219B4C06C297D298E299F290E94BC1959
+:10272000ADC00E94A219C701B6010E948819A6C0B7
+:102730000A2D10E0F801E05EF109E531F10508F03D
+:102740007EC0E059FF4F0C9420221A2D1F708C2F51
+:102750008F71EE2031F00E942119812F0E94061204
+:102760008DC00E944219812F0E940D1287C0EE2059
+:1027700039F0D11183C08C2F8F710E9467197EC0F0
+:10278000D23008F07BC0F7CFEE2039F08C2F8F715C
+:102790000E94211973C0EE20C9F38C2F8F710E9403
+:1027A00042196CC0EE2029F08C2F8F710E940C19F9
+:1027B00065C00E94021962C0EE20B9F00E94261A7C
+:1027C0000E944B1B0E94581A843029F40E94981AC8
+:1027D0008C2F8F7164C0D23008F06FC0CF718C2FF6
+:1027E0000E94211963E08C2F0DC00E94261A0E94BE
+:1027F000451BD230A8F00E94981A0E942C1A64E05F
+:102800008C2F8F71DF91CF911F910F91FF90EF90DF
+:10281000DF90CF90BF90AF909F908F900C94881ACC
+:1028200081E0DF91CF911F910F91FF90EF90DF90AA
+:10283000CF90BF90AF909F908F900C949F1AEE20F6
+:1028400039F0DD2309F4A2CF8A2D0E94FA1016C0B8
+:10285000DD2309F4A2CF8A2D0E94B7110FC04C2F9F
+:102860004F706A2DC4010E94A2020E94271806C060
+:102870004C2F4F706A2DC4010E94FB05BB20E9F06C
+:102880000E94581A80FD19C0F40112820E94521A47
+:102890000E942119C4010E946A140E94521ADF91F9
+:1028A000CF911F910F91FF90EF90DF90CF90BF904D
+:1028B000AF909F908F900C944219DF91CF911F9110
+:1028C0000F91FF90EF90DF90CF90BF90AF909F90CF
+:1028D0008F9008950F931F93CF93DF93EC0128817E
+:1028E00039818B819C81892B31F03F3F11F080E051
+:1028F00003C02F3FE1F781E0811113C0CE010E9498
+:102900006D05882371F0688179818A810E94221A7D
+:102910008C010E94D6190E94A918B801CE010E940C
+:102920001412DF91CF911F910F9108950E94621BA5
+:102930000E94721B0E94341B0E94981B0E94DE2082
+:102940000E94322080E090E00E94FD0F80E090E045
+:102950000C9413100E94521B0C9496140E94171A88
+:10296000292F22952F7030E02C3031054CF42A307D
+:1029700031056CF42250310922303105B0F407C022
+:102980002C30310571F02F30310559F00EC0803FE9
+:1029900031F018F4803E48F402C0843F31F481E005
+:1029A000089593FB882780F9089580E00895CF93D8
+:1029B000DF9300D000D01F92CDB7DEB70F900F90FD
+:1029C0000F900F900F90DF91CF910895CF93DF93E9
+:1029D00000D000D000D0CDB7DEB726960FB6F89461
+:1029E000DEBF0FBECDBFDF91CF9108951F93CF9370
+:1029F000DF93C0917C0116E080917D01C81799F0AA
+:102A0000D0E01C9FF0011D9FF00D1124E258FE4FF5
+:102A10004081518162817381848195810E94E61495
+:102A20002196C770E9CFDF91CF911F910895409112
+:102A3000AE015091AF016091B0017091B1018091F0
+:102A4000B2019091B3010C94E614CF938091B3013D
+:102A500082958F7009F05FC08091B001882309F4DE
+:102A60005AC020917C01A0917D016091AE017091CE
+:102A7000AF018091B1019091B20131E06F3F09F057
+:102A800030E0B32FC6E02A1709F445C0009721F0C3
+:102A90007F3F21F44B2F03C041E001C040E030E014
+:102AA00040FD35C0C29FF001C39FF00D1124E258D4
+:102AB000FE4F418174132BC04081641328C04281B2
+:102AC000411125C0438154814817590710F44150E2
+:102AD0005109481B590B483C5105C8F48091B3017A
+:102AE0008F7080618093B30186E0829FF001839FA5
+:102AF000F00D1124ED57FE4F80818F70806180832F
+:102B00008EEA91E00E946A14CF910C94F6142F5F24
+:102B10003F4F2770B8CFCF910895CF92DF92EF92B9
+:102B2000FF920F931F93CF93DF93CDB7DEB76297DA
+:102B30000FB6F894DEBF0FBECDBF8C0185E0F80163
+:102B4000DE011D9601900D928A95E1F7D8014C9116
+:102B500011965C91119712966C9112971396ED90C5
+:102B6000FC9014977091AE01E091AF012091B101FA
+:102B70003091B2012115310531F0EF3F31F481E0A0
+:102B80007F3F19F403C081E001C080E0B82FB1702D
+:102B9000CB2E80FD6CC1D090B001DD2009F4F5C0D2
+:102BA000F091B301E216F30638F0C701821B930BD4
+:102BB000883C910548F09BC0209530952E0D3F1D17
+:102BC000283C310508F093C08F2F807F09F052C058
+:102BD000E51314C0741312C0D62E61110FC0FF701C
+:102BE000F061F093B3010E9417158EEA91E00E9404
+:102BF0006A148091B301F80185836CC1EF2831F02C
+:102C00005F3F31F481E04F3F19F403C081E001C020
+:102C100080E080FD03C081E0862701C080E0F82FBE
+:102C2000F170FF2E80FF1CC080917C0120917D01FE
+:102C300036E0821709F428C190E0389FF001399FEF
+:102C4000F00D1124E258FE4F7181571306C07081B8
+:102C5000471303C07281671303C001968770E9CFE1
+:102C6000D62E662309F436C18091B301816080932A
+:102C7000B30153C0E51308C0741306C0611104C04A
+:102C8000D8011596FC93AEC04D875E878D859E85D5
+:102C90006A8B0E94AE146A89882329F1D62E662396
+:102CA00011F12091B301822F82958F7090E00297ED
+:102CB0000CF460C08091AE019091AF0198878F8332
+:102CC0001986FB86EA862C87CE01079651C0E51748
+:102CD00031F14D875E878D859E856A8B0E94AE148B
+:102CE0006A8981112EC0C8010E946A14A4C08F2F66
+:102CF000807F69F77E2DF98AE88A89890E94D71436
+:102D00008EEA91E00E946A14EEEAF1E086E0DF01CB
+:102D10001D928A95E9F70E941715D12CDBC0741318
+:102D2000D8CF6111D6CFD8011596FC93C8010E9467
+:102D30006A14EEEAF1E086E0DF011D928A95E9F778
+:102D4000C9C0D62E662379F22091B301822F8295D5
+:102D50008F7090E0029774F08091AE019091AF0176
+:102D60009A8389831B82FD82EC822E83CE01019699
+:102D70000E946A1486E0F801AEEAB1E001900D927B
+:102D80008A95E1F70E9425156FC0E216F30628F038
+:102D9000C701821B930B9C0104C0209530952E0D1A
+:102DA0003F1D283C310508F052C0D62E662309F499
+:102DB0009ACFE5132CC074132AC08091B30180FD13
+:102DC0001DC0982F92959F70C9F0D80115968C93CD
+:102DD00015979F3039F09F5F9295907F8F70892B68
+:102DE00015968C93C8010E946A1486E0F801AEEA39
+:102DF000B1E001900D928A95E1F736C086E0F801C6
+:102E0000AEEAB1E001900D928A95E1F763C04D877B
+:102E10005E878D859E850E94AE14882379F086E0BA
+:102E2000F801AEEAB1E001900D928A95E1F70E94B7
+:102E300025150E941715DD24D3944CC08091B30151
+:102E400081608093B301C8010E946A1443C07E2D43
+:102E5000F98AE88A89890E94D714EEEAF1E086E0CF
+:102E6000DF011D928A95E9F70E94171533C066238A
+:102E700009F439CF4D875E878D859E850E94AE14FB
+:102E8000882309F430CFCBCF4D875E878D859E8513
+:102E90000E94171A292F22952F7030E02230310519
+:102EA0002CF49F7041F0811106C00CC02430310514
+:102EB0002CF49F7049F4805E883020F0C8010E9495
+:102EC0006A14CF2CDC2C06C0D80115969C91907FFB
+:102ED00091F7F8CF8D2D62960FB6F894DEBF0FBE36
+:102EE000CDBFDF91CF911F910F91FF90EF90DF90B9
+:102EF000CF9008951F93CF93DF93CDB7DEB72C9774
+:102F00000FB6F894DEBF0FBECDBF4F8358876987D9
+:102F10007A878B879C87CE0107960E948D15882320
+:102F2000C1F02F8138858A859B85892B31F03F3F01
+:102F300011F080E003C02F3FE1F781E0811147C02D
+:102F40004F81588569857A858B859C850E94E6141A
+:102F50003EC086E0FE013796DE01119601900D928B
+:102F60008A95E1F7FF81E8854A855B854115510522
+:102F700031F0EF3F31F481E0FF3F19F403C081E00D
+:102F800001C080E080FD23C020917D0130E0C901B7
+:102F900001968770992760917C0170E086179707EA
+:102FA000F1F1F983EA835D834C8396E0929FD0012F
+:102FB000939FB00D1124A258BE4FFE01319601908F
+:102FC0000D929A95E1F780937D010E94F61416E028
+:102FD00080917C0190917D01891779F1189FC00142
+:102FE000112482589E4F0E948D15882331F1E09163
+:102FF0007C011E9FF0011124E258FE4F4081518157
+:1030000062817381848195810E94E61480917C01A4
+:1030100090E001968770992780937C01D9CF0E9418
+:10302000AA1410927D0110927C01EEEAF1E086E094
+:10303000DF011D928A95E9F7CACF2C960FB6F89456
+:10304000DEBF0FBECDBFDF91CF911F910895EF92EC
+:10305000FF920F931F93CF93DF939C01009709F486
+:1030600071C0F12CEE24E394E9012196F9018491D9
+:10307000843740F4843008F056C0813081F08230CB
+:1030800021F160C0853709F449C0C0F19CE7980F71
+:10309000903708F057C08F770E94B71146C089015A
+:1030A0000E5F1F4FFE01849190E2980F983050F40C
+:1030B0008770FE2D01C0FF0F8A95EAF78F2F0E94BF
+:1030C000651B15C00E94FA1014C089010E5F1F4FC6
+:1030D000FE01849190E2980F983068F48770FE2D7D
+:1030E00001C0FF0F8A95EAF78F2F0E946B1B0E9489
+:1030F000981BE8011AC00E94B711FBCF2E5F3F4F0B
+:10310000FE01C491CC2341F08FE99FE00197F1F7D4
+:1031100000C00000C150F6CFE90107C0FE01F490E5
+:10312000E901229602C00E94FA108F2D882341F0F7
+:10313000EFE9FFE03197F1F700C000008150F6CFD2
+:103140009E0192CFDF91CF911F910F91FF90EF9051
+:10315000089508956093B8017093B9018093BA01FE
+:103160009093BB010C9496140F931F930091B80198
+:103170001091B9012091BA013091BB01062B172B98
+:10318000282B392B0093B8011093B9012093BA0171
+:103190003093BB011F910F910C9496140F931F93C2
+:1031A0000091B8011091B9012091BA013091BB0191
+:1031B00006231723282339230093B8011093B9015C
+:1031C0002093BA013093BB011F910F910C94961478
+:1031D0000F931F930091B8011091B9012091BA018A
+:1031E0003091BB0106271727282739270093B801FC
+:1031F0001093B9012093BA013093BB011F910F9135
+:103200000C9496141092B4011092B5011092B6016C
+:103210001092B7010C94961441E050E060E070E029
+:1032200004C0440F551F661F771F8A95D2F740933D
+:10323000B4015093B5016093B6017093B7010C943B
+:10324000961441E050E060E070E004C0440F551F68
+:10325000661F771F8A95D2F78091B4019091B501CE
+:10326000A091B601B091B701842B952BA62BB72B5B
+:103270008093B4019093B501A093B601B093B701C8
+:103280000C94961441E050E060E070E004C0440FFC
+:10329000551F661F771F8A95D2F740955095609508
+:1032A00070958091B4019091B501A091B601B09153
+:1032B000B70184239523A623B7238093B401909369
+:1032C000B501A093B601B093B7010C94961441E0F8
+:1032D00050E060E070E004C0440F551F661F771F88
+:1032E0008A95D2F78091B4019091B501A091B60171
+:1032F000B091B70184279527A627B7278093B401FB
+:103300009093B501A093B601B093B7010C949614B5
+:103310000F931F930091B4011091B5012091B60154
+:103320003091B701062B172B282B392B0093B401B2
+:103330001093B5012093B6013093B7011F910F91FF
+:103340000C9496140F931F930091B4011091B50142
+:103350002091B6013091B701062317232823392382
+:103360000093B4011093B5012093B6013093B701D7
+:103370001F910F910C9496140F931F930091B40119
+:103380001091B5012091B6013091B701062717279A
+:10339000282739270093B4011093B5012093B60173
+:1033A0003093B7011F910F910C9496140895CF920A
+:1033B000DF92EF92FF920F931F93CF93DF93EC0175
+:1033C000C090B801D090B901E090BA01F090BB0173
+:1033D0008091B4019091B501A091B601B091B7016F
+:1033E000C82AD92AEA2AFB2A0FE110E0B701A60170
+:1033F000002E04C076956795579547950A94D2F7A5
+:1034000040FD05C00150110988F780E007C0BE01EA
+:10341000802F0E944E080197A9F3802FDF91CF9152
+:103420001F910F91FF90EF90DF90CF900895CF9371
+:10343000DF93EC010E94D719BE010E944E08DF9174
+:10344000CF910895CB010E94171A08958091C10170
+:1034500008958093C10108951092C10108950E94BA
+:103460009E1C2091BF013091C0018217930750F03C
+:103470000E949E1C2091BF013091C001821B930BC2
+:103480009C010AC00E949E1C2091BF013091C00186
+:1034900020953095280F391F81E0283B3B4008F4E8
+:1034A00080E008958091BE01859585958595089564
+:1034B0008091BE01877008950E949E1C2091BC01DE
+:1034C0003091BD018217930768F00E949E1C2091E5
+:1034D000BC013091BD01821B930B883B9B4078F46B
+:1034E00080E014C00E949E1C2091BC013091BD015F
+:1034F00020953095280F391F283B3B4088F3809159
+:10350000BE0182FB882780F991E0892781700895A8
+:1035100098E0899F90011124622B6093BE010E9464
+:1035200021190E949E1C9093BD018093BC010895B7
+:103530001092BE011092BD011092BC0108954091FD
+:10354000BE01809584238093BE01982F977089F4E3
+:1035500050E0282F332727FD30954217530749F0B5
+:103560008595859585950E9442191092BD0110920E
+:10357000BC0108959091BE01977081E009F480E04C
+:10358000089590910C019923D9F090910D01992300
+:10359000B9F0982F9695969596959F3088F5E0917D
+:1035A0000E01F0910F01E90FF11D877021E030E06D
+:1035B00001C0220F8A95EAF78181822B81830895C9
+:1035C00040910E0150910F0120E030E09FEFFA0191
+:1035D000E20FF31F6281681799F09F3F19F46111A0
+:1035E00001C0922F2F5F3F4F2E30310581F79F3F53
+:1035F00039F0FA01E90FF11D97FDFA9582830895DC
+:10360000089590910C019923E1F090910D01992377
+:10361000C1F0982F9695969596959F3020F5E0915C
+:103620000E01F0910F01E90FF11D877021E030E0EC
+:1036300001C0220F8A95EAF72095818128232183F2
+:10364000089540910E0150910F0120E030E0FA0101
+:10365000E20FF31F9281981301C012822F5F3F4F38
+:103660002E303105A1F7089581E090E0E0910E0140
+:10367000F0910F01E80FF91F10820196803191053A
+:10368000A9F708958091D50108959091D501982BBF
+:103690009093D501089580959091D50198239093AA
+:1036A000D50108951092D50108959091D401982BD9
+:1036B0009093D401089580959091D401982390938C
+:1036C000D40108951092D40108959091D301982BBC
+:1036D0009093D301089580959091D301982390936E
+:1036E000D30108951092D30108958093C2010E94DE
+:1036F0009E1C9093C0018093BF0108951092C20157
+:103700001092C0011092BF01089540910E01509196
+:103710000F0120E030E080E0FA01E20FF31F918119
+:1037200091118F5F2F5F3F4F2F303105A9F708951B
+:10373000E0910E01F0910F018091D5018083E0911D
+:103740000E01F0910F0180819091D401892B80832B
+:10375000E0910E01F0910F0180819091D301892BAE
+:1037600080838091C201882399F00E942F1A8111D1
+:103770000E947E1BE0910E01F0910F0180819091DB
+:10378000C201892B80830E94851B81110E947E1BB0
+:1037900080910E0190910F010C94E70F40E000978B
+:1037A00039F09C0121503109822393234F5FF7CFD9
+:1037B000842F0895CF92DF92EF92FF920F931F9381
+:1037C0006C01EE24FF24C114D104E104F10421F4BE
+:1037D0006B017C0180E001C080E133272F2D1E2D7D
+:1037E0000D2D011511052105310519F0885F6801BE
+:1037F000790197018601A4E03695279517950795DD
+:10380000AA95D1F7011511052105310519F08C5F35
+:103810006801790197018601F2E0369527951795A1
+:103820000795FA95D1F7011511052105310519F014
+:103830008E5F68017901B701A60176956795579566
+:103840004795452B462B472B09F08F5F1F910F9112
+:10385000FF90EF90DF90CF9008958091E901843040
+:1038600021F11092D70120E488E190E00FB6F8949E
+:10387000A895809360000FBE2093600080E00E94B6
+:10388000E90883B7817F846083BF83B7816083BF8A
+:103890007894889583B78E7F83BF88E10FB6F894BC
+:1038A00080936000109260000FBE089508950895FF
+:1038B0000E94561C0E9461040E94571C0E945505DC
+:1038C00091E0811101C090E0892F08950E94AA140F
+:1038D0000E94DB0F0C94E9081F920F920FB60F9213
+:1038E00011248F939F93AF93BF938091D701811140
+:1038F00013C08091D8019091D901A091DA01B091C3
+:10390000DB014196A11DB11D8093D8019093D9018F
+:10391000A093DA01B093DB01BF91AF919F918F919A
+:103920000F900FBE0F901F90189582E084BD93E01A
+:1039300095BD9AEF97BD80936E0008952FB7F894C8
+:103940008091D8019091D901A091DA01B091DB0169
+:103950002FBF0895CF92DF92EF92FF920F931F93A4
+:103960002FB7F8944091D8015091D9016091DA01B4
+:103970007091DB012FBF6A017B01EE24FF248C01D3
+:1039800020E030E0C016D106E206F30610F4415004
+:103990005109481B590BCA011F910F91FF90EF90DD
+:1039A000DF90CF9008951F920F920FB60F921124BF
+:1039B0008F939F93AF93BF938091D8019091D9013A
+:1039C000A091DA01B091DB010196A11DB11D809398
+:1039D000D8019093D901A093DA01B093DB01BF9194
+:1039E000AF919F918F910F900FBE0F901F901895E0
+:1039F0000E94E10CF8942FEF87EA91E62150804075
+:103A00009040E1F700C0000087E090EBDC0180937C
+:103A1000F3019093F401A093F501B093F6012CE02B
+:103A200088E190E00FB6F894A895809360000FBEEF
+:103A300020936000FFCFEF92FF920F931F93CF93DD
+:103A4000DF93E82E8DE0F82E8F2D0E944E05C5E005
+:103A5000D0E0082F10E098010C2E02C03595279574
+:103A60000A94E2F720FF09C06C2F7F2D80E00E94AE
+:103A7000FC05E81202C081E007C0219760F7FA94C4
+:103A80008FEFF812E1CF80E0DF91CF911F910F917E
+:103A9000FF90EF900895CF93C82F8CE20E941B1DDA
+:103AA000882321F08C2FCF910C941B1D80E0CF91A7
+:103AB0000895CF930E949E1E811102C00E94841E11
+:103AC000C5E6C15049F00E9461048FE39CE901976B
+:103AD000F1F700C00000F5CF89E20E944B1D811173
+:103AE00011C18AE20E944B1D81110E94841E85E053
+:103AF0000E944B1D81110E94F81C0E94A91E8093F8
+:103B0000D60187E00E944B1D882399F18BE10E942A
+:103B10004B1D882351F09091D60191FB882780F9A5
+:103B200021E0822780FB91F922C08EE00E944B1D8C
+:103B3000882351F09091D60192FB882780F921E0EB
+:103B4000822780FB92F913C080E10E944B1D909167
+:103B5000D601882341F093FB882780F921E0822752
+:103B600080FB93F904C0892F809580FB90F9909396
+:103B7000D6018091D6010E94AD1E0E94BB1E80938B
+:103B8000F20180EE0E944B1D882341F08091F201EA
+:103B9000982F909590FB80F98093F20189E30E9421
+:103BA0004B1D882359F09091F20191FB882780F9F1
+:103BB00021E0822780FB91F99093F20182EE0E942E
+:103BC0004B1D882359F09091F20192FB882780F9D0
+:103BD00021E0822780FB92F99093F20186EE0E9409
+:103BE0004B1D882359F09091F20193FB882780F9AF
+:103BF00021E0822780FB93F99093F20183EE0E94EB
+:103C00004B1D882359F09091F20194FB882780F98D
+:103C100021E0822780FB94F99093F20185E30E94D2
+:103C20004B1D882359F09091F20195FB882780F96C
+:103C300021E0822780FB95F99093F20181E30E94B5
+:103C40004B1D882359F09091F20196FB882780F94B
+:103C500021E0822780FB96F99093F20181E10E9496
+:103C60004B1D882359F09091F20197FB882780F92A
+:103C700021E0822780FB97F99093F2018091F20175
+:103C80000E94BF1E8091F20187FB882780F98093F4
+:103C90000D0187E20E944B1DC82F8EE10E944B1D33
+:103CA0008111C2608FE10E944B1D8111C46080E2CE
+:103CB0000E944B1D8111C86081E20E944B1D811141
+:103CC000C06182E20E944B1D8111C06283E20E94AA
+:103CD0004B1D8111C06484E20E944B1D882311F0AA
+:103CE000C06802C0CC2329F08C2F0E94B61E6C2F16
+:103CF00003C00E94B21E682F70E080E090E0CF9178
+:103D00000C94AA18CF9108956DEE7EEF80E090E0BC
+:103D10000E945A2260E082E090E00E94482260E027
+:103D200083E090E00E94482260E084E090E00E94FE
+:103D3000482260E085E090E00C94482280E090E02A
+:103D40000E94422221E08D3E9E4F09F020E0822F0A
+:103D5000089582E090E00C943A22682F82E090E08F
+:103D60000C94482283E090E00C943A22682F83E080
+:103D700090E00C94482284E090E00C943A22682F62
+:103D800084E090E00C9448228091DE0180FF0BC01B
+:103D90006091130185E0689FB001112475956795C6
+:103DA000759567952AC081FF09C06091130185E070
+:103DB000689FB0011124759567951FC082FF07C0E9
+:103DC0006091130185E0689FB001112416C04091F5
+:103DD000DF014423C9F060911201461788F7209152
+:103DE000130185E0289F90011124429FC001439F49
+:103DF000900D112470E00E940C226038710540F48F
+:103E00006115710539F002C065E070E0862F0895F4
+:103E10008FE7089581E008958091DE0180FF08C05A
+:103E20006091110170E0759567957595679521C052
+:103E300081FF06C06091110170E07595679519C00A
+:103E400082FF04C06091110170E010C08091DF0119
+:103E50008823C1F0609110018617A0F7909111019D
+:103E6000989FC001112470E00E940C2260387105F7
+:103E700028F46115710521F0862F08958FE70895C4
+:103E800081E0089561E070E0F4CF803F21F40E946A
+:103E9000C41E819504C0813F29F40E94C41E8093F2
+:103EA000E2010895823F21F40E94C41E819504C05E
+:103EB000833F29F40E94C41E8093E1010895893F45
+:103EC00019F40E940C1F05C08A3F31F40E940C1F98
+:103ED00081958093E30108958B3F21F40E940C1F8C
+:103EE000819504C08C3F29F40E940C1F8093E4014B
+:103EF0000895843F21F48091E001816017C0853FDF
+:103F000021F48091E001826011C0863F21F480910C
+:103F1000E00184600BC0873F21F48091E00188605C
+:103F200005C0883F31F48091E00180618093E00119
+:103F300008958D3F21F48091DE0181600BC08E3F9A
+:103F400021F48091DE01826005C08F3F29F48091C9
+:103F5000DE0184608093DE010895803F39F4809112
+:103F6000E20187FF6CC01092E20169C0813F29F431
+:103F70008091E2011816BCF362C09091E101823F8A
+:103F800029F497FF5CC01092E10159C0833F19F4F6
+:103F90001916CCF354C0893F41F48091E3011816FF
+:103FA0000CF04DC01092E3014AC08A3F29F4809181
+:103FB000E30187FF44C0F6CF8B3F39F48091E401E1
+:103FC00087FF3DC01092E4013AC08C3F29F48091F4
+:103FD000E4011816BCF333C0843F21F48091E00162
+:103FE0008E7F17C0853F21F48091E0018D7F11C045
+:103FF000863F21F48091E0018B7F0BC0873F21F445
+:104000008091E001877F05C0883F31F48091E00115
+:104010008F7E8093E00113C08D3F21F48091DE01FB
+:104020008E7F0BC08E3F21F48091DE018D7F05C015
+:104030008F3F29F48091DE018B7F8093DE01809198
+:10404000E10181110EC08091E20181110AC08091CD
+:10405000E301811106C08091E401811102C0109238
+:10406000DF01089580EE91E00E94F20F0E949E1CF5
+:104070009093DD018093DC0108951F93CF93DF932C
+:104080008091DC019091DD010E94AA1C4091DF012A
+:10409000442321F02091140130E006C02091150145
+:1040A0005AE0259F900111248217930708F482C0DB
+:1040B0008091E1011091E201D091E301C091E4010E
+:1040C000811107C0111105C0D11103C0CC2309F41F
+:1040D00071C04F3F19F04F5F4093DF01181624F471
+:1040E0000E94C41E8093E1018091E10187FF05C019
+:1040F0000E94C41E81958093E101111624F40E9450
+:10410000C41E8093E2018091E20187FF05C00E94F6
+:10411000C41E81958093E2016091E101662339F12B
+:104120001091E201112319F1772767FD7095872F10
+:10413000972F0E941D2123E333E343E35FE30E94B3
+:1041400081210E94EA206093E101612F772767FDBA
+:104150007095872F972F0E941D2123E333E343E3BC
+:104160005FE30E9481210E94EA206093E2011D1614
+:1041700024F40E940C1F8093E3018091E30187FFE8
+:1041800005C00E940C1F81958093E3011C1624F446
+:104190000E940C1F8093E4018091E40187FF05C019
+:1041A0000E940C1F81958093E401DF91CF911F91B4
+:1041B0000C943220DF91CF911F910895E0EEF1E051
+:1041C00085E0DF011D928A95E9F71092DF011092D8
+:1041D000DE01089504D06894B1118DC0089570D0A7
+:1041E00088F09F5790F0B92F9927B751A0F0D1F0E0
+:1041F000660F771F881F991F1AF0BA95C9F712C06A
+:10420000B13081F077D0B1E0089574C0672F782F76
+:104210008827B85F39F0B93FCCF3869577956795D5
+:10422000B395D9F73EF490958095709561957F4F41
+:104230008F4F9F4F0895E89409C097FB3EF49095E7
+:104240008095709561957F4F8F4F9F4F9923A9F06F
+:10425000F92F96E9BB279395F695879577956795FE
+:10426000B795F111F8CFFAF4BB0F11F460FF1BC042
+:104270006F5F7F4F8F4F9F4F16C0882311F096E9D5
+:1042800011C0772321F09EE8872F762F05C0662383
+:1042900071F096E8862F70E060E02AF09A95660F3C
+:1042A000771F881FDAF7880F9695879597F90895F5
+:1042B00057FD9058440F551F59F05F3F71F04795D7
+:1042C000880F97FB991F61F09F3F79F087950895BC
+:1042D000121613061406551FF2CF4695F1DF08C0DB
+:1042E000161617061806991FF1CF869571056105F8
+:1042F00008940895E894BB2766277727CB0197F9A0
+:1043000008950BD078C069D028F06ED018F09523AE
+:1043100009F05AC05FC01124EECFCADFA0F3959F09
+:10432000D1F3950F50E0551F629FF001729FBB279C
+:10433000F00DB11D639FAA27F00DB11DAA1F649F48
+:104340006627B00DA11D661F829F2227B00DA11DFB
+:10435000621F739FB00DA11D621F839FA00D611D81
+:10436000221F749F3327A00D611D231F849F600DA2
+:10437000211D822F762F6A2F11249F5750408AF0DB
+:10438000E1F088234AF0EE0FFF1FBB1F661F771F67
+:10439000881F91505040A9F79E3F510570F014C0FE
+:1043A000AACF5F3FECF3983EDCF38695779567954F
+:1043B000B795F795E7959F5FC1F7FE2B880F911D85
+:1043C0009695879597F9089597F99F6780E870E02B
+:1043D00060E008959FEF80EC089500240A9416167B
+:1043E000170618060906089500240A9412161306E3
+:1043F000140605060895092E0394000C11F4882371
+:1044000052F0BB0F40F4BF2B11F460FF04C06F5F8C
+:104410007F4F8F4F9F4F089597FB072E16F4009400
+:1044200007D077FD09D00E94262207FC05D03EF474
+:10443000909581959F4F0895709561957F4F089550
+:10444000EE0FFF1F0590F491E02D0994AA1BBB1BF2
+:1044500051E107C0AA1FBB1FA617B70710F0A61B84
+:10446000B70B881F991F5A95A9F780959095BC01A5
+:10447000CD010895F999FECF92BD81BDF89A992793
+:1044800080B50895A8E1B0E042E050E00C946222CB
+:10449000262FF999FECF92BD81BDF89A019700B4FD
+:1044A000021639F01FBA20BD0FB6F894FA9AF99A9D
+:1044B0000FBE08950196272F0E9449220C9448228E
+:1044C000DC01CB01FC01F999FECF06C0F2BDE1BDD4
+:1044D000F89A319600B40D9241505040B8F70895C3
+:0444E000F894FFCF7E
+:1044E4002002EB08780955092109EE080101C301EE
+:1044F40028080A03140A3F4D363979042C04F603BC
+:0A450400BD035003690382039B030B
:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c index bf5a974bfe..93d1c84bc5 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c @@ -7,8 +7,7 @@ #define SYMB 1 // symbols #define MDIA 2 // media keys -#define LSFTO M(0) // Left shift, open parens when tapped -#define RSFTC M(1) // Right shift, close parens when tapped +#define LEADER_TIMEOUT 300 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer @@ -22,34 +21,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| * |LShift/(|Z/Ctrl| X | C | V | B | [ | | ] | N | M | , | . |//Ctrl|RShift/)| * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | - | + * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | -/L1 | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | App | LGui | | Alt |Ctrl/Esc| * ,------|------|------| |------+--------+------. - * | | L1 | Home | | PgUp | | | - * | Space| Tap/ |------| |------| Tab/L1 |Enter | - * | |Toggle| End | | PgDn | | | + * | | | Home | | PgUp | | | + * | Space|Leader|------| |------| Tab/L1 |Enter | + * | | | End | | PgDn | | | * `--------------------' `----------------------' */ // 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_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, - KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), - KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, - LSFTO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_LBRC), - LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, - ALT_T(KC_APP), KC_LGUI, - KC_HOME, - KC_SPC,KC_FN1,KC_END, + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, + KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), + KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSPO, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_LBRC), + LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, + ALT_T(KC_APP), KC_LGUI, + KC_HOME, + KC_SPC,KC_LEAD,KC_END, // right hand KC_RGHT, KC_6,KC_7, KC_8, KC_9, KC_0, KC_MINS, TG(SYMB), KC_Y,KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_H,ALT_T(KC_J),KC_K, KC_L, LT(MDIA,KC_SCLN),GUI_T(KC_QUOT), - MEH_T(KC_RBRC),KC_N,KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), RSFTC, - KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_MINS, + MEH_T(KC_RBRC),KC_N,KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSPC, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, LT(SYMB,KC_MINS), KC_LALT, CTL_T(KC_ESC), KC_PGUP, KC_PGDN,LT(SYMB, KC_TAB), KC_ENT @@ -59,13 +58,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | 1 | 2 | 3 | 4 | | | | | | % | = | @ | | F12 | + * | | | | | | | | | | | | | | | F12 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | 5 | 6 | 7 | 8 | 9 |------| |------| & | _ | - | ; | + | | + * | | 1 | 2 | 3 | 4 | 5 |------| |------| & | _ | - | ; | + | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | ( | ) | [ | ] | 0 | | | | | | ( | ) | | | | + * | | 6 | 7 | 8 | 9 | 0 | | | | | | @ | = | % | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | + * | | | |NxtTab|PrvTab| | | | | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -79,19 +78,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [SYMB] = KEYMAP( // left hand KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, - KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_TRNS, KC_TRNS, - KC_TRNS, KC_5, KC_6, KC_7, KC_8, KC_9, - KC_TRNS, KC_LPRN,KC_RPRN,KC_LBRC, KC_RBRC, KC_0, KC_TRNS, + KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, + KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,LCTL(KC_PGUP), LCTL(KC_PGDN), KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, // right hand - KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - KC_TRNS, KC_TRNS, KC_PERC,KC_EQL, KC_AT, KC_TRNS, KC_F12, - KC_AMPR, KC_UNDS,KC_MINS, CM_SCLN, KC_PLUS, KC_TRNS, - KC_TRNS, KC_PIPE, KC_LPRN,KC_RPRN, KC_3, KC_TRNS, KC_TRNS, - KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, + KC_AMPR, KC_UNDS, KC_MINS, CM_SCLN, KC_PLUS, KC_TRNS, + KC_TRNS, KC_PIPE, KC_AT, KC_EQL, KC_PERC, 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 @@ -101,13 +100,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | MsUp | | | | | | | | | | | | + * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * | | PgUp | Home | End | PgDn | |------| |------| | | | | | Play | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | | | | | | | | | | Prev | Next | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * | | | | | | |VolUp |VolDn | Mute | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -120,10 +119,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // MEDIA AND MOUSE [MDIA] = KEYMAP( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + KC_TRNS, KC_PGUP, KC_HOME, KC_END, KC_PGDN, 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, @@ -140,42 +139,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB), // FN1 - Momentary Layer 1 (Symbols) + [2] = ACTION_MACRO_TAP(0), // Eric Tang's Famous Macro! + [3] = ACTION_MACRO_TAP(1) // Eric Tang's Famous Macro! }; static uint16_t key_timer; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - switch(id) { - case 0: { - if (record->event.pressed) { - key_timer = timer_read(); // if the key is being pressed, we start the timer. - register_code(KC_LSFT); // we're now holding down Shift. - } else { // this means the key was just released, so we can figure out how long it was pressed for (tap or "held down"). - if (timer_elapsed(key_timer) < 70) { // the threshhold we pick for counting something as a tap. - register_code(KC_9); // sending 9 while Shift is held down gives us an opening paren - unregister_code(KC_9); // now let's let go of that key - } - unregister_code(KC_LSFT); // let's release the Shift key now. - } - break; - } - case 1: { - if (record->event.pressed) { - key_timer = timer_read(); // Now we're doing the same thing, only for the right shift/close paren key - register_code(KC_RSFT); - } else { - if (timer_elapsed(key_timer) < 70) { - register_code(KC_0); - unregister_code(KC_0); - } - unregister_code(KC_RSFT); - } - break; - } - } - return MACRO_NONE; + return MACRO_NONE; }; // Runs just one time when the keyboard initializes. @@ -183,28 +156,48 @@ void matrix_init_user(void) { }; +LEADER_EXTERNS(); + // Runs constantly in the background, in a loop. void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); + 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) { - // TODO: Make this relevant to the ErgoDox EZ. - case 1: - ergodox_right_led_1_on(); - break; - case 2: - ergodox_right_led_2_on(); - break; - default: - // none - break; - } + ergodox_board_led_off(); + ergodox_right_led_1_off(); + 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; + default: + // none + break; + } -}; + LEADER_DICTIONARY() { + leading = false; + leader_end(); + SEQ_ONE_KEY(KC_W) { + register_code(KC_LALT); + register_code(KC_F4); + unregister_code(KC_F4); + unregister_code(KC_LALT); + } + SEQ_ONE_KEY(KC_O) { + register_code(KC_LCTL); + register_code(KC_LSFT); + register_code(KC_O); + unregister_code(KC_O); + unregister_code(KC_LSFT); + unregister_code(KC_LCTL); + } + } +} diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk b/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk new file mode 100644 index 0000000000..faca18b543 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/makefile.mk @@ -0,0 +1,5 @@ +# Having a file like this allows you to override Makefile definitions +# for your own particular keymap + +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md b/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md index 205280e290..66acfa187b 100644 --- a/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md +++ b/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md @@ -4,6 +4,20 @@ This is my personal layout which I use to test out ideas which may or may not ma Changelog: +## May 24, 2016: + +* Implements Leader key example + * Leader, W sends Alt-F4 + * Leader, O sends Ctrl-shift-o (a shortcut I use in FrontApp) + +## May 8, 2016: + +* Makes bottom-right key send minus/underscore when tapped, L1 temporary toggle when held +* Tweaked the positions of the numbers on the symbol layer. Basically, 12345 are now directly under their number-row counterparts in layer 0. You can imagine pulling the number row down to the home row. And 67890 are directly under 12345 - so it's a matter of just adding 5 and going to the next row (1+5 = 6, 2+5 = 7 and so on). +* Tweaks media/nav layer + * Removes mouse control, as I don't use it + * Makes left home row keys PgUp, Home, End, PgDn + ## Apr 29, 2016: * Tweaks the Hyper and Meh key to send brackets when tapped diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c index efd67addd5..18939b1923 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c +++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c @@ -4,380 +4,175 @@ #include "action_layer.h" #include "action_util.h" -#define BASE 0 // default layer -#define LOCK 1 // shift-lock layer -#define SYMB_SH 2 // symbols shift layer -#define SYMB_LK 3 // symbols lock layer -#define SYMB_UN 4 // symbols unlock layer -#define MDIA_SH 5 // media shift layer -#define MDIA_LK 6 // media lock layer -#define MDIA_UN 7 // media unlock layer -#define UNLOCK 8 // clear to base layer +#define BASE 0 // default layer +#define SYMB 1 // symbols layer +#define MDIA 2 // media layer +#define SPEC 3 // special layer + +#define LCaps 10 // left caps-shift key +#define LSymb 11 // left symbol-shift key +#define LMdia 12 // left media-shift key +#define LSpec 13 // left special-shift key +#define RCaps 14 // right caps-shift key +#define RSymb 15 // right symbol-shift key +#define RMdia 16 // right media-shift key +#define RSpec 17 // right special-shift key + +#define MUL 20 // mouse up left +#define MUR 21 // mouse up right +#define MDL 22 // mouse down left +#define MDR 23 // mouse down right /* - * The Ordinary Layout for the Ergodox EZ keyboard, v3.1 - * modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com + * The Ordinary Layout for the Ergodox EZ keyboard, v4 + * + * Modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com + * + * No rights reserved. This software is in the public domain. + * Credit me if you are friendly but if you're a jerk don't bother. + * * Details: readme.md * https://github.com/nrrkeene/qmk_firmware/tree/master/keyboard/ergodox_ez/keymaps/ordinary */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Keymap 0: Base Layer - * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | LOCK `~ | 1 | 2 | 3 | 4 | 5 | ESC | | - | 6 | 7 | 8 | 9 | 0 | = LOCK | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Media Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ Media | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Symbol | A | S | D | F | G |------| |------| H | J | K | L | ; | ' Symbol | - * |-----------+------+------+------+------+------|Shift | | Tab |------+------+------+------+------+-----------| - * | LShift | Z | X | C | V | B | -Tab | | | N | M | , | . | / | RShift | - * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | LCtrl | Meh |Hyper | LAlt | LGui | | RGui | RAlt | Hyper| Meh | RCtrl | - * `-----------------------------------' `-----------------------------------' - * ,-------------. ,-------------. - * | Home | End | | Left | Right| - * ,------|------|------| |------+------+------. - * | | | PgUp | | Up | | | - * |Backsp| Del |------| |------| Enter| Space| - * | | | PgDn | | Down | | | - * `--------------------' `--------------------' - */ -[BASE] = KEYMAP( -// left hand - LT(LOCK, KC_GRV) ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_ESC -,LT(MDIA_SH, KC_TAB),KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_LBRC -,MO(SYMB_SH) ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G -,KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,LSFT(KC_TAB) -,KC_LCTL ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI - - ,KC_HOME,KC_END - ,KC_PGUP - ,KC_BSPC,KC_DEL ,KC_PGDN - - // right hand - ,KC_MINS ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,LT(LOCK, KC_EQL) - ,KC_RBRC ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,LT(MDIA_SH, KC_BSLS) - ,KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,LT(SYMB_SH, KC_QUOT) - ,KC_TAB ,KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH ,KC_RSFT - ,KC_RGUI,KC_RALT,ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL - - ,KC_LEFT ,KC_RGHT - ,KC_UP - ,KC_DOWN ,KC_ENT ,KC_SPC - ), - -/* Keymap 1: Layer Lock Keys - * - * ,-------------------------------------------------------. ,-------------------------------------------------------. - * | | Esc | | | | | | | | | | | | Bspc | | - * |-------------+------+------+------+------+-------------| |------+------+------+------+------+------+-------------| - * | Media LOCK | | | | | | | | | | | | | | Media LOCK | - * |-------------+------+------+------+------+------| | | |------+------+------+------+------+-------------| - * | Symbol LOCK | | | | | |------| |------| | | | | | Symbol LOCK | - * |-------------+------+------+------+------+------| | | |------+------+------+------+------+-------------| - * | Caps LOCK | | | | | | | | | | | | | | Caps LOCK | - * `-------------+------+------+------+------+-------------' `-------------+------+------+------+------+-------------' - * | | | | | | | | | | | | - * `------------------------------------' `------------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `--------------------' - */ -[LOCK] = KEYMAP( -// left hand - KC_TRNS ,KC_ESC ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,KC_FN3 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,KC_FN2 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,KC_CAPS ,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_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN3 - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN2 - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS - - ,KC_TRNS ,KC_TRNS - ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS - ), - -/* Keymap 2: Symbol Shift Layer - * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | LOCK | F1 | F2 | F3 | F4 | F5 | | | - | F6 | F7 | F8 | F9 | F10 | LOCK | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Media | ! | @ | { | } | & | < | | > | | | 7 | 8 | 9 | / | Media | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Symbol | # | $ | ( | ) | ` |------| |------| / | 4 | 5 | 6 | * | Symbol | - * |-----------+------+------+------+------+------| Tab | | Shift|------+------+------+------+------+-----------| - * | LShift | % | ^ | [ | ] | ~ | | | -Tab| \ | 1 | 2 | 3 | - | RShift | - * `-----------+------+------+------+------+-------------' `------------+------+------+------+------+------------' - * | | | | | | | 0 | . | = | + | Entr | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | Left | Right| | Home | End | - * ,------|------|------| |------+------+------. - * | | | Up | | PgUp | | | - * |Space |Enter |------| |------|BackSp| Del | - * | | | Down | | PgDn | | | - * `--------------------' `--------------------' - */ -[SYMB_SH] = KEYMAP( -// left hand - KC_FN2 ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_TRNS -,MO(MDIA_SH) ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM) -,MO(SYMB_SH) ,KC_HASH ,KC_DLR ,KC_LPRN ,KC_RPRN ,KC_GRV -,KC_LSFT ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB -,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS - ,KC_LEFT ,KC_RGHT - ,KC_UP - ,KC_SPC ,KC_ENT ,KC_DOWN - // right hand - ,KC_MINS ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_FN2 - ,LSFT(KC_DOT),KC_PIPE ,KC_7 ,KC_8 ,KC_9 ,KC_SLSH ,MO(MDIA_SH) - ,KC_SLSH ,KC_4 ,KC_5 ,KC_6 ,KC_ASTR ,MO(SYMB_SH) - ,LSFT(KC_TAB),KC_BSLS ,KC_1 ,KC_2 ,KC_3 ,KC_MINS ,KC_RSFT - ,GUI_T(KC_0),ALT_T(KC_DOT),ALL_T(KC_EQL),MEH_T(KC_PLUS),CTL_T(KC_ENT) - ,KC_HOME ,KC_END - ,KC_PGUP - ,KC_PGDN ,KC_BSPC ,KC_DEL -), - -/* Keymap 3: Symbol Lock Layer - * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | LOCK | F1 | F2 | F3 | F4 | F5 | | | - | F6 | F7 | F8 | F9 | F10 | LOCK | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Media | ! | @ | { | } | & | < | | > | | | 7 | 8 | 9 | / | Media | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Symbol | # | $ | ( | ) | ` |------| |------| / | 4 | 5 | 6 | * | Symbol | - * |-----------+------+------+------+------+------| Tab | | Shift|------+------+------+------+------+-----------| - * | LShift | % | ^ | [ | ] | ~ | | | -Tab| \ | 1 | 2 | 3 | - | RShift | - * `-----------+------+------+------+------+-------------' `------------+------+------+------+------+------------' - * | | | | | | | 0 | . | = | + | Entr | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | Left | Right| | Home | End | - * ,------|------|------| |------+------+------. - * | | | Up | | PgUp | | | - * |Space |Enter |------| |------|BackSp| Del | - * | | | Down | | PgDn | | | - * `--------------------' `--------------------' - */ -[SYMB_LK] = KEYMAP( -// left hand - MO(SYMB_UN) ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_TRNS -,MO(MDIA_SH) ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM) -,MO(UNLOCK) ,KC_HASH ,KC_DLR ,KC_LPRN ,KC_RPRN ,KC_GRV -,KC_LSFT ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB -,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS - ,KC_LEFT ,KC_RGHT - ,KC_UP - ,KC_SPC ,KC_ENT ,KC_DOWN - // right hand - ,KC_MINS ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,MO(SYMB_UN) - ,LSFT(KC_DOT),KC_PIPE ,KC_7 ,KC_8 ,KC_9 ,KC_SLSH ,MO(MDIA_SH) - ,KC_SLSH ,KC_4 ,KC_5 ,KC_6 ,KC_ASTR ,MO(UNLOCK) - ,LSFT(KC_TAB),KC_BSLS ,KC_1 ,KC_2 ,KC_3 ,KC_MINS ,KC_RSFT - ,GUI_T(KC_0),ALT_T(KC_DOT),ALL_T(KC_EQL),MEH_T(KC_PLUS),CTL_T(KC_ENT) - ,KC_HOME ,KC_END - ,KC_PGUP - ,KC_PGDN ,KC_BSPC ,KC_DEL - ), - -/* Keymap 4: Symbol Unlock Layer +/******* Base Layer ******************************************************************************************************** * * ,------------------------------------------------------. ,------------------------------------------------------. - * | | Esc | | | | | | | | | | | | Bspc | | + * | Special `~ | 1 | 2 | 3 | 4 | 5 | ESC | | - | 6 | 7 | 8 | 9 | 0 | =+ Special | * |------------+------+------+------+------+-------------| |------+------+------+------+------+------+------------| - * | Media LOCK | | | | | | | | | | | | | | Media LOCK | + * | Media Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \| Media | * |------------+------+------+------+------+------| | | |------+------+------+------+------+------------| - * | UNLOCK | | | | | |------| |------| | | | | | UNLOCK | - * |------------+------+------+------+------+------| | | |------+------+------+------+------+------------| - * | Caps LOCK | | | | | | | | | | | | | | Caps LOCK | + * | Symbol | A | S | D | F | G |------| |------| H | J | K | L | ; | '" Symbol | + * |------------+------+------+------+------+------|Shift | | Tab |------+------+------+------+------+------------| + * | Capitals | Z | X | C | V | B | -Tab | | | N | M | , | . | / | Capitals | * `------------+------+------+------+------+-------------' `-------------+------+------+------+------+------------' - * | | | | | | | | | | | | - * `----------------------------------' `----------------------------------' + * | LCtrl | Meh |Hyper | LAlt | LGui | | RGui | RAlt | Hyper| Meh | RCtrl | + * `-----------------------------------' `-----------------------------------' * ,-------------. ,-------------. - * | | | | | | + * | Home | End | | Left | Right| * ,------|------|------| |------+------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | + * | | | PgUp | | Up | | | + * |Backsp| Del |------| |------| Enter| Space| + * | | | PgDn | | Down | | | * `--------------------' `--------------------' */ -[SYMB_UN] = KEYMAP( +[BASE] = KEYMAP( // left hand - KC_TRNS ,KC_ESC ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,TG(MDIA_LK) ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,KC_FN1 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,KC_CAPS ,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_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,TG(MDIA_LK) - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1 - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS - ,KC_TRNS ,KC_TRNS - ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS -), + F(LSpec),KC_1,KC_2,KC_3 ,KC_4 ,KC_5 ,KC_ESC +,F(LMdia) ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_LBRC +,M(LSymb) ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G +,M(LCaps) ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,LSFT(KC_TAB) +,KC_LCTL ,KC_MEH ,KC_HYPR,KC_LALT,KC_LGUI + ,KC_HOME,KC_END + ,KC_PGUP + ,KC_BSPC,KC_DEL ,KC_PGDN + // right hand + ,KC_MINS ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,F(RSpec) + ,KC_RBRC ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,F(RMdia) + ,KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,F(RSymb) + ,KC_TAB ,KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH ,M(RCaps) + ,KC_RGUI,KC_RALT,KC_HYPR ,KC_MEH ,KC_RCTL + ,KC_LEFT ,KC_RGHT + ,KC_UP + ,KC_DOWN ,KC_ENT ,KC_SPC + ), -/* Keymap 5: Media Shift Layer +/******* Symbols Layer ***************************************************************************************************** * * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | LOCK | F11 | F12 | F13 | F14 | F15 | | | | F16 | F17 | F18 | F19 | F20 | LOCK | + * | | F1 | F2 | F3 | F4 | F5 | Esc | | - | F6 | F7 | F8 | F9 | F10 | | * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Media |ShutDn|LClick| MsUp |RClick|Vol Up|ScrlUp| |ScrlUp|PrtScr| Home | Up | PgUp | Mail | Media | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Symbol | Sleep|MsLeft|MsDown|MsRght|Vol Dn|------| |------|NumLok| Left | Down | Right|MyComp| Symbol | + * | | ! | @ | { | } | & | < | | > | | | 7 | 8 | 9 | / | | * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | LShift | | |MsDown| | Mute |ScrlDn| |ScrlDn| | End | Down | PgDn | | RShift | + * | | # | $ | ( | ) | ` |------| |------| / | 4 | 5 | 6 | * | | + * |-----------+------+------+------+------+------| Tab | | Shift|------+------+------+------+------+-----------| + * | | % | ^ | [ | ] | ~ | | | -Tab| \ | 1 | 2 | 3 | - | | * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | LCtrl| Meh |Hyper | LAlt | LGui | |Insert|Delete| Hyper| LAlt | LGui | - * `----------------------------------' `----------------------------------' + * | LCtrl | Meh |Hyper | LAlt | LGui | |RGui/0|RAlt/.|Hypr/=|Meh/+ |RCtrl/Ent| + * `-----------------------------------' `-------------------------------------' * ,-------------. ,-------------. - * | Stop |Refrsh| | Prev | Next | + * | Left | Right| | Home | End | * ,------|------|------| |------+------+------. - * |Brwser|Brwser|Search| |VolUp | | | - * |Back | Fwd |------| |------| Stop | Play-| - * | | | Home | |VolDn | | Pause| + * | | | Up | | PgUp | | | + * |Space |Enter |------| |------|BackSp| Del | + * | | | Down | | PgDn | | | * `--------------------' `--------------------' */ -[MDIA_SH] = KEYMAP( +[SYMB] = KEYMAP( // left hand - KC_FN3 ,KC_F11 ,KC_F12 ,KC_F13 ,KC_F14 ,KC_F15 ,KC_NO -,MO(MDIA_SH) ,KC_POWER ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_VOLU ,KC_WH_U -,MO(SYMB_SH) ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD -,KC_LSFT ,KC_NO ,KC_NO ,KC_MS_D ,KC_NO ,KC_MUTE ,KC_WH_D -,KC_LCTL ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI - ,KC_WSTP ,KC_WREF - ,KC_WSCH - ,KC_WBAK ,KC_NO ,KC_WHOM + KC_TRNS ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_ESC +,KC_TRNS ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM) +,KC_TRNS ,KC_HASH ,KC_DLR ,KC_LPRN ,KC_RPRN ,KC_GRV +,KC_TRNS ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB +,KC_LCTL ,KC_MEH ,KC_HYPR,KC_LALT ,KC_LGUI + ,KC_LEFT ,KC_RGHT + ,KC_UP + ,KC_SPC ,KC_ENT ,KC_DOWN // right hand - ,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,KC_FN3 - ,KC_WH_U ,KC_PSCR ,KC_HOME,KC_UP ,KC_PGUP ,KC_MAIL ,MO(MDIA_SH) - ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,MO(SYMB_SH) - ,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_RSFT - ,GUI_T(KC_INS),ALT_T(KC_DEL),ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL - ,KC_MPRV ,KC_MNXT - ,KC_VOLU - ,KC_VOLD ,KC_MSTP ,KC_MPLY + ,KC_MINS ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_TRNS + ,LSFT(KC_DOT),KC_PIPE ,KC_7 ,KC_8 ,KC_9 ,KC_SLSH ,KC_TRNS + ,KC_SLSH ,KC_4 ,KC_5 ,KC_6 ,KC_ASTR ,KC_TRNS + ,LSFT(KC_TAB),KC_BSLS ,KC_1 ,KC_2 ,KC_3 ,KC_MINS ,KC_TRNS + ,GUI_T(KC_0),ALT_T(KC_DOT),ALL_T(KC_EQL),MEH_T(KC_PLUS),CTL_T(KC_ENT) + ,KC_HOME ,KC_END + ,KC_PGUP + ,KC_PGDN ,KC_BSPC ,KC_DEL ), -/* Keymap 6: Media Lock Layer +/******* Media Layer ******************************************************************************************************* * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | LOCK | F11 | F12 | F13 | F14 | F15 | | | | F16 | F17 | F18 | F19 | F20 | LOCK | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Media |ShutDn|LClick| MsUp |RClick|Vol Up|ScrlUp| |ScrlUp|PrtScr| Home | Up | PgUp | Mail | Media | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | | Sleep|MsLeft|MsDown|MsRght|Vol Dn|------| |------|NumLok| Left | Down | Right|MyComp| | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | LShift | | |MsDown| | Mute |ScrlDn| |ScrlDn| | End | Down | PgDn | | RShift | - * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | LCtrl| Meh |Hyper | LAlt | LGui | |Insert|Delete| Hyper| LAlt | LGui | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | Stop |Refrsh| | Prev | Next | - * ,------|------|------| |------+------+------. - * |Brwser|Brwser|Search| |VolUp | | | - * |Back | Fwd |------| |------| Stop | Play-| - * | | | Home | |VolDn | | Pause| - * `--------------------' `--------------------' + * ,---------------------------------------------------------------. ,---------------------------------------------------------------. + * | | F11 | F12 | F13 | F14 | F15 | Esc | | | F16 | F17 | F18 | F19 | F20 | | + * |------+---------+---------+---------+---------+----------------| |------+---------+---------+---------+---------+---------+------| + * | |Shut Down|MouseUpLf|Mouse Up |MouseUpRg|Volume Up|Scroll| |Scroll|PrintScrn| Home | Up | PgUp | Mail | | + * |------+---------+---------+---------+---------+---------| Up | | Up |---------+---------+---------+---------+---------+------| + * | | Sleep |MouseLeft|MouseDown|MouseRght|Volume Dn|------| |------| Num Lock| Left | Down | Right | MyComp | | + * |------+---------+---------+---------+---------+---------|Scroll| |Scroll|---------+---------+---------+---------+---------+------| + * | | |MouseDnLf|MouseDown|MouseDnRg| Mute | Down | | Down | | End | Down | PgDn | | | + * `------+---------+---------+---------+---------+----------------' `----------------+---------+---------+---------+---------+------' + * |LCtrl| Meh | MClick | LClick | R Click| |Cmd/Insrt|Optn/Del | Hyper | Meh |RCtrl| + * `---------------------------------------------' `---------------------------------------------' + * ,-------------. ,-------------. + * | Stop |Refrsh| | Prev | Next | + * ,------|------|------| |------+------+------. + * |Brwser|Brwser|Search| |VolUp | | | + * |Back | Fwd |------| |------| Stop | Play-| + * | | | Home | |VolDn | | Pause| + * `--------------------' `--------------------' */ -[MDIA_LK] = KEYMAP( +[MDIA] = KEYMAP( // left hand - MO(MDIA_UN),KC_F11 ,KC_F12 ,KC_F13 ,KC_F14 ,KC_F15 ,KC_NO -,MO(UNLOCK) ,KC_POWER ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_VOLU ,KC_WH_U -,KC_NO ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD -,KC_LSFT ,KC_NO ,KC_NO ,KC_MS_D ,KC_NO ,KC_MUTE ,KC_WH_D -,KC_LCTL ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI - ,KC_WSTP ,KC_WREF - ,KC_WSCH - ,KC_WBAK ,KC_NO ,KC_WHOM + KC_TRNS ,KC_F11 ,KC_F12 ,KC_F13 ,KC_F14 ,KC_F15 ,KC_ESC +,KC_TRNS ,KC_POWER ,M(MUL) ,KC_MS_U ,M(MUR) ,KC_VOLU ,KC_WH_U +,KC_TRNS ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_VOLD +,KC_TRNS ,KC_NO ,M(MDL) ,KC_MS_D ,M(MDR) ,KC_MUTE ,KC_WH_D +,KC_LCTL ,KC_MEH ,KC_BTN3 ,KC_BTN1 ,KC_BTN2 + ,KC_WSTP ,KC_WREF + ,KC_WSCH + ,KC_WBAK ,KC_NO ,KC_WHOM // right hand - ,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,MO(MDIA_UN) - ,KC_WH_U ,KC_PSCR ,KC_HOME,KC_UP ,KC_PGUP ,KC_MAIL ,MO(UNLOCK) - ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_NO - ,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_RSFT - ,GUI_T(KC_INS),ALT_T(KC_DEL),ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL + ,KC_NO ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,KC_TRNS + ,KC_WH_U ,KC_PSCR ,KC_HOME ,KC_UP ,KC_PGUP ,KC_MAIL ,KC_TRNS + ,KC_NLCK ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_TRNS + ,KC_WH_D ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_TRNS + ,GUI_T(KC_INS),ALT_T(KC_DEL),KC_HYPR ,KC_MEH ,KC_RCTL ,KC_MPRV ,KC_MNXT ,KC_VOLU ,KC_VOLD ,KC_MSTP ,KC_MPLY - ), - -/* Keymap 7: Media Unlock Layer - * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | | Esc | | | | | | | | | | | | Bspc | | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | UNLOCK | | | | | | | | | | | | | | UNLOCK | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | | | | | | |------| |------| | | | | | | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Caps LOCK | | | | | | | | | | | | | | Caps LOCK | - * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | | | | | | | | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `--------------------' - */ -[MDIA_UN] = KEYMAP( -// left hand - KC_TRNS ,KC_ESC ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS -,KC_FN1 ,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_CAPS ,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_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1 - ,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_CAPS - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS - - ,KC_TRNS ,KC_TRNS - ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS - ), +), -/* Keymap 8: Unlock Layer +/******* Special Layer ***************************************************************************************************** * * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | UNLOCK | | | | | | | | | | | | | | UNLOCK | + * | | Esc | | | | | | | | | | | | Bspc | | * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| * | | | | | | | | | | | | | | | | * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| * | | | | | | |------| |------| | | | | | | * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | | | | | | | | | | | | | | | | + * | | | | | | | | | | | | | | | RShift | * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' @@ -389,9 +184,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ -[UNLOCK] = KEYMAP( +[SPEC] = KEYMAP( // left hand - KC_FN1 ,KC_ESC ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS + KC_TRNS ,KC_ESC ,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_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS @@ -399,39 +194,231 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,KC_TRNS ,KC_TRNS ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS - - // right hand - ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1 - ,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_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_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,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_RSFT + ,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_CLEAR(ON_PRESS) // FN1 - clear to base layer - ,[2] = ACTION_LAYER_INVERT(SYMB_LK, ON_PRESS) // FN2 - toggle to Symbols on press - ,[3] = ACTION_LAYER_INVERT(MDIA_LK, ON_PRESS) // FN3 - toggle to Media on press + // the faux shift keys are implemented as macro taps + [LCaps] = ACTION_MACRO_TAP(LCaps) + ,[LSymb] = ACTION_MACRO_TAP(LSymb) + ,[LMdia] = ACTION_MACRO_TAP(LMdia) + ,[LSpec] = ACTION_MACRO_TAP(LSpec) + ,[RCaps] = ACTION_MACRO_TAP(RCaps) + ,[RSymb] = ACTION_MACRO_TAP(RSymb) + ,[RMdia] = ACTION_MACRO_TAP(RMdia) + ,[RSpec] = ACTION_MACRO_TAP(RSpec) }; +uint16_t caps_shift = 0; +uint16_t symb_shift = 0; +uint16_t mdia_shift = 0; + +bool symb_lock = false; +bool mdia_lock = false; + 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: + switch(id) { + // There are two shift keys for each layer so we increment a layer_shift var when one + // is pressed and decrement when one is released. If both are pressed at the same time + // then the layer is locked (or unlocked). The shift counts are bound between 0 and 2 + // only because sometimes rapid pressing led to irregular events; this way the states + // are self healing during use. + + case LCaps: // both caps-shift keys trigger Left Shift + case RCaps: // so they don't interfere with the magic combo + if (record->event.pressed && !record->tap.count) { + if(++caps_shift > 2) caps_shift = 2; + if(caps_shift == 2) { + register_code(KC_CAPS); + unregister_code(KC_CAPS); + } else if(caps_shift == 1) { + register_code(KC_LSFT); + } + } else { + if(--caps_shift < 0) caps_shift = 0; + if(caps_shift == 0) unregister_code(KC_LSFT); + } + break; + + case LSymb: + if (record->event.pressed) { + if(++symb_shift > 2) symb_shift = 2; + if(symb_shift == 2) { + symb_lock = !symb_lock; + } else if(symb_shift == 1) { + layer_on(SYMB); + } + } else { + if(--symb_shift < 0) symb_shift = 0; + if((symb_shift == 0) && (!symb_lock)) layer_off(SYMB); + } + break; + + case LMdia: + if (record->event.pressed) { + if (record->tap.count && (!mdia_shift) && (!mdia_lock)) { + register_code(KC_TAB); + } else { + if(++mdia_shift > 2) mdia_shift = 2; + if(mdia_shift == 2) { + mdia_lock = !mdia_lock; + } else if(mdia_shift == 1) { + layer_on(MDIA); + } + } + } else { + if(record->tap.count && (!mdia_shift) && (!mdia_lock)) { + unregister_code(KC_TAB); + } else { + if(--mdia_shift < 0) mdia_shift = 0; + if((!mdia_shift) && (!mdia_lock)) layer_off(MDIA); + } + } + break; + + case LSpec: + if (record->event.pressed) { + if (record->tap.count && !record->tap.interrupted) { + register_code(KC_GRV); + } else { + layer_on(SPEC); + } + } else { + if(record->tap.count && !record->tap.interrupted) { + unregister_code(KC_GRV); + } else { + layer_off(SPEC); + } + } + break; + + case RSymb: + if (record->event.pressed) { + if (record->tap.count && (!symb_shift) && (!symb_lock)) { + register_code(KC_QUOT); + } else { + if(++symb_shift > 2) symb_shift = 2; + if(symb_shift == 2) { + symb_lock = !symb_lock; + } else if(symb_shift == 1) { + layer_on(SYMB); + } + } + } else { + if(record->tap.count && symb_shift == 0) { + unregister_code(KC_QUOT); + } else { + if(--symb_shift < 0) symb_shift = 0; + if((!symb_shift) && (!symb_lock)) layer_off(SYMB); + } + } + break; + + case RMdia: + if (record->event.pressed) { + if (record->tap.count && (!mdia_shift) && (!mdia_lock)) { + register_code(KC_BSLS); + } else { + if(++mdia_shift > 2) mdia_shift = 2; + if(mdia_shift == 2) { + mdia_lock = !mdia_lock; + } else if(mdia_shift == 1) { + layer_on(MDIA); + } + } + } else { + if(record->tap.count && (!mdia_shift) && (!mdia_lock)) { + unregister_code(KC_BSLS); + } else { + if(--mdia_shift < 0) mdia_shift = 0; + if((!mdia_shift) && (!mdia_lock)) layer_off(MDIA); + } + } + break; + + case RSpec: + if (record->event.pressed) { + if (record->tap.count && !record->tap.interrupted) { + register_code(KC_EQL); + } else { + layer_on(SPEC); + } + } else { + if(record->tap.count && !record->tap.interrupted) { + unregister_code(KC_EQL); + } else { + layer_off(SPEC); + } + } + break; + + // mouse diagonals + + case MUL: // mouse up left + if (record->event.pressed) { + mousekey_on(KC_MS_UP); + mousekey_on(KC_MS_LEFT); + mousekey_send(); + } else { + mousekey_off(KC_MS_UP); + mousekey_off(KC_MS_LEFT); + mousekey_send(); + } + break; + + case MUR: // mouse up right + if (record->event.pressed) { + mousekey_on(KC_MS_UP); + mousekey_on(KC_MS_RIGHT); + mousekey_send(); + } else { + mousekey_off(KC_MS_UP); + mousekey_off(KC_MS_RIGHT); + mousekey_send(); + } + break; + + case MDL: // mouse down left if (record->event.pressed) { - register_code(KC_RSFT); + mousekey_on(KC_MS_DOWN); + mousekey_on(KC_MS_LEFT); + mousekey_send(); } else { - unregister_code(KC_RSFT); + mousekey_off(KC_MS_DOWN); + mousekey_off(KC_MS_LEFT); + mousekey_send(); } break; - } + + case MDR: // mouse down right + if (record->event.pressed) { + mousekey_on(KC_MS_DOWN); + mousekey_on(KC_MS_RIGHT); + mousekey_send(); + } else { + mousekey_off(KC_MS_DOWN); + mousekey_off(KC_MS_RIGHT); + mousekey_send(); + } + break; + + default: + // none + break; + } + return MACRO_NONE; }; @@ -442,31 +429,22 @@ void matrix_init_user(void) { // Runs constantly in the background, in a loop. void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); - // shift or caps lock turns on red light - if((keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) { + if(caps_shift || (keyboard_report->mods & MOD_BIT(KC_RSFT)) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) { ergodox_right_led_1_on(); } else { ergodox_right_led_1_off(); } - // do not change lights while locking and unlocking - if(layer == LOCK || layer == SYMB_UN || layer == MDIA_UN || layer == UNLOCK) { - return; - } - - //ergodox_board_led_off(); - - // symbol turns on green light - if(layer == SYMB_SH || layer == SYMB_LK) { + // Symbol layer turns on green light + if(layer_state & (1UL<<SYMB)) { ergodox_right_led_2_on(); } else { ergodox_right_led_2_off(); } - // media turns on blue light - if(layer == MDIA_SH || layer == MDIA_LK) { + // Media layer turns on blue light + if(layer_state & (1UL<<MDIA)) { ergodox_right_led_3_on(); } else { ergodox_right_led_3_off(); diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png Binary files differindex 69af8df4e1..9c561a10aa 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt index 04792f2dfc..25731ea2e6 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt @@ -1,7 +1,7 @@ [{x:3.5},"#\n3",{x:10.5},"*\n8"], [{y:-0.875,x:2.5},"@\n2",{x:1},"$\n4",{x:8.5},"&\n7",{x:1},"(\n9"], [{y:-0.875,x:5.5},"%\n5",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc"},"_\n\n\n\n\n\n-","^\n6"], -[{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n~\n\n\n\nLock\n`",{c:"#cccccc"},"!\n1",{x:14.5},")\n0",{c:"#2277ff",w:1.5},"+\n\nShift\n\n\n\n=\nLock"], +[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n~\n\n\n\nShift\n`",{c:"#cccccc"},"!\n1",{x:14.5},")\n0",{c:"#2277ff",w:1.5},"+\n\nSpecial\n\n\n\n=\nShift"], [{y:-0.375,x:3.5,c:"#cccccc"},"E",{x:10.5},"I"], [{y:-0.875,x:2.5},"W",{x:1},"R",{x:8.5},"U",{x:1},"O"], [{y:-0.875,x:5.5},"T",{h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]","Y"], @@ -14,7 +14,7 @@ [{y:-0.75,x:3.5,c:"#cccccc"},"C",{x:10.5},"<\n,"], [{y:-0.875,x:2.5},"X",{x:1},"V",{x:8.5},"M",{x:1},">\n."], [{y:-0.875,x:5.5},"B",{x:6.5},"N"], -[{y:-0.875,c:"#2277ff",fa:[0,1,0,1,0,0,0],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc"},"Z",{x:14.5,f:3},"?\n/",{c:"#2277ff",w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], +[{y:-0.875,c:"#2277ff",w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#cccccc"},"Z",{x:14.5},"?\n/",{c:"#2277ff",w:1.5},"\n\nCapitals\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5},"Option\n\n\nRAlt"], [{y:-0.875,x:2.5},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5},"Cmd\n\n\nSuper",{x:1},"Hyper"], [{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Ctrl\n\n\nRCtrl"], diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png Binary files differindex 0ae162431d..99e5ed80b1 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt index cc4c877ebd..4eccc9f350 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt @@ -1,22 +1,22 @@ [{x:3.5,c:"#99de2a"},"F13",{x:10.5},"F18"], [{y:-0.875,x:2.5},"F12",{x:1},"F14",{x:8.5},"F17",{x:1},"F19"], -[{y:-0.875,x:5.5},"F15",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc",a:7},"",{c:"#99de2a",a:4},"F16"], -[{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n\n\n\n\nLock",{c:"#99de2a"},"F11",{x:14.5},"F20",{c:"#2277ff",w:1.5},"\n\nShift\n\n\n\n\nLock"], +[{y:-0.875,x:5.5},"F15",{c:"#ff4444"},"Esc",{x:4.5,c:"#737373",a:7},"",{c:"#99de2a",a:4},"F16"], +[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n\n\n\n\nShift",{c:"#99de2a"},"F11",{x:14.5},"F20",{c:"#2277ff",w:1.5},"\n\nSpecial\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nUp",{x:10.5},"Cursor\n\n\n\n\n\nUp"], -[{y:-0.875,x:2.5},"Left\n\n\n\n\n\nClick",{x:1},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#ffb063"},"Home",{x:1},"Page\n\n\n\n\n\nUp"], +[{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nUpLeft",{x:1},"Mouse\n\n\n\n\n\nUpRgt",{x:8.5,c:"#ffb063"},"Home",{x:1},"Page\n\n\n\n\n\nUp"], [{y:-0.875,x:5.5,c:"#e6e067"},"Vol\n\n\n\n\n\nUp",{c:"#ffb063",h:1.5},"Scroll\n\n\n\n\n\nUp",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nUp",{c:"#e6e067"},"Print\n\n\n\n\n\nScreen"], [{y:-0.875,c:"#000000",t:"#ff0000",w:1.5},"Media\n\n\n\n\n\nShift",{c:"#e6e067",t:"#000000"},"Shut\n\n\n\n\n\nDown",{x:14.5},"Mail",{c:"#000000",t:"#ff0000",w:1.5},"\n\nMedia\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#ff8500",t:"#000000"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"], [{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nLeft",{x:1},"Mouse\n\n\n\n\n\nRight",{x:8.5},"Cursor\n\n\n\n\n\nLeft",{x:1},"Cursor\n\n\n\n\n\nRight"], [{y:-0.875,x:5.5,c:"#e6e067"},"Vol\n\n\n\n\n\nDown",{x:6.5},"Num\n\n\n\n\n\nLock"], -[{y:-0.875,c:"#cccccc",a:7,w:1.5},"",{c:"#e6e067",a:4},"Sleep",{x:14.5},"My\n\n\n\n\n\nComp",{c:"#cccccc",a:7,w:1.5},""], -[{y:-0.625,x:6.5,c:"#ffb063",a:4,h:1.5},"Scroll\n\n\n\n\n\nDown",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nDown"], +[{y:-0.875,c:"#2277ff",w:1.5},"Symbols\n\n\n\n\n\nShift",{c:"#e6e067"},"Sleep",{x:14.5},"My\n\n\n\n\n\nComp",{c:"#2277ff",w:1.5},"\n\nSymbols\n\n\n\n\nShift"], +[{y:-0.625,x:6.5,c:"#ffb063",h:1.5},"Scroll\n\n\n\n\n\nDown",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nDown"], [{y:-0.75,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"], -[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1},"",{x:8.5,c:"#ffb063",a:4},"End",{x:1},"Page\n\n\n\n\n\nDown"], -[{y:-0.875,x:5.5,c:"#e6e067"},"Mute",{x:6.5,c:"#cccccc",a:7},""], -[{y:-0.875,c:"#2277ff",a:4,f2:1,w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], -[{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5,c:"#ffb063"},"Delete\n\n\nOption"], -[{y:-0.875,x:2.5,c:"#77aaff"},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5,c:"#ffb063"},"Insert\n\n\nCmd",{x:1,c:"#77aaff"},"Hyper"], +[{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nDnLeft",{x:1},"Mouse\n\n\n\n\n\nDnRgt",{x:8.5,c:"#ffb063"},"End",{x:1},"Page\n\n\n\n\n\nDown"], +[{y:-0.875,x:5.5,c:"#e6e067"},"Mute",{x:6.5,c:"#737373",a:7},""], +[{y:-0.875,c:"#2277ff",a:4,w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#737373",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,w:1.5},"\n\nCapitals\n\n\n\n\nShift"], +[{y:-0.375,x:3.5,c:"#ff8500"},"Middle\n\n\n\n\n\nClick",{x:10.5,c:"#ffb063",fa:[0,0,0,1]},"Delete\n\n\nOption"], +[{y:-0.875,x:2.5,c:"#ff8500"},"Left\n\n\n\n\n\nClick",{x:1},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#ffb063"},"Insert\n\n\nCmd",{x:1,c:"#77aaff"},"Hyper"], [{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Crtl\n\n\nRCtrl"], [{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#ccbb00"},"Stop\n\n\nBrowser","Reload\n\n\nBrowser"], [{h:2},"< Web\n\n\nBrowser",{h:2},"Web >\n\n\nBrowser","Search\n\n\nBrowser"], diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png Binary files differnew file mode 100644 index 0000000000..6eecf447ee --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt new file mode 100644 index 0000000000..a08827c6de --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt @@ -0,0 +1,27 @@ +[{x:3.5,a:7},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{c:"#ff4444",a:4},"Esc",{x:4.5,c:"#cccccc",a:7},"",""], +[{y:-0.875,c:"#000000",t:"#ff0000",a:4,w:1.5},"Special\n\n\n\n\n\nShift",{c:"#ff4444",t:"#000000"},"Esc",{x:14.5,c:"#54d6de"},"Back\n\n\n\n\n\nspace",{c:"#000000",t:"#ff0000",w:1.5},"\n\nSpecial\n\n\n\n\nShift"], +[{y:-0.375,x:3.5,c:"#cccccc",t:"#000000",a:7},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{h:1.5},"",{x:4.5,h:1.5},"",""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.375,x:3.5},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{x:6.5},""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""], +[{y:-0.625,x:6.5,h:1.5},"",{x:4.5,h:1.5},""], +[{y:-0.75,x:3.5},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.875,x:5.5},"",{x:6.5},""], +[{y:-0.875,w:1.5},"","",{x:14.5},"",{c:"#2277ff",w:1.5},"RShift"], +[{y:-0.375,x:3.5,c:"#cccccc"},"",{x:10.5},""], +[{y:-0.875,x:2.5},"",{x:1},"",{x:8.5},"",{x:1},""], +[{y:-0.75,x:0.5},"","",{x:14.5},"",""], +[{r:30,rx:6.5,ry:4.25,y:-1,x:1},"",""], +[{h:2},"",{h:2},"",""], +[{x:2},""], +[{r:-30,rx:13,y:-1,x:-3},"",""], +[{x:-3},"",{h:2},"",{h:2},""], +[{x:-3},""] + diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png Binary files differindex b3101e5c04..e4de64a96f 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt index 35efdba7d6..e199f5c59f 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt @@ -1,7 +1,7 @@ [{x:3.5,c:"#99de2a"},"F3",{x:10.5},"F8"], [{y:-0.875,x:2.5},"F2",{x:1},"F4",{x:8.5},"F7",{x:1},"F9"], [{y:-0.875,x:5.5},"F5",{c:"#ff4444"},"Esc",{x:4.5,c:"#bbddbb"},"_\n\n\n\n\n\n-",{c:"#99de2a"},"F6"], -[{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n\n\n\n\nLock",{c:"#99de2a"},"F1",{x:14.5},"F10",{c:"#2277ff",w:1.5},"\n\nShift\n\n\n\n\nLock"], +[{y:-0.875,c:"#2277ff",w:1.5},"Special\n\n\n\n\n\nShift",{c:"#99de2a"},"F1",{x:14.5},"F10",{c:"#2277ff",w:1.5},"\n\nSpecial\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#bbddbb"},"{",{x:10.5,c:"#89b087"},"8"], [{y:-0.875,x:2.5,c:"#bbddbb"},"@",{x:1},"}",{x:8.5,c:"#89b087"},"7",{x:1},"9"], [{y:-0.875,x:5.5,c:"#bbddbb"},"&",{h:1.5},"<",{x:4.5,h:1.5},">","|"], @@ -14,7 +14,7 @@ [{y:-0.75,x:3.5,c:"#bbddbb"},"[",{x:10.5,c:"#89b087"},"2"], [{y:-0.875,x:2.5,c:"#bbddbb"},"^",{x:1},"]",{x:8.5,c:"#89b087"},"1",{x:1},"3"], [{y:-0.875,x:5.5,c:"#bbddbb"},"~",{x:6.5},"\\"], -[{y:-0.875,c:"#2277ff",fa:[0,1,0,1,0,0,1],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#bbddbb"},"%",{x:14.5,c:"#89b087"},"-",{c:"#2277ff",w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"], +[{y:-0.875,c:"#2277ff",w:1.5},"Capitals\n\n\n\n\n\nShift",{c:"#bbddbb"},"%",{x:14.5,c:"#89b087"},"-",{c:"#2277ff",w:1.5},"\n\nCapitals\n\n\n\n\nShift"], [{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5,c:"#89b087"},".\n\n\nOption"], [{y:-0.875,x:2.5,c:"#77aaff"},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5,c:"#89b087"},"0\n\n\nCmd",{x:1},"=\n\n\nHyper"], [{y:-0.75,x:0.5,c:"#77aaff"},"Ctrl\n\n\nLCtrl","Meh",{x:14.5,c:"#89b087"},"+\n\n\nMeh","Enter\n\n\nCtrl"], @@ -22,6 +22,6 @@ [{h:2},"Space",{h:2},"Enter","Up"], [{x:2},"Down"], [{r:-30,rx:13,y:-1,x:-3},"Home","End"], -[{x:-3,f:3},"Page\n\n\n\n\n\nUp",{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete"], -[{x:-3,f:3},"Page\n\n\n\n\n\nDown"] +[{x:-3},"Page\n\n\n\n\n\nUp",{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete"], +[{x:-3},"Page\n\n\n\n\n\nDown"] diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex index 8e2d5ce26d..1e740e4f39 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex +++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex @@ -1,1190 +1,1202 @@ -:100000000C945F040C94A3040C94A3040C94A30418
-:100010000C94A3040C94A3040C94A3040C94A304C4
-:100020000C94A3040C94A3040C94C40D0C94960E8D
-:100030000C94A3040C94A3040C94A3040C94A304A4
-:100040000C94A3040C9441230C94A3040C94A304D7
-:100050000C94A3040C94E31C0C94A3040C94A3042C
-:100060000C94A3040C94A3040C94A3040C94A30474
-:100070000C94A3040C94A3040C94A3040C94A30464
-:100080000C94A3040C94A3040C94A3040C94A30454
-:100090000C94A3040C94A3040C94A3040C94A30444
-:1000A0000C94A3040C94A3040C94A304FB0E1D0F46
-:1000B00008101D0F08105F0F820F0810D70FEA0FEE
-:1000C000DE12DE120C130C134E138A138A158A15D6
-:1000D000A2138A159914991464158A158A1578152E
-:1000E000000000810889248935812B850252E100B6
-:1000F000E00000001E00140004001D0000774E0008
-:100100001F001A0016001B00007F4C002000080092
-:1001100007000600E2002A0021001500090019006E
-:10012000E3004B00220017000A00050000004A000F
-:1001300029002F0000002B0200004D002D00300090
-:1001400000002B000000500023001C000B001100D9
-:1001500000004F00240018000D001000E7005200BE
-:1001600025000C000E003600E6002C0026001200D0
-:100170000F003700007F28002700130033003800ED
-:10018000007751002E8131853482E500E4000000C3
-:100190000100C300C2003900010000002900010075
-:1001A0000100010001000100010001000100010047
-:1001B0000100010001000100010001000100010037
-:1001C0000100010001000100010001000100010027
-:1001D0000100010000000100010001000000010019
-:1001E000000001000100010000000100000001000A
-:1001F00001000100010001000000010001000100F8
-:1002000001000100010001000100010001000100E6
-:1002100001000100010001000100010001000100D6
-:100220002A00010001000100010001000100C300DB
-:10023000C200390001000000C20005520252E10074
-:10024000010000003A001E022002220201005100BB
-:100250003B001F0221022302010028003C002F0264
-:1002600026022F0001002C003D0030022702300042
-:10027000010052003E00240235003502000050000B
-:100280000100360200002B0000004F002D00370255
-:1002900000002B0200004A003F003102380031000C
-:1002A00000004D004000240021001E0027784B0074
-:1002B0004100250022001F0037744C004200260038
-:1002C000230020002E7F2A004300380025022D0045
-:1002D0002E774E00C20005520252E5002871000040
-:1002E000045205520852E100010000003A001E02CB
-:1002F00020022202010051003B001F0221022302C2
-:10030000010028003C002F0226022F0001002C00D3
-:100310003D00300227023000010052003E0024025E
-:1003200035003502000050000100360200002B00AD
-:1003300000004F002D00370200002B0200004A0091
-:100340003F0031023800310000004D004000240021
-:1003500021001E0027784B004100250022001F00CD
-:1003600037744C0042002600230020002E7F2A0014
-:100370004300380025022D002E774E00045205520E
-:100380000852E5002871000001000654C100390040
-:10039000010000002900010001000100010001002E
-:1003A0000100010001000100010001000100010045
-:1003B0000100010001000100010001000100010035
-:1003C0000100010001000100010001000000010026
-:1003D0000100010000000100000001000100010017
-:1003E0000000010000000100010001000100010007
-:1003F00000000100010001000100010001000100F6
-:1004000001000100010001000100010001000100E4
-:1004100001000100010001002A00010001000100AB
-:100420000100010001000654C10039000100000074
-:10043000C30005520252E100E000000044006600E3
-:10044000A60000000077B5004500F400F2000000AF
-:10045000007F00006800F000F100F100E200B6004B
-:100460006900F500F3000000E300B4006A00A90091
-:10047000AA00A8000000B8000000F9000000FA007F
-:100480000000B9000000F9000000FA000000AC0014
-:100490006B004600530000000000AB006C004A00F7
-:1004A00050004D004978A9006D00520051005100E4
-:1004B0004C74AE006E004B004F004E00007FAD004C
-:1004C0006F00B100B30000000077AA00C30005521E
-:1004D0000252E500E4000000075208520000E1006B
-:1004E000E000000044006600A60000000077B500B0
-:1004F0004500F400F2000000007F00006800F000FA
-:10050000F100F100E200B6006900F500F300000020
-:10051000E300B4006A00A900AA00A8000000B80027
-:100520000000F9000000FA000000B9000000F90026
-:100530000000FA000000AC006B0046005300000011
-:100540000000AB006C004A0050004D004978A90043
-:100550006D005200510051004C74AE006E004B0013
-:100560004F004E00007FAD006F00B100B3000000EF
-:100570000077AA00075208520000E500E4000000DE
-:100580000100C10001003900010000002900010044
-:100590000100010001000100010001000100010053
-:1005A0000100010001000100010001000100010043
-:1005B0000100010001000100010001000100010033
-:1005C0000100010000000100010001000000010025
-:1005D0000000010001000100000001000000010016
-:1005E0000100010001000100000001000100010004
-:1005F00001000100010001000100010001000100F3
-:1006000001000100010001000100010001000100E2
-:100610002A00010001000100010001000100C100E9
-:100620000100390001000000C100010001000100CB
-:10063000010000002900010001000100010001008B
-:1006400001000100010001000100010001000100A2
-:100650000100010001000100010001000100010092
-:100660000100010001000100010001000000010083
-:100670000100010000000100000001000100010074
-:100680000000010000000100010001000100010064
-:100690000000010001000100010001000100010053
-:1006A0000100010001000100010001000100010042
-:1006B0000100010001000100010001000100010032
-:1006C00001000100C1000100010001000100000063
-:1006D00016034500720067006F0044006F00780049
-:1006E000200045005A000000160345007200670014
-:1006F0006F0044006F007800200045005A000000A1
-:100700000403090409026D00040100A0FA090400B1
-:10071000000103010100092111010001223F00072E
-:1007200005810308000A0904010001030102000910
-:100730002111010001224D000705820308000A096A
-:10074000040200010300000009211101000122360A
-:10075000000705830308000A0904030001030000E1
-:10076000000921110100012239000705840310004E
-:10077000011201100100000008EDFE071301000145
-:1007800002000105010906A101050719E029E71585
-:1007900000250195087501810205081901290595B3
-:1007A000057501910295017503910105071900294D
-:1007B0007715002501957875018102C00501098032
-:1007C000A101850216010026B7001A01002AB70010
-:1007D000751095018100C0050C0901A10185031662
-:1007E0000100269C021A01002A9C027510950181C5
-:1007F00000C005010902A1010901A10005091901B3
-:1008000029051500250195057501810295017503DE
-:1008100081010501093009311581257F950275088F
-:10082000810609381581257F950175088106050C1B
-:100830000A38021581257F950175088106C0C0051B
-:10084000010906A101050719E029E7150025019511
-:1008500008750181029501750881010508190129B2
-:10086000059505750191029501750391010507191B
-:100870000029FF150025FF950675088100C00000BE
-:10088000000000000000000000010204060A0F172B
-:10089000202C3A4A5D71879DB3C7DAE9F5FCFFFC6D
-:1008A000F5E9DAC7B39D87715D4A3A2C20170F0A24
-:1008B00006040201000000000000000000001124F6
-:1008C0001FBECFEFDAE0DEBFCDBF04B603FE24C00B
-:1008D0008091EF019091F001A091F101B091F201AE
-:1008E0008730904BA740B04BB9F41092EF011092B3
-:1008F000F0011092F1011092F20114BE84B7877FCB
-:1009000084BF88E10FB6F894809360001092600075
-:100910000FBEE0E0FFE3099511E0A0E0B1E0E6E002
-:10092000FAE402C005900D92A433B107D9F721E093
-:10093000A4E3B1E001C01D92AF3EB207E1F70E940F
-:100940000A0B0C9401250C94000061110BC0FC01F2
-:100950008281882321F085EE0E946B1103C085EE11
-:100960000E94331280E090E008950895CF93609143
-:10097000B1017091B2018091B3019091B4010E94D4
-:100980000F1CC82FE0910E01F0910F01808182723F
-:1009900019F0259A2D9A06C00E94431081FDF9CFC7
-:1009A00025982D98C130B9F0C430A9F089EF8C0F8B
-:1009B000823088F08EEF8C0F823018F4269A2E9AAF
-:1009C00002C026982E98C550C23018F4279A2F9A44
-:1009D00002C027982F98CF9108950C94B60456988A
-:1009E0005E9825982D9826982E9827982F988FEF07
-:1009F00090E0909389008093880090938B0080937F
-:100A00008A0090938D0080938C00259A2D9A2FEF69
-:100A100080E792E0215080409040E1F700C0000064
-:100A2000269A2E9A2FEF80E792E021508040904046
-:100A3000E1F700C00000279A2F9A2FEF80E792E09D
-:100A4000215080409040E1F700C0000025982D988B
-:100A50002FEF80E792E0215080409040E1F700C006
-:100A6000000026982E982FEF80E792E021508040DA
-:100A70009040E1F700C0000027982F9856985E98A4
-:100A800025982D9826982E9827982F98089589EACA
-:100A90008093800089E08093810024982C983F986F
-:100AA0008AB18F748AB96E98479A8BB1806B8BB973
-:100AB000769A0E94EF040C94B50480E280930001C2
-:100AC0008091340181110EC00E94AC0581E08093B9
-:100AD00034012FEF83ED90E3215080409040E1F707
-:100AE00000C0000080E40E94B205809300018111E3
-:100AF0002EC00E94DC0580930001811128C00E9455
-:100B0000DC0580930001811122C08FE30E94DC0587
-:100B10008093000181111BC00E94D40580E40E94D3
-:100B2000B20580930001811112C08CE00E94DC05A7
-:100B30008093000181110BC00E94DC0580930001AD
-:100B4000811105C08FE30E94DC05809300010E94A3
-:100B5000D4058091000108951092B9008AE0809335
-:100B6000B800089594EA9093BC009091BC0097FF60
-:100B7000FCCF9091B900987F983021F0903111F01E
-:100B800081E008958093BB0084E88093BC0080914D
-:100B9000BC0087FFFCCF8091B900887F883111F0BD
-:100BA000803471F780E0089584E98093BC008091DF
-:100BB000BC0084FDFCCF08958093BB0084E8809343
-:100BC000BC008091BC0087FFFCCF9091B900987F5A
-:100BD00081E0983209F480E0089584E88093BC00B5
-:100BE0008091BC0087FFFCCF8091BB00089580916D
-:100BF0000001811115C080E40E94B20580930001BC
-:100C000081110CC082E10E94DC05809300018111FA
-:100C100005C08FEF0E94DC05809300010E94D4057F
-:100C200084B1807F84B985B1807F85B98AB1837FA3
-:100C30008AB98BB1837F8BB93E98469808950E94FC
-:100C40005D05809300010E94F70580B38C7080BB26
-:100C500081B3836F81BBE4E4F1E0A6E3B1E01192DC
-:100C60001D9281E0E235F807D1F70C944705BF9259
-:100C7000CF92DF92EF92FF920F931F93CF93DF9368
-:100C800080910001882379F0809135018F5F8093F6
-:100C90003501811108C00E945D058093000181111A
-:100CA00002C00E94EF0406E311E0C0E0D0E0DD24C2
-:100CB000D39482E0C82EEE24E394F12CC73000F5E3
-:100CC00080910001811162C080E40E94B20580938E
-:100CD0000001811112C082E10E94DC0580930001B5
-:100CE00081110BC0C7010C2E01C0880F0A94EAF7CE
-:100CF00080950E94DC05809300010E94D40546C0C7
-:100D0000CA30A1F028F4C83059F0C93061F005C0EC
-:100D1000CC3089F070F0CD3089F0209A289810C03E
-:100D2000219A29980DC0229A2A980AC0239A2B98B2
-:100D300007C0529A01C0539A5B9802C03E9A4698E7
-:100D4000E0EAEA95F1F78FB179995AC092E08170A3
-:100D50008D25892B7C9B02C090E001C094E0892BFB
-:100D60007D9B02C090E001C098E0892B7E9B02C071
-:100D700090E001C090E1892B9FB19095991F992730
-:100D8000991F9295990F907E892B0FC08091000139
-:100D900081114BC080E40E94B2058093000188233A
-:100DA00089F1B12C0E94D4058B2DF8019081981700
-:100DB00019F08083C09201010E94F70521960F5F10
-:100DC0001F4FCE30D10509F079CF809101018823E2
-:100DD00071F1815080930101882339F08FE99FE000
-:100DE0000197F1F700C0000022C0A4E4B1E0E6E3FF
-:100DF000F1E081918D9391E0E434F907D1F717C0C8
-:100E000090E0A5CF83E10E94DC0580930001811171
-:100E1000C8CF81E40E94B205809300018111C1CF47
-:100E20000E94ED05B82EB094BDCF80E0BECF0E94E9
-:100E3000ED0481E0DF91CF911F910F91FF90EF9032
-:100E4000DF90CF90BF900895E82FF0E0EC5BFE4F6D
-:100E50008081089508958B3B910578F4883A910537
-:100E600040F5853A9105D0F48430910508F0B1C081
-:100E70008130910509F4ADC06BC0803E910508F446
-:100E800067C0883E910508F4A4C09C01205F310929
-:100E90002031310508F05CC090650895853A9105D0
-:100EA00009F459C0863A910509F458C083E890E4E2
-:100EB0000895883A910509F454C0893A910509F4D6
-:100EC00053C08A3A910509F452C08B3A910509F44E
-:100ED00051C08C3A910509F450C08D3A910509F43E
-:100EE0004FC0803B910509F44EC08E3A910509F43C
-:100EF0004DC08F3A910509F44CC0813B910509F42E
-:100F00004BC0823B910509F44AC0833B910509F42B
-:100F100049C0843B910509F448C0853B910509F41B
-:100F200047C0863B910509F446C0873B910509F40B
-:100F300045C0883B910509F444C0893B910509F4FB
-:100F400043C08A3B910509F042C08AE296E40895C5
-:100F500080E090E0089581E890E4089582E890E4CC
-:100F6000089582EE94E4089589EE94E408958AEE5B
-:100F700094E4089585EB94E4089586EB94E4089551
-:100F800087EB94E408958CEC94E408958DEC94E45C
-:100F9000089583E895E408958AE895E4089582E940
-:100FA00095E4089584E995E4089581E296E408952E
-:100FB00083E296E4089584E296E4089585E296E457
-:100FC000089586E296E4089587E296E4089580E025
-:100FD00094E40895089596E0799FF001112494E532
-:100FE000899FE00DF11D1124E60FF11DEE0FFF1F8B
-:100FF000E851FF4F859194910895880F991F805A69
-:101000009040FC01859194910895880F991F80521A
-:101010009F4FFC0185919491089526E0729FF00105
-:10102000112444E5849FE00DF11D1124E60FF11D0C
-:10103000EE0FFF1FE851FF4F25913491C9019A959A
-:1010400081159F4110F4C9010895C901905281157D
-:10105000904128F4C9019F700E9405080895C901B4
-:1010600090538115904120F4C9019927906C0895FF
-:10107000211580E5380769F40E94AD159FEF24E340
-:101080004CE0915020404040E1F700C000000C943B
-:10109000081D213080E5380731F48091CD01816051
-:1010A0008093CD010895C90190558115904108F0B4
-:1010B00050C0832F99278F70992781309105D9F4DB
-:1010C000A9014370552702C0880F991F4A95E2F77E
-:1010D0009C68A90164E0440F551F6A95E1F7442715
-:1010E0005370842B952B73E0220F331F7A95E1F711
-:1010F000207633271DC08230910529F4922F88274E
-:10110000816F906A089583309105A9F4A901437015
-:10111000552781E090E002C0880F991F4A95E2F7B9
-:101120009C6843E0220F331F4A95E1F7207E377019
-:10113000822B932B08950497F1F4A901437055274E
-:1011400081E090E002C0880F991F4A95E2F79A6803
-:10115000E8CFC90190578115904120F4C9019F70D3
-:1011600090620895C90190588115904120F4C901F9
-:101170009F70906A0895203E3105E0F4203C3105CF
-:1011800058F52133310509F470C048F4293231058E
-:1011900009F464C02A32310509F46EC074C02933E1
-:1011A0003105F1F022383105D9F02533310509F444
-:1011B0004EC069C0233E310589F138F4203E310527
-:1011C000C1F0223E3105E1F05EC0263E310569F1F5
-:1011D000273E3105A9F157C0C9010E94FD070895B6
-:1011E0008091E00180FD02C081FF4DC080EE90E063
-:1011F0004BC08091E00180FFF9CF89E390E044C0CB
-:101200008091E00182FF0EC08091E00184FF03C065
-:1012100080E090E039C083EE90E036C08091E0013C
-:1012200082FFF2CF82EE90E02FC08091E00183FF39
-:101230000BC08091E00184FDEBCF87EE90E024C0ED
-:101240008091E00183FFF5CF86EE90E01DC0809194
-:10125000E00185FF07C089E290E016C08091E001BF
-:1012600085FFF9CF85E390E00FC08091E00186FF14
-:1012700007C08AE290E008C08091E00186FFF9CFC4
-:1012800081E390E001C0C9010E942B0708950895F1
-:101290000C944709809162010895CF93DF9300D0A9
-:1012A0001F92CDB7DEB72091E601243019F523E077
-:1012B00029839B838A832093E9008FEF9091E80034
-:1012C000815095FD06C095ED9A95F1F700008111CA
-:1012D000F5CF8091E80085FF0DC040E050E063E06D
-:1012E00070E0CE0101960E94B70B8091E8008E77E6
-:1012F0008093E8000F900F900F90DF91CF910895A9
-:10130000CF93DF9300D01F92CDB7DEB72091E601D7
-:10131000243021F522E029839B838A8383E0809314
-:10132000E9008FEF9091E800815095FD06C095EDA2
-:101330009A95F1F700008111F5CF8091E80085FFC3
-:101340000DC040E050E063E070E0CE0101960E94E5
-:10135000B70B8091E8008E778093E8000F900F9094
-:101360000F90DF91CF9108952091E6012430F1F4A0
-:1013700022E02093E9002FEF3091E800215035FD65
-:1013800006C035ED3A95F1F700002111F5CF209117
-:10139000E80025FF0BC040E050E065E070E00E94EF
-:1013A000B70B8091E8008E778093E8000895CF9383
-:1013B000DF93EC018091E601843009F046C0909102
-:1013C0000C019923D9F090910D019923B9F08093E4
-:1013D000E9008FEF9091E800815095FD06C095E1FE
+:100000000C94D7020C941B030C941B030C941B033D
+:100010000C941B030C941B030C941B030C941B03E8
+:100020000C941B030C941B030C94500E0C94220F85
+:100030000C941B030C941B030C941B030C941B03C8
+:100040000C941B030C94A1230C941B030C941B0312
+:100050000C941B030C94451D0C941B030C941B0364
+:100060000C941B030C941B030C941B030C941B0398
+:100070000C941B030C941B030C941B030C941B0388
+:100080000C941B030C941B030C941B030C941B0378
+:100090000C941B030C941B030C941B030C941B0368
+:1000A0000C941B030C941B030C941B032B035F0386
+:1000B0008403C2032B036803A603D00391049104B5
+:1000C00054045E0468047A04870FA90F9410A90FE2
+:1000D0009410EB0F0E1094106310761070137013C1
+:1000E000B113B113F3132F142F162F1647142F1615
+:1000F0003E153E1509162F162F161D16000000007E
+:1001000000000000000000000000000000000000EF
+:100110000AC80BC80CC80DC80EC80FC810C811C833
+:100120000D200C200B300A30E00000001E001400EF
+:1001300004001D0000074E001F001A0016001B00DF
+:10014000000F4C002000080007000600E2002A0013
+:100150002100150009001900E3004B0022001700E0
+:100160000A00050000004A0029002F0000002B02B1
+:1001700000004D002D00300000002B00000050005A
+:1001800023001C000B00110000004F002400180089
+:100190000D001000E700520025000C000E00360094
+:1001A000E6002C00260012000F003700000F280088
+:1001B00027001300330038000007510011201020E1
+:1001C0000F200E30E40000000100010001000100DA
+:1001D000E00000003A001E02200222020007510047
+:1001E0003B001F0221022302000F28003C002F02C7
+:1001F00026022F00E2002C003D00300227023000D2
+:10020000E30052003E002402350035020000500099
+:100210002900360200002B0000004F002D0037029D
+:1002200000002B0200004A003F003102380031007C
+:1002300000004D004000240021001E0027784B00E4
+:100240004100250022001F0037744C0042002600A8
+:10025000230020002E7F2A004300380025022D00B5
+:100260002E774E00010001000100010028710000FE
+:100270000100010001000100E000000044006600F0
+:10028000A60000000007B50045001430F20016304B
+:10029000F60000006800F000F100F100F400B60084
+:1002A00069001530F3001730F500B4006A00A900AA
+:1002B000AA00A8000000B8002900F9000000FA0018
+:1002C0000000B9000000F9000000FA000000AC00D6
+:1002D0006B004600530000000000AB006C004A00B9
+:1002E00050004D004978A9006D00520051005100A6
+:1002F0004C74AE006E004B004F004E00000FAD007E
+:100300006F00B100B30000000007AA000100010067
+:1003100001000100E40000000100010001000100F3
+:10032000010000002900010001000100010001009E
+:1003300001000100010001000100010001000100B5
+:1003400001000100010001000100010001000100A5
+:100350000100010001000100010001000000010096
+:100360000100010000000100000001000100010087
+:100370000000010000000100010001000100010077
+:100380000000010001000100010001000100010066
+:100390000100010001000100010001000100010055
+:1003A00001000100010001002A000100010001001C
+:1003B00001000100010001000100E5000100000052
+:1003C00016034500720067006F0044006F0078005C
+:1003D000200045005A000000160345007200670027
+:1003E0006F0044006F007800200045005A000000B4
+:1003F0000403090409026D00040100A0FA090400C5
+:10040000000103010100092111010001223F000741
+:1004100005810308000A0904010001030102000923
+:100420002111010001224D000705820308000A097D
+:10043000040200010300000009211101000122361D
+:10044000000705830308000A0904030001030000F4
+:100450000009211101000122390007058403100061
+:10046000011201100100000008EDFE071301000158
+:1004700002000105010906A101050719E029E71598
+:1004800000250195087501810205081901290595C6
+:100490000575019102950175039101050719002960
+:1004A0007715002501957875018102C00501098045
+:1004B000A101850216010026B7001A01002AB70023
+:1004C000751095018100C0050C0901A10185031675
+:1004D0000100269C021A01002A9C027510950181D8
+:1004E00000C005010902A1010901A10005091901C6
+:1004F00029051500250195057501810295017503F2
+:1005000081010501093009311581257F95027508A2
+:10051000810609381581257F950175088106050C2E
+:100520000A38021581257F950175088106C0C0052E
+:10053000010906A101050719E029E7150025019524
+:1005400008750181029501750881010508190129C5
+:10055000059505750191029501750391010507192E
+:100560000029FF150025FF950675088100C00000D1
+:10057000000000000000000000010204060A0F173E
+:10058000202C3A4A5D71879DB3C7DAE9F5FCFFFC80
+:10059000F5E9DAC7B39D87715D4A3A2C20170F0A37
+:1005A0000604020100000000000000000000112409
+:1005B0001FBECFEFDAE0DEBFCDBF04B603FE24C01E
+:1005C0008091F6019091F701A091F801B091F901A5
+:1005D0008730904BA740B04BB9F41092F6011092BF
+:1005E000F7011092F8011092F90114BE84B7877FC9
+:1005F00084BF88E10FB6F894809360001092600089
+:100600000FBEE0E0FFE3099511E0A0E0B1E0E0ED0E
+:10061000FAE402C005900D92A433B107D9F721E0A6
+:10062000A4E3B1E001C01D92A63FB207E1F70E942A
+:10063000960B0C9466250C940000DC01462F50E0CC
+:100640004A5051094E30510508F06BC14A5A5F4F6C
+:10065000FA010C94162512962C91129780913A016A
+:1006600090913B012223F9F015962C91207FD9F42B
+:1006700001968330910510F082E090E090933B0169
+:1006800080933A0180913A0190913B01823091052B
+:1006900029F489E30E94F81189E30EC0019709F05B
+:1006A00040C181EEFAC0019790933B0180933A01DB
+:1006B000892B09F036C181EE0E94C01232C1129618
+:1006C0002C918091380190913901222379F090C0CA
+:1006D00012963C91129715962C9180913801909129
+:1006E0003901207F31117AC009F09FC001979093A2
+:1006F000390180933801892B09F013C180913501AC
+:1007000081110FC181E067C012963C911297159636
+:100710002C918091360190913701207F332361F035
+:10072000222309F491C0009709F08EC02091340172
+:1007300021118AC08BE2B1C02223B1F00097A1F44D
+:1007400020913401211110C08BE2B6CF12963C915A
+:10075000129715962C918091360190913701207F48
+:10076000311168C009F08DC00197909337018093D3
+:100770003601892B09F0D5C0809134018111D1C097
+:1007800082E029C012969C91129715968C9199231C
+:10079000B1F0982F907F79F080FD0DC085E37DC08A
+:1007A00012969C91129715968C91992379F0982F17
+:1007B000907F09F06FC083E00E94C31AB2C0982FE7
+:1007C000907F41F080FD06C085E376CF982F907F23
+:1007D00009F066C083E00E94E41AA3C0222341F01E
+:1007E000009731F420913501211102C084E355C0F6
+:1007F00001968330910510F082E090E090933901EA
+:1008000080933801809138019091390182309105AF
+:1008100029F0019709F085C081E0CECF80913501A4
+:1008200091E08927809335017CC0009709F05ECF65
+:1008300084E342CF222341F0009731F42091340128
+:10084000211102C081E329C001968330910510F087
+:1008500082E090E0909337018093360180913601D9
+:10086000909137018230910529F0019709F059C024
+:1008700082E0A2CF8091340191E0892780933401F6
+:1008800050C0009709F070CF2091340121116CCF36
+:1008900081E312CF80FD8FCF8EE20E94F81141C01C
+:1008A00080FD98CF8EE208CF12968C91882319F0A4
+:1008B00080EF90E013C080EF90E017C012968C910B
+:1008C000882319F080EF90E01BC080EF90E021C0FA
+:1008D00012968C91882339F081EF90E00E94B91F25
+:1008E00082EF90E011C081EF90E00E94212082EF22
+:1008F00090E013C012968C91882349F081EF90E02C
+:100900000E94B91F83EF90E00E94B91F08C081EFD9
+:1009100090E00E94212083EF90E00E9421200E941D
+:10092000A62080E090E00895089580913A0190918A
+:100930003B01892B19F0259A2D9A0DC0E0910E01EB
+:10094000F0910F01808185FDF6CF0E94CF1081FDCF
+:10095000F2CF25982D988091B90181FF03C0269A86
+:100960002E9A02C026982E988091B90182FF03C06A
+:10097000279A2F9A089527982F9808950C949504F4
+:1009800056985E9825982D9826982E9827982F98F7
+:100990008FEF90E0909389008093880090938B0074
+:1009A00080938A0090938D0080938C00259A2D9AD5
+:1009B0002FEF80E792E0215080409040E1F700C0A7
+:1009C0000000269A2E9A2FEF80E792E02150804077
+:1009D0009040E1F700C00000279A2F9A2FEF80E7A0
+:1009E00092E0215080409040E1F700C0000025983F
+:1009F0002D982FEF80E792E0215080409040E1F762
+:100A000000C0000026982E982FEF80E792E021503A
+:100A100080409040E1F700C0000027982F9856983A
+:100A20005E9825982D9826982E9827982F980895A7
+:100A300089EA8093800089E08093810024982C9833
+:100A40003F988AB18F748AB96E98479A8BB1806B40
+:100A50008BB9769A0E94C0040C94940480E280932F
+:100A6000000180913C0181110EC00E947D0581E052
+:100A700080933C012FEF83ED90E321508040904024
+:100A8000E1F700C0000080E40E948305809300012C
+:100A900081112EC00E94AD0580930001811128C0F4
+:100AA0000E94AD0580930001811122C08FE30E9456
+:100AB000AD058093000181111BC00E94A50580E453
+:100AC0000E94830580930001811112C08CE00E9476
+:100AD000AD058093000181110BC00E94AD0580938C
+:100AE0000001811105C08FE30E94AD0580930001D4
+:100AF0000E94A5058091000108951092B9008AE036
+:100B00008093B800089594EA9093BC009091BC0043
+:100B100097FFFCCF9091B900987F983021F09031E9
+:100B200011F081E008958093BB0084E88093BC00BD
+:100B30008091BC0087FFFCCF8091B900887F88310D
+:100B400011F0803471F780E0089584E98093BC004F
+:100B50008091BC0084FDFCCF08958093BB0084E8A5
+:100B60008093BC008091BC0087FFFCCF9091B900BE
+:100B7000987F81E0983209F480E0089584E88093BA
+:100B8000BC008091BC0087FFFCCF8091BB00089522
+:100B900080910001811115C080E40E94830580933B
+:100BA000000181110CC082E10E94AD05809300011B
+:100BB000811105C08FEF0E94AD05809300010E9456
+:100BC000A50584B1807F84B985B1807F85B98AB15C
+:100BD000837F8AB98BB1837F8BB93E9846980895FD
+:100BE0000E942E05809300010E94C80580B38C707E
+:100BF00080BB81B3836F81BBECE4F1E0AEE3B1E095
+:100C000011921D9281E0EA35F807D1F70C9418058E
+:100C1000BF92CF92DF92EF92FF920F931F93CF93E9
+:100C2000DF9380910001882379F080913D018F5FEF
+:100C300080933D01811108C00E942E058093000120
+:100C4000811102C00E94C0040EE311E0C0E0D0E0B8
+:100C5000DD24D39482E0C82EEE24E394F12CC73037
+:100C600000F580910001811162C080E40E9483053B
+:100C700080930001811112C082E10E94AD05809332
+:100C8000000181110BC0C7010C2E01C0880F0A940E
+:100C9000EAF780950E94AD05809300010E94A505AA
+:100CA00046C0CA30A1F028F4C83059F0C93061F00C
+:100CB00005C0CC3089F070F0CD3089F0209A2898AA
+:100CC00010C0219A29980DC0229A2A980AC0239A06
+:100CD0002B9807C0529A01C0539A5B9802C03E9A63
+:100CE0004698E0EAEA95F1F78FB179995AC092E017
+:100CF00081708D25892B7C9B02C090E001C094E01F
+:100D0000892B7D9B02C090E001C098E0892B7E9BDF
+:100D100002C090E001C090E1892B9FB19095991F8E
+:100D20009927991F9295990F907E892B0FC08091DA
+:100D3000000181114BC080E40E9483058093000173
+:100D4000882389F1B12C0E94A5058B2DF801908193
+:100D5000981719F08083C09201010E94C80521965E
+:100D60000F5F1F4FCE30D10509F079CF809101017F
+:100D7000882371F1815080930101882339F08FE934
+:100D80009FE00197F1F700C0000022C0ACE4B1E0A1
+:100D9000EEE3F1E081918D9391E0EC34F907D1F726
+:100DA00017C090E0A5CF83E10E94AD0580930001BC
+:100DB0008111C8CF81E40E948305809300018111D5
+:100DC000C1CF0E94BE05B82EB094BDCF80E0BECF8B
+:100DD0000E94BE0481E0DF91CF911F910F91FF909F
+:100DE000EF90DF90CF90BF900895E82FF0E0E45BA4
+:100DF000FE4F808108950895089596E0799FF0014F
+:100E0000112494E5899FE00DF11D1124E60FF11DD9
+:100E1000EE0FFF1FE05EFE4F859194910895880FBD
+:100E2000991F84589040FC01859194910895880FF2
+:100E3000991F84509F4FFC018591949108950F93C1
+:100E40001F93CF93DF93EC01811520E3920730F5D8
+:100E5000811530E2930708F0B1C08B3B910588F40F
+:100E6000883A910508F058C0853A910508F049C0C4
+:100E70008430910508F043C08130910509F4B2C176
+:100E8000AEC18F3F910509F0D0F5803F910508F084
+:100E900092C0805E9109089790F1A1C1C11581E5CA
+:100EA000D807A8F4C23090E5D90708F09FC0C11553
+:100EB00020E5D20709F486C008F092C0C11580E48D
+:100EC000D80708F08CC18E011127106CCCC1C11558
+:100ED00090E8D90758F4C11520E7D20708F07BC184
+:100EE000C11530E6D30708F423C179C1C11580E9E3
+:100EF000D80708F074C18E011F70106AB4C18E014A
+:100F0000B2C1853A910509F470C1863A910509F498
+:100F10006FC103E810E4A7C1883A910509F46BC1D9
+:100F2000893A910509F46AC18A3A910509F469C1BF
+:100F30008B3A910509F468C18C3A910509F467C1AF
+:100F40008D3A910509F466C1803B910509F465C1AC
+:100F50008E3A910509F464C18F3A910509F463C191
+:100F6000813B910509F462C1823B910509F461C19D
+:100F7000833B910509F460C1843B910509F45FC18D
+:100F8000853B910509F45EC1863B910509F45DC17D
+:100F9000873B910509F45CC1883B910509F45BC16D
+:100FA000893B910509F45AC18A3B910509F059C161
+:100FB0000AE216E458C18C01106555C19F700E9469
+:100FC000170752C10E9452169FEF24E33CE0915054
+:100FD00020403040E1F700C000000E946A1D43C17C
+:100FE0008091D50181608093D5013DC10E94121F7F
+:100FF000811102C00E94F81E0E942F1F90E0909362
+:10100000F6018093F501C23080E5D80721F4809184
+:10101000F501816086C0C43090E5D90721F4809144
+:10102000F50182607EC0C63020E5D20721F48091B0
+:10103000F501846076C0C83030E5D30719F480919B
+:10104000F50127C0CA3080E5D80721F48091F50169
+:10105000806167C0CC3090E5D90721F48091F5011B
+:1010600080625FC0CE3020E5D20721F48091F50187
+:10107000806457C0C03130E5D30721F48091F50179
+:1010800080684FC0C23180E5D80729F48091F5010E
+:101090008460886046C0C33090E5D90721F4809110
+:1010A000F5018E7F3EC0C53020E5D20721F4809146
+:1010B000F5018D7F36C0C73030E5D30721F480912C
+:1010C000F5018B7F2EC0C93080E5D80719F48091D7
+:1010D000F50126C0CB3090E5D90721F48091F501C8
+:1010E0008F7E1FC0CD3020E5D20721F48091F5011D
+:1010F0008F7D17C0CF3030E5D30721F48091F50103
+:101100008F7B0FC0C13180E5D80721F48091F501B4
+:101110008F7707C0C331D04531F48091F5018B7FC3
+:10112000877F8093F5018091F5010E94331F9BC05A
+:101130008D2F99278F70992781309105E9F48E01C1
+:10114000037011279C0102C0220F331F0A95E2F79A
+:1011500089011C68CE0164E0880F991F6A95E1F748
+:1011600088279370082B192B73E0CC0FDD1F7A951D
+:10117000E1F7C076DD272CC08230910529F41C2FC1
+:101180000027016F106A6FC08330910561F4CE01B2
+:101190008370992701E010E002C0000F111F8A95AB
+:1011A000E2F71C680EC0049709F05DC0CE018370A1
+:1011B000992701E010E002C0000F111F8A95E2F7A5
+:1011C0001A6843E0CC0FDD1F4A95E1F7C07ED77067
+:1011D0000C2B1D2B48C08E011F70106244C000E014
+:1011E00010E041C001E010E03EC001E810E43BC067
+:1011F00002E810E438C002EE14E435C009EE14E44D
+:1012000032C00AEE14E42FC005EB14E42CC006EB48
+:1012100014E429C007EB14E426C00CEC14E423C04A
+:101220000DEC14E420C003E815E41DC00AE815E441
+:101230001AC002E915E417C004E915E414C001E27C
+:1012400016E411C003E216E40EC004E216E40BC07B
+:1012500005E216E408C006E216E405C007E216E45B
+:1012600002C000E014E4C801DF91CF911F910F91FB
+:10127000089596E0799FF001112494E5899FE00D8F
+:10128000F11D1124E60FF11DEE0FFF1FE05EFE4F72
+:1012900085919491803E9105E0F4803C910558F54C
+:1012A0008133910509F46FC048F48932910509F43E
+:1012B00063C08A32910509F46DC072C0893391050B
+:1012C000E9F082389105D1F08533910509F44DC0DC
+:1012D00067C0833E910581F138F4803E9105B9F0F5
+:1012E000823E9105D9F05CC0863E910561F1873E52
+:1012F0009105A1F155C00E940F0708952091F501B5
+:1013000020FD02C021FF4CC080EE90E049C08091DA
+:10131000F50180FFF9CF89E390E042C08091F501AB
+:1013200082FF0EC08091F50184FF03C080E090E051
+:1013300037C083EE90E034C08091F50182FFF2CF98
+:1013400082EE90E02DC08091F50183FF0BC080916B
+:10135000F50184FDEBCF87EE90E022C08091F5018E
+:1013600083FFF5CF86EE90E01BC08091F50185FFED
+:1013700007C089E290E014C08091F50185FFF9CFA4
+:1013800085E390E00DC08091F50186FF07C08AE2F9
+:1013900090E006C08091F50186FFF9CF81E390E0EF
+:1013A0000E941F07089508950C94D30980916A0143
+:1013B0000895CF93DF9300D01F92CDB7DEB7209171
+:1013C000EC01243019F523E029839B838A83209341
+:1013D000E9008FEF9091E800815095FD06C095EDF2
:1013E0009A95F1F700008111F5CF8091E80085FF13
-:1013F0002CC040E050E060E170E017C081E08093D5
-:10140000E9008FEF9091E800815095FD06C095EDC1
-:101410009A95F1F700008111F5CF8091E80085FFE2
-:1014200014C040E050E068E070E0CE010E94B70BCD
-:101430008091E8008E778093E80080E1FE01A2E5CC
-:10144000B1E001900D928A95E1F7DF91CF91089577
-:101450008091E501811109C00E94490D0E94A60DED
-:101460008091E20084608093E20008951092E5018B
-:10147000089508950C942E230E949F1C0E943423EB
-:101480000E9443100C94480942E061EC81E00E9404
-:10149000C30C42E061EC82E00E94C30C42E061ECCC
-:1014A00083E00E94C30C42E161EC84E00C94C30C25
-:1014B0008091E801833009F455C030F4813071F037
-:1014C000823009F48EC008958A3009F47AC08B30D6
-:1014D00009F460C0893009F09CC020C08091E70108
-:1014E000813A09F096C08091E800877F8093E800F8
-:1014F0008091EB019091EC01892B21F060E080E07C
-:1015000090E003C060E182E591E070E00E94000C91
-:101510008091E8008B778093E80008958091E7013F
-:10152000813209F076C08091EB019091EC01009737
-:1015300019F0039709F06DC08091E800877F8093D0
-:10154000E8008091E80082FD05C08091E6018111EC
-:10155000F8CF5FC08091F100809362018091E80034
-:101560008B7753C08091E701813A09F052C0809196
-:10157000EB019091EC01892B09F04BC08091E800C0
-:10158000877F8093E8008091E80080FFFCCF809106
-:101590000C0136C08091E7018132D9F58091EB01D1
-:1015A0009091EC01892BA9F58091E800877F8093C9
-:1015B000E8000E94F80C8091E90180930C010C94E2
-:1015C000AD158091E701813221F58091E800877F98
-:1015D0008093E8000E94F80C8091EA0180936301F7
-:1015E00008958091E701813AA1F48091E800877F16
-:1015F0008093E8008091E80080FFFCCF8091630138
-:101600008093F1008091E8008E778093E8000C943D
-:10161000F80C089584B7877F84BF88E10FB6F894EB
-:1016200080936000109260000FBE90E080E80FB6DB
-:10163000F89480936100909361000FBE0E94921015
-:101640000E94490D0E94A60D8091E2008460809363
-:10165000E20078940E9421100E94941082E091E0B0
-:101660000E943E100E941C238091E601853069F49F
-:101670000E94621C8091E4018823B1F30E948A1CBD
-:10168000882391F30E94A10BEFCF0E949A10ECCF18
-:10169000292F332723303105A9F06CF4213031058F
-:1016A00009F442C02230310509F043C08DE690E0D4
-:1016B00024E037E042C021323105C9F02232310541
-:1016C00019F137C099278130910541F08230910599
-:1016D00041F0892B71F5E0E0F7E005C0E8EEF6E0B7
-:1016E00002C0E0EDF6E0849190E09F0126C06430F6
-:1016F00000F5E62FF0E0EE0FFF1FEE5DFE4F2081BC
-:10170000318189E090E019C0643098F4E62FF0E070
-:10171000DF01AA0FBB1FA65EBE4F2D913C91EA5E72
-:10172000FE4F808190E009C082E190E021E737E040
-:1017300004C080E090E020E030E0FA0131832083B3
-:10174000089580E189BD82E189BD09B400FEFDCF25
-:101750008091D8008F7D8093D8008091E0008260D6
-:101760008093E0008091E00081FDFCCF0895CF924E
-:10177000DF92EF92FF920F931F93CF93DF937C0141
-:101780008B01EA010E94190D811131C0209731F0BF
-:1017900088819981081B190BE80EF91EC12CD12CE8
-:1017A0000115110519F18091E80085FD14C08091A3
-:1017B000E8008E778093E800209741F08881998136
-:1017C0008C0D9D1D9983888385E011C00E94190DA1
-:1017D000882331F30CC0F70181917F018093F100E0
-:1017E00001501109FFEFCF1ADF0ADACF80E0DF9155
-:1017F000CF911F910F91FF90EF90DF90CF900895C0
-:101800002091ED013091EE012617370748F0611560
-:10181000710539F42091E8002E772093E80001C08B
-:10182000B901FC0120E061157105B9F18091E60173
-:10183000882309F440C0853009F43FC08091E80056
-:1018400083FD3DC08091E80082FF06C08091E800E2
-:1018500082FF26C080E008958091E80080FFE3CFFA
-:101860002091F3008091F20090E0922B61157105B8
-:1018700051F08830910538F421912093F1006150A6
-:1018800071090196F3CF21E0089709F020E08091DB
-:10189000E8008E778093E800C6CF2111C7CFD6CF5E
-:1018A0008091E601882339F0853039F08091E80095
-:1018B00083FFCCCF04C082E0089583E0089581E0E7
-:1018C00008952091ED013091EE012617370748F079
-:1018D0006115710539F42091E8002E772093E80016
-:1018E00001C0B901FC0120E061157105C1F18091D1
-:1018F000E601882309F441C0853009F440C0809195
-:10190000E80083FD3EC08091E80082FF06C0809120
-:10191000E80082FF27C080E008958091E80080FF02
-:10192000E3CF2091F3008091F20090E0922B6115BB
-:10193000710559F08830910540F424912093F1000D
-:101940003196615071090196F2CF21E0089709F0B4
-:1019500020E08091E8008E778093E800C5CF2111C8
-:10196000C6CFD5CF8091E601882339F0853039F094
-:101970008091E80083FFCBCF04C082E0089583E02C
-:10198000089581E00895982F973058F59093E900D5
-:10199000981739F07091EC002091ED005091F00013
-:1019A00003C0242F762F50E021FF19C03091EB00A7
-:1019B0003E7F3093EB003091ED003D7F3093ED00A2
-:1019C0003091EB0031603093EB007093EC0020938A
-:1019D000ED005093F0002091EE0027FF07C09F5FBD
-:1019E000D3CF8F708093E90081E0089580E008955F
-:1019F0008091E70187FD05C08091E80080FF0EC05F
-:101A000012C08091E80082FD05C08091E60181113D
-:101A1000F8CF08958091E8008B7708C08091E601A7
-:101A20008111EACF08958091E8008E778093E800D5
-:101A300008958091E4009091E50045E62091EC0046
-:101A400020FF21C02091E80020FD21C02091E60167
-:101A5000222389F0253089F02091EB0025FD0FC06D
-:101A60002091E4003091E5002817390739F34150FF
-:101A700041F0C901E3CF82E0089583E0089581E059
-:101A8000089584E008952091E80022FFDFCF80E0F0
-:101A900008950E94B70D0E94BF0DE0EEF0E0808136
-:101AA00081608083E8EDF0E080818F77808319BCCE
-:101AB000A7EDB0E08C918E7F8C9380818F7E8083A8
-:101AC0001092E50108950F931F93CF93DF930E9427
-:101AD000B70D0E94BF0DC8EDD0E088818F77888355
-:101AE00088818068888388818F7D888319BC109263
-:101AF000E6011092E2011092E4011092E30100EE7F
-:101B000010E0F80180818B7F8083888181608883E9
-:101B100042E060E080E00E94C30CE1EEF0E08081F2
-:101B20008E7F8083E2EEF0E080818160808380811F
-:101B300088608083F80180818E7F808388818061C6
-:101B40008883DF91CF911F910F910895E8EDF0E028
-:101B500080818F7E8083E7EDF0E0808181608083EB
-:101B600084E082BF81E08093E5010C94630DE8ED91
-:101B7000F0E080818E7F80831092E20008951092C1
-:101B8000DA001092E10008951F920F920FB60F92A3
-:101B900011242F933F934F935F936F937F938F9372
-:101BA0009F93AF93BF93EF93FF938091E10082FFE8
-:101BB0000BC08091E20082FF07C08091E1008B7F23
-:101BC0008093E1000E9420108091DA0080FF1FC006
-:101BD0008091D80080FF1BC08091DA008E7F8093B7
-:101BE000DA008091D90080FF0DC080E189BD82E1DB
-:101BF00089BD09B400FEFDCF81E08093E6010E941B
-:101C0000280A05C019BC1092E6010E94360A80918C
-:101C1000E10080FF19C08091E20080FF15C0809133
-:101C2000E2008E7F8093E2008091E20080618093E9
-:101C3000E2008091D80080628093D80019BC85E0D2
-:101C40008093E6010E943A0A8091E10084FF30C04F
-:101C50008091E20084FF2CC080E189BD82E189BDD2
-:101C600009B400FEFDCF8091D8008F7D8093D8000D
-:101C70008091E1008F7E8093E1008091E2008F7E71
-:101C80008093E2008091E20081608093E200809185
-:101C9000E201882311F084E007C08091E30087FF10
-:101CA00002C083E001C081E08093E6010E943C0A0B
-:101CB0008091E10083FF29C08091E20083FF25C06D
-:101CC0008091E100877F8093E10082E08093E601CC
-:101CD0001092E2018091E1008E7F8093E10080917B
-:101CE000E2008E7F8093E2008091E2008061809329
-:101CF000E20042E060E080E00E94C30C8091F000CE
-:101D000088608093F0000E94390AFF91EF91BF91A3
-:101D1000AF919F918F917F916F915F914F913F9183
-:101D20002F910F900FBE0F901F9018951F920F923A
-:101D30000FB60F9211242F933F934F935F936F939E
-:101D40007F938F939F93AF93BF93CF93EF93FF9323
-:101D5000C091E900CF708091EC001092E900809171
-:101D6000F000877F8093F00078940E94D20E10924A
-:101D7000E9008091F00088608093F000C093E90052
-:101D8000FF91EF91CF91BF91AF919F918F917F91F3
-:101D90006F915F914F913F912F910F900FBE0F90D8
-:101DA0001F9018951F93CF93DF93CDB7DEB7AA97F7
-:101DB0000FB6F894DEBF0FBECDBFE7EEF1E0809125
-:101DC000F100819321E0EF3EF207C9F70E94580A23
-:101DD0008091E80083FF1CC12091E7013091E80168
-:101DE000832F90E08A30910508F012C1FC01EA5A75
-:101DF000FF4F0C94B624203881F0223809F008C136
-:101E00008091EB018F708093E9008091EB0085FB5E
-:101E1000882780F91092E90006C08091E301909133
-:101E2000E401911182609091E800977F9093E8001F
-:101E30008093F1001092F100C5C0822F8D7F09F0D0
-:101E4000E7C0222319F0223061F0E2C08091E9015D
-:101E5000813009F0DDC0333009F080E08093E40187
-:101E600028C08091E901811124C02091EB012F70DD
-:101E700009F4CEC02093E9008091EB0080FF19C0E7
-:101E80008091EB00333011F4806211C08061809347
-:101E9000EB0081E090E0022E01C0880F0A94EAF77F
-:101EA0008093EA001092EA008091EB0088608093B2
-:101EB000EB001092E9008091E800877F86C0211135
-:101EC000A7C01091E9011F778091E3008078812BF2
-:101ED0008093E3008091E800877F8093E8000E9470
-:101EE000F80C8091E80080FFFCCF8091E3008068CF
-:101EF0008093E300112311F083E001C082E080931E
-:101F0000E60186C02058223008F082C08091E901A5
-:101F10009091EA018C3D23E0920779F583E08A8372
-:101F20008AE289834FB7F894DE01139620E03EE001
-:101F300051E2E32FF0E050935700E49120FF03C0FB
-:101F4000E295EF703F5FEF708E2F90E0EA3010F077
-:101F5000C79601C0C0968D939D932F5F243149F79A
-:101F60004FBF8091E800877F8093E8006AE270E0CD
-:101F7000CE0101960E94000C14C0AE014F5F5F4F6E
-:101F80006091EB010E94480B009709F441C0209139
-:101F9000E800277F2093E800BC0189819A810E9494
-:101FA000610C8091E8008B778093E80031C0203885
-:101FB00079F58091E800877F8093E8008091E201C5
-:101FC0008093F1008091E8008E778093E8000E9472
-:101FD000F80C1EC021111CC09091E9019230C0F490
-:101FE0008091E800877F8093E8009093E2010E944F
-:101FF000F80C8091E201811104C08091E30087FF19
-:1020000002C084E001C081E08093E6010E94440A9E
-:102010008091E80083FF0AC08091E800877F809369
-:10202000E8008091EB0080628093EB00AA960FB6E7
-:10203000F894DEBF0FBECDBFDF91CF911F91089501
-:102040000895CF938091E6018823B1F08091E90053
-:102050008F709091EC0090FF02C090E801C090E07A
-:10206000C92FC82B1092E9008091E80083FD0E94DF
-:10207000D20ECF70C093E900CF910895909369017B
-:10208000809368010895E0916801F09169013097AB
-:1020900021F00190F081E02D099480E00895E09115
-:1020A0006801F0916901309721F00280F381E02D01
-:1020B00009940895E0916801F0916901309721F049
-:1020C0000480F581E02D09940895209166013091F6
-:1020D00067018217930771F09093670180936601FF
-:1020E000E0916801F0916901309721F00680F78155
-:1020F000E02D0994089520916401309165018217C3
-:10210000930771F09093650180936401E0916801F9
-:10211000F0916901309721F00084F185E02D099458
-:10212000089508950C9491100E94A51C0E941F060A
-:102130000C946B1DCF92DF92EF92FF920F931F933F
-:10214000CF93DF93CDB7DEB72B970FB6F894DEBFF2
-:102150000FBECDBF0E9437063BE6E32E31E0F32EE3
-:1021600000E010E0C02E802F0E942407F701D190DC
-:102170007F01D826B1F40F5F1F4F0E30110591F784
-:102180008FEF89838A831B820E94AE1C8160782F27
-:102190009D838C8349815A816B818D810E943D1181
-:1021A00041C09091CD0191FF04C08B870E942A0706
-:1021B0008B8520E030E04D2D50E0922FBA01022EA9
-:1021C00002C0759567950A94E2F760FF25C02E83DB
-:1021D000CF82EE24E394F12C02C0EE0CFF1C9A9502
-:1021E000E2F790E08E219F2121E0892B09F420E085
-:1021F00028870E94AE1C8160782F9A8789874E813C
-:102200005F8168858A850E943D11F801E559FE4F7E
-:1022100080818E25808306C02F5F3F4F2630310599
-:1022200061F6A9CF0E944F2010916A010E944310CD
-:102230001817A1F00E94431080936A012B960FB6E5
-:10224000F894DEBF0FBECDBFDF91CF911F910F91EC
-:10225000FF90EF90DF90CF900C9448092B960FB62B
-:10226000F894DEBF0FBECDBFDF91CF911F910F91CC
-:10227000FF90EF90DF90CF900895CF93DF93CDB78D
-:10228000DEB72B970FB6F894DEBF0FBECDBF4F83DE
-:10229000588769877A878B87DE01119686E0FD0172
-:1022A00011928A95E9F785E0FE01379601900D922B
-:1022B0008A95E1F749815A816B817C818D819E816C
-:1022C0000E9479182B960FB6F894DEBF0FBECDBFD3
-:1022D000DF91CF910895CF93C82F882309F4C1C00F
-:1022E000823859F40E94431081FDBBC089E30E94EB
-:1022F000161B0E94E01B89E30CC0833879F40E940E
-:10230000431080FDAEC083E50E94161B0E94E01BB7
-:1023100083E50E94561BCF910C94E01B843859F43E
-:102320000E94431082FD9DC087E40E94161B0E94FC
-:10233000E01B87E4EECF8CEF8C0F813A48F48C2FB2
-:102340000E94842281118DC08C2F0E94161BE3CF26
-:1023500080E28C0F883048F4C77081E001C0880F9C
-:10236000CA95EAF70E94971BD6CF8BE58C0F833076
-:1023700078F4C53A29F0C63A31F482E890E005C015
-:1023800081E890E002C083E890E0CF910C94651062
-:1023900088E58C0F833108F064C0C83A39F1C93A36
-:1023A00041F1CA3A49F1CB3A51F1CC3A59F1CD3A1F
-:1023B00061F1C03B69F1CE3A71F1CF3A79F1C13B9D
-:1023C00081F1C23B89F1C33B91F1C43B99F1C53B1B
-:1023D000A1F1C63BA9F1C73BB1F1C83BB9F1C93B7B
-:1023E000C1F1CA3BC9F58AE292E038C082EE90E0C2
-:1023F00035C089EE90E032C08AEE90E02FC085EBC8
-:1024000090E02CC086EB90E029C087EB90E026C0DE
-:102410008CEC90E023C08DEC90E020C083E891E04C
-:102420001DC08AE891E01AC082E991E017C084E9F2
-:1024300091E014C081E292E011C083E292E00EC00C
-:1024400084E292E00BC085E292E008C086E292E06E
-:1024500005C087E292E002C080E090E0CF910C944A
-:102460007B10CF910895882309F44BC0823859F42A
-:102470000E94431081FF45C089E30E94161B0E9401
-:10248000E01B89E30CC0833871F40E94431080FF85
-:1024900038C083E50E94161B0E94E01B83E50E9462
-:1024A000561B0C94E01B843859F40E94431082FFA1
-:1024B00028C087E40E94161B0E94E01B87E4EFCF30
-:1024C0009CEF980F913A58F390E2980F983050F49F
-:1024D000877091E001C0990F8A95EAF7892F0E94D1
-:1024E0009D1BDFCF9BE5980F933020F480E090E0B8
-:1024F0000C946510885A833120F480E090E00C94AD
-:102500007B100895882321F00E94971B0C94E01BF8
-:102510000895882321F00E949D1B0C94E01B0895D0
-:10252000CF92DF92EF92FF920F931F93CF93DF939F
-:10253000CDB7DEB728970FB6F894DEBF0FBECDBF7C
-:102540008C0185E0F801DE01119601900D928A95CB
-:10255000E1F7F80140813181F280258122952F70C9
-:1025600083819481892B31F03F3F31F481E04F3FEB
-:1025700019F403C081E001C080E080FDCBC2498333
-:102580003A8389819A812F830E94D41A9E838887F7
-:102590000E94D31A0E94A6192F814E816885FF20C0
-:1025A00029F00E94B41B68854E812F81E42FE295AB
-:1025B000EF70F0E0E05AFF4F0C94B624842F807F38
-:1025C000142F1F70882311F01295107FFF2059F0EF
-:1025D000112309F454C2812F68870E94A71B0E940F
-:1025E000E01B68854CC2862F0E943312112309F428
-:1025F00091C2812F0E94AD1B28960FB6F894DEBFC2
-:102600000FBECDBFDF91CF911F910F91FF90EF9043
-:10261000DF90CF900C94E01B342F307F842F8F708D
-:10262000303211F08295807F662319F0613019F104
-:102630002BC0FF20B1F0222309F493C1213009F00F
-:1026400090C128960FB6F894DEBF0FBECDBFDF91C4
-:10265000CF911F910F91FF90EF90DF90CF900C944E
-:10266000C71B222319F0213009F454C28E830E9423
-:10267000CA1B8E8189C1FF2021F0223008F04AC296
-:1026800070C1211147C280C1FF2021F0222309F42B
-:1026900068C1F5C1222309F477C105C2242F26950C
-:1026A0002695237030E02115310521F021303105C8
-:1026B000C9F030C2FF2021F0862F942F937002C002
-:1026C00080E090E028960FB6F894DEBF0FBECDBF35
-:1026D000DF91CF911F910F91FF90EF90DF90CF90FE
-:1026E0000C946510FF2021F0862F942F937002C068
-:1026F00080E090E028960FB6F894DEBF0FBECDBF05
-:10270000DF91CF911F910F91FF90EF90DF90CF90CD
-:102710000C947B10862FFF2019F00E94571F02C0D7
-:102720000E94BF1F28960FB6F894DEBF0FBECDBF24
-:10273000DF91CF911F910F91FF90EF90DF90CF909D
-:102740000C944420842F837009F076C0F110E2C10C
-:10275000262F229526952770220F220F862F8F7005
-:10276000C82ED12CE12CF12C022E04C0CC0CDD1C87
-:10277000EE1CFF1C0A94D2F764FF10C06FE070E0FB
-:1027800080E090E004C0660F771F881F991F2A958C
-:10279000D2F7609570958095909503C060E070E0E9
-:1027A000CB01242F269526952370422F50E04230EE
-:1027B0005105D1F04330510559F16C297D298E29FD
-:1027C0009F294130510541F128960FB6F894DEBF9C
-:1027D0000FBECDBFDF91CF911F910F91FF90EF9072
-:1027E000DF90CF900C94CB196C297D298E299F29DD
-:1027F00028960FB6F894DEBF0FBECDBFDF91CF9104
-:102800001F910F91FF90EF90DF90CF900C94E519FE
-:102810000E94CB19C701B60128960FB6F894DEBF07
-:102820000FBECDBFDF91CF911F910F91FF90EF9021
-:10283000DF90CF900C94B119FF2019F0842F817094
-:1028400001C08695882309F465C1262F2295269517
-:102850002770220F220F862F8F70C82ED12CE12CCB
-:10286000F12C022E04C0CC0CDD1CEE1CFF1C0A94C3
-:10287000D2F764FF10C06FE070E080E090E004C029
-:10288000660F771F881F991F2A95D2F7609570955C
-:102890008095909503C060E070E0CB01242F2695D1
-:1028A00026952370422F50E042305105D1F043303D
-:1028B000510559F16C297D298E299F2941305105F7
-:1028C00041F128960FB6F894DEBF0FBECDBFDF9161
-:1028D000CF911F910F91FF90EF90DF90CF900C94CC
-:1028E0009F1A6C297D298E299F2928960FB6F89466
-:1028F000DEBF0FBECDBFDF91CF911F910F91FF9033
-:10290000EF90DF90CF900C94B91A0E949F1AC701E4
-:10291000B60128960FB6F894DEBF0FBECDBFDF918B
+:1013F0000DC040E050E063E070E0CE0101960E9435
+:10140000430C8091E8008E778093E8000F900F9056
+:101410000F90DF91CF910895CF93DF9300D01F926B
+:10142000CDB7DEB72091EC01243021F522E02983ED
+:101430009B838A8383E08093E9008FEF9091E8009B
+:10144000815095FD06C095ED9A95F1F70000811148
+:10145000F5CF8091E80085FF0DC040E050E063E0EB
+:1014600070E0CE0101960E94430C8091E8008E77D7
+:101470008093E8000F900F900F90DF91CF91089527
+:101480002091EC012430F1F422E02093E9002FEFC9
+:101490003091E800215035FD06C035ED3A95F1F761
+:1014A00000002111F5CF2091E80025FF0BC040E09E
+:1014B00050E065E070E00E94430C8091E8008E7778
+:1014C0008093E8000895CF93DF93EC018091EC01C5
+:1014D000843009F046C090910C019923D9F0909185
+:1014E0000D019923B9F08093E9008FEF9091E80006
+:1014F000815095FD06C095E19A95F1F700008111A4
+:10150000F5CF8091E80085FF2CC040E050E060E11D
+:1015100070E017C081E08093E9008FEF9091E800C0
+:10152000815095FD06C095ED9A95F1F70000811167
+:10153000F5CF8091E80085FF14C040E050E068E0FE
+:1015400070E0CE010E94430C8091E8008E7780937A
+:10155000E80080E1FE01AAE5B1E001900D928A95D4
+:10156000E1F7DF91CF9108958091EB01811109C0DE
+:101570000E94D50D0E94320E8091E200846080931B
+:10158000E20008951092EB01089508950C948E23C3
+:101590000E94011D0E9494230E94CF100C94D40934
+:1015A00042E061EC81E00E944F0D42E061EC82E09C
+:1015B0000E944F0D42E061EC83E00E944F0D42E13A
+:1015C00061EC84E00C944F0D8091EE01833009F4BE
+:1015D00055C030F4813071F0823009F48EC0089526
+:1015E0008A3009F47AC08B3009F460C0893009F080
+:1015F0009CC020C08091ED01813A09F096C0809195
+:10160000E800877F8093E8008091F1019091F201DA
+:10161000892B21F060E080E090E003C060E18AE582
+:1016200091E070E00E948C0C8091E8008B778093B1
+:10163000E80008958091ED01813209F076C0809133
+:10164000F1019091F201009719F0039709F06DC034
+:101650008091E800877F8093E8008091E80082FD18
+:1016600005C08091EC018111F8CF5FC08091F1003D
+:1016700080936A018091E8008B7753C08091ED01DF
+:10168000813A09F052C08091F1019091F201892BC9
+:1016900009F04BC08091E800877F8093E80080913B
+:1016A000E80080FFFCCF80910C0136C08091ED01F5
+:1016B0008132D9F58091F1019091F201892BA9F540
+:1016C0008091E800877F8093E8000E94840D8091DC
+:1016D000EF0180930C010C9452168091ED01813240
+:1016E00021F58091E800877F8093E8000E94840DB7
+:1016F0008091F00180936B0108958091ED01813A12
+:10170000A1F48091E800877F8093E8008091E80051
+:1017100080FFFCCF80916B018093F1008091E80005
+:101720008E778093E8000C94840D089584B7877FAA
+:1017300084BF88E10FB6F894809360001092600037
+:101740000FBE90E080E80FB6F8948093610090930C
+:1017500061000FBE0E941E110E94D50D0E94320E24
+:101760008091E20084608093E20078940E94AD1042
+:101770000E94201182E091E00E94CA100E947C2306
+:101780008091EC01853069F40E94C11C8091EA01CE
+:101790008823B1F30E94EC1C882391F30E942D0C46
+:1017A000EFCF0E942611ECCF292F332723303105AC
+:1017B000A9F06CF42130310509F442C02230310522
+:1017C00009F043C08DE690E024EF33E042C02132BF
+:1017D0003105C9F02232310519F137C0992781301E
+:1017E000910541F08230910541F0892B71F5E0EFD0
+:1017F000F3E005C0E8EDF3E002C0E0ECF3E0849133
+:1018000090E09F0126C0643000F5E62FF0E0EE0F77
+:10181000FF1FEE5DFE4F2081318189E090E019C00D
+:10182000643098F4E62FF0E0DF01AA0FBB1FA65E3C
+:10183000BE4F2D913C91EA5EFE4F808190E009C041
+:1018400082E190E021E634E004C080E090E020E016
+:1018500030E0FA0131832083089580E189BD82E17F
+:1018600089BD09B400FEFDCF8091D8008F7D8093A3
+:10187000D8008091E00082608093E0008091E000D9
+:1018800081FDFCCF0895CF92DF92EF92FF920F93EC
+:101890001F93CF93DF937C018B01EA010E94A50D7A
+:1018A000811131C0209731F088819981081B190B73
+:1018B000E80EF91EC12CD12C0115110519F18091EA
+:1018C000E80085FD14C08091E8008E778093E800E1
+:1018D000209741F0888199818C0D9D1D9983888383
+:1018E00085E011C00E94A50D882331F30CC0F701DB
+:1018F00081917F018093F10001501109FFEFCF1A10
+:10190000DF0ADACF80E0DF91CF911F910F91FF9036
+:10191000EF90DF90CF9008952091F3013091F40182
+:101920002617370748F06115710539F42091E80052
+:101930002E772093E80001C0B901FC0120E0611579
+:101940007105B9F18091EC01882309F440C085301C
+:1019500009F43FC08091E80083FD3DC08091E8001C
+:1019600082FF06C08091E80082FF26C080E00895D3
+:101970008091E80080FFE3CF2091F3008091F20096
+:1019800090E0922B6115710551F08830910538F483
+:1019900021912093F100615071090196F3CF21E06C
+:1019A000089709F020E08091E8008E778093E800A6
+:1019B000C6CF2111C7CFD6CF8091EC01882339F053
+:1019C000853039F08091E80083FFCCCF04C082E0FD
+:1019D000089583E0089581E008952091F301309106
+:1019E000F4012617370748F06115710539F4209185
+:1019F000E8002E772093E80001C0B901FC0120E047
+:101A000061157105C1F18091EC01882309F441C091
+:101A1000853009F440C08091E80083FD3EC080918C
+:101A2000E80082FF06C08091E80082FF27C080E0C6
+:101A300008958091E80080FFE3CF2091F30080912A
+:101A4000F20090E0922B6115710559F088309105F4
+:101A500040F424912093F100319661507109019670
+:101A6000F2CF21E0089709F020E08091E8008E771E
+:101A70008093E800C5CF2111C6CFD5CF8091EC016E
+:101A8000882339F0853039F08091E80083FFCBCF8F
+:101A900004C082E0089583E0089581E00895982FBE
+:101AA000973058F59093E900981739F07091EC0051
+:101AB0002091ED005091F00003C0242F762F50E0CC
+:101AC00021FF19C03091EB003E7F3093EB00309145
+:101AD000ED003D7F3093ED003091EB0031603093AD
+:101AE000EB007093EC002093ED005093F0002091F8
+:101AF000EE0027FF07C09F5FD3CF8F708093E90070
+:101B000081E0089580E008958091ED0187FD05C092
+:101B10008091E80080FF0EC012C08091E80082FD35
+:101B200005C08091EC018111F8CF08958091E80003
+:101B30008B7708C08091EC018111EACF08958091E4
+:101B4000E8008E778093E80008958091E4009091FA
+:101B5000E50045E62091EC0020FF21C02091E8003F
+:101B600020FD21C02091EC01222389F0253089F04D
+:101B70002091EB0025FD0FC02091E4003091E5009D
+:101B80002817390739F3415041F0C901E3CF82E00A
+:101B9000089583E0089581E0089584E008952091F8
+:101BA000E80022FFDFCF80E008950E94430E0E94EC
+:101BB0004B0EE0EEF0E0808181608083E8EDF0E0A4
+:101BC00080818F77808319BCA7EDB0E08C918E7FE8
+:101BD0008C9380818F7E80831092EB0108950F9308
+:101BE0001F93CF93DF930E94430E0E944B0EC8EDCC
+:101BF000D0E088818F778883888180688883888116
+:101C00008F7D888319BC1092EC011092E80110922C
+:101C1000EA011092E90100EE10E0F80180818B7F6B
+:101C2000808388818160888342E060E080E00E9458
+:101C30004F0DE1EEF0E080818E7F8083E2EEF0E0F8
+:101C4000808181608083808188608083F8018081C9
+:101C50008E7F8083888180618883DF91CF911F91FF
+:101C60000F910895E8EDF0E080818F7E8083E7EDAD
+:101C7000F0E080818160808384E082BF81E0809396
+:101C8000EB010C94EF0DE8EDF0E080818E7F808316
+:101C90001092E20008951092DA001092E100089587
+:101CA0001F920F920FB60F9211242F933F934F93D1
+:101CB0005F936F937F938F939F93AF93BF93EF93B4
+:101CC000FF938091E10082FF0BC08091E20082FFD0
+:101CD00007C08091E1008B7F8093E1000E94AC10EF
+:101CE0008091DA0080FF1FC08091D80080FF1BC068
+:101CF0008091DA008E7F8093DA008091D90080FF96
+:101D00000DC080E189BD82E189BD09B400FEFDCF2F
+:101D100081E08093EC010E94B40A05C019BC1092C6
+:101D2000EC010E94C20A8091E10080FF19C08091FD
+:101D3000E20080FF15C08091E2008E7F8093E20078
+:101D40008091E20080618093E2008091D8008062FF
+:101D50008093D80019BC85E08093EC010E94C60AEC
+:101D60008091E10084FF30C08091E20084FF2CC0AC
+:101D700080E189BD82E189BD09B400FEFDCF80917B
+:101D8000D8008F7D8093D8008091E1008F7E809372
+:101D9000E1008091E2008F7E8093E2008091E2007A
+:101DA00081608093E2008091E801882311F084E053
+:101DB00007C08091E30087FF02C083E001C081E09B
+:101DC0008093EC010E94C80A8091E10083FF29C042
+:101DD0008091E20083FF25C08091E100877F80939E
+:101DE000E10082E08093EC011092E8018091E10033
+:101DF0008E7F8093E1008091E2008E7F8093E200ED
+:101E00008091E20080618093E20042E060E080E047
+:101E10000E944F0D8091F00088608093F0000E9436
+:101E2000C50AFF91EF91BF91AF919F918F917F91E3
+:101E30006F915F914F913F912F910F900FBE0F9037
+:101E40001F9018951F920F920FB60F9211242F9387
+:101E50003F934F935F936F937F938F939F93AF9332
+:101E6000BF93CF93EF93FF93C091E900CF70809120
+:101E7000EC001092E9008091F000877F8093F000E1
+:101E800078940E945E0F1092E9008091F0008860C3
+:101E90008093F000C093E900FF91EF91CF91BF9143
+:101EA000AF919F918F917F916F915F914F913F91F2
+:101EB0002F910F900FBE0F901F9018951F93CF93E7
+:101EC000DF93CDB7DEB7AA970FB6F894DEBF0FBE8B
+:101ED000CDBFEDEEF1E08091F100819321E0E53F8F
+:101EE000F207C9F70E94E40A8091E80083FF1CC151
+:101EF0002091ED013091EE01832F90E08A30910521
+:101F000008F012C1FC01EC59FF4F0C941625203843
+:101F100081F0223809F008C18091F1018F7080931F
+:101F2000E9008091EB0085FB882780F91092E90099
+:101F300006C08091E9019091EA019111826090912F
+:101F4000E800977F9093E8008093F1001092F100F1
+:101F5000C5C0822F8D7F09F0E7C0222319F02230FF
+:101F600061F0E2C08091EF01813009F0DDC03330D3
+:101F700009F080E08093EA0128C08091EF0181118F
+:101F800024C02091F1012F7009F4CEC02093E90004
+:101F90008091EB0080FF19C08091EB00333011F489
+:101FA000806211C080618093EB0081E090E0022E9E
+:101FB00001C0880F0A94EAF78093EA001092EA00C1
+:101FC0008091EB0088608093EB001092E900809193
+:101FD000E800877F86C02111A7C01091EF011F770D
+:101FE0008091E3008078812B8093E3008091E8006A
+:101FF000877F8093E8000E94840D8091E80080FF35
+:10200000FCCF8091E30080688093E300112311F0FE
+:1020100083E001C082E08093EC0186C0205822302A
+:1020200008F082C08091EF019091F0018C3D23E097
+:10203000920779F583E08A838AE289834FB7F8941F
+:10204000DE01139620E03EE051E2E32FF0E05093F2
+:102050005700E49120FF03C0E295EF703F5FEF70FF
+:102060008E2F90E0EA3010F0C79601C0C0968D9395
+:102070009D932F5F243149F74FBF8091E800877F00
+:102080008093E8006AE270E0CE0101960E948C0C19
+:1020900014C0AE014F5F5F4F6091F1010E94D40BFD
+:1020A000009709F441C02091E800277F2093E800C1
+:1020B000BC0189819A810E94ED0C8091E8008B77A8
+:1020C0008093E80031C0203879F58091E800877F5F
+:1020D0008093E8008091E8018093F1008091E8000E
+:1020E0008E778093E8000E94840D1EC021111CC0D1
+:1020F0009091EF019230C0F48091E800877F809347
+:10210000E8009093E8010E94840D8091E80181111C
+:1021100004C08091E30087FF02C084E001C081E039
+:102120008093EC010E94D00A8091E80083FF0AC0EE
+:102130008091E800877F8093E8008091EB008062C7
+:102140008093EB00AA960FB6F894DEBF0FBECDBF0A
+:10215000DF91CF911F9108950895CF938091EC0165
+:102160008823B1F08091E9008F709091EC0090FF8E
+:1021700002C090E801C090E0C92FC82B1092E9007E
+:102180008091E80083FD0E945E0FCF70C093E9004C
+:10219000CF91089590937101809370010895E0911B
+:1021A0007001F0917101309721F00190F081E02DE4
+:1021B000099480E00895E0917001F09171013097E9
+:1021C00021F00280F381E02D09940895E0917001DF
+:1021D000F0917101309721F00480F581E02D099490
+:1021E000089520916E0130916F018217930771F06D
+:1021F00090936F0180936E01E0917001F0917101F5
+:10220000309721F00680F781E02D09940895209100
+:102210006C0130916D018217930771F090936D01FD
+:1022200080936C01E0917001F0917101309721F081
+:102230000084F185E02D0994089508950C941D11F2
+:102240000E94071D0E94F0050C94CD1DCF92DF92D5
+:10225000EF92FF920F931F93CF93DF93CDB7DEB72B
+:102260002B970FB6F894DEBF0FBECDBF0E940806B5
+:1022700033E7E32E31E0F32E00E010E0C02E802F94
+:102280000E94F506F701D1907F01D826B1F40F5FC7
+:102290001F4F0E30110591F78FEF89838A831B82C0
+:1022A0000E94101D8160782F9D838C8349815A8103
+:1022B0006B818D810E94C91141C09091D50191FF20
+:1022C00004C08B870E94FB068B8520E030E04D2DFB
+:1022D00050E0922FBA01022E02C0759567950A94BC
+:1022E000E2F760FF25C02E83CF82EE24E394F12C29
+:1022F00002C0EE0CFF1C9A95E2F790E08E219F2120
+:1023000021E0892B09F420E028870E94101D8160BC
+:10231000782F9A8789874E815F8168858A850E9498
+:10232000C911F801ED58FE4F80818E25808306C0CB
+:102330002F5F3F4F2630310561F6A9CF0E94B120B3
+:10234000109172010E94CF101817A1F00E94CF10B7
+:10235000809372012B960FB6F894DEBF0FBECDBFEF
+:10236000DF91CF911F910F91FF90EF90DF90CF9071
+:102370000C94D4092B960FB6F894DEBF0FBECDBFD8
+:10238000DF91CF911F910F91FF90EF90DF90CF9051
+:102390000895CF93DF93CDB7DEB72B970FB6F894A0
+:1023A000DEBF0FBECDBF4F83588769877A878B8783
+:1023B000DE01119686E0FD0111928A95E9F785E02C
+:1023C000FE01379601900D928A95E1F749815A8175
+:1023D0006B817C818D819E810E941E192B960FB688
+:1023E000F894DEBF0FBECDBFDF91CF910895089561
+:1023F000CF93C82F882309F4C1C0823859F40E94B2
+:10240000CF1081FDBBC089E30E94C81B0E94921CB3
+:1024100089E30CC0833879F40E94CF1080FDAEC0F0
+:1024200083E50E94C81B0E94921C83E50E94081C41
+:10243000CF910C94921C843859F40E94CF1082FDE5
+:102440009DC087E40E94C81B0E94921C87E4EECFC7
+:102450008CEF8C0F813A48F48C2F0E94E42281117A
+:102460008DC08C2F0E94C81BE3CF80E28C0F883078
+:1024700048F4C77081E001C0880FCA95EAF70E944E
+:10248000491CD6CF8BE58C0F833078F4C53A29F000
+:10249000C63A31F482E890E005C081E890E002C0DD
+:1024A00083E890E0CF910C94F11088E58C0F833194
+:1024B00008F064C0C83A39F1C93A41F1CA3A49F161
+:1024C000CB3A51F1CC3A59F1CD3A61F1C03B69F1C7
+:1024D000CE3A71F1CF3A79F1C13B81F1C23B89F13A
+:1024E000C33B91F1C43B99F1C53BA1F1C63BA9F1B6
+:1024F000C73BB1F1C83BB9F1C93BC1F1CA3BC9F512
+:102500008AE292E038C082EE90E035C089EE90E039
+:1025100032C08AEE90E02FC085EB90E02CC086EBB5
+:1025200090E029C087EB90E026C08CEC90E023C0BF
+:102530008DEC90E020C083E891E01DC08AE891E036
+:102540001AC082E991E017C084E991E014C081E2E9
+:1025500092E011C083E292E00EC084E292E00BC0F0
+:1025600085E292E008C086E292E005C087E292E050
+:1025700002C080E090E0CF910C940711CF910895B4
+:10258000882309F44BC0823859F40E94CF1081FF90
+:1025900045C089E30E94C81B0E94921C89E30CC0BD
+:1025A000833871F40E94CF1080FF38C083E50E9409
+:1025B000C81B0E94921C83E50E94081C0C94921C6C
+:1025C000843859F40E94CF1082FF28C087E40E940B
+:1025D000C81B0E94921C87E4EFCF9CEF980F913AA2
+:1025E00058F390E2980F983050F4877091E001C052
+:1025F000990F8A95EAF7892F0E944F1CDFCF9BE540
+:10260000980F933020F480E090E00C94F110885AF9
+:10261000833120F480E090E00C9407110895882322
+:1026200021F00E94491C0C94921C0895882321F0EB
+:102630000E944F1C0C94921C0895CF92DF92EF924F
+:10264000FF920F931F93CF93DF93CDB7DEB72897F9
+:102650000FB6F894DEBF0FBECDBF8C0185E0F80148
+:10266000DE01119601900D928A95E1F7F801D08074
+:10267000E180F280558152955F7023813481232B54
+:1026800039F0FFEFEF1206C081E0DF1203C003C094
+:1026900081E001C080E080FDE2C2C8015F830E944A
+:1026A000F711D982EA8269817A818F2D0E94C41B39
+:1026B0009E8388870E94781B0E944B1A4E815F81FF
+:1026C0006885FF2029F00E94661C68855F814E8125
+:1026D000E42FE295EF70F0E0E259FF4F0C941625DD
+:1026E000842F807F142F1F70882311F01295107F84
+:1026F000FF20B1F0112309F467C280E2860F883011
+:1027000028F4812F68870E94491C04C0812F6887A4
+:102710000E94591C688568870E94921C688554C273
+:10272000862F68870E94C0126885112309F497C21A
+:10273000605E812F683018F40E944F1C02C00E9416
+:102740005F1C28960FB6F894DEBF0FBECDBFDF9199
+:10275000CF911F910F91FF90EF90DF90CF900C944D
+:10276000921C242F207F842F8F70203211F08295AD
+:10277000807F662319F0613019F12BC0FF20B1F082
+:10278000552309F493C1513009F090C128960FB632
+:10279000F894DEBF0FBECDBFDF91CF911F910F9197
+:1027A000FF90EF90DF90CF900C94791C552319F097
+:1027B000513009F454C28E830E947C1C8E8189C1E1
+:1027C000FF2021F0523008F04AC270C1511147C2B7
+:1027D00080C1FF2021F0552309F468C1F5C15523BC
+:1027E00009F477C105C2242F26952695237030E081
+:1027F0002115310521F021303105C9F030C2FF200B
+:1028000021F0862F942F937002C080E090E02896EC
+:102810000FB6F894DEBF0FBECDBFDF91CF911F91F1
+:102820000F91FF90EF90DF90CF900C94F110FF206C
+:1028300021F0862F942F937002C080E090E02896BC
+:102840000FB6F894DEBF0FBECDBFDF91CF911F91C1
+:102850000F91FF90EF90DF90CF900C940711862F8F
+:10286000FF2019F00E94B91F02C00E942120289663
+:102870000FB6F894DEBF0FBECDBFDF91CF911F9191
+:102880000F91FF90EF90DF90CF900C94A620842FB3
+:10289000837009F076C0F110E2C1262F22952695AB
+:1028A0002770220F220F862F8F70C82ED12CE12C7B
+:1028B000F12C022E04C0CC0CDD1CEE1CFF1C0A9473
+:1028C000D2F764FF10C06FE070E080E090E004C0D9
+:1028D000660F771F881F991F2A95D2F7609570950C
+:1028E0008095909503C060E070E0CB01242F269581
+:1028F00026952370422F50E042305105D1F04330ED
+:10290000510559F16C297D298E299F2941305105A6
+:1029100041F128960FB6F894DEBF0FBECDBFDF9110
:10292000CF911F910F91FF90EF90DF90CF900C947B
-:10293000851A603FC9F118F4603E50F49BC0623FB5
-:1029400009F460C008F44AC0633F09F46FC092C044
-:10295000162F1F70842F8F71FF2099F00E941E1A6E
-:10296000812F28960FB6F894DEBF0FBECDBFDF9142
+:10293000701A6C297D298E299F2928960FB6F89444
+:10294000DEBF0FBECDBFDF91CF911F910F91FF90E2
+:10295000EF90DF90CF900C948A1A0E94701AC701F2
+:10296000B60128960FB6F894DEBF0FBECDBFDF913B
:10297000CF911F910F91FF90EF90DF90CF900C942B
-:1029800082120E943F1A812F28960FB6F894DEBF5C
-:102990000FBECDBFDF91CF911F910F91FF90EF90B0
-:1029A000DF90CF900C948912FF20A1F02111B2C0CA
-:1029B000842F8F7128960FB6F894DEBF0FBECDBF5F
-:1029C000DF91CF911F910F91FF90EF90DF90CF900B
-:1029D0000C94641A223008F09DC0EACFFF20A1F0C9
-:1029E000842F8F7128960FB6F894DEBF0FBECDBF2F
-:1029F000DF91CF911F910F91FF90EF90DF90CF90DB
-:102A00000C941E1AFF2061F3842F8F7128960FB645
+:10298000561AFF2019F0842F817001C08695882384
+:1029900009F465C1262F229526952770220F220F54
+:1029A000862F8F70C82ED12CE12CF12C022E04C062
+:1029B000CC0CDD1CEE1CFF1C0A94D2F764FF10C087
+:1029C0006FE070E080E090E004C0660F771F881F22
+:1029D000991F2A95D2F7609570958095909503C0C0
+:1029E00060E070E0CB01242F269526952370422FBE
+:1029F00050E042305105D1F04330510559F16C2976
+:102A00007D298E299F294130510541F128960FB625
:102A1000F894DEBF0FBECDBFDF91CF911F910F9114
-:102A2000FF90EF90DF90CF900C943F1AFF2091F031
-:102A3000842F8F7128960FB6F894DEBF0FBECDBFDE
+:102A2000FF90EF90DF90CF900C94441B6C297D2990
+:102A30008E299F2928960FB6F894DEBF0FBECDBF12
:102A4000DF91CF911F910F91FF90EF90DF90CF908A
-:102A50000C94091A28960FB6F894DEBF0FBECDBFAE
-:102A6000DF91CF911F910F91FF90EF90DF90CF906A
-:102A70000C94FF19FF20A1F0222309F4B1CF862F77
-:102A800028960FB6F894DEBF0FBECDBFDF91CF9171
-:102A90001F910F91FF90EF90DF90CF900C946B11EE
-:102AA000222309F4B1CF862F28960FB6F894DEBF03
-:102AB0000FBECDBFDF91CF911F910F91FF90EF908F
-:102AC000DF90CF900C9433124F70C8010E94A50480
-:102AD00028960FB6F894DEBF0FBECDBFDF91CF9121
-:102AE0001F910F91FF90EF90DF90CF900C942619DB
-:102AF0004F70C80128960FB6F894DEBF0FBECDBF49
-:102B0000DF91CF911F910F91FF90EF90DF90CF90C9
-:102B10000C94EA0728960FB6F894DEBF0FBECDBF1F
-:102B2000DF91CF911F910F91FF90EF90DF90CF90A9
-:102B300008950E94B41B0E94C41B0E94891B0E941E
-:102B4000E01B0E94F0200E94442080E090E00E9460
-:102B5000651080E090E00C947B100E94A41B0C9404
-:102B600099150E94D41A292F22952F7030E02C300D
-:102B700031054CF42A3031056CF4225031092230F1
-:102B8000310590F407C02C30310551F02F3031055C
-:102B900039F00AC0803E10F0803F31F481E00895A2
-:102BA00093FB882780F9089580E00895CF93DF9301
-:102BB00000D000D01F92CDB7DEB70F900F900F90CE
-:102BC0000F900F90DF91CF910895CF93DF9300D0B6
-:102BD00000D000D0CDB7DEB726960FB6F894DEBF92
-:102BE0000FBECDBFDF91CF9108951F93CF93DF9399
-:102BF000C091790116E080917A01C81799F0D0E070
-:102C00001C9FF0011D9FF00D1124E558FE4F4081DF
-:102C1000518162817381848195810E94E51521969D
-:102C2000C770E9CFDF91CF911F9108954091AB011B
-:102C30005091AC016091AD017091AE018091AF01F6
-:102C40009091B0010C94E515CF938091B0018295DD
-:102C50008F7009F05FC08091AD01882309F45AC0DC
-:102C600020917901A0917A016091AB017091AC0142
-:102C70008091AE019091AF0131E06F3F09F030E0FB
-:102C8000B32FC6E02A1709F445C0009721F07F3F13
-:102C900021F44B2F03C041E001C040E030E040FD93
-:102CA00035C0C29FF001C39FF00D1124E558FE4FBF
-:102CB000418174132BC04081641328C042814111AB
-:102CC00025C0438154814817590710F441505109D8
-:102CD000481B590B483C5105C8F48091B0018F70D6
-:102CE00080618093B00186E0829FF001839FF00DA8
-:102CF0001124E058FE4F80818F70806180838BEAC1
-:102D000091E00E949012CF910C94F5152F5F3F4FE8
-:102D10002770B8CFCF910895CF92DF92EF92FF92B4
-:102D20000F931F93CF93DF93CDB7DEB762970FB6A4
-:102D3000F894DEBF0FBECDBF8C0185E0F801DE0147
-:102D40001D9601900D928A95E1F7D8014C9111964C
-:102D50005C91119712966C9112971396ED90FC90DE
-:102D600014977091AB01E091AC012091AE013091CC
-:102D7000AF012115310531F0EF3F31F481E07F3FA4
-:102D800019F403C081E001C080E0B82FB170CB2EF0
-:102D900080FD6CC1D090AD01DD2009F4F5C0F0914B
-:102DA000B001E216F30638F0C701821B930B883C92
-:102DB000910548F09BC0209530952E0D3F1D283C75
-:102DC000310508F093C08F2F807F09F052C0E513C2
-:102DD00014C0741312C0D62E61110FC0FF70F061C1
-:102DE000F093B0010E9416168BEA91E00E949012B7
-:102DF0008091B001F80185836CC1EF2831F05F3F0D
-:102E000031F481E04F3F19F403C081E001C080E05C
-:102E100080FD03C081E0862701C080E0F82FF170BB
-:102E2000FF2E80FF1CC08091790120917A0136E04D
-:102E3000821709F428C190E0389FF001399FF00D06
-:102E40001124E558FE4F7181571306C07081471356
-:102E500003C07281671303C001968770E9CFD62E35
-:102E6000662309F436C18091B00181608093B0017E
-:102E700053C0E51308C0741306C0611104C0D80123
-:102E80001596FC93AEC04D875E878D859E856A8BB7
-:102E90000E94B1156A89882329F1D62E662311F183
-:102EA0002091B001822F82958F7090E002970CF4F0
-:102EB00060C08091AB019091AC0198878F83198697
-:102EC000FB86EA862C87CE01079651C0E51731F1C3
-:102ED0004D875E878D859E856A8B0E94B1156A89B4
-:102EE00081112EC0C8010E949012A4C08F2F807F34
-:102EF00069F77E2DF98AE88A89890E94D6158BEABE
-:102F000091E00E949012EBEAF1E086E0DF011D9271
-:102F10008A95E9F70E941616D12CDBC07413D8CF1E
-:102F20006111D6CFD8011596FC93C8010E9490126A
-:102F3000EBEAF1E086E0DF011D928A95E9F7C9C06E
-:102F4000D62E662379F22091B001822F82958F7060
-:102F500090E0029774F08091AB019091AC019A835C
-:102F600089831B82FD82EC822E83CE0101960E9412
-:102F7000901286E0F801ABEAB1E001900D928A95DB
-:102F8000E1F70E9424166FC0E216F30628F0C7018D
-:102F9000821B930B9C0104C0209530952E0D3F1D84
-:102FA000283C310508F052C0D62E662309F49ACF8A
-:102FB000E5132CC074132AC08091B00180FD1DC0A0
-:102FC000982F92959F70C9F0D80115968C931597FC
-:102FD0009F3039F09F5F9295907F8F70892B159667
-:102FE0008C93C8010E94901286E0F801ABEAB1E030
-:102FF00001900D928A95E1F736C086E0F801ABEAC0
-:10300000B1E001900D928A95E1F763C04D875E872C
-:103010008D859E850E94B115882379F086E0F801A0
-:10302000ABEAB1E001900D928A95E1F70E94241677
-:103030000E941616DD24D3944CC08091B0018160AB
-:103040008093B001C8010E94901243C07E2DF98A7E
-:10305000E88A89890E94D615EBEAF1E086E0DF0173
-:103060001D928A95E9F70E94161633C0662309F46B
-:1030700039CF4D875E878D859E850E94B115882347
-:1030800009F430CFCBCF4D875E878D859E850E941A
-:10309000D41A292F22952F7030E0223031052CF4DC
-:1030A0009F7041F0811106C00CC0243031052CF412
-:1030B0009F7049F4805E883020F0C8010E94901211
-:1030C000CF2CDC2C06C0D80115969C91907F91F7EF
-:1030D000F8CF8D2D62960FB6F894DEBF0FBECDBF30
-:1030E000DF91CF911F910F91FF90EF90DF90CF90E4
-:1030F00008951F93CF93DF93CDB7DEB72C970FB60C
-:10310000F894DEBF0FBECDBF4F83588769877A879B
-:103110008B879C87CE0107960E948C168823C1F06E
-:103120002F8138858A859B85892B31F03F3F11F0AF
-:1031300080E003C02F3FE1F781E0811147C04F815C
-:10314000588569857A858B859C850E94E5153EC0EA
-:1031500086E0FE013796DE01119601900D928A9568
-:10316000E1F7FF81E8854A855B854115510531F01E
-:10317000EF3F31F481E0FF3F19F403C081E001C06B
-:1031800080E080FD23C020917A0130E0C9010196E2
-:10319000877099276091790170E086179707F1F1A0
-:1031A000F983EA835D834C8396E0929FD001939FDD
-:1031B000B00D1124A558BE4FFE01319601900D921D
-:1031C0009A95E1F780937A010E94F51516E08091B7
-:1031D000790190917A01891779F1189FC001112422
-:1031E00085589E4F0E948C16882331F1E091790119
-:1031F0001E9FF0011124E558FE4F408151816281EC
-:103200007381848195810E94E5158091790190E018
-:1032100001968770992780937901D9CF0E94AD15C7
-:1032200010927A0110927901EBEAF1E086E0DF0179
-:103230001D928A95E9F7CACF2C960FB6F894DEBF97
-:103240000FBECDBFDF91CF911F910895EF92FF92F6
-:103250000F931F93CF93DF93FC01009709F46FC086
-:10326000F12CEE24E394EF0121968491843740F40D
-:10327000843008F055C0813081F0823021F15FC088
-:10328000853709F447C0C0F19CE7980F903708F0E4
-:1032900056C08F770E94331245C08F010E5F1F4FBB
-:1032A000FE01849190E2980F983050F48770FE2DC3
-:1032B00001C0FF0F8A95EAF78F2F0E94B71B15C038
-:1032C0000E946B1114C08F010E5F1F4FFE0184918D
-:1032D00090E2980F983068F48770FE2D01C0FF0FC0
-:1032E0008A95EAF78F2F0E94BD1B0E94E01BE80120
-:1032F00019C00E943312FBCFCF010296FE01C49188
-:10330000CC2361F0EFE9FFE03197F1F700C0000056
-:10331000C150F6CFCF010296FE01F490EC0102C03D
-:103320000E946B118F2D882341F0EFE9FFE0319768
-:10333000F1F700C000008150F6CFFE0194CFDF917D
-:10334000CF911F910F91FF90EF9008950895609392
-:10335000B5017093B6018093B7019093B8010C94B6
-:1033600099150F931F930091B5011091B60120910B
-:10337000B7013091B801062B172B282B392B00935E
-:10338000B5011093B6012093B7013093B8011F9196
-:103390000F910C9499150F931F930091B501109103
-:1033A000B6012091B7013091B801062317232823D5
-:1033B00039230093B5011093B6012093B7013093E0
-:1033C000B8011F910F910C9499150F931F930091C1
-:1033D000B5011091B6012091B7013091B8010627CF
-:1033E0001727282739270093B5011093B60120939A
-:1033F000B7013093B8011F910F910C949915109259
-:10340000B1011092B2011092B3011092B4010C9468
-:10341000991541E050E060E070E004C0440F551F92
-:10342000661F771F8A95D2F74093B1015093B2017E
-:103430006093B3017093B4010C94991541E050E08E
-:1034400060E070E004C0440F551F661F771F8A9527
-:10345000D2F78091B1019091B201A091B301B091E6
-:10346000B401842B952BA62BB72B8093B10190939D
-:10347000B201A093B301B093B4010C94991541E04B
-:1034800050E060E070E004C0440F551F661F771FD6
-:103490008A95D2F740955095609570958091B101CD
-:1034A0009091B201A091B301B091B401842395230E
-:1034B000A623B7238093B1019093B201A093B301E7
-:1034C000B093B4010C94991541E050E060E070E0D5
-:1034D00004C0440F551F661F771F8A95D2F780914D
-:1034E000B1019091B201A091B301B091B4018427D0
-:1034F0009527A627B7278093B1019093B201A09397
-:10350000B301B093B4010C9499150F931F930091DC
-:10351000B1011091B2012091B3013091B401062B99
-:10352000172B282B392B0093B1011093B201209354
-:10353000B3013093B4011F910F910C9499150F931F
-:103540001F930091B1011091B2012091B30130910C
-:10355000B40106231723282339230093B1011093C4
-:10356000B2012093B3013093B4011F910F910C94D9
-:1035700099150F931F930091B1011091B201209101
-:10358000B3013091B4010627172728273927009364
-:10359000B1011093B2012093B3013093B4011F9194
-:1035A0000F910C9499150895CF92DF92EF92FF92AC
-:1035B0000F931F93CF93DF93EC01C090B501D09090
-:1035C000B601E090B701F090B8018091B1019091FF
-:1035D000B201A091B301B091B401C82AD92AEA2A54
-:1035E000FB2A0FE110E0B701A601002E04C076957A
-:1035F0006795579547950A94D2F740FF07C0BE01DB
-:10360000802F0E940D088130910539F40150110975
-:1036100050F7BE0180E00E940D08DF91CF911F910D
-:103620000F91FF90EF90DF90CF90089590910C0153
-:103630009923D9F090910D019923B9F0982F96957F
-:10364000969596959F3088F5E0910E01F0910F01C7
-:10365000E90FF11D877021E030E001C0220F8A954B
-:10366000EAF78181822B8183089540910E01509168
-:103670000F0120E030E09FEFFA01E20FF31F6281BB
-:10368000681799F09F3F19F4611101C0922F2F5FC5
-:103690003F4F2E30310581F79F3F39F0FA01E90F96
-:1036A000F11D97FDFA9582830895089590910C017C
-:1036B0009923E1F090910D019923C1F0982F9695EF
-:1036C000969596959F3020F5E0910E01F0910F01AF
-:1036D000E90FF11D877021E030E001C0220F8A95CB
-:1036E000EAF72095818128232183089540910E01D6
-:1036F00050910F0120E030E0FA01E20FF31F9281B8
-:10370000981301C012822F5F3F4F2E303105A1F771
-:10371000089581E090E0E0910E01F0910F01E80F33
-:10372000F91F1082019680319105A9F708959091B3
-:10373000CC01982B9093CC01089580959091CC0169
-:1037400098239093CC0108951092CC010895909104
-:10375000CB01982B9093CB01089580959091CB014C
-:1037600098239093CB0108951092CB0108959091E6
-:10377000CA01982B9093CA01089580959091CA012F
-:1037800098239093CA0108951092CA0108958093D6
-:10379000B90108951092B901089540910E01509118
-:1037A0000F0120E030E080E0FA01E20FF31F918189
-:1037B00091118F5F2F5F3F4F2F303105A9F708958B
-:1037C000E0910E01F0910F018091CC018083E09196
-:1037D0000E01F0910F0180819091CB01892B8083A4
-:1037E000E0910E01F0910F0180819091CA01892B27
-:1037F00080839091B901992361F0E0910E01F091DD
-:103800000F018081892B80830E94CD1B8111109232
-:10381000B90180910E0190910F010C944F10CF923D
-:10382000DF92EF92FF920F931F936C01EE24FF241F
-:10383000C114D104E104F10421F46B017C0180E0A6
-:1038400001C080E133272F2D1E2D0D2D01151105EF
-:103850002105310519F0885F68017901970186011A
-:10386000A4E03695279517950795AA95D1F70115E8
-:1038700011052105310519F08C5F68017901970167
-:103880008601F2E03695279517950795FA95D1F7B9
-:10389000011511052105310519F08E5F68017901C7
-:1038A000B701A6017695679557954795452B462B09
-:1038B000472B09F08F5F1F910F91FF90EF90DF90E2
-:1038C000CF9008958091E601843009F11092CE01E5
-:1038D00020E488E190E00FB6F894A895809360000A
-:1038E0000FBE2093600083B7817F846083BF83B75E
-:1038F000816083BF7894889583B78E7F83BF88E18A
-:103900000FB6F89480936000109260000FBE089587
-:1039100008950895CF930E94881C0E9437060E9444
-:10392000891CC0E08C2F0E942407811105C0CF5F45
-:10393000CE30C1F780E001C081E0CF9108950E94B0
-:10394000AD150E9443100C94480982E084BD93E0B9
-:1039500095BD9AEF97BD80936E0008952FB7F894A8
-:103960008091CF019091D001A091D101B091D2016D
-:103970002FBF0895CF92DF92EF92FF920F931F9384
-:103980002FB7F8944091CF015091D0016091D101AF
-:103990007091D2012FBF6A017B01EE24FF248C01BC
-:1039A00020E030E0C016D106E206F30610F44150E4
-:1039B0005109481B590BCA011F910F91FF90EF90BD
-:1039C000DF90CF9008951F920F920FB60F9211249F
-:1039D0008F939F93AF93BF938091CF019091D0012C
-:1039E000A091D101B091D2010196A11DB11D80938A
-:1039F000CF019093D001A093D101B093D201BF9198
-:103A0000AF919F918F910F900FBE0F901F901895BF
-:103A10000E94490DF8942FEF87EA91E621508040EB
-:103A20009040E1F700C0000087E090EBDC0180935C
-:103A3000EF019093F001A093F101B093F2012CE01B
-:103A400088E190E00FB6F894A895809360000FBECF
-:103A500020936000FFCFEF92FF920F931F93CF93BD
-:103A6000DF93E82EF12C8F2D0E942407C0E0D0E0D8
-:103A7000082F10E098010C2E02C0359527950A9466
-:103A8000E2F720FD05C02196C630D10599F709C09F
-:103A90006C2F7F2D80E00E94EB07E812F4CF81E0CD
-:103AA00005C0F3948EE0F812DECF80E0DF91CF9175
-:103AB0001F910F91FF90EF900895CF93C82F8CE244
-:103AC0000E942B1D882321F08C2FCF910C942B1D4D
-:103AD00080E0CF910895CF930E94B01E811102C063
-:103AE0000E94961EC5E6C15049F00E9437068FE33A
-:103AF0009CE90197F1F700C00000F5CF89E20E9430
-:103B00005D1D811111C18AE20E945D1D81110E941B
-:103B1000961E85E00E945D1D81110E94081D0E9475
-:103B2000BB1E8093CD0187E00E945D1D882399F123
-:103B30008BE10E945D1D882351F09091CD0191FB96
-:103B4000882780F921E0822780FB91F922C08EE04E
-:103B50000E945D1D882351F09091CD0192FB882732
-:103B600080F921E0822780FB92F913C080E10E9456
-:103B70005D1D9091CD01882341F093FB882780F94A
-:103B800021E0822780FB93F904C0892F809580FB78
-:103B900090F99093CD018091CD010E94BF1E0E94AB
-:103BA000CD1E8093E00180EE0E945D1D882341F0D0
-:103BB0008091E001982F909590FB80F98093E0012F
-:103BC00089E30E945D1D882359F09091E00191FBEB
-:103BD000882780F921E0822780FB91F99093E0010A
-:103BE00082EE0E945D1D882359F09091E00192FBC6
-:103BF000882780F921E0822780FB92F99093E001E9
-:103C000086EE0E945D1D882359F09091E00193FBA0
-:103C1000882780F921E0822780FB93F99093E001C7
-:103C200083EE0E945D1D882359F09091E00194FB82
-:103C3000882780F921E0822780FB94F99093E001A6
-:103C400085E30E945D1D882359F09091E00195FB6A
-:103C5000882780F921E0822780FB95F99093E00185
-:103C600081E30E945D1D882359F09091E00196FB4D
-:103C7000882780F921E0822780FB96F99093E00164
-:103C800081E10E945D1D882359F09091E00197FB2E
-:103C9000882780F921E0822780FB97F99093E00143
-:103CA0008091E0010E94D11E8091E00187FB88276E
-:103CB00080F980930D0187E20E945D1DC82F8EE17F
-:103CC0000E945D1D8111C2608FE10E945D1D811106
-:103CD000C46080E20E945D1D8111C86081E20E9483
-:103CE0005D1D8111C06182E20E945D1D8111C06273
-:103CF00083E20E945D1D8111C06484E20E945D1D0B
-:103D0000882311F0C06802C0CC2329F08C2F0E94B8
-:103D1000C81E6C2F03C00E94C41E682F70E080E094
-:103D200090E0CF910C94A719CF9108956DEE7EEF9E
-:103D300080E090E00E94EC2460E082E090E00E944D
-:103D4000DE2460E083E090E00E94DE2460E084E016
-:103D500090E00E94DE2460E085E090E00C94DE2498
-:103D600080E090E00E94D82421E08D3E9E4F09F033
-:103D700020E0822F089582E090E00C94D024682FF8
-:103D800082E090E00C94DE2483E090E00C94D02458
-:103D9000682F83E090E00C94DE2484E090E00C94A3
-:103DA000D024682F84E090E00C94DE248091D5012B
-:103DB00080FF0BC06091130185E0689FB001112462
-:103DC00075956795759567952AC081FF09C06091C3
-:103DD000130185E0689FB0011124759567951FC098
-:103DE00082FF07C06091130185E0689FB001112434
-:103DF00016C04091D6014423C9F0609112014617C4
-:103E000088F72091130185E0289F90011124429F9B
-:103E1000C001439F900D112470E00E94A2246038DD
-:103E2000710540F46115710539F002C065E070E07C
-:103E3000862F08958FE7089581E008958091D50138
-:103E400080FF08C06091110170E0759567957595C8
-:103E5000679521C081FF06C06091110170E07595E2
-:103E6000679519C082FF04C06091110170E010C015
-:103E70008091D6018823C1F0609110018617A0F7C8
-:103E800090911101989FC001112470E00E94A2241A
-:103E90006038710528F46115710521F0862F0895A9
-:103EA0008FE7089581E0089561E070E0F4CF803FEE
-:103EB00021F40E94D61E819504C0813F29F40E94FE
-:103EC000D61E8093D9010895823F21F40E94D61E08
-:103ED000819504C0833F29F40E94D61E8093D801A7
-:103EE0000895893F19F40E941E1F05C08A3F31F4CE
-:103EF0000E941E1F81958093DA0108958B3F21F463
-:103F00000E941E1F819504C08C3F29F40E941E1F31
-:103F10008093DB010895843F21F48091D701816073
-:103F200017C0853F21F48091D701826011C0863F80
-:103F300021F48091D70184600BC0873F21F48091E8
-:103F4000D701886005C0883F31F48091D701806136
-:103F50008093D70108958D3F21F48091D501816030
-:103F60000BC08E3F21F48091D501826005C08F3F48
-:103F700029F48091D50184608093D5010895803F14
-:103F800039F48091D90187FF6CC01092D90169C0C2
-:103F9000813F29F48091D9011816BCF362C0909139
-:103FA000D801823F29F497FF5CC01092D80159C014
-:103FB000833F19F41916CCF354C0893F41F4809122
-:103FC000DA0118160CF04DC01092DA014AC08A3F8F
-:103FD00029F48091DA0187FF44C0F6CF8B3F39F492
-:103FE0008091DB0187FF3DC01092DB013AC08C3F1E
-:103FF00029F48091DB011816BCF333C0843F21F40F
-:104000008091D7018E7F17C0853F21F48091D70121
-:104010008D7F11C0863F21F48091D7018B7F0BC02B
-:10402000873F21F48091D701877F05C0883F31F415
-:104030008091D7018F7E8093D70113C08D3F21F4EB
-:104040008091D5018E7F0BC08E3F21F48091D501E8
-:104050008D7F05C08F3F29F48091D5018B7F8093A0
-:10406000D5018091D80181110EC08091D9018111B3
-:104070000AC08091DA01811106C08091DB018111B3
-:1040800002C01092D601089587ED91E00E945A1067
-:104090000E94AE1C9093D4018093D30108951F9386
-:1040A000CF93DF938091D3019091D4010E94BA1CE9
-:1040B0004091D601442321F02091140130E006C044
-:1040C000209115015AE0259F900111248217930732
-:1040D00008F482C08091D8011091D901D091DA0101
-:1040E000C091DB01811107C0111105C0D11103C0BE
-:1040F000CC2309F471C04F3F19F04F5F4093D601B4
-:10410000181624F40E94D61E8093D8018091D801FD
-:1041100087FF05C00E94D61E81958093D801111695
-:1041200024F40E94D61E8093D9018091D90187FF83
-:1041300005C00E94D61E81958093D9016091D80157
-:10414000662339F11091D901112319F1772767FD01
-:104150007095872F972F0E94B32323E333E343E324
-:104160005FE30E9417240E9480236093D801612F8F
-:10417000772767FD7095872F972F0E94B32323E33E
-:1041800033E343E35FE30E9417240E94802360939C
-:10419000D9011D1624F40E941E1F8093DA0180911C
-:1041A000DA0187FF05C00E941E1F81958093DA0106
-:1041B0001C1624F40E941E1F8093DB018091DB01FA
-:1041C00087FF05C00E941E1F81958093DB01DF9150
-:1041D000CF911F910C944420DF91CF911F910895AE
-:1041E000E7EDF1E085E0DF011D928A95E9F7109295
-:1041F000D6011092D5010895833081F128F48130E1
-:1042000059F08230D1F00895853009F449C0B8F1F1
-:10421000863009F456C0089520911501862F90E04C
-:10422000820F911D8F3F910520F4620F609315015D
-:1042300008958FEF80931501089520911401862F22
-:1042400090E0820F911D8F3F910520F4620F6093E3
-:10425000140108958FEF80931401089520911301A4
-:10426000862F90E0820F911D8F3F910520F4620F01
-:104270006093130108958FEF8093130108952091A7
-:104280001201862F90E0820F911D8F3F910520F43F
-:10429000620F6093120108958FEF809312010895C9
-:1042A00020911101862F90E0820F911D8F3F910583
-:1042B00020F4620F6093110108958FEF8093110134
-:1042C000089520911001862F90E0820F911D8F3F5D
-:1042D000910520F4620F6093100108958FEF809391
-:1042E00010010895833011F128F4813049F08230B3
-:1042F00091F00895853081F120F18630C1F1089563
-:1043000080911501681720F4861B8093150108958C
-:1043100010921501089580911401681720F4861BEE
-:10432000809314010895109214010895809113014F
-:10433000681720F4861B80931301089510921301CF
-:10434000089580911201681720F4861B8093120152
-:10435000089510921201089580911101681720F4B8
-:10436000861B809311010895109211010895809188
-:104370001001681720F4861B809310010895109295
-:10438000100108958D3109F442C020F58E3009F4F2
-:1043900079C070F4873009F45EC020F4863009F4E7
-:1043A00042C033C08830D1F18B3009F4A7C02DC092
-:1043B000863109F4A3C038F4803109F46DC081312D
-:1043C00009F47BC022C0893109F498C08B3109F40B
-:1043D0004FC01BC0853309F479C048F4873209F413
-:1043E00075C008F478C0893209F470C00EC08334F7
-:1043F00038F48A3308F071C0883309F47FC005C0EF
-:10440000833409F463C08834C1F080E008950E94C9
-:104410003A230E9443100E94480970C00E94BB1EAC
-:104420000E94CD1E6BC08091CD01817F8E7F8093D5
-:10443000CD0181E08093DD0108950E94AD152FEF3D
-:1044400083ED90E3215080409040E1F700C00000F0
-:104450000E94081D53C09091CD01892F817090FF5B
-:1044600003C0917F9E7F26C091609093CD0146C08E
-:104470009091CD0191FB882780F921E0822780FB74
-:1044800091F913C09091CD0192FB882780F921E02A
-:10449000822780FB92F909C09091CD0193FB882778
-:1044A00080F921E0822780FB93F99093CD01882346
-:1044B00029F191609093CD0108950E94AD158091EE
-:1044C0000D0191E0892780930D0118C061E070E033
-:1044D00080E090E00FC023EE01C027EC280F61E0E0
-:1044E00070E080E090E004C0660F771F881F991F7E
-:1044F0002A95D2F70E94A7190E94AD1581E0089570
-:1045000080E0089580E00895CF93C82F8091DD0169
-:10451000813079F018F08230D1F184C0A0910E0181
-:10452000B0910F018C91813169F0823209F07CC029
-:1045300009C0A0910E01B0910F018C91813111F051
-:10454000823249F48C2F0E94802281111DC08C2F51
-:104550000E94C2211AC08C2F0E948222811114C095
-:10456000C43179F048F4CB3079F0C03109F060C043
-:1045700082E08093DD0108C0C93219F0C83321F010
-:1045800057C01092DD0154C081E0817053C0C93220
-:1045900089F118F5C43171F1A8F4C73009F046C0AB
-:1045A0008AE08093150194E19093140193E0909335
-:1045B00013018093120188E08093110188E28093B7
-:1045C000100134C0CE51C63088F5EC2FF0E0E65D26
-:1045D000FE4F80818093DC0129C0CE34E9F020F4C5
-:1045E000CB3421F56AE013C0C13579F0C235F1F45E
-:1045F00061E00DC08091DC01882319F01092DC018C
-:1046000015C081E08093DD0115C061E006C0809196
-:10461000DC010E94FC200AC06AE08091DC010E945B
-:10462000722104C01092DD0180E004C081E002C06C
-:1046300080E0ABCFCF910895E1E8F0E08081886021
-:1046400080838081816080838FB7F89493E090931A
-:10465000890090ED909388008FBF0895EFE6F0E019
-:104660008081826080830895EFE6F0E080818D7F15
-:1046700080830895EFE6F0E0808192E089278083CF
-:1046800008951F920F920FB60F9211242F933F930C
-:104690004F935F936F937F938F939F93AF93BF934A
-:1046A000EF93FF938091DE019091DF01019690934B
-:1046B000DF018093DE01811103C082E00E9448097E
-:1046C000E091DF01E695E695F0E0E258F74FE491DE
-:1046D0008091DE018E1303C080E00E944809FF91A3
-:1046E000EF91BF91AF919F918F917F916F915F916A
-:1046F0004F913F912F910F900FBE0F901F901895E3
-:1047000004D06894B1118DC0089570D088F09F577F
-:1047100090F0B92F9927B751A0F0D1F0660F771F0D
-:10472000881F991F1AF0BA95C9F712C0B13081F0ED
-:1047300077D0B1E0089574C0672F782F8827B85FCD
-:1047400039F0B93FCCF3869577956795B395D9F74E
-:104750003EF490958095709561957F4F8F4F9F4F58
-:104760000895E89409C097FB3EF490958095709564
-:1047700061957F4F8F4F9F4F9923A9F0F92F96E9AD
-:10478000BB279395F695879577956795B795F11122
-:10479000F8CFFAF4BB0F11F460FF1BC06F5F7F4FBF
-:1047A0008F4F9F4F16C0882311F096E911C07723D1
-:1047B00021F09EE8872F762F05C0662371F096E8DA
-:1047C000862F70E060E02AF09A95660F771F881FA9
-:1047D000DAF7880F9695879597F9089557FD9058C1
-:1047E000440F551F59F05F3F71F04795880F97FBB5
-:1047F000991F61F09F3F79F087950895121613066F
-:104800001406551FF2CF4695F1DF08C0161617069D
-:104810001806991FF1CF86957105610508940895D2
-:10482000E894BB2766277727CB0197F908950BD02B
-:1048300078C069D028F06ED018F0952309F05AC0DE
-:104840005FC01124EECFCADFA0F3959FD1F3950F7F
-:1048500050E0551F629FF001729FBB27F00DB11D04
-:10486000639FAA27F00DB11DAA1F649F6627B00D94
-:10487000A11D661F829F2227B00DA11D621F739F7D
-:10488000B00DA11D621F839FA00D611D221F749F8B
-:104890003327A00D611D231F849F600D211D822FD2
-:1048A000762F6A2F11249F5750408AF0E1F0882319
-:1048B0004AF0EE0FFF1FBB1F661F771F881F915026
-:1048C0005040A9F79E3F510570F014C0AACF5F3F3A
-:1048D000ECF3983EDCF3869577956795B795F79559
-:1048E000E7959F5FC1F7FE2B880F911D96958795E1
-:1048F00097F9089597F99F6780E870E060E0089560
-:104900009FEF80EC089500240A94161617061806E7
-:104910000906089500240A941216130614060506C3
-:104920000895092E0394000C11F4882352F0BB0F54
-:1049300040F4BF2B11F460FF04C06F5F7F4F8F4FB7
-:104940009F4F089597FB072E16F4009407D077FD2C
-:1049500009D00E94BC2407FC05D03EF490958195B7
-:104960009F4F0895709561957F4F0895EE0FFF1F3B
-:104970000590F491E02D0994AA1BBB1B51E107C0DF
-:10498000AA1FBB1FA617B70710F0A61BB70B881FDF
-:10499000991F5A95A9F780959095BC01CD0108956E
-:1049A000F999FECF92BD81BDF89A992780B50895F7
-:1049B000A8E1B0E042E050E00C94F324262FF999EE
-:1049C000FECF1FBA92BD81BD20BD0FB6F894FA9AF2
-:1049D000F99A0FBE019608950E94DE24272F0C94A9
-:1049E000DF24DC01CB01FC01F999FECF06C0F2BD4A
-:1049F000E1BDF89A319600B40D9241505040B8F79D
-:064A00000895F894FFCFB9
-:104A060020024A09D709B40980094D090101BA01F2
-:104A160028080A03140A3F4D36393F08F207BC0737
-:104A2600830716072F0748076107010203040506D7
-:044A36000708090064
+:102A50000C945E1B0E94441BC701B60128960FB65A
+:102A6000F894DEBF0FBECDBFDF91CF911F910F91C4
+:102A7000FF90EF90DF90CF900C942A1B603FC9F13C
+:102A800018F4603E50F49BC0623F09F460C008F443
+:102A90004AC0633F09F46FC092C0162F1F70842F85
+:102AA0008F71FF2099F00E94C31A812F28960FB6CC
+:102AB000F894DEBF0FBECDBFDF91CF911F910F9174
+:102AC000FF90EF90DF90CF900C940F130E94E41AC8
+:102AD000812F28960FB6F894DEBF0FBECDBFDF91D1
+:102AE000CF911F910F91FF90EF90DF90CF900C94BA
+:102AF0001613FF20A1F05111B2C0842F8F712896B8
+:102B00000FB6F894DEBF0FBECDBFDF91CF911F91FE
+:102B10000F91FF90EF90DF90CF900C94091B5230F3
+:102B200008F09DC0EACFFF20A1F0842F8F71289676
+:102B30000FB6F894DEBF0FBECDBFDF91CF911F91CE
+:102B40000F91FF90EF90DF90CF900C94C31AFF206D
+:102B500061F3842F8F7128960FB6F894DEBF0FBEF5
+:102B6000CDBFDF91CF911F910F91FF90EF90DF903C
+:102B7000CF900C94E41AFF2091F0842F8F71289647
+:102B80000FB6F894DEBF0FBECDBFDF91CF911F917E
+:102B90000F91FF90EF90DF90CF900C94AE1A289693
+:102BA0000FB6F894DEBF0FBECDBFDF91CF911F915E
+:102BB0000F91FF90EF90DF90CF900C94A41AFF201C
+:102BC000A1F0552309F4B1CF862F28960FB6F894BB
+:102BD000DEBF0FBECDBFDF91CF911F910F91FF9050
+:102BE000EF90DF90CF900C94F811552309F4B1CFFA
+:102BF000862F28960FB6F894DEBF0FBECDBFDF91AB
+:102C0000CF911F910F91FF90EF90DF90CF900C9498
+:102C1000C0124F70C8010E941D0328960FB6F89489
+:102C2000DEBF0FBECDBFDF91CF911F910F91FF90FF
+:102C3000EF90DF90CF900C94CB194F70C80128967D
+:102C40000FB6F894DEBF0FBECDBFDF91CF911F91BD
+:102C50000F91FF90EF90DF90CF900C94FC06289698
+:102C60000FB6F894DEBF0FBECDBFDF91CF911F919D
+:102C70000F91FF90EF90DF90CF9008950E94661C17
+:102C80000E94761C0E943B1C0E94921C0E945221B2
+:102C90000E94A62080E090E00E94F11080E090E089
+:102CA0000C9407110E94561C0C943E160E94B91BEE
+:102CB000292F22952F7030E02C3031054CF42A302A
+:102CC00031056CF4225031092230310590F407C0EF
+:102CD0002C30310551F02F30310539F00AC0803EDB
+:102CE00010F0803F31F481E0089593FB882780F94C
+:102CF000089580E00895CF93DF9300D000D01F9215
+:102D0000CDB7DEB70F900F900F900F900F90DF911F
+:102D1000CF910895CF93DF9300D000D000D0CDB7EE
+:102D2000DEB726960FB6F894DEBF0FBECDBFDF919B
+:102D3000CF9108951F93CF93DF93C091810116E047
+:102D400080918201C81799F0D0E01C9FF0011D9F6F
+:102D5000F00D1124ED57FE4F408151816281738146
+:102D6000848195810E948A162196C770E9CFDF91F0
+:102D7000CF911F9108954091B3015091B40160919A
+:102D8000B5017091B6018091B7019091B8010C9492
+:102D90008A16CF938091B80182958F7009F05FC039
+:102DA0008091B501882309F45AC020918101A09136
+:102DB00082016091B3017091B4018091B60190914C
+:102DC000B70131E06F3F09F030E0B32FC6E02A17BA
+:102DD00009F445C0009721F07F3F21F44B2F03C039
+:102DE00041E001C040E030E040FD35C0C29FF0014D
+:102DF000C39FF00D1124ED57FE4F418174132BC07A
+:102E00004081641328C04281411125C0438154810F
+:102E10004817590710F441505109481B590B483CB9
+:102E20005105C8F48091B8018F7080618093B8011A
+:102E300086E0829FF001839FF00D1124E857FE4F3A
+:102E400080818F708061808383EB91E00E941D13ED
+:102E5000CF910C949A162F5F3F4F2770B8CFCF9128
+:102E60000895CF92DF92EF92FF920F931F93CF932B
+:102E7000DF93CDB7DEB762970FB6F894DEBF0FBE13
+:102E8000CDBF8C0185E0F801DE011D9601900D9209
+:102E90008A95E1F7D8014C9111965C9111971296A1
+:102EA0006C9112971396ED90FC9014977091B3016A
+:102EB000E091B4012091B6013091B701211531059F
+:102EC00031F0EF3F31F481E07F3F19F403C081E03E
+:102ED00001C080E0B82FB170CB2E80FD6CC1D090C6
+:102EE000B501DD2009F4F5C0F091B801E216F30652
+:102EF00038F0C701821B930B883C910548F09BC0BA
+:102F0000209530952E0D3F1D283C310508F093C0CB
+:102F10008F2F807F09F052C0E51314C0741312C0C4
+:102F2000D62E61110FC0FF70F061F093B8010E94BE
+:102F3000BB1683EB91E00E941D138091B801F8014C
+:102F400085836CC1EF2831F05F3F31F481E04F3F62
+:102F500019F403C081E001C080E080FD03C081E07E
+:102F6000862701C080E0F82FF170FF2E80FF1CC083
+:102F7000809181012091820136E0821709F428C1F5
+:102F800090E0389FF001399FF00D1124ED57FE4F6E
+:102F90007181571306C07081471303C07281671394
+:102FA00003C001968770E9CFD62E662309F436C197
+:102FB0008091B80181608093B80153C0E51308C0C7
+:102FC000741306C0611104C0D8011596FC93AEC0FD
+:102FD0004D875E878D859E856A8B0E9456166A890D
+:102FE000882329F1D62E662311F12091B801822F72
+:102FF00082958F7090E002970CF460C08091B301CD
+:103000009091B40198878F831986FB86EA862C8776
+:10301000CE01079651C0E51731F14D875E878D854A
+:103020009E856A8B0E9456166A8981112EC0C8013E
+:103030000E941D13A4C08F2F807F69F77E2DF98A0F
+:10304000E88A89890E947B1683EB91E00E941D1318
+:10305000E3EBF1E086E0DF011D928A95E9F70E943B
+:10306000BB16D12CDBC07413D8CF6111D6CFD801D9
+:103070001596FC93C8010E941D13E3EBF1E086E076
+:10308000DF011D928A95E9F7C9C0D62E662379F231
+:103090002091B801822F82958F7090E0029774F092
+:1030A0008091B3019091B4019A8389831B82FD8240
+:1030B000EC822E83CE0101960E941D1386E0F8015A
+:1030C000A3EBB1E001900D928A95E1F70E94C91639
+:1030D0006FC0E216F30628F0C701821B930B9C0118
+:1030E00004C0209530952E0D3F1D283C310508F079
+:1030F00052C0D62E662309F49ACFE5132CC0741360
+:103100002AC08091B80180FD1DC0982F92959F70B4
+:10311000C9F0D80115968C9315979F3039F09F5FB1
+:103120009295907F8F70892B15968C93C8010E9481
+:103130001D1386E0F801A3EBB1E001900D928A9592
+:10314000E1F736C086E0F801A3EBB1E001900D9203
+:103150008A95E1F763C04D875E878D859E850E94C5
+:103160005616882379F086E0F801A3EBB1E00190D0
+:103170000D928A95E1F70E94C9160E94BB16DD24C4
+:10318000D3944CC08091B80181608093B801C8018C
+:103190000E941D1343C07E2DF98AE88A89890E9406
+:1031A0007B16E3EBF1E086E0DF011D928A95E9F7FB
+:1031B0000E94BB1633C0662309F439CF4D875E8762
+:1031C0008D859E850E945616882309F430CFCBCF7B
+:1031D0004D875E878D859E850E94B91B292F22957C
+:1031E0002F7030E0223031052CF49F7041F08111B6
+:1031F00006C00CC0243031052CF49F7049F4805E69
+:10320000883020F0C8010E941D13CF2CDC2C06C092
+:10321000D80115969C91907F91F7F8CF8D2D6296ED
+:103220000FB6F894DEBF0FBECDBFDF91CF911F91D7
+:103230000F91FF90EF90DF90CF9008951F93CF9361
+:10324000DF93CDB7DEB72C970FB6F894DEBF0FBE75
+:10325000CDBF4F83588769877A878B879C87CE013C
+:1032600007960E9431178823C1F02F8138858A85FF
+:103270009B85892B31F03F3F11F080E003C02F3F49
+:10328000E1F781E0811147C04F81588569857A85D2
+:103290008B859C850E948A163EC086E0FE0137968B
+:1032A000DE01119601900D928A95E1F7FF81E88584
+:1032B0004A855B854115510531F0EF3F31F481E0DE
+:1032C000FF3F19F403C081E001C080E080FD23C00E
+:1032D0002091820130E0C9010196877099276091A1
+:1032E000810170E086179707F1F1F983EA835D8326
+:1032F0004C8396E0929FD001939FB00D1124AD575F
+:10330000BE4FFE01319601900D929A95E1F78093A0
+:1033100082010E949A1616E08091810190918201AB
+:10332000891779F1189FC00111248D579E4F0E9473
+:103330003117882331F1E09181011E9FF0011124A2
+:10334000ED57FE4F40815181628173818481958167
+:103350000E948A168091810190E0019687709927DA
+:1033600080938101D9CF0E9452161092820110924F
+:103370008101E3EBF1E086E0DF011D928A95E9F738
+:10338000CACF2C960FB6F894DEBF0FBECDBFDF912B
+:10339000CF911F910895EF92FF920F931F93CF93B8
+:1033A000DF93FC01009709F46FC0F12CEE24E39445
+:1033B000EF0121968491843740F4843008F055C0A1
+:1033C000813081F0823021F15FC0853709F447C038
+:1033D000C0F19CE7980F903708F056C08F770E9495
+:1033E000C01245C08F010E5F1F4FFE01849190E215
+:1033F000980F983050F48770FE2D01C0FF0F8A950A
+:10340000EAF78F2F0E94691C15C00E94F81114C0A2
+:103410008F010E5F1F4FFE01849190E2980F98304C
+:1034200068F48770FE2D01C0FF0F8A95EAF78F2F91
+:103430000E946F1C0E94921CE80119C00E94C012D9
+:10344000FBCFCF010296FE01C491CC2361F0EFE9DE
+:10345000FFE03197F1F700C00000C150F6CFCF0177
+:103460000296FE01F490EC0102C00E94F8118F2D2B
+:10347000882341F0EFE9FFE03197F1F700C0000049
+:103480008150F6CFFE0194CFDF91CF911F910F9124
+:10349000FF90EF90089508956093BD017093BE0171
+:1034A0008093BF019093C0010C943E160F931F931D
+:1034B0000091BD011091BE012091BF013091C0016A
+:1034C000062B172B282B392B0093BD011093BE011F
+:1034D0002093BF013093C0011F910F910C943E16B1
+:1034E0000F931F930091BD011091BE012091BF0168
+:1034F0003091C00106231723282339230093BD01EF
+:103500001093BE012093BF013093C0011F910F9112
+:103510000C943E160F931F930091BD011091BE01B4
+:103520002091BF013091C00106271727282739278E
+:103530000093BD011093BE012093BF013093C001E1
+:103540001F910F910C943E161092B9011092BA017E
+:103550001092BB011092BC010C943E1641E050E069
+:1035600060E070E004C0440F551F661F771F8A9506
+:10357000D2F74093B9015093BA016093BB017093A5
+:10358000BC010C943E1641E050E060E070E004C0E5
+:10359000440F551F661F771F8A95D2F78091B90196
+:1035A0009091BA01A091BB01B091BC01842B952BE5
+:1035B000A62BB72B8093B9019093BA01A093BB01BE
+:1035C000B093BC010C943E1641E050E060E070E026
+:1035D00004C0440F551F661F771F8A95D2F7409588
+:1035E0005095609570958091B9019091BA01A09124
+:1035F000BB01B091BC0184239523A623B7238093FC
+:10360000B9019093BA01A093BB01B093BC010C9493
+:103610003E1641E050E060E070E004C0440F551FEA
+:10362000661F771F8A95D2F78091B9019091BA01F0
+:10363000A091BB01B091BC0184279527A627B7278D
+:103640008093B9019093BA01A093BB01B093BC01E0
+:103650000C943E160F931F930091B9011091BA017B
+:103660002091BB013091BC01062B172B282B392B45
+:103670000093B9011093BA012093BB013093BC01B0
+:103680001F910F910C943E160F931F930091B90157
+:103690001091BA012091BB013091BC010623172380
+:1036A000282339230093B9011093BA012093BB0159
+:1036B0003093BC011F910F910C943E160F931F93F2
+:1036C0000091B9011091BA012091BB013091BC0168
+:1036D00006271727282739270093B9011093BA0125
+:1036E0002093BB013093BC011F910F910C943E16A7
+:1036F0000895CF92DF92EF92FF920F931F93CF9393
+:10370000DF93EC01C090BD01D090BE01E090BF01FD
+:10371000F090C0018091B9019091BA01A091BB01D4
+:10372000B091BC01C82AD92AEA2AFB2A0FE110E08D
+:10373000B701A601002E04C0769567955795479569
+:103740000A94D2F740FD05C00150110988F780E0C6
+:1037500007C0BE01802F0E9439090197A9F3802F6D
+:10376000DF91CF911F910F91FF90EF90DF90CF905D
+:103770000895CF93DF93EC010E94791BBE010E9454
+:103780003909DF91CF910895CB010E94B91B0895AB
+:1037900090910C019923D9F090910D019923B9F0E2
+:1037A000982F9695969596959F3088F5E0910E0105
+:1037B000F0910F01E90FF11D877021E030E001C0A9
+:1037C000220F8A95EAF78181822B818308954091A7
+:1037D0000E0150910F0120E030E09FEFFA01E20F5F
+:1037E000F31F6281681799F09F3F19F4611101C0BE
+:1037F000922F2F5F3F4F2E30310581F79F3F39F0D9
+:10380000FA01E90FF11D97FDFA9582830895089555
+:1038100090910C019923E1F090910D019923C1F051
+:10382000982F9695969596959F3020F5E0910E01EC
+:10383000F0910F01E90FF11D877021E030E001C028
+:10384000220F8A95EAF72095818128232183089504
+:1038500040910E0150910F0120E030E0FA01E20F9B
+:10386000F31F9281981301C012822F5F3F4F2E30B9
+:103870003105A1F7089581E090E0E0910E01F0910B
+:103880000F01E80FF91F1082019680319105A9F709
+:1038900008959091D401982B9093D4010895809528
+:1038A0009091D40198239093D40108951092D4015B
+:1038B00008959091D301982B9093D301089580950A
+:1038C0009091D30198239093D30108951092D3013E
+:1038D00008959091D201982B9093D20108958095EC
+:1038E0009091D20198239093D20108951092D20121
+:1038F00008958093C10108951092C10108954091E7
+:103900000E0150910F0120E030E080E0FA01E20F5B
+:10391000F31F918191118F5F2F5F3F4F2F30310542
+:10392000A9F70895E0910E01F0910F018091D40163
+:103930008083E0910E01F0910F0180819091D3017D
+:10394000892B8083E0910E01F0910F01808190918D
+:10395000D201892B80839091C101992361F0E0917C
+:103960000E01F0910F018081892B80830E947F1CC2
+:1039700081111092C10180910E0190910F010C9460
+:10398000DB108091EC01843021F11092D60120E40B
+:1039900088E190E00FB6F894A895809360000FBE80
+:1039A0002093600080E00E94D40983B7817F846007
+:1039B00083BF83B7816083BF7894889583B78E7FF8
+:1039C00083BF88E10FB6F894809360001092600086
+:1039D0000FBE089508950895CF930E94EA1C0E9497
+:1039E00008060E94EB1CC0E08C2F0E94F506811196
+:1039F00005C0CF5FCE30C1F780E001C081E0CF913C
+:103A000008950E9452160E94CF100C94D40982E0AF
+:103A100084BD93E095BD9AEF97BD80936E000895A5
+:103A20002FB7F8948091D7019091D801A091D90136
+:103A3000B091DA012FBF0895CF92DF92EF92FF92FB
+:103A40000F931F932FB7F8944091D7015091D8014D
+:103A50006091D9017091DA012FBF6A017B01EE24D8
+:103A6000FF248C0120E030E0C016D106E206F30608
+:103A700010F441505109481B590BCA011F910F9175
+:103A8000FF90EF90DF90CF9008951F920F920FB6A6
+:103A90000F9211248F939F93AF93BF938091D7017F
+:103AA0009091D801A091D901B091DA010196A11DA0
+:103AB000B11D8093D7019093D801A093D901B09301
+:103AC000DA01BF91AF919F918F910F900FBE0F9030
+:103AD0001F9018950E94D50DF8942FEF87EA91E674
+:103AE000215080409040E1F700C0000087E090EB5B
+:103AF000DC018093F6019093F701A093F801B09355
+:103B0000F9012CE088E190E00FB6F894A895809335
+:103B100060000FBE20936000FFCFEF92FF920F93E3
+:103B20001F93CF93DF93E82EF12C8F2D0E94F50683
+:103B3000C0E0D0E0082F10E098010C2E02C03595AF
+:103B400027950A94E2F720FD05C02196C630D105DD
+:103B500099F709C06C2F7F2D80E00E94FD06E812C6
+:103B6000F4CF81E005C0F3948EE0F812DECF80E060
+:103B7000DF91CF911F910F91FF90EF900895CF9318
+:103B8000C82F8CE20E948D1D882321F08C2FCF91AD
+:103B90000C948D1D80E0CF910895CF930E94121F49
+:103BA000811102C00E94F81EC5E6C15049F00E9472
+:103BB00008068FE39CE90197F1F700C00000F5CFFC
+:103BC00089E20E94BF1D811111C18AE20E94BF1DBE
+:103BD00081110E94F81E85E00E94BF1D81110E9484
+:103BE0006A1D0E941D1F8093D50187E00E94BF1DA2
+:103BF000882399F18BE10E94BF1D882351F0909199
+:103C0000D50191FB882780F921E0822780FB91F97B
+:103C100022C08EE00E94BF1D882351F09091D501F3
+:103C200092FB882780F921E0822780FB92F913C05C
+:103C300080E10E94BF1D9091D501882341F093FB44
+:103C4000882780F921E0822780FB93F904C0892F1F
+:103C5000809580FB90F99093D5018091D5010E94C9
+:103C6000211F0E942F1F8093F50180EE0E94BF1D2F
+:103C7000882341F08091F501982F909590FB80F971
+:103C80008093F50189E30E94BF1D882359F090912C
+:103C9000F50191FB882780F921E0822780FB91F9CB
+:103CA0009093F50182EE0E94BF1D882359F09091F8
+:103CB000F50192FB882780F921E0822780FB92F9A9
+:103CC0009093F50186EE0E94BF1D882359F09091D4
+:103CD000F50193FB882780F921E0822780FB93F987
+:103CE0009093F50183EE0E94BF1D882359F09091B7
+:103CF000F50194FB882780F921E0822780FB94F965
+:103D00009093F50185E30E94BF1D882359F090919F
+:103D1000F50195FB882780F921E0822780FB95F942
+:103D20009093F50181E30E94BF1D882359F0909183
+:103D3000F50196FB882780F921E0822780FB96F920
+:103D40009093F50181E10E94BF1D882359F0909165
+:103D5000F50197FB882780F921E0822780FB97F9FE
+:103D60009093F5018091F5010E94331F8091F50138
+:103D700087FB882780F980930D0187E20E94BF1D91
+:103D8000C82F8EE10E94BF1D8111C2608FE10E9489
+:103D9000BF1D8111C46080E20E94BF1D8111C860F7
+:103DA00081E20E94BF1D8111C06182E20E94BF1D9D
+:103DB0008111C06283E20E94BF1D8111C06484E250
+:103DC0000E94BF1D882311F0C06802C0CC2329F0D7
+:103DD0008C2F0E942A1F6C2F03C00E94261F682F61
+:103DE00070E080E090E0CF910C944C1ACF91089550
+:103DF0006DEE7EEF80E090E00E94502560E082E072
+:103E000090E00E943E2560E083E090E00E943E2525
+:103E100060E084E090E00E943E2560E085E090E074
+:103E20000C943E2580E090E00E94382521E08D3EF4
+:103E30009E4F09F020E0822F089582E090E00C94DC
+:103E40003025682F82E090E00C943E2583E090E0DE
+:103E50000C943025682F83E090E00C943E2584E09C
+:103E600090E00C943025682F84E090E00C943E257F
+:103E70008091DD0180FF0BC06091130185E0689F98
+:103E8000B001112475956795759567952AC081FFD6
+:103E900009C06091130185E0689FB00111247595F8
+:103EA00067951FC082FF07C06091130185E0689F7E
+:103EB000B001112416C04091DE014423C9F0609185
+:103EC0001201461788F72091130185E0289F900181
+:103ED0001124429FC001439F900D112470E00E9465
+:103EE00002256038710540F46115710539F002C092
+:103EF00065E070E0862F08958FE7089581E00895CA
+:103F00008091DD0180FF08C06091110170E075951E
+:103F100067957595679521C081FF06C06091110175
+:103F200070E07595679519C082FF04C0609111011A
+:103F300070E010C08091DE018823C1F06091100113
+:103F40008617A0F790911101989FC001112470E08D
+:103F50000E9402256038710528F46115710521F071
+:103F6000862F08958FE7089581E0089561E070E05D
+:103F7000F4CF803F21F40E94381F819504C0813F17
+:103F800029F40E94381F8093E1010895823F21F4B3
+:103F90000E94381F819504C0833F29F40E94381F76
+:103FA0008093E0010895893F19F40E94801F05C0A5
+:103FB0008A3F31F40E94801F81958093E201089529
+:103FC0008B3F21F40E94801F819504C08C3F29F40F
+:103FD0000E94801F8093E3010895843F21F4809123
+:103FE000DF01816017C0853F21F48091DF0182608D
+:103FF00011C0863F21F48091DF0184600BC0873FB0
+:1040000021F48091DF01886005C0883F31F4809100
+:10401000DF0180618093DF0108958D3F21F480915D
+:10402000DD0181600BC08E3F21F48091DD01826053
+:1040300005C08F3F29F48091DD0184608093DD010C
+:104040000895803F39F48091E10187FF6CC01092A0
+:10405000E10169C0813F29F48091E1011816BCF3A8
+:1040600062C09091E001823F29F497FF5CC01092FA
+:10407000E00159C0833F19F41916CCF354C0893FAD
+:1040800041F48091E20118160CF04DC01092E2014B
+:104090004AC08A3F29F48091E20187FF44C0F6CFED
+:1040A0008B3F39F48091E30187FF3DC01092E3011B
+:1040B0003AC08C3F29F48091E3011816BCF333C059
+:1040C000843F21F48091DF018E7F17C0853F21F46A
+:1040D0008091DF018D7F11C0863F21F48091DF0147
+:1040E0008B7F0BC0873F21F48091DF01877F05C064
+:1040F000883F31F48091DF018F7E8093DF0113C010
+:104100008D3F21F48091DD018E7F0BC08E3F21F425
+:104110008091DD018D7F05C08F3F29F48091DD0105
+:104120008B7F8093DD018091E00181110EC0809131
+:10413000E10181110AC08091E201811106C08091E4
+:10414000E301811102C01092DE0108958FED91E02C
+:104150000E94E6100E94101D9093DC018093DB0109
+:1041600008951F93CF93DF938091DB019091DC0141
+:104170000E941C1D4091DE01442321F02091140176
+:1041800030E006C0209115015AE0259F90011124CE
+:104190008217930708F482C08091E0011091E10139
+:1041A000D091E201C091E301811107C0111105C056
+:1041B000D11103C0CC2309F471C04F3F19F04F5FF8
+:1041C0004093DE01181624F40E94381F8093E0010A
+:1041D0008091E00187FF05C00E94381F8195809380
+:1041E000E001111624F40E94381F8093E1018091B0
+:1041F000E10187FF05C00E94381F81958093E1018E
+:104200006091E001662339F11091E101112319F168
+:10421000772767FD7095872F972F0E94132423E33C
+:1042200033E343E35FE30E9477240E94E02360933B
+:10423000E001612F772767FD7095872F972F0E94E8
+:10424000132423E333E343E35FE30E9477240E94D4
+:10425000E0236093E1011D1624F40E94801F8093E7
+:10426000E2018091E20187FF05C00E94801F8195D5
+:104270008093E2011C1624F40E94801F8093E301C6
+:104280008091E30187FF05C00E94801F8195809384
+:10429000E301DF91CF911F910C94A620DF91CF9184
+:1042A0001F910895EFEDF1E085E0DF011D928A9501
+:1042B000E9F71092DE011092DD010895833081F15B
+:1042C00028F4813059F08230D1F00895853009F416
+:1042D00049C0B8F1863009F456C0089520911501FF
+:1042E000862F90E0820F911D8F3F910520F4620F81
+:1042F0006093150108958FEF809315010895209123
+:104300001401862F90E0820F911D8F3F910520F4BC
+:10431000620F6093140108958FEF80931401089544
+:1043200020911301862F90E0820F911D8F3F910500
+:1043300020F4620F6093130108958FEF80931301AF
+:10434000089520911201862F90E0820F911D8F3FDA
+:10435000910520F4620F6093120108958FEF80930E
+:104360001201089520911101862F90E0820F911D76
+:104370008F3F910520F4620F6093110108958FEF34
+:1043800080931101089520911001862F90E0820FF3
+:10439000911D8F3F910520F4620F609310010895E5
+:1043A0008FEF809310010895833011F128F481304C
+:1043B00049F0823091F00895853081F120F1863006
+:1043C000C1F1089580911501681720F4861B809330
+:1043D0001501089510921501089580911401681730
+:1043E00020F4861B809314010895109214010895FF
+:1043F00080911301681720F4861B809313010895A0
+:1044000010921301089580911201681720F4861B01
+:104410008093120108951092120108958091110164
+:10442000681720F4861B80931101089510921101E2
+:10443000089580911001681720F4861B8093100165
+:1044400008951092100108958D3109F442C020F5AD
+:104450008E3009F477C070F4873009F459C018F42D
+:104460008630F1F134C0883009F4A8C08B3009F4EB
+:10447000A5C02DC0863109F4A1C038F4803109F4FB
+:1044800072C0813109F479C022C0893109F496C023
+:104490008B3109F44DC01BC0853309F487C048F443
+:1044A000873209F483C008F473C0893209F47EC0EE
+:1044B0000EC0833438F48A3308F068C0883309F4B6
+:1044C0007DC005C0833409F471C0883499F080E060
+:1044D00008950E949A230E94CF100E94D4096EC0B2
+:1044E0008091D501817F8E7F8093D50181E080937B
+:1044F000E50108950E9452162FEF83ED90E32150BD
+:1045000080409040E1F700C000000E946A1D56C044
+:104510009091D501892F8095817080FB90F919F0D9
+:10452000966098601DC0997F977F9093D50146C093
+:104530009091D50191FB882780F921E0822780FBAB
+:1045400091F909C09091D50192FB882780F921E06B
+:10455000822780FB92F99093D501882379F19160AD
+:104560009093D50108959091D50193FB882780F908
+:1045700021E0822780FB93F9EECF0E9452168091B2
+:104580000D0191E0892780930D0118C027EC01C02F
+:1045900023EE280F61E070E080E090E004C0660F39
+:1045A000771F881F991F2A95D2F704C061E070E039
+:1045B00080E090E00E944C1A0E94521681E008951B
+:1045C00080E0089580E00895CF93C82F8091E501A1
+:1045D000813079F018F08230D1F184C0A0910E01C1
+:1045E000B0910F018C91813169F0823209F07CC069
+:1045F00009C0A0910E01B0910F018C91813111F091
+:10460000823249F48C2F0E94E02281111DC08C2F30
+:104610000E9424221AC08C2F0E94E222811114C011
+:10462000C43179F048F4CB3079F0C03109F060C082
+:1046300082E08093E50108C0C93219F0C83321F047
+:1046400057C01092E50154C081E0817053C0C93257
+:1046500089F118F5C43171F1A8F4C73009F046C0EA
+:104660008AE08093150194E19093140193E0909374
+:1046700013018093120188E08093110188E28093F6
+:10468000100134C0CE51C63088F5EC2FF0E0E65D65
+:10469000FE4F80818093E40129C0CE34E9F020F4FC
+:1046A000CB3421F56AE013C0C13579F0C235F1F49D
+:1046B00061E00DC08091E401882319F01092E401BB
+:1046C00015C081E08093E50115C061E006C08091CE
+:1046D000E4010E945E210AC06AE08091E4010E9428
+:1046E000D42104C01092E50180E004C081E002C042
+:1046F00080E0ABCFCF910895E1E8F0E08081886061
+:1047000080838081816080838FB7F89493E0909359
+:10471000890090ED909388008FBF0895EFE6F0E058
+:104720008081826080830895EFE6F0E080818D7F54
+:1047300080830895EFE6F0E0808192E0892780830E
+:1047400008951F920F920FB60F9211242F933F934B
+:104750004F935F936F937F938F939F93AF93BF9389
+:10476000EF93FF938091E6019091E701019690937A
+:10477000E7018093E601811103C082E00E94D40921
+:10478000E091E701E695E695F0E0E259FA4FE49111
+:104790008091E6018E1303C080E00E94D409FF914E
+:1047A000EF91BF91AF919F918F917F916F915F91A9
+:1047B0004F913F912F910F900FBE0F901F90189522
+:1047C00004D06894B1118DC0089570D088F09F57BF
+:1047D00090F0B92F9927B751A0F0D1F0660F771F4D
+:1047E000881F991F1AF0BA95C9F712C0B13081F02D
+:1047F00077D0B1E0089574C0672F782F8827B85F0D
+:1048000039F0B93FCCF3869577956795B395D9F78D
+:104810003EF490958095709561957F4F8F4F9F4F97
+:104820000895E89409C097FB3EF4909580957095A3
+:1048300061957F4F8F4F9F4F9923A9F0F92F96E9EC
+:10484000BB279395F695879577956795B795F11161
+:10485000F8CFFAF4BB0F11F460FF1BC06F5F7F4FFE
+:104860008F4F9F4F16C0882311F096E911C0772310
+:1048700021F09EE8872F762F05C0662371F096E819
+:10488000862F70E060E02AF09A95660F771F881FE8
+:10489000DAF7880F9695879597F9089557FD905800
+:1048A000440F551F59F05F3F71F04795880F97FBF4
+:1048B000991F61F09F3F79F08795089512161306AE
+:1048C0001406551FF2CF4695F1DF08C016161706DD
+:1048D0001806991FF1CF8695710561050894089512
+:1048E000E894BB2766277727CB0197F908950BD06B
+:1048F00078C069D028F06ED018F0952309F05AC01E
+:104900005FC01124EECFCADFA0F3959FD1F3950FBE
+:1049100050E0551F629FF001729FBB27F00DB11D43
+:10492000639FAA27F00DB11DAA1F649F6627B00DD3
+:10493000A11D661F829F2227B00DA11D621F739FBC
+:10494000B00DA11D621F839FA00D611D221F749FCA
+:104950003327A00D611D231F849F600D211D822F11
+:10496000762F6A2F11249F5750408AF0E1F0882358
+:104970004AF0EE0FFF1FBB1F661F771F881F915065
+:104980005040A9F79E3F510570F014C0AACF5F3F79
+:10499000ECF3983EDCF3869577956795B795F79598
+:1049A000E7959F5FC1F7FE2B880F911D9695879520
+:1049B00097F9089597F99F6780E870E060E008959F
+:1049C0009FEF80EC089500240A9416161706180627
+:1049D0000906089500240A94121613061406050603
+:1049E0000895092E0394000C11F4882352F0BB0F94
+:1049F00040F4BF2B11F460FF04C06F5F7F4F8F4FF7
+:104A00009F4F089597FB072E16F4009407D077FD6B
+:104A100009D00E941C2507FC05D03EF49095819595
+:104A20009F4F0895709561957F4F0895EE0FFF1F7A
+:104A30000590F491E02D0994AA1BBB1B51E107C01E
+:104A4000AA1FBB1FA617B70710F0A61BB70B881F1E
+:104A5000991F5A95A9F780959095BC01CD010895AD
+:104A6000F999FECF92BD81BDF89A992780B5089536
+:104A7000A8E1B0E042E050E00C945825262FF999C7
+:104A8000FECF92BD81BDF89A019700B4021639F0AD
+:104A90001FBA20BD0FB6F894FA9AF99A0FBE08957E
+:104AA0000196272F0E943F250C943E25DC01CB0167
+:104AB000FC01F999FECF06C0F2BDE1BDF89A31962E
+:104AC00000B40D9241505040B8F70895F894FFCFCC
+:104AD0002002D609630A400A0C0AD9090101C20161
+:104AE00028080A03140A3F4D36392F05E204AC04A6
+:104AF000730406041F04380451040102030405066C
+:044B00000708090099
:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/readme.md b/keyboard/ergodox_ez/keymaps/ordinary/readme.md index 842dc7ee19..6465cd79e0 100644 --- a/keyboard/ergodox_ez/keymaps/ordinary/readme.md +++ b/keyboard/ergodox_ez/keymaps/ordinary/readme.md @@ -55,7 +55,7 @@ Finally, consider the turquoise text-nav keys. Here in the Symbols layer, these * The bright green keys are more F-keys * The dark yellow keys signal Web and Audio applications * The light yellow keys signal the operating system -* The uncolored keys do nothing in case you bump them by accident +* The dark gray keys do nothing in case you bump them by accident  @@ -67,14 +67,37 @@ Alas, the yellow keys have at best spotty success with common software. Good luc ## Switching Between Layers ## -The three Shift keys correspond to three logical layers on top of the ever-present base layer, and are represented in the three LEDs on the keyboard: Capitals (red), Symbols (green), Media (blue). The color of a layer illuminates when the layer is active. Shift keys work in the expected way: press them and the keys shift to that layer; release them and the keys shift back to the base layer. The Ordinary Layout also features a Shift Lock key to keep a layer active indefinitely. Hold down the Shift Lock key then press any Shift key to lock to that layer. Or, hold down the Shift key and press the Shift Lock key; it works either way. To revert to the base layer, use the Shift Lock key again in combination with the Shift key. +In addition to Symbols and Media there is the Capitals layer which is exactly the same as pressing the shift key. Each layer is accessed by a shift key on each edge of the keyboard and corresponds to one of the three LEDs on the keyboard: Capitals (red), Symbols (green), Media (blue). The color of a layer illuminates when the layer is active. -This layout attempts to treat the Capitals Shift layer the same as the other two Shift layers, but internally they are different which causes some inconsistencies. For instance, it is possible to switch from any layer to any other layer, and to lock to any layer, *except* it is not possible to go from Media to Symbols. You must exit the Media layer before engaging the Symbols layer. Also, the Caps Lock feature must be triggered by first pressing the Shift Lock key then a Capitals Shift key; it doesn't work if you press the Shift key first (instead you get the secondary symbol character associated with the Shift Lock button). +Shift buttons work in the expected way: press them and all of the keys switch to that layer; release them and the keys switch back to the base layer. If you press both of a pair of shift keys, the layer will lock on until you press both shift keys again. For instance, the widely and rightly loathed Caps Lock is engaged by pressing both Capitals Shift buttons. All the Shift keys work this way. -## Special Escape & Backspace Sequences ## +Multiple layers can be turned on at once. The Capitals layer will affect characters on other layers to capitalize. Other layers, however, don't 'mix': Symbols blankets the base layout; Media blankets Symbols. -In the Ordinary Layout, the most unsatisfying key location is the Escape key which rightly belongs segregated on its own way up on the top left of the keyboard. The Ergodox does not have a physical button in such a location and the nearest one, in the top left corner, is home to the tilde (er, grave) which is commonly found there. The Escape key is important so it features prominently on the other top corner on the left side of the keyboard, and is always there in all layers. Nevertheless, alas, it isn't Ordinary to put the escape in that different corner! +## Special Sequences ## -That tilde key has a second function as the Shift Lock key and that makes possible a special feature. To make this layout as Ordinary as possible, the Escape key can *also* be accessed by pressing Shift Lock then the 1 button right next to it. This easy gesture is a way to partially maintain the ease of flicking your wrist to the left and tapping Escape. This gesture works in all layers. + -Finally, because the special Escape sequence is so natural and useful, on the top right corner of the Ergodox EZ you can do the same gesture with the 0 key to produce a Backspace. Users of this keyboard and this layout are well advised to learn to use their thumbs for deleting text, but sometimes you are doing other computery things and just want to flick your digits up to the right and press backspace a bunch times. These special sequences should feel unremarkably mundane but might prove to be remarkably useful. +### Escape ### + +The One True Location for the Escape key is segregated way up on the top left of the keyboard. The Ergodox does not have a physical button in such a location and the nearest one is home to the tilde (er, grave) which is commonly found there. In the Ordinary layout the Escape key is found on all layers in the prominent location in the corner next to the 5, whnich is easy to remember, and yet it isn't natural for those of us with muscle memory flicking our wrists up and to the left looking for Escape. + +The Ordinary layout offers as a consolation prize a Special sequence for Escape: Special Shift + 1. This is natural so you can tap the top left button, then the button next to it and get Escape. This gesture works in all layers. + +### Backspace ### + +At the top right corner of the Ergodox EZ you can a gesture similar to the special Escape sequence, using the 0 key, to produce a Backspace. Users of this keyboard and this layout are well advised to learn to use their thumbs for deleting text, but sometimes you are doing other computery things and just want to flick your digits up to the right and press backspace a bunch times. + +### RShift ### + +The Ordinary Layout locks layers by pressing both of a pair of shift keys. This interferes with the QMK firmware magic sequence, which is LShift+RShift. To work around this, both of the Capitals Shift keys produce a *Left Shift* keystroke. If for some reason a person needs *Right Shift* they can find it by pressing a Special Shift key, then the Capitals Shift key on the right side of the keyboard. + +**** + +The Ordinary Layout for the Ergodox EZ keyboard, v4 + +Modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com + +No rights reserved. This software is in the public domain. Credit me if you are friendly but if you're a jerk don't bother. + +Details: readme.md + https://github.com/nrrkeene/qmk_firmware/tree/master/keyboard/ergodox_ez/keymaps/ordinary diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c index b3ed55f217..19e539006a 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c @@ -15,6 +15,15 @@ #include "keymap_extras/keymap_spanish.h" #include "keymap_extras/keymap_bepo.h" + +/** +* This layout was generated using the ErgodoxLayoutGenerator (ELG). You can download it from https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases +* documentation about it can be found here https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/ +* Thanks to the team of Erez Zukerman for building the great Ergodox-EZ! +* +* use at own risk! +**/ + #define BASE 0 #define SYMB 1 #define MDIA 2 @@ -23,24 +32,73 @@ #define EGOS 5 #define SMLY_TOG_QUOT 0 + #define M_TOGGLE_5 1 + #define TGH_NUM 2 + #define M_DE_OSX_PLUS_CTRLALT 3 + #define SM_KISS 4 + #define SM_FROWN 5 + #define SM_CRY 6 + #define SM_SMILE 7 + #define SM_SMIRK 8 + #define M_LGUI_SHFT 9 + #define SM_HEART 10 + #define TOG_HLD_MDIA 11 + #define SM_LAUGH 12 + #define SM_SAD 13 + #define M_DE_OSX_CIRC_CTRLCMD 14 + #define M_MEH_SH_ACUT 15 + //Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/** +* Layer: BASE +* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ +* | ESC | 1 | 2 | 3 | 4 | 5 | Hold or toggle | | Hold or toggle | 6 | 7 | 8 | 9 | 0 | ß | +* | | | | | | | Layer NUMB | | Layer MDIA | | | | | | | +* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ +* | TAB | Q | W | E | R | T | Cmd | | Cmd | Z | U | I | O | P | Ü | +* | | | | | | | | | | | | | | | | +* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/\-------------------\ \-------------------\/-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ +* | Alt | A | S | D | F | G | | H | J | K | L | Ö | Ä | +* | | | | | | | | | | | | | ALT | +* /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------//-------------------//-------------------/ +* | Shift | Y | X | C | V | B | Alt | | Alt | N | M | , | . | - | Shift | +* | | Ctrl | | | | | | | | | | | | Ctrl | | +* \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\ \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\\-------------------\ +* +* +* /-------------------//-------------------//-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------//-------------------//-------------------/ +* | < | LongPress / Type | LongPress / Type | Shift+Ctrl | Type | | # | ACUT | CMD+Shift | ALT+Shift | + | +* | SYMB | DE_OSX_CIRC_CTRLCMD| DE_OSX_PLUS_CTRAlt | | Toggle SMLY | | Meh | Hyper | | | SYMB | +* \-------------------\\-------------------\\-------------------\\-------------------\/-------------------//-------------------/ /-------------------//-------------------/ \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\ +* | HOME | END | | LEFT | RIGHT | +* | | | | | | +* \-------------------\/-------------------/ /-------------------/\-------------------\ +* | PGUP | | UP | +* | | | | +* /-------------------//-------------------//-------------------/ /-------------------//-------------------//-------------------/ +* | BSPC | DEL | PGDN | | DOWN | ENT | SPC | +* | | | | | | | | +* \-------------------\\-------------------\\-------------------\ \-------------------\\-------------------\\-------------------\ +* +* +**/ [BASE]=KEYMAP( //left half KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(TGH_NUM), @@ -60,6 +118,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_ENT, KC_SPC), +/** +* Layer: SYMB +* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ +* | APPLICATION| F1 | F2 | F3 | F4 | F5 | F5 | | F6 | F6 | F7 | F8 | F9 | F10 | F11 | +* | | | | | | | | | | | | | | | | +* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ +* | | < | > | ! | ? | | | | | \ | [ | ] | < | > | ! | +* | | | | | | | | | | | | | | | | +* /-----------//-----------//-----------//-----------//-----------//-----------/\-----------\ \-----------\/-----------//-----------//-----------//-----------//-----------//-----------/ +* | | # | $ | \ | / | . | | / | ( | ) | { | } | # | +* | | | | | | | | | | | | | | +* /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------//-----------//-----------/ +* | | | < | % | | | ~ | | | | | | ~ | | | | | +* | | | | | | | | | | | | | | | | +* \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\ \-----------\\-----------\\-----------\\-----------\\-----------\\-----------\\-----------\ +* +* +* /-----------//-----------//-----------//-----------//-----------/ /-----------//-----------//-----------//-----------//-----------/ +* | | | | | | | ' | DQOT | | Toggle 5 | | +* | | | | | | | | | | | | +* \-----------\\-----------\\-----------\\-----------\/-----------//-----------/ /-----------//-----------/ \-----------\\-----------\\-----------\\-----------\\-----------\ +* | | | | F13 | F12 | +* | | | | | | +* \-----------\/-----------/ /-----------/\-----------\ +* | | | F14 | +* | | | | +* /-----------//-----------//-----------/ /-----------//-----------//-----------/ +* | | DEL | | | F15 | | | +* | | | | | | | | +* \-----------\\-----------\\-----------\ \-----------\\-----------\\-----------\ +* +* +**/ [SYMB]=KEYMAP( //left half KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, @@ -79,6 +170,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F13, KC_F12, KC_F14, KC_F15, KC_TRNS, KC_TRNS), +/** +* Layer: MDIA +* /-----//-----//-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----//-----//-----/ +* | | | | | | | | | | | | | | | | +* | | | | | | | | | | | | | | | | +* /-----//-----//-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----//-----//-----/ +* | | | BTN1 | U | BTN2 | U | | | | | | | | | | +* | | | | | | | | | | | | | | | | +* /-----//-----//-----//-----//-----//-----/\-----\ \-----\/-----//-----//-----//-----//-----//-----/ +* | | | L | D | R | D | | | | | | | | +* | | | | | | | | | | | | | | +* /-----//-----//-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----//-----//-----/ +* | | | L | D | R | BTN3 | | | | | | | | UP | | +* | | | | | | | | | | | | | | | | +* \-----\\-----\\-----\\-----\\-----\\-----\\-----\ \-----\\-----\\-----\\-----\\-----\\-----\\-----\ +* +* +* /-----//-----//-----//-----//-----/ /-----//-----//-----//-----//-----/ +* | | | | | | | | | LEFT | DOWN | RIGHT| +* | | | | | | | | | | | | +* \-----\\-----\\-----\\-----\/-----//-----/ /-----//-----/ \-----\\-----\\-----\\-----\\-----\ +* | | | | MPRV | MNXT | +* | | | | | | +* \-----\/-----/ /-----/\-----\ +* | | | VOLU | +* | | | | +* /-----//-----//-----/ /-----//-----//-----/ +* | | | | | VOLD | MUTE | MPLY | +* | | | | | | | | +* \-----\\-----\\-----\ \-----\\-----\\-----\ +* +* +**/ [MDIA]=KEYMAP( //left half KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -90,14 +214,47 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //right half - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_VOLD, KC_TRNS, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS, - KC_MUTE, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, - KC_TRNS, KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_WBAK), + 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_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, + KC_MPRV, KC_MNXT, + KC_VOLU, + KC_VOLD, KC_MUTE, KC_MPLY), +/** +* Layer: SMLY +* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/ +* | | | | | | | | | Typing | Typing | Typing | | | | | +* | | | | | | | | | SM_SMILE| SM_SMIRK| SM_LAUGH| | | | | +* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/ +* | | | | | | | | | | Typing | Typing | Typing | | | | +* | | | | | | | | | | SM_FROWN| SM_SAD | SM_CRY | | | | +* /--------//--------//--------//--------//--------//--------/\--------\ \--------\/--------//--------//--------//--------//--------//--------/ +* | | | | | | | | Typing | Typing | | | | | +* | | | | | | | | SM_HEART| SM_KISS | | | | | +* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/ +* | | | | | | | | | | | | | | | | +* | | | | | | | | | | | | | | | | +* \--------\\--------\\--------\\--------\\--------\\--------\\--------\ \--------\\--------\\--------\\--------\\--------\\--------\\--------\ +* +* +* /--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------/ +* | | | | | | | | | | | | +* | | | | | | | | | | | | +* \--------\\--------\\--------\\--------\/--------//--------/ /--------//--------/ \--------\\--------\\--------\\--------\\--------\ +* | | | | | | +* | | | | | | +* \--------\/--------/ /--------/\--------\ +* | | | | +* | | | | +* /--------//--------//--------/ /--------//--------//--------/ +* | | | | | | | | +* | | | | | | | | +* \--------\\--------\\--------\ \--------\\--------\\--------\ +* +* +**/ [SMLY]=KEYMAP( //left half KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -117,6 +274,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +/** +* Layer: NUMB +* /----//----//----//----//----//----//----/ /----//----//----//----//----//----//----/ +* | | | | | | | | | | F6 | F7 | F8 | F9 | F10 | F11 | +* | | | | | | | | | | | | | | | | +* /----//----//----//----//----//----//----/ /----//----//----//----//----//----//----/ +* | | | | UP | | | | | | / | 7 | 8 | 9 | * | F12 | +* | | | | | | | | | | | | | | | | +* /----//----//----//----//----//----/\----\ \----\/----//----//----//----//----//----/ +* | | | LEFT| DOWN| RGHT| | | / | 4 | 5 | 6 | + | - | +* | | | | | | | | | | | | | | +* /----//----//----//----//----//----//----/ /----//----//----//----//----//----//----/ +* | | | | | | | | | | % | 1 | 2 | 3 | | | +* | | | | | | | | | | | | | | | | +* \----\\----\\----\\----\\----\\----\\----\ \----\\----\\----\\----\\----\\----\\----\ +* +* +* /----//----//----//----//----/ /----//----//----//----//----/ +* | | | | | | | 0 | . | , | = | | +* | | | | | | | | | | | | +* \----\\----\\----\\----\/----//----/ /----//----/ \----\\----\\----\\----\\----\ +* | | | | | | +* | | | | | | +* \----\/----/ /----/\----\ +* | | | | +* | | | | +* /----//----//----/ /----//----//----/ +* | | | | | | | | +* | | | | | | | | +* \----\\----\\----\ \----\\----\\----\ +* +* +**/ [NUMB]=KEYMAP( //left half KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -136,6 +326,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +/** +* Layer: EGOS +* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/ +* | | | | | | | | | | | | | | | | +* | | | | | | | | | | | | | | | | +* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/ +* | | | | | | | | | | | | | | | | +* | | | | | | | | | | | | | | | | +* /--------//--------//--------//--------//--------//--------/\--------\ \--------\/--------//--------//--------//--------//--------//--------/ +* | Shift | | | | | | | | | | | | | +* | | | | | | | | | | | | | | +* /--------//--------//--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------//--------//--------/ +* | | | | | | | | | | | | | | | | +* | | | | | | | | | | | | | | | | +* \--------\\--------\\--------\\--------\\--------\\--------\\--------\ \--------\\--------\\--------\\--------\\--------\\--------\\--------\ +* +* +* /--------//--------//--------//--------//--------/ /--------//--------//--------//--------//--------/ +* | Ctrl | | | | | | | | | Toggle 5| | +* | | | | | | | | | | | | +* \--------\\--------\\--------\\--------\/--------//--------/ /--------//--------/ \--------\\--------\\--------\\--------\\--------\ +* | F1 | F2 | | | | +* | | | | | | +* \--------\/--------/ /--------/\--------\ +* | F3 | | | +* | | | | +* /--------//--------//--------/ /--------//--------//--------/ +* | SPC | Ctrl | F4 | | | | | +* | | | | | | | | +* \--------\\--------\\--------\ \--------\\--------\\--------\ +* +* +**/ [EGOS]=KEYMAP( //left half KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -259,7 +482,7 @@ case M_LGUI_SHFT: if (record->event.pressed){ return MACRO(DOWN(KC_LGUI),DOWN(KC_LSFT),END); }else{ - return MACRO(UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),U(LGUI),U(LSFT),END); + return MACRO(UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),UP(KC_LGUI),UP(KC_LSFT),U(LGUI),U(LSFT),END); } break; diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental.hex b/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental.hex new file mode 100644 index 0000000000..3c7ab58597 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental.hex @@ -0,0 +1,1247 @@ +:100000000C9430040C9474040C9474040C947404D4 +:100010000C9474040C9474040C9474040C94740480 +:100020000C9474040C9474040C94680F0C943A109F +:100030000C9474040C9474040C9474040C94740460 +:100040000C9474040C9404250C9474040C9474049F +:100050000C9474040C94931E0C9474040C94740407 +:100060000C9474040C9474040C9474040C94740430 +:100070000C9474040C9474040C9474040C94740420 +:100080000C9474040C9474040C9474040C94740410 +:100090000C9474040C9474040C9474040C94740400 +:1000A0000C9474040C9474040C9474048404BE04BE +:1000B000D004F2040A05100516051C0522052805C2 +:1000C0002D0533055D05620567057E05A710C9107E +:1000D000B711C910B7110E113111B711861199114D +:1000E00085148514C214C214051543155C175C17DA +:1000F0005C155C175D165D1630175C175C174717AB +:1001000002E002E2012E022E02E10002E002E10220 +:10011000E20001E001E101E20002E002E301640229 +:10012000640002E002E30001E001E30001E10137C5 +:10013000023702E10138023801E10125022502E11E +:100140000001E10137023702E10138023801E10123 +:1001500007020702E10001350235012002200002FA +:10016000E302E102E302E102E302E102E302E1026F +:10017000E302E102E302E102E302E102E302E1025F +:10018000E302E102E302E102E302E102E302E1024F +:10019000E302E102E302E102E302E102E302E1023F +:1001A000E302E102E302E102E302E102E302E1022F +:1001B000E302E102E302E102E302E102E302E1021F +:1001C000E302E102E302E102E302E102E302E1020F +:1001D000E302E102E302E102E302E102E302E102FF +:1001E000E302E102E302E102E302E102E302E102EF +:1001F000E302E102E302E10001E301E10001E101C8 +:1002000036023602E10138023801E10126022602F7 +:10021000E10001E10137023702E10138023801E172 +:100220000126022602E10001E10136023602E10167 +:1002300038023801E10125022502E10001E1013720 +:10024000023702E10138023801E20125022502E20B +:100250000001E10137023702E10138023801E10112 +:1002600030023002E10002E002E20130023000021E +:10027000E002E20001E001E20001E10131023102AD +:10028000E10029002B00E200E100358100001E00A2 +:10029000140004001D710E304E001F001A001600DD +:1002A0001B0003304C002000080007000600E0029D +:1002B0002A00210015000900190000304B0022001F +:1002C00017000A00050000004A000230E3000000A9 +:1002D000E20000004D000B30E7000000E6000000E7 +:1002E000500023001C000B00110000004F002400F0 +:1002F00018000D0010003177520025000C000E0090 +:1003000036002E7F2C00260012000F003700E10877 +:1003100028002700130033003871E10451002D003C +:100320002F003474E50030810000650001000100F9 +:100330000100010000003A00350031000100010019 +:1003400001003B0035022102350001004C003C0059 +:100350001E0224062202010001003D002D0224029B +:100360002404010001003E000100370011040000D8 +:1003700001003E00010000000100000001003F00FC +:10038000010000000100000068003F002406240274 +:10039000240400004500400022042502110431021B +:1003A000690041002304260201001F0201004200EF +:1003B0003500250401000100010043003502260438 +:1003C000010001306A0044001E02310001000100FA +:1003D0000000010001000100010001000000010017 +:1003E000010001000100010001000100F400F20021 +:1003F000FB00010001000100F000F100FA00010023 +:1004000001000100F500F300FC0001000100010003 +:10041000F900FA00F60000000100010001000000F0 +:1004200001000000010001000100000001000000C7 +:10043000AC0001000100010001000000AB00010060 +:100440000100010001000100A900010001000100FC +:1004500001000100AE000100010001000100500098 +:10046000A80001000100010052005100AA00010093 +:100470000100010001004F00000001000100010027 +:100480000100010000000100010001000100010065 +:100490000100010001000100010001000100010054 +:1004A0000100010001000100010001000100010044 +:1004B0000100010001000100010001000100000035 +:1004C00001000100010000000100000001000730F0 +:1004D00001000000010000000100083005300A3072 +:1004E0000100000001000C300D300430010001005B +:1004F00001000100063001000100010001000100BF +:1005000001000100010001000100010001000100E3 +:1005100001000100010001000100010001000100D3 +:1005200000000100010001000100010000000100C5 +:100530000100010001000100010001000100500064 +:100540000100010001000100520051000100010002 +:100550000100010001004F00010001000100010045 +:100560000100010001000000010001000100000085 +:100570000100000001000100010000000100000076 +:1005800001003F002402240222020000010040007A +:10059000240021001E002700010041002500220048 +:1005A0001F00370001004200260023002000360013 +:1005B0000100430030023000010027020100440026 +:1005C0004500380001000100000001000100E100C9 +:1005D0000100E00000000100010001000100010035 +:1005E0003D0001000100010001000100E0000100E8 +:1005F00001000100010001002C00010001000100C8 +:10060000010001003C0001000100010001000000A8 +:100610003A00010001000000010000003B00010061 +:1006200001000000010000000100010001000100C4 +:1006300001000000010001000100010001000100B3 +:1006400001000100010001000100010001000100A2 +:100650000100010001000100010001000100010092 +:100660000100013001000100010001000100010052 +:10067000000016034500720067006F0044006F0021 +:100680007800200045005A00000016034500720063 +:1006900067006F0044006F007800200045005A009A +:1006A00000000403090409026D00040100A0FA0916 +:1006B0000400000103010100092111010001223F92 +:1006C000000705810308000A090401000103010273 +:1006D00000092111010001224D00070582030800D5 +:1006E0000A090402000103000000092111010001B0 +:1006F0002236000705830308000A090403000103EA +:1007000000000009211101000122390007058403BE +:100710001000011201100100000008EDFE07130196 +:10072000000102000105010906A101050719E029E0 +:10073000E7150025019508750181020508190129B1 +:10074000059505750191029501750391010507193C +:1007500000297715002501957875018102C00501F2 +:100760000980A101850216010026B7001A01002A9E +:10077000B700751095018100C0050C0901A1018524 +:1007800003160100269C021A01002A9C027510958E +:10079000018100C005010902A1010901A1000509AB +:1007A000190129051500250195057501810295019D +:1007B000750381010501093009311581257F9502F5 +:1007C0007508810609381581257F95017508810610 +:1007D000050C0A38021581257F950175088106C030 +:1007E000C005010906A101050719E029E715002543 +:1007F00001950875018102950175088101050819A7 +:100800000129059505750191029501750391010571 +:1008100007190029FF150025FF950675088100C0FE +:100820000000000000000000000000010204060AB1 +:100830000F17202C3A4A5D71879DB3C7DAE9F5FCA2 +:10084000FFFCF5E9DAC7B39D87715D4A3A2C2017A2 +:100850000F0A060402010000000000000000000072 +:1008600011241FBECFEFDAE0DEBFCDBF04B603FE1A +:1008700024C08091F0019091F101A091F201B0911A +:10088000F3018730904BA740B04BB9F41092F001C0 +:100890001092F1011092F2011092F30114BE84B78C +:1008A000877F84BF88E10FB6F89480936000109230 +:1008B00060000FBEE0E0FFE3099511E0A0E0B1E0C9 +:1008C000E6E9FDE402C005900D92A433B107D9F723 +:1008D00011E0A4E3B1E001C01D92A03FB107E1F730 +:1008E0000E94AC0C0C94C9260C940000462F50E0DA +:1008F0004031510508F01FC1DC01FA01EA5AFF4FEF +:1009000012968C910C9479268823A9F00E945D1E82 +:1009100090933501809334018091B3019091B4019B +:10092000A091B501B091B60128E08227887099277F +:10093000AA27BB27AEC08091B3019091B401A091CA +:10094000B501B091B60128E0822788709927AA27BF +:10095000BB278093B3019093B401A093B501B093EA +:10096000B60180913401909135010E94691E87394A +:1009700091050CF0E0C089E792E00895882309F41E +:10098000DAC08091B3019091B401A091B501B0910A +:10099000B60120E2822780729927AA27BB2779C057 +:1009A000882339F00E945D1E9093350180933401B5 +:1009B0000AC080913401909135010E94691E8739E7 +:1009C00091050CF4B8C08091B3019091B401A0914D +:1009D000B501B091B60120E1822780719927AA273D +:1009E000BB2757C0882349F00E945D1E90933501B4 +:1009F0008093340184E792E00895809134019091CE +:100A000035010E94691E873991050CF08EC086E67B +:100A100092E00895882309F48EC081E592E008955C +:100A2000882309F488C08CE392E00895882309F4B0 +:100A300082C087E292E00895882309F47CC082E1B5 +:100A400092E00895882309F476C08DEF91E008952F +:100A500081116EC08FE591E00895882309F46BC081 +:100A600086E591E008958823E9F00E945D1E909349 +:100A70003501809334018091B3019091B401A0912C +:100A8000B501B091B60124E0822784709927AA2786 +:100A9000BB278093B3019093B401A093B501B093A9 +:100AA000B60149C080913401909135010E94691EC0 +:100AB000873991050CF43FC0DECF8823E1F181E452 +:100AC00091E008958823B9F18CE291E0089588239C +:100AD00049F00E945D1E909335018093340187E2B6 +:100AE00091E0089580913401909135010E94691E32 +:100AF000873991051CF589E191E00895882349F033 +:100B00000E945D1E909335018093340182E191E053 +:100B1000089580913401909135010E94691E8739B2 +:100B200091057CF480E091E008958FE692E00895CD +:100B300088EF91E0089580E090E0089582E291E0EE +:100B400008958BE091E0089508956091B30170914C +:100B5000B4018091B5019091B6010E94BF1D5698D5 +:100B60005E9825982D9826982E9827982F98823051 +:100B700061F018F4813031F00895843069F08530E7 +:100B800039F00895259A2D9A0895269A2E9A089557 +:100B9000259A2D9A269A2E9A279A2F9A08950C9480 +:100BA000A50556985E9825982D9826982E982798F2 +:100BB0002F988FEF90E09093890080938800909316 +:100BC0008B0080938A0090938D0080938C00259AEF +:100BD0002D9A2FEF80E792E0215080409040E1F77E +:100BE00000C00000269A2E9A2FEF80E792E0215055 +:100BF00080409040E1F700C00000279A2F9A2FEF25 +:100C000080E792E0215080409040E1F700C0000072 +:100C100025982D982FEF80E792E02150804090405A +:100C2000E1F700C0000026982E982FEF80E792E0B1 +:100C3000215080409040E1F700C0000027982F9895 +:100C400056985E9825982D9826982E9827982F9834 +:100C5000089589EA8093800089E080938100249838 +:100C60002C983F988AB18F748AB96E98479A8BB145 +:100C7000806B8BB9769A0E94D1050C94A40580E212 +:100C8000809300018091360181110EC00E948E0672 +:100C900081E0809336012FEF83ED90E32150804077 +:100CA0009040E1F700C0000080E40E949406809329 +:100CB000000181112EC00E94BE06809300018111A7 +:100CC00028C00E94BE0680930001811122C08FE3DC +:100CD0000E94BE068093000181111BC00E94B606CF +:100CE00080E40E94940680930001811112C08CE080 +:100CF0000E94BE068093000181110BC00E94BE06B7 +:100D000080930001811105C08FE30E94BE0680938D +:100D100000010E94B6068091000108951092B9006A +:100D20008AE08093B800089594EA9093BC00909173 +:100D3000BC0097FFFCCF9091B900987F983021F0CC +:100D4000903111F081E008958093BB0084E8809396 +:100D5000BC008091BC0087FFFCCF8091B900887FE8 +:100D6000883111F0803471F780E0089584E9809330 +:100D7000BC008091BC0084FDFCCF08958093BB0033 +:100D800084E88093BC008091BC0087FFFCCF9091E9 +:100D9000B900987F81E0983209F480E0089584E8F2 +:100DA0008093BC008091BC0087FFFCCF8091BB008A +:100DB000089580910001811115C080E40E9494067D +:100DC0008093000181110CC082E10E94BE068093D5 +:100DD0000001811105C08FEF0E94BE0680930001C3 +:100DE0000E94B60684B1807F84B985B1807F85B9C1 +:100DF0008AB1837F8AB98BB1837F8BB93E9846983D +:100E000008950E943F06809300010E94D90680B396 +:100E10008C7080BB81B3836F81BBA8E3B1E0E6E453 +:100E2000F1E08EE08E0F11921D928E13FCCF0C9488 +:100E30002906BF92CF92DF92EF92FF920F931F93FA +:100E4000CF93DF9380910001882379F0809137015F +:100E50008F5F80933701811108C00E943F06809305 +:100E60000001811102C00E94D10508E311E0C0E039 +:100E7000D0E0DD24D39482E0C82EEE24E394F12C5C +:100E8000C730D10500F580910001811164C080E474 +:100E90000E94940680930001811112C082E10E9499 +:100EA000BE068093000181110BC0C7010C2E01C04A +:100EB000880F0A94EAF780950E94BE06809300018D +:100EC0000E94B60648C0CA30A1F028F4C83059F0D4 +:100ED000C93061F005C0CC3089F070F0CD3089F0B8 +:100EE000209A289810C0219A29980DC0229A2A98F1 +:100EF0000AC0239A2B9807C0529A01C0539A5B9854 +:100F000002C03E9A469890EA9A95F1F79FB1799976 +:100F100002C082E001C080E091709D25982B7C99F1 +:100F200002C084E001C080E0892B7D9902C038E0D6 +:100F300001C030E0832B7E9902C020E101C020E097 +:100F4000822B9FB19095991F9927991F9295990F80 +:100F5000907E892B0FC080910001811149C080E4EF +:100F60000E94940680930001882379F1B12C0E949D +:100F7000B6068B2DF8019081981719F08083C092E6 +:100F800001010E94D90621960F5F1F4FCE30D10577 +:100F900009F076CF80910101882361F1815080931F +:100FA0000101882339F08FE99FE00197F1F700C034 +:100FB000000020C0A6E4B1E0E8E3F1E0CF01825FE9 +:100FC00091919D938E13FCCF15C083E10E94BE06C4 +:100FD000809300018111CACF81E40E94940680931E +:100FE00000018111C3CF0E94CF06B82EB094BFCFAD +:100FF00080E0C0CF0E94CF0581E0DF91CF911F91AB +:101000000F91FF90EF90DF90CF90BF900895E82F61 +:10101000F0E0EA5BFE4F808108950895089596E020 +:10102000799FF001112494E5899FE00DF11D1124B1 +:10103000E60FF11DEE0FFF1FEE57FD4F85919491C6 +:101040000895880F991FFC01EE5FFE4F85919491E2 +:101050000895880F991FFC01EE57FD4F85919491DB +:1010600008950F931F93CF93DF93EC018115904365 +:1010700050F5C11580E2D80708F0B3C0CB3BD105CD +:1010800090F4C83AD10508F05AC0C53AD10508F025 +:101090004BC0C430D10508F0BBC1219709F0B5C1E0 +:1010A00001E010E0F5C1CF3FD10511F008F0B0C16B +:1010B000C03FD10508F092C0CE01805E910908972B +:1010C00008F4A6C1A2C1C11591E5D907A8F4C230A0 +:1010D00020E5D20708F09EC0C11580E5D80709F4C5 +:1010E00085C008F091C0C11520E4D20708F08DC179 +:1010F000DD278E01106CCCC1C11580E8D80758F4EB +:10110000C11590E7D90708F07CC1C11520E6D207C8 +:1011100008F422C17AC1C11580E9D80708F075C169 +:10112000DF708E01106AB4C1C53AD10509F472C1ED +:10113000C63AD10509F071C102E810E4A9C1C83A64 +:10114000D10509F46DC1C93AD10509F46CC1CA3A97 +:10115000D10509F46BC1CB3AD10509F46AC1CC3A87 +:10116000D10509F469C1CD3AD10509F468C1C03B84 +:10117000D10509F467C1CE3AD10509F466C1CF3A69 +:10118000D10509F465C1C13BD10509F464C1C23B75 +:10119000D10509F463C1C33BD10509F462C1C43B65 +:1011A000D10509F461C1C53BD10509F460C1C63B55 +:1011B000D10509F45FC1C73BD10509F45EC1C83B45 +:1011C000D10509F45DC1C93BD10509F45CC1CA3B35 +:1011D000D10509F45BC100E014E45AC18E01106529 +:1011E00057C1CE019F700E94290853C10E948017E9 +:1011F0009FEF24E38CE0915020408040E1F700C055 +:1012000000000E94B81E44C18091CF01816080938C +:10121000CF013EC10E946120811102C00E9447207F +:101220000E947E2090E09093F0018093EF01C23005 +:1012300090E5D90721F48091EF01816086C0C43028 +:1012400020E5D20721F48091EF0182607EC0C63094 +:1012500080E5D80721F48091EF01846076C0C83022 +:1012600090E5D90719F48091EF0127C0CA3020E535 +:10127000D20721F48091EF01806167C0CC3080E516 +:10128000D80721F48091EF0180625FC0CE3090E5F5 +:10129000D90721F48091EF01806457C0C03120E567 +:1012A000D20721F48091EF0180684FC0C23180E500 +:1012B000D80729F48091EF018460886046C0C3306C +:1012C00090E5D90721F48091EF018E7F3EC0C530B3 +:1012D00020E5D20721F48091EF018D7F36C0C73021 +:1012E00080E5D80721F48091EF018B7F2EC0C930B3 +:1012F00090E5D90719F48091EF0126C0CB3020E5A5 +:10130000D20721F48091EF018F7E1FC0CD3080E5A0 +:10131000D80721F48091EF018F7D17C0CF3090E581 +:10132000D90721F48091EF018F7B0FC0C13120E5F7 +:10133000D20721F48091EF018F7707C0C331D045E8 +:1013400031F48091EF018B7F877F8093EF01809153 +:10135000EF010E9482209CC08D2F99278F709927C2 +:1013600081309105D9F49E012370332702C0880F84 +:10137000991F2A95E2F79C688E0144E0000F111F27 +:101380004A95E1F700271370802B912B53E0CC0F87 +:10139000DD1F5A95E1F7C076DD272FC08230910519 +:1013A00031F4DC2FCC278E01016F106A71C08330BD +:1013B000910569F4CE018370992701E010E002C025 +:1013C000000F111F8A95E2F7C8019C680FC00497AF +:1013D00009F05EC0CE018370992701E010E002C0E1 +:1013E000000F111F8A95E2F7C8019A6823E0CC0F1D +:1013F000DD1F2A95E1F7C07ED7708C010C2B1D2BC9 +:1014000047C0DF708E01106243C000E010E040C0B2 +:101410008E013EC001E810E43BC003E810E438C090 +:1014200002EE14E435C009EE14E432C00AEE14E40E +:101430002FC005EB14E42CC006EB14E429C007EB25 +:1014400014E426C00CEC14E423C00DEC14E420C01A +:1014500003E815E41DC00AE815E41AC002E915E422 +:1014600017C004E915E414C001E216E411C003E258 +:1014700016E40EC004E216E40BC005E216E408C050 +:1014800006E216E405C007E216E402C00AE216E42A +:10149000C801DF91CF911F910F91089596E0799F38 +:1014A000F001112494E5899FE00DF11D1124E60F50 +:1014B000F11DEE0FFF1FEE57FD4F85919491803E79 +:1014C0009105E0F4803C910558F58133910509F4CC +:1014D0006FC048F48932910509F463C08A329105DE +:1014E00009F46DC072C089339105E9F08238910525 +:1014F000D1F08533910509F44DC067C0833E910555 +:1015000081F138F4803E9105B9F0823E9105D9F021 +:101510005CC0863E910561F1873E9105A1F155C001 +:101520000E94210808952091EF0120FD02C021FFB3 +:101530004CC080EE90E049C08091EF0180FFF9CF70 +:1015400089E390E042C08091EF0182FF0EC080915C +:10155000EF0184FF03C080E090E037C083EE90E0AD +:1015600034C08091EF0182FFF2CF82EE90E02DC077 +:101570008091EF0183FF0BC08091EF0184FDEBCFE1 +:1015800087EE90E022C08091EF0183FFF5CF86EED9 +:1015900090E01BC08091EF0185FF07C089E290E0D9 +:1015A00014C08091EF0185FFF9CF85E390E00DC075 +:1015B0008091EF0186FF07C08AE290E006C080912B +:1015C000EF0186FFF9CF81E390E00E943108089592 +:1015D00008950C94E80A809164010895CF93DF93F5 +:1015E00000D01F92CDB7DEB79C018091E601843018 +:1015F00019F593E099833B832A839093E9008FEF59 +:101600009091E800815095FD06C095ED9A95F1F70F +:1016100000008111F5CF8091E80085FF0DC040E00A +:1016200050E063E070E0CE0101960E94580D809179 +:10163000E8008E778093E8000F900F900F90DF9175 +:10164000CF910895CF93DF9300D01F92CDB7DEB72F +:101650002091E601243021F522E029839B838A83AF +:1016600083E08093E9008FEF9091E800815095FD31 +:1016700006C095ED9A95F1F700008111F5CF8091A4 +:10168000E80085FF0DC040E050E063E070E0CE016F +:1016900001960E94580D8091E8008E778093E800B3 +:1016A0000F900F900F90DF91CF9108952091E60158 +:1016B0002430F1F422E02093E9002FEF3091E8008C +:1016C000215035FD06C035ED3A95F1F700002111A6 +:1016D000F5CF2091E80025FF0BC040E050E065E029 +:1016E00070E00E94580D8091E8008E778093E800AA +:1016F0000895CF93DF93EC019091E601943009F0C7 +:1017000046C080910C018823D9F080910D01882377 +:10171000B9F09093E9008FEF9091E800815095FD2A +:1017200006C095E19A95F1F700008111F5CF8091FF +:10173000E80085FF2CC040E050E060E170E017C099 +:1017400081E08093E9008FEF9091E800815095FD52 +:1017500006C095ED9A95F1F700008111F5CF8091C3 +:10176000E80085FF14C040E050E068E070E0CE0182 +:101770000E94580D8091E8008E778093E80080E108 +:10178000FE01A4E5B1E001900D928A95E1F7DF91A9 +:10179000CF9108958091E501811109C00E94ED0E5D +:1017A0000E944A0F8091E20084608093E2000895D5 +:1017B0001092E501089508950C94F1240E944E1EA4 +:1017C0000E94F7240E94F0110C94E90A42E061ECB7 +:1017D00081E00E94670E42E061EC82E00E94670EA9 +:1017E00042E061EC83E00E94670E42E161EC84E03C +:1017F0000C94670E8091E801833009F455C030F4F1 +:10180000813071F0823009F48EC008958A3009F475 +:101810007AC08B3009F460C0893009F09CC020C0C8 +:101820008091E701813A09F096C08091E800877FB6 +:101830008093E8008091EB019091EC01892B21F4D9 +:1018400060E184E591E003C060E080E090E070E05A +:101850000E94A30D8091E8008B778093E8000895A3 +:101860008091E701813209F076C08091EB0190917F +:10187000EC01009719F0039709F06DC08091E80022 +:10188000877F8093E8008091E80082FD05C0809109 +:10189000E6018111F8CF5FC08091F100809364016F +:1018A0008091E8008B7753C08091E701813A09F07D +:1018B00052C08091EB019091EC01892B09F04BC053 +:1018C0008091E800877F8093E8008091E80080FFA6 +:1018D000FCCF80910C0136C08091E7018132D9F5AF +:1018E0008091EB019091EC01892BA9F58091E800A2 +:1018F000877F8093E8000E949C0E8091E90180938D +:101900000C010C9480178091E701813221F58091C0 +:10191000E800877F8093E8000E949C0E8091EA0196 +:101920008093650108958091E701813AA1F4809147 +:10193000E800877F8093E8008091E80080FFFCCF7B +:10194000809165018093F1008091E8008E7780930B +:10195000E8000C949C0E089584B7877F84BF88E1CB +:101960000FB6F89480936000109260000FBE90E074 +:1019700080E80FB6F89480936100909361000FBEE9 +:101980000E943F120E94ED0E0E944A0F8091E200D9 +:1019900084608093E20078940E94D0110E944112EA +:1019A00082E091E00E94EB110E94DF248091E60129 +:1019B000853069F40E940F1E8091E4018823B1F301 +:1019C0000E943A1E882391F30E94420DEFCF0E949D +:1019D0004712ECCF292F332723303105C9F064F4A7 +:1019E0002130310581F02230310509F043C08DE608 +:1019F00090E026EA36E042C021323105F1F0223291 +:101A0000310541F137C082E190E023E137E036C093 +:101A100099278130910541F08230910541F0892B61 +:101A200049F5E2EAF6E005C0EAE8F6E002C0E2E7DE +:101A3000F6E0849190E09F0121C06430D8F4E62F55 +:101A4000F0E0EE0FFF1FEE5DFE4F2081318189E057 +:101A500090E014C0643070F470E0FB01EE0FFF1FE3 +:101A6000E65EFE4F20813181FB01EA5EFE4F808100 +:101A700090E004C080E090E020E030E0FA013183A3 +:101A80002083089580E189BD82E189BD09B400FE0B +:101A9000FDCF8091D8008F7D8093D8008091E000A9 +:101AA00082608093E0008091E00081FDFCCF08958A +:101AB000CF92DF92EF92FF920F931F93CF93DF931A +:101AC000EC018B016A010E94BB0E811133C0C1146D +:101AD000D10439F0F60180819181081B190BC80FE0 +:101AE000D91FE12CF12C0115110519F18091E800A5 +:101AF00085FD16C08091E8008E778093E800C114C0 +:101B0000D10449F0F60180819181E80EF91EF1823D +:101B1000E08285E00FC00E94BB0E882321F30AC03B +:101B200089918093F10001501109FFEFEF1AFF0A2C +:101B3000DACF80E0DF91CF911F910F91FF90EF906E +:101B4000DF90CF9008952091ED013091EE0126179E +:101B5000370748F06115710539F42091E8002E77B8 +:101B60002093E80001C0B90140E061157105A9F1B9 +:101B70002091E601222309F443C0253009F442C034 +:101B80002091E80023FD40C02091E80022FD32C0F2 +:101B90002091E80020FFE9CF4091F3002091F2006E +:101BA00030E0342BFC01CF016115710559F028306C +:101BB000310540F481918093F100615071092F5FEC +:101BC0003F4FF1CF41E02830310509F040E020914E +:101BD000E8002E772093E800C8CF4111C9CF0AC092 +:101BE0008091E601882361F0853061F08091E80002 +:101BF00083FD0AC08091E80082FFF2CF80E0089563 +:101C000082E0089583E0089581E008952091ED0138 +:101C10003091EE012617370748F06115710539F448 +:101C20002091E8002E772093E80001C0B901FC0163 +:101C300020E06115710591F18091E601882309F496 +:101C400040C0853009F43FC08091E80083FD3DC06D +:101C50008091E80082FD2FC08091E80080FFE9CFED +:101C60002091F3008091F20090E0922B61157105B4 +:101C700059F08830910540F424912093F100319679 +:101C8000615071090196F2CF21E0089709F020E038 +:101C90008091E8008E778093E800CBCF2111CCCFE4 +:101CA0000AC08091E601882361F0853061F080915F +:101CB000E80083FD0AC08091E80082FFF2CF80E057 +:101CC000089582E0089583E0089581E00895982FB3 +:101CD000973058F59093E900981739F07091EC001F +:101CE0002091ED005091F00003C0242F762F50E09A +:101CF00021FF19C03091EB003E7F3093EB00309113 +:101D0000ED003D7F3093ED003091EB00316030937A +:101D1000EB007093EC002093ED005093F0002091C5 +:101D2000EE0027FF07C09F5FD3CF8F708093E9003D +:101D300081E0089580E008958091E70187FF11C058 +:101D40008091E80082FD05C08091E6018111F8CF05 +:101D500011C08091E8008B770BC08091E601882349 +:101D600049F08091E80080FFF8CF8091E8008E77FD +:101D70008093E80008952091E4003091E50095E615 +:101D80004091EC00842F817040FF22C08091E800D8 +:101D900080FD1CC08091E601882391F0853091F090 +:101DA0008091EB0085FD10C04091E4005091E5006A +:101DB0004217530729F39A01915011F784E00895CF +:101DC00082E0089583E0089581E0089580E0089519 +:101DD0004091E80042FFDECF08950E945B0F0E9411 +:101DE000630FE0EEF0E0808181608083E8EDF0E059 +:101DF00080818F77808319BCA7EDB0E08C918E7FB6 +:101E00008C9380818F7E80831092E50108950F93DB +:101E10001F93CF93DF930E945B0F0E94630FC8ED67 +:101E2000D0E088818F7788838881806888838881E3 +:101E30008F7D888319BC1092E6011092E201109206 +:101E4000E4011092E30100EE10E0F80180818B7F45 +:101E5000808388818160888342E060E080E00E9426 +:101E6000670EE1EEF0E080818E7F8083E2EEF0E0AD +:101E7000808181608083808188608083F801808197 +:101E80008E7F8083888180618883DF91CF911F91CD +:101E90000F910895E8EDF0E080818F7E8083E7ED7B +:101EA000F0E080818160808384E082BF81E0809364 +:101EB000E5010C94070FE8EDF0E080818E7F8083D0 +:101EC0001092E20008951092DA001092E100089555 +:101ED0001F920F920FB60F9211242F933F934F939F +:101EE0005F936F937F938F939F93AF93BF93EF9382 +:101EF000FF938091E10082FF0BC08091E20082FF9E +:101F000007C08091E1008B7F8093E1000E94CF1198 +:101F10008091DA0080FF1FC08091D80080FF1BC035 +:101F20008091DA008E7F8093DA008091D90080FF63 +:101F30000DC080E189BD82E189BD09B400FEFDCFFD +:101F400081E08093E6010E94CA0B05C019BC109283 +:101F5000E6010E94D80B8091E10080FF19C08091BA +:101F6000E20080FF15C08091E2008E7F8093E20046 +:101F70008091E20080618093E2008091D8008062CD +:101F80008093D80019BC85E08093E6010E94DC0BA9 +:101F90008091E10084FF30C08091E20084FF2CC07A +:101FA00080E189BD82E189BD09B400FEFDCF809149 +:101FB000D8008F7D8093D8008091E1008F7E809340 +:101FC000E1008091E2008F7E8093E2008091E20048 +:101FD00081608093E2008091E201882311F084E027 +:101FE00007C08091E30087FD02C081E001C083E06B +:101FF0008093E6010E94DE0B8091E10083FF29C0FF +:102000008091E20083FF25C08091E100877F80936B +:10201000E10082E08093E6011092E2018091E1000C +:102020008E7F8093E1008091E2008E7F8093E200BA +:102030008091E20080618093E20042E060E080E015 +:102040000E94670E8091F00088608093F0000E94EB +:10205000DB0BFF91EF91BF91AF919F918F917F919A +:102060006F915F914F913F912F910F900FBE0F9005 +:102070001F9018951F920F920FB60F9211242F9355 +:102080003F934F935F936F937F938F939F93AF9300 +:10209000BF93CF93DF93EF93FF93C091E900CF708D +:1020A0008091EC00D82FD17080FDD0E81092E9002B +:1020B0008091F000877F8093F00078940E947E10DA +:1020C0001092E9008091F00088608093F000CD2BA1 +:1020D000CF70C093E900FF91EF91DF91CF91BF9155 +:1020E000AF919F918F917F916F915F914F913F91B0 +:1020F0002F910F900FBE0F901F9018951F93CF93A5 +:10210000DF93CDB7DEB7AA970FB6F894DEBF0FBE48 +:10211000CDBFE7EEF1E088E08E0F9091F100919352 +:102120008E13FBCF0E94FA0B8091E80083FF1FC142 +:102130008091E7019091E801492F50E04A30510524 +:1021400008F015C1FA01EA59FF4F0C94792680383E +:1021500081F0823809F00BC18091EB018F70809380 +:10216000E9008091EB0085FB882780F91092E90057 +:1021700006C08091E3019091E401911182609091F9 +:10218000E800977F9093E8008093F1001092F100AF +:10219000C8C0282F2D7F09F0EAC0882319F08230AB +:1021A00061F0E5C08091E901813009F0E0C0933031 +:1021B00009F080E08093E4012BC08091E901811156 +:1021C00027C08091EB018F7009F4D1C08093E900A2 +:1021D0002091EB0020FF1CC0933021F48091EB0094 +:1021E000806214C09091EB0090619093EB0021E02D +:1021F00030E0A90102C0440F551F8A95E2F74093D1 +:10220000EA001092EA008091EB0088608093EB0076 +:102210001092E9008091E800877F86C08111A7C0F5 +:102220001091E9011F778091E3008078812B8093E2 +:10223000E3008091E800877F8093E8000E949C0E75 +:102240008091E80080FFFCCF8091E300806880935C +:10225000E300111102C082E001C083E08093E60137 +:1022600086C08058823008F082C08091E901909148 +:10227000EA018C3D53E0950779F583E08A838AE291 +:1022800089834FB7F894DE01139620E03EE051E2D7 +:10229000E32FF0E050935700E49120FF03C0E29554 +:1022A000EF703F5FEF708E2F90E0EA3010F0C7962E +:1022B00001C0C0968D939D932F5F243149F74FBF86 +:1022C0008091E800877F8093E8006AE270E0CE01A9 +:1022D00001960E94A30D14C0AE014F5F5F4F609145 +:1022E000EB010E94EA0CBC01892B09F440C09091DB +:1022F000E800977F9093E80089819A810E94060EFA +:102300008091E8008B778093E80031C0803879F5C0 +:102310008091E800877F8093E8008091E2018093BC +:10232000F1008091E8008E778093E8000E949C0E77 +:102330001EC081111CC09091E9019230C0F48091BF +:10234000E800877F8093E8009093E2010E949C0E52 +:102350008091E201811106C08091E30087FD02C0F7 +:1023600081E001C084E08093E6010E94E60B809149 +:10237000E80083FF0AC08091E800877F8093E8002F +:102380008091EB0080628093EB00AA960FB6F894E0 +:10239000DEBF0FBECDBFDF91CF911F91089508958D +:1023A000CF938091E6018823A1F0C091E900CF701E +:1023B0009091EC00892F817090FD80E8C82B1092DD +:1023C000E9008091E80083FD0E947E10CF70C093E9 +:1023D000E900CF91089590936B0180936A0108956D +:1023E000E0916A01F0916B01309721F00190F0814A +:1023F000E02D099480E00895E0916A01F0916B016D +:10240000309721F00280F381E02D09940895E09146 +:102410006A01F0916B01309721F00480F581E02D85 +:1024200009940895209168013091690182179307FA +:1024300071F09093690180936801E0916A01F091D5 +:102440006B01309721F00680F781E02D0994089503 +:1024500020916601309167018217930771F0909384 +:10246000670180936601E0916A01F0916B013097FA +:1024700021F00084F185E02D0994089508950C94CD +:102480003E120E94541E0E9401070C941A1FCF9204 +:10249000DF92EF92FF920F931F93CF93DF93CDB70D +:1024A000DEB72B970FB6F894DEBF0FBECDBF0E94EC +:1024B00019078DE6C82E81E0D82E00E010E0E02E4E +:1024C000802F0E940708F60141916F01F42EF82633 +:1024D000B1F40F5F1F4F0E30110589F78FEF89831D +:1024E0008A831B820E945D1E8160782F9D838C836E +:1024F00049815A816B818D810E94EA1240C090917E +:10250000CF0191FF04C08B870E940D088B8520E0CE +:1025100030E04F2D50E0922FBA01022E02C0759587 +:1025200067950A94E2F760FF24C02E83EF8221E0D2 +:1025300030E0690102C0CC0CDD1C9A95E2F790E016 +:102540008C219D21892B09F420E028870E945D1EA3 +:102550008160782F9A8789874E815F8168858A8517 +:102560000E94EA12F801E359FE4F8081C826C0821A +:1025700006C02F5F3F4F2630310569F6AACF0E9473 +:10258000012210916C010E94F0111817A1F00E9415 +:10259000F01180936C012B960FB6F894DEBF0FBE3E +:1025A000CDBFDF91CF911F910F91FF90EF90DF9002 +:1025B000CF900C94E90A2B960FB6F894DEBF0FBEAD +:1025C000CDBFDF91CF911F910F91FF90EF90DF90E2 +:1025D000CF900895CF93DF93CDB7DEB72B970FB68B +:1025E000F894DEBF0FBECDBF4F83588769877A87C7 +:1025F0008B87DE01119686E0FD0111928A95E9F73D +:1026000085E0FE01379601900D928A95E1F74981A8 +:102610005A816B817C818D819E810E941A1A2B9632 +:102620000FB6F894DEBF0FBECDBFDF91CF910895F6 +:102630000895CF93882309F4C2C0C82F823859F473 +:102640000E94F01181FDBBC089E30E94C31C0E945F +:10265000901D89E30CC0833879F40E94F01180FD4D +:10266000AEC083E50E94C31C0E94901D83E50E94BA +:10267000051DCF910C94901D843859F40E94F011DF +:1026800082FD9DC087E40E94C31C0E94901D87E4C8 +:10269000EECF8CEF8C0F813A48F48C2F0E944424AB +:1026A00081118DC08C2F0E94C31CE3CF80E28C0F60 +:1026B000883048F4C77081E001C0880FCA95EAF7F6 +:1026C0000E94491DD6CF8BE58C0F833078F4C53A34 +:1026D00029F0C63A31F083E890E005C081E890E047 +:1026E00002C082E890E0CF910C94121288E58C0F22 +:1026F000833108F064C0C83A39F1C93A41F1CA3AA5 +:1027000049F1CB3A51F1CC3A59F1CD3A61F1C03BA4 +:1027100069F1CE3A71F1CF3A79F1C13B81F1C23B17 +:1027200089F1C33B91F1C43B99F1C53BA1F1C63B93 +:10273000A9F1C73BB1F1C83BB9F1C93BC1F1CA3BF3 +:10274000C9F180E090E038C082EE90E035C089EEBB +:1027500090E032C08AEE90E02FC085EB90E02CC074 +:1027600086EB90E029C087EB90E026C08CEC90E0EF +:1027700023C08DEC90E020C083E891E01DC08AE882 +:1027800091E01AC082E991E017C084E991E014C099 +:1027900081E292E011C083E292E00EC084E292E016 +:1027A0000BC085E292E008C086E292E005C087E2B5 +:1027B00092E002C08AE292E0CF910C942812CF916D +:1027C0000895882309F44BC0823859F40E94F0110F +:1027D00081FF45C089E30E94C31C0E94901D89E3CC +:1027E0000CC0833871F40E94F01180FF38C083E57B +:1027F0000E94C31C0E94901D83E50E94051D0C943D +:10280000901D843859F40E94F01182FF28C087E49B +:102810000E94C31C0E94901D87E4EFCF9CEF980F8D +:10282000913A58F390E2980F983050F4877091E005 +:1028300001C0990F8A95EAF7892F0E944F1DDFCFBB +:102840009BE5980F933020F480E090E00C941212F6 +:10285000885A833120F480E090E00C942812089587 +:10286000882321F00E94491D0C94901D089588230F +:1028700021F00E944F1D0C94901D0895BF92CF929D +:10288000DF92EF92FF920F931F93CF93DF9300D0CD +:1028900000D000D0CDB7DEB725E0FC01DE011196F7 +:1028A00001900D922A95E1F7FC01D08011810281FF +:1028B000258122952F7043815481452B09F4FCC258 +:1028C0001F3F21F4FFEFDF1609F4F6C27C012E83CF +:1028D0000E941813D9821A8369817A81802F0E94FD +:1028E000BF1C182FB92E0E94741C0E943B1B2E8106 +:1028F000002319F00E94661D2E81EB2DE295EF70EA +:10290000F0E0E059FF4F0C9479268B2D807F9B2DB2 +:102910009F70F92E882319F0F29480EFF82200239B +:1029200089F0FF2009F475C280E2810F883020F41D +:102930008F2D0E94491D03C08F2D0E94591D0E949A +:10294000901D67C2812F0E94E113FF2009F4B4C2D9 +:10295000105E8F2D183018F40E944F1D02C00E9487 +:102960005F1D26960FB6F894DEBF0FBECDBFDF9178 +:10297000CF911F910F91FF90EF90DF90CF90BF907C +:102980000C94901D3B2D307F8B2D8F70303211F0C9 +:102990008295807F112319F0113021F12CC0002382 +:1029A000B9F0222309F4A0C1213009F09DC1269677 +:1029B0000FB6F894DEBF0FBECDBFDF91CF911F9150 +:1029C0000F91FF90EF90DF90CF90BF900C94791D06 +:1029D000222319F0213009F46FC28E830E947C1DDE +:1029E0008E8196C1002321F0223008F065C27CC19F +:1029F000211162C28DC1002321F0222309F474C188 +:102A000008C2222309F484C119C22B2D26952695CC +:102A1000237030E02115310521F021303105D1F04E +:102A20004BC2002321F0812F9B2D937002C080E0C8 +:102A300090E026960FB6F894DEBF0FBECDBFDF91B3 +:102A4000CF911F910F91FF90EF90DF90CF90BF90AB +:102A50000C941212002321F0812F9B2D937002C041 +:102A600080E090E026960FB6F894DEBF0FBECDBF93 +:102A7000DF91CF911F910F91FF90EF90DF90CF905A +:102A8000BF900C942812812F002319F00E94092175 +:102A900002C00E94712126960FB6F894DEBF0FBEC9 +:102AA000CDBFDF91CF911F910F91FF90EF90DF90FD +:102AB000CF90BF900C94F6218B2D837009F07BC0D2 +:102AC0000111FAC1812F829586958770880F880F32 +:102AD000912F9F70C92ED12CE12CF12C082E04C00F +:102AE000CC0CDD1CEE1CFF1C0A94D2F714FF12C0A4 +:102AF0004FE050E060E070E004C0440F551F661FD7 +:102B0000771F8A95D2F7CB01BA01609570958095B1 +:102B1000909503C060E070E0CB012B2D26952695A3 +:102B20002370422F50E042305105D9F04330510517 +:102B300069F16C297D298E299F294130510551F178 +:102B400026960FB6F894DEBF0FBECDBFDF91CF91B2 +:102B50001F910F91FF90EF90DF90CF90BF900C945A +:102B6000621B6C297D298E299F2926960FB6F89421 +:102B7000DEBF0FBECDBFDF91CF911F910F91FF90B0 +:102B8000EF90DF90CF90BF900C947E1B0E94621B51 +:102B9000C701B60126960FB6F894DEBF0FBECDBFB3 +:102BA000DF91CF911F910F91FF90EF90DF90CF9029 +:102BB000BF900C94461B002319F08B2D817001C02F +:102BC0008695882309F478C1812F82958695877030 +:102BD000880F880F912F9F70C92ED12CE12CF12CDA +:102BE000082E04C0CC0CDD1CEE1CFF1C0A94D2F78E +:102BF00014FF12C04FE050E060E070E004C0440FEA +:102C0000551F661F771F8A95D2F7CB01BA016095D1 +:102C100070958095909503C060E070E0CB012B2DFE +:102C2000269526952370422F50E042305105D9F069 +:102C30004330510569F16C297D298E299F29413046 +:102C4000510551F126960FB6F894DEBF0FBECDBFE9 +:102C5000DF91CF911F910F91FF90EF90DF90CF9078 +:102C6000BF900C943C1C6C297D298E299F292696A7 +:102C70000FB6F894DEBF0FBECDBFDF91CF911F918D +:102C80000F91FF90EF90DF90CF90BF900C94581C65 +:102C90000E943C1CC701B60126960FB6F894DEBF11 +:102CA0000FBECDBFDF91CF911F910F91FF90EF909D +:102CB000DF90CF90BF900C94201C103FD1F118F4FE +:102CC000103E50F4A1C0123F09F463C008F44CC098 +:102CD000133F09F473C098C01F708B2D8F710023B0 +:102CE000A1F00E94B91B812F26960FB6F894DEBF83 +:102CF0000FBECDBFDF91CF911F910F91FF90EF904D +:102D0000DF90CF90BF900C9430140E94DA1B812F7B +:102D100026960FB6F894DEBF0FBECDBFDF91CF91E0 +:102D20001F910F91FF90EF90DF90CF90BF900C9488 +:102D300037140023A9F02111BFC08B2D8F71269667 +:102D40000FB6F894DEBF0FBECDBFDF91CF911F91BC +:102D50000F91FF90EF90DF90CF90BF900C94FF1BEE +:102D6000223008F0A9C0E9CF0023A9F08B2D8F7184 +:102D700026960FB6F894DEBF0FBECDBFDF91CF9180 +:102D80001F910F91FF90EF90DF90CF90BF900C9428 +:102D9000B91B002359F38B2D8F7126960FB6F8942B +:102DA000DEBF0FBECDBFDF91CF911F910F91FF907E +:102DB000EF90DF90CF90BF900C94DA1B002399F036 +:102DC0008B2D8F7126960FB6F894DEBF0FBECDBF48 +:102DD000DF91CF911F910F91FF90EF90DF90CF90F7 +:102DE000BF900C94A41B26960FB6F894DEBF0FBEBE +:102DF000CDBFDF91CF911F910F91FF90EF90DF90AA +:102E0000CF90BF900C949A1B0023A9F0222309F4C1 +:102E1000ADCF812F26960FB6F894DEBF0FBECDBF83 +:102E2000DF91CF911F910F91FF90EF90DF90CF90A6 +:102E3000BF900C941913222309F4ADCF812F26964D +:102E40000FB6F894DEBF0FBECDBFDF91CF911F91BB +:102E50000F91FF90EF90DF90CF90BF900C94E11313 +:102E60004B2D4F70612FC7010E94760426960FB636 +:102E7000F894DEBF0FBECDBFDF91CF911F910F91B0 +:102E8000FF90EF90DF90CF90BF900C94BE1A4B2D27 +:102E90004F70612FC70126960FB6F894DEBF0FBEA4 +:102EA000CDBFDF91CF911F910F91FF90EF90DF90F9 +:102EB000CF90BF900C940E0826960FB6F894DEBF04 +:102EC0000FBECDBFDF91CF911F910F91FF90EF907B +:102ED000DF90CF90BF9008950E94661D0E94761DDE +:102EE0000E943B1D0E94901D0E94A7220E94F62175 +:102EF00080E090E00E94121280E090E00C94281292 +:102F00000E94561D0C946C170E94B41C292F229508 +:102F10002F7030E02C3031054CF42A3031056CF440 +:102F2000225031092230310588F407C02C30310598 +:102F300049F02F30310531F009C0803E48F0803F24 +:102F400029F406C093FB882780F9089580E008954E +:102F500081E00895CF93DF9300D000D01F92CDB7CA +:102F6000DEB70F900F900F900F900F90DF91CF91E1 +:102F70000895CF93DF9300D000D000D0CDB7DEB757 +:102F800026960FB6F894DEBF0FBECDBFDF91CF916E +:102F900008951F93CF93DF93C0917B0116E080913A +:102FA0007C01C81799F0D0E01C9FF0011D9FF00D27 +:102FB0001124E358FE4F40815181628173818481E5 +:102FC00095810E94B9172196C770E9CFDF91CF9103 +:102FD0001F9108954091AD015091AE016091AF01F4 +:102FE0007091B0018091B1019091B2010C94B91728 +:102FF0008091B20182958F7009F054C08091AF0129 +:10300000882309F44FC080917B01A0917C016091DD +:10301000AD017091AE014091B0015091B101B6E0A7 +:103020008A1709F43FC090E041155105C1F17F3F77 +:1030300011F46F3FA1F1B89FF001B99FF00D112479 +:10304000E358FE4F218172132AC02081621327C0EA +:103050002281211124C0238134812417350710F4E3 +:1030600021503109241B350B283C3105C0F4209137 +:10307000B2012F7020612093B20126E0289FF00159 +:10308000299FF00D1124EE57FE4F80818F708061D3 +:1030900080838DEA91E00E943E140C94C91701963A +:1030A0008770BECF0895CF92DF92EF92FF920F9379 +:1030B0001F93CF93DF93CDB7DEB762970FB6F89427 +:1030C000DEBF0FBECDBF8C0185E0F801DE011D968D +:1030D00001900D928A95E1F7D8014C9111965C917F +:1030E000119712966C9112971396CD90DC901497CD +:1030F0003091AD017091AE018091B0019091B1011C +:10310000009709F46BC17F3F19F43F3F09F466C192 +:10311000E090AF01EE2009F4C0C02091B201C816C2 +:10312000D90628F0F601E81BF90BCF0104C0809501 +:1031300090958C0D9D1DFF24F394883C910578F0AB +:10314000F12C207F09F0C6C07C2DD98AC88A8989D4 +:103150000E94AA178DEA91E00E943E14B1C0822F0E +:10316000807F09F046C0751314C0341312C061117A +:1031700010C02F7020612093B2010E94EA178DEADF +:1031800091E00E943E148091B201D80115968C9373 +:103190002EC0CD2819F15F3F11F44F3FF9F0F62E04 +:1031A00061111CC080917B0120917C0136E0821767 +:1031B00009F45AC090E0389FF001399FF00D1124B6 +:1031C000E358FE4F7181571306C07081471303C047 +:1031D0007281711103C001968770E9CFF62E6623C4 +:1031E00009F418C18091B20181608093B201F12C81 +:1031F00011C1751308C0341306C0611104C0809159 +:10320000B201D801C3C04D875E878D859E856A8BCC +:103210000E9484176A898823E1F16623D1F1209105 +:10322000B201822F82958F7090E0029774F08091A6 +:10323000AD019091AE0198878F831986DB86CA868F +:103240002C87CE0107960E943E1486E0F801ADEA75 +:10325000B1E001900D928A95E1F70E94F8170E9463 +:10326000EA17FF24F394D6C04D875E878D859E852F +:103270000E94B41C292F22952F7030E02230310596 +:103280000CF0BCC09F7009F0B6C0805E883008F4B6 +:10329000C1C0C8010E943E14E4CFC816D90608F484 +:1032A00053C0F601E81BF90BCF01883C910508F4E7 +:1032B00050C0F12C7C2DD98AC88A89890E94AA170E +:1032C000EDEAF1E086E0DF011D928A95E9F70E94C0 +:1032D000EA17A0C0751314C0341312C0611110C0D6 +:1032E0008091B201F8018583C8010E943E1486E0F6 +:1032F000EDEAF1E0DF011D928A95E9F7FE2C8AC024 +:103300004D875E878D859E856A8B0E9484176A89AA +:10331000882309F4BECF662309F4BBCF2091B20104 +:10332000822F82958F7090E002970CF48ECF80915F +:10333000AD019091AE019A8389831B82DD82CC829C +:103340002E83CE0101967FCF809590958C0D9D1D8B +:10335000ACCFF62E662309F49CCF75132EC0341320 +:103360002CC02091B20120FD1FC0822F82958F704A +:10337000D9F0D80115962C9315978F3049F08F5FAF +:10338000982F9295907F822F8F70892B15968C9312 +:10339000C8010E943E1486E0F801ADEAB1E0019058 +:1033A0000D928A95E1F793CF86E0F801ADEAB1E09E +:1033B00001900D928A95E1F72DC04D875E878D852E +:1033C0009E850E948417811140CF8091B201816057 +:1033D0008093B201C8010E943E141CC0662309F408 +:1033E00058CF4D875E878D859E850E9484178823E0 +:1033F00009F44FCF2ACF811148CF0CC024303105BA +:103400000CF047CF9F7009F440CFF8019581907F71 +:1034100009F03BCF8F2D62960FB6F894DEBF0FBE3A +:10342000CDBFDF91CF911F910F91FF90EF90DF9073 +:10343000CF9008951F93CF93DF93CDB7DEB72C972E +:103440000FB6F894DEBF0FBECDBF4F835887698794 +:103450007A878B879C87CE0107960E945318882312 +:1034600069F08F8198852A853B85232BF1F19F3F59 +:1034700009F063C08F3F09F060C037C086E0FE01ED +:103480003796DE01119601900D928A95E1F76F81D2 +:103490007885EA85FB85309741F17F3F11F46F3FD6 +:1034A00021F120917C0130E0C901019687709927B4 +:1034B00040917B0150E08417950709F447C0698368 +:1034C0007A83FD83EC8396E0929FD001939FB00DA9 +:1034D0001124A358BE4FFE01319601900D929A958A +:1034E000E1F780937C010E94C91716E080917B016F +:1034F00090917C018917C1F1189FC0011124835854 +:103500009E4F0E945318882379F1E0917B011E9F02 +:10351000F0011124E358FE4F408151816281738193 +:10352000848195810E94B91780917B0190E001967A +:103530008770992780937B01D9CF4F815885698502 +:103540007A858B859C850E94B917CFCF0E94801702 +:1035500010927C0110927B01EDEAF1E086E0DF0140 +:103560001D928A95E9F7C1CF2C960FB6F894DEBF6D +:103570000FBECDBFDF91CF911F910895EF92FF92C3 +:103580000F931F93CF93DF938C01892B09F46CC0A9 +:10359000F12CEE24E394E8012196F801849184371C +:1035A00040F4843008F051C0813081F0823019F14C +:1035B0005BC0853709F444C0A8F19CE7980F9037A9 +:1035C00008F052C08F770E94E11341C00E5F1F4F79 +:1035D000FE01C49180E28C0F883048F4C7708E2DB4 +:1035E00001C0880FCA95EAF70E94691D14C08C2F8C +:1035F0000E9419132DC00E5F1F4FFE01C49180E27F +:103600008C0F883058F4C7708E2D01C0880FCA9572 +:10361000EAF70E946F1D0E94901D1AC08C2F0E9415 +:10362000E11316C00E5F1F4FFE01C491CC2381F041 +:103630008FE99FE00197F1F700C00000C150F6CF7D +:103640000E5F1F4FFE01F49003C00E9419138E01FC +:103650008F2D882309F49FCFEFE9FFE03197F1F731 +:1036600000C000008150F5CFDF91CF911F910F91E5 +:10367000FF90EF90089508956093B7017093B8019B +:103680008093B9019093BA010C946C170F931F9318 +:103690000091B7011091B8012091B9013091BA01A0 +:1036A000DC01CB01802B912BA22BB32B8093B70194 +:1036B0009093B801A093B901B093BA011F910F91F3 +:1036C0000C946C170F931F930091B7011091B801E0 +:1036D0002091B9013091BA01DC01CB018023912303 +:1036E000A223B3238093B7019093B801A093B901AB +:1036F000B093BA011F910F910C946C170F931F9305 +:103700000091B7011091B8012091B9013091BA012F +:10371000DC01CB0180279127A227B3278093B70133 +:103720009093B801A093B901B093BA011F910F9182 +:103730000C946C171092B3011092B4011092B50161 +:103740001092B6010C946C1741E050E060E070E01C +:1037500004C0440F551F661F771F8A95D2F7409308 +:10376000B3015093B4016093B5017093B6010C940A +:103770006C1741E050E060E070E004C0440F551F5A +:10378000661F771F8A95D2F78091B3019091B4019B +:10379000A091B501B091B601482B592B6A2B7B2B18 +:1037A0004093B3015093B4016093B5017093B60197 +:1037B0000C946C1741E050E060E070E004C0440FEE +:1037C000551F661F771F8A95D2F7409550956095D3 +:1037D00070958091B3019091B401A091B501B09121 +:1037E000B601482359236A237B234093B3015093A6 +:1037F000B4016093B5017093B6010C946C1741E06D +:1038000050E060E070E004C0440F551F661F771F52 +:103810008A95D2F78091B3019091B401A091B5013E +:10382000B091B601482759276A277B274093B301F7 +:103830005093B4016093B5017093B6010C946C176A +:103840000F931F930091B3011091B4012091B50122 +:103850003091B601DC01CB01802B912BA22BB32B35 +:103860008093B3019093B401A093B501B093B601D6 +:103870001F910F910C946C170F931F930091B3013C +:103880001091B4012091B5013091B601DC01CB015A +:1038900080239123A223B3238093B3019093B40197 +:1038A000A093B501B093B6011F910F910C946C17C2 +:1038B0000F931F930091B3011091B4012091B501B2 +:1038C0003091B601DC01CB0180279127A227B327D5 +:1038D0008093B3019093B401A093B501B093B60166 +:1038E0001F910F910C946C170895CF92DF92EF9275 +:1038F000FF920F931F93CF93DF938C01C090B7017A +:10390000D090B801E090B901F090BA018091B30174 +:103910009091B401A091B501B091B601C82AD92AFD +:10392000EA2AFB2ACFE1D0E0D701C6010C2E04C061 +:10393000B695A795979587950A94D2F780FF06C00C +:10394000B8018C2F0E944E0A019721F4219760F74D +:1039500080E001C08C2FDF91CF911F910F91FF90DC +:10396000EF90DF90CF900895CF93DF93EC010E940A +:10397000751CBE010E944E0ADF91CF910895CB01C4 +:103980000E94B41C089590910C01992321F090910C +:103990000D01911109C020910E0130910F01F90123 +:1039A00032969FEF40E01FC0982F9695969596957A +:1039B0009F3050F5E0910E01F0910F01E90FF11DDC +:1039C000877021E030E0A90102C0440F551F8A959D +:1039D000E2F7CA019181892B818308959F3F39F0D5 +:1039E0004F5F4E3041F051915813F8CF0DC0511137 +:1039F000F7CF942FF5CF9F3F39F0F901E90FF11D73 +:103A000097FDFA9582830895089590910C0199236A +:103A100021F090910D01911109C020910E0130917A +:103A20000F01F9013296205F3F4F1FC0982F9695E6 +:103A3000969596959F30F0F4E0910E01F0910F016C +:103A4000E90FF11D877021E030E0A90102C0440FA9 +:103A5000551F8A95E2F7CA01809591818923818358 +:103A600008953196E217F30729F090819813F9CF62 +:103A70001082F7CF089581E090E0E0910E01F0917F +:103A80000F01E80FF91F1082019680319105A9F707 +:103A900008959091CE01892B8093CE010895809551 +:103AA0009091CE0189238093CE0108951092CE018A +:103AB00008959091CD01892B8093CD010895809533 +:103AC0009091CD0189238093CD0108951092CD016D +:103AD00008959091CC01892B8093CC010895809515 +:103AE0009091CC0189238093CC0108951092CC0150 +:103AF00008958093BB0108951092BB0108958091B1 +:103B00000E0190910F01FC0131969C01205F3F4F07 +:103B100080E0919191118F5FE217F307D1F708953B +:103B2000E0910E01F0910F018091CE018083E09130 +:103B30000E01F0910F0190818091CD01892B80833E +:103B4000E0910E01F0910F0190818091CC01892BC1 +:103B500080838091BB01882361F0E0910E01F09198 +:103B60000F019081892B80830E947F1D811110920B +:103B7000BB0180910E0190910F010C94FC11CF922A +:103B8000DF92EF92FF926C01EE24FF24C114D10466 +:103B9000E104F10421F0C701B60120E101C020E0F9 +:103BA000C72ED82EE92EFF24C114D104E104F1045C +:103BB00019F0285FC701B6016B017C0154E0F6944F +:103BC000E794D794C7945A95D1F7C114D104E1046E +:103BD000F10419F02C5FC701B6016B017C0142E0D2 +:103BE000F694E794D794C7944A95D1F7C114D104B9 +:103BF000E104F10419F02E5FC701B601DC01CB012D +:103C0000B695A79597958795892B8A2B8B2B09F0CD +:103C10002F5F822FFF90EF90DF90CF9008958091DB +:103C2000E601843021F11092D00120E488E190E097 +:103C30000FB6F894A895809360000FBE20936000A3 +:103C400080E00E94E90A83B7817F846083BF83B7E5 +:103C5000816083BF7894889583B78E7F83BF88E126 +:103C60000FB6F89480936000109260000FBE089524 +:103C700008950895CF930E94381E0E9419070E944C +:103C8000391EC0E08C2F0E940708811104C0CF5F4D +:103C9000CE30C1F701C081E0CF9108950E94801716 +:103CA0000E94F0110C94E90A82E084BD93E095BD76 +:103CB0009AEF97BD80936E0008952FB7F894809186 +:103CC000D1019091D201A091D301B091D4012FBF25 +:103CD0000895CF92DF92EF92FF920F931F932FB729 +:103CE000F8944091D1015091D2016091D30170912B +:103CF000D4012FBF6A017B01EE24FF248C0120E058 +:103D000030E0C016D106E206F30610F44150510926 +:103D10009A01281B390BC9011F910F91FF90EF9059 +:103D2000DF90CF9008951F920F920FB60F9211243B +:103D30008F939F93AF93BF938091D1019091D201C4 +:103D4000A091D301B091D4010196A11DB11D809322 +:103D5000D1019093D201A093D301B093D401BF912C +:103D6000AF919F918F910F900FBE0F901F9018955C +:103D70000E94ED0EF8942FEF87EA91E621508040E3 +:103D80009040E1F700C0000087E090EBDC018093F9 +:103D9000F0019093F101A093F201B093F3019CE044 +:103DA00088E10FB6F894A895809360000FBE9093B9 +:103DB0006000FFCFEF92FF920F931F93CF93DF939B +:103DC000D82FC0E08C2F0E94070800E010E0E82EFA +:103DD000F12CC701002E02C0959587950A94E2F751 +:103DE00080FD06C00F5F1F4F0630110591F709C017 +:103DF000602F7C2F80E00E940F08D813F3CF81E062 +:103E000004C0CF5FCE30F1F680E0DF91CF911F91FB +:103E10000F91FF90EF900895CF93C82F8CE20E94EE +:103E2000DA1E882321F08C2FCF910C94DA1E80E0CB +:103E3000CF910895CF930E946120811102C00E940A +:103E40004720C5E6C15049F00E9419078FE39CE95D +:103E50000197F1F700C00000F5CF89E20E940C1F26 +:103E6000811113C18AE20E940C1F81110E94472018 +:103E700085E00E940C1F81110E94B81E0E946C20D8 +:103E80008093CF0187E00E940C1F8823A9F18BE16A +:103E90000E940C1F882351F08091CF0181FB2227C3 +:103EA00020F991E0922790FB81F90EC08EE00E94EC +:103EB0000C1F882361F08091CF0182FB222720F91B +:103EC00091E0922790FB82F98093CF0115C080E1A9 +:103ED0000E940C1F9091CF01882341F093FB222771 +:103EE00020F981E0822780FB93F904C0892F809517 +:103EF00080FB90F99093CF018091CF010E947020B8 +:103F00000E947E208093EF0180EE0E940C1F882388 +:103F100041F08091EF01982F909590FB80F980936C +:103F2000EF0189E30E940C1F882359F08091EF0173 +:103F300081FB222720F991E0922790FB81F9809361 +:103F4000EF0182EE0E940C1F882359F08091EF014F +:103F500082FB222720F991E0922790FB82F980933F +:103F6000EF0186EE0E940C1F882359F08091EF012B +:103F700083FB222720F991E0922790FB83F980931D +:103F8000EF0183EE0E940C1F882359F08091EF010E +:103F900084FB222720F991E0922790FB84F98093FB +:103FA000EF0185E30E940C1F882359F08091EF01F7 +:103FB00085FB222720F991E0922790FB85F98093D9 +:103FC000EF0181E30E940C1F882359F08091EF01DB +:103FD00086FB222720F991E0922790FB86F98093B7 +:103FE000EF0181E10E940C1F882359F08091EF01BD +:103FF00087FB222720F991E0922790FB87F9809395 +:10400000EF018091EF010E9482208091EF0187FBF8 +:10401000882780F980930D0187E20E940C1FC82F2A +:104020008EE10E940C1F8111C2608FE10E940C1F63 +:104030008111C46080E20E940C1F8111C86081E27E +:104040000E940C1F8111C06182E20E940C1F81112D +:10405000C06283E20E940C1F8111C06484E20E944E +:104060000C1F882311F0C06802C0CC2329F08C2FCC +:104070000E9479206C2F03C00E947520682F70E089 +:1040800080E090E0CF910C943C1BCF9108956DEEB1 +:104090007EEF80E090E00E94B32660E082E090E056 +:1040A0000E94A12660E083E090E00E94A12660E0EB +:1040B00084E090E00E94A12660E085E090E00C940E +:1040C000A12680E090E00E949B2621E08D3E9E4F3D +:1040D00009F020E0822F089582E090E00C9493266E +:1040E000682F82E090E00C94A12683E090E00C948D +:1040F0009326682F83E090E00C94A12684E090E062 +:104100000C949326682F84E090E00C94A126809173 +:10411000D70180FF0BC06091130185E0689FB0015B +:10412000112475956795759567952BC081FF09C01A +:104130006091130185E0689FB00111247595679522 +:1041400020C082FF07C06091130185E0689FB00125 +:10415000112417C09091D8019923D1F060911201D8 +:10416000961788F72091130185E0289F900111246C +:10417000929FA001939F500D112470E0CA010E94EC +:1041800065266038710540F46115710539F002C08B +:1041900065E070E0862F08958FE7089581E0089527 +:1041A0008091D70180FF08C06091110170E0759582 +:1041B00067957595679521C081FF06C060911101D3 +:1041C00070E07595679519C082FF04C06091110178 +:1041D00070E010C09091D8019923C1F06091100156 +:1041E0009617A0F780911101899FC001112470E0FA +:1041F0000E9465266038710528F46115710521F06B +:10420000862F08958FE7089581E0089561E070E0BA +:10421000F4CF803F21F40E948720819504C0813F24 +:1042200029F40E9487208093DB010895823F21F4C6 +:104230000E948720819504C0833F29F40E94872033 +:104240008093DA010895893F19F40E94D02005C0B7 +:104250008A3F31F40E94D02081958093DC0108953B +:104260008B3F21F40E94D020819504C08C3F29F41B +:104270000E94D0208093DD010895843F21F4809135 +:10428000D901816017C0853F21F48091D9018260F6 +:1042900011C0863F21F48091D90184600BC0873F13 +:1042A00021F48091D901886005C0883F31F4809164 +:1042B000D90180618093D90108958D3F21F48091C7 +:1042C000D70181600BC08E3F21F48091D7018260BD +:1042D00005C08F3F29F48091D70184608093D70176 +:1042E0000895803F39F48091DB0187FF6CC0109204 +:1042F000DB0169C0813F29F48091DB011816BCF312 +:1043000062C09091DA01823F29F497FF5CC010925D +:10431000DA0159C0833F19F41916CCF354C0893F10 +:1043200041F48091DC0118160CF04DC01092DC01B4 +:104330004AC08A3F29F48091DC0187FF44C0F6CF50 +:104340008B3F39F48091DD0187FF3DC01092DD0184 +:104350003AC08C3F29F48091DD011816BCF333C0BC +:10436000843F21F48091D9018E7F17C0853F21F4CD +:104370008091D9018D7F11C0863F21F48091D901B0 +:104380008B7F0BC0873F21F48091D901877F05C0C7 +:10439000883F31F48091D9018F7E8093D90113C079 +:1043A0008D3F21F48091D7018E7F0BC08E3F21F489 +:1043B0008091D7018D7F05C08F3F29F48091D7016F +:1043C0008B7F8093D7018091DA0181110EC080919B +:1043D000DB0181110AC08091DC01811106C080914E +:1043E000DD01811102C01092D801089589ED91E09C +:1043F0000E9407120E945D1E9093D6018093D50102 +:1044000008951F93CF93DF938091D5019091D601AA +:104410000E94691EAC019091D801992321F020914E +:10442000140130E006C0209115018AE0289F900118 +:1044300011244217530708F486C08091DA01C09115 +:10444000DB01D091DC011091DD01811107C0C111A8 +:1044500076C0D11174C0111172C075C09F3F19F0A0 +:104460009F5F9093D801181624F40E9487208093B0 +:10447000DA018091DA0187FF05C00E9487208195CB +:104480008093DA011C1624F40E9487208093DB01BC +:104490008091DB0187FF05C00E9487208195809372 +:1044A000DB016091DA01662339F1C091DB01CC2395 +:1044B00019F1772767FD7095872F972F0E94762532 +:1044C00023E333E343E35FE30E94DA250E944325BD +:1044D0006093DA016C2F772767FD7095872F972FF0 +:1044E0000E94762523E333E343E35FE30E94DA256A +:1044F0000E9443256093DB011D1624F40E94D02006 +:104500008093DC018091DC0187FF05C00E94D020F0 +:1045100081958093DC01111624F40E94D0208093B1 +:10452000DD018091DD0187FF05C00E94D0208195CB +:104530008093DD01DF91CF911F910C94F6219F3F75 +:1045400009F08ECF96CFDF91CF911F910895E9EDBD +:10455000F1E085E0DF011D928A95E9F71092D8011C +:104560001092D7010895833081F128F4813059F0F9 +:104570008230D1F00895853009F449C0B8F1863011 +:1045800009F456C0089580911501262F30E0280FB8 +:10459000311D2F3F310524F4680F609315010895F4 +:1045A0008FEF80931501089580911401262F30E03C +:1045B000280F311D2F3F310524F4680F609314013B +:1045C00008958FEF80931401089580911301262F91 +:1045D00030E0280F311D2F3F310524F4680F609320 +:1045E000130108958FEF80931301089580911201B4 +:1045F000262F30E0280F311D2F3F310524F4680F9E +:104600006093120108958FEF8093120108958091B5 +:104610001101262F30E0280F311D2F3F310524F4E2 +:10462000680F6093110108958FEF80931101089531 +:1046300080911001262F30E0280F311D2F3F3105CA +:1046400024F4680F6093100108958FEF8093100198 +:104650000895833011F128F4813049F0823091F0CF +:104660000895853081F120F18630C1F1089580915F +:104670001501681720F4861B809315010895109288 +:104680001501089580911401681720F4861B80930A +:104690001401089510921401089580911301681770 +:1046A00020F4861B8093130108951092130108953E +:1046B00080911201681720F4861B809312010895DF +:1046C00010921201089580911101681720F4861B41 +:1046D00080931101089510921101089580911001A5 +:1046E000681720F4861B8093100108951092100122 +:1046F00008950F931F938D3109F46BC008F03FC0EC +:104700008E3009F47FC0C0F4873009F469C068F4C2 +:10471000863009F0B1C08091CF01817F8E7F809378 +:10472000CF0181E08093DF01A8C0883009F4A2C0E6 +:104730008B3009F49FC0A0C0863109F49BC078F487 +:10474000803109F472C0813109F096C00E9480174F +:1047500090910D0181E0892780930D018BC08931F3 +:1047600009F488C08B3109F087C08091CF0181FBAB +:10477000222720F991E0922790FB81F94CC08533E4 +:1047800009F470C048F4873209F46CC008F459C0C9 +:10479000893209F467C070C0833438F48A3308F072 +:1047A0004EC0883309F466C067C0833409F45AC028 +:1047B000883409F061C00E9480170FEF13ED20E3E9 +:1047C000015010402040E1F700C000000E94B81ED8 +:1047D00051C00E94FD240E94F0110E94E90A4AC0C3 +:1047E0009091CF01892F8095817080FB90F929F0FD +:1047F000966098609093CF0140C0997F977F909387 +:10480000CF0138C08091CF0182FB222720F991E0AF +:10481000922790FB82F98093CF01992359F18091DF +:10482000CF0181608093CF0125C08091CF0183FBB0 +:10483000222720F991E0922790FB83F9ECCF89534E +:1048400001C08D5141E050E060E070E08A019B01C1 +:1048500004C0000F111F221F331F8A95D2F7C90110 +:10486000B80104C061E070E080E090E00E943C1B71 +:104870000E94801781E001C080E01F910F91089590 +:1048800080E0089580E00895CF93C82F8091DF01E4 +:10489000813079F018F08230E9F187C0E0910E01A3 +:1048A000F0910F018081813169F0823209F07FC07F +:1048B00009C0E0910E01F0910F018081813111F06A +:1048C000823261F48C2F0E944024811104C08C2F0D +:1048D0000E9479231DC081E090E01AC08C2F0E94B5 +:1048E0004224811114C0C43179F048F4CB3079F0FE +:1048F000C03109F060C082E08093DF0108C0C93296 +:1049000019F0C83321F057C01092DF0154C081E084 +:10491000817053C0C93289F118F5C43171F1A8F41E +:10492000C73009F046C08AE08093150194E1909366 +:10493000140193E0909313018093120188E0809317 +:10494000110188E28093100134C0CE51C63088F541 +:10495000EC2FF0E0E65DFE4F80818093DE0129C000 +:10496000CE34E9F020F4CB3421F56AE013C0C13530 +:1049700079F0C235F1F461E00DC08091DE01882349 +:1049800019F01092DE0115C081E08093DF0115C09F +:1049900061E006C08091DE010E94B3220AC06AE095 +:1049A0008091DE010E94292304C01092DF0180E083 +:1049B00004C081E002C080E0ABCFCF910895E1E870 +:1049C000F0E08081886080838081816080838FB700 +:1049D000F89493E09093890090ED909388008FBFB6 +:1049E0000895EFE6F0E08081826080830895EFE62D +:1049F000F0E080818D7F80830895EFE6F0E0908184 +:104A000082E08927808308951F920F920FB60F923C +:104A100011242F933F934F935F936F937F938F93C3 +:104A20009F93AF93BF93EF93FF938091E001909199 +:104A3000E10101969093E1018093E001811103C0AF +:104A400082E00E94E90AE091E101E695E695F0E056 +:104A5000E05EF74FE4918091E0018E1303C080E0A7 +:104A60000E94E90AFF91EF91BF91AF919F918F91C1 +:104A70007F916F915F914F913F912F910F900FBE5A +:104A80000F901F90189504D06894B1118DC00895AF +:104A900070D088F09F5790F0B92F9927B751A0F0A8 +:104AA000D1F0660F771F881F991F1AF0BA95C9F7C2 +:104AB00012C0B13081F077D0B1E0089574C0672F93 +:104AC000782F8827B85F39F0B93FCCF38695779572 +:104AD0006795B395D9F73EF490958095709561955B +:104AE0007F4F8F4F9F4F0895E89409C097FB3EF486 +:104AF00090958095709561957F4F8F4F9F4F99232B +:104B0000A9F0F92F96E9BB279395F69587957795A8 +:104B10006795B795F111F8CFFAF4BB0F11F460FF68 +:104B20001BC06F5F7F4F8F4F9F4F16C0882311F0C0 +:104B300096E911C0772321F09EE8872F762F05C0D4 +:104B4000662371F096E8862F70E060E02AF09A956F +:104B5000660F771F881FDAF7880F9695879597F964 +:104B6000089557FD9058440F551F59F05F3F71F05D +:104B70004795880F97FB991F61F09F3F79F08795C4 +:104B80000895121613061406551FF2CF4695F1DF4D +:104B900008C0161617061806991FF1CF86957105DD +:104BA000610508940895E894BB2766277727CB0111 +:104BB00097F908950BD078C069D028F06ED018F01E +:104BC000952309F05AC05FC01124EECFCADFA0F3CD +:104BD000959FD1F3950F50E0551F629FF001729F92 +:104BE000BB27F00DB11D639FAA27F00DB11DAA1FB1 +:104BF000649F6627B00DA11D661F829F2227B00DFE +:104C0000A11D621F739FB00DA11D621F839FA00D88 +:104C1000611D221F749F3327A00D611D231F849FD8 +:104C2000600D211D822F762F6A2F11249F5750402F +:104C30008AF0E1F088234AF0EE0FFF1FBB1F661FCA +:104C4000771F881F91505040A9F79E3F510570F083 +:104C500014C0AACF5F3FECF3983EDCF386957795BE +:104C60006795B795F795E7959F5FC1F7FE2B880F7E +:104C7000911D9695879597F9089597F99F6780E814 +:104C800070E060E008959FEF80EC089500240A949E +:104C90001616170618060906089500240A94121617 +:104CA0001306140605060895092E0394000C11F44A +:104CB000882352F0BB0F40F4BF2B11F460FF04C0F7 +:104CC0006F5F7F4F8F4F9F4F089597FB072E16F40E +:104CD000009407D077FD09D00E947F2607FC05D0FD +:104CE0003EF4909581959F4F0895709561957F4F03 +:104CF0000895EE0FFF1F0590F491E02D0994AA1B73 +:104D0000BB1B51E107C0AA1FBB1FA617B70710F0B6 +:104D1000A61BB70B881F991F5A95A9F780959095E8 +:104D2000BC01CD010895F999FECF92BD81BDF89ADD +:104D3000992780B50895A8E1B0E042E050E00C94D6 +:104D4000BB26262FF999FECF92BD81BDF89A019717 +:104D500000B4021639F01FBA20BD0FB6F894FA9AC3 +:104D6000F99A0FBE08950196272F0E94A2260C944F +:104D7000A126DC01CB01FC01F999FECF06C0F2BDF2 +:104D8000E1BDF89A319600B40D9241505040B8F709 +:064D90000895F894FFCF26 +:104D96002002EB0A790B560B220BEE0A0101BC012D +:104DA60028080A03140A3F4D3639E10794075E07BF +:104DB6002507B806D106EA0603070102030405061D +:044DC60007080900D1 +:00000001FF diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png b/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png Binary files differindex 29f1099d06..031d874a7b 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/readme.md b/keyboard/ergodox_ez/keymaps/osx_de_experimental/readme.md new file mode 100644 index 0000000000..e6a1018416 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/osx_de_experimental/readme.md @@ -0,0 +1,22 @@ + +# Ergodox und Ergodox-EZ experimentelles Layout + +dieses layout ist experimentell und wird im Lufe der Zeit viele Änderungen und Verbesserungen durchlaufen. Falls diese sich als vorteilhaft erweisen, werden sie evtl. auch in das `osx_de` layout übernommen. + + + +# Erstellt Mit Dem ErgodoxLayoutGenerator + +Der ErgodoxLayoutGenerator (ELG) ist ein kleines Werkzeug, welches die Erstellung und Pflege der eigenen Keymaps erleichtern soll. Es ist in java geschrieben und kann [hier](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases) heruntergeladen werden. Damit das Tool funktioniert sollte das offizielle Oracle JDK in aktueller Version installiert sein. +Die Dokumentation für den ELG kann man [hier](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/) nachlesen (momentan leider nur in Englisch verfügbar). +--------------------------------------------------------------------------------------------------------------------- + +# Ergodox and Ergodox-EZ experimental layout + +This is an experimental layout which will undergo heavy changes over time. If changes prove to be good, they might also move into the `osx_de` layout. + +Created Using the ErgodoxLayoutGenerator + +The ErgodoxLayoutGenerator (ELG) is a little tool, which makes the creation and maintenance of keycaps a lot easier. It was written in Java and can be downloaded [here](https://github.com/sboesebeck/ErgodoxLayoutGenerator/releases). To use the tool, you need to have a current version of Oracles JDK installed. + +The documentation of the ELG can be viewed [here](https://boesebeck.name/2016/04/16/ergodoxlayoutgenerator-documentation/).
\ No newline at end of file diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c new file mode 100644 index 0000000000..e23c5a1d6a --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c @@ -0,0 +1,45 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = KEYMAP( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F5, + KC_TAB, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_BSLS, + CTL_T(KC_ESC), KC_A, KC_S, KC_E, KC_T, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, + KC_F1, KC_F2, KC_F3, KC_F4, KC_LGUI, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, KC_MUTE, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLU, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, CTL_T(KC_ESC), KC_LALT, + // + /*-*/ KC_F6, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, + /*-*/ KC_NO, KC_J, KC_U, KC_R, KC_L, KC_SCLN, KC_MINS, + /*-*/ /*-*/ KC_Y, KC_N, KC_I, KC_O, KC_H, KC_ENT, + /*-*/ KC_RBRC, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + /*-*/ /*-*/ /*-*/ KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_MPLY, KC_MNXT, + KC_MPRV, + KC_RALT, KC_QUOT, KC_SPC + ) +}; + +const uint16_t PROGMEM fn_actions[] = { +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); +}; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { +}; diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md new file mode 100644 index 0000000000..80475ab21e --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md @@ -0,0 +1,28 @@ +# Roman's Layout + +There is only one layer based on [Norman layout](https://normanlayout.info/). + +Looking for multiple-layer layouts? + +- [Symbols, arrows, plover, HJKL arrows](../romanzolotarev-norman-plover-osx-hjkl/) +- [Same with IJKL arrows](../romanzolotarev-norman-plover-osx/) + +[](http://www.keyboard-layout-editor.com/#/gists/9e89d54f1ea6eeeb7dab1b2d19d28195) + +## Functional Keys + +- Tap `F1` to mute microphone via [Shush](http://mizage.com/shush/). +- Tap `F2` to copy screenshot to the clipboard. +- Hold `SHIFT` and tap `F2` to save screenshot as a file. +- Tap `F3`, `F4`, `F5`, `F6` to resize a window via [Divvy](http://mizage.com/divvy/). + +## CTRL/ESC + +CTRL and ESC are frequently used in Vim. + +- Tap `CTRL/ESC` to send `ESC`. +- Hold `CTRL/ESC` to use as `CTRL`. + +## Activate N-rollover + +- Hold left `SHIFT` and right `SHIRT` and then tap `N`. diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex new file mode 100644 index 0000000000..1be94c43d1 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.hex @@ -0,0 +1,1092 @@ +:100000000C94BB010C94FF010C94FF010C94FF01B4
+:100010000C94FF010C94FF010C94FF010C94FF0160
+:100020000C94FF010C94FF010C94E20A0C94B40BA5
+:100030000C94FF010C94FF010C94FF010C94FF0140
+:100040000C94FF010C9432200C94FF010C94FF01DE
+:100050000C94FF010C94BD190C94FF010C94FF014A
+:100060000C94FF010C94FF010C94FF010C94FF0110
+:100070000C94FF010C94FF010C94FF010C94FF0100
+:100080000C94FF010C94FF010C94FF010C94FF01F0
+:100090000C94FF010C94FF010C94FF010C94FF01E0
+:1000A0000C94FF010C94FF010C94FF01210C430CF4
+:1000B000310D430C310D880CAB0C310D000D130DBF
+:1000C000FF0FFF0F3C103C107F10BD10D612D61250
+:1000D000D610D612D711D711AA12D612D612C11223
+:1000E00035002B002971E1003A0000001E001400C9
+:1000F00004001D003B00E2001F001A0016001B0058
+:100100003C00297120000700080006003D002A007D
+:100110002100090017001900E300A90022000E00C9
+:100120000A0005000000AA003E00310000002F0078
+:100130000000A8003F000000000030000000AE00FA
+:1001400023000D001C0013000000AB002400180069
+:1001500011001000E700AC00250015000C0036006F
+:1001600050002C0026000F00120037005100340010
+:10017000270033000B0038005200E6002E002D004F
+:100180002800E5004F0000001603450072006700DC
+:100190006F0044006F007800200045005A00000006
+:1001A00016034500720067006F0044006F0078007E
+:1001B000200045005A0000000403090409026D00F4
+:1001C000040100A0FA090400000103010100092153
+:1001D00011010001223F000705810308000A0904FC
+:1001E00001000103010200092111010001224D005B
+:1001F0000705820308000A09040200010300000049
+:100200000921110100012236000705830308000AB5
+:10021000090403000103000000092111010001226B
+:1002200039000705840310000112011001000000CD
+:1002300008EDFE071301000102000105010906A1F6
+:1002400001050719E029E7150025019508750181C9
+:100250000205081901290595057501910295017599
+:100260000391010507190029771500250195787577
+:10027000018102C005010980A10185021601002645
+:10028000B7001A01002AB700751095018100C0055A
+:100290000C0901A1018503160100269C021A010028
+:1002A0002A9C02751095018100C005010902A10177
+:1002B0000901A10005091901290515002501950568
+:1002C000750181029501750381010501093009312C
+:1002D0001581257F95027508810609381581257FCE
+:1002E000950175088106050C0A38021581257F9550
+:1002F0000175088106C0C005010906A1010507199D
+:10030000E029E71500250195087501810295017521
+:1003100008810105081901290595057501910295C6
+:1003200001750391010507190029FF150025FF95A7
+:100330000675088100C000000000000000000000F9
+:1003400000010204060A0F17202C3A4A5D71879DAE
+:10035000B3C7DAE9F5FCFFFCF5E9DAC7B39D8771AD
+:100360005D4A3A2C20170F0A060402010000000023
+:1003700000000000000011241FBECFEFDAE0DEBF56
+:10038000CDBF04B603FE24C08091EF019091F0012F
+:10039000A091F101B091F2018730904BA740B04B92
+:1003A000B9F41092EF011092F0011092F101109245
+:1003B000F20114BE84B7877F84BF88E10FB6F8943A
+:1003C00080936000109260000FBEE0E0FFE30995AB
+:1003D00011E0A0E0B1E0E8EEF3E402C005900D9278
+:1003E000A433B107D9F711E0A4E3B1E001C01D9235
+:1003F000AF3EB107E1F70E9426080C94F2210C945D
+:100400000000089556985E9825982D9826982E9865
+:1004100027982F98089508950C940B0256985E988B
+:1004200025982D9826982E9827982F988FEF90E052
+:10043000909389008093880090938B0080938A002A
+:1004400090938D0080938C00259A2D9A2FEF80E752
+:1004500092E0215080409040E1F700C00000269AD1
+:100460002E9A2FEF80E792E0215080409040E1F7F4
+:1004700000C00000279A2F9A2FEF80E792E02150CA
+:1004800080409040E1F700C0000025982D982FEFA4
+:1004900080E792E0215080409040E1F700C00000EA
+:1004A00026982E982FEF80E792E0215080409040D0
+:1004B000E1F700C0000027982F9856985E9825987D
+:1004C0002D9826982E9827982F98089589EA80933A
+:1004D000800089E08093810024982C983F988AB10D
+:1004E0008F748AB96E98479A8BB1806B8BB9769A64
+:1004F0000E940E020C94020280E28093000180911F
+:10050000340181110EC00E94CB0281E0809334013E
+:100510002FEF83ED90E3215080409040E1F700C041
+:10052000000080E40E94D1028093000181112EC05E
+:100530000E94FB0280930001811128C00E94FB02EF
+:1005400080930001811122C08FE30E94FB028093FF
+:10055000000181111BC00E94F30280E40E94D102BD
+:1005600080930001811112C08CE00E94FB028093F5
+:10057000000181110BC00E94FB02809300018111D8
+:1005800005C08FE30E94FB02809300010E94F302EA
+:100590008091000108951092B9008AE08093B8001C
+:1005A000089594EA9093BC009091BC0097FFFCCF13
+:1005B0009091B900987F983021F0903111F081E04E
+:1005C00008958093BB0084E88093BC008091BC00B8
+:1005D00087FFFCCF8091B900887F883111F080348B
+:1005E00071F780E0089584E98093BC008091BC009D
+:1005F00084FDFCCF08958093BB0084E88093BC0009
+:100600008091BC0087FFFCCF9091B900987F81E07A
+:10061000983209F480E0089584E88093BC008091CA
+:10062000BC0087FFFCCF8091BB0008958091000142
+:10063000811115C080E40E94D102809300018111D4
+:100640000CC082E10E94FB0280930001811105C071
+:100650008FEF0E94FB02809300010E94F30284B19D
+:10066000807F84B985B1807F85B98AB1837F8AB95B
+:100670008BB1837F8BB93E98469808950E947C0287
+:10068000809300010E94160380B38C7080BB81B3FD
+:10069000836F81BBA6E3B1E0E4E4F1E08EE08E0F6E
+:1006A00011921D928E13FCCF0C946602BF92CF92D2
+:1006B000DF92EF92FF920F931F93CF93DF9380917E
+:1006C0000001882379F0809135018F5F8093350197
+:1006D000811108C00E947C0280930001811102C038
+:1006E0000E940E0206E311E0C0E0D0E0DD24D394C6
+:1006F00082E0C82EEE24E394F12CC730D10500F53A
+:1007000080910001811164C080E40E94D102809335
+:100710000001811112C082E10E94FB02809300015E
+:1007200081110BC0C7010C2E01C0880F0A94EAF793
+:1007300080950E94FB02809300010E94F30248C052
+:10074000CA30A1F028F4C83059F0C93061F005C0B2
+:10075000CC3089F070F0CD3089F0209A289810C004
+:10076000219A29980DC0229A2A980AC0239A2B9878
+:1007700007C0529A01C0539A5B9802C03E9A4698AD
+:1007800090EA9A95F1F79FB1799902C082E001C091
+:1007900080E091709D25982B7C9902C084E001C077
+:1007A00080E0892B7D9902C038E001C030E0832BC6
+:1007B0007E9902C020E101C020E0822B9FB190957C
+:1007C000991F9927991F9295990F907E892B0FC099
+:1007D00080910001811149C080E40E94D102809380
+:1007E0000001882379F1B12C0E94F3028B2DF801CE
+:1007F0009081981719F08083C09201010E9416031E
+:1008000021960F5F1F4FCE30D10509F076CF809132
+:100810000101882361F1815080930101882339F01F
+:100820008FE99FE00197F1F700C0000020C0A4E429
+:10083000B1E0E6E3F1E0CF01825F91919D938E13E9
+:10084000FCCF15C083E10E94FB028093000181115F
+:10085000CACF81E40E94D102809300018111C3CFED
+:100860000E940C03B82EB094BFCF80E0C0CF0E948E
+:100870000C0281E0DF91CF911F910F91FF90EF90DB
+:10088000DF90CF90BF900895E82FF0E0EC5BFE4F33
+:100890008081089508958B3B910578F4883A9105FD
+:1008A00040F5853A9105D0F48430910508F0B1C047
+:1008B0008130910509F4ADC06BC0803E910508F40C
+:1008C00067C0883E910508F4A4C09C01205F3109EF
+:1008D0002031310508F05CC090650895853A910596
+:1008E00009F459C0863A910509F058C082E890E4AD
+:1008F0000895883A910509F454C0893A910509F49C
+:1009000053C08A3A910509F452C08B3A910509F413
+:1009100051C08C3A910509F450C08D3A910509F403
+:100920004FC0803B910509F44EC08E3A910509F401
+:100930004DC08F3A910509F44CC0813B910509F4F3
+:100940004BC0823B910509F44AC0833B910509F4F1
+:1009500049C0843B910509F448C0853B910509F4E1
+:1009600047C0863B910509F446C0873B910509F4D1
+:1009700045C0883B910509F444C0893B910509F4C1
+:1009800043C08A3B910509F442C080E094E4089595
+:1009900080E090E0089581E890E4089583E890E491
+:1009A000089582EE94E4089589EE94E408958AEE21
+:1009B00094E4089585EB94E4089586EB94E4089517
+:1009C00087EB94E408958CEC94E408958DEC94E422
+:1009D000089583E895E408958AE895E4089582E906
+:1009E00095E4089584E995E4089581E296E40895F4
+:1009F00083E296E4089584E296E4089585E296E41D
+:100A0000089586E296E4089587E296E408958AE2DE
+:100A100096E40895089596E0799FF001112494E5F5
+:100A2000899FE00DF11D1124E60FF11DEE0FFF1F50
+:100A3000E052FF4F859194910895880F991FFC0112
+:100A4000E05AF040859194910895880F991FFC0118
+:100A5000E052FF4F85919491089526E0729FF00136
+:100A6000112444E5849FE00DF11D1124E60FF11DD2
+:100A7000EE0FFF1FE052FF4F859194919C013A9534
+:100A800021154FE1340708F41CC13F5121153041B5
+:100A900020F49F700E94250508959C013053211574
+:100AA000304118F49927906C0895811520E592073C
+:100AB00071F40E94FA124FEF84E39CE041508040B1
+:100AC0009040E1F700C000000E94E219FAC08130B6
+:100AD00020E5920731F48091CD0181608093CD01B2
+:100AE000F0C09C0130552115304108F051C0292F2C
+:100AF00033272F70332721303105D9F4AC014370EF
+:100B0000552702C0220F331F4A95E2F73C68AC011B
+:100B100064E0440F551F6A95E1F744275370242B76
+:100B2000352B73E0880F991F7A95E1F78076992726
+:100B30001DC02230310529F4982F8827816F906AD3
+:100B4000089523303105A9F4AC014370552721E005
+:100B500030E002C0220F331F4A95E2F73C6843E0C1
+:100B6000880F991F4A95E1F7807E9770822B932B0F
+:100B7000089524303105E1F4AC014370552721E09C
+:100B800030E002C0220F331F4A95E2F73A68E7CF00
+:100B90009C0130572115304118F49F7090620895E0
+:100BA0009C0130582115304118F49F70906A0895C7
+:100BB000803E9105E0F4803C910558F58133910524
+:100BC00009F46FC048F48932910509F463C08A3290
+:100BD000910509F46DC072C089339105E9F082383E
+:100BE0009105D1F08533910509F44DC067C0833E6E
+:100BF000910581F138F4803E9105B9F0823E91056E
+:100C0000D9F05CC0863E910561F1873E9105A1F166
+:100C100055C00E941D0508952091E00120FD02C0ED
+:100C200021FF4CC080EE90E049C08091E00180FF40
+:100C3000F9CF89E390E042C08091E00182FF0EC0CD
+:100C40008091E00184FF03C080E090E037C083EE34
+:100C500090E034C08091E00182FFF2CF82EE90E01C
+:100C60002DC08091E00183FF0BC08091E00184FDE5
+:100C7000EBCF87EE90E022C08091E00183FFF5CFBB
+:100C800086EE90E01BC08091E00185FF07C089E2FD
+:100C900090E014C08091E00185FFF9CF85E390E0FA
+:100CA0000DC08091E00186FF07C08AE290E006C097
+:100CB0008091E00186FFF9CF81E390E00E944B0430
+:100CC0000895089508950C94620680916201089534
+:100CD000CF93DF9300D01F92CDB7DEB79C018091F8
+:100CE000E601843019F593E099833B832A8390933E
+:100CF000E9008FEF9091E800815095FD06C095EDD9
+:100D00009A95F1F700008111F5CF8091E80085FFF9
+:100D10000DC040E050E063E070E0CE0101960E941B
+:100D2000D2088091E8008E778093E8000F900F90B2
+:100D30000F90DF91CF910895CF93DF9300D01F9252
+:100D4000CDB7DEB72091E601243021F522E02983DA
+:100D50009B838A8383E08093E9008FEF9091E80082
+:100D6000815095FD06C095ED9A95F1F7000081112F
+:100D7000F5CF8091E80085FF0DC040E050E063E0D2
+:100D800070E0CE0101960E94D2088091E8008E7733
+:100D90008093E8000F900F900F90DF91CF9108950E
+:100DA0002091E6012430F1F422E02093E9002FEFB6
+:100DB0003091E800215035FD06C035ED3A95F1F748
+:100DC00000002111F5CF2091E80025FF0BC040E085
+:100DD00050E065E070E00E94D2088091E8008E77D4
+:100DE0008093E8000895CF93DF93EC019091E601A2
+:100DF000943009F046C080910C018823D9F080918D
+:100E00000D018823B9F09093E9008FEF9091E800ED
+:100E1000815095FD06C095E19A95F1F7000081118A
+:100E2000F5CF8091E80085FF2CC040E050E060E104
+:100E300070E017C081E08093E9008FEF9091E800A7
+:100E4000815095FD06C095ED9A95F1F7000081114E
+:100E5000F5CF8091E80085FF14C040E050E068E0E5
+:100E600070E0CE010E94D2088091E8008E778093D6
+:100E7000E80080E1FE01A2E5B1E001900D928A95C3
+:100E8000E1F7DF91CF9108958091E501811109C0CB
+:100E90000E94670A0E94C40A8091E20084608093E5
+:100EA000E20008951092E501089508950C941F2022
+:100EB0000E9478190E9425200E946A0D0C946306F6
+:100EC00042E061EC81E00E94E10942E061EC82E0F5
+:100ED0000E94E10942E061EC83E00E94E10942E105
+:100EE00061EC84E00C94E1098091E801833009F41D
+:100EF00055C030F4813071F0823009F48EC008950D
+:100F00008A3009F47AC08B3009F460C0893009F066
+:100F10009CC020C08091E701813A09F096C0809181
+:100F2000E800877F8093E8008091EB019091EC01CD
+:100F3000892B21F460E182E591E003C060E080E06C
+:100F400090E070E00E941D098091E8008B7780930B
+:100F5000E80008958091E701813209F076C0809120
+:100F6000EB019091EC01009719F0039709F06DC027
+:100F70008091E800877F8093E8008091E80082FDFF
+:100F800005C08091E6018111F8CF5FC08091F1002A
+:100F9000809362018091E8008B7753C08091E701D4
+:100FA000813A09F052C08091EB019091EC01892BBC
+:100FB00009F04BC08091E800877F8093E800809122
+:100FC000E80080FFFCCF80910C0136C08091E701E2
+:100FD0008132D9F58091EB019091EC01892BA9F533
+:100FE0008091E800877F8093E8000E94160A809134
+:100FF000E90180930C010C94FA128091E70181328F
+:1010000021F58091E800877F8093E8000E94160A0E
+:101010008091EA018093630108958091E701813A0C
+:10102000A1F48091E800877F8093E8008091E80038
+:1010300080FFFCCF809163018093F1008091E800F4
+:101040008E778093E8000C94160A089584B7877F02
+:1010500084BF88E10FB6F89480936000109260001E
+:101060000FBE90E080E80FB6F894809361009093F3
+:1010700061000FBE0E94B90D0E94670A0E94C40A57
+:101080008091E20084608093E20078940E944A0D8F
+:101090000E94BB0D82E091E00E94650D0E940D2030
+:1010A0008091E601853069F40E9439198091E4014C
+:1010B0008823B1F30E946419882391F30E94BC082D
+:1010C000EFCF0E94C10DECCF292F332723303105FC
+:1010D000C9F064F42130310581F02230310509F086
+:1010E00043C08DE690E02CEB31E042C02132310567
+:1010F000F1F02232310541F137C082E190E029E27E
+:1011000032E036C099278130910541F08230910557
+:1011100041F0892B49F5E8EBF1E005C0E0EAF1E0A8
+:1011200002C0E8E8F1E0849190E09F0121C06430C2
+:10113000D8F4E62FF0E0EE0FFF1FEE5DFE4F2081AA
+:10114000318189E090E014C0643070F470E0FB01FC
+:10115000EE0FFF1FE65EFE4F20813181FB01EA5E4C
+:10116000FE4F808190E004C080E090E020E030E01D
+:10117000FA0131832083089580E189BD82E189BD30
+:1011800009B400FEFDCF8091D8008F7D8093D800F8
+:101190008091E00082608093E0008091E00081FD1A
+:1011A000FCCF0895CF92DF92EF92FF920F931F939F
+:1011B000CF93DF93EC018B016A010E94350A811104
+:1011C00033C0C114D10439F0F60180819181081B2C
+:1011D000190BC80FD91FE12CF12C0115110519F1BC
+:1011E0008091E80085FD16C08091E8008E7780939D
+:1011F000E800C114D10449F0F60180819181E80E24
+:10120000F91EF182E08285E00FC00E94350A882332
+:1012100021F30AC089918093F10001501109FFEF79
+:10122000EF1AFF0ADACF80E0DF91CF911F910F9183
+:10123000FF90EF90DF90CF9008952091ED013091D5
+:10124000EE012617370748F06115710539F4209132
+:10125000E8002E772093E80001C0B90140E0611555
+:101260007105A9F12091E601222309F443C025303C
+:1012700009F442C02091E80023FD40C02091E8001D
+:1012800022FD32C02091E80020FFE9CF4091F30019
+:101290002091F20030E0342BFC01CF016115710583
+:1012A00059F02830310540F481918093F10061506C
+:1012B00071092F5F3F4FF1CF41E02830310509F030
+:1012C00040E02091E8002E772093E800C8CF41113C
+:1012D000C9CF0AC08091E601882361F0853061F0B2
+:1012E0008091E80083FD0AC08091E80082FFF2CF80
+:1012F00080E0089582E0089583E0089581E00895F4
+:101300002091ED013091EE012617370748F0611565
+:10131000710539F42091E8002E772093E80001C090
+:10132000B901FC0120E06115710591F18091E601A0
+:10133000882309F440C0853009F43FC08091E8005B
+:1013400083FD3DC08091E80082FD2FC08091E800C0
+:1013500080FFE9CF2091F3008091F20090E0922B82
+:101360006115710559F08830910540F4249120935E
+:10137000F1003196615071090196F2CF21E0089792
+:1013800009F020E08091E8008E778093E800CBCFD1
+:101390002111CCCF0AC08091E601882361F085300D
+:1013A00061F08091E80083FD0AC08091E80082FF2F
+:1013B000F2CF80E0089582E0089583E0089581E00F
+:1013C0000895982F973058F59093E900981739F0C1
+:1013D0007091EC002091ED005091F00003C0242F9B
+:1013E000762F50E021FF19C03091EB003E7F309303
+:1013F000EB003091ED003D7F3093ED003091EB003C
+:1014000031603093EB007093EC002093ED0050932B
+:10141000F0002091EE0027FF07C09F5FD3CF8F70B1
+:101420008093E90081E0089580E008958091E701CC
+:1014300087FF11C08091E80082FD05C08091E60120
+:101440008111F8CF11C08091E8008B770BC080919B
+:10145000E601882349F08091E80080FFF8CF809171
+:10146000E8008E778093E80008952091E4003091A1
+:10147000E50095E64091EC00842F817040FF22C08A
+:101480008091E80080FD1CC08091E601882391F0E6
+:10149000853091F08091EB0085FD10C04091E40013
+:1014A0005091E5004217530729F39A01915011F723
+:1014B00084E0089582E0089583E0089581E008952E
+:1014C00080E008954091E80042FFDECF08950E9439
+:1014D000D50A0E94DD0AE0EEF0E080818160808321
+:1014E000E8EDF0E080818F77808319BCA7EDB0E054
+:1014F0008C918E7F8C9380818F7E80831092E5010A
+:1015000008950F931F93CF93DF930E94D50A0E94F3
+:10151000DD0AC8EDD0E088818F7788838881806874
+:10152000888388818F7D888319BC1092E601109290
+:10153000E2011092E4011092E30100EE10E0F801E4
+:1015400080818B7F808388818160888342E060E036
+:1015500080E00E94E109E1EEF0E080818E7F8083EF
+:10156000E2EEF0E08081816080838081886080830A
+:10157000F80180818E7F8083888180618883DF91FC
+:10158000CF911F910F910895E8EDF0E080818F7E5B
+:101590008083E7EDF0E080818160808384E082BF1A
+:1015A00081E08093E5010C94810AE8EDF0E0808110
+:1015B0008E7F80831092E20008951092DA001092DC
+:1015C000E10008951F920F920FB60F9211242F93EE
+:1015D0003F934F935F936F937F938F939F93AF93BB
+:1015E000BF93EF93FF938091E10082FF0BC0809146
+:1015F000E20082FF07C08091E1008B7F8093E100D1
+:101600000E94490D8091DA0080FF1FC08091D800B0
+:1016100080FF1BC08091DA008E7F8093DA0080917A
+:10162000D90080FF0DC080E189BD82E189BD09B488
+:1016300000FEFDCF81E08093E6010E94440705C0D3
+:1016400019BC1092E6010E9452078091E10080FFD0
+:1016500019C08091E20080FF15C08091E2008E7F6A
+:101660008093E2008091E20080618093E2008091AB
+:10167000D80080628093D80019BC85E08093E60191
+:101680000E9456078091E10084FF30C08091E20003
+:1016900084FF2CC080E189BD82E189BD09B400FED0
+:1016A000FDCF8091D8008F7D8093D8008091E1009C
+:1016B0008F7E8093E1008091E2008F7E8093E20034
+:1016C0008091E20081608093E2008091E2018823B2
+:1016D00011F084E007C08091E30087FD02C081E043
+:1016E00001C083E08093E6010E9458078091E100E9
+:1016F00083FF29C08091E20083FF25C08091E10033
+:10170000877F8093E10082E08093E6011092E201FE
+:101710008091E1008E7F8093E1008091E2008E7FD6
+:101720008093E2008091E20080618093E20042E0D9
+:1017300060E080E00E94E1098091F0008860809381
+:10174000F0000E945507FF91EF91BF91AF919F91DB
+:101750008F917F916F915F914F913F912F910F905A
+:101760000FBE0F901F9018951F920F920FB60F92F9
+:1017700011242F933F934F935F936F937F938F9396
+:101780009F93AF93BF93CF93DF93EF93FF93C0915A
+:10179000E900CF708091EC00D82FD17080FDD0E8A7
+:1017A0001092E9008091F000877F8093F000789498
+:1017B0000E94F80B1092E9008091F00088608093FD
+:1017C000F000CD2BCF70C093E900FF91EF91DF9136
+:1017D000CF91BF91AF919F918F917F916F915F91C9
+:1017E0004F913F912F910F900FBE0F901F90189522
+:1017F0001F93CF93DF93CDB7DEB7AA970FB6F894B8
+:10180000DEBF0FBECDBFE7EEF1E088E08E0F909116
+:10181000F10091938E13FBCF0E9474078091E80032
+:1018200083FF1FC18091E7019091E801492F50E0AB
+:101830004A30510508F015C1FA01EA5AFF4F0C94DD
+:10184000A721803881F0823809F00BC18091EB012B
+:101850008F708093E9008091EB0085FB882780F9E9
+:101860001092E90006C08091E3019091E40191118A
+:1018700082609091E800977F9093E8008093F10058
+:101880001092F100C8C0282F2D7F09F0EAC08823EC
+:1018900019F0823061F0E5C08091E901813009F0F2
+:1018A000E0C0933009F080E08093E4012BC0809188
+:1018B000E901811127C08091EB018F7009F4D1C03B
+:1018C0008093E9002091EB0020FF1CC0933021F4AD
+:1018D0008091EB00806214C09091EB009061909336
+:1018E000EB0021E030E0A90102C0440F551F8A95AA
+:1018F000E2F74093EA001092EA008091EB008860E2
+:101900008093EB001092E9008091E800877F86C009
+:101910008111A7C01091E9011F778091E3008078C1
+:10192000812B8093E3008091E800877F8093E8001B
+:101930000E94160A8091E80080FFFCCF8091E300AE
+:1019400080688093E300111102C082E001C083E04F
+:101950008093E60186C08058823008F082C0809172
+:10196000E9019091EA018C3D53E0950779F583E018
+:101970008A838AE289834FB7F894DE01139620E0C8
+:101980003EE051E2E32FF0E050935700E49120FF56
+:1019900003C0E295EF703F5FEF708E2F90E0EA306A
+:1019A00010F0C79601C0C0968D939D932F5F243190
+:1019B00049F74FBF8091E800877F8093E8006AE293
+:1019C00070E0CE0101960E941D0914C0AE014F5F68
+:1019D0005F4F6091EB010E946408BC01892B09F400
+:1019E00040C09091E800977F9093E80089819A81A8
+:1019F0000E9480098091E8008B778093E80031C0D5
+:101A0000803879F58091E800877F8093E8008091A5
+:101A1000E2018093F1008091E8008E778093E800E6
+:101A20000E94160A1EC081111CC09091E9019230DB
+:101A3000C0F48091E800877F8093E8009093E201F2
+:101A40000E94160A8091E201811106C08091E30094
+:101A500087FD02C081E001C084E08093E6010E941E
+:101A600060078091E80083FF0AC08091E800877FCB
+:101A70008093E8008091EB0080628093EB00AA964F
+:101A80000FB6F894DEBF0FBECDBFDF91CF911F918F
+:101A900008950895CF938091E6018823A1F0C09125
+:101AA000E900CF709091EC00892F817090FD80E863
+:101AB000C82B1092E9008091E80083FD0E94F80B8A
+:101AC000CF70C093E900CF910895909369018093FE
+:101AD00068010895E0916801F0916901309721F063
+:101AE0000190F081E02D099480E00895E091680173
+:101AF000F0916901309721F00280F381E02D099483
+:101B00000895E0916801F0916901309721F0048017
+:101B1000F581E02D099408952091660130916701C7
+:101B20008217930771F09093670180936601E091AB
+:101B30006801F0916901309721F00680F781E02D6E
+:101B400009940895209164013091650182179307EB
+:101B500071F09093650180936401E0916801F091C8
+:101B60006901309721F00084F185E02D09940895F2
+:101B700008950C94B80D0E947E190E943E030C94A7
+:101B8000441ACF92DF92EF92FF920F931F93CF935D
+:101B9000DF93CDB7DEB72B970FB6F894DEBF0FBE3D
+:101BA000CDBF0E9456038BE6C82E81E0D82E00E000
+:101BB00010E0E02E802F0E944404F60141916F0155
+:101BC000F42EF826B1F40F5F1F4F0E30110589F780
+:101BD0008FEF89838A831B820E9487198160782F07
+:101BE0009D838C8349815A816B818D810E94640E13
+:101BF00040C09091CD0191FF04C08B870E944A04A0
+:101C00008B8520E030E04F2D50E0922FBA01022E5C
+:101C100002C0759567950A94E2F760FF24C02E8391
+:101C2000EF8221E030E0690102C0CC0CDD1C9A9506
+:101C3000E2F790E08C219D21892B09F420E0288790
+:101C40000E9487198160782F9A8789874E815F81EA
+:101C500068858A850E94640EF801E559FE4F8081EF
+:101C6000C826C08206C02F5F3F4F2630310569F677
+:101C7000AACF0E942B1D10916A010E946A0D1817AD
+:101C8000A1F00E946A0D80936A012B960FB6F8941A
+:101C9000DEBF0FBECDBFDF91CF911F910F91FF909F
+:101CA000EF90DF90CF900C9463062B960FB6F894CC
+:101CB000DEBF0FBECDBFDF91CF911F910F91FF907F
+:101CC000EF90DF90CF900895CF93DF93CDB7DEB73D
+:101CD0002B970FB6F894DEBF0FBECDBF4F8358874A
+:101CE00069877A878B87DE01119686E0FD01119264
+:101CF0008A95E9F785E0FE01379601900D928A9565
+:101D0000E1F749815A816B817C818D819E810E949E
+:101D100094152B960FB6F894DEBF0FBECDBFDF91A2
+:101D2000CF9108950895CF93882309F4C2C0C82F96
+:101D3000823859F40E946A0D81FDBBC089E30E947C
+:101D40003D180E940A1989E30CC0833879F40E9477
+:101D50006A0D80FDAEC083E50E943D180E940A19FD
+:101D600083E50E947F18CF910C940A19843859F4A6
+:101D70000E946A0D82FD9DC087E40E943D180E946A
+:101D80000A1987E4EECF8CEF8C0F813A48F48C2F40
+:101D90000E94721F81118DC08C2F0E943D18E3CFCD
+:101DA00080E28C0F883048F4C77081E001C0880F52
+:101DB000CA95EAF70E94C318D6CF8BE58C0F833003
+:101DC00078F4C53A29F0C63A31F083E890E005C0CE
+:101DD00081E890E002C082E890E0CF910C948C0DF5
+:101DE00088E58C0F833108F064C0C83A39F1C93AEC
+:101DF00041F1CA3A49F1CB3A51F1CC3A59F1CD3AD5
+:101E000061F1C03B69F1CE3A71F1CF3A79F1C13B52
+:101E100081F1C23B89F1C33B91F1C43B99F1C53BD0
+:101E2000A1F1C63BA9F1C73BB1F1C83BB9F1C93B30
+:101E3000C1F1CA3BC9F180E090E038C082EE90E089
+:101E400035C089EE90E032C08AEE90E02FC085EB7D
+:101E500090E02CC086EB90E029C087EB90E026C094
+:101E60008CEC90E023C08DEC90E020C083E891E002
+:101E70001DC08AE891E01AC082E991E017C084E9A8
+:101E800091E014C081E292E011C083E292E00EC0C2
+:101E900084E292E00BC085E292E008C086E292E024
+:101EA00005C087E292E002C08AE292E0CF910C94F2
+:101EB000A20DCF910895882309F44BC0823859F4BC
+:101EC0000E946A0D81FF45C089E30E943D180E946F
+:101ED0000A1989E30CC0833871F40E946A0D80FFEF
+:101EE00038C083E50E943D180E940A1983E50E94CC
+:101EF0007F180C940A19843859F40E946A0D82FFE5
+:101F000028C087E40E943D180E940A1987E4EFCF99
+:101F10009CEF980F913A58F390E2980F983050F454
+:101F2000877091E001C0990F8A95EAF7892F0E9486
+:101F3000C918DFCF9BE5980F933020F480E090E044
+:101F40000C948C0D885A833120F480E090E00C943E
+:101F5000A20D0895882321F00E94C3180C940A1939
+:101F60000895882321F00E94C9180C940A19089535
+:101F7000BF92CF92DF92EF92FF920F931F93CF9376
+:101F8000DF9300D000D000D0CDB7DEB725E0FC0154
+:101F9000DE01119601900D922A95E1F7FC01D080A7
+:101FA00011810281258122952F7043815481452B17
+:101FB00009F4FCC21F3F21F4FFEFDF1609F4F6C25B
+:101FC0007C012E830E94920ED9821A8369817A81C4
+:101FD000802F0E943918182FB92E0E94EE170E94E8
+:101FE000B5162E81002319F00E94E0182E81EB2DEA
+:101FF000E295EF70F0E0E05AFF4F0C94A7218B2D93
+:10200000807F9B2D9F70F92E882319F0F29480EF2A
+:10201000F822002389F0FF2009F475C280E2810FC5
+:10202000883020F48F2D0E94C31803C08F2D0E948A
+:10203000D3180E940A1967C2812F0E945B0FFF20EC
+:1020400009F4B4C2105E8F2D183018F40E94C9181C
+:1020500002C00E94D91826960FB6F894DEBF0FBEB4
+:10206000CDBFDF91CF911F910F91FF90EF90DF9047
+:10207000CF90BF900C940A193B2D307F8B2D8F7021
+:10208000303211F08295807F112319F0113021F147
+:102090002CC00023B9F0222309F4A0C1213009F09B
+:1020A0009DC126960FB6F894DEBF0FBECDBFDF915F
+:1020B000CF911F910F91FF90EF90DF90CF90BF9045
+:1020C0000C94F318222319F0213009F46FC28E8387
+:1020D0000E94F6188E8196C1002321F0223008F06C
+:1020E00065C27CC1211162C28DC1002321F022236F
+:1020F00009F474C108C2222309F484C119C22B2D2A
+:1021000026952695237030E02115310521F02130E8
+:102110003105D1F04BC2002321F0812F9B2D93700C
+:1021200002C080E090E026960FB6F894DEBF0FBEA6
+:10213000CDBFDF91CF911F910F91FF90EF90DF9076
+:10214000CF90BF900C948C0D002321F0812F9B2DFC
+:10215000937002C080E090E026960FB6F894DEBF40
+:102160000FBECDBFDF91CF911F910F91FF90EF90E8
+:10217000DF90CF90BF900C94A20D812F002319F017
+:102180000E94331C02C00E949B1C26960FB6F89436
+:10219000DEBF0FBECDBFDF91CF911F910F91FF909A
+:1021A000EF90DF90CF90BF900C94201D8B2D83700B
+:1021B00009F07BC00111FAC1812F82958695877045
+:1021C000880F880F912F9F70C92ED12CE12CF12CF4
+:1021D000082E04C0CC0CDD1CEE1CFF1C0A94D2F7A8
+:1021E00014FF12C04FE050E060E070E004C0440F04
+:1021F000551F661F771F8A95D2F7CB01BA016095EC
+:1022000070958095909503C060E070E0CB012B2D18
+:10221000269526952370422F50E042305105D9F083
+:102220004330510569F16C297D298E299F29413060
+:10223000510551F126960FB6F894DEBF0FBECDBF03
+:10224000DF91CF911F910F91FF90EF90DF90CF9092
+:10225000BF900C94DC166C297D298E299F29269627
+:102260000FB6F894DEBF0FBECDBFDF91CF911F91A7
+:102270000F91FF90EF90DF90CF90BF900C94F816E5
+:102280000E94DC16C701B60126960FB6F894DEBF91
+:102290000FBECDBFDF91CF911F910F91FF90EF90B7
+:1022A000DF90CF90BF900C94C016002319F08B2DB7
+:1022B000817001C08695882309F478C1812F8295A9
+:1022C00086958770880F880F912F9F70C92ED12C0B
+:1022D000E12CF12C082E04C0CC0CDD1CEE1CFF1CE4
+:1022E0000A94D2F714FF12C04FE050E060E070E0B3
+:1022F00004C0440F551F661F771F8A95D2F7CB0184
+:10230000BA01609570958095909503C060E070E08B
+:10231000CB012B2D269526952370422F50E042307D
+:102320005105D9F04330510569F16C297D298E2979
+:102330009F294130510551F126960FB6F894DEBF22
+:102340000FBECDBFDF91CF911F910F91FF90EF9006
+:10235000DF90CF90BF900C94B6176C297D298E2901
+:102360009F2926960FB6F894DEBF0FBECDBFDF9132
+:10237000CF911F910F91FF90EF90DF90CF90BF9082
+:102380000C94D2170E94B617C701B60126960FB655
+:10239000F894DEBF0FBECDBFDF91CF911F910F919B
+:1023A000FF90EF90DF90CF90BF900C949A17103F62
+:1023B000D1F118F4103E50F4A1C0123F09F463C0EB
+:1023C00008F44CC0133F09F473C098C01F708B2DE4
+:1023D0008F710023A1F00E943317812F26960FB62C
+:1023E000F894DEBF0FBECDBFDF91CF911F910F914B
+:1023F000FF90EF90DF90CF90BF900C94AA0F0E94B7
+:102400005417812F26960FB6F894DEBF0FBECDBFAE
+:10241000DF91CF911F910F91FF90EF90DF90CF90C0
+:10242000BF900C94B10F0023A9F02111BFC08B2DD8
+:102430008F7126960FB6F894DEBF0FBECDBFDF9129
+:10244000CF911F910F91FF90EF90DF90CF90BF90B1
+:102450000C947917223008F0A9C0E9CF0023A9F025
+:102460008B2D8F7126960FB6F894DEBF0FBECDBFB1
+:10247000DF91CF911F910F91FF90EF90DF90CF9060
+:10248000BF900C943317002359F38B2D8F71269630
+:102490000FB6F894DEBF0FBECDBFDF91CF911F9175
+:1024A0000F91FF90EF90DF90CF90BF900C94541756
+:1024B000002399F08B2D8F7126960FB6F894DEBF0E
+:1024C0000FBECDBFDF91CF911F910F91FF90EF9085
+:1024D000DF90CF90BF900C941E1726960FB6F894FD
+:1024E000DEBF0FBECDBFDF91CF911F910F91FF9047
+:1024F000EF90DF90CF90BF900C9414170023A9F0B9
+:10250000222309F4ADCF812F26960FB6F894DEBFB3
+:102510000FBECDBFDF91CF911F910F91FF90EF9034
+:10252000DF90CF90BF900C94930E222309F4ADCF8F
+:10253000812F26960FB6F894DEBF0FBECDBFDF9178
+:10254000CF911F910F91FF90EF90DF90CF90BF90B0
+:102550000C945B0F4B2D4F70612FC7010E9401023D
+:1025600026960FB6F894DEBF0FBECDBFDF91CF9198
+:102570001F910F91FF90EF90DF90CF90BF900C9440
+:1025800038164B2D4F70612FC70126960FB6F89461
+:10259000DEBF0FBECDBFDF91CF911F910F91FF9096
+:1025A000EF90DF90CF90BF900C940A0526960FB65F
+:1025B000F894DEBF0FBECDBFDF91CF911F910F9179
+:1025C000FF90EF90DF90CF90BF9008950E94E018A9
+:1025D0000E94F0180E94B5180E940A190E94D11D8D
+:1025E0000E94201D80E090E00E948C0D80E090E031
+:1025F0000C94A20D0E94D0180C94E6120E942E1882
+:10260000292F22952F7030E02C3031054CF42A30E0
+:1026100031056CF4225031092230310588F407C0AD
+:102620002C30310549F02F30310531F009C0803EA2
+:1026300048F0803F29F406C093FB882780F908956D
+:1026400080E0089581E00895CF93DF9300D000D01B
+:102650001F92CDB7DEB70F900F900F900F900F9095
+:10266000DF91CF910895CF93DF9300D000D000D0B9
+:10267000CDB7DEB726960FB6F894DEBF0FBECDBF3E
+:10268000DF91CF9108951F93CF93DF93C09179018C
+:1026900016E080917A01C81799F0D0E01C9FF001F4
+:1026A0001D9FF00D1124E558FE4F4081518162813C
+:1026B0007381848195810E9433132196C770E9CF7D
+:1026C000DF91CF911F9108954091AB015091AC01E2
+:1026D0006091AD017091AE018091AF019091B00118
+:1026E0000C9433138091B00182958F7009F054C01F
+:1026F0008091AD01882309F44FC080917901A091A8
+:102700007A016091AB017091AC014091AE015091A2
+:10271000AF01B6E08A1709F43FC090E041155105BA
+:10272000C1F17F3F11F46F3FA1F1B89FF001B99F54
+:10273000F00D1124E558FE4F218172132AC020812B
+:10274000621327C02281211124C0238134812417E0
+:10275000350710F421503109241B350B283C310575
+:10276000C0F42091B0012F7020612093B00126E0C9
+:10277000289FF001299FF00D1124E058FE4F808121
+:102780008F70806180838BEA91E00E94B80F0C9477
+:10279000431301968770BECF0895CF92DF92EF92D8
+:1027A000FF920F931F93CF93DF93CDB7DEB762975E
+:1027B0000FB6F894DEBF0FBECDBF8C0185E0F801E7
+:1027C000DE011D9601900D928A95E1F7D8014C919A
+:1027D00011965C91119712966C9112971396CD9069
+:1027E000DC9014973091AB017091AC018091AE01F7
+:1027F0009091AF01009709F46BC17F3F19F43F3FFF
+:1028000009F466C1E090AD01EE2009F4C0C020914A
+:10281000B001C816D90628F0F601E81BF90BCF0164
+:1028200004C0809590958C0D9D1DFF24F394883CE9
+:10283000910578F0F12C207F09F0C6C07C2DD98A53
+:10284000C88A89890E9424138BEA91E00E94B80FFC
+:10285000B1C0822F807F09F046C0751314C03413B5
+:1028600012C0611110C02F7020612093B0010E942E
+:1028700064138BEA91E00E94B80F8091B001D801F7
+:1028800015968C932EC0CD2819F15F3F11F44F3F60
+:10289000F9F0F62E61111CC08091790120917A0126
+:1028A00036E0821709F45AC090E0389FF001399F52
+:1028B000F00D1124E558FE4F7181571306C0708149
+:1028C000471303C07281711103C001968770E9CF6D
+:1028D000F62E662309F418C18091B00181608093BF
+:1028E000B001F12C11C1751308C0341306C0611179
+:1028F00004C08091B001D801C3C04D875E878D852B
+:102900009E856A8B0E94FE126A898823E1F1662304
+:10291000D1F12091B001822F82958F7090E00297C3
+:1029200074F08091AB019091AC0198878F831986E8
+:10293000DB86CA862C87CE0107960E94B80F86E0F8
+:10294000F801ABEAB1E001900D928A95E1F70E949F
+:1029500072130E946413FF24F394D6C04D875E87E0
+:102960008D859E850E942E18292F22952F7030E08C
+:10297000223031050CF0BCC09F7009F0B6C0805EFB
+:10298000883008F4C1C0C8010E94B80FE4CFC8164F
+:10299000D90608F453C0F601E81BF90BCF01883CB7
+:1029A000910508F450C0F12C7C2DD98AC88A8989F8
+:1029B0000E942413EBEAF1E086E0DF011D928A9584
+:1029C000E9F70E946413A0C0751314C0341312C039
+:1029D000611110C08091B001F8018583C8010E9487
+:1029E000B80F86E0EBEAF1E0DF011D928A95E9F786
+:1029F000FE2C8AC04D875E878D859E856A8B0E94DE
+:102A0000FE126A89882309F4BECF662309F4BBCF7E
+:102A10002091B001822F82958F7090E002970CF484
+:102A20008ECF8091AB019091AC019A8389831B82F8
+:102A3000DD82CC822E83CE0101967FCF809590954A
+:102A40008C0D9D1DACCFF62E662309F49CCF75131B
+:102A50002EC034132CC02091B00120FD1FC0822F46
+:102A600082958F70D9F0D80115962C9315978F30D9
+:102A700049F08F5F982F9295907F822F8F70892BCE
+:102A800015968C93C8010E94B80F86E0F801ABEA56
+:102A9000B1E001900D928A95E1F793CF86E0F801BD
+:102AA000ABEAB1E001900D928A95E1F72DC04D8718
+:102AB0005E878D859E850E94FE12811140CF809198
+:102AC000B00181608093B001C8010E94B80F1CC0A2
+:102AD000662309F458CF4D875E878D859E850E94B9
+:102AE000FE12882309F44FCF2ACF811148CF0CC0A2
+:102AF000243031050CF047CF9F7009F440CFF80126
+:102B00009581907F09F03BCF8F2D62960FB6F89498
+:102B1000DEBF0FBECDBFDF91CF911F910F91FF9010
+:102B2000EF90DF90CF9008951F93CF93DF93CDB7B1
+:102B3000DEB72C970FB6F894DEBF0FBECDBF4F8324
+:102B4000588769877A878B879C87CE0107960E9472
+:102B5000CD13882369F08F8198852A853B85232BA7
+:102B6000F1F19F3F09F063C08F3F09F060C037C0AB
+:102B700086E0FE013796DE01119601900D928A954E
+:102B8000E1F76F817885EA85FB85309741F17F3FDA
+:102B900011F46F3F21F120917A0130E0C9010196D3
+:102BA000877099274091790150E08417950709F4BF
+:102BB00047C069837A83FD83EC8396E0929FD001BE
+:102BC000939FB00D1124A558BE4FFE013196019080
+:102BD0000D929A95E1F780937A010E94431316E0D3
+:102BE0008091790190917A018917C1F1189FC001F4
+:102BF000112485589E4F0E94CD13882379F1E091CE
+:102C000079011E9FF0011124E558FE4F408151814A
+:102C100062817381848195810E943313809179014F
+:102C200090E001968770992780937901D9CF4F81E1
+:102C3000588569857A858B859C850E943313CFCF13
+:102C40000E94FA1210927A0110927901EBEAF1E0F7
+:102C500086E0DF011D928A95E9F7C1CF2C960FB669
+:102C6000F894DEBF0FBECDBFDF91CF911F910895C5
+:102C7000EF92FF920F931F93CF93DF938C01892BD9
+:102C800009F46CC0F12CEE24E394E8012196F801DC
+:102C90008491843740F4843008F051C0813081F051
+:102CA000823019F15BC0853709F444C0A8F19CE774
+:102CB000980F903708F052C08F770E945B0F41C089
+:102CC0000E5F1F4FFE01C49180E28C0F883048F4E4
+:102CD000C7708E2D01C0880FCA95EAF70E94E318CD
+:102CE00014C08C2F0E94930E2DC00E5F1F4FFE014B
+:102CF000C49180E28C0F883058F4C7708E2D01C0CB
+:102D0000880FCA95EAF70E94E9180E940A191AC0AA
+:102D10008C2F0E945B0F16C00E5F1F4FFE01C491E7
+:102D2000CC2381F08FE99FE00197F1F700C000000C
+:102D3000C150F6CF0E5F1F4FFE01F49003C00E94FA
+:102D4000930E8E018F2D882309F49FCFEFE9FFE0CA
+:102D50003197F1F700C000008150F5CFDF91CF919E
+:102D60001F910F91FF90EF90089508956093B50122
+:102D70007093B6018093B7019093B8010C94E6125A
+:102D80000F931F930091B5011091B6012091B701E7
+:102D90003091B801DC01CB01802B912BA22BB32BFE
+:102DA0008093B5019093B601A093B701B093B80199
+:102DB0001F910F910C94E6120F931F930091B50190
+:102DC0001091B6012091B7013091B801DC01CB011F
+:102DD00080239123A223B3238093B5019093B6015E
+:102DE000A093B701B093B8011F910F910C94E61214
+:102DF0000F931F930091B5011091B6012091B70177
+:102E00003091B801DC01CB0180279127A227B3279D
+:102E10008093B5019093B601A093B701B093B80128
+:102E20001F910F910C94E6121092B1011092B20111
+:102E30001092B3011092B4010C94E61241E050E0FC
+:102E400060E070E004C0440F551F661F771F8A952D
+:102E5000D2F74093B1015093B2016093B3017093E4
+:102E6000B4010C94E61241E050E060E070E004C070
+:102E7000440F551F661F771F8A95D2F78091B101C5
+:102E80009091B201A091B301B091B401482B592B9C
+:102E90006A2B7B2B4093B1015093B2016093B30135
+:102EA0007093B4010C94E61241E050E060E070E0F1
+:102EB00004C0440F551F661F771F8A95D2F74095AF
+:102EC0005095609570958091B1019091B201A0915B
+:102ED000B301B091B401482359236A237B23409363
+:102EE000B1015093B2016093B3017093B4010C949B
+:102EF000E61241E050E060E070E004C0440F551F6E
+:102F0000661F771F8A95D2F78091B1019091B20127
+:102F1000A091B301B091B401482759276A277B27B4
+:102F20004093B1015093B2016093B3017093B40127
+:102F30000C94E6120F931F930091B1011091B2010E
+:102F40002091B3013091B401DC01CB01802B912B96
+:102F5000A22BB32B8093B1019093B201A093B30144
+:102F6000B093B4011F910F910C94E6120F931F932D
+:102F70000091B1011091B2012091B3013091B401DF
+:102F8000DC01CB0180239123A223B3238093B101E1
+:102F90009093B201A093B301B093B4011F910F912C
+:102FA0000C94E6120F931F930091B1011091B2019E
+:102FB0002091B3013091B401DC01CB01802791272E
+:102FC000A227B3278093B1019093B201A093B301DC
+:102FD000B093B4011F910F910C94E6120895CF9213
+:102FE000DF92EF92FF920F931F93CF93DF938C01A9
+:102FF000C090B501D090B601E090B701F090B80153
+:103000008091B1019091B201A091B301B091B4014E
+:10301000C82AD92AEA2AFB2ACFE1D0E0D701C60183
+:103020000C2E04C0B695A795979587950A94D2F76C
+:1030300080FF06C0B8018C2F0E942D05019721F456
+:10304000219760F780E001C08C2FDF91CF911F9115
+:103050000F91FF90EF90DF90CF900895CF93DF9383
+:10306000EC010E94EF17BE010E942D05DF91CF9168
+:103070000895CB010E942E18089590910C01992378
+:1030800021F090910D01911109C020910E01309114
+:103090000F01F90132969FEF40E01FC0982F9695DF
+:1030A000969596959F3050F5E0910E01F0910F01A5
+:1030B000E90FF11D877021E030E0A90102C0440F43
+:1030C000551F8A95E2F7CA019181892B8183089562
+:1030D0009F3F39F04F5F4E3041F051915813F8CF78
+:1030E0000DC05111F7CF942FF5CF9F3F39F0F90163
+:1030F000E90FF11D97FDFA95828308950895909147
+:103100000C01992321F090910D01911109C020919A
+:103110000E0130910F01F9013296205F3F4F1FC021
+:10312000982F9695969596959F30F0F4E0910E0124
+:10313000F0910F01E90FF11D877021E030E0A90146
+:1031400002C0440F551F8A95E2F7CA01809591810C
+:103150008923818308953196E217F30729F090813E
+:103160009813F9CF1082F7CF089581E090E0E091B5
+:103170000E01F0910F01E80FF91F108201968031C6
+:103180009105A9F708959091CC01892B8093CC01EA
+:10319000089580959091CC0189238093CC01089566
+:1031A0001092CC0108959091CB01892B8093CB0193
+:1031B000089580959091CB0189238093CB01089548
+:1031C0001092CB0108959091CA01892B8093CA0176
+:1031D000089580959091CA0189238093CA0108952A
+:1031E0001092CA0108958093B90108951092B9010F
+:1031F000089580910E0190910F01FC0131969C0180
+:10320000205F3F4F80E0919191118F5FE217F307AC
+:10321000D1F70895E0910E01F0910F018091CC015A
+:103220008083E0910E01F0910F0190818091CB019C
+:10323000892B8083E0910E01F0910F0190818091A4
+:10324000CA01892B80838091B901882361F0E091C4
+:103250000E01F0910F019081892B80830E94F91853
+:1032600081111092B90180910E0190910F010C947F
+:10327000760D8091E601843021F11092CE0120E498
+:1032800088E190E00FB6F894A895809360000FBE97
+:103290002093600080E00E94630683B7817F846092
+:1032A00083BF83B7816083BF7894889583B78E7F0F
+:1032B00083BF88E10FB6F89480936000109260009D
+:1032C0000FBE089508950895CF930E9462190E9439
+:1032D00056030E946319C0E08C2F0E9444048111A0
+:1032E00004C0CF5FCE30C1F701C081E0CF91089517
+:1032F0000E94FA120E946A0D0C94630682E084BD5B
+:1033000093E095BD9AEF97BD80936E0008952FB717
+:10331000F8948091CF019091D001A091D101B0910A
+:10332000D2012FBF0895CF92DF92EF92FF920F93B9
+:103330001F932FB7F8944091CF015091D001609125
+:10334000D1017091D2012FBF6A017B01EE24FF24CD
+:103350008C0120E030E0C016D106E206F30610F43E
+:10336000415051099A01281B390BC9011F910F9136
+:10337000FF90EF90DF90CF9008951F920F920FB6BD
+:103380000F9211248F939F93AF93BF938091CF019E
+:103390009091D001A091D101B091D2010196A11DCF
+:1033A000B11D8093CF019093D001A093D101B09330
+:1033B000D201BF91AF919F918F910F900FBE0F904F
+:1033C0001F9018950E94670AF8942FEF87EA91E6FC
+:1033D000215080409040E1F700C0000087E090EB72
+:1033E000DC018093EF019093F001A093F101B09381
+:1033F000F2019CE088E10FB6F894A89580936000F4
+:103400000FBE90936000FFCFEF92FF920F931F9338
+:10341000CF93DF93D82FC0E08C2F0E94440400E0AC
+:1034200010E0E82EF12CC701002E02C0959587957B
+:103430000A94E2F780FD06C00F5F1F4F06301105AA
+:1034400091F709C0602F7C2F80E00E940B05D813F4
+:10345000F3CF81E004C0CF5FCE30F1F680E0DF91A2
+:10346000CF911F910F91FF90EF900895CF93C82FA8
+:103470008CE20E94041A882321F08C2FCF910C94A7
+:10348000041A80E0CF910895CF930E948B1B811185
+:1034900002C00E94711BC5E6C15049F00E9456034C
+:1034A0008FE39CE90197F1F700C00000F5CF89E2B6
+:1034B0000E94361A811113C18AE20E94361A8111C4
+:1034C0000E94711B85E00E94361A81110E94E21948
+:1034D0000E94961B8093CD0187E00E94361A8823B4
+:1034E000A9F18BE10E94361A882351F08091CD0119
+:1034F00081FB222720F991E0922790FB81F90EC0F1
+:103500008EE00E94361A882361F08091CD0182FB03
+:10351000222720F991E0922790FB82F98093CD0138
+:1035200015C080E10E94361A9091CD01882341F0A8
+:1035300093FB222720F981E0822780FB93F904C0C6
+:10354000892F809580FB90F99093CD018091CD01DA
+:103550000E949A1B0E94A81B8093E00180EE0E94AB
+:10356000361A882341F08091E001982F909590FBC6
+:1035700080F98093E00189E30E94361A882359F08C
+:103580008091E00181FB222720F991E0922790FBB6
+:1035900081F98093E00182EE0E94361A882359F067
+:1035A0008091E00182FB222720F991E0922790FB95
+:1035B00082F98093E00186EE0E94361A882359F042
+:1035C0008091E00183FB222720F991E0922790FB74
+:1035D00083F98093E00183EE0E94361A882359F024
+:1035E0008091E00184FB222720F991E0922790FB53
+:1035F00084F98093E00185E30E94361A882359F00C
+:103600008091E00185FB222720F991E0922790FB31
+:1036100085F98093E00181E30E94361A882359F0EE
+:103620008091E00186FB222720F991E0922790FB10
+:1036300086F98093E00181E10E94361A882359F0CF
+:103640008091E00187FB222720F991E0922790FBEF
+:1036500087F98093E0018091E0010E94AC1B80918A
+:10366000E00187FB882780F980930D0187E20E94A3
+:10367000361AC82F8EE10E94361A8111C2608FE17E
+:103680000E94361A8111C46080E20E94361A8111AC
+:10369000C86081E20E94361A8111C06182E20E94F4
+:1036A000361A8111C06283E20E94361A8111C06409
+:1036B00084E20E94361A882311F0C06802C0CC232D
+:1036C00029F08C2F0E94A31B6C2F03C00E949F1B0C
+:1036D000682F70E080E090E0CF910C94B616CF9107
+:1036E00008956DEE7EEF80E090E00E94DD2160E0C5
+:1036F00082E090E00E94CF2160E083E090E00E94B1
+:10370000CF2160E084E090E00E94CF2160E085E07E
+:1037100090E00C94CF2180E090E00E94C92121E04C
+:103720008D3E9E4F09F020E0822F089582E090E0C8
+:103730000C94C121682F82E090E00C94CF2183E0AB
+:1037400090E00C94C121682F83E090E00C94CF218D
+:1037500084E090E00C94C121682F84E090E00C9408
+:10376000CF218091D50180FF0BC06091130185E0CE
+:10377000689FB001112475956795759567952BC065
+:1037800081FF09C06091130185E0689FB001112499
+:103790007595679520C082FF07C06091130185E091
+:1037A000689FB001112417C09091D6019923D1F0E0
+:1037B00060911201961788F72091130185E0289FE8
+:1037C00090011124929FA001939F500D112470E04D
+:1037D000CA010E9493216038710540F4611571059A
+:1037E00039F002C065E070E0862F08958FE70895F4
+:1037F00081E008958091D50180FF08C0609111019A
+:1038000070E0759567957595679521C081FF06C035
+:103810006091110170E07595679519C082FF04C031
+:103820006091110170E010C09091D6019923C1F010
+:10383000609110019617A0F780911101899FC00136
+:10384000112470E00E9493216038710528F46115FD
+:10385000710521F0862F08958FE7089581E008957E
+:1038600061E070E0F4CF803F21F40E94B11B8195AC
+:1038700004C0813F29F40E94B11B8093D9010895AF
+:10388000823F21F40E94B11B819504C0833F29F43B
+:103890000E94B11B8093D8010895893F19F40E94BA
+:1038A000FA1B05C08A3F31F40E94FA1B8195809370
+:1038B000DA0108958B3F21F40E94FA1B819504C020
+:1038C0008C3F29F40E94FA1B8093DB010895843F0A
+:1038D00021F48091D701816017C0853F21F4809148
+:1038E000D701826011C0863F21F48091D7018460A6
+:1038F0000BC0873F21F48091D701886005C0883FC5
+:1039000031F48091D70180618093D70108958D3F74
+:1039100021F48091D50181600BC08E3F21F480910C
+:10392000D501826005C08F3F29F48091D501846064
+:103930008093D5010895803F39F48091D90187FFA4
+:103940006CC01092D90169C0813F29F48091D901DE
+:103950001816BCF362C09091D801823F29F497FFFA
+:103960005CC01092D80159C0833F19F41916CCF3EA
+:1039700054C0893F41F48091DA0118160CF04DC013
+:103980001092DA014AC08A3F29F48091DA0187FF58
+:1039900044C0F6CF8B3F39F48091DB0187FF3DC0F7
+:1039A0001092DB013AC08C3F29F48091DB0118169C
+:1039B000BCF333C0843F21F48091D7018E7F17C0C0
+:1039C000853F21F48091D7018D7F11C0863F21F47E
+:1039D0008091D7018B7F0BC0873F21F48091D70165
+:1039E000877F05C0883F31F48091D7018F7E809317
+:1039F000D70113C08D3F21F48091D5018E7F0BC07C
+:103A00008E3F21F48091D5018D7F05C08F3F29F431
+:103A10008091D5018B7F8093D5018091D801811150
+:103A20000EC08091D90181110AC08091DA01811103
+:103A300006C08091DB01811102C01092D601089569
+:103A400087ED91E00E94810D0E9487199093D40127
+:103A50008093D30108951F93CF93DF938091D30177
+:103A60009091D4010E949319AC019091D6019923B1
+:103A700021F02091140130E006C0209115018AE068
+:103A8000289F900111244217530708F486C08091A3
+:103A9000D801C091D901D091DA011091DB018111D7
+:103AA00007C0C11176C0D11174C0111172C075C0A8
+:103AB0009F3F19F09F5F9093D601181624F40E943F
+:103AC000B11B8093D8018091D80187FF05C00E9467
+:103AD000B11B81958093D8011C1624F40E94B11B60
+:103AE0008093D9018091D90187FF05C00E94B11B45
+:103AF00081958093D9016091D801662339F1C091F5
+:103B0000D901CC2319F1772767FD7095872F972F5F
+:103B10000E94A42023E333E343E35FE30E940821F0
+:103B20000E9471206093D8016C2F772767FD7095F4
+:103B3000872F972F0E94A42023E333E343E35FE31F
+:103B40000E9408210E9471206093D9011D1624F45F
+:103B50000E94FA1B8093DA018091DA0187FF05C089
+:103B60000E94FA1B81958093DA01111624F40E94B9
+:103B7000FA1B8093DB018091DB0187FF05C00E9467
+:103B8000FA1B81958093DB01DF91CF911F910C94FB
+:103B9000201D9F3F09F08ECF96CFDF91CF911F91CF
+:103BA0000895E7EDF1E085E0DF011D928A95E9F7E0
+:103BB0001092D6011092D5010895833081F128F436
+:103BC000813059F08230D1F00895853009F449C030
+:103BD000B8F1863009F456C0089580911501262F5A
+:103BE00030E0280F311D2F3F310524F4680F60931A
+:103BF000150108958FEF80931501089580911401A8
+:103C0000262F30E0280F311D2F3F310524F4680F97
+:103C10006093140108958FEF8093140108958091AB
+:103C20001301262F30E0280F311D2F3F310524F4DA
+:103C3000680F6093130108958FEF80931301089527
+:103C400080911201262F30E0280F311D2F3F3105C2
+:103C500024F4680F6093120108958FEF809312018E
+:103C6000089580911101262F30E0280F311D2F3F3C
+:103C7000310524F4680F6093110108958FEF80934C
+:103C80001101089580911001262F30E0280F311D79
+:103C90002F3F310524F4680F6093100108958FEFD2
+:103CA000809310010895833011F128F4813049F098
+:103CB000823091F00895853081F120F18630C1F194
+:103CC000089580911501681720F4861B80931501D3
+:103CD000089510921501089580911401681720F439
+:103CE000861B809314010895109214010895809109
+:103CF0001301681720F4861B809313010895109216
+:103D00001301089580911201681720F4861B809397
+:103D100012010895109212010895809111016817FF
+:103D200020F4861B809311010895109211010895CB
+:103D300080911001681720F4861B8093100108956C
+:103D40001092100108950F931F938D3109F46AC0EA
+:103D500008F03FC08E3009F484C0C0F4873009F405
+:103D60006DC068F4863009F0B5C08091CD01817FC7
+:103D70008E7F8093CD0181E08093DD01ACC08830DF
+:103D800009F457C08B3009F46AC0A4C0863109F425
+:103D900066C078F4803109F477C0813109F09AC0A7
+:103DA0000E94FA1290910D0181E0892780930D0104
+:103DB00056C0893109F453C08B3109F08BC0809112
+:103DC000CD0181FB222720F991E0922790FB81F918
+:103DD00051C0853309F475C048F4873209F471C0C5
+:103DE00008F45EC0893209F46CC074C0833430F4C6
+:103DF0008A3308F053C0883391F16CC0833409F4DE
+:103E000060C0883409F066C00E94FA120FEF13ED0B
+:103E100020E3015010402040E1F700C000000E9464
+:103E2000E2191DC00E942B200E946A0D0E946306A9
+:103E300016C00E94961B0E94A81B11C09091CD0134
+:103E4000892F8095817080FB90F929F096609860A9
+:103E50009093CD0140C0997F977F9093CD0181E0F1
+:103E60003AC08091CD0182FB222720F991E0922770
+:103E700090FB82F98093CD01992389F38091CD0144
+:103E800081608093CD01EBCF8091CD0183FB222710
+:103E900020F991E0922790FB83F9ECCF895301C080
+:103EA0008D5141E050E060E070E08A019B0104C068
+:103EB000000F111F221F331F8A95D2F7C901B801C5
+:103EC00004C061E070E080E090E00E94B6160E94BD
+:103ED000FA12C5CF80E01F910F91089580E00895F8
+:103EE00080E00895CF93C82F8091DD01813079F073
+:103EF00018F08230E9F187C0E0910E01F0910F01D6
+:103F00008081813169F0823209F07FC009C0E0917F
+:103F10000E01F0910F018081813111F0823261F444
+:103F20008C2F0E946E1F811104C08C2F0E94A31E33
+:103F30001DC081E090E01AC08C2F0E94701F81117B
+:103F400014C0C43179F048F4CB3079F0C03109F0B5
+:103F500060C082E08093DD0108C0C93219F0C83327
+:103F600021F057C01092DD0154C081E0817053C030
+:103F7000C93289F118F5C43171F1A8F4C73009F0DC
+:103F800046C08AE08093150194E19093140193E078
+:103F9000909313018093120188E08093110188E2CD
+:103FA0008093100134C0CE51C63088F5EC2FF0E07C
+:103FB000E65DFE4F80818093DC0129C0CE34E9F0BC
+:103FC00020F4CB3421F56AE013C0C13579F0C23555
+:103FD000F1F461E00DC08091DC01882319F01092AA
+:103FE000DC0115C081E08093DD0115C061E006C0F1
+:103FF0008091DC010E94DD1D0AC06AE08091DC0135
+:104000000E94531E04C01092DD0180E004C081E0D4
+:1040100002C080E0ABCFCF910895E1E8F0E080816D
+:10402000886080838081816080838FB7F89493E07B
+:104030009093890090ED909388008FBF0895EFE6EC
+:10404000F0E08081826080830895EFE6F0E0808177
+:104050008D7F80830895EFE6F0E0908182E08927EC
+:10406000808308951F920F920FB60F9211242F9301
+:104070003F934F935F936F937F938F939F93AF93F0
+:10408000BF93EF93FF938091DE019091DF01019642
+:104090009093DF018093DE01811103C082E00E94D2
+:1040A0006306E091DF01E695E695F0E0EA5CFC4FFF
+:1040B000E4918091DE018E1303C080E00E946306CC
+:1040C000FF91EF91BF91AF919F918F917F916F91F0
+:1040D0005F914F913F912F910F900FBE0F901F90C6
+:1040E000189504D06894B1118DC0089570D088F0EF
+:1040F0009F5790F0B92F9927B751A0F0D1F0660FD4
+:10410000771F881F991F1AF0BA95C9F712C0B130EE
+:1041100081F077D0B1E0089574C0672F782F882799
+:10412000B85F39F0B93FCCF3869577956795B3952D
+:10413000D9F73EF490958095709561957F4F8F4F9C
+:104140009F4F0895E89409C097FB3EF490958095A1
+:10415000709561957F4F8F4F9F4F9923A9F0F92F4D
+:1041600096E9BB279395F695879577956795B795CB
+:10417000F111F8CFFAF4BB0F11F460FF1BC06F5FB1
+:104180007F4F8F4F9F4F16C0882311F096E911C0C3
+:10419000772321F09EE8872F762F05C0662371F0E4
+:1041A00096E8862F70E060E02AF09A95660F771FF8
+:1041B000881FDAF7880F9695879597F9089557FD28
+:1041C0009058440F551F59F05F3F71F04795880F85
+:1041D00097FB991F61F09F3F79F08795089512161C
+:1041E00013061406551FF2CF4695F1DF08C01616C8
+:1041F00017061806991FF1CF869571056105089479
+:104200000895E894BB2766277727CB0197F908958F
+:104210000BD078C069D028F06ED018F0952309F043
+:104220005AC05FC01124EECFCADFA0F3959FD1F32F
+:10423000950F50E0551F629FF001729FBB27F00D54
+:10424000B11D639FAA27F00DB11DAA1F649F6627A9
+:10425000B00DA11D661F829F2227B00DA11D621FF8
+:10426000739FB00DA11D621F839FA00D611D221FB2
+:10427000749F3327A00D611D231F849F600D211D96
+:10428000822F762F6A2F11249F5750408AF0E1F039
+:1042900088234AF0EE0FFF1FBB1F661F771F881F82
+:1042A00091505040A9F79E3F510570F014C0AACF1D
+:1042B0005F3FECF3983EDCF3869577956795B7956D
+:1042C000F795E7959F5FC1F7FE2B880F911D969597
+:1042D000879597F9089597F99F6780E870E060E007
+:1042E00008959FEF80EC089500240A94161617068F
+:1042F00018060906089500240A94121613061406D7
+:1043000005060895092E0394000C11F4882352F039
+:10431000BB0F40F4BF2B11F460FF04C06F5F7F4FF1
+:104320008F4F9F4F089597FB072E16F4009407D0E8
+:1043300077FD09D00E94AD2107FC05D03EF4909591
+:1043400081959F4F0895709561957F4F0895EE0F69
+:10435000FF1F0590F491E02D0994AA1BBB1B51E1AE
+:1043600007C0AA1FBB1FA617B70710F0A61BB70BE5
+:10437000881F991F5A95A9F780959095BC01CD018A
+:104380000895F999FECF92BD81BDF89A992780B51D
+:104390000895A8E1B0E042E050E00C94E421262F1B
+:1043A000F999FECF1FBA92BD81BD20BD0FB6F8941A
+:1043B000FA9AF99A0FBE019608950E94CF21272FED
+:1043C0000C94D021DC01CB01FC01F999FECF06C091
+:1043D000F2BDE1BDF89A319600B40D9241505040C3
+:0843E000B8F70895F894FFCF2F
+:1043E80020026506F306D0069C0668060101BA019C
+:1043F80028080A03140A3F4D3639F702AA02740244
+:104408003B02CE01E701000219020102030405067E
+:044418000708090088
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png Binary files differnew file mode 100644 index 0000000000..4b9433be28 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c new file mode 100644 index 0000000000..dd946c1823 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c @@ -0,0 +1,73 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 +#define QWRT 1 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = KEYMAP( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F5, + KC_TAB, KC_Q, KC_W, KC_D, KC_F, KC_K, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_E, KC_T, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, + KC_F1, KC_F2, KC_F3, KC_F4, KC_LGUI, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLD, KC_MUTE, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_VOLU, + /*-*/ /*-*/ /*-*/ /*-*/ /*-*/ KC_BSPC, CTL_T(KC_ESC), KC_LALT, + // + /*-*/ KC_F6, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, + /*-*/ TG(QWRT), KC_J, KC_U, KC_R, KC_L, KC_SCLN, KC_MINS, + /*-*/ /*-*/ KC_Y, KC_N, KC_I, KC_O, KC_H, KC_ENT, + /*-*/ KC_RBRC, KC_P, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + /*-*/ /*-*/ /*-*/ KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + KC_MPLY, KC_MNXT, + KC_MPRV, + KC_RALT, KC_QUOT, KC_SPC + ), + [QWRT] = KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_E, KC_R, KC_T, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_D, KC_F, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + /*-*/ KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS, + /*-*/ /*-*/ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_TRNS, + /*-*/ KC_TRNS, KC_N, 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[] = { +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { +}; + +// 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); + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + switch (layer) { + case QWRT: + ergodox_right_led_1_on(); + break; + default: + break; + } +}; diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md new file mode 100644 index 0000000000..0e78c130b3 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md @@ -0,0 +1,34 @@ +# Roman's Layout + +There are two layers: + +- **BASE** is [Norman layout](https://normanlayout.info/). +- **QWRT** is QWERTY. + +[](http://www.keyboard-layout-editor.com/#/gists/3b236f450da474dc506a5a80390c3cc7) + +## Switching + +- Tap `QWRT` to toggle **QWRT**. + +## LEDs + +- Red: QWRT is on. + +## Functional Keys + +- Tap `F1` to mute microphone via [Shush](http://mizage.com/shush/). +- Tap `F2` to copy screenshot to the clipboard. +- Hold `SHIFT` and tap `F2` to save screenshot as a file. +- Tap `F3`, `F4`, `F5`, `F6` to resize a window via [Divvy](http://mizage.com/divvy/). + +## CTRL/ESC + +Both CTRL and ESC are frequently used in Vim. + +- Tap `CTRL/ESC` to send `ESC`. +- Hold `CTRL/ESC` to use as `CTRL`. + +## Activate N-rollover + +- Hold left `SHIFT` and right `SHIRT` and then tap `N`. diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex new file mode 100644 index 0000000000..80ae0751b1 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.hex @@ -0,0 +1,1139 @@ +:100000000C940F020C9453020C9453020C94530260
+:100010000C9453020C9453020C9453020C9453020C
+:100020000C9453020C9453020C94070C0C94D90CAE
+:100030000C9453020C9453020C9453020C945302EC
+:100040000C9453020C94A3210C9453020C9453026D
+:100050000C9453020C94321B0C9453020C945302D4
+:100060000C9453020C9453020C9453020C945302BC
+:100070000C9453020C9453020C9453020C945302AC
+:100080000C9453020C9453020C9453020C9453029C
+:100090000C9453020C9453020C9453020C9453028C
+:1000A0000C9453020C9453020C945302460D680DA9
+:1000B000560E680D560EAD0DD00D560E250E380E8F
+:1000C0002411241161116111A411E211FB13FB131E
+:1000D000FB11FB13FC12FC12CF13FB13FB13E613F3
+:1000E00035002B00E000E1003A0000001E00140083
+:1000F00004001D003B00E2001F001A0016001B0058
+:100100003C00297120000700080006003D002A007D
+:100110002100090017001900E300A90022000E00C9
+:100120000A0005000000AA003E00310000002F0078
+:100130000000A8003F000154000030000000AE00A5
+:1001400023000D001C0013000000AB002400180069
+:1001500011001000E700AC00250015000C0036006F
+:1001600050002C0026000F00120037005100340010
+:10017000270033000B0038005200E6002E002D004F
+:100180002800E5004F00000001000100010001000F
+:100190000100000001000100010001000100010058
+:1001A0000100010001000100010001000100080040
+:1001B0000700010001000100010015000900010015
+:1001C0000100010001001700010001000000010012
+:1001D0000100010000000100000001000100010019
+:1001E000000001000000010001001C000B001100D4
+:1001F00000000100010018000D00010001000100D5
+:1002000001000C000E0001000100010001001200BD
+:100210000F00010001000100010013003300010084
+:1002200001000100010001000100010001000000C7
+:1002300016034500720067006F0044006F007800ED
+:10024000200045005A0000001603450072006700B8
+:100250006F0044006F007800200045005A00000045
+:100260000403090409026D00040100A0FA09040056
+:10027000000103010100092111010001223F0007D3
+:1002800005810308000A09040100010301020009B5
+:100290002111010001224D000705820308000A090F
+:1002A00004020001030000000921110100012236AF
+:1002B000000705830308000A090403000103000086
+:1002C00000092111010001223900070584031000F3
+:1002D000011201100100000008EDFE0713010001EA
+:1002E00002000105010906A101050719E029E7152A
+:1002F0000025019508750181020508190129059558
+:1003000005750191029501750391010507190029F1
+:100310007715002501957875018102C005010980D6
+:10032000A101850216010026B7001A01002AB700B4
+:10033000751095018100C0050C0901A10185031606
+:100340000100269C021A01002A9C02751095018169
+:1003500000C005010902A1010901A1000509190157
+:100360002905150025019505750181029501750383
+:1003700081010501093009311581257F9502750834
+:10038000810609381581257F950175088106050CC0
+:100390000A38021581257F950175088106C0C005C0
+:1003A000010906A101050719E029E71500250195B6
+:1003B0000875018102950175088101050819012957
+:1003C00005950575019102950175039101050719C0
+:1003D0000029FF150025FF950675088100C0000063
+:1003E000000000000000000000010204060A0F17D0
+:1003F000202C3A4A5D71879DB3C7DAE9F5FCFFFC12
+:10040000F5E9DAC7B39D87715D4A3A2C20170F0AC8
+:10041000060402010000000000000000000011249A
+:100420001FBECFEFDAE0DEBFCDBF04B603FE24C0AF
+:100430008091EE019091EF01A091F001B091F10156
+:100440008730904BA740B04BB9F41092EE01109258
+:10045000EF011092F0011092F10114BE84B7877F72
+:1004600084BF88E10FB6F89480936000109260001A
+:100470000FBEE0E0FFE3099511E0A0E0B1E0E4ED9C
+:10048000F6E402C005900D92A433B107D9F711E04C
+:10049000A4E3B1E001C01D92AE3EB107E1F70E94B6
+:1004A0004B090C9468230C94000008950895609102
+:1004B000B1017091B2018091B3019091B4010E9499
+:1004C0005E1A56985E9825982D9826982E9827980B
+:1004D0002F98813011F4259A2D9A08950C94570283
+:1004E00056985E9825982D9826982E9827982F989C
+:1004F0008FEF90E0909389008093880090938B0019
+:1005000080938A0090938D0080938C00259A2D9A79
+:100510002FEF80E792E0215080409040E1F700C04B
+:100520000000269A2E9A2FEF80E792E0215080401B
+:100530009040E1F700C00000279A2F9A2FEF80E744
+:1005400092E0215080409040E1F700C000002598E3
+:100550002D982FEF80E792E0215080409040E1F706
+:1005600000C0000026982E982FEF80E792E02150DF
+:1005700080409040E1F700C0000027982F985698DF
+:100580005E9825982D9826982E9827982F9808954C
+:1005900089EA8093800089E08093810024982C98D8
+:1005A0003F988AB18F748AB96E98479A8BB1806BE5
+:1005B0008BB9769A0E9470020C94560280E2809366
+:1005C00000018091340181110EC00E942D0381E051
+:1005D000809334012FEF83ED90E3215080409040D1
+:1005E000E1F700C0000080E40E9433038093000123
+:1005F00081112EC00E945D0380930001811128C0EB
+:100600000E945D0380930001811122C08FE30E944C
+:100610005D038093000181111BC00E94550380E49B
+:100620000E94330380930001811112C08CE00E946C
+:100630005D038093000181110BC00E945D038093D4
+:100640000001811105C08FE30E945D0380930001CA
+:100650000E9455038091000108951092B9008AE02C
+:100660008093B800089594EA9093BC009091BC00E8
+:1006700097FFFCCF9091B900987F983021F090318E
+:1006800011F081E008958093BB0084E88093BC0062
+:100690008091BC0087FFFCCF8091B900887F8831B2
+:1006A00011F0803471F780E0089584E98093BC00F4
+:1006B0008091BC0084FDFCCF08958093BB0084E84A
+:1006C0008093BC008091BC0087FFFCCF9091B90063
+:1006D000987F81E0983209F480E0089584E880935F
+:1006E000BC008091BC0087FFFCCF8091BB000895C7
+:1006F00080910001811115C080E40E943303809332
+:10070000000181110CC082E10E945D038093000111
+:10071000811105C08FEF0E945D03809300010E944C
+:10072000550384B1807F84B985B1807F85B98AB152
+:10073000837F8AB98BB1837F8BB93E9846980895A1
+:100740000E94DE02809300010E94780380B38C70C7
+:1007500080BB81B3836F81BBA6E3B1E0E4E4F1E049
+:100760008EE08E0F11921D928E13FCCF0C94C80256
+:10077000BF92CF92DF92EF92FF920F931F93CF938E
+:10078000DF9380910001882379F0809135018F5F9C
+:1007900080933501811108C00E94DE028093000120
+:1007A000811102C00E94700206E311E0C0E0D0E0B7
+:1007B000DD24D39482E0C82EEE24E394F12CC730DC
+:1007C000D10500F580910001811164C080E40E9490
+:1007D000330380930001811112C082E10E945D0306
+:1007E0008093000181110BC0C7010C2E01C0880F3E
+:1007F0000A94EAF780950E945D03809300010E94AD
+:10080000550348C0CA30A1F028F4C83059F0C930A7
+:1008100061F005C0CC3089F070F0CD3089F0209ABD
+:10082000289810C0219A29980DC0229A2A980AC0A7
+:10083000239A2B9807C0529A01C0539A5B9802C022
+:100840003E9A469890EA9A95F1F79FB1799902C03D
+:1008500082E001C080E091709D25982B7C9902C0B8
+:1008600084E001C080E0892B7D9902C038E001C09E
+:1008700030E0832B7E9902C020E101C020E0822B72
+:100880009FB19095991F9927991F9295990F907EE6
+:10089000892B0FC080910001811149C080E40E9422
+:1008A000330380930001882379F1B12C0E94550312
+:1008B0008B2DF8019081981719F08083C092010167
+:1008C0000E94780321960F5F1F4FCE30D10509F0AB
+:1008D00076CF80910101882361F1815080930101DD
+:1008E000882339F08FE99FE00197F1F700C00000FD
+:1008F00020C0A4E4B1E0E6E3F1E0CF01825F919192
+:100900009D938E13FCCF15C083E10E945D038093FD
+:1009100000018111CACF81E40E943303809300015A
+:100920008111C3CF0E946E03B82EB094BFCF80E078
+:10093000C0CF0E946E0281E0DF91CF911F910F9195
+:10094000FF90EF90DF90CF90BF900895E82FF0E0F8
+:10095000EC5BFE4F808108950895089596E0799F9D
+:10096000F001112494E5899FE00DF11D1124E60F9B
+:10097000F11DEE0FFF1FE052FF4F859194910895F6
+:10098000880F991FFC01E05AF040859194910895D9
+:10099000880F991FFC01E052FF4F859194910895B3
+:1009A0000F931F93CF93DF93EC018115904350F584
+:1009B000C11580E2D80708F0B3C0CB3BD10590F455
+:1009C000C83AD10508F05AC0C53AD10508F04BC065
+:1009D000C430D10508F0BBC1219709F0B5C101E0D1
+:1009E00010E0F5C1CF3FD10511F008F0B0C1C03F14
+:1009F000D10508F092C0CE01805E9109089708F4F5
+:100A0000A6C1A2C1C11591E5D907A8F4C23020E55D
+:100A1000D20708F09EC0C11580E5D80709F485C04B
+:100A200008F091C0C11520E4D20708F08DC1DD2780
+:100A30008E01106CCCC1C11580E8D80758F4C115DF
+:100A400090E7D90708F07CC1C11520E6D20708F469
+:100A500022C17AC1C11580E9D80708F075C1DF70DD
+:100A60008E01106AB4C1C53AD10509F472C1C63A03
+:100A7000D10509F071C102E810E4A9C1C83AD10555
+:100A800009F46DC1C93AD10509F46CC1CA3AD1055E
+:100A900009F46BC1CB3AD10509F46AC1CC3AD1054E
+:100AA00009F469C1CD3AD10509F468C1C03BD1054B
+:100AB00009F467C1CE3AD10509F466C1CF3AD10530
+:100AC00009F465C1C13BD10509F464C1C23BD1053C
+:100AD00009F463C1C33BD10509F462C1C43BD1052C
+:100AE00009F461C1C53BD10509F460C1C63BD1051C
+:100AF00009F45FC1C73BD10509F45EC1C83BD1050C
+:100B000009F45DC1C93BD10509F45CC1CA3BD105FB
+:100B100009F45BC100E014E45AC18E01106557C1AD
+:100B2000CE019F700E94C80453C10E941F149FEF02
+:100B300024E38CE0915020408040E1F700C00000A9
+:100B40000E94571B44C18091CD0181608093CD01EB
+:100B50003EC10E94001D811102C00E94E61C0E943D
+:100B60001D1D90E09093EE018093ED01C23090E561
+:100B7000D90721F48091ED01816086C0C43020E561
+:100B8000D20721F48091ED0182607EC0C63080E5FD
+:100B9000D80721F48091ED01846076C0C83090E5DB
+:100BA000D90719F48091ED0127C0CA3020E5D2079A
+:100BB00021F48091ED01806167C0CC3080E5D807D9
+:100BC00021F48091ED0180625FC0CE3090E5D907BD
+:100BD00021F48091ED01806457C0C03120E5D20737
+:100BE00021F48091ED0180684FC0C23180E5D807C3
+:100BF00029F48091ED018460886046C0C33090E59F
+:100C0000D90721F48091ED018E7F3EC0C53020E5EB
+:100C1000D20721F48091ED018D7F36C0C73080E589
+:100C2000D80721F48091ED018B7F2EC0C93090E56B
+:100C3000D90719F48091ED0126C0CB3020E5D20709
+:100C400021F48091ED018F7E1FC0CD3080E5D80763
+:100C500021F48091ED018F7D17C0CF3090E5D90749
+:100C600021F48091ED018F7B0FC0C13120E5D207C7
+:100C700021F48091ED018F7707C0C331D04531F465
+:100C80008091ED018B7F877F8093ED018091ED0155
+:100C90000E94211D9CC08D2F99278F70992781302C
+:100CA0009105D9F49E012370332702C0880F991F44
+:100CB0002A95E2F79C688E0144E0000F111F4A95C7
+:100CC000E1F700271370802B912B53E0CC0FDD1F31
+:100CD0005A95E1F7C076DD272FC08230910531F4B7
+:100CE000DC2FCC278E01016F106A71C08330910513
+:100CF00069F4CE018370992701E010E002C0000F73
+:100D0000111F8A95E2F7C8019C680FC0049709F08B
+:100D10005EC0CE018370992701E010E002C0000F91
+:100D2000111F8A95E2F7C8019A6823E0CC0FDD1FF6
+:100D30002A95E1F7C07ED7708C010C2B1D2B47C084
+:100D4000DF708E01106243C000E010E040C08E01F1
+:100D50003EC001E810E43BC003E810E438C002EEF6
+:100D600014E435C009EE14E432C00AEE14E42FC0D6
+:100D700005EB14E42CC006EB14E429C007EB14E4E3
+:100D800026C00CEC14E423C00DEC14E420C003E8EE
+:100D900015E41DC00AE815E41AC002E915E417C0FD
+:100DA00004E915E414C001E216E411C003E216E4FC
+:100DB0000EC004E216E40BC005E216E408C006E229
+:100DC00016E405C007E216E402C00AE216E4C80110
+:100DD000DF91CF911F910F91089596E0799FF001D7
+:100DE000112494E5899FE00DF11D1124E60FF11DFA
+:100DF000EE0FFF1FE052FF4F85919491803E9105C9
+:100E0000E0F4803C910558F58133910509F46FC0F9
+:100E100048F48932910509F463C08A32910509F4D6
+:100E20006DC072C089339105E9F082389105D1F027
+:100E30008533910509F44DC067C0833E910581F16A
+:100E400038F4803E9105B9F0823E9105D9F05CC03E
+:100E5000863E910561F1873E9105A1F155C00E9442
+:100E6000C00408952091ED0120FD02C021FF4CC077
+:100E700080EE90E049C08091ED0180FFF9CF89E3D9
+:100E800090E042C08091ED0182FF0EC08091ED01A3
+:100E900084FF03C080E090E037C083EE90E034C070
+:100EA0008091ED0182FFF2CF82EE90E02DC0809123
+:100EB000ED0183FF0BC08091ED0184FDEBCF87EE48
+:100EC00090E022C08091ED0183FFF5CF86EE90E0A7
+:100ED0001BC08091ED0185FF07C089E290E014C03E
+:100EE0008091ED0185FFF9CF85E390E00DC0809101
+:100EF000ED0186FF07C08AE290E006C08091ED0117
+:100F000086FFF9CF81E390E00E94D0040895089510
+:100F10000C948707809162010895CF93DF9300D0EE
+:100F20001F92CDB7DEB79C018091E401843019F5A2
+:100F300093E099833B832A839093E9008FEF90910C
+:100F4000E800815095FD06C095ED9A95F1F70000F7
+:100F50008111F5CF8091E80085FF0DC040E050E0A1
+:100F600063E070E0CE0101960E94F7098091E800ED
+:100F70008E778093E8000F900F900F90DF91CF91C4
+:100F80000895CF93DF9300D01F92CDB7DEB72091A5
+:100F9000E401243021F522E029839B838A8383E0C6
+:100FA0008093E9008FEF9091E800815095FD06C095
+:100FB00095ED9A95F1F700008111F5CF8091E80049
+:100FC00085FF0DC040E050E063E070E0CE01019687
+:100FD0000E94F7098091E8008E778093E8000F90D7
+:100FE0000F900F90DF91CF9108952091E40124306C
+:100FF000F1F422E02093E9002FEF3091E800215036
+:1010000035FD06C035ED3A95F1F700002111F5CF19
+:101010002091E80025FF0BC040E050E065E070E063
+:101020000E94F7098091E8008E778093E800089588
+:10103000CF93DF93EC019091E401943009F046C026
+:1010400080910C018823D9F080910D018823B9F09B
+:101050009093E9008FEF9091E800815095FD06C0D4
+:1010600095E19A95F1F700008111F5CF8091E800A4
+:1010700085FF2CC040E050E060E170E017C081E0E7
+:101080008093E9008FEF9091E800815095FD06C0B4
+:1010900095ED9A95F1F700008111F5CF8091E80068
+:1010A00085FF14C040E050E068E070E0CE010E948F
+:1010B000F7098091E8008E778093E80080E1FE01D7
+:1010C000A2E5B1E001900D928A95E1F7DF91CF9111
+:1010D00008958091E301811109C00E948C0B0E9448
+:1010E000E90B8091E20084608093E2000895109201
+:1010F000E301089508950C9490210E94ED1A0E9436
+:1011000096210E948F0E0C94880742E061EC81E0EA
+:101110000E94060B42E061EC82E00E94060B42E076
+:1011200061EC83E00E94060B42E161EC84E00C94E8
+:10113000060B8091E601833009F455C030F481300C
+:1011400071F0823009F48EC008958A3009F47AC0B3
+:101150008B3009F460C0893009F09CC020C08091B8
+:10116000E501813A09F096C08091E800877F80937D
+:10117000E8008091E9019091EA01892B21F460E176
+:1011800082E591E003C060E080E090E070E00E94C2
+:10119000420A8091E8008B778093E800089580915F
+:1011A000E501813209F076C08091E9019091EA0170
+:1011B000009719F0039709F06DC08091E800877FD0
+:1011C0008093E8008091E80082FD05C08091E401F1
+:1011D0008111F8CF5FC08091F1008093620180910E
+:1011E000E8008B7753C08091E501813A09F052C045
+:1011F0008091E9019091EA01892B09F04BC080911F
+:10120000E800877F8093E8008091E80080FFFCCFB2
+:1012100080910C0136C08091E5018132D9F5809131
+:10122000E9019091EA01892BA9F58091E800877F77
+:101230008093E8000E943B0B8091E70180930C01B2
+:101240000C941F148091E501813221F58091E80012
+:10125000877F8093E8000E943B0B8091E801809398
+:10126000630108958091E501813AA1F48091E8003D
+:10127000877F8093E8008091E80080FFFCCF809119
+:1012800063018093F1008091E8008E778093E800FD
+:101290000C943B0B089584B7877F84BF88E10FB619
+:1012A000F89480936000109260000FBE90E080E898
+:1012B0000FB6F89480936100909361000FBE0E9476
+:1012C000DE0E0E948C0B0E94E90B8091E20084608C
+:1012D0008093E20078940E946F0E0E94E00E82E0FC
+:1012E00091E00E948A0E0E947E218091E401853067
+:1012F00069F40E94AE1A8091E2018823B1F30E9442
+:10130000D91A882391F30E94E109EFCF0E94E60EDB
+:10131000ECCF292F332723303105C9F064F4213075
+:10132000310581F02230310509F043C08DE690E0AF
+:1013300024E632E042C021323105F1F0223231059B
+:1013400041F137C082E190E021ED32E036C09927CB
+:101350008130910541F08230910541F0892B49F5AA
+:10136000E0E6F2E005C0E8E4F2E002C0E0E3F2E02B
+:10137000849190E09F0121C06430D8F4E62FF0E022
+:10138000EE0FFF1FEE5DFE4F2081318189E090E07E
+:1013900014C0643070F470E0FB01EE0FFF1FE65ED6
+:1013A000FE4F20813181FB01EA5EFE4F808190E09B
+:1013B00004C080E090E020E030E0FA013183208337
+:1013C000089580E189BD82E189BD09B400FEFDCFA9
+:1013D0008091D8008F7D8093D8008091E00082605A
+:1013E0008093E0008091E00081FDFCCF0895CF92D2
+:1013F000DF92EF92FF920F931F93CF93DF93EC0155
+:101400008B016A010E945A0B811133C0C114D104AF
+:1014100039F0F60180819181081B190BC80FD91F83
+:10142000E12CF12C0115110519F18091E80085FDE1
+:1014300016C08091E8008E778093E800C114D10433
+:1014400049F0F60180819181E80EF91EF182E08277
+:1014500085E00FC00E945A0B882321F30AC08991AE
+:101460008093F10001501109FFEFEF1AFF0ADACF64
+:1014700080E0DF91CF911F910F91FF90EF90DF906F
+:10148000CF9008952091EB013091EC01261737079A
+:1014900048F06115710539F42091E8002E7720930A
+:1014A000E80001C0B90140E061157105A9F1209182
+:1014B000E401222309F443C0253009F442C02091FD
+:1014C000E80023FD40C02091E80022FD32C02091B9
+:1014D000E80020FFE9CF4091F3002091F20030E0D6
+:1014E000342BFC01CF016115710559F0283031050D
+:1014F00040F481918093F100615071092F5F3F4F5B
+:10150000F1CF41E02830310509F040E02091E800BA
+:101510002E772093E800C8CF4111C9CF0AC080912F
+:10152000E401882361F0853061F08091E80083FD5B
+:101530000AC08091E80082FFF2CF80E0089582E047
+:10154000089583E0089581E008952091EB013091A2
+:10155000EC012617370748F06115710539F4209121
+:10156000E8002E772093E80001C0B901FC0120E0DB
+:101570006115710591F18091E401882309F440C05F
+:10158000853009F43FC08091E80083FD3DC0809123
+:10159000E80082FD2FC08091E80080FFE9CF209114
+:1015A000F3008091F20090E0922B6115710559F0E3
+:1015B0008830910540F424912093F10031966150D8
+:1015C00071090196F2CF21E0089709F020E080919F
+:1015D000E8008E778093E800CBCF2111CCCF0AC0F2
+:1015E0008091E401882361F0853061F08091E8000A
+:1015F00083FD0AC08091E80082FFF2CF80E0089569
+:1016000082E0089583E0089581E00895982F97304F
+:1016100058F59093E900981739F07091EC002091FB
+:10162000ED005091F00003C0242F762F50E021FFF1
+:1016300019C03091EB003E7F3093EB003091ED000C
+:101640003D7F3093ED003091EB0031603093EB0043
+:101650007093EC002093ED005093F0002091EE0089
+:1016600027FF07C09F5FD3CF8F708093E90081E091
+:10167000089580E008958091E50187FF11C0809171
+:10168000E80082FD05C08091E4018111F8CF11C00E
+:101690008091E8008B770BC08091E401882349F0AA
+:1016A0008091E80080FFF8CF8091E8008E778093EA
+:1016B000E80008952091E4003091E50095E640911E
+:1016C000EC00842F817040FF22C08091E80080FDF3
+:1016D0001CC08091E401882391F0853091F08091C5
+:1016E000EB0085FD10C04091E4005091E5004217E9
+:1016F000530729F39A01915011F784E0089582E08D
+:10170000089583E0089581E0089580E00895409170
+:10171000E80042FFDECF08950E94FA0B0E94020CFF
+:10172000E0EEF0E0808181608083E8EDF0E0808190
+:101730008F77808319BCA7EDB0E08C918E7F8C935E
+:1017400080818F7E80831092E30108950F931F9311
+:10175000CF93DF930E94FA0B0E94020CC8EDD0E0F9
+:1017600088818F77888388818068888388818F7D4E
+:10177000888319BC1092E4011092E0011092E201FA
+:101780001092E10100EE10E0F80180818B7F8083F0
+:1017900088818160888342E060E080E00E94060BDF
+:1017A000E1EEF0E080818E7F8083E2EEF0E08081E8
+:1017B00081608083808188608083F80180818E7F52
+:1017C0008083888180618883DF91CF911F910F9101
+:1017D0000895E8EDF0E080818F7E8083E7EDF0E012
+:1017E00080818160808384E082BF81E08093E30117
+:1017F0000C94A60BE8EDF0E080818E7F8083109240
+:10180000E20008951092DA001092E10008951F920C
+:101810000F920FB60F9211242F933F934F935F9324
+:101820006F937F938F939F93AF93BF93EF93FF93A8
+:101830008091E10082FF0BC08091E20082FF07C02F
+:101840008091E1008B7F8093E1000E946E0E809179
+:10185000DA0080FF1FC08091D80080FF1BC08091FC
+:10186000DA008E7F8093DA008091D90080FF0DC06E
+:1018700080E189BD82E189BD09B400FEFDCF81E030
+:101880008093E4010E94690805C019BC1092E4012C
+:101890000E9477088091E10080FF19C08091E200EA
+:1018A00080FF15C08091E2008E7F8093E2008091DE
+:1018B000E20080618093E2008091D8008062809392
+:1018C000D80019BC85E08093E4010E947B088091D8
+:1018D000E10084FF30C08091E20084FF2CC080E1F1
+:1018E00089BD82E189BD09B400FEFDCF8091D80099
+:1018F0008F7D8093D8008091E1008F7E8093E100FE
+:101900008091E2008F7E8093E2008091E20081600E
+:101910008093E2008091E001882311F084E007C009
+:101920008091E30087FD02C081E001C083E08093E5
+:10193000E4010E947D088091E10083FF29C080912D
+:10194000E20083FF25C08091E100877F8093E10062
+:1019500082E08093E4011092E0018091E1008E7FAB
+:101960008093E1008091E2008E7F8093E20080917D
+:10197000E20080618093E20042E060E080E00E944B
+:10198000060B8091F00088608093F0000E947A0836
+:10199000FF91EF91BF91AF919F918F917F916F9147
+:1019A0005F914F913F912F910F900FBE0F901F901D
+:1019B00018951F920F920FB60F9211242F933F93F9
+:1019C0004F935F936F937F938F939F93AF93BF9347
+:1019D000CF93DF93EF93FF93C091E900CF70809195
+:1019E000EC00D82FD17080FDD0E81092E9008091F2
+:1019F000F000877F8093F00078940E941D0D109274
+:101A0000E9008091F00088608093F000CD2BCF70CA
+:101A1000C093E900FF91EF91DF91CF91BF91AF911A
+:101A20009F918F917F916F915F914F913F912F91F6
+:101A30000F900FBE0F901F9018951F93CF93DF93B9
+:101A4000CDB7DEB7AA970FB6F894DEBF0FBECDBFF5
+:101A5000E5EEF1E088E08E0F9091F10091938E1306
+:101A6000FBCF0E9499088091E80083FF1FC18091FD
+:101A7000E5019091E601492F50E04A30510508F008
+:101A800015C1FA01EA5AFF4F0C941823803881F0EF
+:101A9000823809F00BC18091E9018F708093E900D1
+:101AA0008091EB0085FB882780F91092E90006C041
+:101AB0008091E1019091E201911182609091E800A2
+:101AC000977F9093E8008093F1001092F100C8C0D6
+:101AD000282F2D7F09F0EAC0882319F0823061F0A9
+:101AE000E5C08091E701813009F0E0C0933009F052
+:101AF00080E08093E2012BC08091E701811127C033
+:101B00008091E9018F7009F4D1C08093E9002091A0
+:101B1000EB0020FF1CC0933021F48091EB00806229
+:101B200014C09091EB0090619093EB0021E030E0C5
+:101B3000A90102C0440F551F8A95E2F74093EA00BD
+:101B40001092EA008091EB0088608093EB00109285
+:101B5000E9008091E800877F86C08111A7C01091BD
+:101B6000E7011F778091E3008078812B8093E30069
+:101B70008091E800877F8093E8000E943B0B809172
+:101B8000E80080FFFCCF8091E30080688093E30051
+:101B9000111102C082E001C083E08093E40186C09D
+:101BA0008058823008F082C08091E7019091E8016E
+:101BB0008C3D53E0950779F583E08A838AE2898337
+:101BC0004FB7F894DE01139620E03EE051E2E32F98
+:101BD000F0E050935700E49120FF03C0E295EF70CE
+:101BE0003F5FEF708E2F90E0EA3010F0C79601C093
+:101BF000C0968D939D932F5F243149F74FBF8091FD
+:101C0000E800877F8093E8006AE270E0CE010196E9
+:101C10000E94420A14C0AE014F5F5F4F6091E9011C
+:101C20000E948909BC01892B09F440C09091E80009
+:101C3000977F9093E80089819A810E94A50A8091FC
+:101C4000E8008B778093E80031C0803879F5809187
+:101C5000E800877F8093E8008091E0018093F100A5
+:101C60008091E8008E778093E8000E943B0B1EC0B5
+:101C700081111CC09091E7019230C0F48091E8007E
+:101C8000877F8093E8009093E0010E943B0B809156
+:101C9000E001811106C08091E30087FD02C081E070
+:101CA00001C084E08093E4010E9485088091E800EF
+:101CB00083FF0AC08091E800877F8093E8008091CD
+:101CC000EB0080628093EB00AA960FB6F894DEBF1B
+:101CD0000FBECDBFDF91CF911F9108950895CF938F
+:101CE0008091E4018823A1F0C091E900CF70909128
+:101CF000EC00892F817090FD80E8C82B1092E900DC
+:101D00008091E80083FD0E941D0DCF70C093E90013
+:101D1000CF91089590936901809368010895E091AF
+:101D20006801F0916901309721F00190F081E02D78
+:101D3000099480E00895E0916801F091690130977D
+:101D400021F00280F381E02D09940895E09168016B
+:101D5000F0916901309721F00480F581E02D09941C
+:101D6000089520916601309167018217930771F001
+:101D70009093670180936601E0916801F091690199
+:101D8000309721F00680F781E02D09940895209185
+:101D90006401309165018217930771F0909365019A
+:101DA00080936401E0916801F0916901309721F01E
+:101DB0000084F185E02D0994089508950C94DD0EBA
+:101DC0000E94F31A0E94A0030C94B91BCF92DF92D9
+:101DD000EF92FF920F931F93CF93DF93CDB7DEB7B0
+:101DE0002B970FB6F894DEBF0FBECDBF0E94B8038D
+:101DF0008BE6C82E81E0D82E00E010E0E02E802F88
+:101E00000E94A604F60141916F01F42EF826B1F468
+:101E10000F5F1F4F0E30110589F78FEF89838A837B
+:101E20001B820E94FC1A8160782F9D838C834981DC
+:101E30005A816B818D810E94890F40C09091CD01A4
+:101E400091FF04C08B870E94AC048B8520E030E0BA
+:101E50004F2D50E0922FBA01022E02C07595679562
+:101E60000A94E2F760FF24C02E83EF8221E030E085
+:101E7000690102C0CC0CDD1C9A95E2F790E08C2140
+:101E80009D21892B09F420E028870E94FC1A81609B
+:101E9000782F9A8789874E815F8168858A850E941D
+:101EA000890FF801E559FE4F8081C826C08206C01F
+:101EB0002F5F3F4F2630310569F6AACF0E94A01E42
+:101EC00010916A010E948F0E1817A1F00E948F0EC8
+:101ED00080936A012B960FB6F894DEBF0FBECDBF7C
+:101EE000DF91CF911F910F91FF90EF90DF90CF90F6
+:101EF0000C9488072B960FB6F894DEBF0FBECDBFAB
+:101F0000DF91CF911F910F91FF90EF90DF90CF90D5
+:101F10000895CF93DF93CDB7DEB72B970FB6F89424
+:101F2000DEBF0FBECDBF4F83588769877A878B8707
+:101F3000DE01119686E0FD0111928A95E9F785E0B0
+:101F4000FE01379601900D928A95E1F749815A81F9
+:101F50006B817C818D819E810E94B9162B960FB674
+:101F6000F894DEBF0FBECDBFDF91CF9108950895E5
+:101F7000CF93882309F4C2C0C82F823859F40E9435
+:101F80008F0E81FDBBC089E30E9462190E942F1A47
+:101F900089E30CC0833879F40E948F0E80FDAEC0B7
+:101FA00083E50E9462190E942F1A83E50E94A419FA
+:101FB000CF910C942F1A843859F40E948F0E82FD11
+:101FC0009DC087E40E9462190E942F1A87E4EECF19
+:101FD0008CEF8C0F813A48F48C2F0E94E320811102
+:101FE0008DC08C2F0E946219E3CF80E28C0F883065
+:101FF00048F4C77081E001C0880FCA95EAF70E94D3
+:10200000E819D6CF8BE58C0F833078F4C53A29F0E8
+:10201000C63A31F083E890E005C081E890E002C064
+:1020200082E890E0CF910C94B10E88E58C0F83315B
+:1020300008F064C0C83A39F1C93A41F1CA3A49F1E5
+:10204000CB3A51F1CC3A59F1CD3A61F1C03B69F14B
+:10205000CE3A71F1CF3A79F1C13B81F1C23B89F1BE
+:10206000C33B91F1C43B99F1C53BA1F1C63BA9F13A
+:10207000C73BB1F1C83BB9F1C93BC1F1CA3BC9F19A
+:1020800080E090E038C082EE90E035C089EE90E0CC
+:1020900032C08AEE90E02FC085EB90E02CC086EB3A
+:1020A00090E029C087EB90E026C08CEC90E023C044
+:1020B0008DEC90E020C083E891E01DC08AE891E0BB
+:1020C0001AC082E991E017C084E991E014C081E26E
+:1020D00092E011C083E292E00EC084E292E00BC075
+:1020E00085E292E008C086E292E005C087E292E0D5
+:1020F00002C08AE292E0CF910C94C70ECF9108956E
+:10210000882309F44BC0823859F40E948F0E81FF56
+:1021100045C089E30E9462190E942F1A89E30CC00E
+:10212000833871F40E948F0E80FF38C083E50E94CF
+:1021300062190E942F1A83E50E94A4190C942F1A89
+:10214000843859F40E948F0E82FF28C087E40E94D1
+:1021500062190E942F1A87E4EFCF9CEF980F913AF3
+:1021600058F390E2980F983050F4877091E001C0D6
+:10217000990F8A95EAF7892F0E94EE19DFCF9BE528
+:10218000980F933020F480E090E00C94B10E885AC0
+:10219000833120F480E090E00C94C70E08958823EA
+:1021A00021F00E94E8190C942F1A0895882321F039
+:1021B0000E94EE190C942F1A0895BF92CF92DF92CD
+:1021C000EF92FF920F931F93CF93DF9300D000D035
+:1021D00000D0CDB7DEB725E0FC01DE0111960190FD
+:1021E0000D922A95E1F7FC01D080118102812581B1
+:1021F00022952F7043815481452B09F4FCC21F3F67
+:1022000021F4FFEFDF1609F4F6C27C012E830E9451
+:10221000B70FD9821A8369817A81802F0E945E1953
+:10222000182FB92E0E9413190E94DA172E8100234D
+:1022300019F00E94051A2E81EB2DE295EF70F0E067
+:10224000E05AFF4F0C9418238B2D807F9B2D9F709D
+:10225000F92E882319F0F29480EFF822002389F0F8
+:10226000FF2009F475C280E2810F883020F48F2DA1
+:102270000E94E81903C08F2D0E94F8190E942F1A9E
+:1022800067C2812F0E948010FF2009F4B4C2105E43
+:102290008F2D183018F40E94EE1902C00E94FE190A
+:1022A00026960FB6F894DEBF0FBECDBFDF91CF915B
+:1022B0001F910F91FF90EF90DF90CF90BF900C9403
+:1022C0002F1A3B2D307F8B2D8F70303211F082957D
+:1022D000807F112319F0113021F12CC00023B9F0B7
+:1022E000222309F4A0C1213009F09DC126960FB622
+:1022F000F894DEBF0FBECDBFDF91CF911F910F913C
+:10230000FF90EF90DF90CF90BF900C94181A22238B
+:1023100019F0213009F46FC28E830E941B1A8E813E
+:1023200096C1002321F0223008F065C27CC1211142
+:1023300062C28DC1002321F0222309F474C108C2B6
+:10234000222309F484C119C22B2D269526952370CA
+:1023500030E02115310521F021303105D1F04BC29B
+:10236000002321F0812F9B2D937002C080E090E02C
+:1023700026960FB6F894DEBF0FBECDBFDF91CF918A
+:102380001F910F91FF90EF90DF90CF90BF900C9432
+:10239000B10E002321F0812F9B2D937002C080E0AD
+:1023A00090E026960FB6F894DEBF0FBECDBFDF914A
+:1023B000CF911F910F91FF90EF90DF90CF90BF9042
+:1023C0000C94C70E812F002319F00E94A81D02C093
+:1023D0000E94101E26960FB6F894DEBF0FBECDBF2A
+:1023E000DF91CF911F910F91FF90EF90DF90CF90F1
+:1023F000BF900C94951E8B2D837009F07BC001114A
+:10240000FAC1812F829586958770880F880F912F4A
+:102410009F70C92ED12CE12CF12C082E04C0CC0CBD
+:10242000DD1CEE1CFF1C0A94D2F714FF12C04FE013
+:1024300050E060E070E004C0440F551F661F771F36
+:102440008A95D2F7CB01BA016095709580959095E9
+:1024500003C060E070E0CB012B2D269526952370FC
+:10246000422F50E042305105D9F04330510569F117
+:102470006C297D298E299F294130510551F12696DD
+:102480000FB6F894DEBF0FBECDBFDF91CF911F9185
+:102490000F91FF90EF90DF90CF90BF900C940118B8
+:1024A0006C297D298E299F2926960FB6F894DEBFC8
+:1024B0000FBECDBFDF91CF911F910F91FF90EF9095
+:1024C000DF90CF90BF900C941D180E940118C70197
+:1024D000B60126960FB6F894DEBF0FBECDBFDF91D2
+:1024E000CF911F910F91FF90EF90DF90CF90BF9011
+:1024F0000C94E517002319F08B2D817001C086958F
+:10250000882309F478C1812F829586958770880F7A
+:10251000880F912F9F70C92ED12CE12CF12C082E01
+:1025200004C0CC0CDD1CEE1CFF1C0A94D2F714FF77
+:1025300012C04FE050E060E070E004C0440F551F4F
+:10254000661F771F8A95D2F7CB01BA016095709507
+:102550008095909503C060E070E0CB012B2D26950F
+:1025600026952370422F50E042305105D9F0433078
+:10257000510569F16C297D298E299F29413051052A
+:1025800051F126960FB6F894DEBF0FBECDBFDF9196
+:10259000CF911F910F91FF90EF90DF90CF90BF9060
+:1025A0000C94DB186C297D298E299F2926960FB65D
+:1025B000F894DEBF0FBECDBFDF91CF911F910F9179
+:1025C000FF90EF90DF90CF90BF900C94F7180E948F
+:1025D000DB18C701B60126960FB6F894DEBF0FBE12
+:1025E000CDBFDF91CF911F910F91FF90EF90DF90C2
+:1025F000CF90BF900C94BF18103FD1F118F4103E4B
+:1026000050F4A1C0123F09F463C008F44CC0133F5A
+:1026100009F473C098C01F708B2D8F710023A1F037
+:102620000E945818812F26960FB6F894DEBF0FBE71
+:10263000CDBFDF91CF911F910F91FF90EF90DF9071
+:10264000CF90BF900C94CF100E947918812F2696BE
+:102650000FB6F894DEBF0FBECDBFDF91CF911F91B3
+:102660000F91FF90EF90DF90CF90BF900C94D61019
+:102670000023A9F02111BFC08B2D8F7126960FB6B4
+:10268000F894DEBF0FBECDBFDF91CF911F910F91A8
+:10269000FF90EF90DF90CF90BF900C949E18223067
+:1026A00008F0A9C0E9CF0023A9F08B2D8F712696E1
+:1026B0000FB6F894DEBF0FBECDBFDF91CF911F9153
+:1026C0000F91FF90EF90DF90CF90BF900C9458182F
+:1026D000002359F38B2D8F7126960FB6F894DEBF29
+:1026E0000FBECDBFDF91CF911F910F91FF90EF9063
+:1026F000DF90CF90BF900C947918002399F08B2D28
+:102700008F7126960FB6F894DEBF0FBECDBFDF9156
+:10271000CF911F910F91FF90EF90DF90CF90BF90DE
+:102720000C94431826960FB6F894DEBF0FBECDBFAB
+:10273000DF91CF911F910F91FF90EF90DF90CF909D
+:10274000BF900C9439180023A9F0222309F4ADCFCF
+:10275000812F26960FB6F894DEBF0FBECDBFDF9156
+:10276000CF911F910F91FF90EF90DF90CF90BF908E
+:102770000C94B80F222309F4ADCF812F26960FB603
+:10278000F894DEBF0FBECDBFDF91CF911F910F91A7
+:10279000FF90EF90DF90CF90BF900C9480104B2D66
+:1027A0004F70612FC7010E94550226960FB6F8940C
+:1027B000DEBF0FBECDBFDF91CF911F910F91FF9074
+:1027C000EF90DF90CF90BF900C945D174B2D4F7022
+:1027D000612FC70126960FB6F894DEBF0FBECDBF9E
+:1027E000DF91CF911F910F91FF90EF90DF90CF90ED
+:1027F000BF900C94AD0426960FB6F894DEBF0FBEC2
+:10280000CDBFDF91CF911F910F91FF90EF90DF909F
+:10281000CF90BF9008950E94051A0E94151A0E9439
+:10282000DA190E942F1A0E94461F0E94951E80E00E
+:1028300090E00E94B10E80E090E00C94C70E0E94E0
+:10284000F5190C940B140E945319292F22952F70FF
+:1028500030E02C3031054CF42A3031056CF4225034
+:1028600031092230310588F407C02C30310549F098
+:102870002F30310531F009C0803E48F0803F29F407
+:1028800006C093FB882780F9089580E0089581E0D1
+:102890000895CF93DF9300D000D01F92CDB7DEB75D
+:1028A0000F900F900F900F900F90DF91CF910895A0
+:1028B000CF93DF9300D000D000D0CDB7DEB72696FF
+:1028C0000FB6F894DEBF0FBECDBFDF91CF91089554
+:1028D0001F93CF93DF93C091790116E080917A0125
+:1028E000C81799F0D0E01C9FF0011D9FF00D112436
+:1028F000E558FE4F408151816281738184819581C9
+:102900000E9458142196C770E9CFDF91CF911F9193
+:1029100008954091AB015091AC016091AD0170916F
+:10292000AE018091AF019091B0010C945814809148
+:10293000B00182958F7009F054C08091AD01882359
+:1029400009F44FC080917901A0917A016091AB01A7
+:102950007091AC014091AE015091AF01B6E08A1781
+:1029600009F43FC090E041155105C1F17F3F11F4DA
+:102970006F3FA1F1B89FF001B99FF00D1124E55808
+:10298000FE4F218172132AC02081621327C0228149
+:10299000211124C0238134812417350710F42150DC
+:1029A0003109241B350B283C3105C0F42091B001BE
+:1029B0002F7020612093B00126E0289FF001299F0D
+:1029C000F00D1124E058FE4F80818F70806180836C
+:1029D0008BEA91E00E94DD100C94681401968770D8
+:1029E000BECF0895CF92DF92EF92FF920F931F9385
+:1029F000CF93DF93CDB7DEB762970FB6F894DEBF03
+:102A00000FBECDBF8C0185E0F801DE011D9601905F
+:102A10000D928A95E1F7D8014C9111965C9111972E
+:102A200012966C9112971396CD90DC90149730917A
+:102A3000AB017091AC018091AE019091AF01009714
+:102A400009F46BC17F3F19F43F3F09F466C1E09080
+:102A5000AD01EE2009F4C0C02091B001C816D9061E
+:102A600028F0F601E81BF90BCF0104C08095909582
+:102A70008C0D9D1DFF24F394883C910578F0F12C7A
+:102A8000207F09F0C6C07C2DD98AC88A89890E9416
+:102A900049148BEA91E00E94DD10B1C0822F807F43
+:102AA00009F046C0751314C0341312C0611110C070
+:102AB0002F7020612093B0010E9489148BEA91E06D
+:102AC0000E94DD108091B001D80115968C932EC024
+:102AD000CD2819F15F3F11F44F3FF9F0F62E611147
+:102AE0001CC08091790120917A0136E0821709F4A7
+:102AF0005AC090E0389FF001399FF00D1124E5583D
+:102B0000FE4F7181571306C07081471303C0728155
+:102B1000711103C001968770E9CFF62E662309F480
+:102B200018C18091B00181608093B001F12C11C176
+:102B3000751308C0341306C0611104C08091B00140
+:102B4000D801C3C04D875E878D859E856A8B0E94A4
+:102B500023146A898823E1F16623D1F12091B00121
+:102B6000822F82958F7090E0029774F08091AB0174
+:102B70009091AC0198878F831986DB86CA862C8753
+:102B8000CE0107960E94DD1086E0F801ABEAB1E0C5
+:102B900001900D928A95E1F70E9497140E94891482
+:102BA000FF24F394D6C04D875E878D859E850E9455
+:102BB0005319292F22952F7030E0223031050CF067
+:102BC000BCC09F7009F0B6C0805E883008F4C1C0F8
+:102BD000C8010E94DD10E4CFC816D90608F453C01E
+:102BE000F601E81BF90BCF01883C910508F450C0B1
+:102BF000F12C7C2DD98AC88A89890E944914EBEA74
+:102C0000F1E086E0DF011D928A95E9F70E948914C0
+:102C1000A0C0751314C0341312C0611110C080918C
+:102C2000B001F8018583C8010E94DD1086E0EBEA5F
+:102C3000F1E0DF011D928A95E9F7FE2C8AC04D87ED
+:102C40005E878D859E856A8B0E9423146A898823FE
+:102C500009F4BECF662309F4BBCF2091B001822FC7
+:102C600082958F7090E002970CF48ECF8091AB012B
+:102C70009091AC019A8389831B82DD82CC822E8362
+:102C8000CE0101967FCF809590958C0D9D1DACCF88
+:102C9000F62E662309F49CCF75132EC034132CC076
+:102CA0002091B00120FD1FC0822F82958F70D9F036
+:102CB000D80115962C9315978F3049F08F5F982F78
+:102CC0009295907F822F8F70892B15968C93C801D7
+:102CD0000E94DD1086E0F801ABEAB1E001900D92B0
+:102CE0008A95E1F793CF86E0F801ABEAB1E0019075
+:102CF0000D928A95E1F72DC04D875E878D859E8563
+:102D00000E942314811140CF8091B0018160809393
+:102D1000B001C8010E94DD101CC0662309F458CF21
+:102D20004D875E878D859E850E942314882309F434
+:102D30004FCF2ACF811148CF0CC0243031050CF081
+:102D400047CF9F7009F440CFF8019581907F09F03B
+:102D50003BCF8F2D62960FB6F894DEBF0FBECDBF6E
+:102D6000DF91CF911F910F91FF90EF90DF90CF9067
+:102D700008951F93CF93DF93CDB7DEB72C970FB68F
+:102D8000F894DEBF0FBECDBF4F83588769877A871F
+:102D90008B879C87CE0107960E94F214882369F0E6
+:102DA0008F8198852A853B85232BF1F19F3F09F080
+:102DB00063C08F3F09F060C037C086E0FE013796E0
+:102DC000DE01119601900D928A95E1F76F81788569
+:102DD000EA85FB85309741F17F3F11F46F3F21F188
+:102DE00020917A0130E0C9010196877099274091BE
+:102DF000790150E08417950709F447C069837A8305
+:102E0000FD83EC8396E0929FD001939FB00D112437
+:102E1000A558BE4FFE01319601900D929A95E1F7AB
+:102E200080937A010E94681416E080917901909154
+:102E30007A018917C1F1189FC001112485589E4F4E
+:102E40000E94F214882379F1E09179011E9FF0012C
+:102E50001124E558FE4F4081518162817381848144
+:102E600095810E9458148091790190E001968770B5
+:102E7000992780937901D9CF4F81588569857A85C3
+:102E80008B859C850E945814CFCF0E941F141092EE
+:102E90007A0110927901EBEAF1E086E0DF011D9200
+:102EA0008A95E9F7C1CF2C960FB6F894DEBF0FBE16
+:102EB000CDBFDF91CF911F910895EF92FF920F93B5
+:102EC0001F93CF93DF938C01892B09F46CC0F12CF5
+:102ED000EE24E394E8012196F8018491843740F4CC
+:102EE000843008F051C0813081F0823019F15BC02C
+:102EF000853709F444C0A8F19CE7980F903708F093
+:102F000052C08F770E94801041C00E5F1F4FFE019C
+:102F1000C49180E28C0F883048F4C7708E2D01C0B8
+:102F2000880FCA95EAF70E94081A14C08C2F0E94D5
+:102F3000B80F2DC00E5F1F4FFE01C49180E28C0FB1
+:102F4000883058F4C7708E2D01C0880FCA95EAF7F3
+:102F50000E940E1A0E942F1A1AC08C2F0E948010F5
+:102F600016C00E5F1F4FFE01C491CC2381F08FE984
+:102F70009FE00197F1F700C00000C150F6CF0E5F4F
+:102F80001F4FFE01F49003C00E94B80F8E018F2DD9
+:102F9000882309F49FCFEFE9FFE03197F1F700C0F4
+:102FA00000008150F5CFDF91CF911F910F91FF90DD
+:102FB000EF90089508956093B5017093B6018093E2
+:102FC000B7019093B8010C940B140F931F930091C9
+:102FD000B5011091B6012091B7013091B801DC0123
+:102FE000CB01802B912BA22BB32B8093B501909317
+:102FF000B601A093B701B093B8011F910F910C9443
+:103000000B140F931F930091B5011091B6012091FD
+:10301000B7013091B801DC01CB0180239123A223B9
+:10302000B3238093B5019093B601A093B701B093F9
+:10303000B8011F910F910C940B140F931F930091E3
+:10304000B5011091B6012091B7013091B801DC01B2
+:10305000CB0180279127A227B3278093B5019093B6
+:10306000B601A093B701B093B8011F910F910C94D2
+:103070000B141092B1011092B2011092B301109290
+:10308000B4010C940B1441E050E060E070E004C027
+:10309000440F551F661F771F8A95D2F74093B101E1
+:1030A0005093B2016093B3017093B4010C940B146C
+:1030B00041E050E060E070E004C0440F551F661F1F
+:1030C000771F8A95D2F78091B1019091B201A091BA
+:1030D000B301B091B401482B592B6A2B7B2B409341
+:1030E000B1015093B2016093B3017093B4010C9499
+:1030F0000B1441E050E060E070E004C0440F551F45
+:10310000661F771F8A95D2F7409550956095709508
+:103110008091B1019091B201A091B301B091B4013D
+:10312000482359236A237B234093B1015093B20172
+:103130006093B3017093B4010C940B1441E050E020
+:1031400060E070E004C0440F551F661F771F8A952A
+:10315000D2F78091B1019091B201A091B301B091E9
+:10316000B401482759276A277B274093B101509320
+:10317000B2016093B3017093B4010C940B140F93DC
+:103180001F930091B1011091B2012091B3013091D0
+:10319000B401DC01CB01802B912BA22BB32B8093AC
+:1031A000B1019093B201A093B301B093B4011F9108
+:1031B0000F910C940B140F931F930091B101109178
+:1031C000B2012091B3013091B401DC01CB01802325
+:1031D0009123A223B3238093B1019093B201A093D2
+:1031E000B301B093B4011F910F910C940B140F9382
+:1031F0001F930091B1011091B2012091B301309160
+:10320000B401DC01CB0180279127A227B32780934B
+:10321000B1019093B201A093B301B093B4011F9197
+:103220000F910C940B140895CF92DF92EF92FF92BE
+:103230000F931F93CF93DF938C01C090B501D09073
+:10324000B601E090B701F090B8018091B101909182
+:10325000B201A091B301B091B401C82AD92AEA2AD7
+:10326000FB2ACFE1D0E0D701C6010C2E04C0B695F1
+:10327000A795979587950A94D2F780FF06C0B80165
+:103280008C2F0E94ED06019721F4219760F780E0D2
+:1032900001C08C2FDF91CF911F910F91FF90EF9084
+:1032A000DF90CF900895CF93DF93EC010E94141923
+:1032B000BE010E94ED06DF91CF910895CB010E94DF
+:1032C0005319089590910C01992321F090910D01CB
+:1032D000911109C020910E0130910F01F901329630
+:1032E0009FEF40E01FC0982F9695969596959F303A
+:1032F00050F5E0910E01F0910F01E90FF11D87707B
+:1033000021E030E0A90102C0440F551F8A95E2F781
+:10331000CA019181892B818308959F3F39F04F5FC6
+:103320004E3041F051915813F8CF0DC05111F7CFE5
+:10333000942FF5CF9F3F39F0F901E90FF11D97FD6B
+:10334000FA9582830895089590910C01992321F0B4
+:1033500090910D01911109C020910E0130910F0142
+:10336000F9013296205F3F4F1FC0982F9695969592
+:1033700096959F30F0F4E0910E01F0910F01E90F66
+:10338000F11D877021E030E0A90102C0440F551FF4
+:103390008A95E2F7CA0180959181892381830895F6
+:1033A0003196E217F30729F090819813F9CF108234
+:1033B000F7CF089581E090E0E0910E01F0910F01C8
+:1033C000E80FF91F1082019680319105A9F7089541
+:1033D0009091CC01892B8093CC0108958095909198
+:1033E000CC0189238093CC0108951092CC010895DB
+:1033F0009091CB01892B8093CB010895809590917A
+:10340000CB0189238093CB0108951092CB010895BD
+:103410009091CA01892B8093CA010895809590915B
+:10342000CA0189238093CA0108951092CA010895A0
+:103430008093B90108951092B901089580910E0109
+:1034400090910F01FC0131969C01205F3F4F80E07D
+:10345000919191118F5FE217F307D1F70895E091F1
+:103460000E01F0910F018091CC018083E0910E015B
+:10347000F0910F0190818091CB01892B8083E091A5
+:103480000E01F0910F0190818091CA01892B8083F8
+:103490008091B901882361F0E0910E01F0910F0154
+:1034A0009081892B80830E941E1A81111092B9018C
+:1034B00080910E0190910F010C949B0ECF92DF92A0
+:1034C000EF92FF926C01EE24FF24C114D104E104B9
+:1034D000F10421F0C701B60120E101C020E0C72EB0
+:1034E000D82EE92EFF24C114D104E104F10419F00F
+:1034F000285FC701B6016B017C0154E0F694E794A4
+:10350000D794C7945A95D1F7C114D104E104F104BA
+:1035100019F02C5FC701B6016B017C0142E0F69403
+:10352000E794D794C7944A95D1F7C114D104E10424
+:10353000F10419F02E5FC701B601DC01CB01B6958D
+:10354000A79597958795892B8A2B8B2B09F02F5F51
+:10355000822FFF90EF90DF90CF9008958091E4014B
+:10356000843021F11092CE0120E488E190E00FB682
+:10357000F894A895809360000FBE2093600080E0CF
+:103580000E94880783B7817F846083BF83B781608F
+:1035900083BF7894889583B78E7F83BF88E10FB609
+:1035A000F89480936000109260000FBE0895089513
+:1035B0000895CF930E94D71A0E94B8030E94D81A88
+:1035C000C0E08C2F0E94A604811104C0CF5FCE30D2
+:1035D000C1F701C081E0CF9108950E941F140E949D
+:1035E0008F0E0C94880782E084BD93E095BD9AEF1E
+:1035F00097BD80936E0008952FB7F8948091CF0106
+:103600009091D001A091D101B091D2012FBF089526
+:10361000CF92DF92EF92FF920F931F932FB7F89400
+:103620004091CF015091D0016091D1017091D201B0
+:103630002FBF6A017B01EE24FF248C0120E030E0E3
+:10364000C016D106E206F30610F4415051099A0162
+:10365000281B390BC9011F910F91FF90EF90DF904C
+:10366000CF9008951F920F920FB60F9211248F934F
+:103670009F93AF93BF938091CF019091D001A09180
+:10368000D101B091D2010196A11DB11D8093CF014E
+:103690009093D001A093D101B093D201BF91AF918B
+:1036A0009F918F910F900FBE0F901F9018950E94C1
+:1036B0008C0BF8942FEF87EA91E6215080409040E0
+:1036C000E1F700C0000087E090EBDC018093EE01A1
+:1036D0009093EF01A093F001B093F1019CE088E199
+:1036E0000FB6F894A895809360000FBE9093600089
+:1036F000FFCFEF92FF920F931F93CF93DF93D82FBB
+:10370000C0E08C2F0E94A60400E010E0E82EF12C0F
+:10371000C701002E02C0959587950A94E2F780FDB7
+:1037200006C00F5F1F4F0630110591F709C0602FCB
+:103730007C2F80E00E94AE04D813F3CF81E004C058
+:10374000CF5FCE30F1F680E0DF91CF911F910F91E6
+:10375000FF90EF900895CF93C82F8CE20E94791BC1
+:10376000882321F08C2FCF910C94791B80E0CF918E
+:103770000895CF930E94001D811102C00E94E61C93
+:10378000C5E6C15049F00E94B8038FE39CE9019758
+:10379000F1F700C00000F5CF89E20E94AB1B811158
+:1037A00013C18AE20E94AB1B81110E94E61C85E0D6
+:1037B0000E94AB1B81110E94571B0E940B1D80931E
+:1037C000CD0187E00E94AB1B8823A9F18BE10E9409
+:1037D000AB1B882351F08091CD0181FB222720F97A
+:1037E00091E0922790FB81F90EC08EE00E94AB1B06
+:1037F000882361F08091CD0182FB222720F991E09E
+:10380000922790FB82F98093CD0115C080E10E9440
+:10381000AB1B9091CD01882341F093FB222720F927
+:1038200081E0822780FB93F904C0892F809580FB7B
+:1038300090F99093CD018091CD010E940F1D0E94BF
+:103840001D1D8093ED0180EE0E94AB1B882341F08B
+:103850008091ED01982F909590FB80F98093ED0178
+:1038600089E30E94AB1B882359F08091ED0181FB15
+:10387000222720F991E0922790FB81F98093ED01B6
+:1038800082EE0E94AB1B882359F08091ED0182FBF0
+:10389000222720F991E0922790FB82F98093ED0195
+:1038A00086EE0E94AB1B882359F08091ED0183FBCB
+:1038B000222720F991E0922790FB83F98093ED0174
+:1038C00083EE0E94AB1B882359F08091ED0184FBAD
+:1038D000222720F991E0922790FB84F98093ED0153
+:1038E00085E30E94AB1B882359F08091ED0185FB95
+:1038F000222720F991E0922790FB85F98093ED0132
+:1039000081E30E94AB1B882359F08091ED0186FB77
+:10391000222720F991E0922790FB86F98093ED0110
+:1039200081E10E94AB1B882359F08091ED0187FB58
+:10393000222720F991E0922790FB87F98093ED01EF
+:103940008091ED010E94211D8091ED0187FB882768
+:1039500080F980930D0187E20E94AB1BC82F8EE196
+:103960000E94AB1B8111C2608FE10E94AB1B8111D1
+:10397000C46080E20E94AB1B8111C86081E20E949A
+:10398000AB1B8111C06182E20E94AB1B8111C0623E
+:1039900083E20E94AB1B8111C06484E20E94AB1BD6
+:1039A000882311F0C06802C0CC2329F08C2F0E941C
+:1039B000181D6C2F03C00E94141D682F70E080E05A
+:1039C00090E0CF910C94DB17CF9108956DEE7EEFD0
+:1039D00080E090E00E94522360E082E090E00E944C
+:1039E000402360E083E090E00E94402360E084E0B8
+:1039F00090E00E94402360E085E090E00C9440233A
+:103A000080E090E00E943A2321E08D3E9E4F09F035
+:103A100020E0822F089582E090E00C943223682FFA
+:103A200082E090E00C94402383E090E00C943223F9
+:103A3000682F83E090E00C94402384E090E00C94A5
+:103A40003223682F84E090E00C9440238091D501CC
+:103A500080FF0BC06091130185E0689FB0011124C5
+:103A600075956795759567952BC081FF09C0609125
+:103A7000130185E0689FB00111247595679520C0FA
+:103A800082FF07C06091130185E0689FB001112497
+:103A900017C09091D6019923D1F060911201961729
+:103AA00088F72091130185E0289F90011124929FAF
+:103AB000A001939F500D112470E0CA010E940423BD
+:103AC0006038710540F46115710539F002C065E098
+:103AD00070E0862F08958FE7089581E00895809122
+:103AE000D50180FF08C06091110170E07595679560
+:103AF0007595679521C081FF06C06091110170E046
+:103B00007595679519C082FF04C06091110170E03E
+:103B100010C09091D6019923C1F0609110019617C1
+:103B2000A0F780911101899FC001112470E00E94CB
+:103B300004236038710528F46115710521F0862F82
+:103B400008958FE7089581E0089561E070E0F4CF73
+:103B5000803F21F40E94261D819504C0813F29F4F5
+:103B60000E94261D8093D9010895823F21F40E946E
+:103B7000261D819504C0833F29F40E94261D809351
+:103B8000D8010895893F19F40E946F1D05C08A3F2E
+:103B900031F40E946F1D81958093DA0108958B3F67
+:103BA00021F40E946F1D819504C08C3F29F40E946E
+:103BB0006F1D8093DB010895843F21F48091D7012C
+:103BC000816017C0853F21F48091D701826011C0C8
+:103BD000863F21F48091D70184600BC0873F21F498
+:103BE0008091D701886005C0883F31F48091D7016A
+:103BF00080618093D70108958D3F21F48091D50194
+:103C000081600BC08E3F21F48091D501826005C098
+:103C10008F3F29F48091D50184608093D501089568
+:103C2000803F39F48091D90187FF6CC01092D9018F
+:103C300069C0813F29F48091D9011816BCF362C094
+:103C40009091D801823F29F497FF5CC01092D8016F
+:103C500059C0833F19F41916CCF354C0893F41F47D
+:103C60008091DA0118160CF04DC01092DA014AC0AA
+:103C70008A3F29F48091DA0187FF44C0F6CF8B3F59
+:103C800039F48091DB0187FF3DC01092DB013AC01F
+:103C90008C3F29F48091DB011816BCF333C0843FBC
+:103CA00021F48091D7018E7F17C0853F21F4809148
+:103CB000D7018D7F11C0863F21F48091D7018B7F82
+:103CC0000BC0873F21F48091D701877F05C0883FD3
+:103CD00031F48091D7018F7E8093D70113C08D3F3F
+:103CE00021F48091D5018E7F0BC08E3F21F480910D
+:103CF000D5018D7F05C08F3F29F48091D5018B7F41
+:103D00008093D5018091D80181110EC08091D90195
+:103D100081110AC08091DA01811106C08091DB0116
+:103D2000811102C01092D601089587ED91E00E94A2
+:103D3000A60E0E94FC1A9093D4018093D30108959B
+:103D40001F93CF93DF938091D3019091D4010E9470
+:103D5000081BAC019091D601992321F02091140108
+:103D600030E006C0209115018AE0289F90011124BF
+:103D70004217530708F486C08091D801C091D90139
+:103D8000D091DA011091DB01811107C0C11176C019
+:103D9000D11174C0111172C075C09F3F19F09F5F9F
+:103DA0009093D601181624F40E94261D8093D80102
+:103DB0008091D80187FF05C00E94261D81958093C0
+:103DC000D8011C1624F40E94261D8093D9018091ED
+:103DD000D90187FF05C00E94261D81958093D901D6
+:103DE0006091D801662339F1C091D901CC2319F132
+:103DF000772767FD7095872F972F0E94152223E361
+:103E000033E343E35FE30E9479220E94E22160935F
+:103E1000D8016C2F772767FD7095872F972F0E9409
+:103E2000152223E333E343E35FE30E9479220E94F8
+:103E3000E2216093D9011D1624F40E946F1D809326
+:103E4000DA018091DA0187FF05C00E946F1D81951C
+:103E50008093DA01111624F40E946F1D8093DB0118
+:103E60008091DB0187FF05C00E946F1D81958093C3
+:103E7000DB01DF91CF911F910C94951E9F3F09F0BC
+:103E80008ECF96CFDF91CF911F910895E7EDF1E0AE
+:103E900085E0DF011D928A95E9F71092D601109214
+:103EA000D5010895833081F128F4813059F08230B2
+:103EB000D1F00895853009F449C0B8F1863009F48D
+:103EC00056C0089580911501262F30E0280F311D2E
+:103ED0002F3F310524F4680F6093150108958FEF8B
+:103EE00080931501089580911401262F30E0280F4A
+:103EF000311D2F3F310524F4680F6093140108959C
+:103F00008FEF80931401089580911301262F30E0E4
+:103F1000280F311D2F3F310524F4680F60931301E2
+:103F200008958FEF80931301089580911201262F39
+:103F300030E0280F311D2F3F310524F4680F6093C6
+:103F4000120108958FEF809312010895809111015D
+:103F5000262F30E0280F311D2F3F310524F4680F44
+:103F60006093110108958FEF80931101089580915E
+:103F70001001262F30E0280F311D2F3F310524F48A
+:103F8000680F6093100108958FEF809310010895DA
+:103F9000833011F128F4813049F0823091F0089596
+:103FA000853081F120F18630C1F1089580911501AD
+:103FB000681720F4861B809315010895109215014F
+:103FC000089580911401681720F4861B80931401D2
+:103FD000089510921401089580911301681720F438
+:103FE000861B809313010895109213010895809108
+:103FF0001201681720F4861B809312010895109215
+:104000001201089580911101681720F4861B809396
+:1040100011010895109211010895809110016817FF
+:1040200020F4861B809310010895109210010895CA
+:104030000F931F938D3109F46BC008F03FC08E3091
+:1040400009F47FC0C0F4873009F469C068F4863091
+:1040500009F0B1C08091CD01817F8E7F8093CD0129
+:1040600081E08093DD01A8C0883009F4A2C08B30C4
+:1040700009F49FC0A0C0863109F49BC078F4803158
+:1040800009F472C0813109F096C00E941F1490910A
+:104090000D0181E0892780930D018BC0893109F4DE
+:1040A00088C08B3109F087C08091CD0181FB222728
+:1040B00020F991E0922790FB81F94CC0853309F4F7
+:1040C00070C048F4873209F46CC008F459C08932D2
+:1040D00009F467C070C0833438F48A3308F04EC0E6
+:1040E000883309F466C067C0833409F45AC0883441
+:1040F00009F061C00E941F140FEF13ED20E301507F
+:1041000010402040E1F700C000000E94571B51C042
+:104110000E949C210E948F0E0E9488074AC09091A5
+:10412000CD01892F8095817080FB90F929F09660F0
+:1041300098609093CD0140C0997F977F9093CD0177
+:1041400038C08091CD0182FB222720F991E092278F
+:1041500090FB82F98093CD01992359F18091CD0193
+:1041600081608093CD0125C08091CD0183FB222702
+:1041700020F991E0922790FB83F9ECCF895301C09D
+:104180008D5141E050E060E070E08A019B0104C085
+:10419000000F111F221F331F8A95D2F7C901B801E2
+:1041A00004C061E070E080E090E00E94DB170E94B4
+:1041B0001F1481E001C080E01F910F91089580E0FD
+:1041C000089580E00895CF93C82F8091DD0181305C
+:1041D00079F018F08230E9F187C0E0910E01F0919A
+:1041E0000F018081813169F0823209F07FC009C0FE
+:1041F000E0910E01F0910F018081813111F0823246
+:1042000061F48C2F0E94DF20811104C08C2F0E944A
+:1042100018201DC081E090E01AC08C2F0E94E12080
+:10422000811114C0C43179F048F4CB3079F0C03139
+:1042300009F060C082E08093DD0108C0C93219F046
+:10424000C83321F057C01092DD0154C081E0817065
+:1042500053C0C93289F118F5C43171F1A8F4C730DF
+:1042600009F046C08AE08093150194E1909314010F
+:1042700093E0909313018093120188E080931101E1
+:1042800088E28093100134C0CE51C63088F5EC2FFF
+:10429000F0E0E65DFE4F80818093DC0129C0CE34E2
+:1042A000E9F020F4CB3421F56AE013C0C13579F090
+:1042B000C235F1F461E00DC08091DC01882319F072
+:1042C0001092DC0115C081E08093DD0115C061E032
+:1042D00006C08091DC010E94521F0AC06AE08091F2
+:1042E000DC010E94C81F04C01092DD0180E004C000
+:1042F00081E002C080E0ABCFCF910895E1E8F0E02B
+:104300008081886080838081816080838FB7F8940A
+:1043100093E09093890090ED909388008FBF08956B
+:10432000EFE6F0E08081826080830895EFE6F0E0C0
+:1043300080818D7F80830895EFE6F0E0908182E0B8
+:104340008927808308951F920F920FB60F92112430
+:104350002F933F934F935F936F937F938F939F938D
+:10436000AF93BF93EF93FF938091DE019091DF01B4
+:1043700001969093DF018093DE01811103C082E0FA
+:104380000E948807E091DF01E695E695F0E0E252B1
+:10439000FC4FE4918091DE018E1303C080E00E9407
+:1043A0008807FF91EF91BF91AF919F918F917F917E
+:1043B0006F915F914F913F912F910F900FBE0F9092
+:1043C0001F90189504D06894B1118DC0089570D0D5
+:1043D00088F09F5790F0B92F9927B751A0F0D1F0EE
+:1043E000660F771F881F991F1AF0BA95C9F712C078
+:1043F000B13081F077D0B1E0089574C0672F782F85
+:104400008827B85F39F0B93FCCF3869577956795E3
+:10441000B395D9F73EF490958095709561957F4F4F
+:104420008F4F9F4F0895E89409C097FB3EF49095F5
+:104430008095709561957F4F8F4F9F4F9923A9F07D
+:10444000F92F96E9BB279395F6958795779567950C
+:10445000B795F111F8CFFAF4BB0F11F460FF1BC050
+:104460006F5F7F4F8F4F9F4F16C0882311F096E9E3
+:1044700011C0772321F09EE8872F762F05C0662391
+:1044800071F096E8862F70E060E02AF09A95660F4A
+:10449000771F881FDAF7880F9695879597F9089503
+:1044A00057FD9058440F551F59F05F3F71F04795E5
+:1044B000880F97FB991F61F09F3F79F087950895CA
+:1044C000121613061406551FF2CF4695F1DF08C0E9
+:1044D000161617061806991FF1CF86957105610506
+:1044E00008940895E894BB2766277727CB0197F9AE
+:1044F00008950BD078C069D028F06ED018F09523BD
+:1045000009F05AC05FC01124EECFCADFA0F3959F17
+:10451000D1F3950F50E0551F629FF001729FBB27AA
+:10452000F00DB11D639FAA27F00DB11DAA1F649F56
+:104530006627B00DA11D661F829F2227B00DA11D09
+:10454000621F739FB00DA11D621F839FA00D611D8F
+:10455000221F749F3327A00D611D231F849F600DB0
+:10456000211D822F762F6A2F11249F5750408AF0E9
+:10457000E1F088234AF0EE0FFF1FBB1F661F771F75
+:10458000881F91505040A9F79E3F510570F014C00C
+:10459000AACF5F3FECF3983EDCF38695779567955D
+:1045A000B795F795E7959F5FC1F7FE2B880F911D93
+:1045B0009695879597F9089597F99F6780E870E039
+:1045C00060E008959FEF80EC089500240A94161689
+:1045D000170618060906089500240A9412161306F1
+:1045E000140605060895092E0394000C11F488237F
+:1045F00052F0BB0F40F4BF2B11F460FF04C06F5F9B
+:104600007F4F8F4F9F4F089597FB072E16F400940E
+:1046100007D077FD09D00E941E2307FC05D03EF489
+:10462000909581959F4F0895709561957F4F08955E
+:10463000EE0FFF1F0590F491E02D0994AA1BBB1B00
+:1046400051E107C0AA1FBB1FA617B70710F0A61B92
+:10465000B70B881F991F5A95A9F780959095BC01B3
+:10466000CD010895F999FECF92BD81BDF89A9927A1
+:1046700080B50895A8E1B0E042E050E00C945A23E0
+:10468000262FF999FECF92BD81BDF89A019700B40B
+:10469000021639F01FBA20BD0FB6F894FA9AF99AAB
+:1046A0000FBE08950196272F0E9441230C944023AA
+:1046B000DC01CB01FC01F999FECF06C0F2BDE1BDE2
+:1046C000F89A319600B40D9241505040B8F70895D1
+:0446D000F894FFCF8C
+:1046D40020028A071808F507C1078D070101BA01EE
+:1046E40028080A03140A3F4D36399F0352031C035A
+:1046F400E30276028F02A802C10201020304050646
+:044704000708090099
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png Binary files differnew file mode 100644 index 0000000000..34762ecb75 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png diff --git a/keyboard/ergodox_ez/keymaps/sneako/README.md b/keyboard/ergodox_ez/keymaps/sneako/README.md new file mode 100644 index 0000000000..8dd110ee68 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/sneako/README.md @@ -0,0 +1,6 @@ +# ergodox_keymap + +Based on the default Ergodox EZ firmware + +Replaced the left side Bksp with a Crtl/Esc, this really helps in vim. +Removed the Ctrls from the Z and / keys. diff --git a/keyboard/ergodox_ez/keymaps/sneako/keymap.c b/keyboard/ergodox_ez/keymaps/sneako/keymap.c new file mode 100644 index 0000000000..0c68631029 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/sneako/keymap.c @@ -0,0 +1,187 @@ +// Based on `default_osx` +// Replace left Bksp with Ctrl/Esc +// Remove the Ctrl from Z and / +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define MDIA 2 // media keys + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * |Ctrl/Esc| A | S | D | F | G |------| |------| H | J | K | L |; / L2| LGui | + * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| + * | LShift | Z | X | C | V | B | | | | N | M | , | . | / | RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | App | LGui | | Alt |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * | Space|Backsp|------| |------| Tab |Enter | + * | |ace | End | | PgDn | | | + * `--------------------' `----------------------' + */ +// 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_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, + KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), + CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), + LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT, + ALT_T(KC_APP), KC_LGUI, + KC_HOME, + KC_SPC,KC_BSPC,KC_END, + // right hand + KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), + MEH_T(KC_NO),KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, + KC_LALT, CTL_T(KC_ESC), + KC_PGUP, + KC_PGDN,KC_TAB, KC_ENT + ), +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | . | 0 | = | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP( + // left hand + KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS, + KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, + KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,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_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS, + KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS +), +/* Keymap 2: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + // right hand + 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_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + KC_TRNS, KC_TRNS, KC_WBAK +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +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) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; + +// 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); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + 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; + default: + // none + break; + } + +}; diff --git a/keyboard/ergodox_ez/keymaps/sneako/sneako.hex b/keyboard/ergodox_ez/keymaps/sneako/sneako.hex new file mode 100644 index 0000000000..1db1728652 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/sneako/sneako.hex @@ -0,0 +1,1152 @@ +:100000000C9465020C94A9020C94A9020C94A90208
+:100010000C94A9020C94A9020C94A9020C94A902B4
+:100020000C94A9020C94A9020C94720C0C94440D2B
+:100030000C94A9020C94A9020C94A9020C94A90294
+:100040000C94A9020C940E220C94A9020C94A902FF
+:100050000C94A9020C949D1B0C94A9020C94A90267
+:100060000C94A9020C94A9020C94A9020C94A90264
+:100070000C94A9020C94A9020C94A9020C94A90254
+:100080000C94A9020C94A9020C94A9020C94A90244
+:100090000C94A9020C94A9020C94A9020C94A90234
+:1000A0000C94A9020C94A9020C94A902B10DD30DD1
+:1000B000C10ED30DC10E180E3B0EC10E900EA30E35
+:1000C0008F118F11CC11CC110F124D1266146614C2
+:1000D00066126614671367133A1466146614511493
+:1000E0000000F0A12E004C002971E10035810000D4
+:1000F0001E00140004001D0034004D001F001A00F3
+:1001000016001B00E1042A0020000800070006007A
+:1001100050002C0021001500090019004F004A0072
+:10012000220017000A000500000065745000015409
+:100130000000007F0000E3004F0001540000007742
+:100140000000E20023001C000B00110000002971D8
+:10015000240018000D00100052004B0025000C0078
+:100160000E00360051002800260012000F00370054
+:100170002F002B00270013003382380030004E0080
+:100180002D0031003478E500C100000001000100BD
+:1001900001000100010000003A001E0220022202BC
+:1001A000010001003B001F022102230201000100A7
+:1001B0003C002F0226022F00010001003D0030020A
+:1001C00027023000010001003E00310235003502F7
+:1001D000000001000100010000000100000001001A
+:1001E0000100010000000100000001003F0052007A
+:1001F00051002402000001004000240021001E00E4
+:10020000010001004100250022001F00370001000D
+:1002100042002600230020002700010043002502A1
+:100220002E0231002E0001004400450001000100B3
+:1002300001000000010001000100010001000000B8
+:1002400001000100010001000100010001000100A6
+:10025000F2000100010001000100F000F1000100C6
+:10026000F400010001000100F3000100F5000100AD
+:100270000100010001000100000001000100010077
+:100280000000010000000100010001000000010069
+:100290000000010001000100010001000000010058
+:1002A0000100010001000100A9000100010001009E
+:1002B0000100AC00AA00B600010001000100AB0083
+:1002C000A80001000100010001000100010001007F
+:1002D00001000100AE00010001000000160345000E
+:1002E000720067006F0044006F0078002000450036
+:1002F0005A00000016034500720067006F004400BA
+:100300006F007800200045005A0000000403090433
+:1003100009026D00040100A0FA09040000010301B4
+:100320000100092111010001223F00070581030896
+:10033000000A090401000103010200092111010062
+:1003400001224D000705820308000A09040200018A
+:100350000300000009211101000122360007058376
+:100360000308000A09040300010300000009211129
+:100370000100012239000705840310000112011059
+:100380000100000008EDFE07130100010200010555
+:10039000010906A101050719E029E71500250195C6
+:1003A0000875018102050819012905950575019156
+:1003B000029501750391010507190029771500259C
+:1003C00001957875018102C005010980A1018502AE
+:1003D00016010026B7001A01002AB7007510950112
+:1003E0008100C0050C0901A1018503160100269CAE
+:1003F000021A01002A9C02751095018100C00501B6
+:100400000902A1010901A100050919012905150029
+:10041000250195057501810295017503810105018D
+:10042000093009311581257F950275088106093843
+:100430001581257F950175088106050C0A3802157E
+:1004400081257F950175088106C0C005010906A1B7
+:1004500001050719E029E7150025019508750181B7
+:100460000295017508810105081901290595057591
+:100470000191029501750391010507190029FF15E6
+:100480000025FF950675088100C0000000000000EF
+:100490000000000000010204060A0F17202C3A4A4F
+:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2
+:1004B000B39D87715D4A3A2C20170F0A060402018A
+:1004C0000000000000000000000011241FBECFEF5C
+:1004D000DAE0DEBFCDBF04B603FE24C08091EE019A
+:1004E0009091EF01A091F001B091F1018730904B14
+:1004F000A740B04BB9F41092EE011092EF011092A8
+:10050000F0011092F10114BE84B7877F84BF88E1A7
+:100510000FB6F89480936000109260000FBEE0E088
+:10052000FFE3099511E0A0E0B1E0EAEAF7E402C0D8
+:1005300005900D92A433B107D9F711E0A4E3B1E01F
+:1005400001C01D92AE3EB107E1F70E94B6090C94BE
+:10055000D3230C94000061110BC0FC01828188231D
+:1005600021F085EE0E94231003C085EE0E94EB105F
+:1005700080E090E0089508956091B1017091B2011A
+:100580008091B3019091B4010E94C91A56985E9867
+:1005900025982D9826982E9827982F98813019F015
+:1005A000823021F00895259A2D9A0895269A2E9A40
+:1005B00008950C94BC0256985E9825982D9826981C
+:1005C0002E9827982F988FEF90E090938900809332
+:1005D000880090938B0080938A0090938D00809385
+:1005E0008C00259A2D9A2FEF80E792E021508040D1
+:1005F0009040E1F700C00000269A2E9A2FEF80E786
+:1006000092E0215080409040E1F700C00000279A1E
+:100610002F9A2FEF80E792E0215080409040E1F741
+:1006200000C0000025982D982FEF80E792E0215020
+:1006300080409040E1F700C0000026982E982FEFF0
+:1006400080E792E0215080409040E1F700C0000038
+:1006500027982F9856985E9825982D9826982E982A
+:1006600027982F98089589EA8093800089E08093E5
+:10067000810024982C983F988AB18F748AB96E981B
+:10068000479A8BB1806B8BB9769A0E94DB020C94EF
+:10069000BB0280E2809300018091340181110EC081
+:1006A0000E94980381E0809334012FEF83ED90E363
+:1006B000215080409040E1F700C0000080E40E949B
+:1006C0009E038093000181112EC00E94C803809375
+:1006D0000001811128C00E94C8038093000181118C
+:1006E00022C08FE30E94C8038093000181111BC0C8
+:1006F0000E94C00380E40E949E0380930001811148
+:1007000012C08CE00E94C8038093000181110BC0CD
+:100710000E94C80380930001811105C08FE30E94ED
+:10072000C803809300010E94C003809100010895D6
+:100730001092B9008AE08093B800089594EA9093EB
+:10074000BC009091BC0097FFFCCF9091B900987FBE
+:10075000983021F0903111F081E008958093BB0032
+:1007600084E88093BC008091BC0087FFFCCF80911F
+:10077000B900887F883111F0803471F780E00895E6
+:1007800084E98093BC008091BC0084FDFCCF089577
+:100790008093BB0084E88093BC008091BC0087FFFD
+:1007A000FCCF9091B900987F81E0983209F480E005
+:1007B000089584E88093BC008091BC0087FFFCCF43
+:1007C0008091BB00089580910001811115C080E4E3
+:1007D0000E949E038093000181110CC082E10E945F
+:1007E000C80380930001811105C08FEF0E94C803E8
+:1007F000809300010E94C00384B1807F84B985B1D9
+:10080000807F85B98AB1837F8AB98BB1837F8BB9A9
+:100810003E98469808950E944903809300010E94E3
+:10082000E30380B38C7080BB81B3836F81BBA6E38D
+:10083000B1E0E4E4F1E08EE08E0F11921D928E1390
+:10084000FCCF0C943303BF92CF92DF92EF92FF92D2
+:100850000F931F93CF93DF9380910001882379F04A
+:10086000809135018F5F80933501811108C00E940E
+:10087000490380930001811102C00E94DB0206E35C
+:1008800011E0C0E0D0E0DD24D39482E0C82EEE2455
+:10089000E394F12CC730D10500F58091000181115E
+:1008A00064C080E40E949E0380930001811112C005
+:1008B00082E10E94C8038093000181110BC0C7012F
+:1008C0000C2E01C0880F0A94EAF780950E94C80395
+:1008D000809300010E94C00348C0CA30A1F028F4F0
+:1008E000C83059F0C93061F005C0CC3089F070F0E3
+:1008F000CD3089F0209A289810C0219A29980DC0EF
+:10090000229A2A980AC0239A2B9807C0529A01C0AB
+:10091000539A5B9802C03E9A469890EA9A95F1F7EE
+:100920009FB1799902C082E001C080E091709D255D
+:10093000982B7C9902C084E001C080E0892B7D99CE
+:1009400002C038E001C030E0832B7E9902C020E174
+:1009500001C020E0822B9FB19095991F9927991F84
+:100960009295990F907E892B0FC080910001811183
+:1009700049C080E40E949E0380930001882379F19E
+:10098000B12C0E94C0038B2DF8019081981719F0AB
+:100990008083C09201010E94E30321960F5F1F4FE5
+:1009A000CE30D10509F076CF80910101882361F125
+:1009B000815080930101882339F08FE99FE00197EE
+:1009C000F1F700C0000020C0A4E4B1E0E6E3F1E0EC
+:1009D000CF01825F91919D938E13FCCF15C083E16F
+:1009E0000E94C803809300018111CACF81E40E9454
+:1009F0009E03809300018111C3CF0E94D903B82EBA
+:100A0000B094BFCF80E0C0CF0E94D90281E0DF91D7
+:100A1000CF911F910F91FF90EF90DF90CF90BF90FB
+:100A20000895E82FF0E0EC5BFE4F80810895089573
+:100A3000089596E0799FF001112494E5899FE00DD7
+:100A4000F11D1124E60FF11DEE0FFF1FEC51FF4FBA
+:100A5000859194910895880F991FFC01E05AF04008
+:100A6000859194910895880F991FFC01E052FF4FE2
+:100A70008591949108950F931F93CF93DF93EC0189
+:100A80008115904350F5C11580E2D80708F0B3C036
+:100A9000CB3BD10590F4C83AD10508F05AC0C53A0D
+:100AA000D10508F04BC0C430D10508F0BBC1219777
+:100AB00009F0B5C101E010E0F5C1CF3FD10511F05B
+:100AC00008F0B0C1C03FD10508F092C0CE01805EF1
+:100AD0009109089708F4A6C1A2C1C11591E5D907EB
+:100AE000A8F4C23020E5D20708F09EC0C11580E509
+:100AF000D80709F485C008F091C0C11520E4D207D9
+:100B000008F08DC1DD278E01106CCCC1C11580E8C5
+:100B1000D80758F4C11590E7D90708F07CC1C11572
+:100B200020E6D20708F422C17AC1C11580E9D807AE
+:100B300008F075C1DF708E01106AB4C1C53AD105E5
+:100B400009F472C1C63AD10509F071C102E810E496
+:100B5000A9C1C83AD10509F46DC1C93AD10509F452
+:100B60006CC1CA3AD10509F46BC1CB3AD10509F47D
+:100B70006AC1CC3AD10509F469C1CD3AD10509F46D
+:100B800068C1C03BD10509F467C1CE3AD10509F46B
+:100B900066C1CF3AD10509F465C1C13BD10509F45D
+:100BA00064C1C23BD10509F463C1C33BD10509F45B
+:100BB00062C1C43BD10509F461C1C53BD10509F44B
+:100BC00060C1C63BD10509F45FC1C73BD10509F43B
+:100BD0005EC1C83BD10509F45DC1C93BD10509F42B
+:100BE0005CC1CA3BD10509F45BC100E014E45AC101
+:100BF0008E01106557C1CE019F700E94330553C10D
+:100C00000E948A149FEF24E38CE0915020408040A2
+:100C1000E1F700C000000E94C21B44C18091CD01D9
+:100C200081608093CD013EC10E946B1D811102C085
+:100C30000E94511D0E94881D90E09093EE018093C8
+:100C4000ED01C23090E5D90721F48091ED0181607A
+:100C500086C0C43020E5D20721F48091ED01826086
+:100C60007EC0C63080E5D80721F48091ED01846014
+:100C700076C0C83090E5D90719F48091ED0127C0FE
+:100C8000CA3020E5D20721F48091ED01806167C070
+:100C9000CC3080E5D80721F48091ED0180625FC0FF
+:100CA000CE3090E5D90721F48091ED01806457C0E2
+:100CB000C03120E5D20721F48091ED0180684FC05A
+:100CC000C23180E5D80729F48091ED018460886005
+:100CD00046C0C33090E5D90721F48091ED018E7FA5
+:100CE0003EC0C53020E5D20721F48091ED018D7F13
+:100CF00036C0C73080E5D80721F48091ED018B7FA5
+:100D00002EC0C93090E5D90719F48091ED0126C0B5
+:100D1000CB3020E5D20721F48091ED018F7E1FC0FA
+:100D2000CD3080E5D80721F48091ED018F7D17C08B
+:100D3000CF3090E5D90721F48091ED018F7B0FC072
+:100D4000C13120E5D20721F48091ED018F7707C0F2
+:100D5000C331D04531F48091ED018B7F877F809343
+:100D6000ED018091ED010E948C1D9CC08D2F992773
+:100D70008F70992781309105D9F49E012370332714
+:100D800002C0880F991F2A95E2F79C688E0144E003
+:100D9000000F111F4A95E1F700271370802B912B4C
+:100DA00053E0CC0FDD1F5A95E1F7C076DD272FC049
+:100DB0008230910531F4DC2FCC278E01016F106A4F
+:100DC00071C08330910569F4CE018370992701E0E9
+:100DD00010E002C0000F111F8A95E2F7C8019C685D
+:100DE0000FC0049709F05EC0CE018370992701E01F
+:100DF00010E002C0000F111F8A95E2F7C8019A683F
+:100E000023E0CC0FDD1F2A95E1F7C07ED7708C015F
+:100E10000C2B1D2B47C0DF708E01106243C000E019
+:100E200010E040C08E013EC001E810E43BC003E882
+:100E300010E438C002EE14E435C009EE14E432C008
+:100E40000AEE14E42FC005EB14E42CC006EB14E406
+:100E500029C007EB14E426C00CEC14E423C00DEC0D
+:100E600014E420C003E815E41DC00AE815E41AC024
+:100E700002E915E417C004E915E414C001E216E420
+:100E800011C003E216E40EC004E216E40BC005E252
+:100E900016E408C006E216E405C007E216E402C044
+:100EA0000AE216E4C801DF91CF911F910F910895D6
+:100EB00096E0799FF001112494E5899FE00DF11DE2
+:100EC0001124E60FF11DEE0FFF1FEC51FF4F85912E
+:100ED0009491803E9105E0F4803C910558F5813372
+:100EE000910509F46FC048F48932910509F463C093
+:100EF0008A32910509F46DC072C089339105E9F019
+:100F000082389105D1F08533910509F44DC067C051
+:100F1000833E910581F138F4803E9105B9F0823E1F
+:100F20009105D9F05CC0863E910561F1873E91053F
+:100F3000A1F155C00E942B0508952091ED0120FDDF
+:100F400002C021FF4CC080EE90E049C08091ED01CD
+:100F500080FFF9CF89E390E042C08091ED0182FFEC
+:100F60000EC08091ED0184FF03C080E090E037C0A7
+:100F700083EE90E034C08091ED0182FFF2CF82EEEB
+:100F800090E02DC08091ED0183FF0BC08091ED01B9
+:100F900084FDEBCF87EE90E022C08091ED0183FFCE
+:100FA000F5CF86EE90E01BC08091ED0185FF07C074
+:100FB00089E290E014C08091ED0185FFF9CF85E3CF
+:100FC00090E00DC08091ED0186FF07C08AE290E0BD
+:100FD00006C08091ED0186FFF9CF81E390E00E9489
+:100FE0003B05089508950C94F207809162010895DD
+:100FF000CF93DF9300D01F92CDB7DEB79C018091D5
+:10100000E401843019F593E099833B832A8390931C
+:10101000E9008FEF9091E800815095FD06C095EDB5
+:101020009A95F1F700008111F5CF8091E80085FFD6
+:101030000DC040E050E063E070E0CE0101960E94F8
+:10104000620A8091E8008E778093E8000F900F90FD
+:101050000F90DF91CF910895CF93DF9300D01F922F
+:10106000CDB7DEB72091E401243021F522E02983B9
+:101070009B838A8383E08093E9008FEF9091E8005F
+:10108000815095FD06C095ED9A95F1F7000081110C
+:10109000F5CF8091E80085FF0DC040E050E063E0AF
+:1010A00070E0CE0101960E94620A8091E8008E777E
+:1010B0008093E8000F900F900F90DF91CF910895EB
+:1010C0002091E4012430F1F422E02093E9002FEF95
+:1010D0003091E800215035FD06C035ED3A95F1F725
+:1010E00000002111F5CF2091E80025FF0BC040E062
+:1010F00050E065E070E00E94620A8091E8008E771F
+:101100008093E8000895CF93DF93EC019091E40180
+:10111000943009F046C080910C018823D9F0809169
+:101120000D018823B9F09093E9008FEF9091E800CA
+:10113000815095FD06C095E19A95F1F70000811167
+:10114000F5CF8091E80085FF2CC040E050E060E1E1
+:1011500070E017C081E08093E9008FEF9091E80084
+:10116000815095FD06C095ED9A95F1F7000081112B
+:10117000F5CF8091E80085FF14C040E050E068E0C2
+:1011800070E0CE010E94620A8091E8008E77809321
+:10119000E80080E1FE01A2E5B1E001900D928A95A0
+:1011A000E1F7DF91CF9108958091E301811109C0AA
+:1011B0000E94F70B0E94540C8091E200846080939F
+:1011C000E20008951092E301089508950C94FB2124
+:1011D0000E94581B0E9401220E94FA0E0C94F307F1
+:1011E00042E061EC81E00E94710B42E061EC82E040
+:1011F0000E94710B42E061EC83E00E94710B42E1BE
+:1012000061EC84E00C94710B8091E601833009F469
+:1012100055C030F4813071F0823009F48EC00895E9
+:101220008A3009F47AC08B3009F460C0893009F043
+:101230009CC020C08091E501813A09F096C0809160
+:10124000E800877F8093E8008091E9019091EA01AE
+:10125000892B21F460E182E591E003C060E080E049
+:1012600090E070E00E94AD0A8091E8008B77809357
+:10127000E80008958091E501813209F076C08091FF
+:10128000E9019091EA01009719F0039709F06DC008
+:101290008091E800877F8093E8008091E80082FDDC
+:1012A00005C08091E4018111F8CF5FC08091F10009
+:1012B000809362018091E8008B7753C08091E501B3
+:1012C000813A09F052C08091E9019091EA01892B9D
+:1012D00009F04BC08091E800877F8093E8008091FF
+:1012E000E80080FFFCCF80910C0136C08091E501C1
+:1012F0008132D9F58091E9019091EA01892BA9F514
+:101300008091E800877F8093E8000E94A60B80917F
+:10131000E70180930C010C948A148091E5018132DD
+:1013200021F58091E800877F8093E8000E94A60B5A
+:101330008091E8018093630108958091E501813AED
+:10134000A1F48091E800877F8093E8008091E80015
+:1013500080FFFCCF809163018093F1008091E800D1
+:101360008E778093E8000C94A60B089584B7877F4E
+:1013700084BF88E10FB6F8948093600010926000FB
+:101380000FBE90E080E80FB6F894809361009093D0
+:1013900061000FBE0E94490F0E94F70B0E94540C7F
+:1013A0008091E20084608093E20078940E94DA0EDB
+:1013B0000E944B0F82E091E00E94F50E0E94E9210D
+:1013C0008091E401853069F40E94191B8091E2014B
+:1013D0008823B1F30E94441B882391F30E944C0A96
+:1013E000EFCF0E94510FECCF292F33272330310547
+:1013F000C9F064F42130310581F02230310509F063
+:1014000043C08DE690E020E133E042C02132310557
+:10141000F1F02232310541F137C082E190E02DE751
+:1014200033E036C099278130910541F08230910533
+:1014300041F0892B49F5ECE0F3E005C0E4EFF2E080
+:1014400002C0ECEDF2E0849190E09F0121C0643095
+:10145000D8F4E62FF0E0EE0FFF1FEE5DFE4F208187
+:10146000318189E090E014C0643070F470E0FB01D9
+:10147000EE0FFF1FE65EFE4F20813181FB01EA5E29
+:10148000FE4F808190E004C080E090E020E030E0FA
+:10149000FA0131832083089580E189BD82E189BD0D
+:1014A00009B400FEFDCF8091D8008F7D8093D800D5
+:1014B0008091E00082608093E0008091E00081FDF7
+:1014C000FCCF0895CF92DF92EF92FF920F931F937C
+:1014D000CF93DF93EC018B016A010E94C50B811150
+:1014E00033C0C114D10439F0F60180819181081B09
+:1014F000190BC80FD91FE12CF12C0115110519F199
+:101500008091E80085FD16C08091E8008E77809379
+:10151000E800C114D10449F0F60180819181E80E00
+:10152000F91EF182E08285E00FC00E94C50B88237E
+:1015300021F30AC089918093F10001501109FFEF56
+:10154000EF1AFF0ADACF80E0DF91CF911F910F9160
+:10155000FF90EF90DF90CF9008952091EB013091B4
+:10156000EC012617370748F06115710539F4209111
+:10157000E8002E772093E80001C0B90140E0611532
+:101580007105A9F12091E401222309F443C025301B
+:1015900009F442C02091E80023FD40C02091E800FA
+:1015A00022FD32C02091E80020FFE9CF4091F300F6
+:1015B0002091F20030E0342BFC01CF016115710560
+:1015C00059F02830310540F481918093F100615049
+:1015D00071092F5F3F4FF1CF41E02830310509F00D
+:1015E00040E02091E8002E772093E800C8CF411119
+:1015F000C9CF0AC08091E401882361F0853061F091
+:101600008091E80083FD0AC08091E80082FFF2CF5C
+:1016100080E0089582E0089583E0089581E00895D0
+:101620002091EB013091EC012617370748F0611546
+:10163000710539F42091E8002E772093E80001C06D
+:10164000B901FC0120E06115710591F18091E4017F
+:10165000882309F440C0853009F43FC08091E80038
+:1016600083FD3DC08091E80082FD2FC08091E8009D
+:1016700080FFE9CF2091F3008091F20090E0922B5F
+:101680006115710559F08830910540F4249120933B
+:10169000F1003196615071090196F2CF21E008976F
+:1016A00009F020E08091E8008E778093E800CBCFAE
+:1016B0002111CCCF0AC08091E401882361F08530EC
+:1016C00061F08091E80083FD0AC08091E80082FF0C
+:1016D000F2CF80E0089582E0089583E0089581E0EC
+:1016E0000895982F973058F59093E900981739F09E
+:1016F0007091EC002091ED005091F00003C0242F78
+:10170000762F50E021FF19C03091EB003E7F3093DF
+:10171000EB003091ED003D7F3093ED003091EB0018
+:1017200031603093EB007093EC002093ED00509308
+:10173000F0002091EE0027FF07C09F5FD3CF8F708E
+:101740008093E90081E0089580E008958091E501AB
+:1017500087FF11C08091E80082FD05C08091E401FF
+:101760008111F8CF11C08091E8008B770BC0809178
+:10177000E401882349F08091E80080FFF8CF809150
+:10178000E8008E778093E80008952091E40030917E
+:10179000E50095E64091EC00842F817040FF22C067
+:1017A0008091E80080FD1CC08091E401882391F0C5
+:1017B000853091F08091EB0085FD10C04091E400F0
+:1017C0005091E5004217530729F39A01915011F700
+:1017D00084E0089582E0089583E0089581E008950B
+:1017E00080E008954091E80042FFDECF08950E9416
+:1017F000650C0E946D0CE0EEF0E0808181608083DA
+:10180000E8EDF0E080818F77808319BCA7EDB0E030
+:101810008C918E7F8C9380818F7E80831092E301E8
+:1018200008950F931F93CF93DF930E94650C0E943E
+:101830006D0CC8EDD0E088818F77888388818068BF
+:10184000888388818F7D888319BC1092E40110926F
+:10185000E0011092E2011092E10100EE10E0F801C7
+:1018600080818B7F808388818160888342E060E013
+:1018700080E00E94710BE1EEF0E080818E7F80833A
+:10188000E2EEF0E0808181608083808188608083E7
+:10189000F80180818E7F8083888180618883DF91D9
+:1018A000CF911F910F910895E8EDF0E080818F7E38
+:1018B0008083E7EDF0E080818160808384E082BFF7
+:1018C00081E08093E3010C94110CE8EDF0E080815D
+:1018D0008E7F80831092E20008951092DA001092B9
+:1018E000E10008951F920F920FB60F9211242F93CB
+:1018F0003F934F935F936F937F938F939F93AF9398
+:10190000BF93EF93FF938091E10082FF0BC0809122
+:10191000E20082FF07C08091E1008B7F8093E100AD
+:101920000E94D90E8091DA0080FF1FC08091D800FC
+:1019300080FF1BC08091DA008E7F8093DA00809157
+:10194000D90080FF0DC080E189BD82E189BD09B465
+:1019500000FEFDCF81E08093E4010E94D40805C021
+:1019600019BC1092E4010E94E2088091E10080FF1E
+:1019700019C08091E20080FF15C08091E2008E7F47
+:101980008093E2008091E20080618093E200809188
+:10199000D80080628093D80019BC85E08093E40170
+:1019A0000E94E6088091E10084FF30C08091E2004F
+:1019B00084FF2CC080E189BD82E189BD09B400FEAD
+:1019C000FDCF8091D8008F7D8093D8008091E10079
+:1019D0008F7E8093E1008091E2008F7E8093E20011
+:1019E0008091E20081608093E2008091E001882391
+:1019F00011F084E007C08091E30087FD02C081E020
+:101A000001C083E08093E4010E94E8088091E10036
+:101A100083FF29C08091E20083FF25C08091E1000F
+:101A2000877F8093E10082E08093E4011092E001DF
+:101A30008091E1008E7F8093E1008091E2008E7FB3
+:101A40008093E2008091E20080618093E20042E0B6
+:101A500060E080E00E94710B8091F00088608093CC
+:101A6000F0000E94E508FF91EF91BF91AF919F9127
+:101A70008F917F916F915F914F913F912F910F9037
+:101A80000FBE0F901F9018951F920F920FB60F92D6
+:101A900011242F933F934F935F936F937F938F9373
+:101AA0009F93AF93BF93CF93DF93EF93FF93C09137
+:101AB000E900CF708091EC00D82FD17080FDD0E884
+:101AC0001092E9008091F000877F8093F000789475
+:101AD0000E94880D1092E9008091F0008860809348
+:101AE000F000CD2BCF70C093E900FF91EF91DF9113
+:101AF000CF91BF91AF919F918F917F916F915F91A6
+:101B00004F913F912F910F900FBE0F901F901895FE
+:101B10001F93CF93DF93CDB7DEB7AA970FB6F89494
+:101B2000DEBF0FBECDBFE5EEF1E088E08E0F9091F5
+:101B3000F10091938E13FBCF0E9404098091E8007D
+:101B400083FF1FC18091E5019091E601492F50E08C
+:101B50004A30510508F015C1FA01EA5AFF4F0C94BA
+:101B60008323803881F0823809F00BC18091E9012C
+:101B70008F708093E9008091EB0085FB882780F9C6
+:101B80001092E90006C08091E1019091E20191116B
+:101B900082609091E800977F9093E8008093F10035
+:101BA0001092F100C8C0282F2D7F09F0EAC08823C9
+:101BB00019F0823061F0E5C08091E701813009F0D1
+:101BC000E0C0933009F080E08093E2012BC0809167
+:101BD000E701811127C08091E9018F7009F4D1C01C
+:101BE0008093E9002091EB0020FF1CC0933021F48A
+:101BF0008091EB00806214C09091EB009061909313
+:101C0000EB0021E030E0A90102C0440F551F8A9586
+:101C1000E2F74093EA001092EA008091EB008860BE
+:101C20008093EB001092E9008091E800877F86C0E6
+:101C30008111A7C01091E7011F778091E3008078A0
+:101C4000812B8093E3008091E800877F8093E800F8
+:101C50000E94A60B8091E80080FFFCCF8091E300FA
+:101C600080688093E300111102C082E001C083E02C
+:101C70008093E40186C08058823008F082C0809151
+:101C8000E7019091E8018C3D53E0950779F583E0F9
+:101C90008A838AE289834FB7F894DE01139620E0A5
+:101CA0003EE051E2E32FF0E050935700E49120FF33
+:101CB00003C0E295EF703F5FEF708E2F90E0EA3047
+:101CC00010F0C79601C0C0968D939D932F5F24316D
+:101CD00049F74FBF8091E800877F8093E8006AE270
+:101CE00070E0CE0101960E94AD0A14C0AE014F5FB4
+:101CF0005F4F6091E9010E94F409BC01892B09F44E
+:101D000040C09091E800977F9093E80089819A8184
+:101D10000E94100B8091E8008B778093E80031C01F
+:101D2000803879F58091E800877F8093E800809182
+:101D3000E0018093F1008091E8008E778093E800C5
+:101D40000E94A60B1EC081111CC09091E701923029
+:101D5000C0F48091E800877F8093E8009093E001D1
+:101D60000E94A60B8091E001811106C08091E300E2
+:101D700087FD02C081E001C084E08093E4010E94FD
+:101D8000F0088091E80083FF0AC08091E800877F17
+:101D90008093E8008091EB0080628093EB00AA962C
+:101DA0000FB6F894DEBF0FBECDBFDF91CF911F916C
+:101DB00008950895CF938091E4018823A1F0C09104
+:101DC000E900CF709091EC00892F817090FD80E840
+:101DD000C82B1092E9008091E80083FD0E94880DD5
+:101DE000CF70C093E900CF910895909369018093DB
+:101DF00068010895E0916801F0916901309721F040
+:101E00000190F081E02D099480E00895E09168014F
+:101E1000F0916901309721F00280F381E02D09945F
+:101E20000895E0916801F0916901309721F00480F4
+:101E3000F581E02D099408952091660130916701A4
+:101E40008217930771F09093670180936601E09188
+:101E50006801F0916901309721F00680F781E02D4B
+:101E600009940895209164013091650182179307C8
+:101E700071F09093650180936401E0916801F091A5
+:101E80006901309721F00084F185E02D09940895CF
+:101E900008950C94480F0E945E1B0E940B040C9442
+:101EA000241CCF92DF92EF92FF920F931F93CF9358
+:101EB000DF93CDB7DEB72B970FB6F894DEBF0FBE1A
+:101EC000CDBF0E9423048BE6C82E81E0D82E00E00F
+:101ED00010E0E02E802F0E941105F60141916F0164
+:101EE000F42EF826B1F40F5F1F4F0E30110589F75D
+:101EF0008FEF89838A831B820E94671B8160782F02
+:101F00009D838C8349815A816B818D810E94F40F5E
+:101F100040C09091CD0191FF04C08B870E941705AE
+:101F20008B8520E030E04F2D50E0922FBA01022E39
+:101F300002C0759567950A94E2F760FF24C02E836E
+:101F4000EF8221E030E0690102C0CC0CDD1C9A95E3
+:101F5000E2F790E08C219D21892B09F420E028876D
+:101F60000E94671B8160782F9A8789874E815F81E5
+:101F700068858A850E94F40FF801E559FE4F80813B
+:101F8000C826C08206C02F5F3F4F2630310569F654
+:101F9000AACF0E940B1F10916A010E94FA0E181717
+:101FA000A1F00E94FA0E80936A012B960FB6F89466
+:101FB000DEBF0FBECDBFDF91CF911F910F91FF907C
+:101FC000EF90DF90CF900C94F3072B960FB6F89418
+:101FD000DEBF0FBECDBFDF91CF911F910F91FF905C
+:101FE000EF90DF90CF900895CF93DF93CDB7DEB71A
+:101FF0002B970FB6F894DEBF0FBECDBF4F83588727
+:1020000069877A878B87DE01119686E0FD01119240
+:102010008A95E9F785E0FE01379601900D928A9541
+:10202000E1F749815A816B817C818D819E810E947B
+:1020300024172B960FB6F894DEBF0FBECDBFDF91ED
+:10204000CF9108950895CF93882309F4C2C0C82F73
+:10205000823859F40E94FA0E81FDBBC089E30E94C8
+:10206000CD190E949A1A89E30CC0833879F40E9432
+:10207000FA0E80FDAEC083E50E94CD190E949A1A27
+:1020800083E50E940F1ACF910C949A1A843859F460
+:102090000E94FA0E82FD9DC087E40E94CD190E9425
+:1020A0009A1A87E4EECF8CEF8C0F813A48F48C2F8C
+:1020B0000E944E2181118DC08C2F0E94CD19E3CF3B
+:1020C00080E28C0F883048F4C77081E001C0880F2F
+:1020D000CA95EAF70E94531AD6CF8BE58C0F83304E
+:1020E00078F4C53A29F0C63A31F083E890E005C0AB
+:1020F00081E890E002C082E890E0CF910C941C0F40
+:1021000088E58C0F833108F064C0C83A39F1C93AC8
+:1021100041F1CA3A49F1CB3A51F1CC3A59F1CD3AB1
+:1021200061F1C03B69F1CE3A71F1CF3A79F1C13B2F
+:1021300081F1C23B89F1C33B91F1C43B99F1C53BAD
+:10214000A1F1C63BA9F1C73BB1F1C83BB9F1C93B0D
+:10215000C1F1CA3BC9F180E090E038C082EE90E066
+:1021600035C089EE90E032C08AEE90E02FC085EB5A
+:1021700090E02CC086EB90E029C087EB90E026C071
+:102180008CEC90E023C08DEC90E020C083E891E0DF
+:102190001DC08AE891E01AC082E991E017C084E985
+:1021A00091E014C081E292E011C083E292E00EC09F
+:1021B00084E292E00BC085E292E008C086E292E001
+:1021C00005C087E292E002C08AE292E0CF910C94CF
+:1021D000320FCF910895882309F44BC0823859F407
+:1021E0000E94FA0E81FF45C089E30E94CD190E942A
+:1021F0009A1A89E30CC0833871F40E94FA0E80FFAA
+:1022000038C083E50E94CD190E949A1A83E50E9486
+:102210000F1A0C949A1A843859F40E94FA0E82FF0D
+:1022200028C087E40E94CD190E949A1A87E4EFCF54
+:102230009CEF980F913A58F390E2980F983050F431
+:10224000877091E001C0990F8A95EAF7892F0E9463
+:10225000591ADFCF9BE5980F933020F480E090E08F
+:102260000C941C0F885A833120F480E090E00C9489
+:10227000320F0895882321F00E94531A0C949A1A61
+:102280000895882321F00E94591A0C949A1A0895EF
+:10229000BF92CF92DF92EF92FF920F931F93CF9353
+:1022A000DF9300D000D000D0CDB7DEB725E0FC0131
+:1022B000DE01119601900D922A95E1F7FC01D08084
+:1022C00011810281258122952F7043815481452BF4
+:1022D00009F4FCC21F3F21F4FFEFDF1609F4F6C238
+:1022E0007C012E830E942210D9821A8369817A810F
+:1022F000802F0E94C919182FB92E0E947E190E94A2
+:1023000045182E81002319F00E94701A2E81EB2DA2
+:10231000E295EF70F0E0E05AFF4F0C9483238B2D91
+:10232000807F9B2D9F70F92E882319F0F29480EF07
+:10233000F822002389F0FF2009F475C280E2810FA2
+:10234000883020F48F2D0E94531A03C08F2D0E94D5
+:10235000631A0E949A1A67C2812F0E94EB10FF2015
+:1023600009F4B4C2105E8F2D183018F40E94591A67
+:1023700002C00E94691A26960FB6F894DEBF0FBEFF
+:10238000CDBFDF91CF911F910F91FF90EF90DF9024
+:10239000CF90BF900C949A1A3B2D307F8B2D8F706D
+:1023A000303211F08295807F112319F0113021F124
+:1023B0002CC00023B9F0222309F4A0C1213009F078
+:1023C0009DC126960FB6F894DEBF0FBECDBFDF913C
+:1023D000CF911F910F91FF90EF90DF90CF90BF9022
+:1023E0000C94831A222319F0213009F46FC28E83D2
+:1023F0000E94861A8E8196C1002321F0223008F0B7
+:1024000065C27CC1211162C28DC1002321F022234B
+:1024100009F474C108C2222309F484C119C22B2D06
+:1024200026952695237030E02115310521F02130C5
+:102430003105D1F04BC2002321F0812F9B2D9370E9
+:1024400002C080E090E026960FB6F894DEBF0FBE83
+:10245000CDBFDF91CF911F910F91FF90EF90DF9053
+:10246000CF90BF900C941C0F002321F0812F9B2D47
+:10247000937002C080E090E026960FB6F894DEBF1D
+:102480000FBECDBFDF91CF911F910F91FF90EF90C5
+:10249000DF90CF90BF900C94320F812F002319F062
+:1024A0000E94131E02C00E947B1E26960FB6F8944F
+:1024B000DEBF0FBECDBFDF91CF911F910F91FF9077
+:1024C000EF90DF90CF90BF900C94001F8B2D837006
+:1024D00009F07BC00111FAC1812F82958695877022
+:1024E000880F880F912F9F70C92ED12CE12CF12CD1
+:1024F000082E04C0CC0CDD1CEE1CFF1C0A94D2F785
+:1025000014FF12C04FE050E060E070E004C0440FE0
+:10251000551F661F771F8A95D2F7CB01BA016095C8
+:1025200070958095909503C060E070E0CB012B2DF5
+:10253000269526952370422F50E042305105D9F060
+:102540004330510569F16C297D298E299F2941303D
+:10255000510551F126960FB6F894DEBF0FBECDBFE0
+:10256000DF91CF911F910F91FF90EF90DF90CF906F
+:10257000BF900C946C186C297D298E299F29269672
+:102580000FB6F894DEBF0FBECDBFDF91CF911F9184
+:102590000F91FF90EF90DF90CF90BF900C94881830
+:1025A0000E946C18C701B60126960FB6F894DEBFDC
+:1025B0000FBECDBFDF91CF911F910F91FF90EF9094
+:1025C000DF90CF90BF900C945018002319F08B2D02
+:1025D000817001C08695882309F478C1812F829586
+:1025E00086958770880F880F912F9F70C92ED12CE8
+:1025F000E12CF12C082E04C0CC0CDD1CEE1CFF1CC1
+:102600000A94D2F714FF12C04FE050E060E070E08F
+:1026100004C0440F551F661F771F8A95D2F7CB0160
+:10262000BA01609570958095909503C060E070E068
+:10263000CB012B2D269526952370422F50E042305A
+:102640005105D9F04330510569F16C297D298E2956
+:102650009F294130510551F126960FB6F894DEBFFF
+:102660000FBECDBFDF91CF911F910F91FF90EF90E3
+:10267000DF90CF90BF900C9446196C297D298E294C
+:102680009F2926960FB6F894DEBF0FBECDBFDF910F
+:10269000CF911F910F91FF90EF90DF90CF90BF905F
+:1026A0000C9462190E944619C701B60126960FB60E
+:1026B000F894DEBF0FBECDBFDF91CF911F910F9178
+:1026C000FF90EF90DF90CF90BF900C942A19103FAD
+:1026D000D1F118F4103E50F4A1C0123F09F463C0C8
+:1026E00008F44CC0133F09F473C098C01F708B2DC1
+:1026F0008F710023A1F00E94C318812F26960FB678
+:10270000F894DEBF0FBECDBFDF91CF911F910F9127
+:10271000FF90EF90DF90CF90BF900C943A110E9401
+:10272000E418812F26960FB6F894DEBF0FBECDBFFA
+:10273000DF91CF911F910F91FF90EF90DF90CF909D
+:10274000BF900C9441110023A9F02111BFC08B2D23
+:102750008F7126960FB6F894DEBF0FBECDBFDF9106
+:10276000CF911F910F91FF90EF90DF90CF90BF908E
+:102770000C940919223008F0A9C0E9CF0023A9F070
+:102780008B2D8F7126960FB6F894DEBF0FBECDBF8E
+:10279000DF91CF911F910F91FF90EF90DF90CF903D
+:1027A000BF900C94C318002359F38B2D8F7126967C
+:1027B0000FB6F894DEBF0FBECDBFDF91CF911F9152
+:1027C0000F91FF90EF90DF90CF90BF900C94E418A2
+:1027D000002399F08B2D8F7126960FB6F894DEBFEB
+:1027E0000FBECDBFDF91CF911F910F91FF90EF9062
+:1027F000DF90CF90BF900C94AE1826960FB6F89449
+:10280000DEBF0FBECDBFDF91CF911F910F91FF9023
+:10281000EF90DF90CF90BF900C94A4180023A9F004
+:10282000222309F4ADCF812F26960FB6F894DEBF90
+:102830000FBECDBFDF91CF911F910F91FF90EF9011
+:10284000DF90CF90BF900C942310222309F4ADCFDA
+:10285000812F26960FB6F894DEBF0FBECDBFDF9155
+:10286000CF911F910F91FF90EF90DF90CF90BF908D
+:102870000C94EB104B2D4F70612FC7010E94AB02DF
+:1028800026960FB6F894DEBF0FBECDBFDF91CF9175
+:102890001F910F91FF90EF90DF90CF90BF900C941D
+:1028A000C8174B2D4F70612FC70126960FB6F894AD
+:1028B000DEBF0FBECDBFDF91CF911F910F91FF9073
+:1028C000EF90DF90CF90BF900C94180526960FB62E
+:1028D000F894DEBF0FBECDBFDF91CF911F910F9156
+:1028E000FF90EF90DF90CF90BF9008950E94701AF4
+:1028F0000E94801A0E94451A0E949A1A0E94B11FD3
+:102900000E94001F80E090E00E941C0F80E090E099
+:102910000C94320F0E94601A0C9476140E94BE1917
+:10292000292F22952F7030E02C3031054CF42A30BD
+:1029300031056CF4225031092230310588F407C08A
+:102940002C30310549F02F30310531F009C0803E7F
+:1029500048F0803F29F406C093FB882780F908954A
+:1029600080E0089581E00895CF93DF9300D000D0F8
+:102970001F92CDB7DEB70F900F900F900F900F9072
+:10298000DF91CF910895CF93DF9300D000D000D096
+:10299000CDB7DEB726960FB6F894DEBF0FBECDBF1B
+:1029A000DF91CF9108951F93CF93DF93C091790169
+:1029B00016E080917A01C81799F0D0E01C9FF001D1
+:1029C0001D9FF00D1124E558FE4F40815181628119
+:1029D0007381848195810E94C3142196C770E9CFC9
+:1029E000DF91CF911F9108954091AB015091AC01BF
+:1029F0006091AD017091AE018091AF019091B001F5
+:102A00000C94C3148091B00182958F7009F054C06A
+:102A10008091AD01882309F44FC080917901A09184
+:102A20007A016091AB017091AC014091AE0150917F
+:102A3000AF01B6E08A1709F43FC090E04115510597
+:102A4000C1F17F3F11F46F3FA1F1B89FF001B99F31
+:102A5000F00D1124E558FE4F218172132AC0208108
+:102A6000621327C02281211124C0238134812417BD
+:102A7000350710F421503109241B350B283C310552
+:102A8000C0F42091B0012F7020612093B00126E0A6
+:102A9000289FF001299FF00D1124E058FE4F8081FE
+:102AA0008F70806180838BEA91E00E9448110C94C2
+:102AB000D31401968770BECF0895CF92DF92EF9224
+:102AC000FF920F931F93CF93DF93CDB7DEB762973B
+:102AD0000FB6F894DEBF0FBECDBF8C0185E0F801C4
+:102AE000DE011D9601900D928A95E1F7D8014C9177
+:102AF00011965C91119712966C9112971396CD9046
+:102B0000DC9014973091AB017091AC018091AE01D3
+:102B10009091AF01009709F46BC17F3F19F43F3FDB
+:102B200009F466C1E090AD01EE2009F4C0C0209127
+:102B3000B001C816D90628F0F601E81BF90BCF0141
+:102B400004C0809590958C0D9D1DFF24F394883CC6
+:102B5000910578F0F12C207F09F0C6C07C2DD98A30
+:102B6000C88A89890E94B4148BEA91E00E944811B6
+:102B7000B1C0822F807F09F046C0751314C0341392
+:102B800012C0611110C02F7020612093B0010E940B
+:102B9000F4148BEA91E00E9448118091B001D801B1
+:102BA00015968C932EC0CD2819F15F3F11F44F3F3D
+:102BB000F9F0F62E61111CC08091790120917A0103
+:102BC00036E0821709F45AC090E0389FF001399F2F
+:102BD000F00D1124E558FE4F7181571306C0708126
+:102BE000471303C07281711103C001968770E9CF4A
+:102BF000F62E662309F418C18091B001816080939C
+:102C0000B001F12C11C1751308C0341306C0611155
+:102C100004C08091B001D801C3C04D875E878D8507
+:102C20009E856A8B0E948E146A898823E1F166234F
+:102C3000D1F12091B001822F82958F7090E00297A0
+:102C400074F08091AB019091AC0198878F831986C5
+:102C5000DB86CA862C87CE0107960E94481186E043
+:102C6000F801ABEAB1E001900D928A95E1F70E947C
+:102C700002150E94F414FF24F394D6C04D875E879A
+:102C80008D859E850E94BE19292F22952F7030E0D8
+:102C9000223031050CF0BCC09F7009F0B6C0805ED8
+:102CA000883008F4C1C0C8010E944811E4CFC8169A
+:102CB000D90608F453C0F601E81BF90BCF01883C94
+:102CC000910508F450C0F12C7C2DD98AC88A8989D5
+:102CD0000E94B414EBEAF1E086E0DF011D928A95D0
+:102CE000E9F70E94F414A0C0751314C0341312C085
+:102CF000611110C08091B001F8018583C8010E9464
+:102D0000481186E0EBEAF1E0DF011D928A95E9F7D0
+:102D1000FE2C8AC04D875E878D859E856A8B0E94BA
+:102D20008E146A89882309F4BECF662309F4BBCFC9
+:102D30002091B001822F82958F7090E002970CF461
+:102D40008ECF8091AB019091AC019A8389831B82D5
+:102D5000DD82CC822E83CE0101967FCF8095909527
+:102D60008C0D9D1DACCFF62E662309F49CCF7513F8
+:102D70002EC034132CC02091B00120FD1FC0822F23
+:102D800082958F70D9F0D80115962C9315978F30B6
+:102D900049F08F5F982F9295907F822F8F70892BAB
+:102DA00015968C93C8010E94481186E0F801ABEAA1
+:102DB000B1E001900D928A95E1F793CF86E0F8019A
+:102DC000ABEAB1E001900D928A95E1F72DC04D87F5
+:102DD0005E878D859E850E948E14811140CF8091E3
+:102DE000B00181608093B001C8010E9448111CC0ED
+:102DF000662309F458CF4D875E878D859E850E9496
+:102E00008E14882309F44FCF2ACF811148CF0CC0EC
+:102E1000243031050CF047CF9F7009F440CFF80102
+:102E20009581907F09F03BCF8F2D62960FB6F89475
+:102E3000DEBF0FBECDBFDF91CF911F910F91FF90ED
+:102E4000EF90DF90CF9008951F93CF93DF93CDB78E
+:102E5000DEB72C970FB6F894DEBF0FBECDBF4F8301
+:102E6000588769877A878B879C87CE0107960E944F
+:102E70005D15882369F08F8198852A853B85232BF2
+:102E8000F1F19F3F09F063C08F3F09F060C037C088
+:102E900086E0FE013796DE01119601900D928A952B
+:102EA000E1F76F817885EA85FB85309741F17F3FB7
+:102EB00011F46F3F21F120917A0130E0C9010196B0
+:102EC000877099274091790150E08417950709F49C
+:102ED00047C069837A83FD83EC8396E0929FD0019B
+:102EE000939FB00D1124A558BE4FFE01319601905D
+:102EF0000D929A95E1F780937A010E94D31416E01F
+:102F00008091790190917A018917C1F1189FC001D0
+:102F1000112485589E4F0E945D15882379F1E09118
+:102F200079011E9FF0011124E558FE4F4081518127
+:102F300062817381848195810E94C314809179019B
+:102F400090E001968770992780937901D9CF4F81BE
+:102F5000588569857A858B859C850E94C314CFCF5F
+:102F60000E948A1410927A0110927901EBEAF1E042
+:102F700086E0DF011D928A95E9F7C1CF2C960FB646
+:102F8000F894DEBF0FBECDBFDF91CF911F910895A2
+:102F9000EF92FF920F931F93CF93DF938C01892BB6
+:102FA00009F46CC0F12CEE24E394E8012196F801B9
+:102FB0008491843740F4843008F051C0813081F02E
+:102FC000823019F15BC0853709F444C0A8F19CE751
+:102FD000980F903708F052C08F770E94EB1041C0D5
+:102FE0000E5F1F4FFE01C49180E28C0F883048F4C1
+:102FF000C7708E2D01C0880FCA95EAF70E94731A18
+:1030000014C08C2F0E9423102DC00E5F1F4FFE0195
+:10301000C49180E28C0F883058F4C7708E2D01C0A7
+:10302000880FCA95EAF70E94791A0E949A1A1AC064
+:103030008C2F0E94EB1016C00E5F1F4FFE01C49133
+:10304000CC2381F08FE99FE00197F1F700C00000E9
+:10305000C150F6CF0E5F1F4FFE01F49003C00E94D7
+:1030600023108E018F2D882309F49FCFEFE9FFE015
+:103070003197F1F700C000008150F5CFDF91CF917B
+:103080001F910F91FF90EF90089508956093B501FF
+:103090007093B6018093B7019093B8010C947614A5
+:1030A0000F931F930091B5011091B6012091B701C4
+:1030B0003091B801DC01CB01802B912BA22BB32BDB
+:1030C0008093B5019093B601A093B701B093B80176
+:1030D0001F910F910C9476140F931F930091B501DB
+:1030E0001091B6012091B7013091B801DC01CB01FC
+:1030F00080239123A223B3238093B5019093B6013B
+:10310000A093B701B093B8011F910F910C9476145E
+:103110000F931F930091B5011091B6012091B70153
+:103120003091B801DC01CB0180279127A227B3277A
+:103130008093B5019093B601A093B701B093B80105
+:103140001F910F910C9476141092B1011092B2015C
+:103150001092B3011092B4010C94761441E050E047
+:1031600060E070E004C0440F551F661F771F8A950A
+:10317000D2F74093B1015093B2016093B3017093C1
+:10318000B4010C94761441E050E060E070E004C0BB
+:10319000440F551F661F771F8A95D2F78091B101A2
+:1031A0009091B201A091B301B091B401482B592B79
+:1031B0006A2B7B2B4093B1015093B2016093B30112
+:1031C0007093B4010C94761441E050E060E070E03C
+:1031D00004C0440F551F661F771F8A95D2F740958C
+:1031E0005095609570958091B1019091B201A09138
+:1031F000B301B091B401482359236A237B23409340
+:10320000B1015093B2016093B3017093B4010C9477
+:10321000761441E050E060E070E004C0440F551FB8
+:10322000661F771F8A95D2F78091B1019091B20104
+:10323000A091B301B091B401482759276A277B2791
+:103240004093B1015093B2016093B3017093B40104
+:103250000C9476140F931F930091B1011091B20159
+:103260002091B3013091B401DC01CB01802B912B73
+:10327000A22BB32B8093B1019093B201A093B30121
+:10328000B093B4011F910F910C9476140F931F9378
+:103290000091B1011091B2012091B3013091B401BC
+:1032A000DC01CB0180239123A223B3238093B101BE
+:1032B0009093B201A093B301B093B4011F910F9109
+:1032C0000C9476140F931F930091B1011091B201E9
+:1032D0002091B3013091B401DC01CB01802791270B
+:1032E000A227B3278093B1019093B201A093B301B9
+:1032F000B093B4011F910F910C9476140895CF925E
+:10330000DF92EF92FF920F931F93CF93DF938C0185
+:10331000C090B501D090B601E090B701F090B8012F
+:103320008091B1019091B201A091B301B091B4012B
+:10333000C82AD92AEA2AFB2ACFE1D0E0D701C60160
+:103340000C2E04C0B695A795979587950A94D2F749
+:1033500080FF06C0B8018C2F0E945807019721F406
+:10336000219760F780E001C08C2FDF91CF911F91F2
+:103370000F91FF90EF90DF90CF900895CF93DF9360
+:10338000EC010E947F19BE010E945807DF91CF9186
+:103390000895CB010E94BE19089590910C019923C4
+:1033A00021F090910D01911109C020910E013091F1
+:1033B0000F01F90132969FEF40E01FC0982F9695BC
+:1033C000969596959F3050F5E0910E01F0910F0182
+:1033D000E90FF11D877021E030E0A90102C0440F20
+:1033E000551F8A95E2F7CA019181892B818308953F
+:1033F0009F3F39F04F5F4E3041F051915813F8CF55
+:103400000DC05111F7CF942FF5CF9F3F39F0F9013F
+:10341000E90FF11D97FDFA95828308950895909123
+:103420000C01992321F090910D01911109C0209177
+:103430000E0130910F01F9013296205F3F4F1FC0FE
+:10344000982F9695969596959F30F0F4E0910E0101
+:10345000F0910F01E90FF11D877021E030E0A90123
+:1034600002C0440F551F8A95E2F7CA0180959181E9
+:103470008923818308953196E217F30729F090811B
+:103480009813F9CF1082F7CF089581E090E0E09192
+:103490000E01F0910F01E80FF91F108201968031A3
+:1034A0009105A9F708959091CC01892B8093CC01C7
+:1034B000089580959091CC0189238093CC01089543
+:1034C0001092CC0108959091CB01892B8093CB0170
+:1034D000089580959091CB0189238093CB01089525
+:1034E0001092CB0108959091CA01892B8093CA0153
+:1034F000089580959091CA0189238093CA01089507
+:103500001092CA0108958093B90108951092B901EB
+:10351000089580910E0190910F01FC0131969C015C
+:10352000205F3F4F80E0919191118F5FE217F30789
+:10353000D1F70895E0910E01F0910F018091CC0137
+:103540008083E0910E01F0910F0190818091CB0179
+:10355000892B8083E0910E01F0910F019081809181
+:10356000CA01892B80838091B901882361F0E091A1
+:103570000E01F0910F019081892B80830E94891A9E
+:1035800081111092B90180910E0190910F010C945C
+:10359000060FCF92DF92EF92FF926C01EE24FF2490
+:1035A000C114D104E104F10421F0C701B60120E106
+:1035B00001C020E0C72ED82EE92EFF24C114D1046B
+:1035C000E104F10419F0285FC701B6016B017C0129
+:1035D00054E0F694E794D794C7945A95D1F7C11460
+:1035E000D104E104F10419F02C5FC701B6016B01AD
+:1035F0007C0142E0F694E794D794C7944A95D1F7BA
+:10360000C114D104E104F10419F02E5FC701B60121
+:10361000DC01CB01B695A79597958795892B8A2BC9
+:103620008B2B09F02F5F822FFF90EF90DF90CF90D0
+:1036300008958091E401843021F11092CE0120E4BC
+:1036400088E190E00FB6F894A895809360000FBED3
+:103650002093600080E00E94F30783B7817F84603D
+:1036600083BF83B7816083BF7894889583B78E7F4B
+:1036700083BF88E10FB6F8948093600010926000D9
+:103680000FBE089508950895CF930E94421B0E9493
+:1036900023040E94431BC0E08C2F0E94110581115E
+:1036A00004C0CF5FCE30C1F701C081E0CF91089553
+:1036B0000E948A140E94FA0E0C94F30782E084BDE3
+:1036C00093E095BD9AEF97BD80936E0008952FB754
+:1036D000F8948091CF019091D001A091D101B09147
+:1036E000D2012FBF0895CF92DF92EF92FF920F93F6
+:1036F0001F932FB7F8944091CF015091D001609162
+:10370000D1017091D2012FBF6A017B01EE24FF2409
+:103710008C0120E030E0C016D106E206F30610F47A
+:10372000415051099A01281B390BC9011F910F9172
+:10373000FF90EF90DF90CF9008951F920F920FB6F9
+:103740000F9211248F939F93AF93BF938091CF01DA
+:103750009091D001A091D101B091D2010196A11D0B
+:10376000B11D8093CF019093D001A093D101B0936C
+:10377000D201BF91AF919F918F910F900FBE0F908B
+:103780001F9018950E94F70BF8942FEF87EA91E6A7
+:10379000215080409040E1F700C0000087E090EBAE
+:1037A000DC018093EE019093EF01A093F001B093C0
+:1037B000F1019CE088E10FB6F894A8958093600031
+:1037C0000FBE90936000FFCFEF92FF920F931F9375
+:1037D000CF93DF93D82FC0E08C2F0E94110500E01B
+:1037E00010E0E82EF12CC701002E02C095958795B8
+:1037F0000A94E2F780FD06C00F5F1F4F06301105E7
+:1038000091F709C0602F7C2F80E00E941905D81322
+:10381000F3CF81E004C0CF5FCE30F1F680E0DF91DE
+:10382000CF911F910F91FF90EF900895CF93C82FE4
+:103830008CE20E94E41B882321F08C2FCF910C9402
+:10384000E41B80E0CF910895CF930E946B1D8111FE
+:1038500002C00E94511DC5E6C15049F00E942304D8
+:103860008FE39CE90197F1F700C00000F5CF89E2F2
+:103870000E94161C811113C18AE20E94161C81113C
+:103880000E94511D85E00E94161C81110E94C21BDE
+:103890000E94761D8093CD0187E00E94161C88232C
+:1038A000A9F18BE10E94161C882351F08091CD0173
+:1038B00081FB222720F991E0922790FB81F90EC02D
+:1038C0008EE00E94161C882361F08091CD0182FB5E
+:1038D000222720F991E0922790FB82F98093CD0175
+:1038E00015C080E10E94161C9091CD01882341F003
+:1038F00093FB222720F981E0822780FB93F904C003
+:10390000892F809580FB90F99093CD018091CD0116
+:103910000E947A1D0E94881D8093ED0180EE0E9416
+:10392000161C882341F08091ED01982F909590FB13
+:1039300080F98093ED0189E30E94161C882359F0D9
+:103940008091ED0181FB222720F991E0922790FBE5
+:1039500081F98093ED0182EE0E94161C882359F0B4
+:103960008091ED0182FB222720F991E0922790FBC4
+:1039700082F98093ED0186EE0E94161C882359F08F
+:103980008091ED0183FB222720F991E0922790FBA3
+:1039900083F98093ED0183EE0E94161C882359F071
+:1039A0008091ED0184FB222720F991E0922790FB82
+:1039B00084F98093ED0185E30E94161C882359F059
+:1039C0008091ED0185FB222720F991E0922790FB61
+:1039D00085F98093ED0181E30E94161C882359F03C
+:1039E0008091ED0186FB222720F991E0922790FB40
+:1039F00086F98093ED0181E10E94161C882359F01D
+:103A00008091ED0187FB222720F991E0922790FB1E
+:103A100087F98093ED018091ED010E948C1D8091CA
+:103A2000ED0187FB882780F980930D0187E20E94D2
+:103A3000161CC82F8EE10E94161C8111C2608FE1F6
+:103A40000E94161C8111C46080E20E94161C811124
+:103A5000C86081E20E94161C8111C06182E20E944E
+:103A6000161C8111C06283E20E94161C8111C06481
+:103A700084E20E94161C882311F0C06802C0CC2387
+:103A800029F08C2F0E94831D6C2F03C00E947F1D84
+:103A9000682F70E080E090E0CF910C944618CF91B1
+:103AA00008956DEE7EEF80E090E00E94BD2360E01F
+:103AB00082E090E00E94AB2360E083E090E00E940F
+:103AC000AB2360E084E090E00E94AB2360E085E0FF
+:103AD00090E00C94AB2380E090E00E94A52321E0CD
+:103AE0008D3E9E4F09F020E0822F089582E090E005
+:103AF0000C949D23682F82E090E00C94AB2383E02C
+:103B000090E00C949D23682F83E090E00C94AB230D
+:103B100084E090E00C949D23682F84E090E00C9466
+:103B2000AB238091D50180FF0BC06091130185E02C
+:103B3000689FB001112475956795759567952BC0A1
+:103B400081FF09C06091130185E0689FB0011124D5
+:103B50007595679520C082FF07C06091130185E0CD
+:103B6000689FB001112417C09091D6019923D1F01C
+:103B700060911201961788F72091130185E0289F24
+:103B800090011124929FA001939F500D112470E089
+:103B9000CA010E946F236038710540F461157105F8
+:103BA00039F002C065E070E0862F08958FE7089530
+:103BB00081E008958091D50180FF08C060911101D6
+:103BC00070E0759567957595679521C081FF06C072
+:103BD0006091110170E07595679519C082FF04C06E
+:103BE0006091110170E010C09091D6019923C1F04D
+:103BF000609110019617A0F780911101899FC00173
+:103C0000112470E00E946F236038710528F461155B
+:103C1000710521F0862F08958FE7089581E00895BA
+:103C200061E070E0F4CF803F21F40E94911D819506
+:103C300004C0813F29F40E94911D8093D901089509
+:103C4000823F21F40E94911D819504C0833F29F495
+:103C50000E94911D8093D8010895893F19F40E9414
+:103C6000DA1D05C08A3F31F40E94DA1D81958093E8
+:103C7000DA0108958B3F21F40E94DA1D819504C07A
+:103C80008C3F29F40E94DA1D8093DB010895843F64
+:103C900021F48091D701816017C0853F21F4809184
+:103CA000D701826011C0863F21F48091D7018460E2
+:103CB0000BC0873F21F48091D701886005C0883F01
+:103CC00031F48091D70180618093D70108958D3FB1
+:103CD00021F48091D50181600BC08E3F21F4809149
+:103CE000D501826005C08F3F29F48091D5018460A1
+:103CF0008093D5010895803F39F48091D90187FFE1
+:103D00006CC01092D90169C0813F29F48091D9011A
+:103D10001816BCF362C09091D801823F29F497FF36
+:103D20005CC01092D80159C0833F19F41916CCF326
+:103D300054C0893F41F48091DA0118160CF04DC04F
+:103D40001092DA014AC08A3F29F48091DA0187FF94
+:103D500044C0F6CF8B3F39F48091DB0187FF3DC033
+:103D60001092DB013AC08C3F29F48091DB011816D8
+:103D7000BCF333C0843F21F48091D7018E7F17C0FC
+:103D8000853F21F48091D7018D7F11C0863F21F4BA
+:103D90008091D7018B7F0BC0873F21F48091D701A1
+:103DA000877F05C0883F31F48091D7018F7E809353
+:103DB000D70113C08D3F21F48091D5018E7F0BC0B8
+:103DC0008E3F21F48091D5018D7F05C08F3F29F46E
+:103DD0008091D5018B7F8093D5018091D80181118D
+:103DE0000EC08091D90181110AC08091DA01811140
+:103DF00006C08091DB01811102C01092D6010895A6
+:103E000087ED91E00E94110F0E94671B9093D401EF
+:103E10008093D30108951F93CF93DF938091D301B3
+:103E20009091D4010E94731BAC019091D60199230B
+:103E300021F02091140130E006C0209115018AE0A4
+:103E4000289F900111244217530708F486C08091DF
+:103E5000D801C091D901D091DA011091DB01811113
+:103E600007C0C11176C0D11174C0111172C075C0E4
+:103E70009F3F19F09F5F9093D601181624F40E947B
+:103E8000911D8093D8018091D80187FF05C00E94C1
+:103E9000911D81958093D8011C1624F40E94911DD8
+:103EA0008093D9018091D90187FF05C00E94911D9F
+:103EB00081958093D9016091D801662339F1C09131
+:103EC000D901CC2319F1772767FD7095872F972F9C
+:103ED0000E94802223E333E343E35FE30E94E42272
+:103EE0000E944D226093D8016C2F772767FD709553
+:103EF000872F972F0E94802223E333E343E35FE37E
+:103F00000E94E4220E944D226093D9011D1624F4E0
+:103F10000E94DA1D8093DA018091DA0187FF05C0E3
+:103F20000E94DA1D81958093DA01111624F40E9413
+:103F3000DA1D8093DB018091DB0187FF05C00E94C1
+:103F4000DA1D81958093DB01DF91CF911F910C9455
+:103F5000001F9F3F09F08ECF96CFDF91CF911F9129
+:103F60000895E7EDF1E085E0DF011D928A95E9F71C
+:103F70001092D6011092D5010895833081F128F472
+:103F8000813059F08230D1F00895853009F449C06C
+:103F9000B8F1863009F456C0089580911501262F96
+:103FA00030E0280F311D2F3F310524F4680F609356
+:103FB000150108958FEF80931501089580911401E4
+:103FC000262F30E0280F311D2F3F310524F4680FD4
+:103FD0006093140108958FEF8093140108958091E8
+:103FE0001301262F30E0280F311D2F3F310524F417
+:103FF000680F6093130108958FEF80931301089564
+:1040000080911201262F30E0280F311D2F3F3105FE
+:1040100024F4680F6093120108958FEF80931201CA
+:10402000089580911101262F30E0280F311D2F3F78
+:10403000310524F4680F6093110108958FEF809388
+:104040001101089580911001262F30E0280F311DB5
+:104050002F3F310524F4680F6093100108958FEF0E
+:10406000809310010895833011F128F4813049F0D4
+:10407000823091F00895853081F120F18630C1F1D0
+:10408000089580911501681720F4861B809315010F
+:10409000089510921501089580911401681720F475
+:1040A000861B809314010895109214010895809145
+:1040B0001301681720F4861B809313010895109252
+:1040C0001301089580911201681720F4861B8093D4
+:1040D000120108951092120108958091110168173C
+:1040E00020F4861B80931101089510921101089508
+:1040F00080911001681720F4861B809310010895A9
+:104100001092100108950F931F938D3109F46BC025
+:1041100008F03FC08E3009F47FC0C0F4873009F446
+:1041200069C068F4863009F0B1C08091CD01817F0B
+:104130008E7F8093CD0181E08093DD01A8C088301F
+:1041400009F4A2C08B3009F49FC0A0C0863109F4E5
+:104150009BC078F4803109F472C0813109F096C0B7
+:104160000E948A1490910D0181E0892780930D01AE
+:104170008BC0893109F488C08B3109F087C08091E8
+:10418000CD0181FB222720F991E0922790FB81F954
+:104190004CC0853309F470C048F4873209F46CC010
+:1041A00008F459C0893209F467C070C0833438F408
+:1041B0008A3308F04EC0883309F466C067C0833480
+:1041C00009F45AC0883409F061C00E948A140FEFC4
+:1041D00013ED20E3015010402040E1F700C0000043
+:1041E0000E94C21B51C00E9407220E94FA0E0E9428
+:1041F000F3074AC09091CD01892F8095817080FB93
+:1042000090F929F0966098609093CD0140C0997F15
+:10421000977F9093CD0138C08091CD0182FB2227FA
+:1042200020F991E0922790FB82F98093CD019923A8
+:1042300059F18091CD0181608093CD0125C080919D
+:10424000CD0183FB222720F991E0922790FB83F98F
+:10425000ECCF895301C08D5141E050E060E070E047
+:104260008A019B0104C0000F111F221F331F8A9572
+:10427000D2F7C901B80104C061E070E080E090E0CD
+:104280000E9446180E948A1481E001C080E01F91BC
+:104290000F91089580E0089580E00895CF93C82F8E
+:1042A0008091DD01813079F018F08230E9F187C02A
+:1042B000E0910E01F0910F018081813169F082322D
+:1042C00009F07FC009C0E0910E01F0910F018081DB
+:1042D000813111F0823261F48C2F0E944A218111C8
+:1042E00004C08C2F0E9483201DC081E090E01AC082
+:1042F0008C2F0E944C21811114C0C43179F048F4F4
+:10430000CB3079F0C03109F060C082E08093DD01EC
+:1043100008C0C93219F0C83321F057C01092DD012E
+:1043200054C081E0817053C0C93289F118F5C4319D
+:1043300071F1A8F4C73009F046C08AE080931501F6
+:1043400094E19093140193E09093130180931201F0
+:1043500088E08093110188E28093100134C0CE512F
+:10436000C63088F5EC2FF0E0E65DFE4F808180934B
+:10437000DC0129C0CE34E9F020F4CB3421F56AE029
+:1043800013C0C13579F0C235F1F461E00DC0809100
+:10439000DC01882319F01092DC0115C081E08093C4
+:1043A000DD0115C061E006C08091DC010E94BD1FE7
+:1043B0000AC06AE08091DC010E94332004C01092A0
+:1043C000DD0180E004C081E002C080E0ABCFCF918E
+:1043D0000895E1E8F0E080818860808380818160D9
+:1043E00080838FB7F89493E09093890090ED909339
+:1043F00088008FBF0895EFE6F0E0808182608083BF
+:104400000895EFE6F0E080818D7F80830895EFE6E8
+:10441000F0E0908182E08927808308951F920F92B7
+:104420000FB60F9211242F933F934F935F936F9387
+:104430007F938F939F93AF93BF93EF93FF9380915D
+:10444000DE019091DF0101969093DF018093DE0100
+:10445000811103C082E00E94F307E091DF01E6953D
+:10446000E695F0E0E657FB4FE4918091DE018E1374
+:1044700003C080E00E94F307FF91EF91BF91AF91DD
+:104480009F918F917F916F915F914F913F912F916C
+:104490000F900FBE0F901F90189504D06894B11123
+:1044A0008DC0089570D088F09F5790F0B92F99274C
+:1044B000B751A0F0D1F0660F771F881F991F1AF02F
+:1044C000BA95C9F712C0B13081F077D0B1E0089544
+:1044D00074C0672F782F8827B85F39F0B93FCCF3C5
+:1044E000869577956795B395D9F73EF49095809525
+:1044F000709561957F4F8F4F9F4F0895E89409C045
+:1045000097FB3EF490958095709561957F4F8F4F06
+:104510009F4F9923A9F0F92F96E9BB279395F6951C
+:10452000879577956795B795F111F8CFFAF4BB0F9A
+:1045300011F460FF1BC06F5F7F4F8F4F9F4F16C0FE
+:10454000882311F096E911C0772321F09EE8872F88
+:10455000762F05C0662371F096E8862F70E060E044
+:104560002AF09A95660F771F881FDAF7880F9695BD
+:10457000879597F9089557FD9058440F551F59F0A6
+:104580005F3F71F04795880F97FB991F61F09F3F40
+:1045900079F087950895121613061406551FF2CF69
+:1045A0004695F1DF08C0161617061806991FF1CFB9
+:1045B00086957105610508940895E894BB276627E0
+:1045C0007727CB0197F908950BD078C069D028F0F0
+:1045D0006ED018F0952309F05AC05FC01124EECFB9
+:1045E000CADFA0F3959FD1F3950F50E0551F629F4E
+:1045F000F001729FBB27F00DB11D639FAA27F00D3C
+:10460000B11DAA1F649F6627B00DA11D661F829F62
+:104610002227B00DA11D621F739FB00DA11D621F47
+:10462000839FA00D611D221F749F3327A00D611D64
+:10463000231F849F600D211D822F762F6A2F112446
+:104640009F5750408AF0E1F088234AF0EE0FFF1F99
+:10465000BB1F661F771F881F91505040A9F79E3FD0
+:10466000510570F014C0AACF5F3FECF3983EDCF325
+:10467000869577956795B795F795E7959F5FC1F70D
+:10468000FE2B880F911D9695879597F9089597F9B8
+:104690009F6780E870E060E008959FEF80EC0895E8
+:1046A00000240A9416161706180609060895002411
+:1046B0000A9412161306140605060895092E03948B
+:1046C000000C11F4882352F0BB0F40F4BF2B11F4FF
+:1046D00060FF04C06F5F7F4F8F4F9F4F089597FB20
+:1046E000072E16F4009407D077FD09D00E94892385
+:1046F00007FC05D03EF4909581959F4F08957095E5
+:1047000061957F4F0895EE0FFF1F0590F491E02D06
+:104710000994AA1BBB1B51E107C0AA1FBB1FA61708
+:10472000B70710F0A61BB70B881F991F5A95A9F75A
+:1047300080959095BC01CD010895F999FECF92BD69
+:1047400081BDF89A992780B50895A8E1B0E042E0CC
+:1047500050E00C94C523262FF999FECF92BD81BD60
+:10476000F89A019700B4021639F01FBA20BD0FB6AF
+:10477000F894FA9AF99A0FBE08950196272F0E948D
+:10478000AC230C94AB23DC01CB01FC01F999FECFE7
+:1047900006C0F2BDE1BDF89A319600B40D924150C9
+:0A47A0005040B8F70895F894FFCFD9
+:1047AA002002F507830860082C08F8070101BA01FE
+:1047BA0028080A03140A3F4D36394B04FE03C8037E
+:1047CA008F0322033B0354036D030102030405060E
+:0447DA0007080900C3
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/supercoder/README.md b/keyboard/ergodox_ez/keymaps/supercoder/README.md new file mode 100644 index 0000000000..ad531b3da7 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/README.md @@ -0,0 +1,29 @@ +SuperCoder 2000 layout for the ErgoDox +================================================== + + + +Ever found yourself in need of entering binary codes rapidly? Ever wanted to use +all ten fingers to do so? Ever felt your SuperCoder 2000 too limiting, by only +having three buttons? We heard you! With this layout for the ErgoDox EZ, you +will be able to tap in binary at an unparalleled speed and accuracy! Efficiency +never seen before! + +Behold the Ultimate SuperCoder 2000 layout! + + + +### To use it... + +To use this piece of top quality engineering, you can either +[download the hex file][hex] we have prepared for you, or you can compile it on +your own: + + [hex]: https://raw.githubusercontent.com/algernon/ergodox-supercoder/master/supercoder.hex + +``` +$ git clone https://github.com/jackhumbert/qmk_firmware.git +$ cd qmk_firmware/keyboard/ergodox_ez +$ git clone https://github.com/algernon/ergodox-supercoder.git keymaps/supercoder +$ make KEYMAP=supercoder +``` diff --git a/keyboard/ergodox_ez/keymaps/supercoder/config_user.h b/keyboard/ergodox_ez/keymaps/supercoder/config_user.h new file mode 100644 index 0000000000..8da1383726 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/config_user.h @@ -0,0 +1,9 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H 1 + +#include "config.h" + +#undef LOCKING_SUPPORT_ENABLE +#undef LOCKING_RESYNC_ENABLE + +#endif diff --git a/keyboard/ergodox_ez/keymaps/supercoder/images/layout.png b/keyboard/ergodox_ez/keymaps/supercoder/images/layout.png Binary files differnew file mode 100644 index 0000000000..c72958c6e7 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/images/layout.png diff --git a/keyboard/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg b/keyboard/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg Binary files differnew file mode 100644 index 0000000000..d690eaf020 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg diff --git a/keyboard/ergodox_ez/keymaps/supercoder/keymap.c b/keyboard/ergodox_ez/keymaps/supercoder/keymap.c new file mode 100644 index 0000000000..ca21d30fd2 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/keymap.c @@ -0,0 +1,75 @@ +/* + * SuperCoder 2000 layout + */ + +#include "ergodox_ez.h" + +/* Layers */ + +#define SC2K 0 // default layer + +/* The Keymap */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Keymap 0: Base Layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | 0 | 0 | 0 | 0 | 0 | 0 | 0 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | 0 | 0 | 0 | 0 | 0 | 0 | 0 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | 0 | 0 | 0 | 0 | 0 | 0 |------| |------| 1 | 1 | 1 | 1 | 1 | 1 | + * |-----------+------+------+------+------+------| 0 | | 1 |------+------+------+------+------+-----------| + * | 0 | 0 | 0 | 0 | 0 | 0 | | | | 1 | 1 | 1 | 1 | 1 | 1 | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | 0 | 0 | 0 | 0 | 0 | | 1 | 1 | 1 | 1 | 1 | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | DONE | DONE | | DONE | DONE | + * ,------|------|------| |------+------+------. + * | | | DONE | | DONE | | | + * | DONE | DONE |------| |------| DONE | DONE | + * | | | DONE | | DONE | | | + * `--------------------' `--------------------' + */ +[SC2K] = KEYMAP( + // left hand + KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 +,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 +,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 +,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 +,KC_0 ,KC_0 ,KC_0 ,KC_0 ,KC_0 + + ,KC_ENT ,KC_ENT + ,KC_ENT + ,KC_ENT ,KC_ENT ,KC_ENT + + // right hand + ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 + ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 + ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 + ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 + ,KC_1 ,KC_1 ,KC_1 ,KC_1 ,KC_1 + + ,KC_ENT ,KC_ENT + ,KC_ENT + ,KC_ENT ,KC_ENT ,KC_ENT + ), +}; + +const uint16_t PROGMEM fn_actions[] = { +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + return MACRO_NONE; +}; + +// 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) { +} diff --git a/keyboard/ergodox_ez/keymaps/supercoder/makefile.mk b/keyboard/ergodox_ez/keymaps/supercoder/makefile.mk new file mode 100644 index 0000000000..41a195d9c0 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/makefile.mk @@ -0,0 +1,6 @@ +BOOTMAGIC_ENABLE=no +COMMAND_ENABLE=no +SLEEP_LED_ENABLE=no +UNICODE_ENABLE=no +MOUSEKEY_ENABLE=no +EXTRAKEY_ENABLE=no diff --git a/keyboard/ergodox_ez/keymaps/supercoder/supercoder.hex b/keyboard/ergodox_ez/keymaps/supercoder/supercoder.hex new file mode 100644 index 0000000000..4a1e2fbede --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/supercoder/supercoder.hex @@ -0,0 +1,846 @@ +:100000000C9456010C949D010C949D010C949D013F
+:100010000C949D010C949D010C949D010C949D01E8
+:100020000C949D010C949D010C94D90B0C94AB0C79
+:100030000C941D190C949D010C949D010C949D0130
+:100040000C949D010C949D010C949D010C949D01B8
+:100050000C949D010C9485190C949D010C949D01A8
+:100060000C949D010C949D010C949D010C949D0198
+:100070000C949D010C949D010C949D010C949D0188
+:100080000C949D010C949D010C949D010C949D0178
+:100090000C949D010C949D010C949D010C949D0168
+:1000A0000C949D010C949D010C949D01180D3A0D2A
+:1000B000280E3A0D280E7F0DA20D280EF70D0A0E00
+:1000C00071107110A010A010FC11FC11FC11FC119A
+:1000D000D610FC1186118611ED11FC11FC11F611E0
+:1000E00093119311931193119311931193119311F0
+:1000F00093119311931193119311931193119311E0
+:10010000A511B211B911C011CA112700270027008B
+:1001100027002700000027002700270027002700CE
+:100120002800270027002700270027002800270095
+:100130002700270027002700280027002700270086
+:10014000270027002800270027002700270000009D
+:1001500028002700270000002700000028001E00BC
+:100160001E0000001E00000028001E001E001E00D1
+:100170001E00000028001E001E001E001E001E00A3
+:1001800028001E001E001E001E001E0028001E006B
+:100190001E001E001E001E0028001E001E001E0065
+:1001A0001E001E0028001E001E001E001E001E0055
+:1001B000000016034500720067006F0044006F00E6
+:1001C0007800200045005A00000016034500720028
+:1001D00067006F0044006F007800200045005A005F
+:1001E00000000403090409023B00020100A0FA090F
+:1001F0000400000103010100092111010001223F57
+:10020000000705810308000A09040100010300003A
+:1002100000092111010001223900070582031000A5
+:10022000011201100100000008EDFE07130100019A
+:1002300002000105010906A101050719E029E715DA
+:100240000025019508750181020508190129059508
+:1002500005750191029501750391010507190029A2
+:100260007715002501957875018102C00501090601
+:10027000A101050719E029E7150025019508750179
+:100280008102950175088101050819012905950567
+:10029000750191029501750391010507190029FF68
+:1002A000150025FF950675088100C00011241FBEAA
+:1002B000CFEFDAE0DEBFCDBF04B603FE27C08091EA
+:1002C000CA019091CB01A091CC01B091CD018730B2
+:1002D000904BA740B04BD1F41092CA011092CB01C1
+:1002E0001092CC011092CD0114BE84B7877F84BFD9
+:1002F0000FB6F894A89580916000886180936000A3
+:10030000109260000FBEE0E0FFE3099511E0A0E06D
+:10031000B1E0E6EBF4E302C005900D92A031B10725
+:10032000D9F721E0A0E1B1E001C01D92AA3CB207DB
+:10033000E1F70E941D090C94591A0C94000080E00A
+:1003400090E00895089508950C94A30156985E983E
+:1003500025982D9826982E9827982F988FEF90E023
+:10036000909389008093880090938B0080938A00FB
+:1003700090938D0080938C00259A2D9A2FEF80E723
+:1003800092E0215080409040E1F700C00000269AA2
+:100390002E9A2FEF80E792E0215080409040E1F7C5
+:1003A00000C00000279A2F9A2FEF80E792E021509B
+:1003B00080409040E1F700C0000025982D982FEF75
+:1003C00080E792E0215080409040E1F700C00000BB
+:1003D00026982E982FEF80E792E0215080409040A1
+:1003E000E1F700C0000027982F9856985E9825984E
+:1003F0002D9826982E9827982F98089589EA80930B
+:10040000800089E08093810024982C983F988AB1DD
+:100410008F748AB96E98479A8BB1806B8BB9769A34
+:100420000E94A6010C94A20180E2809300018091B9
+:10043000100181110EC00E94630281E080931001BF
+:100440002FEF83ED90E3215080409040E1F700C012
+:10045000000080E40E9469028093000181112EC097
+:100460000E94930280930001811128C00E94930290
+:1004700080930001811122C08FE30E949302809338
+:10048000000181111BC00E948B0280E40E9469025E
+:1004900080930001811112C08CE00E94930280932E
+:1004A000000181110BC00E94930280930001811111
+:1004B00005C08FE30E949302809300010E948B028B
+:1004C0008091000108951092B9008AE08093B800ED
+:1004D000089594EA9093BC009091BC0097FFFCCFE4
+:1004E0009091B900987F983021F0903111F081E01F
+:1004F00008958093BB0084E88093BC008091BC0089
+:1005000087FFFCCF8091B900887F883111F080345B
+:1005100071F780E0089584E98093BC008091BC006D
+:1005200084FDFCCF08958093BB0084E88093BC00D9
+:100530008091BC0087FFFCCF9091B900987F81E04B
+:10054000983209F480E0089584E88093BC0080919B
+:10055000BC0087FFFCCF8091BB0008958091000113
+:10056000811115C080E40E9469028093000181110D
+:100570000CC082E10E94930280930001811105C0AA
+:100580008FEF0E949302809300010E948B0284B13E
+:10059000807F84B985B1807F85B98AB1837F8AB92C
+:1005A0008BB1837F8BB93E98469808950E941402C0
+:1005B000809300010E94AE0280B38C7080BB81B337
+:1005C000836F81BBA2E1B1E0E0E2F1E08EE08E0F4B
+:1005D00011921D928E13FCCF0C94FE01BF92CF920C
+:1005E000DF92EF92FF920F931F93CF93DF9380914F
+:1005F0000001882379F0809111018F5F80931101B0
+:10060000811108C00E94140280930001811102C070
+:100610000E94A60102E111E0C0E0D0E0DD24D39405
+:1006200082E0C82EEE24E394F12CC730D10500F50A
+:1006300080910001811164C080E40E94690280936E
+:100640000001811112C082E10E9493028093000197
+:1006500081110BC0C7010C2E01C0880F0A94EAF764
+:1006600080950E949302809300010E948B0248C0F3
+:10067000CA30A1F028F4C83059F0C93061F005C083
+:10068000CC3089F070F0CD3089F0209A289810C0D5
+:10069000219A29980DC0229A2A980AC0239A2B9849
+:1006A00007C0529A01C0539A5B9802C03E9A46987E
+:1006B00090EA9A95F1F79FB1799902C082E001C062
+:1006C00080E091709D25982B7C9902C084E001C048
+:1006D00080E0892B7D9902C038E001C030E0832B97
+:1006E0007E9902C020E101C020E0822B9FB190954D
+:1006F000991F9927991F9295990F907E892B0FC06A
+:1007000080910001811149C080E40E9469028093B8
+:100710000001882379F1B12C0E948B028B2DF80106
+:100720009081981719F08083C09201010E94AE0257
+:1007300021960F5F1F4FCE30D10509F076CF809103
+:100740000101882361F1815080930101882339F0F0
+:100750008FE99FE00197F1F700C0000020C0A0E200
+:10076000B1E0E2E1F1E0CF01825F91919D938E13C0
+:10077000FCCF15C083E10E94930280930001811198
+:10078000CACF81E40E946902809300018111C3CF26
+:100790000E94A402B82EB094BFCF80E0C0CF0E94C8
+:1007A000A40181E0DF91CF911F910F91FF90EF9015
+:1007B000DF90CF90BF900895E82FF0E0E05EFE4F0D
+:1007C0008081089508950F931F93CF93DF93C0E224
+:1007D000D1E010E00C2F025F899190E00E94CF18C9
+:1007E000180F0C13F9CF812FDF91CF911F910F912B
+:1007F000089581E0089508950F931F93CF93DF9399
+:100800008C01FC01C081D181CE010E945417BE0130
+:100810000E949F04EC01F8018281882309F44AC0F8
+:100820008091390181111FC0C431F0E5DF0709F063
+:1008300051C00E94FB0381E0809339010E944F194F
+:100840009093380180933701109230011092320159
+:10085000109231011092340110923301109236013E
+:100860001092350165C080913701909138010E9446
+:100870005B19883C910570F480913001E82FF0E01D
+:10088000EE0FFF1FEF5CFE4FD183C0838F5F80931D
+:1008900030014EC0C43880E5D80721F0C538D045B6
+:1008A00001F13AC0F8018281882341F010922E01B3
+:1008B00082E01EC0C438E0E5DE0759F580912E01C4
+:1008C000811106C086E20E94700F86E20E94041029
+:1008D00082E01CC0C438F0E5DF0741F3C538D045DD
+:1008E000D9F4F8018281882331F010922F0180E23F
+:1008F0000E942C101DC080912F01811106C087E23B
+:100900000E94700F87E20E94041080E20E94331060
+:100910000FC0C538D04529F381E080932E01809324
+:100920002F01C801DF91CF911F910F910C94F90312
+:1009300080E0DF91CF911F910F910895089596E087
+:10094000799FF001112494E5899FE00DF11D112498
+:10095000E60FF11DEE0FFF1FE65FFE4F85919491AC
+:100960000895880F991FFC01E657F04085919491F6
+:100970000895880F991FFC01E65FFE4F85919491C1
+:1009800008950F931F93CF93DF93EC01811590434C
+:1009900050F5C11580E2D80708F0C3C0CB3BD105A4
+:1009A00090F4C83AD10508F06AC0C53AD10508F0FC
+:1009B0005BC0C430D10508F0D0C1219709F0CAC18D
+:1009C00001E010E00AC2CF3FD10511F008F0C5C127
+:1009D000C03FD10508F0A2C0CE01805E9109089702
+:1009E00008F4BBC1B7C1C13090E5D90709F4A2C072
+:1009F00020F5C0318FE4D80770F4C11590E4D90711
+:100A000008F094C0C11521E3D20708F0A3C1DD2787
+:100A10008E01106CE2C1C115D04509F09BC10E9446
+:100A20005B128FEF94E32CE0815090402040E1F77F
+:100A300000C000000E94AA19D0C1C11597E5D907CE
+:100A400058F4C03121E5D20708F01CC1C43180E55B
+:100A5000D80708F475C07EC1CE019057811590412A
+:100A600008F078C1DF7073C1C53AD10509F477C1C8
+:100A7000C63AD10509F076C102E810E4AEC1C83A21
+:100A8000D10509F472C1C93AD10509F471C1CA3A54
+:100A9000D10509F470C1CB3AD10509F46FC1CC3A44
+:100AA000D10509F46EC1CD3AD10509F46DC1C03B41
+:100AB000D10509F46CC1CE3AD10509F46BC1CF3A26
+:100AC000D10509F46AC1C13BD10509F469C1C23B32
+:100AD000D10509F468C1C33BD10509F467C1C43B22
+:100AE000D10509F466C1C53BD10509F465C1C63B12
+:100AF000D10509F464C1C73BD10509F463C1C83B02
+:100B0000D10509F462C1C93BD10509F461C1CA3BF1
+:100B1000D10509F460C100E014E45FC18E011065E5
+:100B20005CC1CE019F700E94B90458C1DF708E0174
+:100B3000106A53C18091B60181608093B6014DC1A6
+:100B40000E94011A811102C00E94E7190E94141A22
+:100B500090E09093CA018093C901C23080E5D80724
+:100B600021F48091C901816086C0C43090E5D90725
+:100B700021F48091C90182607EC0C63020E5D20791
+:100B800021F48091C901846076C0C83080E5D8071F
+:100B900019F48091C90127C0CA3090E5D90721F422
+:100BA0008091C901806167C0CC3020E5D20721F473
+:100BB0008091C90180625FC0CE3080E5D80721F402
+:100BC0008091C901806457C0C03190E5D90721F4F4
+:100BD0008091C90180684FC0C23120E5D20729F455
+:100BE0008091C9018460886046C0C33080E5D80721
+:100BF00021F48091C9018E7F3EC0C53090E5D907B0
+:100C000021F48091C9018D7F36C0C73020E5D2071D
+:100C100021F48091C9018B7F2EC0C93080E5D807AF
+:100C200019F48091C90126C0CB3090E5D90721F491
+:100C30008091C9018F7E1FC0CD3020E5D20721F4FD
+:100C40008091C9018F7D17C0CF3080E5D80721F48E
+:100C50008091C9018F7B0FC0C13190E5D90721F484
+:100C60008091C9018F7707C0C331D04531F480919D
+:100C7000C9018B7F877F8093C9018091C9010E9440
+:100C8000181AABC08D2F99278F7099278130910545
+:100C9000D9F49E012370332702C0880F991F2A952B
+:100CA000E2F79C688E0144E0000F111F4A95E1F7BE
+:100CB00000271370802B912B53E0CC0FDD1F5A952A
+:100CC000E1F7C076DD272FC08230910531F4DC2FAB
+:100CD000CC278E01016F106A80C08330910569F4C2
+:100CE000CE018370992701E010E002C0000F111FB0
+:100CF0008A95E2F7C8019C680FC084309105B9F469
+:100D0000CE018370992701E010E002C0000F111F8F
+:100D10008A95E2F7C8019A6823E0CC0FDD1F2A9577
+:100D2000E1F7C07ED7708C010C2B1D2B56C085308F
+:100D3000910531F4DC2FCC278E01046F106A4DC071
+:100D4000069709F04AC0CF71DD27DC2FCC278E0132
+:100D5000106243C000E010E040C08E013EC001E8D8
+:100D600010E43BC003E810E438C002EE14E435C0E0
+:100D700009EE14E432C00AEE14E42FC005EB14E4CB
+:100D80002CC006EB14E429C007EB14E426C00CECDD
+:100D900014E423C00DEC14E420C003E815E41DC0E6
+:100DA0000AE815E41AC002E915E417C004E915E4DD
+:100DB00014C001E216E411C003E216E40EC004E21E
+:100DC00016E40BC005E216E408C006E216E405C00E
+:100DD00007E216E402C00AE216E4C801DF91CF91EF
+:100DE0001F910F91089596E0799FF001112494E5E9
+:100DF000899FE00DF11D1124E60FF11DEE0FFF1F7D
+:100E0000E65FFE4F85919491803E9105E0F4803C31
+:100E1000910558F58133910509F46FC048F4893282
+:100E2000910509F463C08A32910509F46DC072C05E
+:100E300089339105E9F082389105D1F08533910528
+:100E400009F44DC067C0833E910581F138F4803EBE
+:100E50009105B9F0823E9105D9F05CC0863E9105BE
+:100E600061F1873E9105A1F155C00E94B10408953A
+:100E70002091C90120FD02C021FF4CC080EE90E00E
+:100E800049C08091C90180FFF9CF89E390E042C059
+:100E90008091C90182FF0EC08091C90184FF03C007
+:100EA00080E090E037C083EE90E034C08091C901CB
+:100EB00082FFF2CF82EE90E02DC08091C90183FFC6
+:100EC0000BC08091C90184FDEBCF87EE90E022C07A
+:100ED0008091C90183FFF5CF86EE90E01BC0809121
+:100EE000C90185FF07C089E290E014C08091C90163
+:100EF00085FFF9CF85E390E00DC08091C90186FFA1
+:100F000007C08AE290E006C08091C90186FFF9CF50
+:100F100081E390E00E94C104089508950C948D0728
+:100F200080914A0108950895CF93DF9300D01F92D6
+:100F3000CDB7DEB72091C001243021F523E029830D
+:100F40009B838A8381E08093E9008FEF9091E80092
+:100F5000815095FD06C095ED9A95F1F7000081113D
+:100F6000F5CF8091E80085FF0DC040E050E063E0E0
+:100F700070E0CE0101960E94C9098091E8008E7749
+:100F80008093E8000F900F900F90DF91CF9108951C
+:100F9000CF93DF9300D01F92CDB7DEB72091C00171
+:100FA000243021F522E029839B838A8381E080938A
+:100FB000E9008FEF9091E800815095FD06C095ED16
+:100FC0009A95F1F700008111F5CF8091E80085FF37
+:100FD0000DC040E050E063E070E0CE0101960E9459
+:100FE000C9098091E8008E778093E8000F900F90F8
+:100FF0000F90DF91CF910895CF93DF932091C0019F
+:10100000243009F048C0EC0180910C018823E1F004
+:1010100080910D018823C1F082E08093E9008FEF79
+:101020009091E800815095FD06C095E19A95F1F701
+:1010300000008111F5CF8091E80085FF2CC040E0D1
+:1010400050E060E170E017C081E08093E9008FEF2D
+:101050009091E800815095FD06C095ED9A95F1F7C5
+:1010600000008111F5CF8091E80085FF14C040E0B9
+:1010700050E068E070E0CE010E94C9098091E8006C
+:101080008E778093E80080E1FE01AAE3B1E0019051
+:101090000D928A95E1F7DF91CF9108958091BF017C
+:1010A000811109C00E945E0B0E94BB0B8091E2007F
+:1010B00084608093E20008951092BF01089508951E
+:1010C00008950C94171942E061EC81E00E94D80A5F
+:1010D00042E161EC82E00C94D80A8091C201833035
+:1010E00009F453C030F4813071F0823009F48CC0BF
+:1010F00008958A3009F478C08B3009F45EC08930D5
+:1011000009F09AC020C08091C101813A09F094C0D1
+:101110008091E800877F8093E8008091C5019091DD
+:10112000C601892B21F460E18AE391E003C060E00D
+:1011300080E090E070E00E94140A8091E8008B77D4
+:101140008093E80008958091C101813209F074C054
+:101150008091C5019091C601029708F06DC0809101
+:10116000E800877F8093E8008091E80082FD05C059
+:101170008091C0018111F8CF5FC08091F100809310
+:101180004A018091E8008B7753C08091C101813A78
+:1011900009F052C08091C5019091C601892B09F0D8
+:1011A0004BC08091E800877F8093E8008091E80041
+:1011B00080FFFCCF80910C0136C08091C10181324B
+:1011C000D9F58091C5019091C601892BA9F580912F
+:1011D000E800877F8093E8000E940D0B8091C30197
+:1011E00080930C010C945B128091C101813221F536
+:1011F0008091E800877F8093E8000E940D0B80912A
+:10120000C40180934B0108958091C101813AA1F4FA
+:101210008091E800877F8093E8008091E80080FF5C
+:10122000FCCF80914B018093F1008091E8008E7794
+:101230008093E8000C940D0B089584B7877F84BFDA
+:101240000FB6F894A8958091600088618093600043
+:10125000109260000FBE90E080E80FB6F894809383
+:101260006100909361000FBE0E94A50E0E945E0B6C
+:101270000E94BB0B8091E20084608093E20078942E
+:101280000E94410E0E94A70E82E091E00E945C0E37
+:101290008091C001853069F40E94DB188091BE0105
+:1012A0008823B1F30E940919882391F30E94B3099E
+:1012B000EFCF0E94AD0EECCF292F3327233031051D
+:1012C000C9F064F42130310581F02230310509F094
+:1012D00042C08BE390E026EE31E041C0213231057F
+:1012E000F1F02232310549F136C082E190E021E28D
+:1012F00032E035C099278130910541F08230910567
+:1013000041F0892B41F5E2EEF1E005C0EAECF1E0B5
+:1013100002C0E2EBF1E0849190E09F0120C06623DF
+:1013200039F06130C1F489E090E021E132E017C08A
+:1013300089E090E028EF31E012C0662339F0613097
+:1013400051F489E390E023E332E009C08FE390E0B9
+:101350002CE632E004C080E090E020E030E0FA01CA
+:1013600031832083089580E189BD82E189BD09B47C
+:1013700000FEFDCF8091D8008F7D8093D8008091B2
+:10138000E00082608093E0008091E00081FDFCCF6E
+:101390000895CF92DF92EF92FF920F931F93CF9316
+:1013A000DF93EC018B016A010E942C0B811133C089
+:1013B000C114D10439F0F60180819181081B190B09
+:1013C000C80FD91FE12CF12C0115110519F18091DD
+:1013D000E80085FD16C08091E8008E778093E800D4
+:1013E000C114D10449F0F60180819181E80EF91E03
+:1013F000F182E08285E00FC00E942C0B882321F34C
+:101400000AC089918093F10001501109FFEFEF1A92
+:10141000FF0ADACF80E0DF91CF911F910F91FF900B
+:10142000EF90DF90CF9008952091C7013091C801CF
+:101430002617370748F06115710539F42091E80047
+:101440002E772093E80001C0B90140E061157105D5
+:10145000A9F12091C001222309F443C0253009F4E9
+:1014600042C02091E80023FD40C02091E80022FD09
+:1014700032C02091E80020FFE9CF4091F300209195
+:10148000F20030E0342BFC01CF016115710559F0F9
+:101490002830310540F481918093F1006150710949
+:1014A0002F5F3F4FF1CF41E02830310509F040E098
+:1014B0002091E8002E772093E800C8CF4111C9CFD2
+:1014C0000AC08091C001882361F0853061F080916D
+:1014D000E80083FD0AC08091E80082FFF2CF80E03F
+:1014E000089582E0089583E0089581E008952091B1
+:1014F000C7013091C8012617370748F061157105FB
+:1015000039F42091E8002E772093E80001C0B9015A
+:10151000FC0120E06115710591F18091C0018823E3
+:1015200009F440C0853009F43FC08091E80083FD94
+:101530003DC08091E80082FD2FC08091E80080FFCF
+:10154000E9CF2091F3008091F20090E0922B611599
+:10155000710559F08830910540F424912093F100F1
+:101560003196615071090196F2CF21E0089709F098
+:1015700020E08091E8008E778093E800CBCF2111A6
+:10158000CCCF0AC08091C001882361F0853061F022
+:101590008091E80083FD0AC08091E80082FFF2CFCD
+:1015A00080E0089582E0089583E0089581E0089541
+:1015B000982F973058F59093E900981739F070916B
+:1015C000EC002091ED005091F00003C0242F762F05
+:1015D00050E021FF19C03091EB003E7F3093EB00CB
+:1015E0003091ED003D7F3093ED003091EB003160A4
+:1015F0003093EB007093EC002093ED005093F000DB
+:101600002091EE0027FF07C09F5FD3CF8F7080939C
+:10161000E90081E0089580E008958091C10187FF8D
+:1016200011C08091E80082FD05C08091C001811148
+:10163000F8CF11C08091E8008B770BC08091C0017A
+:10164000882349F08091E80080FFF8CF8091E8007E
+:101650008E778093E80008952091E4003091E500B2
+:1016600095E64091EC00842F817040FF22C080916C
+:10167000E80080FD1CC08091C001882391F0853076
+:1016800091F08091EB0085FD10C04091E4005091F5
+:10169000E5004217530729F39A01915011F784E0AE
+:1016A000089582E0089583E0089581E0089580E040
+:1016B00008954091E80042FFDECF08950E94CC0BD0
+:1016C0000E94D40BE0EEF0E0808181608083E8ED41
+:1016D000F0E080818F77808319BCA7EDB0E08C911A
+:1016E0008E7F8C9380818F7E80831092BF010895BE
+:1016F0000F931F93CF93DF930E94CC0B0E94D40BC8
+:10170000C8EDD0E088818F7788838881806888835E
+:1017100088818F7D888319BC1092C0011092BC0112
+:101720001092BE011092BD0100EE10E0F801808120
+:101730008B7F808388818160888342E060E080E0E5
+:101740000E94D80AE1EEF0E080818E7F8083E2EE95
+:10175000F0E0808181608083808188608083F801EF
+:1017600080818E7F8083888180618883DF91CF91A3
+:101770001F910F910895E8EDF0E080818F7E8083C6
+:10178000E7EDF0E080818160808384E082BF81E0CA
+:101790008093BF010C94780BE8EDF0E080818E7FA0
+:1017A00080831092E20008951092DA001092E10016
+:1017B00008951F920F920FB60F9211242F933F930B
+:1017C0004F935F936F937F938F939F93AF93BF9349
+:1017D000EF93FF938091E10082FF0BC08091E200C4
+:1017E00082FF07C08091E1008B7F8093E1000E941F
+:1017F000400E8091DA0080FF1FC08091D80080FFEA
+:101800001BC08091DA008E7F8093DA008091D9002E
+:1018100080FF0DC080E189BD82E189BD09B400FE71
+:10182000FDCF81E08093C0010E944E0805C019BC25
+:101830001092C0010E945C088091E10080FF19C0F5
+:101840008091E20080FF15C08091E2008E7F80933E
+:10185000E2008091E20080618093E2008091D800F4
+:1018600080628093D80019BC85E08093C0010E94FB
+:1018700060088091E10084FF30C08091E20084FF25
+:101880002CC080E189BD82E189BD09B400FEFDCF95
+:101890008091D8008F7D8093D8008091E1008F7E69
+:1018A0008093E1008091E2008F7E8093E20080913E
+:1018B000E20081608093E2008091BC01882311F0F6
+:1018C00084E007C08091E30087FD02C081E001C091
+:1018D00083E08093C0010E9461088091E10083FF52
+:1018E00029C08091E20083FF25C08091E100877FBD
+:1018F0008093E10082E08093C0011092BC0180914E
+:10190000E1008E7F8093E1008091E2008E7F8093E2
+:10191000E2008091E20080618093E20042E060E0BA
+:1019200080E00E94D80A8091F00088608093F000E7
+:101930000E945F08FF91EF91BF91AF919F918F91AE
+:101940007F916F915F914F913F912F910F900FBEBB
+:101950000F901F9018951F920F920FB60F9211249F
+:101960002F933F934F935F936F937F938F939F93A7
+:10197000AF93BF93CF93DF93EF93FF93C091E900B1
+:10198000CF708091EC00D82FD17080FDD0E81092FC
+:10199000E9008091F000877F8093F00078940E94A6
+:1019A000EF0C1092E9008091F00088608093F000C5
+:1019B000CD2BCF70C093E900FF91EF91DF91CF91D4
+:1019C000BF91AF919F918F917F916F915F914F9157
+:1019D0003F912F910F900FBE0F901F9018951F935E
+:1019E000CF93DF93CDB7DEB7AA970FB6F894DEBFDB
+:1019F0000FBECDBFE1ECF1E088E08E0F9091F100D9
+:101A000091938E13FBCF0E946D088091E80083FFB5
+:101A10001FC18091C1019091C201492F50E04A300D
+:101A2000510508F015C1FA01EA5AFF4F0C941D1A2E
+:101A3000803881F0823809F00BC18091C5018F7028
+:101A40008093E9008091EB0085FB882780F9109254
+:101A5000E90006C08091BD019091BE0191118260A4
+:101A60009091E800977F9093E8008093F1001092A6
+:101A7000F100C8C0282F2D7F09F0EAC0882319F093
+:101A8000823061F0E5C08091C301813009F0E0C08F
+:101A9000933009F080E08093BE012BC08091C30198
+:101AA000811127C08091C5018F7009F4D1C0809346
+:101AB000E9002091EB0020FF1CC0933021F48091BD
+:101AC000EB00806214C09091EB0090619093EB006A
+:101AD00021E030E0A90102C0440F551F8A95E2F7CA
+:101AE0004093EA001092EA008091EB0088608093B6
+:101AF000EB001092E9008091E800877F86C0811199
+:101B0000A7C01091C3011F778091E3008078812BDB
+:101B10008093E3008091E800877F8093E8000E9433
+:101B20000D0B8091E80080FFFCCF8091E30080687E
+:101B30008093E300111102C082E001C083E0809332
+:101B4000C00186C08058823008F082C08091C301F5
+:101B50009091C4018C3D53E0950779F583E08A8329
+:101B60008AE289834FB7F894DE01139620E03EE0C5
+:101B700051E2E32FF0E050935700E49120FF03C0BF
+:101B8000E295EF703F5FEF708E2F90E0EA3010F03B
+:101B9000C79601C0C0968D939D932F5F243149F75E
+:101BA0004FBF8091E800877F8093E8006AE270E091
+:101BB000CE0101960E94140A14C0AE014F5F5F4F20
+:101BC0006091C5010E945C09BC01892B09F440C0E9
+:101BD0009091E800977F9093E80089819A810E9414
+:101BE000770A8091E8008B778093E80031C08038D5
+:101BF00079F58091E800877F8093E8008091BC01AF
+:101C00008093F1008091E8008E778093E8000E9435
+:101C10000D0B1EC081111CC09091C3019230C0F405
+:101C20008091E800877F8093E8009093BC010E9438
+:101C30000D0B8091BC01811106C08091E30087FDEE
+:101C400002C081E001C084E08093C0010E9463086B
+:101C50008091E80083FF0AC08091E800877F80932D
+:101C6000E8008091EB0080628093EB00AA960FB6AB
+:101C7000F894DEBF0FBECDBFDF91CF911F910895C5
+:101C80000895CF938091C0018823A1F0C091E9000D
+:101C9000CF709091EC00892F817090FD80E8C82B67
+:101CA0001092E9008091E80083FD0E94EF0CCF7054
+:101CB000C093E900CF910895909351018093500112
+:101CC0000895E0915001F0915101309721F0019079
+:101CD000F081E02D099480E00895E0915001F091A9
+:101CE0005101309721F00280F381E02D099408958D
+:101CF00020914E0130914F018217930771F090931C
+:101D00004F0180934E01E0915001F09151013097C5
+:101D100021F00680F781E02D0994089520914C016F
+:101D200030914D018217930771F090934D0180938C
+:101D30004C01E0915001F0915101309721F0008465
+:101D4000F185E02D0994089508950C94A40E0E9445
+:101D500046190E94D6020C94CC199F92AF92BF9262
+:101D6000CF92DF92EF92FF920F931F93CF93DF9367
+:101D700000D000D000D0CDB7DEB70E94EE020DE05B
+:101D800010E0AA24A394B12C902E802F0E94DC0393
+:101D900098012D5A3E4F6901F901F080F826A1F40F
+:101DA0000150110988F78FEF89838A831B820E9473
+:101DB0004F198160782F9D838C8349815A816B8173
+:101DC0008D810E94420F2FC09091B60191FF04C0F7
+:101DD0008E830E94E2038E8125E030E0A501022E71
+:101DE00001C0440F0A94EAF7E42E4F21C1F0298381
+:101DF0009A828E2191E009F490E09B830E944F1912
+:101E00008160782F9D838C8349815A816B818D817C
+:101E10000E94420FF6018081E826E08204C0215032
+:101E20003109E0F6BDCF109152010E94610E1817E2
+:101E3000B9F00E94610E8093520126960FB6F89475
+:101E4000DEBF0FBECDBFDF91CF911F910F91FF90ED
+:101E5000EF90DF90CF90BF90AF909F900C948E0743
+:101E600026960FB6F894DEBF0FBECDBFDF91CF919F
+:101E70001F910F91FF90EF90DF90CF90BF90AF90A8
+:101E80009F900895CF93DF93CDB7DEB72B970FB612
+:101E9000F894DEBF0FBECDBF4F83588769877A871E
+:101EA0008B87DE01119686E0FD0111928A95E9F794
+:101EB00085E0FE01379601900D928A95E1F7498100
+:101EC0005A816B817C818D819E810E94F9142B96B1
+:101ED0000FB6F894DEBF0FBECDBFDF91CF9108954E
+:101EE000882309F490C09CEF980F913A18F40E944F
+:101EF000D3170DC090E2980F983058F4877091E096
+:101F000001C0990F8A95EAF7892F0E9459180C94FD
+:101F1000A0189BE5980F933070F4853A29F0863A23
+:101F200031F083E890E005C081E890E002C082E8EB
+:101F300090E00C94780E98E5980F933108F063C008
+:101F4000883A39F1893A41F18A3A49F18B3A51F1AB
+:101F50008C3A59F18D3A61F1803B69F18E3A71F119
+:101F60008F3A79F1813B81F1823B89F1833B91F199
+:101F7000843B99F1853BA1F1863BA9F1873BB1F107
+:101F8000883BB9F1893BC1F18A3BC9F180E090E01F
+:101F900038C082EE90E035C089EE90E032C08AEE23
+:101FA00090E02FC085EB90E02CC086EB90E029C03C
+:101FB00087EB90E026C08CEC90E023C08DEC90E0A5
+:101FC00020C083E891E01DC08AE891E01AC082E950
+:101FD00091E017C084E991E014C081E292E011C061
+:101FE00083E292E00EC084E292E00BC085E292E0D0
+:101FF00008C086E292E005C087E292E002C08AE271
+:1020000092E00C948E0E0895882329F19CEF980F8E
+:10201000913A18F40E9415180DC090E2980F98306C
+:1020200058F4877091E001C0990F8A95EAF7892FDB
+:102030000E945F180C94A0189BE5980F933020F431
+:1020400080E090E00C94780E885A833120F480E090
+:1020500090E00C948E0E0895882321F00E94591868
+:102060000C94A0180895882321F00E945F180C9406
+:10207000A01808957F928F929F92AF92BF92CF92B5
+:10208000DF92EF92FF920F931F93CF93DF931F92F4
+:10209000CDB7DEB77C01C62E772EFC0115811295D7
+:1020A0001F70028101110E9476180E94CC178823AC
+:1020B00079F0002369F080E28C0D883048F082E0EE
+:1020C0000E94B5170E94CC1791E0D82ED92601C0E6
+:1020D000D12CE72DE295EF70F0E0E05AFF4F0C9421
+:1020E0001D1A872D807F172D1F70882311F01295E0
+:1020F000107F002389F0112309F465C180E28C0D63
+:10210000883020F4812F0E94591803C0812F0E942B
+:1021100069180E94A01857C18C2D0E940410112329
+:1021200009F46AC180E28C0D883020F4812F0E946E
+:102130005F1803C0812F0E946F180E94A0185CC115
+:10214000972D907F872D8F70903211F08295807F30
+:10215000CC2021F0F1E0CF16B1F01EC0002349F0F1
+:10216000112309F4E9C0113009F0E6C00E94891872
+:1021700043C1112319F0113009F43EC189830E9433
+:102180008C188981DFC0002321F0123008F034C19F
+:10219000D3C0111131C1D6C0002321F0112309F49D
+:1021A000CBC011C1112309F4CDC013C1872D837099
+:1021B00009F052C0011120C18C2D8295869587703F
+:1021C000880F880F9C2D9F70892E912CA12CB12CEB
+:1021D000082E04C0880C991CAA1CBB1C0A94D2F7B8
+:1021E000C4FE14C00FE010E020E030E0B901A80107
+:1021F00004C0440F551F661F771F8A95D2F7CB0185
+:10220000BA01609570958095909503C060E070E08C
+:10221000CB01272D26952695237030E022303105FD
+:1022200069F02330310589F0682979298A299B29A9
+:102230002130310571F00E944116DEC068297929EC
+:102240008A299B290E945D16D7C00E944116C501AC
+:10225000B4010E942516D0C0002319F0872D81708B
+:1022600001C08695882309F4C7C08C2D8295869578
+:102270008770880F880F9C2D9F70892E912CA12C20
+:10228000B12C082E04C0880C991CAA1CBB1C0A94F3
+:10229000D2F7C4FE14C00FE010E020E030E0B90136
+:1022A000A80104C0440F551F661F771F8A95D2F7F7
+:1022B000CB01BA01609570958095909503C060E060
+:1022C00070E0CB01272D269526952370422F50E0F4
+:1022D0004230510569F04330510589F06829792968
+:1022E0008A299B294130510571F00E941B1784C037
+:1022F000682979298A299B290E9437177DC00E9465
+:102300001B17C501B4010E94FF1676C08C2D90E00A
+:10231000FC01E05EF109E531F10508F050C0E0593B
+:10232000FF4F0C941D1A1C2D1F70872D8F710023D9
+:1023300031F00E949816812F0E942C105DC00E94DF
+:10234000B916812F0E94331057C0002339F01111A4
+:1023500053C0872D8F710E94DE164EC0123008F0D8
+:102360004BC0F7CF002339F0872D8F710E9498164C
+:1023700043C00023C9F3872D8F710E94B9163CC05A
+:10238000002329F0872D8F710E94831635C00E948B
+:10239000791632C0002351F0172D1F71812F0E9432
+:1023A000981663E0812F0E94AC1726C081E00E943E
+:1023B000B517123008F182E00E94B5171DC0002346
+:1023C00031F0112389F28C2D0E94700F15C011235A
+:1023D00091F28C2D0E9404100FC0472D4F706C2D70
+:1023E000C7010E949F010E949D1506C0472D4F7096
+:1023F0006C2DC7010E949E04DD20F9F00E94A817F1
+:1024000080FD1BC0F70112820E94A2170E9498163D
+:10241000C7010E942C120E94A2170F90DF91CF914A
+:102420001F910F91FF90EF90DF90CF90BF90AF90F2
+:102430009F908F907F900C94B9160F90DF91CF9161
+:102440001F910F91FF90EF90DF90CF90BF90AF90D2
+:102450009F908F907F9008950F931F93CF93DF935A
+:10246000EC01888199812B813C81232BB9F09F3F1E
+:1024700011F48F3F99F0CE010E94FC03882371F084
+:10248000688179818A810E949E178C010E9453176E
+:102490000E941A16B801CE010E943A10DF91CF9126
+:1024A0001F910F9108950E9476180E9486180E942D
+:1024B0004B180C94A0180E9466180C9453120E949A
+:1024C0009317292F22952F7030E02C3031054CF4D2
+:1024D0002A3031056CF42250310922303105A8F43C
+:1024E00007C02C30310569F02F30310551F00DC097
+:1024F000803F69F018F4803E40F409C0843F29F41D
+:1025000006C093FB882780F9089580E0089581E054
+:102510000895CF93DF9300D000D01F92CDB7DEB7E0
+:102520000F900F900F900F900F90DF91CF91089523
+:10253000CF93DF9300D000D000D0CDB7DEB7269682
+:102540000FB6F894DEBF0FBECDBFDF91CF910895D7
+:102550001F93CF93DF93C091610116E080916201D8
+:10256000C81799F0D0E01C9FF0011D9FF00D1124B9
+:10257000ED59FE4F40815181628173818481958143
+:102580000E9498122196C770E9CFDF91CF911F91D9
+:10259000089540919301509194016091950170913B
+:1025A000960180919701909198010C9498128091D6
+:1025B000980182958F7009F054C08091950188230D
+:1025C00009F44FC080916101A09162016091930173
+:1025D000709194014091960150919701B6E08A174D
+:1025E00009F43FC090E041155105C1F17F3F11F45E
+:1025F0006F3FA1F1B89FF001B99FF00D1124ED5983
+:10260000FE4F218172132AC02081621327C02281CC
+:10261000211124C0238134812417350710F421505F
+:102620003109241B350B283C3105C0F42091980159
+:102630002F7020612093980126E0289FF001299FA8
+:10264000F00D1124E859FE4F80818F7080618083E6
+:1026500083E991E00E942C120C94A81201968770D5
+:10266000BECF0895CF92DF92EF92FF920F931F9308
+:10267000CF93DF93CDB7DEB762970FB6F894DEBF86
+:102680000FBECDBF8C0185E0F801DE011D960190E3
+:102690000D928A95E1F7D8014C9111965C911197B2
+:1026A00012966C9112971396CD90DC9014973091FE
+:1026B00093017091940180919601909197010097F8
+:1026C00009F46BC17F3F19F43F3F09F466C1E09004
+:1026D0009501EE2009F4C0C020919801C816D906D2
+:1026E00028F0F601E81BF90BCF0104C08095909506
+:1026F0008C0D9D1DFF24F394883C910578F0F12CFE
+:10270000207F09F0C6C07C2DD98AC88A89890E9499
+:10271000891283E991E00E942C12B1C0822F807F40
+:1027200009F046C0751314C0341312C0611110C0F3
+:102730002F702061209398010E94C91283E991E0D3
+:102740000E942C1280919801D80115968C932EC06E
+:10275000CD2819F15F3F11F44F3FF9F0F62E6111CA
+:102760001CC0809161012091620136E0821709F45A
+:102770005AC090E0389FF001399FF00D1124ED59B7
+:10278000FE4F7181571306C07081471303C07281D9
+:10279000711103C001968770E9CFF62E662309F404
+:1027A00018C180919801816080939801F12C11C12A
+:1027B000751308C0341306C0611104C080919801DC
+:1027C000D801C3C04D875E878D859E856A8B0E9428
+:1027D0005F126A898823E1F16623D1F12091980183
+:1027E000822F82958F7090E0029774F08091930110
+:1027F0009091940198878F831986DB86CA862C87EF
+:10280000CE0107960E942C1286E0F801A3E9B1E000
+:1028100001900D928A95E1F70E94D7120E94C91289
+:10282000FF24F394D6C04D875E878D859E850E94D8
+:102830009317292F22952F7030E0223031050CF0AC
+:10284000BCC09F7009F0B6C0805E883008F4C1C07B
+:10285000C8010E942C12E4CFC816D90608F453C050
+:10286000F601E81BF90BCF01883C910508F450C034
+:10287000F12C7C2DD98AC88A89890E948912E3E9C2
+:10288000F1E086E0DF011D928A95E9F70E94C91206
+:10289000A0C0751314C0341312C0611110C0809110
+:1028A0009801F8018583C8010E942C1286E0E3E9B3
+:1028B000F1E0DF011D928A95E9F7FE2C8AC04D8771
+:1028C0005E878D859E856A8B0E945F126A89882348
+:1028D00009F4BECF662309F4BBCF20919801822F63
+:1028E00082958F7090E002970CF48ECF80919301C7
+:1028F000909194019A8389831B82DD82CC822E83FE
+:10290000CE0101967FCF809590958C0D9D1DACCF0B
+:10291000F62E662309F49CCF75132EC034132CC0F9
+:102920002091980120FD1FC0822F82958F70D9F0D1
+:10293000D80115962C9315978F3049F08F5F982FFB
+:102940009295907F822F8F70892B15968C93C8015A
+:102950000E942C1286E0F801A3E9B1E001900D92EB
+:102960008A95E1F793CF86E0F801A3E9B1E0019001
+:102970000D928A95E1F72DC04D875E878D859E85E6
+:102980000E945F12811140CF8091980181608093F5
+:102990009801C8010E942C121CC0662309F458CF6C
+:1029A0004D875E878D859E850E945F12882309F47E
+:1029B0004FCF2ACF811148CF0CC0243031050CF005
+:1029C00047CF9F7009F440CFF8019581907F09F0BF
+:1029D0003BCF8F2D62960FB6F894DEBF0FBECDBFF2
+:1029E000DF91CF911F910F91FF90EF90DF90CF90EB
+:1029F00008951F93CF93DF93CDB7DEB72C970FB613
+:102A0000F894DEBF0FBECDBF4F83588769877A87A2
+:102A10008B879C87CE0107960E943213882369F02A
+:102A20008F8198852A853B85232BF1F19F3F09F003
+:102A300063C08F3F09F060C037C086E0FE01379663
+:102A4000DE01119601900D928A95E1F76F817885EC
+:102A5000EA85FB85309741F17F3F11F46F3F21F10B
+:102A60002091620130E0C901019687709927409159
+:102A7000610150E08417950709F447C069837A83A0
+:102A8000FD83EC8396E0929FD001939FB00D1124BB
+:102A9000AD59BE4FFE01319601900D929A95E1F726
+:102AA000809362010E94A81216E0809161019091CA
+:102AB00062018917C1F1189FC00111248D599E4FE1
+:102AC0000E943213882379F1E09161011E9FF00189
+:102AD0001124ED59FE4F40815181628173818481BF
+:102AE00095810E9498128091610190E00196877013
+:102AF000992780936101D9CF4F81588569857A855F
+:102B00008B859C850E949812CFCF0E945B121092F9
+:102B1000620110926101E3E9F1E086E0DF011D92BC
+:102B20008A95E9F7C1CF2C960FB6F894DEBF0FBE99
+:102B3000CDBFDF91CF911F910895EF92FF920F9338
+:102B40001F93CF93DF938C01892B09F46CC0F12C78
+:102B5000EE24E394E8012196F8018491843740F44F
+:102B6000843008F051C0813081F0823019F15BC0AF
+:102B7000853709F444C0A8F19CE7980F903708F016
+:102B800052C08F770E94041041C00E5F1F4FFE019C
+:102B9000C49180E28C0F883048F4C7708E2D01C03C
+:102BA000880FCA95EAF70E94791814C08C2F0E94EA
+:102BB000700F2DC00E5F1F4FFE01C49180E28C0F7D
+:102BC000883058F4C7708E2D01C0880FCA95EAF777
+:102BD0000E947F180E94A0181AC08C2F0E94041017
+:102BE00016C00E5F1F4FFE01C491CC2381F08FE908
+:102BF0009FE00197F1F700C00000C150F6CF0E5FD3
+:102C00001F4FFE01F49003C00E94700F8E018F2DA4
+:102C1000882309F49FCFEFE9FFE03197F1F700C077
+:102C200000008150F5CFDF91CF911F910F91FF9060
+:102C3000EF900895089560939D0170939E01809395
+:102C40009F019093A0010C9453120F931F93009136
+:102C50009D0110919E0120919F013091A001DC0106
+:102C6000CB01802B912BA22BB32B80939D019093B2
+:102C70009E01A0939F01B093A0011F910F910C940E
+:102C800053120F931F9300919D0110919E0120916B
+:102C90009F013091A001DC01CB0180239123A2236D
+:102CA000B32380939D0190939E01A0939F01B093C5
+:102CB000A0011F910F910C9453120F931F93009139
+:102CC0009D0110919E0120919F013091A001DC0196
+:102CD000CB0180279127A227B32780939D01909352
+:102CE0009E01A0939F01B093A0011F910F910C949E
+:102CF00053121092990110929A0110929B01109216
+:102D00009C010C94531241E050E060E070E004C07C
+:102D1000440F551F661F771F8A95D2F7409399017C
+:102D200050939A0160939B0170939C010C945312F1
+:102D300041E050E060E070E004C0440F551F661FA2
+:102D4000771F8A95D2F78091990190919A01A0916D
+:102D50009B01B0919C01482B592B6A2B7B2B4093F4
+:102D6000990150939A0160939B0170939C010C947C
+:102D7000531241E050E060E070E004C0440F551F82
+:102D8000661F771F8A95D2F740955095609570958C
+:102D90008091990190919A01A0919B01B0919C0121
+:102DA000482359236A237B234093990150939A0126
+:102DB00060939B0170939C010C94531241E050E08E
+:102DC00060E070E004C0440F551F661F771F8A95AE
+:102DD000D2F78091990190919A01A0919B01B091B5
+:102DE0009C01482759276A277B27409399015093D4
+:102DF0009A0160939B0170939C010C9453120F9362
+:102E00001F930091990110919A0120919B0130919B
+:102E10009C01DC01CB01802B912BA22BB32B809347
+:102E2000990190939A01A0939B01B0939C011F91EB
+:102E30000F910C9453120F931F93009199011091CD
+:102E40009A0120919B0130919C01DC01CB018023F0
+:102E50009123A223B3238093990190939A01A09385
+:102E60009B01B0939C011F910F910C9453120F93EF
+:102E70001F930091990110919A0120919B0130912B
+:102E80009C01DC01CB0180279127A227B3278093E7
+:102E9000990190939A01A0939B01B0939C011F917B
+:102EA0000F910C9453120895CF92DF92EF92FF92FC
+:102EB0000F931F93CF93DF938C01C0909D01D0900F
+:102EC0009E01E0909F01F090A00180919901909166
+:102ED0009A01A0919B01B0919C01C82AD92AEA2AA3
+:102EE000FB2ACFE1D0E0D701C6010C2E04C0B69575
+:102EF000A795979587950A94D2F780FF06C0B801E9
+:102F00008C2F0E94F306019721F4219760F780E04F
+:102F100001C08C2FDF91CF911F910F91FF90EF9007
+:102F2000DF90CF900895CF93DF93EC010E94541768
+:102F3000BE010E94F306DF91CF910895CB010E945C
+:102F4000931708958091A10185958595859508959C
+:102F50008091A1018770089598E0899F90011124C4
+:102F6000262B2093A1010C9498162091A101809505
+:102F700082238093A101982F977069F430E0482F45
+:102F8000082E000C550B2417350729F085958595DB
+:102F900085950C94B91608959091A101977081E0E0
+:102FA00009F480E0089590910C01992321F090910B
+:102FB0000D01911109C020910E0130910F01F9010D
+:102FC00032969FEF40E01FC0982F96959695969564
+:102FD0009F3050F5E0910E01F0910F01E90FF11DC6
+:102FE000877021E030E0A90102C0440F551F8A9587
+:102FF000E2F7CA019181892B818308959F3F39F0BF
+:103000004F5F4E3041F051915813F8CF0DC0511120
+:10301000F7CF942FF5CF9F3F39F0F901E90FF11D5C
+:1030200097FDFA9582830895089590910C01992354
+:1030300021F090910D01911109C020910E01309164
+:103040000F01F9013296205F3F4F1FC0982F9695D0
+:10305000969596959F30F0F4E0910E01F0910F0156
+:10306000E90FF11D877021E030E0A90102C0440F93
+:10307000551F8A95E2F7CA01809591818923818342
+:1030800008953196E217F30729F090819813F9CF4C
+:103090001082F7CF089581E090E0E0910E01F09169
+:1030A0000F01E80FF91F1082019680319105A9F7F1
+:1030B00008959091B501892B8093B501089580956D
+:1030C0009091B50189238093B50108951092B501BF
+:1030D00008959091B401892B8093B401089580954F
+:1030E0009091B40189238093B40108951092B401A2
+:1030F00008959091B301892B8093B3010895809531
+:103100009091B30189238093B30108951092B30184
+:1031100008958093A20108951092A20108958091CC
+:103120000E0190910F01FC0131969C01205F3F4FF1
+:1031300080E0919191118F5FE217F307D1F7089525
+:10314000E0910E01F0910F018091B5018083E09133
+:103150000E01F0910F0190818091B401892B808341
+:10316000E0910E01F0910F0190818091B301892BC4
+:1031700080838091A201882361F0E0910E01F0919B
+:103180000F019081892B80830E948F1881111092EA
+:10319000A20180910E0190910F010C946D0E20E020
+:1031A000009739F0AC0141505109842395232F5FDA
+:1031B000F7CF822F08958091C001843039F11092A9
+:1031C000B70120E488E190E00FB6F894A8958093C9
+:1031D00060000FBE2093600080E00E948E0783B7DE
+:1031E000817F846083BF83B7816083BF7894889533
+:1031F00083B78E7F83BF0FB6F894A8958091600047
+:10320000886180936000109260000FBE0895089559
+:1032100008950E9407190E94EE020E9408190E9458
+:10322000E30391E0811101C090E0892F08950E948D
+:103230005B120E94610E0C948E071F920F920FB6C4
+:103240000F9211248F939F93AF93BF938091B701F7
+:10325000811113C08091B8019091B901A091BA0178
+:10326000B091BB014196A11DB11D8093B80190930F
+:10327000B901A093BA01B093BB01BF91AF919F91E7
+:103280008F910F900FBE0F901F90189582E084BD14
+:1032900093E095BD9AEF97BD80936E0008952FB788
+:1032A000F8948091B8019091B901A091BA01B091C0
+:1032B000BB012FBF0895CF92DF92EF92FF920F9341
+:1032C0001F932FB7F8944091B8015091B9016091C4
+:1032D000BA017091BB012FBF6A017B01EE24FF246C
+:1032E0008C0120E030E0C016D106E206F30610F4AF
+:1032F000415051099A01281B390BC9011F910F91A7
+:10330000FF90EF90DF90CF9008951F920F920FB62D
+:103310000F9211248F939F93AF93BF938091B80125
+:103320009091B901A091BA01B091BB010196A11D84
+:10333000B11D8093B8019093B901A093BA01B093E5
+:10334000BB01BF91AF919F918F910F900FBE0F90D6
+:103350001F9018950E945E0BF8942FEF87EA91E674
+:10336000215080409040E1F700C0000087E090EBE2
+:10337000DC018093CA019093CB01A093CC01B09360
+:10338000CD019CE088E10FB6F894A8958093600089
+:103390000FBE90936000FFCF0E94011A811102C0FE
+:1033A0000E94E7190E940C1A8093B6010E94141A19
+:1033B0008093C90187FB882780F980930D010E94C3
+:1033C000101A682F70E080E090E00C941B166DEEF0
+:1033D0007EEF80E090E00E94431A60E082E090E09F
+:1033E0000E94311A60E083E090E00E94311A60E0B0
+:1033F00084E090E00E94311A60E085E090E00C9457
+:10340000311A80E090E00E942B1A21E08D3E9E4F01
+:1034100009F020E0822F089582E090E00C94231AB6
+:1034200083E090E00C94231A84E090E00C94231A3B
+:10343000682F84E090E00C94311AEE0FFF1F059086
+:10344000F491E02D0994F999FECF92BD81BDF89ACF
+:10345000992780B50895A8E1B0E042E050E00C94CF
+:103460004B1A262FF999FECF92BD81BDF89A01978C
+:1034700000B4021639F01FBA20BD0FB6F894FA9ABC
+:10348000F99A0FBE08950196272F0E94321A0C94C4
+:10349000311ADC01CB01FC01F999FECF06C0F2BD67
+:1034A000E1BDF89A319600B40D9241505040B8F702
+:0634B0000895F894FFCF1F
+:1034B60020029007FC079307C80794070101A301A0
+:00000001FF
diff --git a/keyboard/quark/config.h b/keyboard/ergodox_ez/keymaps/townk_osx/config.h index 7f9a48ce4d..78aa3ee8b9 100644 --- a/keyboard/quark/config.h +++ b/keyboard/ergodox_ez/keymaps/townk_osx/config.h @@ -1,5 +1,6 @@ /* Copyright 2012 Jun Wako <wakojun@gmail.com> +Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 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 @@ -18,28 +19,43 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef CONFIG_H #define CONFIG_H +#include "config_common.h" /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define PRODUCT_ID 0x1307 #define DEVICE_VER 0x0001 -#define MANUFACTURER jackhumbert -#define PRODUCT Quark -#define DESCRIPTION t.m.k. keyboard firmware for the Quark +#define MANUFACTURER ErgoDox EZ +#define PRODUCT ErgoDox EZ +#define DESCRIPTION t.m.k. keyboard firmware for Ergodox /* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 +#define MATRIX_ROWS 14 +#define MATRIX_COLS 6 + +#define MOUSEKEY_DELAY 100 +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 3 +#define MOUSEKEY_TIME_TO_MAX 10 + +#define TAPPING_TOGGLE 1 + +#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } +#define ROWS (int []){ D0, D5, B5, B6 } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST /* number of backlight levels */ -/* NOTE: this is the max value of 0..BACKLIGHT_LEVELS so really 16 levels. */ -#define BACKLIGHT_LEVELS 15 +#define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCE 2 +#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 @@ -48,21 +64,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key combination for command */ #define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ + keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ + keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) - - /* * Feature disable options * These options are also useful to firmware size reduction. */ /* disable debug print */ -//#define NO_DEBUG +#define NO_DEBUG /* disable print */ -//#define NO_PRINT +// #define NO_PRINT /* disable action features */ //#define NO_ACTION_LAYER @@ -70,5 +85,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION +//#define DEBUG_MATRIX_SCAN_RATE +#define ONESHOT_TAP_TOGGLE 2 +#define ONESHOT_TIMEOUT 3000 #endif diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c new file mode 100644 index 0000000000..b63698ec6a --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c @@ -0,0 +1,285 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" +#include "action_util.h" +#include "led.h" +#include "keymap_common.h" +#include "timer.h" + +/* + +# Why this Layout + +This layout was based on Kinesis layout and other ErgoDox user layouts +available. It's target to be used on a MacOS but I'm pretty sure it can be +addapted to Windows and/or Linux easily. + +## Function Key + +The `fn` key work almost like it would in any other keyboard with the exception +it has a semi-sticky behavior. What does that mean? + +Well, if you press the `fn` and release it, the keyboard will be put on the +_function layout_ and the next key stroke will be processed as if the `fn` key +was pressed. Aftwards, the leyout get back to _normal_. If you hold `fn` and +press any other key, when you release them, the keyboard leyout is back to +_normal_. + +While pressing the `fn` with the left hand and strikeing the other keys on the +right hand is farly easy, the same cannot being said for the other keys on the +left side. So, instead of trying to do contorcionism with my left hand, I +decided to do a semi-sticky version of `fn`. This way, I can press the `fn` +key with my pinky, release it and press the `1` key to issue an `F1` to the +operating system. + +## Key-Pad Key + +The `key pad` key is a layout switch key. If pressed, it will put the keyboard +on the _key pad layout_ and stay there until key is pressed again. + +This is used to make the keyboard behave mostly like a **num pad keyboard**. + +## Notes +- Regardless in which layout you are, keys from other layouts are not + accessible. This means that if you are on the _key pad layout_, the left hand + will be pretty much unusable. + Of course that like anything else, there are exceptions to this rule. + Modifiers should remain accessible throughout the layers. +- The _shift key_ is, like the _function key_, also configured to have a sticky + behavior. +- All sticky keys have a timeout of 3 seconds. + +*/ +#define BASE 0 +#define KEYPAD 1 +#define FN 2 + +#define MACRO_TMUX_ESC 10 +#define MACRO_TMUX_PASTE 11 +#define MACRO_OSX_COPY 12 +#define MACRO_OSX_PASTE 13 + +#define M_TESC M(MACRO_TMUX_ESC) +#define M_TPASTE M(MACRO_TMUX_PASTE) +#define M_OSXCPY M(MACRO_OSX_COPY) +#define M_OSXPST M(MACRO_OSX_PASTE) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Base Layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | `~ | 1 | 2 | 3 | 4 | 5 | ESC | | Pwr | 6 | 7 | 8 | 9 | 0 | - _ | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | Tab | Q | W | E | R | T | F16 | | F17 | Y | U | I | O | P | = + | + * |-----------+------+------+------+------+------| Meh | | Meh |------+------+------+------+------+-----------| + * | \ (Ctrl) | A | S | D | F | G |------| |------| H | J | K | L | ; | ' " (Ctrl)| + * |-----------+------+------+------+------+------| F18 | | F19 |------+------+------+------+------+-----------| + * | LShift | Z | X | C | V | B | Hyper| | Hyper| N | M | , | . | / | RShift | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | FN | KPAD |LCtrl | LAlt | LGui | | RGui | RAlt | RCtrl| KPAD | FN | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | M(0) | M(1) | | M(2) | M(3) | + * ,------|------|------| |------+------+------. + * | | | Home | | PgUp | | | + * |Backsp| Del |------| |------| Enter| Space| + * | | | End | | PgDn | | | + * `--------------------' `--------------------' + * + * M(0) = Ctrk+A Esc + * (this is used to issue the Esc key to the Tmux application) + * M(1) = Ctrk+A P + * (this is used to issue the Paste key to the Tmux application) + * M(2) = Cmd+C + * M(3) = Cmd+V + */ +[BASE]=KEYMAP(//left half + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MEH_T(KC_F16), + CTL_T(KC_BSLS), KC_A, KC_S, KC_D, KC_F, KC_G, + KC_FN2, KC_Z, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_F18), + KC_FN1, TG(KEYPAD), KC_LCTRL, KC_LALT, KC_LGUI, + M_TESC, M_TPASTE, + KC_HOME, + KC_BSPC, KC_DELT, KC_END, + //right half + KC_POWER, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + MEH_T(KC_F17), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL, + KC_H, KC_J, KC_K, KC_L, KC_SCLN, CTL_T(KC_QUOT), + ALL_T(KC_F19), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_FN2, + KC_RGUI, KC_RALT, CTL_T(KC_LBRC), KC_FN3, KC_FN1, + M_OSXCPY, M_OSXPST, + KC_PGUP, + KC_PGDN, KC_ENT, KC_SPC), + +/* Keymap 1: KeyPad Layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | | | LClk | RClk | MClk | | | | BTab | Clear| / | * | ^ | ( | | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | M.Accel 2 | |ScrlUp| U |ScrlDn| | | | Tab | 7 | 8 | 9 | + | ) | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | M.Accel 1 | | L | D | R | |------| |------| 4 | 5 | 6 | - | | | + * |-----------+------+------+------+------+------| | |Return|------+------+------+------+------+-----------| + * | M.Accel 0 | |ScrlL | |ScrlR | | | | | 1 | 2 | 3 | = | | | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | | XXXX | | | | | 0 | . | , | XXXX | | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | XXXX | | + * | | |------| |------| XXXX | | + * | | | | | | XXXX | | + * `--------------------' `--------------------' + */ +[KEYPAD]=KEYMAP(//left half + KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3, KC_NO, KC_NO, + KC_MS_ACCEL2, KC_NO, KC_MS_WH_UP, KC_MS_U, KC_MS_WH_DOWN, KC_NO, KC_NO, + KC_MS_ACCEL1, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, + KC_MS_ACCEL0, KC_NO, KC_MS_WH_LEFT, KC_NO, KC_MS_WH_RIGHT, KC_NO, KC_NO, + KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, + KC_NO, + KC_NO, KC_NO, KC_NO, + //right half + LSFT(KC_TAB), KC_CLEAR, KC_KP_SLASH, KC_KP_ASTERISK, KC_CIRCUMFLEX, KC_LPRN, KC_NO, + KC_TAB, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_RPRN, KC_NO, + KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_NO, KC_NO, + KC_KP_ENTER, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_EQUAL, KC_NO, KC_NO, + KC_KP_0, KC_KP_DOT, KC_KP_COMMA, KC_TRNS, KC_NO, + KC_NO, KC_NO, + KC_NO, + KC_NO, KC_TRNS, KC_NO), + +/* Keymap 2: Functions Layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | Vol. Up | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | | Stop | Rw | Rec | FF | | XXXX | | XXXX | | | | | | Vol. Down | + * |-----------+------+------+------+------+------| XXXX | | XXXX |------+------+------+------+------+-----------| + * | CapsLock | Eject| Prev | Play | Next | |------| |------| Left | Down | Up | Right| | Mute | + * |-----------+------+------+------+------+------| XXXX | | XXXX |------+------+------+------+------+-----------| + * | L Shift | | | | | | XXXX | | XXXX | | | | | | R Shift | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | XXXXX | | XXXX | XXXX | XXXX | | XXXX | XXXX | XXXX | | XXXXX | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + * + * XXX = These keys are transparent keys that, when pressed, they issue the key from the previous layer. + */ +[FN]=KEYMAP(//left half + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, + KC_NO, KC_MEDIA_STOP, KC_MEDIA_REWIND, KC_MEDIA_SELECT, KC_MEDIA_FAST_FORWARD, KC_NO, KC_TRNS, + KC_CAPS, KC_MEDIA_EJECT, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_NO, + KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, + KC_NO, + KC_NO, KC_NO, KC_NO, + //right half + KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, + KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_NO, KC_MUTE, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RSFT, + KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, + KC_NO, KC_NO, + KC_NO, + KC_NO, KC_NO, KC_NO)}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_ONESHOT(FN), + [2] = ACTION_MODS_ONESHOT(MOD_LSFT), // Sticky shift light. Tap for the next keypress to be shifted. Hold for regular shift. + [3] = ACTION_LAYER_TAP_KEY(KEYPAD, KC_RBRC), +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + // MACRODOWN only works in this function + switch(id) { + case MACRO_TMUX_ESC: + if (record->event.pressed) { + return MACRO(D(LCTRL), T(A), U(LCTRL), D(ESC), END); + } + return MACRO(U(ESC), END); + case MACRO_TMUX_PASTE: + if (record->event.pressed) { + return MACRO(D(LCTRL), T(A), U(LCTRL), D(P), END); + } + return MACRO(U(P), END); + case MACRO_OSX_COPY: + if (record->event.pressed) { + return MACRO(D(LGUI), D(C), END); + } + return MACRO(U(C), U(LGUI), END); + case MACRO_OSX_PASTE: + if (record->event.pressed) { + return MACRO(D(LGUI), D(V), END); + } + return MACRO(U(V), U(LGUI), END); + } + return MACRO_NONE; +}; + +// Runs just one time when the keyboard initializes. +void matrix_init_user(void) { +}; + +uint8_t current_layer = BASE; + +// Runs constantly in the background, in a loop. +void matrix_scan_user(void) { + uint8_t layer = biton32(layer_state); + + ergodox_led_all_off(); + ergodox_led_all_set(LED_BRIGHTNESS_LO); + + switch (layer) { + case BASE: + current_layer = BASE; + break; + case KEYPAD: + current_layer = KEYPAD; + break; + default: + // none + break; + } + + // layer leds + if (current_layer == KEYPAD) { + ergodox_right_led_3_on(); + } + + // capslock + if (host_keyboard_leds() & (3<<USB_LED_CAPS_LOCK)) { + ergodox_right_led_1_on(); + } + + // Temporary leds + + // The function layer takes over other layers and we need to reflect that on the leds. + // If the current layer is the BASE, we simply turn on the FN led, but if the current + // layer is the KEYPAD, than we must turn it off before turning on the FN led. + if (layer == FN && !has_oneshot_layer_timed_out()) { + ergodox_right_led_3_off(); + ergodox_right_led_2_on(); + } + + // if the shifted is pressed I show the case led in a brighter color. This is nice to + // differenciate the shift from the capslock. + // Notice that I make sure that we're not using the shift on a chord shortcut (pressing + // shift togather with other modifiers). + if((keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) && // is shift pressed and there is no other + !(keyboard_report->mods & (~MOD_BIT(KC_LSFT) & ~MOD_BIT(KC_RSFT)))) || // modifier being pressed as well + (get_oneshot_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) && !has_oneshot_mods_timed_out())) { // or the one shot shift didn't timed out + ergodox_right_led_1_set(LED_BRIGHTNESS_HI); + ergodox_right_led_1_on(); + } +}; diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/makefile.mk b/keyboard/ergodox_ez/keymaps/townk_osx/makefile.mk new file mode 100644 index 0000000000..e757557bda --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/makefile.mk @@ -0,0 +1,4 @@ +# I don't want my keyboard blinking lights when is suppose to be asleep. +SLEEP_LED_ENABLE = no + +CONFIG_H = keymaps/$(KEYMAP)/config.h diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/readme.md b/keyboard/ergodox_ez/keymaps/townk_osx/readme.md new file mode 100644 index 0000000000..c2853ca173 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/readme.md @@ -0,0 +1,77 @@ +# Townk's Keymap + +Trying to take care of an enjury on my arm I borrow an ergonomic keyboard from +a frient ([Kinesis Advantage](http://www.kinesis-ergo.com/shop/advantage-pro-for-pc-mac/)). + +I really enjoyed my time with it but there were some anoyancies: + +* The curvature on the keys bothered me since I'm a Vim user and using the + motion keys on my editor was awkard. +* I had to spend too much time remapping the keyboard to make some symbol keys + more accessible to me. +* The fact that my hands had to stay close to each other was a bit stressfull + to my sholders. + +After a long research I find out that Ergodox EZ would be perfect for my needs +and purchase one. Before the keyboard even got in my hands I started to think +on the layout I would use on it and soon enough I planed couple adjustments +from the Kinesis I was using so far. + +## The layout + +Here are the layout mapping in images so you can have a glimpse on it: + + + + + +Notice that, differently from the default behavior, my layer keys are not transparent +by default, which means that if you press any non-labeled white key, nothing will be +handled to the OS. + +### One shot keys + +It all started with the access to the function keys (F1, F2, F3...), since +those keys are located on a different layer I needed a way to press them with +minimal effort without disrupting my flow. + +For me, togglihg a layer to press a button and than toggle it back is a waste +of time (although I admit it's a single tap from what I have), so I decided to +do it as a one shot key. I could press it and the next pressed key would be +handled by the target layer which just after it delivers the key to the OS it +would get back to the previous layer. + +After setting up my layout to do just that I realized that occasionally I +would stop myseld on the middle of the process and the one shot layer would be +still triggered until I press any other key. So to prevent me from tapping +keys I don't want I added a timeout of 3 seconds for the one shot actions. + +Ultimately I tested the shift key as a one shot one and really like it, so +here you have it, all the one shot keys on my layout. + +## Glossary + +If you're not familiar with the Mac symbols used on some keys, here is a +reference to them: + +| Symbol | Description | +| :----: | ------------------- | +| ⌘ | Command | +| ⇪ | Caps Lock | +| ⇧ | Shift | +| ⌥ | Option (alt) | +| ⎋ | Esc | +| ⇥ | Tab forward | +| ⇤ | Tab backward | +| ⌃ | Control | +| ␣ | Space | +| ⌫ | Backspace | +| ⌦ | Delete | +| ⏎ | Enter | +| ⌤ | Return | +| ⌽ | Power on/off button | +| ↖ | Home | +| ↘ | End | +| ⇞ | Page up | +| ⇟ | Page down | +| ⌧ | Clear | diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex new file mode 100644 index 0000000000..868d86e82d --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx.hex @@ -0,0 +1,1166 @@ +:100000000C9474020C94B8020C94B8020C94B802CC
+:100010000C94B8020C94B8020C94B8020C94B80278
+:100020000C94B8020C94B8020C94ED0C0C94BF0D17
+:100030000C94141C0C94B8020C94B8020C94B802E2
+:100040000C94B8020C94B8020C94B8020C94B80248
+:100050000C94B8020C947C1C0C94B8020C94B8025A
+:100060000C94B8020C94B8020C94B8020C94B80228
+:100070000C94B8020C94B8020C94B8020C94B80218
+:100080000C94B8020C94B8020C94B8020C94B80208
+:100090000C94B8020C94B8020C94B8020C94B802F8
+:1000A0000C94B8020C94B8020C94B8022C0E4E0EAC
+:1000B0003C0F4E0E3C0F930EB60E3C0F0B0F1E0F57
+:1000C00029122912551255129D12BB1237143714DA
+:1000D000C61237147B137B132814371437143114CA
+:1000E0008813881388138813881388138813881338
+:1000F0008813881388138813881388138813881328
+:100100009913A713AE13B513BF13021902E300012D
+:10011000E3011900020602E30001E30106000213F5
+:100120000001E00104020402E001130002290001C1
+:10013000E00104020402E00129000000F4A2002210
+:1001400030A135002B003171C200C10000001E003B
+:10015000140004001D0001544D001F001A00160079
+:100160001B00E0004C002000080007000600E20031
+:100170002A002100150009001900E3004A002200AE
+:1001800017000A00050000000A3029006B77000004
+:100190006D7F00000B3066006C7700006E7F000002
+:1001A0000C3023001C000B00110000000D30240057
+:1001B00018000D001000E7004B0025000C000E0099
+:1001C0003600E6002C00260012000F0037002F71C9
+:1001D00028002700130033003800C3004E002D0014
+:1001E0002E003471C200C10000000000FF00FE00BC
+:1001F000FD00000000000000000000000000010001
+:100200000000F400F900F200FB0000000000F5001F
+:10021000F000F100000000000000F600FA00F3001A
+:10022000FC000000000000000000000000000000D2
+:1002300000000000000000000000000000002B0291
+:100240002B0000005800000000009C005F005C00D4
+:10025000590000000000540060005D005A00620078
+:100260000000550061005E005B0063000000230297
+:100270005700560067008500010026022702000093
+:10028000000001000000000000000000000000006D
+:100290000000000000003900E100010000003A0009
+:1002A000AD00B0000000000000003B00BC00AC004E
+:1002B0000000010000003C00AF00AE0000000100A3
+:1002C00000003D00BB00AB000000010000003E004C
+:1002D000000000000000000000003F0001000000DE
+:1002E00001000000000040000100000001000000CB
+:1002F000000041000000500000000000000042002B
+:100300000000510000000100000043000000520006
+:10031000000001000000440000004F000000010048
+:100320000000450000000000000000000000A900DF
+:10033000AA00A800E50001000000160345007200B5
+:1003400067006F0044006F007800200045005A00ED
+:10035000000016034500720067006F0044006F0044
+:100360007800200045005A00000004030904090237
+:100370006D00040100A0FA0904000001030101005E
+:10038000092111010001223F000705810308000A2D
+:1003900009040100010301020009211101000122E9
+:1003A0004D000705820308000A090402000103004A
+:1003B000000009211101000122360007058303080E
+:1003C000000A0904030001030000000921110100D3
+:1003D00001223900070584031000011201100100F9
+:1003E000000008EDFE0713010001020001050109EC
+:1003F00006A101050719E029E715002501950875F3
+:1004000001810205081901290595057501910295DB
+:10041000017503910105071900297715002501953C
+:100420007875018102C005010980A10185021601CC
+:100430000026B7001A01002AB70075109501810047
+:10044000C0050C0901A1018503160100269C021AB2
+:1004500001002A9C02751095018100C00501090266
+:10046000A1010901A10005091901290515002501AE
+:10047000950575018102950175038101050109301A
+:1004800009311581257F9502750881060938158186
+:10049000257F950175088106050C0A38021581250E
+:1004A0007F950175088106C0C005010906A10105F7
+:1004B0000719E029E71500250195087501810295C6
+:1004C0000175088101050819012905950575019136
+:1004D000029501750391010507190029FF150025F3
+:1004E000FF950675088100C011241FBECFEFDAE02A
+:1004F000DEBFCDBF04B603FE24C08091F30190910E
+:10050000F401A091F501B091F6018730904BA7401E
+:10051000B04BB9F41092F3011092F4011092F5016E
+:100520001092F60114BE84B7877F84BF88E10FB6AE
+:10053000F89480936000109260000FBEE0E0FFE34B
+:10054000099511E0A0E0B1E0E0E9F8E402C005900F
+:100550000D92A433B107D9F711E0A4E3B1E001C0D3
+:100560001D92A33FB107E1F70E94330A0C94462481
+:100570000C940000FC016B3079F018F46A3031F013
+:100580001DC06C3079F06D3099F018C082818111F6
+:1005900018C08CE291E008958281811115C08EE12E
+:1005A00091E008958281811112C084E191E0089563
+:1005B000828181110FC08AE091E0089580E090E08F
+:1005C00008958FE291E0089581E291E0089589E134
+:1005D00091E008958FE091E008950895CF936091A0
+:1005E000B2017091B3018091B4019091B5010E9464
+:1005F0007F1BC82F56985E9825982D9826982E9880
+:1006000027982F988FE090E090938900809388003E
+:1006100090938B0080938A0090938D0080938C0040
+:10062000CC2329F0C13029F4C093340102C01092C8
+:10063000340180913401813011F4279A2F9A0E945D
+:10064000750F867011F0259A2D9AC23041F40E94E0
+:10065000081A811104C027982F98269A2E9AE091A3
+:100660000E01F0910F018081982F927259F08D7DCB
+:1006700049F48FEF90E09093890080938800259A49
+:100680002D9A08C00E94351B827221F00E94DB194E
+:10069000882379F3CF9108950C94EE0256985E98D2
+:1006A00025982D9826982E9827982F988FEF90E0D0
+:1006B000909389008093880090938B0080938A00A8
+:1006C00090938D0080938C00259A2D9A2FEF80E7D0
+:1006D00092E0215080409040E1F700C00000269A4F
+:1006E0002E9A2FEF80E792E0215080409040E1F772
+:1006F00000C00000279A2F9A2FEF80E792E0215048
+:1007000080409040E1F700C0000025982D982FEF21
+:1007100080E792E0215080409040E1F700C0000067
+:1007200026982E982FEF80E792E02150804090404D
+:10073000E1F700C0000027982F9856985E982598FA
+:100740002D9826982E9827982F98089589EA8093B7
+:10075000800089E08093810024982C983F988AB18A
+:100760008F748AB96E98479A8BB1806B8BB9769AE1
+:100770000E944E030C94ED0280E280930001809170
+:10078000350181110EC00E940B0481E08093350178
+:100790002FEF83ED90E3215080409040E1F700C0BF
+:1007A000000080E40E9411048093000181112EC09A
+:1007B0000E943B0480930001811128C00E943B04E9
+:1007C00080930001811122C08FE30E943B0480933B
+:1007D000000181111BC00E94330480E40E941104B7
+:1007E00080930001811112C08CE00E943B04809331
+:1007F000000181110BC00E943B0480930001811114
+:1008000005C08FE30E943B04809300010E943304E3
+:100810008091000108951092B9008AE08093B80099
+:10082000089594EA9093BC009091BC0097FFFCCF90
+:100830009091B900987F983021F0903111F081E0CB
+:1008400008958093BB0084E88093BC008091BC0035
+:1008500087FFFCCF8091B900887F883111F0803408
+:1008600071F780E0089584E98093BC008091BC001A
+:1008700084FDFCCF08958093BB0084E88093BC0086
+:100880008091BC0087FFFCCF9091B900987F81E0F8
+:10089000983209F480E0089584E88093BC00809148
+:1008A000BC0087FFFCCF8091BB00089580910001C0
+:1008B000811115C080E40E94110480930001811110
+:1008C0000CC082E10E943B0480930001811105C0AD
+:1008D0008FEF0E943B04809300010E94330484B197
+:1008E000807F84B985B1807F85B98AB1837F8AB9D9
+:1008F0008BB1837F8BB93E98469808950E94BC03C4
+:10090000809300010E94560480B38C7080BB81B339
+:10091000836F81BBA7E3B1E0E5E4F1E08EE08E0FE9
+:1009200011921D928E13FCCF0C94A603BF92CF920E
+:10093000DF92EF92FF920F931F93CF93DF938091FB
+:100940000001882379F0809136018F5F8093360112
+:10095000811108C00E94BC0380930001811102C074
+:100960000E944E0307E311E0C0E0D0E0DD24D39401
+:1009700082E0C82EEE24E394F12CC730D10500F5B7
+:1009800080910001811164C080E40E941104809371
+:100990000001811112C082E10E943B04809300019A
+:1009A00081110BC0C7010C2E01C0880F0A94EAF711
+:1009B00080950E943B04809300010E94330448C04C
+:1009C000CA30A1F028F4C83059F0C93061F005C030
+:1009D000CC3089F070F0CD3089F0209A289810C082
+:1009E000219A29980DC0229A2A980AC0239A2B98F6
+:1009F00007C0529A01C0539A5B9802C03E9A46982B
+:100A000090EA9A95F1F79FB1799902C082E001C00E
+:100A100080E091709D25982B7C9902C084E001C0F4
+:100A200080E0892B7D9902C038E001C030E0832B43
+:100A30007E9902C020E101C020E0822B9FB19095F9
+:100A4000991F9927991F9295990F907E892B0FC016
+:100A500080910001811149C080E40E9411048093BB
+:100A60000001882379F1B12C0E9433048B2DF80109
+:100A70009081981719F08083C09201010E9456045A
+:100A800021960F5F1F4FCE30D10509F076CF8091B0
+:100A90000101882361F1815080930101882339F09D
+:100AA0008FE99FE00197F1F700C0000020C0A5E4A6
+:100AB000B1E0E7E3F1E0CF01825F91919D938E1366
+:100AC000FCCF15C083E10E943B048093000181119B
+:100AD000CACF81E40E941104809300018111C3CF29
+:100AE0000E944C04B82EB094BFCF80E0C0CF0E94CB
+:100AF0004C0381E0DF91CF911F910F91FF90EF9018
+:100B0000DF90CF90BF900895E82FF0E0EB5BFE4FB1
+:100B1000808108950895089596E0799FF001112449
+:100B200094E5899FE00DF11D1124E60FF11DEE0FF4
+:100B3000FF1FEE5BFE4F859194910895880F991FDA
+:100B4000FC01E654F040859194910895880F991F17
+:100B5000FC01E65CFE4F8591949108950F931F93DD
+:100B6000CF93DF93EC018115904350F5C11580E2DE
+:100B7000D80708F0B3C0CB3BD10590F4C83AD105F3
+:100B800008F05AC0C53AD10508F04BC0C430D105B1
+:100B900008F0CCC1219709F0C6C101E010E006C2FF
+:100BA000CF3FD10511F008F0C1C1C03FD10508F019
+:100BB00092C0CE01805E9109089708F4B7C1B3C115
+:100BC000C11591E5D907A8F4C23020E5D20708F095
+:100BD0009EC0C11580E5D80709F485C008F091C012
+:100BE000C11520E4D20708F09EC1DD278E01106CEC
+:100BF000DDC1C11580E8D80758F4C11590E7D907C1
+:100C000008F08DC1C11520E6D20708F422C18BC1BE
+:100C1000C11580E9D80708F086C1DF708E01106A1F
+:100C2000C5C1C53AD10509F483C1C63AD10509F059
+:100C300082C102E810E4BAC1C83AD10509F47EC104
+:100C4000C93AD10509F47DC1CA3AD10509F47CC17C
+:100C5000CB3AD10509F47BC1CC3AD10509F47AC16C
+:100C6000CD3AD10509F479C1C03BD10509F478C169
+:100C7000CE3AD10509F477C1CF3AD10509F476C14E
+:100C8000C13BD10509F475C1C23BD10509F474C15A
+:100C9000C33BD10509F473C1C43BD10509F472C14A
+:100CA000C53BD10509F471C1C63BD10509F470C13A
+:100CB000C73BD10509F46FC1C83BD10509F46EC12A
+:100CC000C93BD10509F46DC1CA3BD10509F46CC11A
+:100CD00000E014E46BC18E01106568C1CE019F7005
+:100CE0000E94A60564C10E948B149FEF24E38CE050
+:100CF000915020408040E1F700C000000E94A11CFC
+:100D000055C18091D40181608093D4014FC10E946C
+:100D10004A1E811102C00E94301E0E94671E90E090
+:100D20009093F3018093F201C23090E5D90721F44A
+:100D30008091F201816086C0C43020E5D20721F4A1
+:100D40008091F20182607EC0C63080E5D80721F430
+:100D50008091F201846076C0C83090E5D90719F41B
+:100D60008091F20127C0CA3020E5D20721F480919A
+:100D7000F201806167C0CC3080E5D80721F4809112
+:100D8000F20180625FC0CE3090E5D90721F48091F6
+:100D9000F201806457C0C03120E5D20721F4809170
+:100DA000F20180684FC0C23180E5D80729F48091F4
+:100DB000F2018460886046C0C33090E5D90721F411
+:100DC0008091F2018E7F3EC0C53020E5D20721F42C
+:100DD0008091F2018D7F36C0C73080E5D80721F4BD
+:100DE0008091F2018B7F2EC0C93090E5D90719F4AC
+:100DF0008091F20126C0CB3020E5D20721F480910A
+:100E0000F2018F7E1FC0CD3080E5D80721F480919C
+:100E1000F2018F7D17C0CF3090E5D90721F4809182
+:100E2000F2018F7B0FC0C13120E5D20721F4809100
+:100E3000F2018F7707C0C331D04531F48091F201C0
+:100E40008B7F877F8093F2018091F2010E946B1E5D
+:100E5000ADC08D2F99278F70992781309105D9F4D6
+:100E60009E012370332702C0880F991F2A95E2F74D
+:100E70009C688E0144E0000F111F4A95E1F700279E
+:100E80001370802B912B53E0CC0FDD1F5A95E1F7A7
+:100E9000C076DD272FC08230910531F4DC2FCC27BE
+:100EA0008E01016F106A82C08330910569F4CE0112
+:100EB0008370992701E010E002C0000F111F8A958E
+:100EC000E2F7C8019C680FC084309105B9F4CE01E7
+:100ED0008370992701E010E002C0000F111F8A956E
+:100EE000E2F7C8019A6823E0CC0FDD1F2A95E1F7ED
+:100EF000C07ED7708C010C2B1D2B58C085309105FE
+:100F000031F4DC2FCC278E01046F106A4FC0069796
+:100F100009F04CC0CF71DD27DC2FCC2701C0DF707A
+:100F20008E01106243C000E010E040C08E013EC060
+:100F300001E810E43BC003E810E438C002EE14E41A
+:100F400035C009EE14E432C00AEE14E42FC005EBFC
+:100F500014E42CC006EB14E429C007EB14E426C00B
+:100F60000CEC14E423C00DEC14E420C003E815E4F9
+:100F70001DC00AE815E41AC002E915E417C004E927
+:100F800015E414C001E216E411C003E216E40EC039
+:100F900004E216E40BC005E216E408C006E216E41B
+:100FA00005C007E216E402C00AE216E4C801DF91B8
+:100FB000CF911F910F91089596E0799FF001112430
+:100FC00094E5899FE00DF11D1124E60FF11DEE0F50
+:100FD000FF1FEE5BFE4F85919491803E9105E0F4FA
+:100FE000803C910558F58133910509F46FC048F4B0
+:100FF0008932910509F463C08A32910509F46DC004
+:1010000072C089339105E9F082389105D1F08533BA
+:10101000910509F44DC067C0833E910581F138F414
+:10102000803E9105B9F0823E9105D9F05CC0863EC4
+:10103000910561F1873E9105A1F155C00E949E0581
+:1010400008952091F20120FD02C021FF4CC080EEE6
+:1010500090E049C08091F20180FFF9CF89E390E0F0
+:1010600042C08091F20182FF0EC08091F20184FFA4
+:1010700003C080E090E037C083EE90E034C0809100
+:10108000F20182FFF2CF82EE90E02DC08091F2015A
+:1010900083FF0BC08091F20184FDEBCF87EE90E0DF
+:1010A00022C08091F20183FFF5CF86EE90E01BC055
+:1010B0008091F20185FF07C089E290E014C0809121
+:1010C000F20185FFF9CF85E390E00DC08091F20138
+:1010D00086FF07C08AE290E006C08091F20186FF99
+:1010E000F9CF81E390E00E94AE05089508950C9435
+:1010F0007608809163010895CF93DF9300D01F920B
+:10110000CDB7DEB79C018091E901843019F593E0F9
+:1011100099833B832A839093E9008FEF9091E800B5
+:10112000815095FD06C095ED9A95F1F7000081116B
+:10113000F5CF8091E80085FF0DC040E050E063E00E
+:1011400070E0CE0101960E94DD0A8091E8008E7762
+:101150008093E8000F900F900F90DF91CF9108954A
+:10116000CF93DF9300D01F92CDB7DEB72091E90176
+:10117000243021F522E029839B838A8383E08093B6
+:10118000E9008FEF9091E800815095FD06C095ED44
+:101190009A95F1F700008111F5CF8091E80085FF65
+:1011A0000DC040E050E063E070E0CE0101960E9487
+:1011B000DD0A8091E8008E778093E8000F900F9011
+:1011C0000F90DF91CF9108952091E9012430F1F43F
+:1011D00022E02093E9002FEF3091E800215035FD07
+:1011E00006C035ED3A95F1F700002111F5CF2091B9
+:1011F000E80025FF0BC040E050E065E070E00E9491
+:10120000DD0A8091E8008E778093E8000895CF93FF
+:10121000DF93EC019091E901943009F046C0809190
+:101220000C018823D9F080910D018823B9F09093A7
+:10123000E9008FEF9091E800815095FD06C095E19F
+:101240009A95F1F700008111F5CF8091E80085FFB4
+:101250002CC040E050E060E170E017C081E0809376
+:10126000E9008FEF9091E800815095FD06C095ED63
+:101270009A95F1F700008111F5CF8091E80085FF84
+:1012800014C040E050E068E070E0CE010E94DD0A4A
+:101290008091E8008E778093E80080E1FE01A3E56D
+:1012A000B1E001900D928A95E1F7DF91CF91089519
+:1012B0008091E801811109C00E94720C0E94CF0C3C
+:1012C0008091E20084608093E20008951092E8012A
+:1012D0000895089508950C940E1C42E061EC81E09D
+:1012E0000E94EC0B42E061EC82E00E94EC0B42E0D9
+:1012F00061EC83E00E94EC0B42E161EC84E00C9431
+:10130000EC0B8091EB01833009F455C030F481304F
+:1013100071F0823009F48EC008958A3009F47AC0E1
+:101320008B3009F460C0893009F09CC020C08091E6
+:10133000EA01813A09F096C08091E800877F8093A6
+:10134000E8008091EE019091EF01892B21F460E19A
+:1013500083E591E003C060E080E090E070E00E94EF
+:10136000280B8091E8008B778093E80008958091A6
+:10137000EA01813209F076C08091EE019091EF018F
+:10138000009719F0039709F06DC08091E800877FFE
+:101390008093E8008091E80082FD05C08091E9011A
+:1013A0008111F8CF5FC08091F1008093630180913B
+:1013B000E8008B7753C08091EA01813A09F052C06E
+:1013C0008091EE019091EF01892B09F04BC0809143
+:1013D000E800877F8093E8008091E80080FFFCCFE1
+:1013E00080910C0136C08091EA018132D9F580915B
+:1013F000EE019091EF01892BA9F58091E800877F9C
+:101400008093E8000E94210C8091EC0180930C01F4
+:101410000C948B148091EA01813221F58091E800CF
+:10142000877F8093E8000E94210C8091ED018093DA
+:10143000640108958091EA01813AA1F48091E80065
+:10144000877F8093E8008091E80080FFFCCF809147
+:1014500064018093F1008091E8008E778093E8002A
+:101460000C94210C089584B7877F84BF88E10FB660
+:10147000F89480936000109260000FBE90E080E8C6
+:101480000FB6F89480936100909361000FBE0E94A4
+:10149000C40F0E94720C0E94CF0C8091E200846005
+:1014A0008093E20078940E94550F0E94C60F82E05C
+:1014B00091E00E94700F8091E901853069F40E94EB
+:1014C000CF1B8091E7018823B1F30E94FA1B882388
+:1014D00091F30E94C70AEFCF0E94CC0FECCF292FC7
+:1014E000332723303105C9F064F42130310581F010
+:1014F0002230310509F043C08DE690E02EE633E05E
+:1015000042C021323105F1F02232310541F137C0BC
+:1015100082E190E02BED33E036C0992781309105D0
+:1015200041F08230910541F0892B49F5EAE6F3E07C
+:1015300005C0E2E5F3E002C0EAE3F3E0849190E065
+:101540009F0121C06430D8F4E62FF0E0EE0FFF1FBA
+:10155000EE5DFE4F2081318189E090E014C064305F
+:1015600070F470E0FB01EE0FFF1FE65EFE4F20817E
+:101570003181FB01EA5EFE4F808190E004C080E093
+:1015800090E020E030E0FA0131832083089580E18B
+:1015900089BD82E189BD09B400FEFDCF8091D800EC
+:1015A0008F7D8093D8008091E00082608093E0007E
+:1015B0008091E00081FDFCCF0895CF92DF92EF9201
+:1015C000FF920F931F93CF93DF93EC018B016A017E
+:1015D0000E94400C811133C0C114D10439F0F601CE
+:1015E00080819181081B190BC80FD91FE12CF12CA8
+:1015F0000115110519F18091E80085FD16C0809153
+:10160000E8008E778093E800C114D10449F0F60118
+:1016100080819181E80EF91EF182E08285E00FC0A1
+:101620000E94400C882321F30AC089918093F10025
+:1016300001501109FFEFEF1AFF0ADACF80E0DF91C6
+:10164000CF911F910F91FF90EF90DF90CF90089571
+:101650002091F0013091F1012617370748F061150C
+:10166000710539F42091E8002E772093E80001C03D
+:10167000B90140E061157105A9F12091E90122232A
+:1016800009F443C0253009F442C02091E80023FD4D
+:1016900040C02091E80022FD32C02091E80020FFE8
+:1016A000E9CF4091F3002091F20030E0342BFC01AF
+:1016B000CF016115710559F02830310540F4819151
+:1016C0008093F100615071092F5F3F4FF1CF41E0EE
+:1016D0002830310509F040E02091E8002E77209372
+:1016E000E800C8CF4111C9CF0AC08091E901882321
+:1016F00061F0853061F08091E80083FD0AC080913F
+:10170000E80082FFF2CF80E0089582E0089583E050
+:10171000089581E008952091F0013091F10126179C
+:10172000370748F06115710539F42091E8002E77EC
+:101730002093E80001C0B901FC0120E061157105AA
+:1017400091F18091E901882309F440C0853009F4C2
+:101750003FC08091E80083FD3DC08091E80082FD9C
+:101760002FC08091E80080FFE9CF2091F3008091A5
+:10177000F20090E0922B6115710559F088309105C7
+:1017800040F424912093F100319661507109019643
+:10179000F2CF21E0089709F020E08091E8008E77F1
+:1017A0008093E800CBCF2111CCCF0AC08091E90112
+:1017B000882361F0853061F08091E80083FD0AC0E4
+:1017C0008091E80082FFF2CF80E0089582E00895E2
+:1017D00083E0089581E00895982F973058F590930D
+:1017E000E900981739F07091EC002091ED005091CC
+:1017F000F00003C0242F762F50E021FF19C0309154
+:10180000EB003E7F3093EB003091ED003D7F309355
+:10181000ED003091EB0031603093EB007093EC0001
+:101820002093ED005093F0002091EE0027FF07C0B9
+:101830009F5FD3CF8F708093E90081E0089580E0AF
+:1018400008958091EA0187FF11C08091E80082FD30
+:1018500005C08091E9018111F8CF11C08091E800A5
+:101860008B770BC08091E901882349F08091E800D3
+:1018700080FFF8CF8091E8008E778093E80008958C
+:101880002091E4003091E50095E64091EC00842F32
+:10189000817040FF22C08091E80080FD1CC08091D3
+:1018A000E901882391F0853091F08091EB0085FD6E
+:1018B00010C04091E4005091E5004217530729F30E
+:1018C0009A01915011F784E0089582E0089583E031
+:1018D000089581E0089580E008954091E80042FF76
+:1018E000DECF08950E94E00C0E94E80CE0EEF0E0EC
+:1018F000808181608083E8EDF0E080818F77808354
+:1019000019BCA7EDB0E08C918E7F8C9380818F7E87
+:1019100080831092E80108950F931F93CF93DF9374
+:101920000E94E00C0E94E80CC8EDD0E088818F771F
+:10193000888388818068888388818F7D888319BCAB
+:101940001092E9011092E5011092E7011092E60170
+:1019500000EE10E0F80180818B7F808388818160B8
+:10196000888342E060E080E00E94EC0BE1EEF0E072
+:1019700080818E7F8083E2EEF0E0808181608083D1
+:10198000808188608083F80180818E7F8083888158
+:1019900080618883DF91CF911F910F910895E8EDC9
+:1019A000F0E080818F7E8083E7EDF0E080818160D0
+:1019B000808384E082BF81E08093E8010C948C0CEA
+:1019C000E8EDF0E080818E7F80831092E200089540
+:1019D0001092DA001092E10008951F920F920FB654
+:1019E0000F9211242F933F934F935F936F937F93A5
+:1019F0008F939F93AF93BF93EF93FF938091E100F9
+:101A000082FF0BC08091E20082FF07C08091E1005D
+:101A10008B7F8093E1000E94540F8091DA0080FF59
+:101A20001FC08091D80080FF1BC08091DA008E7F9C
+:101A30008093DA008091D90080FF0DC080E189BDDC
+:101A400082E189BD09B400FEFDCF81E08093E90108
+:101A50000E94580905C019BC1092E9010E9466094C
+:101A60008091E10080FF19C08091E20080FF15C0E5
+:101A70008091E2008E7F8093E2008091E20080619D
+:101A80008093E2008091D80080628093D80019BCD6
+:101A900085E08093E9010E946A098091E10084FF5A
+:101AA00030C08091E20084FF2CC080E189BD82E1DA
+:101AB00089BD09B400FEFDCF8091D8008F7D809351
+:101AC000D8008091E1008F7E8093E1008091E20058
+:101AD0008F7E8093E2008091E20081608093E2003B
+:101AE0008091E501882311F084E007C08091E30034
+:101AF00087FD02C081E001C083E08093E9010E947C
+:101B00006B098091E10083FF29C08091E20083FF8F
+:101B100025C08091E100877F8093E10082E080937F
+:101B2000E9011092E5018091E1008E7F8093E10050
+:101B30008091E2008E7F8093E2008091E2008061DC
+:101B40008093E20042E060E080E00E94EC0B809134
+:101B5000F00088608093F0000E946909FF91EF9186
+:101B6000BF91AF919F918F917F916F915F914F91B5
+:101B70003F912F910F900FBE0F901F9018951F92BD
+:101B80000F920FB60F9211242F933F934F935F93B1
+:101B90006F937F938F939F93AF93BF93CF93DF9375
+:101BA000EF93FF93C091E900CF708091EC00D82FA4
+:101BB000D17080FDD0E81092E9008091F000877F1D
+:101BC0008093F00078940E94030E1092E9008091B7
+:101BD000F00088608093F000CD2BCF70C093E900B7
+:101BE000FF91EF91DF91CF91BF91AF919F918F9135
+:101BF0007F916F915F914F913F912F910F900FBE09
+:101C00000F901F9018951F93CF93DF93CDB7DEB73A
+:101C1000AA970FB6F894DEBF0FBECDBFEAEEF1E093
+:101C200088E08E0F9091F10091938E13FBCF0E946C
+:101C300081098091E80083FF1FC18091EA019091A2
+:101C4000EB01492F50E04A30510508F015C1FA0167
+:101C5000EA5AFF4F0C94F623803881F0823809F05D
+:101C60000BC18091EE018F708093E9008091EB00B1
+:101C700085FB882780F91092E90006C08091E60173
+:101C80009091E701911182609091E800977F909385
+:101C9000E8008093F1001092F100C8C0282F2D7F3A
+:101CA00009F0EAC0882319F0823061F0E5C0809124
+:101CB000EC01813009F0E0C0933009F080E08093BE
+:101CC000E7012BC08091EC01811127C08091EE01CA
+:101CD0008F7009F4D1C08093E9002091EB0020FFC0
+:101CE0001CC0933021F48091EB00806214C090916D
+:101CF000EB0090619093EB0021E030E0A90102C07D
+:101D0000440F551F8A95E2F74093EA001092EA00CB
+:101D10008091EB0088608093EB001092E900809145
+:101D2000E800877F86C08111A7C01091EC011F7762
+:101D30008091E3008078812B8093E3008091E8001C
+:101D4000877F8093E8000E94210C8091E80080FF4B
+:101D5000FCCF8091E30080688093E300111102C002
+:101D600082E001C083E08093E90186C08058823020
+:101D700008F082C08091EC019091ED018C3D53E020
+:101D8000950779F583E08A838AE289834FB7F894CF
+:101D9000DE01139620E03EE051E2E32FF0E05093A5
+:101DA0005700E49120FF03C0E295EF703F5FEF70B2
+:101DB0008E2F90E0EA3010F0C79601C0C0968D9348
+:101DC0009D932F5F243149F74FBF8091E800877FB3
+:101DD0008093E8006AE270E0CE0101960E94280B31
+:101DE00014C0AE014F5F5F4F6091EE010E946F0A19
+:101DF000BC01892B09F440C09091E800977F909333
+:101E0000E80089819A810E948B0B8091E8008B7792
+:101E10008093E80031C0803879F58091E800877FB1
+:101E20008093E8008091E5018093F1008091E800C3
+:101E30008E778093E8000E94210C1EC081111CC087
+:101E40009091EC019230C0F48091E800877F8093FC
+:101E5000E8009093E5010E94210C8091E501811139
+:101E600006C08091E30087FD02C081E001C084E0EC
+:101E70008093E9010E946D098091E80083FF0AC008
+:101E80008091E800877F8093E8008091EB0080627A
+:101E90008093EB00AA960FB6F894DEBF0FBECDBFBD
+:101EA000DF91CF911F9108950895CF938091E9011B
+:101EB0008823A1F0C091E900CF709091EC00892FA8
+:101EC000817090FD80E8C82B1092E9008091E800B5
+:101ED00083FD0E94030ECF70C093E900CF91089557
+:101EE00090936A01809369010895E0916901F091EE
+:101EF0006A01309721F00190F081E02D099480E093
+:101F00000895E0916901F0916A01309721F0028013
+:101F1000F381E02D09940895E0916901F0916A013F
+:101F2000309721F00480F581E02D099408952091E7
+:101F30006701309168018217930771F090936801EF
+:101F400080936701E0916901F0916A01309721F077
+:101F50000680F781E02D0994089520916501309164
+:101F600066018217930771F0909366018093650173
+:101F7000E0916901F0916A01309721F00084F185C8
+:101F8000E02D0994089508950C94C30F0E943D1C00
+:101F90000E947E040C94031DCF92DF92EF92FF9279
+:101FA0000F931F93CF93DF93CDB7DEB72B970FB669
+:101FB000F894DEBF0FBECDBF0E9496048CE6C82EFB
+:101FC00081E0D82E00E010E0E02E802F0E948405F2
+:101FD000F60141916F01F42EF826B1F40F5F1F4F07
+:101FE0000E30110589F78FEF89838A831B820E9447
+:101FF000461C8160782F9D838C8349815A816B8137
+:102000008D810E946F1040C09091D40191FF04C057
+:102010008B870E948A058B8520E030E04F2D50E0B1
+:10202000922FBA01022E02C0759567950A94E2F7C5
+:1020300060FF24C02E83EF8221E030E0690102C0FE
+:10204000CC0CDD1C9A95E2F790E08C219D21892B28
+:1020500009F420E028870E94461C8160782F9A8727
+:1020600089874E815F8168858A850E946F10F8019B
+:10207000E459FE4F8081C826C08206C02F5F3F4FC3
+:102080002630310569F6AACF0E94EA1F10916B0134
+:102090000E94750F1817A1F00E94750F80936B01B5
+:1020A0002B960FB6F894DEBF0FBECDBFDF91CF9158
+:1020B0001F910F91FF90EF90DF90CF900C947708D5
+:1020C0002B960FB6F894DEBF0FBECDBFDF91CF9138
+:1020D0001F910F91FF90EF90DF90CF900895CF93D5
+:1020E000DF93CDB7DEB72B970FB6F894DEBF0FBEE8
+:1020F000CDBF4F83588769877A878B87DE0111961A
+:1021000086E0FD0111928A95E9F785E0FE01379698
+:1021100001900D928A95E1F749815A816B817C810A
+:102120008D819E810E9429172B960FB6F894DEBFF1
+:102130000FBECDBFDF91CF9108950895CF9388232F
+:1021400009F4C2C0C82F823859F40E94750F81FD6E
+:10215000BBC089E30E946C1A0E94491B89E30CC032
+:10216000833879F40E94750F80FDAEC083E50E942C
+:102170006C1A0E94491B83E50E94AE1ACF910C9401
+:10218000491B843859F40E94750F82FD9DC087E475
+:102190000E946C1A0E94491B87E4EECF8CEF8C0FD3
+:1021A000813A48F48C2F0E94252281118DC08C2FFA
+:1021B0000E946C1AE3CF80E28C0F883048F4C7701D
+:1021C00081E001C0880FCA95EAF70E94F51AD6CFC0
+:1021D0008BE58C0F833078F4C53A29F0C63A31F09C
+:1021E00083E890E005C081E890E002C082E890E0DA
+:1021F000CF910C94970F88E58C0F833108F064C061
+:10220000C83A39F1C93A41F1CA3A49F1CB3A51F1E8
+:10221000CC3A59F1CD3A61F1C03B69F1CE3A71F156
+:10222000CF3A79F1C13B81F1C23B89F1C33B91F1D6
+:10223000C43B99F1C53BA1F1C63BA9F1C73BB1F144
+:10224000C83BB9F1C93BC1F1CA3BC9F180E090E09C
+:1022500038C082EE90E035C089EE90E032C08AEE60
+:1022600090E02FC085EB90E02CC086EB90E029C079
+:1022700087EB90E026C08CEC90E023C08DEC90E0E2
+:1022800020C083E891E01DC08AE891E01AC082E98D
+:1022900091E017C084E991E014C081E292E011C09E
+:1022A00083E292E00EC084E292E00BC085E292E00D
+:1022B00008C086E292E005C087E292E002C08AE2AE
+:1022C00092E0CF910C94AD0FCF910895882309F43B
+:1022D0004BC0823859F40E94750F81FF45C089E3D5
+:1022E0000E946C1A0E94491B89E30CC0833871F468
+:1022F0000E94750F80FF38C083E50E946C1A0E940F
+:10230000491B83E50E94AE1A0C94491B843859F48A
+:102310000E94750F82FF28C087E40E946C1A0E94F9
+:10232000491B87E4EFCF9CEF980F913A58F390E266
+:10233000980F983050F4877091E001C0990F8A95FA
+:10234000EAF7892F0E94FB1ADFCF9BE5980F9330A5
+:1023500020F480E090E00C94970F885A833120F4A9
+:1023600080E090E00C94AD0F0895882321F00E9446
+:10237000F51A0C94491B0895882321F00E94FB1A3A
+:102380000C94491B08952F923F924F925F927F9237
+:102390008F929F92AF92BF92CF92DF92EF92FF9275
+:1023A0000F931F93CF93DF9300D000D01F92CDB730
+:1023B000DEB725E0FC01DE01119601900D922A9511
+:1023C000E1F7FC0100811181F280E580E2943FE0B9
+:1023D000E32223813481232B09F472C21F3F19F4B5
+:1023E0000F3F09F46DC26C010E94081A882319F08E
+:1023F00082E00E944A1AC6010E949D1009831A8336
+:1024000069817A818F2D0E94CE198C010E948319D7
+:102410000E944A18F1100E94121B0E94651A88231C
+:1024200079F0FF2069F080E2800F883048F082E088
+:102430000E944A1A0E94651A91E0782E792601C0FE
+:10244000712CE12FE295EF70F0E0E05AFF4F0C9411
+:10245000F623812F807F1F70882311F01295107F43
+:10246000FF2089F0112309F4E8C180E2800F883051
+:1024700020F4812F0E94F51A03C0812F0E94051BB2
+:102480000E94491BDAC1802F0E946611112309F4B2
+:10249000EEC1005E812F083018F40E94FB1A02C0C2
+:1024A0000E940B1B0E94491BE2C1812F807F1F707D
+:1024B000803211F01295107F002319F0013049F19C
+:1024C00032C0FF2091F0EE2091F1F1E0EF1204C054
+:1024D000812F0E94251BCBC122E0E21228C00E945E
+:1024E0002E1B812F0E94D51922C0EE2079F031E0F9
+:1024F000E31208C00E94F21A812309F4B8C10E94B5
+:10250000D81904C042E0E41609F4B1C10E942E1BA0
+:1025100012C0FF2029F051E05E1508F4A8C107C0E1
+:10252000E110A5C108C0FF2021F0E11086C1812F74
+:10253000F7C0E11089C1812FF9C0812F869586955A
+:10254000837090E0009719F0019759F090C1FF2037
+:1025500019F0C801937002C080E090E00E94970FCC
+:1025600086C1FF2019F0C801937002C080E090E09E
+:102570000E94AD0F7CC1802FFF2019F00E94F21E37
+:1025800002C00E945A1F0E94DF1F71C1812F8370F9
+:1025900009F055C0F1106BC1802F82958695877028
+:1025A000880F880F902F9F70492F50E060E070E0F7
+:1025B0001A012B01082E04C0220C331C441C551C8C
+:1025C0000A94D2F704FF15C02FE0822E912CA12C83
+:1025D000B12CA501940104C0220F331F441F551FC5
+:1025E0008A95D2F7CA01B90160957095809590954A
+:1025F00003C060E070E0CB01169516951370412F73
+:1026000050E04230510569F04330510589F06229AC
+:102610007329842995294130510571F00E94711860
+:1026200026C162297329842995290E948D181FC10A
+:102630000E947118C201B1010E94551818C1FF20F3
+:1026400019F0812F817001C08695882309F40FC18C
+:10265000802F829586958770880F880F902F9F70A6
+:10266000492F50E060E070E01A012B01082E04C0F1
+:10267000220C331C441C551C0A94D2F704FF15C0CD
+:102680009FE0892E912CA12CB12CA501940104C0AE
+:10269000220F331F441F551F8A95D2F7CA01B90173
+:1026A000609570958095909503C060E070E0CB01D7
+:1026B000169516951370412F50E04230510569F080
+:1026C0004330510589F062297329842995294130C5
+:1026D000510571F00E944B19CAC0622973298429DF
+:1026E00095290E946719C3C00E944B19C201B1010C
+:1026F0000E942F19BCC0802F90E0FC01E05EF10920
+:10270000E531F10508F094C0E059FF4F0C94F62331
+:102710000F70812F8F71FF2031F00E94C818802F19
+:102720000E94B511A4C00E94E918802F0E94BC111C
+:102730009EC0FF2039F0E1109AC0812F8F710E9456
+:102740000E1995C031E03E1508F491C0F6CFFF2078
+:1027500039F0812F8F710E94C81889C0FF20C9F3FA
+:10276000812F8F710E94E91882C0FF2029F0812FEC
+:102770008F710E94B3187BC00E94A91878C0FF20F7
+:10278000C1F00E94D2190E94FB1A0E94041A8430E0
+:1027900029F40E94431A812F8F717AC041E04E15AF
+:1027A00008F48EC01F71812F0E94C81863E0812F2A
+:1027B0000EC00E94D2190E94F51A51E05E15F8F47D
+:1027C0000E94431A0E94D81964E0812F8F710F90E4
+:1027D0000F900F900F900F90DF91CF911F910F915D
+:1027E000FF90EF90DF90CF90BF90AF909F908F9031
+:1027F0007F905F904F903F902F900C94331A81E020
+:102800000F900F900F900F900F90DF91CF911F912D
+:102810000F91FF90EF90DF90CF90BF90AF909F907F
+:102820008F907F905F904F903F902F900C944A1A1A
+:10283000FF2039F0EE2009F48CCF802F0E949E10EB
+:1028400016C0EE2009F48CCF802F0E9466110FC0B5
+:10285000412F4F70602FC6010E94BA020E94CD170F
+:1028600006C0412F4F70602FC6010E948B05772054
+:1028700039F10E94041A80FD23C0F60112820E94E1
+:10288000FE190E94C818C6010E94C3110E94FE19B9
+:102890000F900F900F900F900F90DF91CF911F919D
+:1028A0000F91FF90EF90DF90CF90BF90AF909F90EF
+:1028B0008F907F905F904F903F902F900C94E918ED
+:1028C0000F900F900F900F900F90DF91CF911F916D
+:1028D0000F91FF90EF90DF90CF90BF90AF909F90BF
+:1028E0008F907F905F904F903F902F9008950E941F
+:1028F000121B0E94221B0E94E41A0E94491B0E9484
+:1029000090200E94DF1F80E090E00E94970F80E0FF
+:1029100090E00C94AD0F0E94021B0C9477140E945F
+:10292000C319292F22952F7030E02C3031054CF43B
+:102930002A3031056CF42250310922303105A8F4D7
+:1029400007C02C30310569F02F30310551F00DC032
+:10295000803F69F018F4803E40F409C0843F29F4B8
+:1029600006C093FB882780F9089580E0089581E0F0
+:102970000895CF93DF9300D000D01F92CDB7DEB77C
+:102980000F900F900F900F900F90DF91CF910895BF
+:10299000CF93DF9300D000D000D0CDB7DEB726961E
+:1029A0000FB6F894DEBF0FBECDBFDF91CF91089573
+:1029B0001F93CF93DF93C0917A0116E080917B0142
+:1029C000C81799F0D0E01C9FF0011D9FF00D112455
+:1029D000E458FE4F408151816281738184819581E9
+:1029E0000E94C8142196C770E9CFDF91CF911F9143
+:1029F00008954091AC015091AD016091AE0170918C
+:102A0000AF018091B0019091B1010C94C8148091F4
+:102A1000B10182958F7009F054C08091AE01882376
+:102A200009F44FC080917A01A0917B016091AC01C3
+:102A30007091AD014091AF015091B001B6E08A179D
+:102A400009F43FC090E041155105C1F17F3F11F4F9
+:102A50006F3FA1F1B89FF001B99FF00D1124E45828
+:102A6000FE4F218172132AC02081621327C0228168
+:102A7000211124C0238134812417350710F42150FB
+:102A80003109241B350B283C3105C0F42091B101DC
+:102A90002F7020612093B10126E0289FF001299F2B
+:102AA000F00D1124EF57FE4F80818F70806180837D
+:102AB0008CEA91E00E94C3110C94D814019687709F
+:102AC000BECF0895CF92DF92EF92FF920F931F93A4
+:102AD000CF93DF93CDB7DEB762970FB6F894DEBF22
+:102AE0000FBECDBF8C0185E0F801DE011D9601907F
+:102AF0000D928A95E1F7D8014C9111965C9111974E
+:102B000012966C9112971396CD90DC901497309199
+:102B1000AC017091AD018091AF019091B00100972F
+:102B200009F46BC17F3F19F43F3F09F466C1E0909F
+:102B3000AE01EE2009F4C0C02091B101C816D9063B
+:102B400028F0F601E81BF90BCF0104C080959095A1
+:102B50008C0D9D1DFF24F394883C910578F0F12C99
+:102B6000207F09F0C6C07C2DD98AC88A89890E9435
+:102B7000B9148CEA91E00E94C311B1C0822F807F0A
+:102B800009F046C0751314C0341312C0611110C08F
+:102B90002F7020612093B1010E94F9148CEA91E01A
+:102BA0000E94C3118091B101D80115968C932EC05B
+:102BB000CD2819F15F3F11F44F3FF9F0F62E611166
+:102BC0001CC080917A0120917B0136E0821709F4C4
+:102BD0005AC090E0389FF001399FF00D1124E4585D
+:102BE000FE4F7181571306C07081471303C0728175
+:102BF000711103C001968770E9CFF62E662309F4A0
+:102C000018C18091B10181608093B101F12C11C193
+:102C1000751308C0341306C0611104C08091B1015E
+:102C2000D801C3C04D875E878D859E856A8B0E94C3
+:102C30008F146A898823E1F16623D1F12091B101D3
+:102C4000822F82958F7090E0029774F08091AC0192
+:102C50009091AD0198878F831986DB86CA862C8771
+:102C6000CE0107960E94C31186E0F801ACEAB1E0FC
+:102C700001900D928A95E1F70E9407150E94F914C0
+:102C8000FF24F394D6C04D875E878D859E850E9474
+:102C9000C319292F22952F7030E0223031050CF016
+:102CA000BCC09F7009F0B6C0805E883008F4C1C017
+:102CB000C8010E94C311E4CFC816D90608F453C056
+:102CC000F601E81BF90BCF01883C910508F450C0D0
+:102CD000F12C7C2DD98AC88A89890E94B914ECEA22
+:102CE000F1E086E0DF011D928A95E9F70E94F91470
+:102CF000A0C0751314C0341312C0611110C08091AC
+:102D0000B101F8018583C8010E94C31186E0ECEA95
+:102D1000F1E0DF011D928A95E9F7FE2C8AC04D870C
+:102D20005E878D859E856A8B0E948F146A898823B1
+:102D300009F4BECF662309F4BBCF2091B101822FE5
+:102D400082958F7090E002970CF48ECF8091AC0149
+:102D50009091AD019A8389831B82DD82CC822E8380
+:102D6000CE0101967FCF809590958C0D9D1DACCFA7
+:102D7000F62E662309F49CCF75132EC034132CC095
+:102D80002091B10120FD1FC0822F82958F70D9F054
+:102D9000D80115962C9315978F3049F08F5F982F97
+:102DA0009295907F822F8F70892B15968C93C801F6
+:102DB0000E94C31186E0F801ACEAB1E001900D92E7
+:102DC0008A95E1F793CF86E0F801ACEAB1E0019093
+:102DD0000D928A95E1F72DC04D875E878D859E8582
+:102DE0000E948F14811140CF8091B1018160809346
+:102DF000B101C8010E94C3111CC0662309F458CF59
+:102E00004D875E878D859E850E948F14882309F4E7
+:102E10004FCF2ACF811148CF0CC0243031050CF0A0
+:102E200047CF9F7009F440CFF8019581907F09F05A
+:102E30003BCF8F2D62960FB6F894DEBF0FBECDBF8D
+:102E4000DF91CF911F910F91FF90EF90DF90CF9086
+:102E500008951F93CF93DF93CDB7DEB72C970FB6AE
+:102E6000F894DEBF0FBECDBF4F83588769877A873E
+:102E70008B879C87CE0107960E946215882369F094
+:102E80008F8198852A853B85232BF1F19F3F09F09F
+:102E900063C08F3F09F060C037C086E0FE013796FF
+:102EA000DE01119601900D928A95E1F76F81788588
+:102EB000EA85FB85309741F17F3F11F46F3F21F1A7
+:102EC00020917B0130E0C9010196877099274091DC
+:102ED0007A0150E08417950709F447C069837A8323
+:102EE000FD83EC8396E0929FD001939FB00D112457
+:102EF000A458BE4FFE01319601900D929A95E1F7CC
+:102F000080937B010E94D81416E080917A01909101
+:102F10007B018917C1F1189FC001112484589E4F6D
+:102F20000E946215882379F1E0917A011E9FF001D9
+:102F30001124E458FE4F4081518162817381848164
+:102F400095810E94C81480917A0190E00196877063
+:102F5000992780937A01D9CF4F81588569857A85E1
+:102F60008B859C850E94C814CFCF0E948B14109231
+:102F70007B0110927A01ECEAF1E086E0DF011D921C
+:102F80008A95E9F7C1CF2C960FB6F894DEBF0FBE35
+:102F9000CDBFDF91CF911F910895EF92FF920F93D4
+:102FA0001F93CF93DF938C01892B09F46CC0F12C14
+:102FB000EE24E394E8012196F8018491843740F4EB
+:102FC000843008F051C0813081F0823019F15BC04B
+:102FD000853709F444C0A8F19CE7980F903708F0B2
+:102FE00052C08F770E94661141C00E5F1F4FFE01D5
+:102FF000C49180E28C0F883048F4C7708E2D01C0D8
+:10300000880FCA95EAF70E94151B14C08C2F0E94E6
+:103010009E102DC00E5F1F4FFE01C49180E28C0FE9
+:10302000883058F4C7708E2D01C0880FCA95EAF712
+:103030000E941B1B0E94491B1AC08C2F0E94661104
+:1030400016C00E5F1F4FFE01C491CC2381F08FE9A3
+:103050009FE00197F1F700C00000C150F6CF0E5F6E
+:103060001F4FFE01F49003C00E949E108E018F2D11
+:10307000882309F49FCFEFE9FFE03197F1F700C013
+:1030800000008150F5CFDF91CF911F910F91FF90FC
+:10309000EF90089508956093B6017093B7018093FF
+:1030A000B8019093B9010C9477140F931F9300917A
+:1030B000B6011091B7012091B8013091B901DC013E
+:1030C000CB01802B912BA22BB32B8093B601909335
+:1030D000B701A093B801B093B9011F910F910C945F
+:1030E00077140F931F930091B6011091B7012091AF
+:1030F000B8013091B901DC01CB0180239123A223D7
+:10310000B3238093B6019093B701A093B801B09315
+:10311000B9011F910F910C9477140F931F93009195
+:10312000B6011091B7012091B8013091B901DC01CD
+:10313000CB0180279127A227B3278093B6019093D4
+:10314000B701A093B801B093B9011F910F910C94EE
+:1031500077141092B2011092B3011092B401109240
+:10316000B5010C94771441E050E060E070E004C0D9
+:10317000440F551F661F771F8A95D2F74093B201FF
+:103180005093B3016093B4017093B5010C9477141C
+:1031900041E050E060E070E004C0440F551F661F3E
+:1031A000771F8A95D2F78091B2019091B301A091D7
+:1031B000B401B091B501482B592B6A2B7B2B40935E
+:1031C000B2015093B3016093B4017093B5010C94B4
+:1031D000771441E050E060E070E004C0440F551FF8
+:1031E000661F771F8A95D2F7409550956095709528
+:1031F0008091B2019091B301A091B401B091B50159
+:10320000482359236A237B234093B2015093B3018F
+:103210006093B4017093B5010C94771441E050E0D1
+:1032200060E070E004C0440F551F661F771F8A9549
+:10323000D2F78091B2019091B301A091B401B09105
+:10324000B501482759276A277B274093B20150933D
+:10325000B3016093B4017093B5010C9477140F938C
+:103260001F930091B2011091B3012091B4013091EC
+:10327000B501DC01CB01802B912BA22BB32B8093CA
+:10328000B2019093B301A093B401B093B5011F9123
+:103290000F910C9477140F931F930091B20110912A
+:1032A000B3012091B4013091B501DC01CB01802341
+:1032B0009123A223B3238093B2019093B301A093EF
+:1032C000B401B093B5011F910F910C9477140F9333
+:1032D0001F930091B2011091B3012091B40130917C
+:1032E000B501DC01CB0180279127A227B32780936A
+:1032F000B2019093B301A093B401B093B5011F91B3
+:103300000F910C9477140895CF92DF92EF92FF9271
+:103310000F931F93CF93DF938C01C090B601D09091
+:10332000B701E090B801F090B9018091B20190919D
+:10333000B301A091B401B091B501C82AD92AEA2AF3
+:10334000FB2ACFE1D0E0D701C6010C2E04C0B69510
+:10335000A795979587950A94D2F780FF06C0B80184
+:103360008C2F0E94DC07019721F4219760F780E001
+:1033700001C08C2FDF91CF911F910F91FF90EF90A3
+:10338000DF90CF900895CF93DF93EC010E948419D2
+:10339000BE010E94DC07DF91CF910895CB010E940E
+:1033A000C31908958091BF0108958093BF010895C6
+:1033B0001092BF0108950E94461C2091BD013091DA
+:1033C000BE018217930750F00E94461C2091BD0158
+:1033D0003091BE01821B930B9C010AC00E94461CC7
+:1033E0002091BD013091BE0120953095280F391FE5
+:1033F00081E0283B3B4008F480E008958091BC01C7
+:1034000085958595859508958091BC01877008956F
+:103410000E94461C2091BA013091BB01821793078C
+:10342000A8F00E94461C2091BA013091BB01821B7A
+:10343000930B883B9B4010F480E013C08091BC014B
+:1034400082FB882780F991E089270BC00E94461CE7
+:103450002091BA013091BB0120953095820F931FC6
+:10346000E8CF8170089598E0899F90011124262B60
+:103470002093BC010E94C8180E94461C9093BB0177
+:103480008093BA0108951092BC011092BB01109272
+:10349000BA0108952091BC01809582238093BC01DC
+:1034A000982F977089F430E0482F552747FD5095A5
+:1034B0002417350749F08595859585950E94E9186B
+:1034C0001092BB011092BA0108959091BC019770BF
+:1034D00081E009F480E0089590910C01992321F096
+:1034E00090910D01911109C020910E0130910F01B1
+:1034F000F90132969FEF40E01FC0982F9695969560
+:1035000096959F3050F5E0910E01F0910F01E90F73
+:10351000F11D877021E030E0A90102C0440F551F62
+:103520008A95E2F7CA019181892B818308959F3F93
+:1035300039F04F5F4E3041F051915813F8CF0DC024
+:103540005111F7CF942FF5CF9F3F39F0F901E90FD3
+:10355000F11D97FDFA9582830895089590910C01CD
+:10356000992321F090910D01911109C020910E0134
+:1035700030910F01F9013296205F3F4F1FC0982F05
+:103580009695969596959F30F0F4E0910E01F09106
+:103590000F01E90FF11D877021E030E0A90102C0A1
+:1035A000440F551F8A95E2F7CA01809591818923BE
+:1035B000818308953196E217F30729F090819813DB
+:1035C000F9CF1082F7CF089581E090E0E0910E01ED
+:1035D000F0910F01E80FF91F1082019680319105DB
+:1035E000A9F708958091D30108959091D301892B73
+:1035F0008093D301089580959091D301892380937E
+:10360000D30108951092D30108959091D201892B8E
+:103610008093D201089580959091D201892380935F
+:10362000D20108951092D20108959091D101892B71
+:103630008093D101089580959091D1018923809341
+:10364000D10108951092D10108958093C0010E9484
+:10365000461C9093BE018093BD0108951092C00155
+:103660001092BE011092BD0108958091C00108958D
+:1036700080910E0190910F01FC0131969C01205F19
+:103680003F4F80E0919191118F5FE217F307D1F7DF
+:103690000895E0910E01F0910F018091D301808394
+:1036A000E0910E01F0910F0190818091D201892B60
+:1036B0008083E0910E01F0910F0190818091D10102
+:1036C000892B80838091C001882399F00E94DB19A7
+:1036D00081110E942E1BE0910E01F0910F0190814B
+:1036E0008091C001892B80830E94381B81110E9428
+:1036F0002E1B80910E0190910F010C94810FCF929F
+:10370000DF92EF92FF926C01EE24FF24C114D104EA
+:10371000E104F10421F0C701B60120E101C020E07D
+:10372000C72ED82EE92EFF24C114D104E104F104E0
+:1037300019F0285FC701B6016B017C0154E0F694D3
+:10374000E794D794C7945A95D1F7C114D104E104F2
+:10375000F10419F02C5FC701B6016B017C0142E056
+:10376000F694E794D794C7944A95D1F7C114D1043D
+:10377000E104F10419F02E5FC701B601DC01CB01B1
+:10378000B695A79597958795892B8A2B8B2B09F052
+:103790002F5F822FFF90EF90DF90CF900895809160
+:1037A000E901843021F11092D50120E488E190E014
+:1037B0000FB6F894A895809360000FBE2093600028
+:1037C00080E00E94770883B7817F846083BF83B7DE
+:1037D000816083BF7894889583B78E7F83BF88E1AB
+:1037E0000FB6F89480936000109260000FBE0895A9
+:1037F00008950895CF930E94F81B0E9496040E949A
+:10380000F91BC0E08C2F0E948405811104C0CF5F9A
+:10381000CE30C1F701C081E0CF9108950E948B1492
+:103820000E94750F0C9477081F920F920FB60F929B
+:1038300011248F939F93AF93BF938091D5018111F2
+:1038400013C08091D6019091D701A091D801B09179
+:10385000D9014196A11DB11D8093D6019093D70146
+:10386000A093D801B093D901BF91AF919F918F914F
+:103870000F900FBE0F901F90189582E084BD93E0CB
+:1038800095BD9AEF97BD80936E0008952FB7F89479
+:103890008091D6019091D701A091D801B091D90122
+:1038A0002FBF0895CF92DF92EF92FF920F931F9355
+:1038B0002FB7F8944091D6015091D7016091D8016B
+:1038C0007091D9012FBF6A017B01EE24FF248C0186
+:1038D00020E030E0C016D106E206F30610F44150B5
+:1038E00051099A01281B390BC9011F910F91FF90B3
+:1038F000EF90DF90CF9008951F920F920FB60F9226
+:1039000011248F939F93AF93BF938091D601909191
+:10391000D701A091D801B091D9010196A11DB11D87
+:103920008093D6019093D701A093D801B093D90189
+:10393000BF91AF919F918F910F900FBE0F901F90ED
+:1039400018950E94720CF8942FEF87EA91E62150A7
+:1039500080409040E1F700C0000087E090EBDC0180
+:103960008093F3019093F401A093F501B093F601D5
+:103970009CE088E10FB6F894A895809360000FBE94
+:1039800090936000FFCFEF92FF920F931F93CF931E
+:10399000DF93D82FC0E08C2F0E94840500E010E058
+:1039A000E82EF12CC701002E02C0959587950A9448
+:1039B000E2F780FD06C00F5F1F4F0630110591F73B
+:1039C00009C0602F7C2F80E00E948C05D813F3CFB4
+:1039D00081E004C0CF5FCE30F1F680E0DF91CF917F
+:1039E0001F910F91FF90EF900895CF93C82F8CE215
+:1039F0000E94C31C882321F08C2FCF910C94C31CF0
+:103A000080E0CF910895CF930E944A1E811102C099
+:103A10000E94301EC5E6C15049F00E9496048FE313
+:103A20009CE90197F1F700C00000F5CF89E20E9400
+:103A3000F51C811113C18AE20E94F51C81110E94BC
+:103A4000301E85E00E94F51C81110E94A11C0E947D
+:103A5000551E8093D40187E00E94F51C8823A9F1AC
+:103A60008BE10E94F51C882351F08091D40181FBE9
+:103A7000222720F991E0922790FB81F90EC08EE079
+:103A80000E94F51C882361F08091D40182FB2227DB
+:103A900020F991E0922790FB82F98093D40115C020
+:103AA00080E10E94F51C9091D401882341F093FBA2
+:103AB000222720F981E0822780FB93F904C0892F17
+:103AC000809580FB90F99093D4018091D4010E945D
+:103AD000591E0E94671E8093F20180EE0E94F51C21
+:103AE000882341F08091F201982F909590FB80F906
+:103AF0008093F20189E30E94F51C882359F080919C
+:103B0000F20181FB222720F991E0922790FB81F9B5
+:103B10008093F20182EE0E94F51C882359F0809177
+:103B2000F20182FB222720F991E0922790FB82F993
+:103B30008093F20186EE0E94F51C882359F0809153
+:103B4000F20183FB222720F991E0922790FB83F971
+:103B50008093F20183EE0E94F51C882359F0809136
+:103B6000F20184FB222720F991E0922790FB84F94F
+:103B70008093F20185E30E94F51C882359F080911F
+:103B8000F20185FB222720F991E0922790FB85F92D
+:103B90008093F20181E30E94F51C882359F0809103
+:103BA000F20186FB222720F991E0922790FB86F90B
+:103BB0008093F20181E10E94F51C882359F08091E5
+:103BC000F20187FB222720F991E0922790FB87F9E9
+:103BD0008093F2018091F2010E946B1E8091F201AC
+:103BE00087FB882780F980930D0187E20E94F51CEE
+:103BF000C82F8EE10E94F51C8111C2608FE10E94E6
+:103C0000F51C8111C46080E20E94F51C8111C8601E
+:103C100081E20E94F51C8111C06182E20E94F51CC4
+:103C20008111C06283E20E94F51C8111C06484E2AC
+:103C30000E94F51C882311F0C06802C0CC2329F033
+:103C40008C2F0E94621E6C2F03C00E945E1E682F84
+:103C500070E080E090E0CF910C944B18CF910895E4
+:103C60006DEE7EEF80E090E00E94302460E082E024
+:103C700090E00E941E2460E083E090E00E941E24F9
+:103C800060E084E090E00E941E2460E085E090E027
+:103C90000C941E2480E090E00E94182421E08D3EC8
+:103CA0009E4F09F020E0822F089582E090E00C946E
+:103CB0001024682F82E090E00C941E2483E090E0B2
+:103CC0000C941024682F83E090E00C941E2484E070
+:103CD00090E00C941024682F84E090E00C941E2453
+:103CE0008091DC0180FF0BC06091130185E0689F2B
+:103CF000B001112475956795759567952BC081FF67
+:103D000009C06091130185E0689FB0011124759589
+:103D1000679520C082FF07C06091130185E0689F0E
+:103D2000B001112417C09091DD019923D1F0609169
+:103D30001201961788F72091130185E0289F9001C2
+:103D40001124929FA001939F500D112470E0CA018D
+:103D50000E94E2236038710540F46115710539F065
+:103D600002C065E070E0862F08958FE7089581E036
+:103D700008958091DC0180FF08C06091110170E01E
+:103D8000759567957595679521C081FF06C060910F
+:103D9000110170E07595679519C082FF04C06091AC
+:103DA000110170E010C09091DD019923C1F0609184
+:103DB00010019617A0F780911101899FC00111246D
+:103DC00070E00E94E2236038710528F461157105E6
+:103DD00021F0862F08958FE7089581E0089561E02E
+:103DE00070E0F4CF803F21F40E94701E819504C0E2
+:103DF000813F29F40E94701E8093E0010895823F64
+:103E000021F40E94701E819504C0833F29F40E9412
+:103E1000701E8093DF010895893F19F40E94B91E36
+:103E200005C08A3F31F40E94B91E81958093E1015B
+:103E300008958B3F21F40E94B91E819504C08C3FE8
+:103E400029F40E94B91E8093E2010895843F21F471
+:103E50008091DE01816017C0853F21F48091DE01F1
+:103E6000826011C0863F21F48091DE0184600BC026
+:103E7000873F21F48091DE01886005C0883F31F4DE
+:103E80008091DE0180618093DE0108958D3F21F4F1
+:103E90008091DC0181600BC08E3F21F48091DC01B8
+:103EA000826005C08F3F29F48091DC01846080939B
+:103EB000DC010895803F39F48091E00187FF6CC0F8
+:103EC0001092E00169C0813F29F48091E001181649
+:103ED000BCF362C09091DF01823F29F497FF5CC080
+:103EE0001092DF0159C0833F19F41916CCF354C066
+:103EF000893F41F48091E10118160CF04DC01092F9
+:103F0000E1014AC08A3F29F48091E10187FF44C062
+:103F1000F6CF8B3F39F48091E20187FF3DC01092CC
+:103F2000E2013AC08C3F29F48091E2011816BCF3FB
+:103F300033C0843F21F48091DE018E7F17C0853F1E
+:103F400021F48091DE018D7F11C0863F21F48091A4
+:103F5000DE018B7F0BC0873F21F48091DE01877FDC
+:103F600005C0883F31F48091DE018F7E8093DE01B1
+:103F700013C08D3F21F48091DC018E7F0BC08E3FFA
+:103F800021F48091DC018D7F05C08F3F29F4809161
+:103F9000DC018B7F8093DC018091DF0181110EC0F9
+:103FA0008091E00181110AC08091E101811106C078
+:103FB0008091E201811102C01092DD0108958EED21
+:103FC00091E00E948C0F0E94461C9093DB0180932D
+:103FD000DA0108951F93CF93DF938091DA019091D6
+:103FE000DB010E94521CAC019091DD01992321F06C
+:103FF0002091140130E006C0209115018AE0289F2D
+:10400000900111244217530708F486C08091DF0104
+:10401000C091E001D091E1011091E201811107C04E
+:10402000C11176C0D11174C0111172C075C09F3F0B
+:1040300019F09F5F9093DD01181624F40E94701E02
+:104040008093DF018091DF0187FF05C00E94701E11
+:1040500081958093DF011C1624F40E94701E8093CA
+:10406000E0018091E00187FF05C00E94701E8195EC
+:104070008093E0016091DF01662339F1C091E00196
+:10408000CC2319F1772767FD7095872F972F0E9412
+:10409000F32223E333E343E35FE30E9457230E94C9
+:1040A000C0226093DF016C2F772767FD7095872F03
+:1040B000972F0E94F32223E333E343E35FE30E945D
+:1040C00057230E94C0226093E0011D1624F40E9431
+:1040D000B91E8093E1018091E10187FF05C00E9434
+:1040E000B91E81958093E101111624F40E94B91E36
+:1040F0008093E2018091E20187FF05C00E94B91E12
+:1041000081958093E201DF91CF911F910C94DF1F85
+:104110009F3F09F08ECF96CFDF91CF911F910895E9
+:10412000EEEDF1E085E0DF011D928A95E9F710924E
+:10413000DD011092DC010895833081F128F4813093
+:1041400059F08230D1F00895853009F449C0B8F1B2
+:10415000863009F456C0089580911501262F30E06D
+:10416000280F311D2F3F310524F4680F609315018E
+:1041700008958FEF80931501089580911401262FE3
+:1041800030E0280F311D2F3F310524F4680F609374
+:10419000140108958FEF8093140108958091130105
+:1041A000262F30E0280F311D2F3F310524F4680FF2
+:1041B0006093130108958FEF809313010895809108
+:1041C0001201262F30E0280F311D2F3F310524F436
+:1041D000680F6093120108958FEF80931201089584
+:1041E00080911101262F30E0280F311D2F3F31051E
+:1041F00024F4680F6093110108958FEF80931101EB
+:10420000089580911001262F30E0280F311D2F3F97
+:10421000310524F4680F6093100108958FEF8093A7
+:1042200010010895833011F128F4813049F0823073
+:1042300091F00895853081F120F18630C1F1089523
+:1042400080911501681720F4861B8093150108954D
+:1042500010921501089580911401681720F4861BAF
+:104260008093140108951092140108958091130110
+:10427000681720F4861B8093130108951092130190
+:10428000089580911201681720F4861B8093120113
+:10429000089510921201089580911101681720F479
+:1042A000861B809311010895109211010895809149
+:1042B0001001681720F4861B809310010895109256
+:1042C000100108950F931F938B3109F475C0A0F569
+:1042D0008E3009F484C0C0F4873009F45BC068F400
+:1042E000863009F0AAC08091D401817F8E7F8093AF
+:1042F000D40181E08093E401A1C0883009F496C024
+:104300008B3009F493C099C0813109F472C068F40C
+:10431000803109F092C08091D40183FB222720F9DB
+:1043200091E0922790FB83F950C0863109F47EC05A
+:10433000893109F47BC081C0853309F479C068F400
+:10434000873209F475C028F48E3108F476C08D5197
+:104350005AC0893209F46CC070C0833438F48A338F
+:1043600008F050C0883309F461C067C0833409F491
+:104370005FC0883409F061C00E948B140FEF13ED09
+:1043800020E3015010402040E1F700C000000E94EF
+:10439000A11C4CC09091D401892F8095817080FB25
+:1043A00090F929F0966098609093D40147C0997F66
+:1043B000977F9093D4013AC08091D40181FB22274A
+:1043C00020F991E0922790FB81F98093D401992301
+:1043D00069F18091D40181608093D40127C08091DC
+:1043E000D40182FB222720F991E0922790FB82F9E9
+:1043F000ECCF0E948B1490910D0181E0892780936E
+:104400000D0114C0895341E050E060E070E08A0182
+:104410009B0104C0000F111F221F331F8A95D2F782
+:10442000C901B8010E944B180E948B1481E006C09C
+:1044300061E070E080E090E0F5CF80E01F910F91A7
+:10444000089580E0089580E00895CF93C82F80916B
+:10445000E401813079F018F08230E9F187C0E09111
+:104460000E01F0910F018081813169F0823209F0F3
+:104470007FC009C0E0910E01F0910F018081813170
+:1044800011F0823261F48C2F0E942122811104C02C
+:104490008C2F0E9462211DC081E090E01AC08C2FF9
+:1044A0000E942322811114C0C43179F048F4CB302A
+:1044B00079F0C03109F060C082E08093E40108C067
+:1044C000C93219F0C83321F057C01092E40154C02A
+:1044D00081E0817053C0C93289F118F5C43171F19E
+:1044E000A8F4C73009F046C08AE08093150194E132
+:1044F0009093140193E0909313018093120188E04C
+:104500008093110188E28093100134C0CE51C630EF
+:1045100088F5EC2FF0E0E65DFE4F80818093E301AB
+:1045200029C0CE34E9F020F4CB3421F56AE013C081
+:10453000C13579F0C235F1F461E00DC08091E3013D
+:10454000882319F01092E30115C081E08093E40103
+:1045500015C061E006C08091E3010E949C200AC062
+:104560006AE08091E3010E94122104C01092E401EC
+:1045700080E004C081E002C080E0ABCFCF9108951D
+:1045800004D06894B1118DC0089570D088F09F5701
+:1045900090F0B92F9927B751A0F0D1F0660F771F8F
+:1045A000881F991F1AF0BA95C9F712C0B13081F06F
+:1045B00077D0B1E0089574C0672F782F8827B85F4F
+:1045C00039F0B93FCCF3869577956795B395D9F7D0
+:1045D0003EF490958095709561957F4F8F4F9F4FDA
+:1045E0000895E89409C097FB3EF4909580957095E6
+:1045F00061957F4F8F4F9F4F9923A9F0F92F96E92F
+:10460000BB279395F695879577956795B795F111A3
+:10461000F8CFFAF4BB0F11F460FF1BC06F5F7F4F40
+:104620008F4F9F4F16C0882311F096E911C0772352
+:1046300021F09EE8872F762F05C0662371F096E85B
+:10464000862F70E060E02AF09A95660F771F881F2A
+:10465000DAF7880F9695879597F9089557FD905842
+:10466000440F551F59F05F3F71F04795880F97FB36
+:10467000991F61F09F3F79F08795089512161306F0
+:104680001406551FF2CF4695F1DF08C0161617061F
+:104690001806991FF1CF8695710561050894089554
+:1046A000E894BB2766277727CB0197F908950BD0AD
+:1046B00078C069D028F06ED018F0952309F05AC060
+:1046C0005FC01124EECFCADFA0F3959FD1F3950F01
+:1046D00050E0551F629FF001729FBB27F00DB11D86
+:1046E000639FAA27F00DB11DAA1F649F6627B00D16
+:1046F000A11D661F829F2227B00DA11D621F739FFF
+:10470000B00DA11D621F839FA00D611D221F749F0C
+:104710003327A00D611D231F849F600D211D822F53
+:10472000762F6A2F11249F5750408AF0E1F088239A
+:104730004AF0EE0FFF1FBB1F661F771F881F9150A7
+:104740005040A9F79E3F510570F014C0AACF5F3FBB
+:10475000ECF3983EDCF3869577956795B795F795DA
+:10476000E7959F5FC1F7FE2B880F911D9695879562
+:1047700097F9089597F99F6780E870E060E00895E1
+:104780009FEF80EC089500240A9416161706180669
+:104790000906089500240A94121613061406050645
+:1047A0000895092E0394000C11F4882352F0BB0FD6
+:1047B00040F4BF2B11F460FF04C06F5F7F4F8F4F39
+:1047C0009F4F089597FB072E16F4009407D077FDAE
+:1047D00009D00E94FC2307FC05D03EF490958195FA
+:1047E0009F4F0895709561957F4F0895EE0FFF1FBD
+:1047F0000590F491E02D0994AA1BBB1B51E107C061
+:10480000AA1FBB1FA617B70710F0A61BB70B881F60
+:10481000991F5A95A9F780959095BC01CD010895EF
+:10482000F999FECF92BD81BDF89A992780B5089578
+:10483000A8E1B0E042E050E00C943824262FF9992A
+:10484000FECF92BD81BDF89A019700B4021639F0EF
+:104850001FBA20BD0FB6F894FA9AF99A0FBE0895C0
+:104860000196272F0E941F240C941E24DC01CB01EB
+:10487000FC01F999FECF06C0F2BDE1BDF89A319670
+:1048800000B40D9241505040B8F70895F894FFCF0E
+:10489000200279080709E408B0087C080101C10179
+:1048A00028080A03140A3F4D3639A9045C0426047B
+:1048B000ED0380039903B203CB0301020304050651
+:0448C00007080900DC
+:00000001FF
diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_base.png b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_base.png Binary files differnew file mode 100644 index 0000000000..f9bc8b443a --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_base.png diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png Binary files differnew file mode 100644 index 0000000000..983b723480 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png Binary files differnew file mode 100644 index 0000000000..8f04b4327d --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png diff --git a/keyboard/ergodox_ez/keymaps/twey/keymap.c b/keyboard/ergodox_ez/keymaps/twey/keymap.c index 75d264bdbe..019930f2a2 100644 --- a/keyboard/ergodox_ez/keymaps/twey/keymap.c +++ b/keyboard/ergodox_ez/keymaps/twey/keymap.c @@ -5,8 +5,8 @@ #define BASE 0 // default layer #define SYMB 1 // symbols -#define MDIA 2 // media keys -#define STEN 3 // steno +#define STEN 2 // steno +#define MDIA 3 // media keys const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -17,19 +17,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+------+------+------+-------+-------------| |-------+------+------+------+------+------+--------| * | Del | ' | , | . | P | Y | Esc | | Caps | F | G | C | R | L | / | * |--------+------+------+------+-------+------| | | |------+------+------+------+------+--------| - * | BkSp | A | O | E | U | I |------| |-------| D | H | T | N |S / L2|- / Cmd | + * | BkSp | A | O | E | U | I |------| |-------| D | H | T | N | S | - | * |--------+------+------+------+-------+------| Tab | | Enter |------+------+------+------+------+--------| * | LShift | ; | Q | J | K | X | | | | B | M | W | V | Z | RShift | * `--------+------+------+------+-------+-------------' `--------------+------+------+------+------+--------' - * |Grv/L1| '" |AltShf| Left | Right | | Up | Down | [ | ] | ~L1 | + * | L1 | NONE | Grv | Left | Right | | Up | Down | [ | ] | L1 | * `-----------------------------------' `----------------------------------' - * ,-------------. ,---------------. - * | PgUp | PgDn | | Home | End | - * ,------|------|------| |-------+-------+------. - * | | | NONE | | NONE | | | - * | Alt | NONE |------| |-------| Space | Ctrl | - * | | | Supr | | AltGr | | | - * `--------------------' `----------------------' + * ,--------------. ,---------------. + * | PgUp | PgDn | | Home | End | + * ,------|-------|------| |-------+-------+------. + * | | | NONE | | AltGr | | | + * | Alt | Enter |------| |-------| Space | Ctrl | + * | | | Supr | | ~MDIA | | | + * `---------------------' `----------------------' */ // If it accepts an argument (i.e, is a function), it doesn't need KC_. // Otherwise, it needs KC_* @@ -39,19 +39,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DELT, KC_QUOT, KC_COMM,KC_DOT, KC_P, KC_Y, KC_ESC, KC_BSPC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_TAB, - LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT, + MO(SYMB), KC_NO, KC_GRV, KC_LEFT,KC_RGHT, KC_PGUP,KC_PGDN, KC_NO, KC_LALT,KC_ENT ,KC_LGUI, // right hand - KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - KC_CAPS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, - KC_D, KC_H, KC_T, KC_N, LT(MDIA, KC_S), GUI_T(KC_MINS), - KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z , KC_RSFT, - KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_FN1, - KC_HOME,KC_END, - KC_NO, - KC_RALT,KC_SPC,KC_RCTL + KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + KC_CAPS, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, + KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + KC_ENT, KC_B, KC_M, KC_W, KC_V, KC_Z , KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, MO(SYMB), + KC_HOME, KC_END, + KC_RALT, + MO(MDIA),KC_SPC,KC_RCTL ), /* Keymap 1: Symbol Layer * @@ -95,24 +95,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -/* Keymap 2: Media and mouse keys + +[STEN] = KEYMAP( // layout: layer 2: Steno for Plover + // left hand + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_STAR, + KC_NO, PV_LS, PV_LT, PV_LP, PV_LH, PV_STAR, + KC_NO, PV_LS, PV_LK, PV_LW, PV_LR, PV_STAR, PV_STAR, + KC_TRNS,KC_NO, KC_NO, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, + KC_NO, + PV_A, PV_O, KC_NO, + // right hand + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + PV_STAR, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, + PV_STAR, PV_RF, PV_RP, PV_RL, PV_RT, PV_RD, + PV_STAR, PV_STAR, PV_RR, PV_RB, PV_RG, PV_RS, PV_RZ, + KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, + KC_NO, KC_NO, + KC_NO, + KC_TRNS,PV_E, PV_U +), + +/* Keymap 3: Media and mouse keys * * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | MsUp | | | | | | | | | | | | + * | | | | MsUp | | | | | | | Back | | Frwd | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * | | |MsLeft|MsDown|MsRght| |------| |------| | Prev | Play | Next | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | Prev | Next | | | + * | | | | | | | | | | | | | | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | | | | | | * ,------|------|------| |------+------+------. - * | | | | | | |Brwser| - * | | |------| |------| |Back | + * | | | | | | | | + * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ @@ -128,39 +150,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, // right hand KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_WBAK, KC_TRNS, KC_WFWD, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, 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_MPLY, - KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK ), - -[STEN] = KEYMAP( // layout: layer 4: Steno for Plover - // left hand - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_STAR, - KC_NO, PV_LS, PV_LT, PV_LP, PV_LH, PV_STAR, - KC_NO, PV_LS, PV_LK, PV_LW, PV_LR, PV_STAR, PV_STAR, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, - KC_NO, KC_NO, - KC_NO, - PV_A, PV_O, KC_NO, - // right hand - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - PV_STAR, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, - PV_STAR, PV_RF, PV_RP, PV_RL, PV_RT, PV_RD, - PV_STAR, PV_STAR, PV_RR, PV_RB, PV_RG, PV_RS, PV_RZ, - KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, - KC_NO, - KC_NO, PV_E, PV_U -), }; const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) + [1] = ACTION_LAYER_TAP_TOGGLE(MDIA) // FN1 - Momentary Layer 3 (Media) }; void toggle_steno(int pressed) @@ -170,15 +171,19 @@ void toggle_steno(int pressed) if (pressed) { if (layer != STEN) layer_on(STEN); else layer_off(STEN); - register_code(PV_LS); + register_code(PV_LP); register_code(PV_LH); - register_code(PV_RF); - register_code(PV_RT); + register_code(PV_LR); + register_code(PV_O); + register_code(PV_RL); + register_code(PV_RG); } else { - unregister_code(PV_LS); + unregister_code(PV_LP); unregister_code(PV_LH); - unregister_code(PV_RF); - unregister_code(PV_RT); + unregister_code(PV_LR); + unregister_code(PV_O); + unregister_code(PV_RL); + unregister_code(PV_RG); } } @@ -200,26 +205,17 @@ void matrix_init_user(void) { // Runs constantly in the background, in a loop. void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); + uint32_t layer0 = layer_state & (1UL << 0), + layer1 = layer_state & (1UL << 1), + layer2 = layer_state & (1UL << 2), + layer3 = layer_state & (1UL << 3); ergodox_board_led_off(); ergodox_right_led_1_off(); 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; - } + if (layer1) ergodox_right_led_1_on(); + if (layer2) ergodox_right_led_2_on(); + if (layer3) ergodox_right_led_3_on(); }; diff --git a/keyboard/ergodox_ez/keymaps/twey/readme.md b/keyboard/ergodox_ez/keymaps/twey/readme.md index d44c0a2382..979e4261e5 100644 --- a/keyboard/ergodox_ez/keymaps/twey/readme.md +++ b/keyboard/ergodox_ez/keymaps/twey/readme.md @@ -3,8 +3,8 @@ - Layer 0: Non-ANSI Dvorak layout, with modified modifiers — all modifiers on thumb keys, as well as return and space. - Layer 1: Default symbol layout. -- Layer 2: Default media/mouse layout. -- Layer 3: Plover-oriented stenography layer. +- Layer 2: Plover-oriented stenography layer. +- Layer 3: Extended media/mouse layout. ## Unusual features The Plover key (top right key on the left half) also sends my Plover @@ -12,8 +12,6 @@ The Plover key (top right key on the left half) also sends my Plover layer, so you can toggle between steno and typing modes with a single keypress. -If you want to use this feature, you'll need to add: - - "SH-FT": "{PLOVER:TOGGLE}" - -to your Plover dictionary. +If you want to use this feature, you'll need to add the +`commands.json` dictionary to your Plover dictionaries, or define the +toggle stroke (`PHROLG`) yourself. diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c new file mode 100644 index 0000000000..3444152bc3 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c @@ -0,0 +1,233 @@ +#include "ergodox_ez.h" +#include "debug.h" +#include "action_layer.h" + +#define BASE 0 // default layer +#define SYMB 1 // symbols +#define MDIA 2 // media keys + +#define SGWK 0 // "sagewick", ⌘S ⌘⇥ +#define SGWF 1 // "sagewick freshly", ⌘S ⌘⇥ ⌘R +#define BBED 2 // BBEdit +#define TMNL 3 // Terminal +#define SAFA 4 // Safari +#define ALFRED_LEAD_TIME 100 // time, in milliseconds, to let Alfred come to the fore and accept keyboard input + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | L1 | | L1 | 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | ⌦ | Q | W | E | R | T | ~L1 | | ~L1 | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | ⌫ | A | S | D | F | G |------| |------| H | J | K | L |; / L2| ' / L⌘ | + * |--------+------+------+------+------+------| L⌘ | | L⌘ |------+------+------+------+------+--------| + * | L⇧ | Z | X | C | V | B | | | | N | M | , | . | / / ⌃| R⇧ | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | L⌃ | L⌥ | L⌘ | ← | → | | ↑ | ↓ | [ | ] | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,---------------. + * | `~ | '" | | ⎋ | ⌫ | + * ,------|------|------| |------+--------+------. + * | | | PgUp | | PgDn | | | + * | | ⌫ |------| |------| ⇥ |Enter | + * | | | L⌥ | | L⌃ | | | + * `--------------------' `----------------------' + */ +// 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_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(SYMB), + KC_DELT, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(SYMB), + KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LGUI, + KC_LCTL, KC_LALT, KC_LGUI,KC_LEFT,KC_RGHT, + KC_GRV, KC_QUOT, + KC_PGUP, + KC_SPC,KC_BSPC,KC_LALT, + // right hand + TG(SYMB), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + MO(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), + KC_LGUI, KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT, + KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_SPC , + KC_ESC, KC_BSPC, + KC_PGDN, + KC_LCTL, KC_TAB, KC_ENT + ), +/* Keymap 1: Symbol Layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | [ | ] | { | } | " | | | | / | 7 | 8 | 9 | * | F12 | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | < | > | ( | ) | ' |------| |------| - | 4 | 5 | 6 | + | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | & | 1 | 2 | 3 | = | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | 0 | . | ← | → | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | Home | | | + * | | |------| |------| | | + * | | | | | End | | | + * `--------------------' `--------------------' + */ +// SYMBOLS +[SYMB] = KEYMAP( + // left hand + KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, + KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_DQUO,KC_TRNS, + KC_TRNS,KC_LABK,KC_RABK,KC_LPRN,KC_RPRN,KC_QUOT, + 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_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_TRNS, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, + KC_MINS, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_EQL, KC_TRNS, + KC_0, KC_DOT, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_HOME, + KC_END , KC_TRNS, KC_TRNS +), +/* Keymap 2: Media keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | F14 | F15 | | | | | | ⌘Q | ⌘W | ⌘⇧` | ⌘` | | | Power | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | PgUp |⌘S⌘⇥⌘R| Term | | | | ⌘] | ⌥⌘↑ | ↑ | ⌥⌘↓ | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |Safari| PgDn | | |------| |------| ⌘[ | ← | ↓ | → | | ⏯ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | |BBEdit| | | |L⇧+Spc| Spc | ⏮ | ⏭ | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | Home | | End | | | + * | | |------| |------| ⌘C | ⌘V | + * | | | | | ⌘X | | | + * `--------------------' `--------------------' + */ +// MEDIA AND MOUSE +[MDIA] = KEYMAP( + KC_TRNS, KC_F14 , KC_F15 , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, /* F14 dims screen, F15 brightens */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, M(SGWF), M(TMNL), KC_TRNS, + KC_TRNS, KC_TRNS, M(SAFA), KC_PGDN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(BBED), KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_HOME, + KC_TRNS, KC_TRNS, KC_TRNS, + // right hand + LGUI(KC_Q), LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, KC_PWR, + KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS, + LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY, + KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, + LGUI(KC_X), LGUI(KC_C), LGUI(KC_V) +), +}; + +const uint16_t PROGMEM fn_actions[] = { + [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case SGWK: + if (record->event.pressed) { + return MACRO( + I(10), + D(LGUI), T(S), U(LGUI), + D(LGUI), T(TAB), U(LGUI), + END); + } + break; + case SGWF: + if (record->event.pressed) { + return MACRO( + I(10), + D(LGUI), T(S), U(LGUI), + D(LGUI), T(TAB), U(LGUI), + D(LGUI), T(R), U(LGUI), + END); + } + break; + case BBED: + if (record->event.pressed) { + return MACRO( + I(10), + D(LALT), T(SPC), U(LALT), W(ALFRED_LEAD_TIME), + T(B), T(B), T(E), T(D), T(I), T(T), + T(ENT), + END); + } + break; + case TMNL: + if (record->event.pressed) { + return MACRO( + I(10), + D(LALT), T(SPC), U(LALT), W(ALFRED_LEAD_TIME), + T(T), T(E), T(R), T(M), T(I), T(N), T(A), T(L), + T(ENT), + END); + } + break; + case SAFA: + if (record->event.pressed) { + return MACRO( + I(10), + D(LALT), T(SPC), U(LALT), W(ALFRED_LEAD_TIME), + T(S), T(A), T(F), T(A), T(R), T(I), + T(ENT), + END); + } + break; + } + return MACRO_NONE; +}; + +// 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); + + ergodox_board_led_off(); + ergodox_right_led_1_off(); + 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; + default: + // none + break; + } + +}; diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown new file mode 100644 index 0000000000..7bce7c6909 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown @@ -0,0 +1,45 @@ +# The Zweihander Layout + +NB: the backtick (\`) is special in Markdown. If I write ⌘\` in this readme, I mean “command-backtick”, not “command-backslash-backtick”. + +This layout is tuned for people who… + + +## use OS X + +This layout doesn’t make any concessions for Windows use. While it should work fine in Windows, I’m not about to devote precious keyboard space to Windows-specific shortcuts. + + +## mouse left-handed while doing other things with the right hand + +I tend to have my mouse in my left hand, but I like to use my other hand to make things go faster. I’ve added a bunch of buttons to the media layer to speed up browsing in Safari and Finder: + +- Close Window (⌘W) +- Back (⌘[) +- Forward (⌘]) +- Open and Close Parent Folder (⌥⌘↓) +- Go Up and Close Just-Left Folder (⌥⌘↑) +- Cycle through open windows in current application (⌘\` and ⌘⇧\`) +- Cycle through tabs in current window (⌥⇥ and ⌥⇧⇥) +- Space (page down in browsers; Quick Look in the Finder) +- Shift-Space (page up in web browsers) + +Because moving letter-by-letter is way slower than moving word-by-word, I added Option (⌥) to the bottommost button on the left side. This key can be held easily while holding ; (activate media layer) and pressing J and L to move left and right by word. + + +## use lots of modifier keys in OS X menu-item shortcuts + +I wanted to preserve the feel of a number of shortcuts that involve pressing lots of modifier keys at once; this is why the bottom left of the keyboard has shift, control, option, and command in the usual spaces. Further, some common shortcuts I press have a key on the right side of the keyboard. These shortcuts include: + +- Empty Trash Without Asking for Confirmation (⇧⌥⌘⌫) +- Shut Down Without Asking for Confirmation (⇧⌥⌘ power) + + +## use Emacs-style shortcuts + +I press C-a, C-e, and C-k all the time. It’s difficult to press these key combinations with the control key on the bottom left and I’m too quick on the draw for the control function on the / key to work reliably, so the bottommost thumb button on the right side is another control key. + + +## use spreadsheets + +All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer. diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex new file mode 100644 index 0000000000..599d581fe4 --- /dev/null +++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex @@ -0,0 +1,1172 @@ +:100000000C94D3020C9417030C9417030C9417034D
+:100010000C9417030C9417030C9417030C941703F8
+:100020000C9417030C9417030C94CF0D0C94A10E91
+:100030000C9417030C9417030C9417030C941703D8
+:100040000C9417030C94AB220C9417030C94170315
+:100050000C9417030C943E1C0C9417030C94170378
+:100060000C9417030C9417030C9417030C941703A8
+:100070000C9417030C9417030C9417030C94170398
+:100080000C9417030C9417030C9417030C94170388
+:100090000C9417030C9417030C9417030C94170378
+:1000A0000C9417030C9417030C9417030E0F300FC6
+:1000B0001E10300F1E10750F980F1E10ED0F001040
+:1000C000CF12CF12FE12FE1234135413851485146E
+:1000D0005F1385140F140F147614851485147F1480
+:1000E0001C141C141C141C141C141C141C141C1490
+:1000F0001C141C141C141C141C141C141C141C1480
+:100100002E143B14421449145314750A01E2012CB5
+:10011000022C02E2746401160216010402040109B1
+:1001200002090104020401150215010C020C012848
+:10013000022800750A01E2012C022C02E27464011B
+:10014000170217010802080115021501100210011B
+:100150000C020C0111021101040204010F020F0133
+:1001600028022800750A01E2012C022C02E27464C4
+:100170000105020501050205010802080107020741
+:10018000010C020C011702170128022800750A0150
+:10019000E30116021602E301E3012B022B02E30145
+:1001A000E30115021502E300750A01E301160216C8
+:1001B00002E301E3012B022B02E3000000F0A12E79
+:1001C000004C002A00E100E00000001E00140004C2
+:1001D000001D00E200E2001F001A0016001B00E3F1
+:1001E000002A00200008000700060050002C002113
+:1001F000001500090019004F004B00220017000AEB
+:1002000000050000003500015401520000E3000029
+:10021000003400015401520000E3000000290023D3
+:10022000001C000B00110000002A00240018000D23
+:1002300000100052004E0025000C000E0036005148
+:10024000002800260012000F0037002F002B002787
+:10025000001300334238713000E0002D00310034CB
+:1002600078E5002C00000001000100010001000100
+:100270000000003A002F0036020100010001003B9F
+:1002800000300037020100010001003C002F02266F
+:10029000020100010001003D0030022702010001BF
+:1002A0000001003E003402340001000000010001A2
+:1002B0000001000000010000000100010001000039
+:1002C000000100000001003F0038002D0024020062
+:1002D0000001004000240021001E0027004A0041C8
+:1002E00000250022001F00370001004200260023E5
+:1002F00000200050000100430025022E022E004F76
+:10030000004D004400450001000100010000000113
+:10031000000100010001000100000069000100016E
+:10032000000100010001006A000100043001000129
+:1003300000010001004B004E00010001000100011E
+:100340000001300100010001004A000100033001FA
+:100350000002300000010001000100000001000067
+:100360000001001408010000000100000001001A53
+:100370000830082F082C0200000100350A520C50EA
+:10038000002C00A9000100350852005100AC00AA61
+:100390000019080100510C4F00AB00A8000608012D
+:1003A0000001000100010001001B08A5000100AED2
+:1003B0000001000100000016034500720067006F95
+:1003C0000044006F007800200045005A000000162D
+:1003D000034500720067006F0044006F0078002042
+:1003E0000045005A0000000403090409026D0004DE
+:1003F0000100A0FA09040000010301010009211114
+:10040000010001223F000705810308000A090401D9
+:10041000000103010200092111010001224D000722
+:1004200005820308000A0904020001030000000914
+:1004300021110100012236000705830308000A0983
+:100440000403000103000000092111010001223909
+:1004500000070584031000011201100100000008CC
+:10046000EDFE071301000102000105010906A101CB
+:10047000050719E029E71500250195087501810296
+:100480000508190129059505750191029501750366
+:100490009101050719002977150025019578750147
+:1004A0008102C005010980A101850216010026B75D
+:1004B000001A01002AB700751095018100C0050CD3
+:1004C0000901A1018503160100269C021A01002AD8
+:1004D0009C02751095018100C005010902A1010966
+:1004E00001A10005091901290515002501950575CA
+:1004F000018102950175038101050109300931155A
+:1005000081257F95027508810609381581257F951B
+:100510000175088106050C0A38021581257F9501B1
+:1005200075088106C0C005010906A101050719E08B
+:1005300029E71500250195087501810295017508C7
+:10054000810105081901290595057501910295019B
+:10055000750391010507190029FF150025FF950670
+:1005600075088100C00000000000000000000000CD
+:10057000010204060A0F17202C3A4A5D71879DB3C9
+:10058000C7DAE9F5FCFFFCF5E9DAC7B39D87715DD1
+:100590004A3A2C20170F0A0604020100000000004E
+:1005A00000000000000011241FBECFEFDAE0DEBF24
+:1005B000CDBF04B603FE24C08091FB019091FC01E5
+:1005C000A091FD01B091FE018730904BA740B04B48
+:1005D000B9F41092FB011092FC011092FD011092EF
+:1005E000FE0114BE84B7877F84BF88E10FB6F894FC
+:1005F00080936000109260000FBEE0E0FFE3099579
+:1006000011E0A0E0B1E0E4EEF8E402C005900D9244
+:10061000A433B107D9F711E0A4E3B1E001C01D9202
+:10062000AB3FB107E1F70E94130B0C9470240C94BC
+:100630000000FC016230B9F028F4662341F061301B
+:1006400061F023C06330A9F06430C9F01EC082811C
+:100650008823D9F088EA91E0089582818823A9F05F
+:100660008DE891E008958281882379F084E691E015
+:1006700008958281882349F083E391E0089582817F
+:10068000882319F08AE091E0089580E090E00895D1
+:1006900008956091BD017091BE018091BF0190915C
+:1006A000C0010E94701B56985E9825982D98269838
+:1006B0002E9827982F98813019F0823021F00895D4
+:1006C000259A2D9A0895269A2E9A08950C944903F6
+:1006D00056985E9825982D9826982E9827982F98AA
+:1006E0008FEF90E0909389008093880090938B0027
+:1006F00080938A0090938D0080938C00259A2D9A88
+:100700002FEF80E792E0215080409040E1F700C059
+:100710000000269A2E9A2FEF80E792E02150804029
+:100720009040E1F700C00000279A2F9A2FEF80E752
+:1007300092E0215080409040E1F700C000002598F1
+:100740002D982FEF80E792E0215080409040E1F714
+:1007500000C0000026982E982FEF80E792E02150ED
+:1007600080409040E1F700C0000027982F985698ED
+:100770005E9825982D9826982E9827982F9808955A
+:1007800089EA8093800089E08093810024982C98E6
+:100790003F988AB18F748AB96E98479A8BB1806BF3
+:1007A0008BB9769A0E9468030C94480380E2809388
+:1007B00000018091340181110EC00E94250481E066
+:1007C000809334012FEF83ED90E3215080409040DF
+:1007D000E1F700C0000080E40E942B048093000138
+:1007E00081112EC00E94550480930001811128C000
+:1007F0000E94550480930001811122C08FE30E9462
+:1008000055048093000181111BC00E944D0480E4B7
+:100810000E942B0480930001811112C08CE00E9481
+:1008200055048093000181110BC00E9455048093F0
+:100830000001811105C08FE30E94550480930001DF
+:100840000E944D048091000108951092B9008AE041
+:100850008093B800089594EA9093BC009091BC00F6
+:1008600097FFFCCF9091B900987F983021F090319C
+:1008700011F081E008958093BB0084E88093BC0070
+:100880008091BC0087FFFCCF8091B900887F8831C0
+:1008900011F0803471F780E0089584E98093BC0002
+:1008A0008091BC0084FDFCCF08958093BB0084E858
+:1008B0008093BC008091BC0087FFFCCF9091B90071
+:1008C000987F81E0983209F480E0089584E880936D
+:1008D000BC008091BC0087FFFCCF8091BB000895D5
+:1008E00080910001811115C080E40E942B04809347
+:1008F000000181110CC082E10E9455048093000127
+:10090000811105C08FEF0E945504809300010E9461
+:100910004D0484B1807F84B985B1807F85B98AB167
+:10092000837F8AB98BB1837F8BB93E9846980895AF
+:100930000E94D603809300010E94700480B38C70E3
+:1009400080BB81B3836F81BBA6E3B1E0E4E4F1E057
+:100950008EE08E0F11921D928E13FCCF0C94C0036B
+:10096000BF92CF92DF92EF92FF920F931F93CF939C
+:10097000DF9380910001882379F0809135018F5FAA
+:1009800080933501811108C00E94D6038093000135
+:10099000811102C00E94680306E311E0C0E0D0E0CC
+:1009A000DD24D39482E0C82EEE24E394F12CC730EA
+:1009B000D10500F580910001811164C080E40E949E
+:1009C0002B0480930001811112C082E10E94550422
+:1009D0008093000181110BC0C7010C2E01C0880F4C
+:1009E0000A94EAF780950E945504809300010E94C2
+:1009F0004D0448C0CA30A1F028F4C83059F0C930BD
+:100A000061F005C0CC3089F070F0CD3089F0209ACB
+:100A1000289810C0219A29980DC0229A2A980AC0B5
+:100A2000239A2B9807C0529A01C0539A5B9802C030
+:100A30003E9A469890EA9A95F1F79FB1799902C04B
+:100A400082E001C080E091709D25982B7C9902C0C6
+:100A500084E001C080E0892B7D9902C038E001C0AC
+:100A600030E0832B7E9902C020E101C020E0822B80
+:100A70009FB19095991F9927991F9295990F907EF4
+:100A8000892B0FC080910001811149C080E40E9430
+:100A90002B0480930001882379F1B12C0E944D042E
+:100AA0008B2DF8019081981719F08083C092010175
+:100AB0000E94700421960F5F1F4FCE30D10509F0C0
+:100AC00076CF80910101882361F1815080930101EB
+:100AD000882339F08FE99FE00197F1F700C000000B
+:100AE00020C0A4E4B1E0E6E3F1E0CF01825F9191A0
+:100AF0009D938E13FCCF15C083E10E945504809313
+:100B000000018111CACF81E40E942B04809300016F
+:100B10008111C3CF0E946604B82EB094BFCF80E08D
+:100B2000C0CF0E94660381E0DF91CF911F910F91AA
+:100B3000FF90EF90DF90CF90BF900895E82FF0E006
+:100B4000EC5BFE4F8081089508950F931F93CF9320
+:100B5000DF93C4E4D1E010E00C2F025F899190E0B4
+:100B60000E94641B180F0C13F9CF812FDF91CF91D6
+:100B70001F910F91089581E0089508950F931F9399
+:100B8000CF93DF938C01FC01C081D181CE010E9403
+:100B9000E919BE010E946106EC01F80182818823F7
+:100BA00009F44AC080915D0181111FC0C431F0E594
+:100BB000DF0709F051C00E94BD0581E080935D010F
+:100BC0000E94081C90935C0180935B011092540179
+:100BD000109256011092550110925801109257012F
+:100BE00010925A011092590165C080915B01909159
+:100BF0005C010E94141C883C910570F480915401A2
+:100C0000E82FF0E0EE0FFF1FEB5AFE4FD183C083B9
+:100C10008F5F809354014EC0C43880E5D80721F01F
+:100C2000C538D04501F13AC0F8018281882341F0EE
+:100C30001092520182E01EC0C438E0E5DE0759F58B
+:100C400080915201811106C086E20E94731186E2F2
+:100C50000E943B1282E01CC0C438F0E5DF0741F37C
+:100C6000C538D045D9F4F8018281882331F010923B
+:100C7000530180E20E948A121DC0809153018111AC
+:100C800006C087E20E94731187E20E943B1280E255
+:100C90000E9491120FC0C538D04529F381E080939E
+:100CA000520180935301C801DF91CF911F910F91A1
+:100CB0000C94BB0580E0DF91CF911F910F910895B7
+:100CC000089596E0799FF001112494E5899FE00D45
+:100CD000F11D1124E60FF11DEE0FFF1FE154FE4F31
+:100CE000859194910895880F991FFC01E55CFF4F51
+:100CF000859194910895880F991FFC01E554FE4F4A
+:100D00008591949108950F931F93CF93DF93EC01F6
+:100D10008115904350F5C11580E2D80708F0C3C093
+:100D2000CB3BD10590F4C83AD10508F06AC0C53A6A
+:100D3000D10508F05BC0C430D10508F0D0C12197BF
+:100D400009F0CAC101E010E00AC2CF3FD10511F09D
+:100D500008F0C5C1C03FD10508F0A2C0CE01805E39
+:100D60009109089708F4BBC1B7C1C13090E5D90714
+:100D700009F4A2C020F5C0318FE4D80770F4C11582
+:100D800090E4D90708F094C0C11521E3D20708F018
+:100D9000A3C1DD278E01106CE2C1C115D04509F059
+:100DA0009BC10E94F0148FEF94E32CE0815090409F
+:100DB0002040E1F700C000000E94631CD0C1C115B3
+:100DC00097E5D90758F4C03121E5D20708F01CC1D6
+:100DD000C43180E5D80708F475C07EC1CE019057B4
+:100DE0008115904108F078C1DF7073C1C53AD10513
+:100DF00009F477C1C63AD10509F076C102E810E4DA
+:100E0000AEC1C83AD10509F472C1C93AD10509F495
+:100E100071C1CA3AD10509F470C1CB3AD10509F4C0
+:100E20006FC1CC3AD10509F46EC1CD3AD10509F4B0
+:100E30006DC1C03BD10509F46CC1CE3AD10509F4AE
+:100E40006BC1CF3AD10509F46AC1C13BD10509F4A0
+:100E500069C1C23BD10509F468C1C33BD10509F49E
+:100E600067C1C43BD10509F466C1C53BD10509F48E
+:100E700065C1C63BD10509F464C1C73BD10509F47E
+:100E800063C1C83BD10509F462C1C93BD10509F46E
+:100E900061C1CA3BD10509F460C100E014E45FC13F
+:100EA0008E0110655CC1CE019F700E947B0658C107
+:100EB000DF708E01106A53C18091DA0181608093E6
+:100EC000DA014DC10E94081E811102C00E94EE1D70
+:100ED0000E94251E90E09093FB018093FA01C2309E
+:100EE00080E5D80721F48091FA01816086C0C43082
+:100EF00090E5D90721F48091FA0182607EC0C63066
+:100F000020E5D20721F48091FA01846076C0C830D0
+:100F100080E5D80719F48091FA0127C0CA3090E51E
+:100F2000D90721F48091FA01806167C0CC3020E5B7
+:100F3000D20721F48091FA0180625FC0CE3080E553
+:100F4000D80721F48091FA01806457C0C03190E540
+:100F5000D90721F48091FA0180684FC0C23120E5A1
+:100F6000D20729F48091FA018460886046C0C330BA
+:100F700080E5D80721F48091FA018E7F3EC0C5300C
+:100F800090E5D90721F48091FA018D7F36C0C730F2
+:100F900020E5D20721F48091FA018B7F2EC0C93061
+:100FA00080E5D80719F48091FA0126C0CB3090E58E
+:100FB000D90721F48091FA018F7E1FC0CD3020E542
+:100FC000D20721F48091FA018F7D17C0CF3080E5E0
+:100FD000D80721F48091FA018F7B0FC0C13190E5D1
+:100FE000D90721F48091FA018F7707C0C331D0452A
+:100FF00031F48091FA018B7F877F8093FA01809191
+:10100000FA010E94291EABC08D2F99278F70992756
+:1010100081309105D9F49E012370332702C0880FD7
+:10102000991F2A95E2F79C688E0144E0000F111F7A
+:101030004A95E1F700271370802B912B53E0CC0FDA
+:10104000DD1F5A95E1F7C076DD272FC0823091056C
+:1010500031F4DC2FCC278E01016F106A80C0833001
+:10106000910569F4CE018370992701E010E002C078
+:10107000000F111F8A95E2F7C8019C680FC08430E9
+:101080009105B9F4CE018370992701E010E002C008
+:10109000000F111F8A95E2F7C8019A6823E0CC0F70
+:1010A000DD1F2A95E1F7C07ED7708C010C2B1D2B1C
+:1010B00056C08530910531F4DC2FCC278E01046FAA
+:1010C000106A4DC0069709F04AC0CF71DD27DC2FAA
+:1010D000CC278E01106243C000E010E040C08E01BA
+:1010E0003EC001E810E43BC003E810E438C002EE63
+:1010F00014E435C009EE14E432C00AEE14E42FC043
+:1011000005EB14E42CC006EB14E429C007EB14E44F
+:1011100026C00CEC14E423C00DEC14E420C003E85A
+:1011200015E41DC00AE815E41AC002E915E417C069
+:1011300004E915E414C001E216E411C003E216E468
+:101140000EC004E216E40BC005E216E408C006E295
+:1011500016E405C007E216E402C00AE216E4C8017C
+:10116000DF91CF911F910F91089596E0799FF00143
+:10117000112494E5899FE00DF11D1124E60FF11D66
+:10118000EE0FFF1FE154FE4F85919491803E910533
+:10119000E0F4803C910558F58133910509F46FC066
+:1011A00048F48932910509F463C08A32910509F443
+:1011B0006DC072C089339105E9F082389105D1F094
+:1011C0008533910509F44DC067C0833E910581F1D7
+:1011D00038F4803E9105B9F0823E9105D9F05CC0AB
+:1011E000863E910561F1873E9105A1F155C00E94AF
+:1011F000730608952091FA0120FD02C021FF4CC022
+:1012000080EE90E049C08091FA0180FFF9CF89E338
+:1012100090E042C08091FA0182FF0EC08091FA01F5
+:1012200084FF03C080E090E037C083EE90E034C0DC
+:101230008091FA0182FFF2CF82EE90E02DC0809182
+:10124000FA0183FF0BC08091FA0184FDEBCF87EE9A
+:1012500090E022C08091FA0183FFF5CF86EE90E006
+:101260001BC08091FA0185FF07C089E290E014C09D
+:101270008091FA0185FFF9CF85E390E00DC0809160
+:10128000FA0186FF07C08AE290E006C08091FA0169
+:1012900086FFF9CF81E390E00E94830608950895C8
+:1012A0000C944F0980916E010895CF93DF9300D085
+:1012B0001F92CDB7DEB79C018091F101843019F502
+:1012C00093E099833B832A839093E9008FEF909179
+:1012D000E800815095FD06C095ED9A95F1F7000064
+:1012E0008111F5CF8091E80085FF0DC040E050E00E
+:1012F00063E070E0CE0101960E94BF0B8091E80090
+:101300008E778093E8000F900F900F90DF91CF9130
+:101310000895CF93DF9300D01F92CDB7DEB7209111
+:10132000F101243021F522E029839B838A8383E025
+:101330008093E9008FEF9091E800815095FD06C001
+:1013400095ED9A95F1F700008111F5CF8091E800B5
+:1013500085FF0DC040E050E063E070E0CE010196F3
+:101360000E94BF0B8091E8008E778093E8000F9079
+:101370000F900F90DF91CF9108952091F1012430CB
+:10138000F1F422E02093E9002FEF3091E8002150A2
+:1013900035FD06C035ED3A95F1F700002111F5CF86
+:1013A0002091E80025FF0BC040E050E065E070E0D0
+:1013B0000E94BF0B8091E8008E778093E80008952B
+:1013C000CF93DF93EC019091F101943009F046C086
+:1013D00080910C018823D9F080910D018823B9F008
+:1013E0009093E9008FEF9091E800815095FD06C041
+:1013F00095E19A95F1F700008111F5CF8091E80011
+:1014000085FF2CC040E050E060E170E017C081E053
+:101410008093E9008FEF9091E800815095FD06C020
+:1014200095ED9A95F1F700008111F5CF8091E800D4
+:1014300085FF14C040E050E068E070E0CE010E94FB
+:10144000BF0B8091E8008E778093E80080E1FE0179
+:10145000AEE5B1E001900D928A95E1F7DF91CF9171
+:1014600008958091F001811109C00E94540D0E94DD
+:10147000B10D8091E20084608093E20008951092A3
+:10148000F001089508950C9498220E94F91B0E947F
+:101490009E220E9457100C94500942E061EC81E0BA
+:1014A0000E94CE0C42E061EC82E00E94CE0C42E051
+:1014B00061EC83E00E94CE0C42E161EC84E00C948C
+:1014C000CE0C8091F301833009F455C030F48130A3
+:1014D00071F0823009F48EC008958A3009F47AC020
+:1014E0008B3009F460C0893009F09CC020C0809125
+:1014F000F201813A09F096C08091E800877F8093DD
+:10150000E8008091F6019091F701892B21F460E1C8
+:101510008EE591E003C060E080E090E070E00E9422
+:101520000A0C8091E8008B778093E8000895809101
+:10153000F201813209F076C08091F6019091F701B5
+:10154000009719F0039709F06DC08091E800877F3C
+:101550008093E8008091E80082FD05C08091F10150
+:101560008111F8CF5FC08091F10080936E0180916E
+:10157000E8008B7753C08091F201813A09F052C0A4
+:101580008091F6019091F701892B09F04BC0809171
+:10159000E800877F8093E8008091E80080FFFCCF1F
+:1015A00080910C0136C08091F2018132D9F5809191
+:1015B000F6019091F701892BA9F58091E800877FCA
+:1015C0008093E8000E94030D8091F40180930C0148
+:1015D0000C94F0148091F201813221F58091E800A1
+:1015E000877F8093E8000E94030D8091F50180932E
+:1015F0006F0108958091F201813AA1F48091E80091
+:10160000877F8093E8008091E80080FFFCCF809185
+:101610006F018093F1008091E8008E778093E8005D
+:101620000C94030D089584B7877F84BF88E10FB6BB
+:10163000F89480936000109260000FBE90E080E804
+:101640000FB6F89480936100909361000FBE0E94E2
+:10165000A6100E94540D0E94B10D8091E20084609A
+:101660008093E20078940E9437100E94A81082E0D4
+:1016700091E00E9452100E9486228091F1018530F3
+:1016800069F40E94C01B8091EF018823B1F30E948E
+:10169000EB1B882391F30E94A90BEFCF0E94AE10A1
+:1016A000ECCF292F332723303105C9F064F42130E2
+:1016B000310581F02230310509F043C08DE690E01C
+:1016C0002BEE33E042C021323105F1F022323105F8
+:1016D00041F137C082E190E028E534E036C0992737
+:1016E0008130910541F08230910541F0892B49F517
+:1016F000E7EEF3E005C0EFECF3E002C0E7EBF3E068
+:10170000849190E09F0121C06430D8F4E62FF0E08E
+:10171000EE0FFF1FEE5DFE4F2081318189E090E0EA
+:1017200014C0643070F470E0FB01EE0FFF1FE65E42
+:10173000FE4F20813181FB01EA5EFE4F808190E007
+:1017400004C080E090E020E030E0FA0131832083A3
+:10175000089580E189BD82E189BD09B400FEFDCF15
+:101760008091D8008F7D8093D8008091E0008260C6
+:101770008093E0008091E00081FDFCCF0895CF923E
+:10178000DF92EF92FF920F931F93CF93DF93EC01C1
+:101790008B016A010E94220D811133C0C114D10452
+:1017A00039F0F60180819181081B190BC80FD91FF0
+:1017B000E12CF12C0115110519F18091E80085FD4E
+:1017C00016C08091E8008E778093E800C114D104A0
+:1017D00049F0F60180819181E80EF91EF182E082E4
+:1017E00085E00FC00E94220D882321F30AC0899151
+:1017F0008093F10001501109FFEFEF1AFF0ADACFD1
+:1018000080E0DF91CF911F910F91FF90EF90DF90DB
+:10181000CF9008952091F8013091F90126173707EC
+:1018200048F06115710539F42091E8002E77209376
+:10183000E80001C0B90140E061157105A9F12091EE
+:10184000F101222309F443C0253009F442C020915C
+:10185000E80023FD40C02091E80022FD32C0209125
+:10186000E80020FFE9CF4091F3002091F20030E042
+:10187000342BFC01CF016115710559F02830310579
+:1018800040F481918093F100615071092F5F3F4FC7
+:10189000F1CF41E02830310509F040E02091E80027
+:1018A0002E772093E800C8CF4111C9CF0AC080919C
+:1018B000F101882361F0853061F08091E80083FDBB
+:1018C0000AC08091E80082FFF2CF80E0089582E0B4
+:1018D000089583E0089581E008952091F801309102
+:1018E000F9012617370748F06115710539F4209181
+:1018F000E8002E772093E80001C0B901FC0120E048
+:101900006115710591F18091F101882309F440C0BE
+:10191000853009F43FC08091E80083FD3DC080918F
+:10192000E80082FD2FC08091E80080FFE9CF209180
+:10193000F3008091F20090E0922B6115710559F04F
+:101940008830910540F424912093F1003196615044
+:1019500071090196F2CF21E0089709F020E080910B
+:10196000E8008E778093E800CBCF2111CCCF0AC05E
+:101970008091F101882361F0853061F08091E80069
+:1019800083FD0AC08091E80082FFF2CF80E00895D5
+:1019900082E0089583E0089581E00895982F9730BC
+:1019A00058F59093E900981739F07091EC00209168
+:1019B000ED005091F00003C0242F762F50E021FF5E
+:1019C00019C03091EB003E7F3093EB003091ED0079
+:1019D0003D7F3093ED003091EB0031603093EB00B0
+:1019E0007093EC002093ED005093F0002091EE00F6
+:1019F00027FF07C09F5FD3CF8F708093E90081E0FE
+:101A0000089580E008958091F20187FF11C08091D0
+:101A1000E80082FD05C08091F1018111F8CF11C06D
+:101A20008091E8008B770BC08091F101882349F009
+:101A30008091E80080FFF8CF8091E8008E77809356
+:101A4000E80008952091E4003091E50095E640918A
+:101A5000EC00842F817040FF22C08091E80080FD5F
+:101A60001CC08091F101882391F0853091F0809124
+:101A7000EB0085FD10C04091E4005091E500421755
+:101A8000530729F39A01915011F784E0089582E0F9
+:101A9000089583E0089581E0089580E008954091DD
+:101AA000E80042FFDECF08950E94C20D0E94CA0DD9
+:101AB000E0EEF0E0808181608083E8EDF0E08081FD
+:101AC0008F77808319BCA7EDB0E08C918E7F8C93CB
+:101AD00080818F7E80831092F00108950F931F9371
+:101AE000CF93DF930E94C20D0E94CA0DC8EDD0E0D3
+:101AF00088818F77888388818068888388818F7DBB
+:101B0000888319BC1092F1011092ED011092EF013F
+:101B10001092EE0100EE10E0F80180818B7F80834F
+:101B200088818160888342E060E080E00E94CE0C82
+:101B3000E1EEF0E080818E7F8083E2EEF0E0808154
+:101B400081608083808188608083F80180818E7FBE
+:101B50008083888180618883DF91CF911F910F916D
+:101B60000895E8EDF0E080818F7E8083E7EDF0E07E
+:101B700080818160808384E082BF81E08093F00176
+:101B80000C946E0DE8EDF0E080818E7F80831092E2
+:101B9000E20008951092DA001092E10008951F9279
+:101BA0000F920FB60F9211242F933F934F935F9391
+:101BB0006F937F938F939F93AF93BF93EF93FF9315
+:101BC0008091E10082FF0BC08091E20082FF07C09C
+:101BD0008091E1008B7F8093E1000E94361080911C
+:101BE000DA0080FF1FC08091D80080FF1BC0809169
+:101BF000DA008E7F8093DA008091D90080FF0DC0DB
+:101C000080E189BD82E189BD09B400FEFDCF81E09C
+:101C10008093F1010E94310A05C019BC1092F101B4
+:101C20000E943F0A8091E10080FF19C08091E2008C
+:101C300080FF15C08091E2008E7F8093E20080914A
+:101C4000E20080618093E2008091D80080628093FE
+:101C5000D80019BC85E08093F1010E94430A80916D
+:101C6000E10084FF30C08091E20084FF2CC080E15D
+:101C700089BD82E189BD09B400FEFDCF8091D80005
+:101C80008F7D8093D8008091E1008F7E8093E1006A
+:101C90008091E2008F7E8093E2008091E20081607B
+:101CA0008093E2008091ED01882311F084E007C069
+:101CB0008091E30087FD02C081E001C083E0809352
+:101CC000F1010E94450A8091E10083FF29C08091C3
+:101CD000E20083FF25C08091E100877F8093E100CF
+:101CE00082E08093F1011092ED018091E1008E7FFE
+:101CF0008093E1008091E2008E7F8093E2008091EA
+:101D0000E20080618093E20042E060E080E00E94B7
+:101D1000CE0C8091F00088608093F0000E94420A0F
+:101D2000FF91EF91BF91AF919F918F917F916F91B3
+:101D30005F914F913F912F910F900FBE0F901F9089
+:101D400018951F920F920FB60F9211242F933F9365
+:101D50004F935F936F937F938F939F93AF93BF93B3
+:101D6000CF93DF93EF93FF93C091E900CF70809101
+:101D7000EC00D82FD17080FDD0E81092E90080915E
+:101D8000F000877F8093F00078940E94E50E109217
+:101D9000E9008091F00088608093F000CD2BCF7037
+:101DA000C093E900FF91EF91DF91CF91BF91AF9187
+:101DB0009F918F917F916F915F914F913F912F9163
+:101DC0000F900FBE0F901F9018951F93CF93DF9326
+:101DD000CDB7DEB7AA970FB6F894DEBF0FBECDBF62
+:101DE000E2EFF1E088E08E0F9091F10091938E1375
+:101DF000FBCF0E94610A8091E80083FF1FC18091A0
+:101E0000F2019091F301492F50E04A30510508F05A
+:101E100015C1FA01EA5AFF4F0C942024803881F052
+:101E2000823809F00BC18091F6018F708093E90030
+:101E30008091EB0085FB882780F91092E90006C0AD
+:101E40008091EE019091EF01911182609091E800F4
+:101E5000977F9093E8008093F1001092F100C8C042
+:101E6000282F2D7F09F0EAC0882319F0823061F015
+:101E7000E5C08091F401813009F0E0C0933009F0B1
+:101E800080E08093EF012BC08091F401811127C085
+:101E90008091F6018F7009F4D1C08093E900209100
+:101EA000EB0020FF1CC0933021F48091EB00806296
+:101EB00014C09091EB0090619093EB0021E030E032
+:101EC000A90102C0440F551F8A95E2F74093EA002A
+:101ED0001092EA008091EB0088608093EB001092F2
+:101EE000E9008091E800877F86C08111A7C010912A
+:101EF000F4011F778091E3008078812B8093E300C9
+:101F00008091E800877F8093E8000E94030D809114
+:101F1000E80080FFFCCF8091E30080688093E300BD
+:101F2000111102C082E001C083E08093F10186C0FC
+:101F30008058823008F082C08091F4019091F501C0
+:101F40008C3D53E0950779F583E08A838AE28983A3
+:101F50004FB7F894DE01139620E03EE051E2E32F04
+:101F6000F0E050935700E49120FF03C0E295EF703A
+:101F70003F5FEF708E2F90E0EA3010F0C79601C0FF
+:101F8000C0968D939D932F5F243149F74FBF809169
+:101F9000E800877F8093E8006AE270E0CE01019656
+:101FA0000E940A0C14C0AE014F5F5F4F6091F601B2
+:101FB0000E94510BBC01892B09F440C09091E800AC
+:101FC000977F9093E80089819A810E946D0C80919F
+:101FD000E8008B778093E80031C0803879F58091F4
+:101FE000E800877F8093E8008091ED018093F10005
+:101FF0008091E8008E778093E8000E94030D1EC058
+:1020000081111CC09091F4019230C0F48091E800DD
+:10201000877F8093E8009093ED010E94030D8091EB
+:10202000ED01811106C08091E30087FD02C081E0CF
+:1020300001C084E08093F1010E944D0A8091E80084
+:1020400083FF0AC08091E800877F8093E800809139
+:10205000EB0080628093EB00AA960FB6F894DEBF87
+:102060000FBECDBFDF91CF911F9108950895CF93FB
+:102070008091F1018823A1F0C091E900CF70909187
+:10208000EC00892F817090FD80E8C82B1092E90048
+:102090008091E80083FD0E94E50ECF70C093E900B7
+:1020A000CF91089590937501809374010895E09104
+:1020B0007401F0917501309721F00190F081E02DCD
+:1020C000099480E00895E0917401F09175013097D2
+:1020D00021F00280F381E02D09940895E0917401CC
+:1020E000F0917501309721F00480F581E02D09947D
+:1020F000089520917201309173018217930771F056
+:102100009093730180937201E0917401F0917501D5
+:10211000309721F00680F781E02D099408952091F1
+:102120007001309171018217930771F090937101E2
+:1021300080937001E0917401F0917501309721F066
+:102140000084F185E02D0994089508950C94A5105C
+:102150000E94FF1B0E9498040C94C11C9F92AF9296
+:10216000BF92CF92DF92EF92FF920F931F93CF9384
+:10217000DF9300D000D000D0CDB7DEB70E94B0040E
+:102180000DE010E0AA24A394B12C902E802F0E9481
+:102190009E05980129583E4F6901F901F080F82603
+:1021A000A1F40150110988F78FEF89838A831B827C
+:1021B0000E94081C8160782F9D838C8349815A81FD
+:1021C0006B818D810E9445112FC09091DA0191FFA2
+:1021D00004C08E830E94A4058E8125E030E0A50115
+:1021E000022E01C0440F0A94EAF7E42E4F21C1F0F9
+:1021F00029839A828E2191E009F490E09B830E94CA
+:10220000081C8160782F9D838C8349815A816B8162
+:102210008D810E944511F6018081E826E08204C08C
+:1022200021503109E0F6BDCF0E94A81F1091760120
+:102230000E9457101817B9F00E945710809376012A
+:1022400026960FB6F894DEBF0FBECDBFDF91CF91BB
+:102250001F910F91FF90EF90DF90CF90BF90AF90C4
+:102260009F900C94500926960FB6F894DEBF0FBECF
+:10227000CDBFDF91CF911F910F91FF90EF90DF9035
+:10228000CF90BF90AF909F900895CF93DF93CDB73D
+:10229000DEB72B970FB6F894DEBF0FBECDBF4F83CE
+:1022A000588769877A878B87DE01119686E0FD0162
+:1022B00011928A95E9F785E0FE01379601900D921B
+:1022C0008A95E1F749815A816B817C818D819E815C
+:1022D0000E948E172B960FB6F894DEBF0FBECDBFAF
+:1022E000DF91CF910895CF93882309F4C2C0C82FFE
+:1022F000823859F40E94571081FDBBC089E30E94C7
+:10230000681A0E94351B89E30CC0833879F40E9457
+:10231000571080FDAEC083E50E94681A0E94351BED
+:1023200083E50E94AA1ACF910C94351B843859F486
+:102330000E94571082FD9DC087E40E94681A0E9487
+:10234000351B87E4EECF8CEF8C0F813A48F48C2F4D
+:102350000E94EB2181118DC08C2F0E94681AE3CF5F
+:1023600080E28C0F883048F4C77081E001C0880F8C
+:10237000CA95EAF70E94EE1AD6CF8BE58C0F833010
+:1023800078F4C53A29F0C63A31F083E890E005C008
+:1023900081E890E002C082E890E0CF910C9479103F
+:1023A00088E58C0F833108F064C0C83A39F1C93A26
+:1023B00041F1CA3A49F1CB3A51F1CC3A59F1CD3A0F
+:1023C00061F1C03B69F1CE3A71F1CF3A79F1C13B8D
+:1023D00081F1C23B89F1C33B91F1C43B99F1C53B0B
+:1023E000A1F1C63BA9F1C73BB1F1C83BB9F1C93B6B
+:1023F000C1F1CA3BC9F180E090E038C082EE90E0C4
+:1024000035C089EE90E032C08AEE90E02FC085EBB7
+:1024100090E02CC086EB90E029C087EB90E026C0CE
+:102420008CEC90E023C08DEC90E020C083E891E03C
+:102430001DC08AE891E01AC082E991E017C084E9E2
+:1024400091E014C081E292E011C083E292E00EC0FC
+:1024500084E292E00BC085E292E008C086E292E05E
+:1024600005C087E292E002C08AE292E0CF910C942C
+:102470008F10CF910895882309F44BC0823859F406
+:102480000E94571081FF45C089E30E94681A0E948C
+:10249000351B89E30CC0833871F40E94571080FF0C
+:1024A00038C083E50E94681A0E94351B83E50E94AC
+:1024B000AA1A0C94351B843859F40E94571082FFD5
+:1024C00028C087E40E94681A0E94351B87E4EFCF7A
+:1024D0009CEF980F913A58F390E2980F983050F48F
+:1024E000877091E001C0990F8A95EAF7892F0E94C1
+:1024F000F41ADFCF9BE5980F933020F480E090E052
+:102500000C947910885A833120F480E090E00C9488
+:102510008F100895882321F00E94EE1A0C94351B29
+:102520000895882321F00E94F41A0C94351B089515
+:102530007F928F929F92AF92BF92CF92DF92EF9253
+:10254000FF920F931F93CF93DF931F92CDB7DEB708
+:102550007C01C62E772EFC01058102950F70128139
+:1025600011110E940B1B0E94611A882379F011231C
+:1025700069F080E28C0D883048F082E00E944A1AAF
+:102580000E94611A91E0D82ED92601C0D12CE72DE6
+:10259000E295EF70F0E0E05AFF4F0C942024872D75
+:1025A000807F072D0F70882311F00295007F112383
+:1025B00089F0002309F490C180E28C0D883020F46A
+:1025C000802F0E94EE1A03C0802F0E94FE1A0E94E4
+:1025D000351B82C18C2D0E943B12002309F495C14A
+:1025E00080E28C0D883020F4802F0E94F41A03C002
+:1025F000802F0E94041B0E94351B87C1972D907F5E
+:10260000872D8F70903211F08295807FCC2021F041
+:10261000F1E0CF16B1F01EC0112349F0002309F4F8
+:1026200014C1013009F011C10E941E1B6EC10023AC
+:1026300019F0013009F469C189830E94211B898145
+:102640000AC1112321F0023008F05FC1FEC0011160
+:102650005CC101C1112321F0002309F4F6C03CC183
+:10266000002309F4F8C03EC1872D869586958370B6
+:1026700090E0009719F0019761F047C1112321F014
+:102680008C2D972D937002C080E090E00E9479100D
+:102690003CC1112321F08C2D972D937002C080E056
+:1026A00090E00E948F1031C18C2D112319F00E94EF
+:1026B000B01E02C00E94181F0E949D1F26C1872DB8
+:1026C000837009F052C0111120C18C2D829586951E
+:1026D0008770880F880F9C2D9F70892E912CA12CBC
+:1026E000B12C082E04C0880C991CAA1CBB1C0A948F
+:1026F000D2F7C4FE14C00FE010E020E030E0B901D2
+:10270000A80104C0440F551F661F771F8A95D2F792
+:10271000CB01BA01609570958095909503C060E0FB
+:1027200070E0CB01272D26952695237030E02230CE
+:10273000310569F02330310589F0682979298A2922
+:102740009B292130310571F00E94D618DEC068291E
+:1027500079298A299B290E94F218D7C00E94D6188D
+:10276000C501B4010E94BA18D0C0112319F0872DF9
+:10277000817001C08695882309F4C7C08C2D82958D
+:1027800086958770880F880F9C2D9F70892E912CBD
+:10279000A12CB12C082E04C0880C991CAA1CBB1CAF
+:1027A0000A94D2F7C4FE14C00FE010E020E030E03D
+:1027B000B901A80104C0440F551F661F771F8A95F1
+:1027C000D2F7CB01BA01609570958095909503C0C2
+:1027D00060E070E0CB01272D269526952370422FCF
+:1027E00050E04230510569F04330510589F06829C5
+:1027F00079298A299B294130510571F00E94B0192D
+:1028000084C0682979298A299B290E94CC197DC016
+:102810000E94B019C501B4010E94941976C08C2D94
+:1028200090E0FC01E05EF109E531F10508F050C0EF
+:10283000E059FF4F0C9420240C2D0F70872D8F71C1
+:10284000112331F00E942D19802F0E948A125DC041
+:102850000E944E19802F0E94911257C0112339F007
+:10286000011153C0872D8F710E9473194EC0023021
+:1028700008F04BC0F7CF112339F0872D8F710E94DC
+:102880002D1943C01123C9F3872D8F710E944E1952
+:102890003CC0112329F0872D8F710E94181935C073
+:1028A0000E940E1932C0112351F0172D1F71812F74
+:1028B0000E942D1963E0812F0E94411A26C081E0F9
+:1028C0000E944A1A023008F182E00E944A1A1DC092
+:1028D000112331F0002389F28C2D0E94731115C051
+:1028E000002391F28C2D0E943B120FC0472D4F7098
+:1028F0006C2DC7010E9419030E94321806C0472D93
+:102900004F706C2DC7010E946006DD20F9F00E9417
+:102910003D1A80FD1BC0F70112820E94371A0E94E7
+:102920002D19C7010E94B5140E94371A0F90DF912C
+:10293000CF911F910F91FF90EF90DF90CF90BF90BC
+:10294000AF909F908F907F900C944E190F90DF91D5
+:10295000CF911F910F91FF90EF90DF90CF90BF909C
+:10296000AF909F908F907F9008950F931F93CF9378
+:10297000DF93EC01888199812B813C81232BB9F075
+:102980009F3F11F48F3F99F0CE010E94BE0588232E
+:1029900071F0688179818A810E94331A8C010E94CA
+:1029A000E8190E94AF18B801CE010E949812DF9179
+:1029B000CF911F910F9108950E940B1B0E941B1B2A
+:1029C0000E94E01A0E94351B0E944E200E949D1F0B
+:1029D00080E090E00E94791080E090E00C948F10ED
+:1029E0000E94FB1A0C94DC140E94281A292F2295AD
+:1029F0002F7030E02C3031054CF42A3031056CF466
+:102A00002250310922303105A8F407C02C3031059D
+:102A100069F02F30310551F00DC0803F69F018F496
+:102A2000803E40F409C0843F29F406C093FB882708
+:102A300080F9089580E0089581E00895CF93DF93B1
+:102A400000D000D01F92CDB7DEB70F900F900F903F
+:102A50000F900F90DF91CF910895CF93DF9300D027
+:102A600000D000D0CDB7DEB726960FB6F894DEBF03
+:102A70000FBECDBFDF91CF9108951F93CF93DF930A
+:102A8000C091850116E080918601C81799F0D0E0C9
+:102A90001C9FF0011D9FF00D1124E957FE4F40814E
+:102AA000518162817381848195810E942D152196C7
+:102AB000C770E9CFDF91CF911F9108954091B70181
+:102AC0005091B8016091B9017091BA018091BB0138
+:102AD0009091BC010C942D158091BC0182958F7052
+:102AE00009F054C08091B901882309F44FC0809146
+:102AF0008501A09186016091B7017091B801409164
+:102B0000BA015091BB01B6E08A1709F43FC090E0CA
+:102B100041155105C1F17F3F11F46F3FA1F1B89FFD
+:102B2000F001B99FF00D1124E957FE4F2181721376
+:102B30002AC02081621327C02281211124C0238151
+:102B400034812417350710F421503109241B350B2B
+:102B5000283C3105C0F42091BC012F7020612093E6
+:102B6000BC0126E0289FF001299FF00D1124E457B5
+:102B7000FE4F80818F708061808387EB91E00E949F
+:102B8000B5140C943D1501968770BECF0895CF9271
+:102B9000DF92EF92FF920F931F93CF93DF93CDB706
+:102BA000DEB762970FB6F894DEBF0FBECDBF8C01C3
+:102BB00085E0F801DE011D9601900D928A95E1F7FE
+:102BC000D8014C9111965C91119712966C911297C5
+:102BD0001396CD90DC9014973091B7017091B801A5
+:102BE0008091BA019091BB01009709F46BC17F3FBE
+:102BF00019F43F3F09F466C1E090B901EE2009F4F1
+:102C0000C0C02091BC01C816D90628F0F601E81B07
+:102C1000F90BCF0104C0809590958C0D9D1DFF246C
+:102C2000F394883C910578F0F12C207F09F0C6C020
+:102C30007C2DD98AC88A89890E941E1587EB91E06C
+:102C40000E94B514B1C0822F807F09F046C0751371
+:102C500014C0341312C0611110C02F702061209372
+:102C6000BC010E945E1587EB91E00E94B514809133
+:102C7000BC01D80115968C932EC0CD2819F15F3F69
+:102C800011F44F3FF9F0F62E61111CC080918501BF
+:102C90002091860136E0821709F45AC090E0389FEF
+:102CA000F001399FF00D1124E957FE4F7181571340
+:102CB00006C07081471303C07281711103C0019671
+:102CC0008770E9CFF62E662309F418C18091BC0104
+:102CD00081608093BC01F12C11C1751308C03413BD
+:102CE00006C0611104C08091BC01D801C3C04D87EA
+:102CF0005E878D859E856A8B0E94F4146A8988237D
+:102D0000E1F16623D1F12091BC01822F82958F7071
+:102D100090E0029774F08091B7019091B801988784
+:102D20008F831986DB86CA862C87CE0107960E9480
+:102D3000B51486E0F801A7EBB1E001900D928A95F9
+:102D4000E1F70E946C150E945E15FF24F394D6C033
+:102D50004D875E878D859E850E94281A292F229592
+:102D60002F7030E0223031050CF0BCC09F7009F0AC
+:102D7000B6C0805E883008F4C1C0C8010E94B51496
+:102D8000E4CFC816D90608F453C0F601E81BF90BC6
+:102D9000CF01883C910508F450C0F12C7C2DD98AD4
+:102DA000C88A89890E941E15E7EBF1E086E0DF0101
+:102DB0001D928A95E9F70E945E15A0C0751314C094
+:102DC000341312C0611110C08091BC01F8018583D9
+:102DD000C8010E94B51486E0E7EBF1E0DF011D9227
+:102DE0008A95E9F7FE2C8AC04D875E878D859E8582
+:102DF0006A8B0E94F4146A89882309F4BECF662383
+:102E000009F4BBCF2091BC01822F82958F7090E096
+:102E100002970CF48ECF8091B7019091B8019A83FC
+:102E200089831B82DD82CC822E83CE0101967FCFE7
+:102E3000809590958C0D9D1DACCFF62E662309F4E0
+:102E40009CCF75132EC034132CC02091BC0120FDE3
+:102E50001FC0822F82958F70D9F0D80115962C93C0
+:102E600015978F3049F08F5F982F9295907F822F22
+:102E70008F70892B15968C93C8010E94B51486E03B
+:102E8000F801A7EBB1E001900D928A95E1F793CF9D
+:102E900086E0F801A7EBB1E001900D928A95E1F789
+:102EA0002DC04D875E878D859E850E94F41481110B
+:102EB00040CF8091BC0181608093BC01C8010E9419
+:102EC000B5141CC0662309F458CF4D875E878D85E5
+:102ED0009E850E94F414882309F44FCF2ACF8111D4
+:102EE00048CF0CC0243031050CF047CF9F7009F457
+:102EF00040CFF8019581907F09F03BCF8F2D6296EE
+:102F00000FB6F894DEBF0FBECDBFDF91CF911F91FA
+:102F10000F91FF90EF90DF90CF9008951F93CF9384
+:102F2000DF93CDB7DEB72C970FB6F894DEBF0FBE98
+:102F3000CDBF4F83588769877A878B879C87CE015F
+:102F400007960E94C715882369F08F8198852A8586
+:102F50003B85232BF1F19F3F09F063C08F3F09F0C0
+:102F600060C037C086E0FE013796DE011196019001
+:102F70000D928A95E1F76F817885EA85FB85309718
+:102F800041F17F3F11F46F3F21F12091860130E044
+:102F9000C9010196877099274091850150E08417F7
+:102FA000950709F447C069837A83FD83EC8396E033
+:102FB000929FD001939FB00D1124A957BE4FFE01DF
+:102FC000319601900D929A95E1F7809386010E94C7
+:102FD0003D1516E080918501909186018917C1F118
+:102FE000189FC001112489579E4F0E94C71588233E
+:102FF00079F1E09185011E9FF0011124E957FE4F00
+:103000004081518162817381848195810E942D1557
+:103010008091850190E001968770992780938501C2
+:10302000D9CF4F81588569857A858B859C850E948B
+:103030002D15CFCF0E94F0141092860110928501B9
+:10304000E7EBF1E086E0DF011D928A95E9F7C1CF59
+:103050002C960FB6F894DEBF0FBECDBFDF91CF9197
+:103060001F910895EF92FF920F931F93CF93DF93D9
+:103070008C01892B09F46CC0F12CEE24E394E80157
+:103080002196F8018491843740F4843008F051C0CF
+:10309000813081F0823019F15BC0853709F444C07A
+:1030A000A8F19CE7980F903708F052C08F770E94E4
+:1030B0003B1241C00E5F1F4FFE01C49180E28C0F96
+:1030C000883048F4C7708E2D01C0880FCA95EAF782
+:1030D0000E940E1B14C08C2F0E9473112DC00E5F16
+:1030E0001F4FFE01C49180E28C0F883058F4C770E6
+:1030F0008E2D01C0880FCA95EAF70E94141B0E940A
+:10310000351B1AC08C2F0E943B1216C00E5F1F4F3A
+:10311000FE01C491CC2381F08FE99FE00197F1F784
+:1031200000C00000C150F6CF0E5F1F4FFE01F490AB
+:1031300003C00E9473118E018F2D882309F49FCF45
+:10314000EFE9FFE03197F1F700C000008150F5CFC3
+:10315000DF91CF911F910F91FF90EF900895089507
+:103160006093C1017093C2018093C3019093C40125
+:103170000C94DC140F931F930091C1011091C201B4
+:103180002091C3013091C401DC01CB01802B912B34
+:10319000A22BB32B8093C1019093C201A093C301D2
+:1031A000B093C4011F910F910C94DC140F931F93E3
+:1031B0000091C1011091C2012091C3013091C4015D
+:1031C000DC01CB0180239123A223B3238093C1018F
+:1031D0009093C201A093C301B093C4011F910F91BA
+:1031E0000C94DC140F931F930091C1011091C20144
+:1031F0002091C3013091C401DC01CB0180279127CC
+:10320000A227B3278093C1019093C201A093C30169
+:10321000B093C4011F910F910C94DC141092BD0166
+:103220001092BE011092BF011092C0010C94DC14E8
+:1032300041E050E060E070E004C0440F551F661F9D
+:10324000771F8A95D2F74093BD015093BE016093DA
+:10325000BF017093C0010C94DC1441E050E060E0C9
+:1032600070E004C0440F551F661F771F8A95D2F780
+:103270008091BD019091BE01A091BF01B091C001AC
+:10328000482B592B6A2B7B2B4093BD015093BE01D9
+:103290006093BF017093C0010C94DC1441E050E0D6
+:1032A00060E070E004C0440F551F661F771F8A95C9
+:1032B000D2F740955095609570958091BD019091A1
+:1032C000BE01A091BF01B091C001482359236A23D8
+:1032D0007B234093BD015093BE016093BF01709367
+:1032E000C0010C94DC1441E050E060E070E004C0E8
+:1032F000440F551F661F771F8A95D2F78091BD0135
+:103300009091BE01A091BF01B091C00148275927FB
+:103310006A277B274093BD015093BE016093BF0194
+:103320007093C0010C94DC140F931F930091BD01A6
+:103330001091BE012091BF013091C001DC01CB0191
+:10334000802B912BA22BB32B8093BD019093BE01B8
+:10335000A093BF01B093C0011F910F910C94DC1496
+:103360000F931F930091BD011091BE012091BF01E9
+:103370003091C001DC01CB0180239123A223B32330
+:103380008093BD019093BE01A093BF01B093C00193
+:103390001F910F910C94DC140F931F930091BD01AA
+:1033A0001091BE012091BF013091C001DC01CB0121
+:1033B00080279127A227B3278093BD019093BE0158
+:1033C000A093BF01B093C0011F910F910C94DC1426
+:1033D0000895CF92DF92EF92FF920F931F93CF93B6
+:1033E000DF938C01C090C101D090C201E090C30175
+:1033F000F090C4018091BD019091BE01A091BF01E8
+:10340000B091C001C82AD92AEA2AFB2ACFE1D0E02C
+:10341000D701C6010C2E04C0B695A7959795879540
+:103420000A94D2F780FF06C0B8018C2F0E94B5081D
+:10343000019721F4219760F780E001C08C2FDF9184
+:10344000CF911F910F91FF90EF90DF90CF90089553
+:10345000CF93DF93EC010E94E919BE010E94B508E9
+:10346000DF91CF910895CB010E94281A0895809191
+:10347000C50185958595859508958091C5018770CD
+:10348000089598E0899F90011124262B2093C5016F
+:103490000C942D192091C501809582238093C5013C
+:1034A000982F977069F430E0482F552747FD5095C5
+:1034B0002417350729F08595859585950C944E1927
+:1034C00008959091C501977081E009F480E0089516
+:1034D00090910C01992321F090910D01911109C057
+:1034E00020910E0130910F01F90132969FEF40E0DB
+:1034F0001FC0982F9695969596959F3050F5E09120
+:103500000E01F0910F01E90FF11D877021E030E00D
+:10351000A90102C0440F551F8A95E2F7CA019181A3
+:10352000892B818308959F3F39F04F5F4E3041F0E2
+:1035300051915813F8CF0DC05111F7CF942FF5CFFB
+:103540009F3F39F0F901E90FF11D97FDFA9582834C
+:103550000895089590910C01992321F090910D0107
+:10356000911109C020910E0130910F01F90132969D
+:10357000205F3F4F1FC0982F9695969596959F3048
+:10358000F0F4E0910E01F0910F01E90FF11D877049
+:1035900021E030E0A90102C0440F551F8A95E2F7EF
+:1035A000CA01809591818923818308953196E2171C
+:1035B000F30729F090819813F9CF1082F7CF08957F
+:1035C00081E090E0E0910E01F0910F01E80FF91F0A
+:1035D0001082019680319105A9F708959091D90143
+:1035E000892B8093D901089580959091D9018923E1
+:1035F0008093D90108951092D90108959091D8012E
+:10360000892B8093D801089580959091D8018923C2
+:103610008093D80108951092D80108959091D70110
+:10362000892B8093D701089580959091D7018923A4
+:103630008093D70108951092D70108958093C60111
+:1036400008951092C601089580910E0190910F0186
+:10365000FC0131969C01205F3F4F80E091919111D8
+:103660008F5FE217F307D1F70895E0910E01F09113
+:103670000F018091D9018083E0910E01F0910F013B
+:1036800090818091D801892B8083E0910E01F09187
+:103690000F0190818091D701892B80838091C60191
+:1036A000882361F0E0910E01F0910F019081892B48
+:1036B00080830E94241B81111092C60180910E010B
+:1036C00090910F010C94631020E0009739F0AC0149
+:1036D00041505109842395232F5FF7CF822F0895FE
+:1036E000CF92DF92EF92FF926C01EE24FF24C1147F
+:1036F000D104E104F10421F0C701B60120E101C0C9
+:1037000020E0C72ED82EE92EFF24C114D104E104F5
+:10371000F10419F0285FC701B6016B017C0154E088
+:10372000F694E794D794C7945A95D1F7C114D1046D
+:10373000E104F10419F02C5FC701B6016B017C01B3
+:1037400042E0F694E794D794C7944A95D1F7C11410
+:10375000D104E104F10419F02E5FC701B601DC01C8
+:10376000CB01B695A79597958795892B8A2B8B2B9F
+:1037700009F02F5F822FFF90EF90DF90CF90089598
+:103780008091F101843021F11092DB0120E488E185
+:1037900090E00FB6F894A895809360000FBE209338
+:1037A000600080E00E94500983B7817F846083BFFE
+:1037B00083B7816083BF7894889583B78E7F83BFFA
+:1037C00088E10FB6F89480936000109260000FBEFD
+:1037D0000895089508950E94E91B0E94B0040E9474
+:1037E000EA1B0E94A50591E0811101C090E0892F9C
+:1037F00008950E94F0140E9457100C94500982E022
+:1038000084BD93E095BD9AEF97BD80936E000895B7
+:103810002FB7F8948091DC019091DD01A091DE0139
+:10382000B091DF012FBF0895CF92DF92EF92FF9208
+:103830000F931F932FB7F8944091DC015091DD0155
+:103840006091DE017091DF012FBF6A017B01EE24E0
+:10385000FF248C0120E030E0C016D106E206F3061A
+:1038600010F4415051099A01281B390BC9011F91CD
+:103870000F91FF90EF90DF90CF9008951F920F92DD
+:103880000FB60F9211248F939F93AF93BF938091A4
+:10389000DC019091DD01A091DE01B091DF01019684
+:1038A000A11DB11D8093DC019093DD01A093DE0189
+:1038B000B093DF01BF91AF919F918F910F900FBE99
+:1038C0000F901F9018950E94540DF8942FEF87EADF
+:1038D00091E6215080409040E1F700C0000087E071
+:1038E00090EBDC018093FB019093FC01A093FD0120
+:1038F000B093FE019CE088E10FB6F894A895809300
+:1039000060000FBE90936000FFCFEF92FF920F9385
+:103910001F93CF93DF93D82FCDE08C2F0E949E056D
+:1039200005E010E0E82EF12CC701002E02C09595AD
+:1039300087950A94E2F780FF09C0602F7C2F80E012
+:103940000E946106D81302C081E006C0015011092F
+:1039500058F7C15010F780E0DF91CF911F910F9180
+:10396000FF90EF900895CF93C82F8CE20E94851CA2
+:10397000882321F08C2FCF910C94851C80E0CF916F
+:103980000895CF930E94081E811102C00E94EE1D6F
+:10399000C5E6C15049F00E94B0048FE39CE901974D
+:1039A000F1F700C00000F5CF89E20E94B31C81113D
+:1039B00013C18AE20E94B31C81110E94EE1D85E0B2
+:1039C0000E94B31C81110E94631C0E94131E8093ED
+:1039D000DA0187E00E94B31C8823A9F18BE10E94E1
+:1039E000B31C882351F08091DA0181FB222720F952
+:1039F00091E0922790FB81F90EC08EE00E94B31CEB
+:103A0000882361F08091DA0182FB222720F991E07E
+:103A1000922790FB82F98093DA0115C080E10E9421
+:103A2000B31C9091DA01882341F093FB222720F9FF
+:103A300081E0822780FB93F904C0892F809580FB69
+:103A400090F99093DA018091DA010E94171E0E948A
+:103A5000251E8093FA0180EE0E94B31C882341F05A
+:103A60008091FA01982F909590FB80F98093FA014C
+:103A700089E30E94B31C882359F08091FA0181FBED
+:103A8000222720F991E0922790FB81F98093FA0197
+:103A900082EE0E94B31C882359F08091FA0182FBC8
+:103AA000222720F991E0922790FB82F98093FA0176
+:103AB00086EE0E94B31C882359F08091FA0183FBA3
+:103AC000222720F991E0922790FB83F98093FA0155
+:103AD00083EE0E94B31C882359F08091FA0184FB85
+:103AE000222720F991E0922790FB84F98093FA0134
+:103AF00085E30E94B31C882359F08091FA0185FB6D
+:103B0000222720F991E0922790FB85F98093FA0112
+:103B100081E30E94B31C882359F08091FA0186FB4F
+:103B2000222720F991E0922790FB86F98093FA01F1
+:103B300081E10E94B31C882359F08091FA0187FB30
+:103B4000222720F991E0922790FB87F98093FA01D0
+:103B50008091FA010E94291E8091FA0187FB882733
+:103B600080F980930D0187E20E94B31CC82F8EE17B
+:103B70000E94B31C8111C2608FE10E94B31C8111AD
+:103B8000C46080E20E94B31C8111C86081E20E947F
+:103B9000B31C8111C06182E20E94B31C8111C0621A
+:103BA00083E20E94B31C8111C06484E20E94B31CB2
+:103BB000882311F0C06802C0CC2329F08C2F0E940A
+:103BC000201E6C2F03C00E941C1E682F70E080E036
+:103BD00090E0CF910C94B018CF9108956DEE7EEFE8
+:103BE00080E090E00E945A2460E082E090E00E9431
+:103BF000482460E083E090E00E94482460E084E094
+:103C000090E00E94482460E085E090E00C94482415
+:103C100080E090E00E94422421E08D3E9E4F09F01A
+:103C200020E0822F089582E090E00C943A24682FDF
+:103C300082E090E00C94482483E090E00C943A24D5
+:103C4000682F83E090E00C94482484E090E00C948A
+:103C50003A24682F84E090E00C9448248091E2019B
+:103C600080FF0BC06091130185E0689FB0011124B3
+:103C700075956795759567952BC081FF09C0609113
+:103C8000130185E0689FB00111247595679520C0E8
+:103C900082FF07C06091130185E0689FB001112485
+:103CA00017C09091E3019923D1F06091120196170A
+:103CB00088F72091130185E0289F90011124929F9D
+:103CC000A001939F500D112470E0CA010E940C24A2
+:103CD0006038710540F46115710539F002C065E086
+:103CE00070E0862F08958FE7089581E00895809110
+:103CF000E20180FF08C06091110170E07595679541
+:103D00007595679521C081FF06C06091110170E033
+:103D10007595679519C082FF04C06091110170E02C
+:103D200010C09091E3019923C1F0609110019617A2
+:103D3000A0F780911101899FC001112470E00E94B9
+:103D40000C246038710528F46115710521F0862F67
+:103D500008958FE7089581E0089561E070E0F4CF61
+:103D6000803F21F40E942E1E819504C0813F29F4DA
+:103D70000E942E1E8093E6010895823F21F40E9446
+:103D80002E1E819504C0833F29F40E942E1E80932D
+:103D9000E5010895893F19F40E94771E05C08A3F06
+:103DA00031F40E94771E81958093E70108958B3F3F
+:103DB00021F40E94771E819504C08C3F29F40E9453
+:103DC000771E8093E8010895843F21F48091E401F7
+:103DD000816017C0853F21F48091E401826011C0A9
+:103DE000863F21F48091E40184600BC0873F21F479
+:103DF0008091E401886005C0883F31F48091E4013E
+:103E000080618093E40108958D3F21F48091E20167
+:103E100081600BC08E3F21F48091E201826005C079
+:103E20008F3F29F48091E20184608093E20108953C
+:103E3000803F39F48091E60187FF6CC01092E60163
+:103E400069C0813F29F48091E6011816BCF362C075
+:103E50009091E501823F29F497FF5CC01092E50143
+:103E600059C0833F19F41916CCF354C0893F41F46B
+:103E70008091E70118160CF04DC01092E7014AC07E
+:103E80008A3F29F48091E70187FF44C0F6CF8B3F3A
+:103E900039F48091E80187FF3DC01092E8013AC0F3
+:103EA0008C3F29F48091E8011816BCF333C0843F9D
+:103EB00021F48091E4018E7F17C0853F21F4809129
+:103EC000E4018D7F11C0863F21F48091E4018B7F56
+:103ED0000BC0873F21F48091E401877F05C0883FB4
+:103EE00031F48091E4018F7E8093E40113C08D3F13
+:103EF00021F48091E2018E7F0BC08E3F21F48091EE
+:103F0000E2018D7F05C08F3F29F48091E2018B7F14
+:103F10008093E2018091E50181110EC08091E6015C
+:103F200081110AC08091E701811106C08091E801EA
+:103F3000811102C01092E301089584EE91E00E9485
+:103F40006E100E94081C9093E1018093E001089597
+:103F50001F93CF93DF938091E0019091E1010E9444
+:103F6000141CAC019091E301992321F020911401DC
+:103F700030E006C0209115018AE0289F90011124AD
+:103F80004217530708F486C08091E501C091E6010D
+:103F9000D091E7011091E801811107C0C11176C0ED
+:103FA000D11174C0111172C075C09F3F19F09F5F8D
+:103FB0009093E301181624F40E942E1E8093E501CD
+:103FC0008091E50187FF05C00E942E1E8195809398
+:103FD000E5011C1624F40E942E1E8093E6018091B8
+:103FE000E60187FF05C00E942E1E81958093E601A1
+:103FF0006091E501662339F1C091E601CC2319F106
+:10400000772767FD7095872F972F0E941D2323E345
+:1040100033E343E35FE30E9481230E94EA2260933B
+:10402000E5016C2F772767FD7095872F972F0E94EA
+:104030001D2323E333E343E35FE30E9481230E94D4
+:10404000EA226093E6011D1624F40E94771E8093F5
+:10405000E7018091E70187FF05C00E94771E8195E7
+:104060008093E701111624F40E94771E8093E801E3
+:104070008091E80187FF05C00E94771E819580939B
+:10408000E801DF91CF911F910C949D1F9F3F09F094
+:104090008ECF96CFDF91CF911F910895E4EEF1E09E
+:1040A00085E0DF011D928A95E9F71092E3011092F5
+:1040B000E2010895833081F128F4813059F0823093
+:1040C000D1F00895853009F449C0B8F1863009F47B
+:1040D00056C0089580911501262F30E0280F311D1C
+:1040E0002F3F310524F4680F6093150108958FEF79
+:1040F00080931501089580911401262F30E0280F38
+:10410000311D2F3F310524F4680F60931401089589
+:104110008FEF80931401089580911301262F30E0D2
+:10412000280F311D2F3F310524F4680F60931301D0
+:1041300008958FEF80931301089580911201262F27
+:1041400030E0280F311D2F3F310524F4680F6093B4
+:10415000120108958FEF809312010895809111014B
+:10416000262F30E0280F311D2F3F310524F4680F32
+:104170006093110108958FEF80931101089580914C
+:104180001001262F30E0280F311D2F3F310524F478
+:10419000680F6093100108958FEF809310010895C8
+:1041A000833011F128F4813049F0823091F0089584
+:1041B000853081F120F18630C1F10895809115019B
+:1041C000681720F4861B809315010895109215013D
+:1041D000089580911401681720F4861B80931401C0
+:1041E000089510921401089580911301681720F426
+:1041F000861B8093130108951092130108958091F6
+:104200001201681720F4861B809312010895109202
+:104210001201089580911101681720F4861B809384
+:1042200011010895109211010895809110016817ED
+:1042300020F4861B809310010895109210010895B8
+:104240000F931F938D3109F46BC008F03FC08E307F
+:1042500009F47FC0C0F4873009F469C068F486307F
+:1042600009F0B1C08091DA01817F8E7F8093DA01FD
+:1042700081E08093EA01A8C0883009F4A2C08B30A5
+:1042800009F49FC0A0C0863109F49BC078F4803146
+:1042900009F472C0813109F096C00E94F014909127
+:1042A0000D0181E0892780930D018BC0893109F4CC
+:1042B00088C08B3109F087C08091DA0181FB222709
+:1042C00020F991E0922790FB81F94CC0853309F4E5
+:1042D00070C048F4873209F46CC008F459C08932C0
+:1042E00009F467C070C0833438F48A3308F04EC0D4
+:1042F000883309F466C067C0833409F45AC088342F
+:1043000009F061C00E94F0140FEF13ED20E301509B
+:1043100010402040E1F700C000000E94631C51C023
+:104320000E94A4220E9457100E9450094AC09091F6
+:10433000DA01892F8095817080FB90F929F09660D1
+:1043400098609093DA0140C0997F977F9093DA014B
+:1043500038C08091DA0182FB222720F991E0922770
+:1043600090FB82F98093DA01992359F18091DA0167
+:1043700081608093DA0125C08091DA0183FB2227D6
+:1043800020F991E0922790FB83F9ECCF895301C08B
+:104390008D5141E050E060E070E08A019B0104C073
+:1043A000000F111F221F331F8A95D2F7C901B801D0
+:1043B00004C061E070E080E090E00E94B0180E94CC
+:1043C000F01481E001C080E01F910F91089580E01A
+:1043D000089580E00895CF93C82F8091EA0181303D
+:1043E00079F018F08230E9F187C0E0910E01F09188
+:1043F0000F018081813169F0823209F07FC009C0EC
+:10440000E0910E01F0910F018081813111F0823233
+:1044100061F48C2F0E94E721811104C08C2F0E942F
+:1044200020211DC081E090E01AC08C2F0E94E9215C
+:10443000811114C0C43179F048F4CB3079F0C03127
+:1044400009F060C082E08093EA0108C0C93219F027
+:10445000C83321F057C01092EA0154C081E0817046
+:1044600053C0C93289F118F5C43171F1A8F4C730CD
+:1044700009F046C08AE08093150194E190931401FD
+:1044800093E0909313018093120188E080931101CF
+:1044900088E28093100134C0CE51C63088F5EC2FED
+:1044A000F0E0E65DFE4F80818093E90129C0CE34C3
+:1044B000E9F020F4CB3421F56AE013C0C13579F07E
+:1044C000C235F1F461E00DC08091E901882319F053
+:1044D0001092E90115C081E08093EA0115C061E006
+:1044E00006C08091E9010E945A200AC06AE08091CA
+:1044F000E9010E94D02004C01092EA0180E004C0CB
+:1045000081E002C080E0ABCFCF910895E1E8F0E018
+:104510008081886080838081816080838FB7F894F8
+:1045200093E09093890090ED909388008FBF089559
+:10453000EFE6F0E08081826080830895EFE6F0E0AE
+:1045400080818D7F80830895EFE6F0E0908182E0A6
+:104550008927808308951F920F920FB60F9211241E
+:104560002F933F934F935F936F937F938F939F937B
+:10457000AF93BF93EF93FF938091EB019091EC0188
+:1045800001969093EC018093EB01811103C082E0CE
+:104590000E945009E091EC01E695E695F0E0EB59B8
+:1045A000FA4FE4918091EB018E1303C080E00E94EA
+:1045B0005009FF91EF91BF91AF919F918F917F91A2
+:1045C0006F915F914F913F912F910F900FBE0F9080
+:1045D0001F90189504D06894B1118DC0089570D0C3
+:1045E00088F09F5790F0B92F9927B751A0F0D1F0DC
+:1045F000660F771F881F991F1AF0BA95C9F712C066
+:10460000B13081F077D0B1E0089574C0672F782F72
+:104610008827B85F39F0B93FCCF3869577956795D1
+:10462000B395D9F73EF490958095709561957F4F3D
+:104630008F4F9F4F0895E89409C097FB3EF49095E3
+:104640008095709561957F4F8F4F9F4F9923A9F06B
+:10465000F92F96E9BB279395F695879577956795FA
+:10466000B795F111F8CFFAF4BB0F11F460FF1BC03E
+:104670006F5F7F4F8F4F9F4F16C0882311F096E9D1
+:1046800011C0772321F09EE8872F762F05C066237F
+:1046900071F096E8862F70E060E02AF09A95660F38
+:1046A000771F881FDAF7880F9695879597F90895F1
+:1046B00057FD9058440F551F59F05F3F71F04795D3
+:1046C000880F97FB991F61F09F3F79F087950895B8
+:1046D000121613061406551FF2CF4695F1DF08C0D7
+:1046E000161617061806991FF1CF869571056105F4
+:1046F00008940895E894BB2766277727CB0197F99C
+:1047000008950BD078C069D028F06ED018F09523AA
+:1047100009F05AC05FC01124EECFCADFA0F3959F05
+:10472000D1F3950F50E0551F629FF001729FBB2798
+:10473000F00DB11D639FAA27F00DB11DAA1F649F44
+:104740006627B00DA11D661F829F2227B00DA11DF7
+:10475000621F739FB00DA11D621F839FA00D611D7D
+:10476000221F749F3327A00D611D231F849F600D9E
+:10477000211D822F762F6A2F11249F5750408AF0D7
+:10478000E1F088234AF0EE0FFF1FBB1F661F771F63
+:10479000881F91505040A9F79E3F510570F014C0FA
+:1047A000AACF5F3FECF3983EDCF38695779567954B
+:1047B000B795F795E7959F5FC1F7FE2B880F911D81
+:1047C0009695879597F9089597F99F6780E870E027
+:1047D00060E008959FEF80EC089500240A94161677
+:1047E000170618060906089500240A9412161306DF
+:1047F000140605060895092E0394000C11F488236D
+:1048000052F0BB0F40F4BF2B11F460FF04C06F5F88
+:104810007F4F8F4F9F4F089597FB072E16F40094FC
+:1048200007D077FD09D00E94262407FC05D03EF46E
+:10483000909581959F4F0895709561957F4F08954C
+:10484000EE0FFF1F0590F491E02D0994AA1BBB1BEE
+:1048500051E107C0AA1FBB1FA617B70710F0A61B80
+:10486000B70B881F991F5A95A9F780959095BC01A1
+:10487000CD010895F999FECF92BD81BDF89A99278F
+:1048800080B50895A8E1B0E042E050E00C946224C5
+:10489000262FF999FECF92BD81BDF89A019700B4F9
+:1048A000021639F01FBA20BD0FB6F894FA9AF99A99
+:1048B0000FBE08950196272F0E9449240C94482486
+:1048C000DC01CB01FC01F999FECF06C0F2BDE1BDD0
+:1048D000F89A319600B40D9241505040B8F70895BF
+:0448E000F894FFCF7A
+:1048E40020025209E009BD09890955090101C701DE
+:1048F40028080A03140A3F4D36392605D904A304AF
+:104904006A04FD0316042F04480401020304050687
+:044914000708090087
+:00000001FF
diff --git a/keyboard/ergodox_ez/matrix.c b/keyboard/ergodox_ez/matrix.c index c4f5b179f0..7266cca985 100644 --- a/keyboard/ergodox_ez/matrix.c +++ b/keyboard/ergodox_ez/matrix.c @@ -50,7 +50,7 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS]; static matrix_row_t read_cols(uint8_t row); static void init_cols(void); -static void unselect_rows(); +static void unselect_rows(void); static void select_row(uint8_t row); static uint8_t mcp23018_reset_loop; diff --git a/keyboard/ergodox_ez/readme.md b/keyboard/ergodox_ez/readme.md index 97a10ff4d8..59130129cd 100644 --- a/keyboard/ergodox_ez/readme.md +++ b/keyboard/ergodox_ez/readme.md @@ -4,7 +4,7 @@ There are two main ways you could customize the ErgoDox EZ. ## The Easy Way: Use an existing firmware file and just flash it -1. Download and install the [Teensy Loader](https://www.pjrc.com/teensy/loader.html) +1. Download and install the [Teensy Loader](https://www.pjrc.com/teensy/loader.html). Some Linux distributions already provide a binary (may be called `teensy-loader-cli`), so you may prefer to use this. 2. Find a firmware file you like. You can find a few if these in the keymaps subdirectory right here. The file you need ends with .hex, and you can look at its .c counterpart (or its PNG image) to see what you'll be getting. You can also use the [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) to create a firmware Hex file you like. 3. Download the firmware file 4. Connect the keyboard, press its Reset button (gently insert a paperclip into the hole in the top-right corner) and flash it using the Teensy loader you installed on step 1 and the firmware you downloaded. @@ -20,7 +20,7 @@ This requires a little bit of familiarity with coding. 4. Copy `keyboard/ergodox_ez/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`) 5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly. See below for more tips on sharing your work. 6. Compile your firmware by running `make clean` followed by `make KEYMAP=your_name`. For example, `make KEYMAP=german`. This will result in a hex file, which will always be called `ergodox_ez.hex`, regardless of your keymap name. -6. Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. +6. Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successfull build by running `make teensy KEYMAP=your_name`. 7. Submit your work as a pull request to this repository, so others can also use it. :) See below on specifics. Good luck! :) diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index 4c8f9dc8ab..9429049fd9 100644 --- a/keyboard/gh60/Makefile +++ b/keyboard/gh60/Makefile @@ -42,14 +42,14 @@ TARGET = gh60_lufa # Directory common source filess exist +TOP_DIR = ../.. TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . # project specific files -SRC = keymap_common.c \ - matrix.c \ +SRC = matrix.c \ led.c ifdef KEYMAP @@ -119,6 +119,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration +CUSTOM_MATRIX = yes #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA @@ -128,8 +129,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # Search Path VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) VPATH += $(TMK_DIR) -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk
\ No newline at end of file +include $(TOP_DIR)/quantum/quantum.mk diff --git a/keyboard/gh60_rev_c/config.h b/keyboard/gh60_rev_c/config.h index 2fd8f57439..827c08d1be 100644 --- a/keyboard/gh60_rev_c/config.h +++ b/keyboard/gh60_rev_c/config.h @@ -41,15 +41,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
-*/
-#define COLS (int []){ F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-#define ROWS (int []){ D0, D1, D2, D3, D5 }
+*/
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
+#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
+#define DEBOUNCING_DELAY 5
/* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST
@@ -62,17 +63,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/*
+/*
* Force NKRO
*
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
* state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
* makefile for this to work.)
*
* If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
* until the next keyboard reset.
*
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
* fully operational during normal computer usage.
*
* For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
@@ -90,7 +91,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * the keyboard. They are best used in combination with the HID Listen program,
* found here: https://www.pjrc.com/teensy/hid_listen.html
*
- * The options below allow the magic key functionality to be changed. This is
+ * The options below allow the magic key functionality to be changed. This is
* useful if your keyboard/keypad is missing keys and you want magic key support.
*
*/
diff --git a/keyboard/gh60_rev_c/gh60.c b/keyboard/gh60_rev_c/gh60.c index 8e7219bfe8..6da4d8ee3e 100644 --- a/keyboard/gh60_rev_c/gh60.c +++ b/keyboard/gh60_rev_c/gh60.c @@ -12,8 +12,9 @@ void matrix_scan_user(void) { }
__attribute__ ((weak))
-void process_action_user(keyrecord_t *record) {
+bool process_action_user(keyrecord_t *record) {
// leave this function blank - it can be defined in a keymap file
+ return true;
}
__attribute__ ((weak))
@@ -35,11 +36,11 @@ void matrix_scan_kb(void) { matrix_scan_user();
}
-void process_action_kb(keyrecord_t *record) {
+bool process_action_kb(keyrecord_t *record) {
// put your per-action keyboard code here
// runs for every action, just before processing by the firmware
- process_action_user(record);
+ return process_action_user(record);
}
void led_set_kb(uint8_t usb_led) {
diff --git a/keyboard/gh60_rev_c/gh60.h b/keyboard/gh60_rev_c/gh60.h index 2373ad333c..95e5e1ebc7 100644 --- a/keyboard/gh60_rev_c/gh60.h +++ b/keyboard/gh60_rev_c/gh60.h @@ -75,7 +75,7 @@ inline void gh60_wasd_leds_off(void) { DDRF &= ~(1<<7); PORTF &= ~(1<<7); } void matrix_init_user(void);
void matrix_scan_user(void);
-void process_action_user(keyrecord_t *record);
+bool process_action_user(keyrecord_t *record);
void led_set_user(uint8_t usb_led);
#endif
diff --git a/keyboard/ghost_squid/Makefile.lufa b/keyboard/ghost_squid/Makefile.lufa deleted file mode 100644 index 54adb1e3d8..0000000000 --- a/keyboard/ghost_squid/Makefile.lufa +++ /dev/null @@ -1,117 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = ghostsquid_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# List C source files here. (C dependencies are automatically generated.) -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - -# MCU name -MCU = atmega32u2 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -#CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/ghost_squid/README.md b/keyboard/ghost_squid/README.md deleted file mode 100644 index dda67e6ba1..0000000000 --- a/keyboard/ghost_squid/README.md +++ /dev/null @@ -1,20 +0,0 @@ -The Ghost Squid controller -========================== -Custom controller for the Cooler Master QuickFire XT keyboard designed by bpiphany. - -*Note that this is not the official firmware* - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.lufa - -At the moment only the LUFA stack is supported. - - -Bootloader ---------- -To enter bootloader by hardware use a magnet above the controller before connecting the usb cable. - -It is still possible to use Boot Magic and Command (LSFT+RSFT+PAUS) to access the bootloader though. diff --git a/keyboard/ghost_squid/config.h b/keyboard/ghost_squid/config.h deleted file mode 100644 index 54f03143c1..0000000000 --- a/keyboard/ghost_squid/config.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED // 0x2516 (original CM XT value) -#define PRODUCT_ID 0x001A -#define DEVICE_VER 0x0000 -#define MANUFACTURER Cooler Master -#define PRODUCT Cooler Master QuickFire XT - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for Cooler Master QuickFire XT - -/* matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 18 - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/ghost_squid/keymap.c b/keyboard/ghost_squid/keymap.c deleted file mode 100644 index e9ad9efe1a..0000000000 --- a/keyboard/ghost_squid/keymap.c +++ /dev/null @@ -1,102 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "debug.h" -#include "keymap.h" - -/* - Matrix col/row mapping - - ,----. ,-------------------. ,-------------------. ,-------------------. ,--------------. - |06/6| |07/4|08/4|08/2|08/6| |15/5|11/6|12/2|12/4| |14/4|14/5|14/6|14/0| |13/5|13/7|15/7| - `----' `-------------------' `-------------------' `-------------------' `--------------' - ,-------------------------------------------------------------------------. ,--------------. ,-------------------. - |06/4|06/5|07/5|08/5|09/5|09/4|10/4|10/5|11/5|12/5|05/5|05/4|11/4| 14/2| |17/4|02/4|04/4| |16/1|17/1|04/1|04/0| - |-------------------------------------------------------------------------| |--------------| |-------------------| - |06/2 |06/7|07/7|08/7|09/7|09/2|10/2|10/7|11/7|12/7|05/7|05/2|11/2| 14/3| |16/4|02/5|04/5| |16/7|17/7|04/7| | - |-------------------------------------------------------------------------| '--------------' |-------------- 02/7| - |02/7 |06/3|07/3|08/3|09/3|09/6|10/6|10/3|11/3|12/3|05/3|05/6| 14/1| |16/2|17/2|04/2| | - |-------------------------------------------------------------------------| ,----. |-------------------| - |01/2 |06/1|07/1|08/1|09/1|09/0|10/0|10/1|11/1|12/1|05/0| 01/3| |02/6| |16/3|17/3|04/3| | - |-------------------------------------------------------------------------| ,--------------. |-------------- 02/3| - |15/4|03/2|13/6| 16/6 |13/0|0/3|12/0|15/1| |02/0|16/0|17/0| | 17/6 |04/6| | - `-------------------------------------------------------------------------' `--------------' `-------------------' -*/ - -#define KEYMAP( \ - KG6, KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0, KN5, KN7, KP7, \ - KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2, KR4, KC4, KE4, KQ1, KR1, KE1, KE0, \ - KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3, KQ4, KC5, KE5, KQ7, KR7, KE7, KC7, \ - KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO1, KQ2, KR2, KE2, \ - KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0, KB3, KC6, KQ3, KR3, KE3, KC3, \ - KP4, KD2, KN6, KQ6, KN0, KA3, KM0, KP1, KC0, KQ0, KR0, KR6, KE6 \ -) { \ -/* 0 1 2 3 4 5 6 7 */ \ -/* A 0 */ {KC_NO, KC_NO, KC_NO, KC_##KA3, KC_NO, KC_NO, KC_NO, KC_NO },\ -/* B 1 */ {KC_NO, KC_NO, KC_##KB2, KC_##KB3, KC_NO, KC_NO, KC_NO, KC_NO },\ -/* C 2 */ {KC_##KC0, KC_NO, KC_NO, KC_##KC3, KC_##KC4, KC_##KC5, KC_##KC6, KC_##KC7},\ -/* D 3 */ {KC_NO, KC_NO, KC_##KD2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO },\ -/* E 4 */ {KC_##KE0, KC_##KE1, KC_##KE2, KC_##KE3, KC_##KE4, KC_##KE5, KC_##KE6, KC_##KE7},\ -/* F 5 */ {KC_##KF0, KC_NO, KC_##KF2, KC_##KF3, KC_##KF4, KC_##KF5, KC_##KF6, KC_##KF7},\ -/* G 6 */ {KC_NO, KC_##KG1, KC_##KG2, KC_##KG3, KC_##KG4, KC_##KG5, KC_##KG6, KC_##KG7},\ -/* H 7 */ {KC_NO, KC_##KH1, KC_##KH2, KC_##KH3, KC_##KH4, KC_##KH5, KC_##KH6, KC_##KH7},\ -/* I 8 */ {KC_NO, KC_##KI1, KC_##KI2, KC_##KI3, KC_##KI4, KC_##KI5, KC_##KI6, KC_##KI7},\ -/* J 9 */ {KC_##KJ0, KC_##KJ1, KC_##KJ2, KC_##KJ3, KC_##KJ4, KC_##KJ5, KC_##KJ6, KC_##KJ7},\ -/* K 10 */ {KC_##KK0, KC_##KK1, KC_##KK2, KC_##KK3, KC_##KK4, KC_##KK5, KC_##KK6, KC_##KK7},\ -/* L 11 */ {KC_NO, KC_##KL1, KC_##KL2, KC_##KL3, KC_##KL4, KC_##KL5, KC_##KL6, KC_##KL7},\ -/* M 12 */ {KC_##KM0, KC_##KM1, KC_##KM2, KC_##KM3, KC_##KM4, KC_##KM5, KC_NO, KC_##KM7},\ -/* N 13 */ {KC_##KN0, KC_NO, KC_NO, KC_NO, KC_NO, KC_##KN5, KC_##KN6, KC_##KN7},\ -/* O 14 */ {KC_##KO0, KC_##KO1, KC_##KO2, KC_##KO3, KC_##KO4, KC_##KO5, KC_##KO6, KC_NO },\ -/* P 15 */ {KC_NO, KC_##KP1, KC_NO, KC_NO, KC_##KP4, KC_##KP5, KC_NO, KC_##KP7},\ -/* Q 16 */ {KC_##KQ0, KC_##KQ1, KC_##KQ2, KC_##KQ3, KC_##KQ4, KC_NO, KC_##KQ6, KC_##KQ7},\ -/* R 17 */ {KC_##KR0, KC_##KR1, KC_##KR2, KC_##KR3, KC_##KR4, KC_NO, KC_##KR6, KC_##KR7} \ -} - -#include "keymap_ansi.h" - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]); - } else { - return pgm_read_byte(&keymaps[0][(key.col)][(key.row)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/ghost_squid/keymap_ansi.h b/keyboard/ghost_squid/keymap_ansi.h deleted file mode 100644 index ed1088baa9..0000000000 --- a/keyboard/ghost_squid/keymap_ansi.h +++ /dev/null @@ -1,23 +0,0 @@ - -static const uint8_t PROGMEM keymaps[][MATRIX_COLS][MATRIX_ROWS] = { - /* Layer 0: Standard ANSI layer */ - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, \ - CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, \ - LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, PENT, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI, FN0,RCTL, LEFT,DOWN,RGHT, P0, PDOT), \ - /* Layer 1: Function layer */ - KEYMAP(\ - CALC,MYCM,WSCH,WHOM,MAIL,VOLD,VOLU,MSEL,MSTP,MPLY,MPRV,MNXT,TRNS, WAKE, PWR,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS) -}; - -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1) -}; diff --git a/keyboard/ghost_squid/led.c b/keyboard/ghost_squid/led.c deleted file mode 100644 index da5dbd7ae2..0000000000 --- a/keyboard/ghost_squid/led.c +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - -/* LED pin configuration - * - * Scroll Lock PB7 - * CAPS PC6 - * NUMLOCK PC5 - * - */ -void led_set(uint8_t usb_led) -{ - DDRB |= (1<<7); - DDRC |= (1<<5) | (1<<6); - - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - { - PORTC &= ~(1<<6); - } - else - { - PORTC |= (1<<6); - } - - if (usb_led & (1<<USB_LED_NUM_LOCK)) - { - PORTC &= ~(1<<5); - } - else - { - PORTC |= (1<<5); - } - - if (usb_led & (1<<USB_LED_SCROLL_LOCK)) - { - PORTB &= ~(1<<7); - } - else - { - PORTB |= (1<<7); - } -} diff --git a/keyboard/ghost_squid/matrix.c b/keyboard/ghost_squid/matrix.c deleted file mode 100644 index d6a82ef759..0000000000 --- a/keyboard/ghost_squid/matrix.c +++ /dev/null @@ -1,237 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint8_t read_rows(void); -static void init_rows(void); -static void unselect_cols(void); -static void select_col(uint8_t col); - -inline uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - unselect_cols(); - init_rows(); - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { - select_col(col); - _delay_us(3); - uint8_t rows = read_rows(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - debouncing = DEBOUNCE; - } - } - unselect_cols(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop32(matrix[i]); - } - return count; -} - -/* Row pin configuration - * - * row: 0 1 2 3 4 5 6 7 - * pin: PB1 PC2 PB6 PB4 PB3 PB5 PB0 PB2 - * - */ -static void init_rows(void) -{ - DDRC &= ~0b00000100; - DDRB &= ~0b01111111; - PORTC |= 0b00000100; - PORTB |= 0b01111111; -} - -static uint8_t read_rows(void) -{ - return (PINB&(1<<1) ? 0 : (1<<0)) | - (PINC&(1<<2) ? 0 : (1<<1)) | - (PINB&(1<<6) ? 0 : (1<<2)) | - (PINB&(1<<4) ? 0 : (1<<3)) | - (PINB&(1<<3) ? 0 : (1<<4)) | - (PINB&(1<<5) ? 0 : (1<<5)) | - (PINB&(1<<0) ? 0 : (1<<6)) | - (PINB&(1<<2) ? 0 : (1<<7)); -} - -/* These columns uses two 74HC42 4 to 10 bit demultiplexers (low active). - * - * COL PD6 PD5 PD4 PD3 PD2 PD1 - * 10 1 1 0 0 0 0 - * 15 1 1 0 0 0 1 - * 8 1 1 0 0 1 0 - * 14 1 1 0 1 0 0 - * 6 1 1 0 1 0 1 - * 13 1 1 0 1 1 0 - * 12 1 1 1 0 0 0 - * 9 1 1 1 0 1 0 - * 11 1 1 1 1 0 0 - * 7 1 1 1 1 1 0 - * - * COL PD1 PD2 PD3 PD4 PD5 PD6 - * 3 1 1 0 0 0 1 - * 4 1 1 0 0 1 0 - * 17 1 1 0 1 0 0 - * 16 1 1 0 1 1 0 - * 0 1 1 1 0 0 1 - * 5 1 1 1 0 1 0 - * 2 1 1 1 1 0 0 - * 1 1 1 1 1 1 0 - */ -static void unselect_cols(void) -{ - DDRD |= 0b01111111; - PORTD &= ~0b01111111; -} - -static void select_col(uint8_t col) -{ - switch (col) { - case 0: - PORTD |= (1<<6) | (1<<3) | (1<<2) | (1<<1); - break; - case 1: - PORTD |= (1<<5) | (1<<4) | (1<<3) | (1<<2) | (1<<1); - break; - case 2: - PORTD |= (1<<4) | (1<<3) | (1<<2) | (1<<1); - break; - case 3: - PORTD |= (1<<6) | (1<<2) | (1<<1); - break; - case 4: - PORTD |= (1<<5) | (1<<2) | (1<<1); - break; - case 5: - PORTD |= (1<<5) | (1<<3) | (1<<2) | (1<<1); - break; - case 6: - PORTD |= (1<<6) | (1<<5) | (1<<3) | (1<<1); - break; - case 7: - PORTD |= (1<<6) | (1<<5) | (1<<4) | (1<<3) | (1<<2); - break; - case 8: - PORTD |= (1<<6) | (1<<5) | (1<<2); - break; - case 9: - PORTD |= (1<<6) | (1<<5) | (1<<4) | (1<<2); - break; - case 10: - PORTD |= (1<<6) | (1<<5); - break; - case 11: - PORTD |= (1<<6) | (1<<5) | (1<<4) | (1<<3); - break; - case 12: - PORTD |= (1<<6) | (1<<5) | (1<<4); - break; - case 13: - PORTD |= (1<<6) | (1<<5) | (1<<3) | (1<<2); - break; - case 14: - PORTD |= (1<<6) | (1<<5) | (1<<3); - break; - case 15: - PORTD |= (1<<6) | (1<<5) | (1<<1); - break; - case 16: - PORTD |= (1<<5) | (1<<4) | (1<<2) | (1<<1); - break; - case 17: - PORTD |= (1<<4) | (1<<2) | (1<<1); - break; - } -} diff --git a/keyboard/hbkb/Makefile.lufa b/keyboard/hbkb/Makefile.lufa deleted file mode 100644 index 322f219d69..0000000000 --- a/keyboard/hbkb/Makefile.lufa +++ /dev/null @@ -1,120 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = hbkb_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/hbkb/config.h b/keyboard/hbkb/config.h deleted file mode 100644 index fef8c05ed3..0000000000 --- a/keyboard/hbkb/config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xBB00 -#define MANUFACTURER t.m.k. -#define DEVICE_VER 0x0100 -#define PRODUCT Happy Buckling Keyboard - -#define DESCRIPTION mod version of IBM Model M keyboard - -/* matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 8 - -/* define if matrix has ghost */ -#define MATRIX_HAS_GHOST - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* legacy keymap support */ -#define USE_LEGACY_KEYMAP - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \ - keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \ -) - -#endif diff --git a/keyboard/hbkb/keymap.c b/keyboard/hbkb/keymap.c deleted file mode 100644 index b89bdf8e42..0000000000 --- a/keyboard/hbkb/keymap.c +++ /dev/null @@ -1,231 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * Keymap for Macway mod - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "print.h" -#include "debug.h" -#include "util.h" -#include "keymap.h" - - -/* - * Layout: 59key - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| BS | - * |-----------------------------------------------------------| - * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Return | - * |-----------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .|Fn2|Shift | - * |-----------------------------------------------------------| - * |Ctrl | |Alt | Fn4 |Alt | |Fn1 | - * `-----' `---------------------------------------' `-----' - * - * Matrix: 12x8 - * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 - * ---+---------+---------+---------+---------+---------+---------+---------+--------- - * 0 | | | LCTRL | | | | RCTRL | - * 1 | | LSHIFT | | | | | RSHIFT | - * 2 | | Tab | Grave | 1 | Q | A | Z | - * 3 | | Cpslck | | 2 | W | S | X | - * 4 | | | | 3 | E | D | C | - * 5 | G | T | 5 | 4 | R | F | V | B - * 6 | | Bckspc | | | Key*1 | Bckslsh | Enter | Space - * 7 | H | Y | 6 | 7 | U | J | M | N - * 8 | | Rbrckt | Equal | 8 | I | K | Comma | - * 9 | | | | 9 | O | L | Dot | - * A | | Lbrckt | Minus | 0 | P | Smcolon | | Slash - * B | LALT | | | | | | | RALT - * Key*1 This key locates between Equal and Backspace. - * - * Original matrix here: http://geekhack.org/showthread.php?7767-Wireless-Model-M&p=133911&viewfull=1#post133911 - */ -#define KEYMAP( \ - K22, K23, K33, K43, K53, K52, K72, K73, K83, K93, KA3, KA2, K82, K64, K61, \ - K21, K24, K34, K44, K54, K51, K71, K74, K84, K94, KA4, KA1, K81, K65, \ - K31, K25, K35, K45, K55, K50, K70, K75, K85, K95, KA5, KA0, K66, \ - K11, K26, K36, K46, K56, K57, K77, K76, K86, K96, KA7, K16, \ - K02, KB0, K67, KB7, K06 \ -) { \ - { KC_NO, KC_NO, KC_##K02, KC_NO, KC_NO, KC_NO, KC_##K06, KC_NO }, \ - { KC_NO, KC_##K11, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K16, KC_NO }, \ - { KC_NO, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \ - { KC_NO, KC_##K31, KC_NO, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \ - { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \ - { KC_NO, KC_##K61, KC_NO, KC_NO, KC_##K64, KC_##K65, KC_##K66, KC_##K67 }, \ - { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \ - { KC_NO, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_##K93, KC_##K94, KC_##K95, KC_##K96, KC_NO }, \ - { KC_##KA0, KC_##KA1, KC_##KA2, KC_##KA3, KC_##KA4, KC_##KA5, KC_NO, KC_##KA7 }, \ - { KC_##KB0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_##KB7 }, \ -} - -#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)])) - - -// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. -static const uint8_t PROGMEM fn_layer[] = { - 0, // Fn0 - 1, // Fn1 - 2, // Fn2 - 3, // Fn3 - 4, // Fn4 - 0, // Fn5 - 0, // Fn6 - 0 // Fn7 -}; - -// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. -// See layer.c for details. -static const uint8_t PROGMEM fn_keycode[] = { - KC_NO, // Fn0 - KC_NO, // Fn1 - KC_SLSH, // Fn2 - KC_SCLN, // Fn3 - KC_SPC, // Fn4 - KC_NO, // Fn5 - KC_NO, // Fn6 - KC_NO // Fn7 -}; - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| BS | - * |-----------------------------------------------------------| - * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Return | - * |-----------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .|Fn2|Shift | - * |-----------------------------------------------------------| - * |Ctrl | |Alt | Fn4 |Alt | |Fn1 | - * `-----' `---------------------------------------' `-----' - */ - KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \ - LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,ENT, \ - LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN2, FN1, \ - LGUI, LALT, FN4, RALT, FN1), - - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | - * |-----------------------------------------------------------| - * |Contro|VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | - * |-----------------------------------------------------------| - * |Shift | | | | | | +| -|End|PgD|Dow|Shift | - * |-----------------------------------------------------------| - * |Ctrl | |Alt | Space |Alt | |Fn1 | - * `-----' `---------------------------------------' `-----' - */ - KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,BRK, UP, NO, NO, \ - LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,NO, \ - LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,FN1, \ - LGUI, LALT, SPC, RALT, FN1), - - - /* Layer 2: Vi mode (Quote/Rmeta) - * ,-----------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | | - * |-----------------------------------------------------------| - * | \ |Hom|PgD|Up |PgU|End|Hom|PgD|PgU|End| | | | | - * |-----------------------------------------------------------| - * |Contro| |Lef|Dow|Rig| |Lef|Dow|Up |Rig| | | | - * |-----------------------------------------------------------| - * |Shift | | | | | |Hom|PgD|PgU|End|xxx|Shift | - * |-----------------------------------------------------------| - * |Ctrl | |Alt | Space |Alt | |Fn1 | - * `-----' `---------------------------------------' `-----' - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, NO, NO, \ - BSLS,HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, NO, \ - LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, NO, \ - LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, RSFT, \ - LGUI, LALT, SPC, RALT, NO), - - - - /* Layer 3: Mouse mode (Semicolon) - * ,-----------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| | | - * |-----------------------------------------------------------| - * | \ |MwL|MwD|McU|MwU|MwR|MwL|MwD|MwU|MwR| | | | | - * |-----------------------------------------------------------| - * |Contro| |McL|McD|McR| |McL|McD|McU|McR|xxx| | | - * |-----------------------------------------------------------| - * |Shift | | |Mb1|Mb2|Mb3|Mb2|Mb1| | | |Shift | - * |-----------------------------------------------------------| - * |Ctrl | |Alt | Space |Alt | | | - * `-----' `---------------------------------------' `-----' - * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, NO, NO, \ - BSLS,WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, NO, \ - LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, NO, \ - LSFT,NO, NO, BTN1,BTN2,BTN3,BTN2,BTN1,NO, NO, NO, RSFT, \ - LGUI, LALT, BTN1, RALT, NO), - - - /* Layer 4: Matias half keyboard style (Space) - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete | - * |-----------------------------------------------------------| - * |Backs| P| O| I| U| Y| T| R| E| W| Q| | |Tab | - * |-----------------------------------------------------------| - * |Contro| ;| L| K| J| H| G| F| D| S| A|Con|Control | - * |-----------------------------------------------------------| - * |Shift | /| .| ,| M| N| B| V| C| X| Z|Shift | - * |-----------------------------------------------------------| - * |Ctrl | |Alt | Fn4 |Alt | | | - * `-----' `---------------------------------------' `-----' - */ - KEYMAP(MINS,0, 9, 8, 7, 6, 5, 4, 3, 2, 1, NO, NO, NO, ESC, \ - BSPC,P, O, I, U, Y, T, R, E, W, Q, NO, NO, TAB, \ - LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \ - LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT, \ - LGUI, LALT, FN4, RALT, NO), - -}; - - -uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) -{ - return KEYCODE(layer, row, col); -} - -uint8_t keymap_fn_layer(uint8_t index) -{ - return pgm_read_byte(&fn_layer[index]); -} - -uint8_t keymap_fn_keycode(uint8_t index) -{ - return pgm_read_byte(&fn_keycode[index]); -} diff --git a/keyboard/hbkb/led.c b/keyboard/hbkb/led.c deleted file mode 100644 index fc0eeb0ff7..0000000000 --- a/keyboard/hbkb/led.c +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ -} diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c deleted file mode 100644 index ee32312d9a..0000000000 --- a/keyboard/hbkb/matrix.c +++ /dev/null @@ -1,206 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -/* - * Happy Buckling Keyboard(IBM Model M mod) - * - * Pin usage: - * COL: PD0-7 - * ROW: PB0-7, PF4-7 - */ -#ifndef DEBOUNCE -# define DEBOUNCE 10 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -#ifdef MATRIX_HAS_GHOST -static bool matrix_has_ghost_in_row(uint8_t row); -#endif -static matrix_row_t read_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); - - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // JTAG disable for PORT F. write JTD bit twice within four cycles. - MCUCR |= (1<<JTD); - MCUCR |= (1<<JTD); - - // initialize rows - unselect_rows(); - - // initialize columns to input with pull-up(DDR:0, PORT:1) - DDRD = 0x00; - PORTD = 0xFF; - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - _delay_us(30); // without this wait read unstable value. - matrix_row_t cols = read_cols(); - if (matrix_debouncing[i] != cols) { - matrix_debouncing[i] = cols; - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); - } - debouncing = DEBOUNCE; - } - unselect_rows(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 01234567\n"); - for (uint8_t row = 0; row < matrix_rows(); row++) { - phex(row); print(": "); - pbin_reverse(matrix_get_row(row)); -#ifdef MATRIX_HAS_GHOST - if (matrix_has_ghost_in_row(row)) { - print(" <ghost"); - } -#endif - print("\n"); - } -} - -#ifdef MATRIX_HAS_GHOST -inline -static bool matrix_has_ghost_in_row(uint8_t row) -{ - // no ghost exists in case less than 2 keys on - if (((matrix[row] - 1) & matrix[row]) == 0) - return false; - - // ghost exists in case same state as other row - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - if (i != row && (matrix[i] & matrix[row])) - return true; - } - return false; -} -#endif - -inline -static matrix_row_t read_cols(void) -{ - return ~PIND; -} - -inline -static void unselect_rows(void) -{ - // Hi-Z(DDR:0, PORT:0) to unselect - DDRB &= ~0b11111111; - PORTB &= ~0b11111111; - DDRF &= ~0b11110000; - PORTF &= ~0b11110000; -} - -inline -static void select_row(uint8_t row) -{ - // Output low(DDR:1, PORT:0) to select - switch (row) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - DDRB |= (1<<row); - PORTB &= ~(1<<row); - break; - case 8: - DDRF |= (1<<4); - PORTF &= ~(1<<4); - break; - case 9: - case 10: - case 11: - DDRF |= (1<<(row-4)); - PORTF &= ~(1<<(row-4)); - break; - } -} diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile index d434246cef..b6c3b869e4 100644 --- a/keyboard/hhkb/Makefile +++ b/keyboard/hhkb/Makefile @@ -27,7 +27,7 @@ # make flip-ee = Download the eeprom file to the device, using Atmel FLIP # (must have Atmel FLIP installed). # -# make debug = Start either simulavr or avarice as specified for debugging, +# make debug = Start either simulavr or avarice as specified for debugging, # with avr-gdb or avr-insight as the front end for debugging. # # make filename.s = Just compile filename.c into the assembler code only. @@ -39,27 +39,30 @@ #---------------------------------------------------------------------------- # Target file name (without extension). -TARGET = hhkb_lufa +TARGET = hhkb_qmk + # Directory common source filess exist +TOP_DIR = ../.. TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . +# # project specific files +SRC = hhkb_qmk.c \ + matrix.c -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap_common.c \ - matrix.c \ - led.c +ifdef KEYMAP + SRC := keymaps/keymaps/$(KEYMAP).c $(SRC) +else + SRC := keymaps/default.c $(SRC) +endif CONFIG_H = config.h - # MCU name -# PJRC Teensy++ 2.0 -#MCU = at90usb1286 -# TMK Alt Controller or PJRC Teensy 2.0 +#MCU = at90usb1287 MCU = atmega32u4 # Processor frequency. @@ -95,66 +98,52 @@ ARCH = AVR8 # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. F_USB = $(F_CPU) -# Interrupt driven control endpoint task -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Boot Section Size in *bytes* # Teensy halfKay 512 # Teensy++ halfKay 1024 -# Atmel DFU loader 4096 (TMK Alt Controller) +# Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +#OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# as per original hasu settings +OPT_DEFS += -DBOOTLOADER_SIZE=512 # Build Options # comment out to disable the options. # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor -#HHKB_JP = yes # HHKB JP support +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +CUSTOM_MATRIX = yes # Custom matrix file for the HHKB +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +# MIDI_ENABLE = YES # MIDI controls +# UNICODE_ENABLE = YES # Unicode +# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID -#OPT_DEFS += -DNO_ACTION_TAPPING -#OPT_DEFS += -DNO_ACTION_LAYER -#OPT_DEFS += -DNO_ACTION_MACRO - - -# -# Keymap file -# -ifdef KEYMAP - SRC := keymaps/$(KEYMAP).c $(SRC) -else - ifdef HHKB_JP - SRC := keymaps/jp.c $(SRC) - else - SRC := keymaps/hhkb.c $(SRC) - endif -endif - - -ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP)))) - OPT_DEFS += -DHHKB_JP -endif +# Optimize size but this may cause error "relocation truncated to fit" +#EXTRALDFLAGS = -Wl,--relax # Search Path VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) VPATH += $(TMK_DIR) -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION debug-on: all debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) debug-off: all + +include $(TOP_DIR)/quantum/quantum.mk diff --git a/keyboard/hhkb/Makefile.jp b/keyboard/hhkb/Makefile.jp deleted file mode 100644 index e04dbb2424..0000000000 --- a/keyboard/hhkb/Makefile.jp +++ /dev/null @@ -1,2 +0,0 @@ -HHKB_JP = yes -include Makefile diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc deleted file mode 100644 index 403a8ec60a..0000000000 --- a/keyboard/hhkb/Makefile.pjrc +++ /dev/null @@ -1,68 +0,0 @@ -# -# Makefile for PJRC Teensy -# - - -# Target file name (without extension). -TARGET = hhkb_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap_common.c \ - matrix.c \ - led.c - -ifdef KEYMAP - SRC := keymaps/$(KEYMAP).c $(SRC) -else - SRC := keymaps/hasu.c $(SRC) -endif - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -#MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex - - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/hhkb/Makefile.rn42 b/keyboard/hhkb/Makefile.rn42 deleted file mode 100644 index a730442af0..0000000000 --- a/keyboard/hhkb/Makefile.rn42 +++ /dev/null @@ -1,155 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = hhkb_rn42 - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap_common.c \ - matrix.c \ - led.c - -CONFIG_H = config_rn42.h - - -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 (TMK Alt Controller) -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#NKRO_ENABLE = yes # USB Nkey Rollover -#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor -#HHKB_JP = yes # HHKB JP support - - -# -# Keymap file -# -ifdef KEYMAP - SRC := keymaps/$(KEYMAP).c $(SRC) -else - ifdef HHKB_JP - SRC := keymaps/jp.c $(SRC) - else - SRC := keymaps/hhkb.c $(SRC) - endif -endif - - -ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP)))) - OPT_DEFS += -DHHKB_JP -endif - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include rn42.mk -include $(TMK_DIR)/protocol.mk -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION -debug-on: all - -debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT -debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) -debug-off: all diff --git a/keyboard/hhkb/README.md b/keyboard/hhkb/README.md index e20c23d823..389407b3aa 100644 --- a/keyboard/hhkb/README.md +++ b/keyboard/hhkb/README.md @@ -1,102 +1,180 @@ -Alternative Controller for HHKB Pro -=================================== -I wanted to add some features like vi cursor and mouse keys to my [HHKB][HHKB] but its controller is not programmable and firmware source code is not open, of course. This means customizing this keyboard needs to replace original controller with programmable one. +hhkb_qmk keyboard firmware +====================== -This controller can work with HHKB **Professional**, **Professional** 2, **JP** and **Type-S**. +## Quantum MK Firmware -See [this thread][AltController] in geekhack.org. +You have access to a bunch of goodies! Check out the Makefile to enable/disable some of the features. Uncomment the `#` to enable them. Setting them to `no` does nothing and will only confuse future you. -[HHKB]: http://www.pfu.fujitsu.com/hhkeyboard/ -[AltController]: http://geekhack.org/index.php?topic=12047.0 + BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality + MIDI_ENABLE = yes # MIDI controls + # UNICODE_ENABLE = yes # Unicode support - this is commented out, just as an example. You have to use #, not // + BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID +## Quick aliases to common actions -## Update -* Bluetooth module RN-42 is supported.(2015/01) -* V-USB and iWRAP are no longer supported now, but still it'll works with a little fix. See not_supported directory.(2015/01) +Your keymap can include shortcuts to common operations (called "function actions" in tmk). +### Switching and toggling layers -##Features -* Customizable keymap -* More keymap layers(more Fn keys) -* Mouse keys -* USB NKRO -* Bluetooth(RN-42) +`MO(layer)` - momentary switch to *layer*. As soon as you let go of the key, the layer is deactivated and you pop back out to the previous layer. When you apply this to a key, that same key must be set as `KC_TRNS` on the destination layer. Otherwise, you won't make it back to the original layer when you release the key (and you'll get a keycode sent). You can only switch to layers *above* your current layer. If you're on layer 0 and you use `MO(1)`, that will switch to layer 1 just fine. But if you include `MO(3)` on layer 5, that won't do anything for you -- because layer 3 is lower than layer 5 on the stack. -See README of [tmk_keyboard] for more. +`LT(layer, kc)` - momentary switch to *layer* when held, and *kc* when tapped. Like `MO()`, this only works upwards in the layer stack (`layer` must be higher than the current layer). -[tmk_keyboard]: http://github.com/tmk/tmk_keyboard - -###Pros -* No risks: Everything is all reversible -* No need for PCB trace patching, case cutting or any other destructive mod -* Can keep original controller intact -* Can change all HHKB behavior as you like +`TG(layer)` - toggles a layer on or off. As with `MO()`, you should set this key as `KC_TRNS` in the destination layer so that tapping it again actually toggles back to the original layer. Only works upwards in the layer stack. + +### Fun with modifier keys + +* `LSFT(kc)` - applies left Shift to *kc* (keycode) - `S(kc)` is an alias +* `RSFT(kc)` - applies right Shift to *kc* +* `LCTL(kc)` - applies left Control to *kc* +* `RCTL(kc)` - applies right Control to *kc* +* `LALT(kc)` - applies left Alt to *kc* +* `RALT(kc)` - applies right Alt to *kc* +* `LGUI(kc)` - applies left GUI (command/win) to *kc* +* `RGUI(kc)` - applies right GUI (command/win) to *kc* + +You can also chain these, like this: + + LALT(LCTL(KC_DEL)) -- this makes a key that sends Alt, Control, and Delete in a single keypress. + +The following shortcuts automatically add `LSFT()` to keycodes to get commonly used symbols. Their long names are also available and documented in `/quantum/keymap_common.h`. + + KC_TILD ~ + KC_EXLM ! + KC_AT @ + KC_HASH # + KC_DLR $ + KC_PERC % + KC_CIRC ^ + KC_AMPR & + KC_ASTR * + KC_LPRN ( + KC_RPRN ) + KC_UNDS _ + KC_PLUS + + KC_LCBR { + KC_RCBR } + KC_PIPE | + KC_COLN : + +`MT(mod, kc)` - is *mod* (modifier key - MOD_LCTL, MOD_LSFT) when held, and *kc* when tapped. In other words, you can have a key that sends Esc (or the letter O or whatever) when you tap it, but works as a Control key or a Shift key when you hold it down. + +These are the values you can use for the `mod` in `MT()` (right-hand modifiers are not available): + + * MOD_LCTL + * MOD_LSFT + * MOD_LALT + * MOD_LGUI -###Cons -* Void your warranty -* Lose USB hub function of Pro2 +These can also be combined like `MOD_LCTL | MOD_LSFT` e.g. `MT(MOD_LCTL | MOD_LSFT, KC_ESC)` which would activate Control and Shift when held, and send Escape when tapped. -##DISCLAIMER -I'm not a professional of electronics nor MCU programming. This may damage your HHKB. -And my English writing is poor, I'm not sure I can convey my notions accurately. +We've added shortcuts to make common modifier/tap (mod-tap) mappings more compact: + * `CTL_T(kc)` - is LCTL when held and *kc* when tapped + * `SFT_T(kc)` - is LSFT when held and *kc* when tapped + * `ALT_T(kc)` - is LALT when held and *kc* when tapped + * `GUI_T(kc)` - is LGUI when held and *kc* when tapped + * `ALL_T(kc)` - is Hyper (all mods) when held and *kc* when tapped. To read more about what you can do with a Hyper key, see [this blog post by Brett Terpstra](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/) -##Documents -See [doc/HHKB.txt](doc/HHKB.txt) and files under [doc/](doc/) for internal of HHKB and this controller. +### Temporarily setting the default layer +`DF(layer)` - sets default layer to *layer*. The default layer is the one at the "bottom" of the layer stack - the ultimate fallback layer. This currently does not persist over power loss. When you plug the keyboard back in, layer 0 will always be the default. It is theoretically possible to work around that, but that's not what `DF` does. -##Build Firmware & Program -See [this document](../../doc/build.md) first. +### Remember: These are just aliases -### Configuration -If your target is **HHKB JP** you need to set `HHKB_JP` build option in `Makefile` or use `Makefile.jp` instead of `Makefile`. +These functions work the same way that their `ACTION_*` functions do - they're just quick aliases. To dig into all of the tmk ACTION_* functions, please see the [TMK documentation](https://github.com/jackhumbert/qmk_firmware/blob/master/tmk_core/doc/keymap.md#2-action). -If you use other than **TMK Alt Controller Board** set proper `MCU`, `BOOTLOADER_SIZE` and other build options in `Makefile` and `config.h`. At least PJRC Teensy requires changing `BOOTLOADER_SIZE` to 512. +Instead of using `FNx` when defining `ACTION_*` functions, you can use `F(x)` - the benefit here is being able to use more than 32 function actions (up to 4096), if you happen to need them. -### Build -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. Just `make` with `KEYMAP` option like: +## Macro shortcuts: Send a whole string when pressing just one key - $ make -f Makefile.<jp|pjrc|rn42> KEYMAP=(hasu|hhkb|spacefn|<name>) +Instead of using the `ACTION_MACRO` function, you can simply use `M(n)` to access macro *n* - *n* will get passed into the `action_get_macro` as the `id`, and you can use a switch statement to trigger it. This gets called on the keydown and keyup, so you'll need to use an if statement testing `record->event.pressed` (see keymap_default.c). -You can omit `-f` option when you use `Makefile`. `Makefile` is used for **Pro2 and Pro**, `Makefile.jp` fits for **JP** model and `Makefile.rn42` supports Bluetooth module **RN-42**. `Makefile.pjrc` uses **PJRC** as output protocol instead of **LUFA**. +```c +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. +{ + switch(id) { + case 0: // this would trigger when you hit a key mapped as M(0) + if (record->event.pressed) { + return MACRO( I(255), T(H), T(E), T(L), T(L), W(255), T(O), END ); // this sends the string 'hello' when the macro executes + } + break; + } + return MACRO_NONE; +}; +``` +A macro can include the following commands: + +* I() change interval of stroke in milliseconds. +* D() press key. +* U() release key. +* T() type key(press and release). +* W() wait (milliseconds). +* END end mark. + +So above you can see the stroke interval changed to 255ms between each keystroke, then a bunch of keys being typed, waits a while, then the macro ends. + +Note: Using macros to have your keyboard send passwords for you is a bad idea. + +### Additional keycode aliases for software-implemented layouts (Colemak, Dvorak, etc) + +Everything is assuming you're in Qwerty (in software) by default, but there is built-in support for using a Colemak or Dvorak layout by including this at the top of your keymap: + + #include "keymap_<layout>.h" + +Where <layout> is "colemak" or "dvorak". After including this line, you will get access to: + + * `CM_*` for all of the Colemak-equivalent characters + * `DV_*` for all of the Dvorak-equivalent characters + +These implementations assume you're using Colemak or Dvorak on your OS, not on your keyboard - this is referred to as a software-implemented layout. If your computer is in Qwerty and your keymap is in Colemak or Dvorak, this is referred to as a firmware-implemented layout, and you won't need these features. +To give an example, if you're using software-implemented Colemak, and want to get an `F`, you would use `CM_F` - `KC_F` under these same circumstances would result in `T`. -### Program -First, push reset button on board to start bootloader. +## Additional language support -This command programs the controller with [dfu-programmer] if the tool is installed and configured properly. +In `quantum/keymap_extras/`, you'll see various language files - these work the same way as the alternative layout ones do. Most are defined by their two letter country/language code followed by an underscore and a 4-letter abbreviation of its name. `FR_UGRV` which will result in a `ù` when using a software-implemented AZERTY layout. It's currently difficult to send such characters in just the firmware (but it's being worked on - see Unicode support). - $ make -f Makefile.<variant> KEYMAP=<name> dfu +## Unicode support -Or you can also use [FLIP] command to program. Also the tool should be installed and configured properly. FLIP GUI application is also available. +You can currently send 4 hex digits with your OS-specific modifier key (RALT for OSX with the "Unicode Hex Input" layout) - this is currently limited to supporting one OS at a time, and requires a recompile for switching. 8 digit hex codes are being worked on. The keycode function is `UC(n)`, where *n* is a 4 digit hexidecimal. Enable from the Makefile. - $ make -f Makefile.<variant> KEYMAP=<name> flip +## Other firmware shortcut keycodes -Use [Teensy Loader] if your controller is Teensy/Teensy++. +* `RESET` - puts the MCU in DFU mode for flashing new firmware (with `make dfu`) +* `DEBUG` - the firmware into debug mode - you'll need hid_listen to see things +* `BL_ON` - turns the backlight on +* `BL_OFF` - turns the backlight off +* `BL_<n>` - sets the backlight to level *n* +* `BL_INC` - increments the backlight level by one +* `BL_DEC` - decrements the backlight level by one +* `BL_TOGG` - toggles the backlight +* `BL_STEP` - steps through the backlight levels +Enable the backlight from the Makefile. -##Keymap -To define your own keymap create a file in the keymaps folder named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. +## MIDI functionalty +This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile. -##Hardware -You have some options for hardware. Development boards with USB AVR family(ATMega32U4, AT90USB1286) like Teensy will work while MegaAVR with [V-USB] library is also cheaper option for DIY. +## Bluetooth functionality -###1. TMK Alt Controller Board -Design files are available at [Keyboard Controller Board for HHKB(KiCad project)](https://github.com/tmk/HHKB_controller) and see [Controller Distribution thread](http://geekhack.org/index.php?topic=56494.0) if you get an assembled one. +This requires [some hardware changes](https://www.reddit.com/r/MechanicalKeyboards/comments/3psx0q/the_planck_keyboard_with_bluetooth_guide_and/?ref=search_posts), but can be enabled via the Makefile. The firmware will still output characters via USB, so be aware of this when charging via a computer. It would make sense to have a switch on the Bluefruit to turn it off at will. +## Building -###2. PJRC Teensy -See [this thread](http://geekhack.org/index.php?topic=57008.0). +Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Depending on which keymap you would like to use, you will have to compile slightly differently. -###3. V-USB version -See [V-USB controller for HHKB](doc/V-USB.md). +### Default +To build with the default keymap, simply run `make`. +### Other Keymaps +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a file in the keymaps folder named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. -[LUFA]: http://www.fourwalledcubicle.com/LUFA.php -[PJRC]: http://www.pjrc.com/teensy/usb_keyboard.html -[dfu-programmer]: http://dfu-programmer.sourceforge.net/ -[FLIP]: http://www.atmel.com/tools/FLIP.aspx -[Teensy Loader]: http://www.pjrc.com/teensy/loader.html -[V-USB]: http://www.obdev.at/products/vusb/index.html +To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: +``` +$ make KEYMAP=[default|jack|<name>] +``` +Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h index c0acc0a7ed..ee66e44571 100644 --- a/keyboard/hhkb/config.h +++ b/keyboard/hhkb/config.h @@ -1,5 +1,5 @@ /* -Copyright 2011 Jun Wako <wakojun@gmail.com> +Copyright 2012 Jun Wako <wakojun@gmail.com> 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 @@ -18,43 +18,43 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef CONFIG_H #define CONFIG_H +#include "config_common.h" +/* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED #define PRODUCT_ID 0xCAFE #define DEVICE_VER 0x0104 -#define MANUFACTURER t.m.k. +#define MANUFACTURER q.m.k #define PRODUCT HHKB mod -#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod +#define DESCRIPTION q.m.k keyboard firmware for HHKB - -/* matrix size */ -#ifdef HHKB_JP -# define MATRIX_ROWS 16 -#else -# define MATRIX_ROWS 8 -#endif +/* key matrix size */ +#define MATRIX_ROWS 8 #define MATRIX_COLS 8 +#define TAPPING_TERM 200 -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - +/* number of backlight levels */ +#define BACKLIGHT_LEVELS 3 -/* period of tapping(ms) */ -#define TAPPING_TERM 300 -/* tap count needed for toggling a feature */ -#define TAPPING_TOGGLE 5 -/* Oneshot timeout(ms) */ -#define ONESHOT_TIMEOUT 300 +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 -/* Boot Magic salt key: Space */ -#define BOOTMAGIC_KEY_SALT KC_SPACE +/* 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_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) /* * Feature disable options * These options are also useful to firmware size reduction. - */ +*/ + /* disable debug print */ //#define NO_DEBUG diff --git a/keyboard/hhkb/config_rn42.h b/keyboard/hhkb/config_rn42.h deleted file mode 100644 index 21e73f1c53..0000000000 --- a/keyboard/hhkb/config_rn42.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4242 -#define DEVICE_VER 0x0104 -#define MANUFACTURER t.m.k. -#define PRODUCT HHKB mod -#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod - - -/* matrix size */ -#ifdef HHKB_JP -# define MATRIX_ROWS 16 -#else -# define MATRIX_ROWS 8 -#endif -#define MATRIX_COLS 8 - - -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - - -/* period of tapping(ms) */ -#define TAPPING_TERM 300 -/* tap count needed for toggling a feature */ -#define TAPPING_TOGGLE 5 -/* Oneshot timeout(ms) */ -#define ONESHOT_TIMEOUT 300 - -/* Boot Magic salt key: Space */ -#define BOOTMAGIC_KEY_SALT KC_FN6 - -/* power control of key switch board */ -#define HHKB_POWER_SAVING - -/* - * Hardware Serial(UART) - * Baud rate are calculated with round off(+0.5). - */ -#ifdef __AVR_ATmega32U4__ - /* iom32u4.h has no definition of UCSR1D. copy from iom32u2.h */ - #define UCSR1D _SFR_MEM8(0xCB) - #define RTSEN 0 - #define CTSEN 1 - - #define SERIAL_UART_BAUD 115200 - #define SERIAL_UART_DATA UDR1 - #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) - #define SERIAL_UART_RXD_VECT USART1_RX_vect - #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) - #define SERIAL_UART_INIT() do { \ - UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ - UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \ - UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ - UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ - UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \ - UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS(no flow control by hardware) */ \ - DDRD |= (1<<5); PORTD &= ~(1<<5); /* RTS for flow control by firmware */ \ - sei(); \ - } while(0) - #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) - #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) -#else - #error "USART configuration is needed." -#endif - - -/* for debug */ -#define SUART_OUT_PORT PORTD -#define SUART_OUT_BIT 0 -#define SUART_IN_PIN PIND -#define SUART_IN_BIT 1 - - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboard/hhkb/doc/Bluetooth.txt b/keyboard/hhkb/doc/Bluetooth.txt deleted file mode 100644 index 24243aff86..0000000000 --- a/keyboard/hhkb/doc/Bluetooth.txt +++ /dev/null @@ -1,39 +0,0 @@ -HHKB Bluetooth mod -================== -See this article: -http://geekhack.org/showwiki.php?title=Island:20851 - - - -Power consume -============= -Switch board ------------- -5V -18mA full scan/no power control -16.5mA full scan with power control of POWER_ON/POWER_OFF in matrix.c -3.5-6mA 60ms watchdog timer sleep iwrap/main.c - -- the longer sleep time the less power is consumed. -- power control of swtich board must be needed. -FET switch may be better, though 18mA is with in port sink current limit. In current design switch board ground is connected to PB5 pin and power it on by making the pin low. - -Blueguiga WT12 --------------- -3.3V --42mA startup/searching/connecting -19-23mA connected -4mA -8mA not connected - -iWRAP sleep command may not work. to be looked into. - -Power Over all --------------- -5V --65mA startup -17-24mA idle/not connected --42mA connecting -32-37mA idle/connecting(with sleep) -50-53mA typing/connecting(no sleep) - -2013/06/07 diff --git a/keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg b/keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg Binary files differdeleted file mode 100644 index 2e5a25e81e..0000000000 --- a/keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB.txt b/keyboard/hhkb/doc/HHKB.txt deleted file mode 100644 index 3d08ceb0af..0000000000 --- a/keyboard/hhkb/doc/HHKB.txt +++ /dev/null @@ -1,204 +0,0 @@ -Internal of HHKB pro -===================== -HHKB pro has MCU and some chips on separate two PCBs. - -Controller PCB --------------- - M38K07M4 Renesas MCU with USB function - http://documentation.renesas.com/eng/products/mpumcu/rej03b0192_38k0ds.pdf - - (HHKB_controller.jpg) - -Keyswitch PCB -------------- - HC4051 Analog Multiplexer: select a row line. - http://www.ti.com/lit/ds/schs122j/schs122j.pdf - LS145 BCD Decoder: select a column line. - http://www.ti.com/lit/ds/symlink/sn74ls145.pdf - BU9831 Non-volatile electronic potentiometer: for calibration? - https://www.spezial.com/doc/rohm-a/bu9831.pdf - TP1683/4 Capacitive Sensing controller: no datasheet available. - - (HHKB_keyswitch.jpg) - - Topre original chip? - (HHKB_TP1684.jpg) - - -Connector Cable ---------------- -Two PCBs are connected by 15 lines(13 in case of Pro2). -Vcc and GND use 3(2) lines each, other lines are for keyboard signaling. - - HHKB connector lines: - JP Pro2 Pro Function Description TMK pin usage - -------------------------------------------------------------------------------------------- - 1 Vcc(5V) 5V - 1 1 2 Vcc(5V) 5V - 2 2 3 Vcc(5V) 5V - 3 3 4 TP1684 ~KEY: Low(0) when key is pressed PD7 input(with pullup) - 4 4 5 TP1684 HYS: High(1) when key is pressed PB7 output - 5 5 6 HC4051 A(bit0)\ PB0 output - 6 6 7 HC4051 B(bit1) > select row 0-7 PB1 output - 7 7 8 HC4051 C(bit2)/ PB2 output - 8 8 9 LS145 A(bit0)\ PB3 output - 9 9 10 LS145 B(bit1) > select column 0-7 PB4 output - 10 10 11 LS145 C(bit2)/ PB5 output - 11 11 12 LS145 ~D(enable) Low(0) enables selected column PB6 output - 12 12 13 GND GND - 13 13 14 GND GND - 15 GND - 14 HC4051(Z2) ~Enable of Z2 row0-7 PC6 - 15 HC4051(Z3) ~Enable of Z3 row8-15 PC7 - - NOTE: Probably HYS changes threshold for upstroke and makes hysteresis in the result. - NOTE: HYS should be given High(1) when previous KEY state is Low(0). - NOTE: 1KOhm didn't work as pullup resistor on KEY. AVR internal pullup or 10KOhm resistor was OK. - NOTE: JP has two HC4051(Z2,Z3) and line 5, 6 and 7 are connected to both of them. - - (HHKB_connector.jpg) - - -Keyswitch matrix ----------------- -HHKB switch matrix is ghost-free and bounce-free. - - Pro/Pro2(8x8): - COL 0 1 2 3 4 5 6 7 - ROW --------------------------------------------------------------- - 0| 2 q w s a z x c - 1| 3 4 r e d f v b - 2| 5 6 y t g h n _NONE_ - 3| 1 Esc Tab Control LShift LAlt LMeta Space - 4| 7 8 u i k j m _NONE_ - 5| \ ` Delete Return Fn RShift RAlt RMeta - 6| 9 0 o p ; l , _NONE_ - 7| - + ] [ ' / . _NONE_ - - - JP(16x8): - COL 0 1 2 3 4 5 6 7 - ROW --------------------------------------------------------------- - 0| ESC TAB LFn LShift LCtrl - 1| 4 E MuHKN C D - 2| 3 W LAlt X S - 3| 1 HHK - 4| - 5| 5 R V F - 6| 2 Q LGui Z A - 7| 6 T Space B G - 8| 9 I Kana , K - 9| 8 U Henkan M J - A| 7 Y N H - B| 0 O RAlt . L - C| BS Right RShift Enter - D| \ [ Down Up ] - E| - P RFn / ; - F| ~ @ Left Ro : - - -Matrix diagram: - - Pro/Pro2: - +-------------------------+-+-+-+-+-+-+-+ Vcc - |bias control? - - - - - - - - --- - | 3.9K*8 R R R R R R R R | - +--------^+ +--------+ - - - - - - - - | - | 2| | HC4051 <0-------|-|-|-|-|-|-|-|--|R|-+ - | |capa. | <1-------|-|-|-|-|-|-|-|--|R|-+ - | TP1684 |sense | <2-------|-|-|-|-|-|-|-|--|R|-+ - | 11<------| <3-------|-|-|-|-|-|-|-|--|R|-+ - | | | <4-------|-|-|-|-|-|-|-|--|R|-+ - | | | <5-------|-|-|-|-|-|-|-|--|R|-+ - | <-+ | <6-------|-|-|-|-|-|-|-|--|R|-+ - | 1 4 | | | <7-------|-|-|-|-|-|-|-|--|R|-+ - +---V---^-+ | +-^-^-^--+ 0 1 2 3 4 5 6 7 33K*8 - KEY HYS | A B C +-----------------+ - | | +-^----+ | | | | LS145 | - Vcc | | |BU9831| | | | +-^--^--^--^------+ - --- | | +------+ | | | A B C D +-------+ - | | | | | | | | | | | | - 1-3 4 5 6 7 8 9 10 11 12 13-15 Pro | - 1-2 3 4 5 6 7 8 9 10 11 12-13 Pro2| - +--------------------------------------------------+ | - | connector | --- - +--------------------------------------------------+ GND - - - JP: - +-----------------------------+-+-+-+-+ Vcc - |bias control? - - - - - --- - | 3.9K*5 R R R R R | - +--------^+ +--------+ - - - - - | - | | | HC4051 <0-----------|-|-|-|-|----|R|-+ - | |capa. | Z2 <1-----------|-|-|-|-|----|R|-+ - | TP1684 |sense | <2-----------|-|-|-|-|----|R|-+ - | <---+--| <3-----------|-|-|-|-|----|R|-+ - | | | | <4-----------|-|-|-|-|----|R|-+ - | | ~En| <5-----------|-|-|-|-|----|R|-+ - | | +----> <6-----------|-|-|-|-|----|R|-+ - | | | | | A B C <7-----------|-|-|-|-|----|R|-+ - +---V---^-+ | | +-^-^-^--+ | | | | | | - KEY HYS | | | | | | | | | | | - | | | | +--------+ | | | | | | - | | | | | HC4051 <8-----------|-|-|-|-|----|R|-+ - | | | | | Z3 <9-----------|-|-|-|-|----|R|-+ - | | | +--| <A-----------|-|-|-|-|----|R|-+ - | | | | <B-----------|-|-|-|-|----|R|-+ - | | | | <C-----------|-|-|-|-|----|R|-+ - | | | ~En| <D-----------|-|-|-|-|----|R|-+ - | | | +-> <E-----------|-|-|-|-|----|R|-+ - | | | | | A B C <F-----------|-|-|-|-|----|R|-+ - | | | | +-^-^-^--+ 0 1 2 3 4 5 6 7 33K*8 - | | | | | | | +-----------------+ - | | | | | | | | LS145 | - Vcc | | | | | | | +-^--^--^--^------+ - --- | | | | | | | A B C D +-------+ - | | | | | | | | | | | | | | - 1-2 3 4 14 15 5 6 7 8 9 10 11 12-13 | - +--------------------------------------------------+ | - | connector | --- - +--------------------------------------------------+ GND - - -Signals charts --------------- - While pressing space bar, watched HHKB Pro original controller signals by logic analyzer. - Row and column is looping between 0-7 each for selecting a key. - A key is scaned every about 15ms, so scan rate is 66Hz. - - (HHKB_chart1.jpg) - - Space bar locate at ROW:3 COL:7. A key is selected by HC4051(C,B,A) and LS145(C,B,A). - Key state can be read on TP1684(4/KEY) while asserting low on LS145(D). - - (HHKB_chart2.jpg) - - - Signal of JP: - - 1) Select row - rowC ____~~~~____~~~~ 3.8/3.8ms(JP) 7.7/7.7ms(Pro) S2 of HC4051 - rowB __~~__~~__~~__~~ 1.9/1.9ms(JP) 3.8/3.8ms(Pro) S1 of HC4051 - rowA _~_~_~_~_~_~_~_~ 1.0/1.0ms(JP) 1.9/1.9ms(Pro) S0 of HC4051 - 0123456701234567 selected row(Pro) - 0123456789ABCDEF selected row(JP) - rowEn0 ________~~~~~~~~ 7.7/7.7ms(JP only) ~Enable of Z2 HC4051(JP only) - rowEn1 ~~~~~~~~________ 7.7/7.7ms(JP only) ~Enable of Z3 HC4051(JP only) - - 2) Select column - colC ____~~~~____~~~~ 550/410us(JP) / us(Pro) - colB __~~__~~__~~__~~ 200/210us(JP) 450/460us(Pro) - colA _~_~_~_~_~_~_~_~ 100/110us(JP) 220/230us(Pro) - 0123456701234567 selected column - - 3) Wait 5us after column select, then set prev, strobe colD to spit out key status and read it. - hys _~~~~_____ 20us if previous key state is low - colD ~~~__~~~~~ 10us strobe - key ~~~____~~~ 22us indicates current state of the key - - NOTE: JP scans twice fast as Pro/Pro2 does. So Pro/Pro2 scans 8x8 matrix in 15.4ms while JP scans 16x8 in that time. - - - -EOF diff --git a/keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg b/keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg Binary files differdeleted file mode 100644 index 0a03164094..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg b/keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg Binary files differdeleted file mode 100644 index 1f09bd185c..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg b/keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg Binary files differdeleted file mode 100644 index 45f5ada905..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg b/keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg Binary files differdeleted file mode 100644 index e8a09e9b28..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg b/keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg Binary files differdeleted file mode 100644 index e3dae8e86c..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg b/keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg Binary files differdeleted file mode 100644 index 3afc269e7b..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/connector_contact.jpg b/keyboard/hhkb/doc/HHKB_img/connector_contact.jpg Binary files differdeleted file mode 100644 index 5304bc8d7e..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/connector_contact.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg b/keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg Binary files differdeleted file mode 100644 index f1b438ae77..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/probe_contact.jpg b/keyboard/hhkb/doc/HHKB_img/probe_contact.jpg Binary files differdeleted file mode 100644 index dc79afa0cc..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/probe_contact.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/teensy_install.jpg b/keyboard/hhkb/doc/HHKB_img/teensy_install.jpg Binary files differdeleted file mode 100644 index 873d988edb..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/teensy_install.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg b/keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg Binary files differdeleted file mode 100644 index 1c4eb67434..0000000000 --- a/keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg +++ /dev/null diff --git a/keyboard/hhkb/doc/HHKB_keycodes.txt b/keyboard/hhkb/doc/HHKB_keycodes.txt deleted file mode 100644 index 9ec85901e0..0000000000 --- a/keyboard/hhkb/doc/HHKB_keycodes.txt +++ /dev/null @@ -1,69 +0,0 @@ -HHKB keycodes -============= -2015/10/03 -Looked into unclear keycodes(usages) of Fn-chording-key on HHKB. -Followings are usages of Keyboard/Keypad Page(0x07) that HHKB spits out when Fn key is down. - -## HHK mode(Off-Off) - Key Usage - ------------------------ - ⌘ / ◇ 0x78 Stop - -## Lite Ext. mode(On-Off) - - -## Mac mode(Off-On) - Key Usage - ------------------------ - Esc 0x66 Power - A 0x81 Volume Down - S 0x80 Volume Up - D 0x7F Mute - F 0x6F F20 - Delete 0x53 Num Lock and Clear - - -## Secret mode(On-On) - Key Usage - ------------------------ - Esc 0x66 Power - Q 0x78 Stop - W 0x7E Find - E 0x74 Execute - R 0x77 Select - T 0x76 Menu - Y 0x75 Help - Z 0x7A Undo - X 0x7B Cut - C 0x7C Copy - V 0x7D Paste - B 0x79 Again - - -## Matrix Key-Mode - - - Mode - ------------------------------- - Key HHK Lite Mac Secret Desc - --------------------------------------------------------------------------------------- - ⌘ / ◇ 0x78 - - - Stop - Esc - - 0x66 0x66 Power - A - - 0x81 - Volume Down - S - - 0x80 - Volume Up - D - - 0x7F - Mute - F - - 0x6F - F20 - Delete 0x2A 0x2A 0x53 0x2A Num Lock and Clear(0x53)/Backspace(0x2A) - Q - - - 0x78 Stop - W - - - 0x7E Find - E - - - 0x74 Execute - R - - - 0x77 Select - T - - - 0x76 Menu - Y - - - 0x75 Help - Z - - - 0x7A Undo - X - - - 0x7B Cut - C - - - 0x7C Copy - V - - - 0x7D Paste - B - - - 0x79 Again - -EOF diff --git a/keyboard/hhkb/doc/Power.txt b/keyboard/hhkb/doc/Power.txt deleted file mode 100644 index 1287053c3c..0000000000 --- a/keyboard/hhkb/doc/Power.txt +++ /dev/null @@ -1,48 +0,0 @@ -HHKB Power consumption ----------------------- - -**Power consumption - board clock/prescaler keyswitch power ctrl current - -------------------------------------------------------------------------- - tmk 16MHz no no 26.4mA - tmk 16MHz pro1 no 45.1mA - tmk 16MHz/2 no no 18.1mA - tmk 16MHz/2 pro1 no 37.3mA - tmk 8MHz no no 18.9mA - tmk 8MHz pro2 no(w/o FET) 32.1mA - tmk 8MHz pro2 no(w FET) 32.1mA withou POWER_ON/FF - tmk 8MHz pro2 no(w FET) 32.6mA with POWR_ON/OFF - tmk 8MHz pro2 15ms(w FET) 21.3mA with POWR_ON/OFF, enumerated but error -32 - tmk 8MHz pro2 60ms(w FET) 13.3mA with POWR_ON/OFF, not enumerated - - gh60 16MHz 25.8mA - gh60 16MHz USB suspend w LED breathing 17.6-29.1mA - gh60 16MHz USB suspend w/o LED 0.2mA(0.231-0.276mA) - Poker 5.6mA - Poker USB suspend 0.3mA(0.301mA) - gh60 16MHz stock firmware by komar 26.8mA - - - HHKB pro2 Over All 139.4mA - HHKB pro2 Controller 115.1mA - HHKB pro1 Controller 25.9mA - - -keyswitch power consumption: -pro1: 45.1-26.4=18.7mA - 37.3-18.1=19.2mA -pro2: 32.1-18.9=13.2mA - - - - - -**Low Freq Crystal or Prescaler? -No advantage of Low Freq Crystal against Prescaled. - -Clock routing -X'tal --+---->Prescaler-------> System Clock - | - +---------------------> USB PLL - -Design Decision: Install 16MHz crystal on board with using clock rescaler. diff --git a/keyboard/hhkb/doc/V-USB.md b/keyboard/hhkb/doc/V-USB.md deleted file mode 100644 index 7ae86f452f..0000000000 --- a/keyboard/hhkb/doc/V-USB.md +++ /dev/null @@ -1,39 +0,0 @@ -V-USB controller for HHKB -========================= -Not supported actively any more. - -## Build -Use `Makefile.vusb` for [V-USB] controller. - $ make -f Makefile.vusb - -##Hardware -###3. V-USB connection - +---+ +---------------+ - USB GND | | ATmega328p | - ~~~ C3 | | - 5V <-------+--------+---|Vcc,AVCC | HHKB pro pro2 - R1 | | ~~~~~~~~ ~~~~ - D- <----+--+-----R2-----|INT1 PB2-4|------->ROW (6-8) (5-7) - D+ <----|---+----R3-----|INT0 PC0-2|------->COL (9-11) (8-10) - Z1 Z2 | PC3|------->ENABLE (12) (11) - GND<----+---+-----------|GND PB0|<-------KEY (4) (3) - | PB1|------->PREV (5) (4) - | | - GND+-C2--+--|XTAL1 RXD|------->Debug Console - X1 | TXD|<-------Debug Console - GND+-C3--+--|XTAL2 RST|---SW--+GND - +---------------+ - R1: 1.5K Ohm - R2,R3: 68 Ohm - Z1,Z2: Zener 3.6V - C1,C2: 22pF - C3: 0.1uF - X1: Crystal 12MHz - SW: Push Switch(for bootloader) - -- NOTE: See [V-USB] documentation for more detail of hardware and the USB stack. -- NOTE: [USBaspLoader] is very useful for firmware update. - - -[V-USB]: http://www.obdev.at/products/vusb/index.html -[USBaspLoader]: http://www.obdev.at/products/vusb/usbasploader.html diff --git a/keyboard/hhkb_qmk/hhkb_qmk.c b/keyboard/hhkb/hhkb_qmk.c index 36dc3f29db..36dc3f29db 100644 --- a/keyboard/hhkb_qmk/hhkb_qmk.c +++ b/keyboard/hhkb/hhkb_qmk.c diff --git a/keyboard/hhkb_qmk/hhkb_qmk.h b/keyboard/hhkb/hhkb_qmk.h index 1bac33c2de..1bac33c2de 100644 --- a/keyboard/hhkb_qmk/hhkb_qmk.h +++ b/keyboard/hhkb/hhkb_qmk.h diff --git a/keyboard/hhkb/keymap_common.c b/keyboard/hhkb/keymap_common.c deleted file mode 100644 index e938fb6270..0000000000 --- a/keyboard/hhkb/keymap_common.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include <stdint.h> -#include "action.h" -#include <avr/pgmspace.h> -#include "keymap_common.h" - - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} diff --git a/keyboard/hhkb/keymap_common.h b/keyboard/hhkb/keymap_common.h deleted file mode 100644 index 3622665f3a..0000000000 --- a/keyboard/hhkb/keymap_common.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include <stdint.h> -#include <stdbool.h> -#include "keycode.h" -#include "action.h" -#include "action_code.h" -#include "action_layer.h" -#include "action_macro.h" -#include "action_util.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - - -#define KEYMAP( \ - K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ - K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ - K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ - K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ - K35, K36, K37, K57, K56 \ -) \ -{ \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \ - { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \ - { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \ - { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \ - { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \ -} - - -#define KEYMAP_JP( \ - K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \ - K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \ - K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \ - K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \ - K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4 \ -) \ -{ \ - { KC_NO, KC_NO, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_NO }, \ - { KC_NO, KC_NO, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO }, \ - { KC_NO, KC_NO, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \ - { KC_NO, KC_NO, KC_##K32, KC_NO, KC_##K34, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_##K52, KC_##K53, KC_NO, KC_##K55, KC_##K56, KC_NO }, \ - { KC_NO, KC_NO, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \ - { KC_NO, KC_NO, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO }, \ - { KC_NO, KC_NO, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_NO }, \ - { KC_NO, KC_NO, KC_##K92, KC_##K93, KC_##K94, KC_##K95, KC_##K96, KC_NO }, \ - { KC_NO, KC_NO, KC_##KA2, KC_##KA3, KC_NO, KC_##KA5, KC_##KA6, KC_NO }, \ - { KC_NO, KC_NO, KC_##KB2, KC_##KB3, KC_##KB4, KC_##KB5, KC_##KB6, KC_NO }, \ - { KC_NO, KC_NO, KC_##KC2, KC_NO, KC_##KC4, KC_##KC5, KC_##KC6, KC_NO }, \ - { KC_NO, KC_NO, KC_##KD2, KC_##KD3, KC_##KD4, KC_##KD5, KC_##KD6, KC_NO }, \ - { KC_NO, KC_NO, KC_##KE2, KC_##KE3, KC_##KE4, KC_##KE5, KC_##KE6, KC_NO }, \ - { KC_NO, KC_NO, KC_##KF2, KC_##KF3, KC_##KF4, KC_##KF5, KC_##KF6, KC_NO } \ -} - -#endif diff --git a/keyboard/hhkb_qmk/keymaps/default.c b/keyboard/hhkb/keymaps/default.c index bcd8ead377..bcd8ead377 100644 --- a/keyboard/hhkb_qmk/keymaps/default.c +++ b/keyboard/hhkb/keymaps/default.c diff --git a/keyboard/hhkb/keymaps/hasu.c b/keyboard/hhkb/keymaps/hasu.c deleted file mode 100644 index a5602ded31..0000000000 --- a/keyboard/hhkb/keymaps/hasu.c +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Hasu: my personal keymap - */ -#include "keymap_common.h" - - -#ifdef KEYMAP_SECTION_ENABLE -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { -#else -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { -#endif - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs| - * |-----------------------------------------------------------| - * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Fn6 | - * |-----------------------------------------------------------| - * |Fn7 | Z| X| C| V| B| N| M| ,| .|Fn2|Shift |Fn1| - * `-----------------------------------------------------------' - * |Gui|Alt | Fn4 |Fn5 |Gui| - * `-------------------------------------------' - */ - [0] = \ - KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \ - LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,FN6, \ - FN7, Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,FN1, \ - LGUI,LALT, FN4, FN5, RGUI), - - /* Layer 1: HHKB mode[HHKB Fn] - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | |Backs| - * |-----------------------------------------------------------| - * |Contro|VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter | - * |-----------------------------------------------------------| - * |Shift | | | | | | +| -|End|PgD|Dow|Shift | | - * `-----------------------------------------------------------' - * |Gui|Alt | Space |Alt |Gui| - * `-------------------------------------------' - */ - [1] = \ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS, UP, NO, BSPC, \ - LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \ - LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,TRNS, \ - LGUI,LALT, TRNS, RALT,RGUI), - - /* Layer 2: Vi mode[Slash] - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Tab |Hom|PgD|Up |PgU|End|Hom|PgD|PgUlEnd| | | |Backs| - * |-----------------------------------------------------------| - * |Contro| |Lef|Dow|Rig| |Lef|Dow|Up |Rig| | |Return | - * |-----------------------------------------------------------| - * |Shift | | | | | |Hom|PgD|PgUlEnd|Fn0|Shift | | - * `-----------------------------------------------------------' - * |Gui|Alt | Space |Alt |Gui| - * `-------------------------------------------' - */ - [2] = \ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - TAB, HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, BSPC, \ - LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, \ - LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, RSFT,TRNS, \ - LGUI,LALT, SPC, RALT,RGUI), - - /* Layer 3: Mouse mode(IJKL)[Semicolon] - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Tab | | | | | |MwL|MwD|McU|MwU|MwR|Wbk|Wfr|Alt-T| - * |-----------------------------------------------------------| - * |Contro| | | | | |Mb2|McL|McD|McR|Fn | |Return | - * |-----------------------------------------------------------| - * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | | - * `-----------------------------------------------------------' - * |Gui |Alt | Mb1 |Fn |Fn | - * `--------------------------------------------' - * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel - */ - [3] = \ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - FN8, NO, NO, NO, NO, NO, WH_L,WH_D,MS_U,WH_U,WH_R,FN9, FN10,FN8, \ - LCTL,ACL0,ACL1,ACL2,ACL2,NO, NO, MS_L,MS_D,MS_R,FN3, NO, ENT, \ - LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,TRNS, \ - LGUI,LALT, BTN1, TRNS,TRNS), - - /* Layer 4: Mouse mode(IJKL)[Space] - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Tab | | | | | |MwL|MwD|McU|MwU|MwR|Wbk|Wfr|Alt-T| - * |-----------------------------------------------------------| - * |Contro| | | | | |Mb2|McL|McD|McR|Mb1| |Return | - * |-----------------------------------------------------------| - * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | | - * `-----------------------------------------------------------' - * |Gui |Alt | Mb1 |Fn |Fn | - * `--------------------------------------------' - * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel - */ - [4] = \ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - FN8, NO, NO, NO, NO, NO, WH_L,WH_D,MS_U,WH_U,WH_R,BTN4,BTN5,FN8, \ - LCTL,VOLD,VOLU,MUTE,NO, NO, NO, MS_L,MS_D,MS_R,BTN1,NO, ENT, \ - LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,TRNS, \ - LGUI,LALT, TRNS, TRNS,TRNS), - -#if 0 - /* Layer 3: Mouse mode(HJKL)[Semicolon] - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Tab | | | | | |MwL|MwD|MwU|MwR| | | |Backs| - * |-----------------------------------------------------------| - * |Contro| | | | | |McL|McD|McU|McR|Fn0| |Return | - * |-----------------------------------------------------------| - * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | | - * `-----------------------------------------------------------' - * |Gui |Alt | Mb1 |Alt |Fn0| - * `--------------------------------------------' - * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - TAB, NO, NO, NO, NO, NO, NO, WH_D,WH_U,RGHT,NO, NO, NO, BSPC, \ - LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,TRNS,QUOT,ENT, \ - LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,SLSH,RSFT,NO, \ - LGUI,LALT, BTN1, RALT,TRNS), - - /* Layer4: Mouse mode(HJKL)[Space] - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Tab | | | | | |MwL|MwD|MwU|MwR| |Wbk|Wfr|Alt-T| - * |-----------------------------------------------------------| - * |Contro| | | | | |McL|McD|McU|McR|Fn0| |Return | - * |-----------------------------------------------------------| - * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | | - * `-----------------------------------------------------------' - * |Gui |Alt | Fn0 |Alt |Fn0| - * `--------------------------------------------' - * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - FN8, NO, NO, NO, NO, NO, NO, WH_D,WH_U,RGHT,NO, FN9, FN10,FN8, \ - LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,BTN1,NO, ENT, \ - LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \ - LGUI,LALT, TRNS, RALT,RGUI), -#endif -#if 0 - /* Layer x: Matias half-qwerty keyboard style[Space] - * ,-----------------------------------------------------------. - * | -| 0| 9| 8| 7| 6| 5| 4| 3| 2| 1| | | |Esc| - * |-----------------------------------------------------------| - * |Backs| P| O| I| U| Y| T| R| E| W| Q| | |Tab | - * |-----------------------------------------------------------| - * |Contro| ;| L| K| J| H| G| F| D| S| A|Con|Control | - * |-----------------------------------------------------------| - * |Shift | /| .| ,| M| N| B| V| C| X| Z|Shift | | - * `-----------------------------------------------------------' - * |Gui |Alt | Fn0 |Alt |Gui| - * `--------------------------------------------' - */ - KEYMAP(MINS,0, 9, 8, 7, 6, 5, 4, 3, 2, 1, NO, NO, NO, ESC, \ - BSPC,P, O, I, U, Y, T, R, E, W, Q, NO, NO, TAB, \ - LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \ - LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT,NO, \ - LGUI,LALT, TRNS, RALT,RGUI), -#endif -}; - - - -/* id for user defined functions */ -enum function_id { - LSHIFT_LPAREN, -}; - -enum macro_id { - HELLO, - VOLUP, - ALT_TAB, -}; - - -/* - * Fn action definition - */ -#ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { -#else -const uint16_t fn_actions[] PROGMEM = { -#endif - [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used) - [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps) - [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash* - [3] = ACTION_LAYER_TAP_KEY(3, KC_SCLN), // Mousekey layer with Semicolon* - [4] = ACTION_LAYER_TAP_KEY(4, KC_SPC), // Mousekey layer with Space - [5] = ACTION_LAYER_MOMENTARY(4), // Mousekey layer(IJKL) - [6] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT), // RControl with tap Enter - [7] = ACTION_MODS_ONESHOT(MOD_LSFT), // Oneshot Shift - [8] = ACTION_MACRO(ALT_TAB), // Application switching - [9] = ACTION_MODS_KEY(MOD_LALT, KC_LEFT), - [10] = ACTION_MODS_KEY(MOD_LALT, KC_RIGHT), - -// [x] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_BSPC), // LControl with tap Backspace -// [x] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_ESC), // LControl with tap Esc -// [x] = ACTION_FUNCTION_TAP(LSHIFT_LPAREN), // Function: LShift with tap '(' -// [x] = ACTION_MACRO(HELLO), // Macro: say hello -// [x] = ACTION_MACRO(VOLUP), // Macro: media key -}; - - -/* - * Macro definition - */ -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch (id) { - case HELLO: - return (record->event.pressed ? - MACRO( I(0), T(H), T(E), T(L), T(L), W(255), T(O), END ) : - MACRO_NONE ); - case VOLUP: - return (record->event.pressed ? - MACRO( D(VOLU), U(VOLU), END ) : - MACRO_NONE ); - case ALT_TAB: - return (record->event.pressed ? - MACRO( D(LALT), D(TAB), END ) : - MACRO( U(TAB), END )); - } - return MACRO_NONE; -} - - - -/* - * user defined action function - */ -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - if (record->event.pressed) dprint("P"); else dprint("R"); - dprintf("%d", record->tap.count); - if (record->tap.interrupted) dprint("i"); - dprint("\n"); - - switch (id) { - case LSHIFT_LPAREN: - // Shift parentheses example: LShft + tap '(' - // http://stevelosh.com/blog/2012/10/a-modern-space-cadet/#shift-parentheses - // http://geekhack.org/index.php?topic=41989.msg1304899#msg1304899 - if (record->event.pressed) { - if (record->tap.count > 0 && !record->tap.interrupted) { - if (record->tap.interrupted) { - dprint("tap interrupted\n"); - register_mods(MOD_BIT(KC_LSHIFT)); - } - } else { - register_mods(MOD_BIT(KC_LSHIFT)); - } - } else { - if (record->tap.count > 0 && !(record->tap.interrupted)) { - add_weak_mods(MOD_BIT(KC_LSHIFT)); - send_keyboard_report(); - register_code(KC_9); - unregister_code(KC_9); - del_weak_mods(MOD_BIT(KC_LSHIFT)); - send_keyboard_report(); - record->tap.count = 0; // ad hoc: cancel tap - } else { - unregister_mods(MOD_BIT(KC_LSHIFT)); - } - } - break; - } -} diff --git a/keyboard/hhkb/keymaps/hhkb.c b/keyboard/hhkb/keymaps/hhkb.c deleted file mode 100644 index 86ad0f5eee..0000000000 --- a/keyboard/hhkb/keymaps/hhkb.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * HHKB Layout - */ -#include "keymap_common.h" - - -#ifdef KEYMAP_SECTION_ENABLE -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { -#else -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { -#endif - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs| - * |-----------------------------------------------------------| - * |Contro| A| S| D| F| G| H| J| K| L| ;| '|Enter | - * |-----------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0| - * `-----------------------------------------------------------' - * |Alt|Gui | Space |Gui |Alt| - * `-------------------------------------------' - */ - KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \ - LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,ENT, \ - LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,FN0, \ - LALT,LGUI, SPC, RGUI,RALT), - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | |Backs| - * |-----------------------------------------------------------| - * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter | - * |-----------------------------------------------------------| - * | | | | | | | +| -|End|PgD|Dow| | | - * `-----------------------------------------------------------' - * | | | | | | - * `-------------------------------------------' - */ - KEYMAP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, BSPC, \ - TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,PENT, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS, \ - TRNS,TRNS, TRNS, TRNS,TRNS), -}; - - - -/* - * Fn action definition - */ -#ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_LAYER_MOMENTARY(2), - [2] = ACTION_LAYER_MOMENTARY(3), - [3] = ACTION_LAYER_MOMENTARY(4), - [4] = ACTION_LAYER_MOMENTARY(5), - [5] = ACTION_LAYER_MOMENTARY(6), - [6] = ACTION_LAYER_MOMENTARY(7), - [7] = ACTION_LAYER_TOGGLE(1), - [8] = ACTION_LAYER_TOGGLE(2), - [9] = ACTION_LAYER_TOGGLE(3), - [10] = ACTION_LAYER_TAP_TOGGLE(1), - [11] = ACTION_LAYER_TAP_TOGGLE(2), - [12] = ACTION_LAYER_TAP_TOGGLE(3), - [13] = ACTION_LAYER_TAP_KEY(1, KC_A), - [14] = ACTION_LAYER_TAP_KEY(2, KC_F), - [15] = ACTION_LAYER_TAP_KEY(3, KC_J), - [16] = ACTION_LAYER_TAP_KEY(4, KC_SPACE), - [17] = ACTION_LAYER_TAP_KEY(5, KC_SCOLON), - [18] = ACTION_LAYER_TAP_KEY(6, KC_QUOTE), - [19] = ACTION_LAYER_TAP_KEY(7, KC_SLASH), - [20] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPACE), - [21] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_SPACE), - [22] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_QUOTE), - [23] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENTER), - [24] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_ESC), - [25] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_BSPACE), - [26] = ACTION_MODS_ONESHOT(MOD_LCTL), - [27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC), - [28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE), - [29] = ACTION_MODS_ONESHOT(MOD_LSFT), - [30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ESC), - [31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSPACE), -}; -#else -const uint16_t fn_actions[] PROGMEM = { - [0] = ACTION_LAYER_MOMENTARY(1), -}; -#endif diff --git a/keyboard/hhkb/keymaps/jp.c b/keyboard/hhkb/keymaps/jp.c deleted file mode 100644 index 48d0ee70ba..0000000000 --- a/keyboard/hhkb/keymaps/jp.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * HHKB JP Layout - */ -#include "keymap_common.h" - - -#ifdef KEYMAP_SECTION_ENABLE -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { -#else -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { -#endif - /* Layer 0: Default Layer */ - KEYMAP_JP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, \ - LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,BSLS,ENT, \ - LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RO, UP, RSFT, \ - FN0, ZKHK,LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,FN0, LEFT,DOWN,RGHT), - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | - * |------------------------------------------------------` | - * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | | - * |-----------------------------------------------------------| - * | | | | | | | +| -|End|PgD|Dow| | | | - * |-----------------------------------------------------------| - * | || | | | | | | | | || | | | - * `-----------------------------------------------------------' - */ - KEYMAP_JP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, \ - TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,TRNS,PENT, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS), -}; - - - -/* - * Fn action definition - */ -#ifdef KEYMAP_SECTION_ENABLE -const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { -#else -const uint16_t fn_actions[] PROGMEM = { -#endif - [0] = ACTION_LAYER_MOMENTARY(1), -}; diff --git a/keyboard/hhkb_qmk/keymaps/lxol.c b/keyboard/hhkb/keymaps/lxol.c index 3256fda516..3256fda516 100644 --- a/keyboard/hhkb_qmk/keymaps/lxol.c +++ b/keyboard/hhkb/keymaps/lxol.c diff --git a/keyboard/hhkb/keymaps/spacefn.c b/keyboard/hhkb/keymaps/spacefn.c deleted file mode 100644 index deff920ae2..0000000000 --- a/keyboard/hhkb/keymaps/spacefn.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * SpaceFN - * http://geekhack.org/index.php?topic=51069.0 - */ -#include "keymap_common.h" - - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `|BSp| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| - * |-----------------------------------------------------------| - * |Contro| A| S| D| F| G| H| J| K| L| ;| '|Enter | - * |-----------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0| - * `-----------------------------------------------------------' - * |Gui|Alt | SpaceFN |Alt |Gui| - * `-------------------------------------------' - */ - KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, GRV, BSPC, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \ - LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,ENT, \ - LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,FN0, \ - LGUI,LALT, FN1, RALT,RGUI), - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | |Backs| - * |-----------------------------------------------------------| - * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter | - * |-----------------------------------------------------------| - * | | | | | | | +| -|End|PgD|Dow| | | - * `-----------------------------------------------------------' - * | | | | | | - * `-------------------------------------------' - */ - KEYMAP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, BSPC, \ - TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,PENT, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS, \ - TRNS,TRNS, SPC, TRNS,TRNS), - - /* Layer 2: SpaceFN - * ,-----------------------------------------------------------. - * |` | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| |Del| - * |-----------------------------------------------------------| - * | | | |Esc| | | |Hom|Up |End|Psc|Slk|Pau|Ins | - * |-----------------------------------------------------------| - * | | | | | | |PgU|Lef|Dow|Rig| | | | - * |-----------------------------------------------------------| - * | | | | | |Spc|PgD|` |~ | | | | | - * `-----------------------------------------------------------' - * | | | | | | - * `-------------------------------------------' - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,DEL, \ - TRNS,TRNS,TRNS,ESC, TRNS,TRNS,TRNS,HOME,FN3, END, PSCR,SLCK,PAUS,INS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PGUP,LEFT,DOWN,RGHT,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,SPC, PGDN,GRV, FN2, TRNS,TRNS,TRNS,NO, \ - TRNS,TRNS, TRNS, TRNS,TRNS), -}; - - -/* - * user defined action function - */ -enum function_id { - CTRL_SPACE_I, // Ctrl + Up(SpaceFN) -> PgUp -}; - -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -# define MODS_CTRL_MASK (MOD_BIT(KC_LCTRL)|MOD_BIT(KC_RCTRL)) - static uint8_t ctrl_space_i_prev_ctrl; - - switch (id) { - // Ctrl + Up(SpaceFN) -> PgUp - case CTRL_SPACE_I: - ctrl_space_i_prev_ctrl = get_mods()&MODS_CTRL_MASK; - if (record->event.pressed) { - if (ctrl_space_i_prev_ctrl) { - del_mods(ctrl_space_i_prev_ctrl); // remove Ctrl - add_key(KC_PGUP); - send_keyboard_report(); // send PgUp without Ctrl - add_mods(ctrl_space_i_prev_ctrl); // return Ctrl but not sent - } else { - add_key(KC_UP); - send_keyboard_report(); - } - } else { - if (ctrl_space_i_prev_ctrl) { - del_key(KC_PGUP); - send_keyboard_report(); - } else { - del_key(KC_UP); - send_keyboard_report(); - } - } - break; - } -} - - -/* - * Fn action definition - */ -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), - [2] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde - [3] = ACTION_FUNCTION(CTRL_SPACE_I), // Ctrl + Up(SpaceFN) -> PgUp -}; diff --git a/keyboard/hhkb/led.c b/keyboard/hhkb/led.c deleted file mode 100644 index 8a08fe27fc..0000000000 --- a/keyboard/hhkb/led.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - - -/* HHKB has no LEDs */ -void led_set(uint8_t usb_led) -{ - if (usb_led & (1<<USB_LED_CAPS_LOCK)) { - DDRD |= (1<<6); - PORTD |= (1<<6); - } else { - DDRD |= (1<<6); - PORTD &= ~(1<<6); - } -} diff --git a/keyboard/hhkb/matrix.c b/keyboard/hhkb/matrix.c index 14fae0b82c..2dfb2f5e1f 100644 --- a/keyboard/hhkb/matrix.c +++ b/keyboard/hhkb/matrix.c @@ -188,6 +188,14 @@ void matrix_print(void) } } +uint8_t matrix_key_count(void) { + uint8_t count = 0; + for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { + count += bitpop16(matrix_get_row(r)); + } + return count; +} + void matrix_power_up(void) { KEY_POWER_ON(); } diff --git a/keyboard/hhkb/not_supported/Makefile.iwrap b/keyboard/hhkb/not_supported/Makefile.iwrap deleted file mode 100644 index 1614c21d75..0000000000 --- a/keyboard/hhkb/not_supported/Makefile.iwrap +++ /dev/null @@ -1,103 +0,0 @@ -# -# Makefile for iWRAP -# - - -# Target file name (without extension). -TARGET = hhkb_iwrap - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = \ - keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config_iwrap.h - - -# V-USB debug level: To use ps2_usart.c level must be 0 -# ps2_usart.c requires USART to receive PS/2 signal. -OPT_DEFS = -DDEBUG_LEVEL=0 - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -MCU = atmega328p - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 12000000 - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=2048 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -AVRDUDE = avrdude -# Type: avrdude -c ? to get a full listing. -AVRDUDE_PROGRAMMER = usbasp -AVRDUDE_PORT = -AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex -#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep - -# Uncomment the following if you want avrdude's erase cycle counter. -# Note that this counter needs to be initialized first using -Yn, -# see avrdude manual. -#AVRDUDE_ERASE_COUNTER = -y - -# Uncomment the following if you do /not/ wish a verification to be -# performed after programming the device. -#AVRDUDE_NO_VERIFY = -V - -# Increase verbosity level. Please use this when submitting bug -# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> -# to submit bug reports. -#AVRDUDE_VERBOSE = -v -v - -#AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS = -p $(MCU) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) -AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) -AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) - -PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) - - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/iwrap.mk -# TODO: to be selectable: V-USB, LUFA or PJRC -#include $(TMK_DIR)/protocol/vusb.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/hhkb/not_supported/Makefile.vusb b/keyboard/hhkb/not_supported/Makefile.vusb deleted file mode 100644 index 1f8d84684b..0000000000 --- a/keyboard/hhkb/not_supported/Makefile.vusb +++ /dev/null @@ -1,97 +0,0 @@ -# -# Makefile for V-USB -# - - -# Target file name (without extension). -TARGET = hhkb_vusb - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = \ - keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config_vusb.h - - -# V-USB debug level: To use ps2_usart.c level must be 0 -# ps2_usart.c requires USART to receive PS/2 signal. -OPT_DEFS = -DDEBUG_LEVEL=0 - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -MCU = atmega328p -# avrdude doesn't know atmega168p -AVRDUDE_MCU = $(MCU) - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 12000000 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -AVRDUDE = avrdude -# Type: avrdude -c ? to get a full listing. -AVRDUDE_PROGRAMMER = usbasp -AVRDUDE_PORT = -AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex -#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep - -# Uncomment the following if you want avrdude's erase cycle counter. -# Note that this counter needs to be initialized first using -Yn, -# see avrdude manual. -#AVRDUDE_ERASE_COUNTER = -y - -# Uncomment the following if you do /not/ wish a verification to be -# performed after programming the device. -#AVRDUDE_NO_VERIFY = -V - -# Increase verbosity level. Please use this when submitting bug -# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> -# to submit bug reports. -#AVRDUDE_VERBOSE = -v -v - -#AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) -AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) -AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) - -PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) - - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/vusb.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -debug-on: EXTRAFLAGS += -DDEBUG -debug-on: all diff --git a/keyboard/hhkb/not_supported/config_iwrap.h b/keyboard/hhkb/not_supported/config_iwrap.h deleted file mode 100644 index 747c755132..0000000000 --- a/keyboard/hhkb/not_supported/config_iwrap.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xBEEA -// TODO: share these strings with usbconfig.h -// Edit usbconfig.h to change these. -#define MANUFACTURER t.m.k. -#define PRODUCT HHKB mod -#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod - - -/* matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 8 - -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - -/* pins for Software UART */ -#define SUART_IN_PIN PINC -#define SUART_IN_BIT 5 -#define SUART_OUT_PORT PORTC -#define SUART_OUT_BIT 4 - - -#define DEBUG_LED 1 -#define DEBUG_LED_CONFIG (DDRD |= (1<<4)) -#define DEBUG_LED_OFF (PORTD |= (1<<4)) -#define DEBUG_LED_ON (PORTD &= ~(1<<4)) - -/* period of tapping(ms) */ -#define TAPPING_TERM 300 -/* tap count needed for toggling a feature */ -#define TAPPING_TOGGLE 5 - -#endif diff --git a/keyboard/hhkb/not_supported/config_vusb.h b/keyboard/hhkb/not_supported/config_vusb.h deleted file mode 100644 index 44f7acd6cd..0000000000 --- a/keyboard/hhkb/not_supported/config_vusb.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xC0FE -// TODO: share these strings with usbconfig.h -// Edit usbconfig.h to change these. -#define MANUFACTURER t.m.k. -#define PRODUCT HHKB mod -#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod - - -/* matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 8 - - -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - -#endif diff --git a/keyboard/hhkb/not_supported/iwrap.txt b/keyboard/hhkb/not_supported/iwrap.txt deleted file mode 100644 index 20a2420a0b..0000000000 --- a/keyboard/hhkb/not_supported/iwrap.txt +++ /dev/null @@ -1,32 +0,0 @@ - -iWRAP ------ - +---------------+ WT12 - 5V | ATmega168 | 5V/3.3V~~~~ - +-----+---|Vcc,AVCC PC4|---/--->iWRAP(RxD) -USB | C3 | PC5|<--/----iWRAP(TxD) -~~~ | + | | -5V <--BATT + GND | | HHKB - R1 | | ~~~~ -D- <----+-----+--R2-----|INT1 PB2-4|------->ROW(6-8) -D+ <----|---+----R3-----|INT0 PC0-2|------->COL(9-11) - Z1 Z2 | PC3|------->ENABLE(12) -GND<----+---+-----------|GND PB0|<-------KEY(4) - | PB1|------->PREV(5) - | | - GND+-C2--+--|XTAL1 RXD|------->Debug Console - X1 | TXD|<-------Debug Console - GND+-C3--+--|XTAL2 RST|---SW--+GND - +---------------+ - -R1: 1.5K Ohm -R2,R3: 68 Ohm -Z1,Z2: Zener 3.6V -C1,C2: 22pF -C3: 0.1uF -X1: Crystal 12MHz -SW: Push Switch(Optional) -BATT: Li-Po Battery, Battery Charger and Voltage Regulator(5V and 3.3V). - - - diff --git a/keyboard/hhkb/not_supported/usbconfig.h b/keyboard/hhkb/not_supported/usbconfig.h deleted file mode 100644 index c3aad34bef..0000000000 --- a/keyboard/hhkb/not_supported/usbconfig.h +++ /dev/null @@ -1,388 +0,0 @@ -/* Name: usbconfig.h - * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers - * Author: Christian Starkjohann - * Creation Date: 2005-04-01 - * Tabsize: 4 - * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) - * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $ - */ - -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ - -#include "config_vusb.h" - -/* -General Description: -This file is an example configuration (with inline documentation) for the USB -driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is -also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may -wire the lines to any other port, as long as D+ is also wired to INT0 (or any -other hardware interrupt, as long as it is the highest level interrupt, see -section at the end of this file). -*/ - -/* ---------------------------- Hardware Config ---------------------------- */ - -#define USB_CFG_IOPORTNAME D -/* This is the port where the USB bus is connected. When you configure it to - * "B", the registers PORTB, PINB and DDRB will be used. - */ -#define USB_CFG_DMINUS_BIT 3 -/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. - * This may be any bit in the port. - */ -#define USB_CFG_DPLUS_BIT 2 -/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. - * This may be any bit in the port. Please note that D+ must also be connected - * to interrupt pin INT0! [You can also use other interrupts, see section - * "Optional MCU Description" below, or you can connect D- to the interrupt, as - * it is required if you use the USB_COUNT_SOF feature. If you use D- for the - * interrupt, the USB interrupt will also be triggered at Start-Of-Frame - * markers every millisecond.] - */ -#define USB_CFG_CLOCK_KHZ (F_CPU/1000) -/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000, - * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code - * require no crystal, they tolerate +/- 1% deviation from the nominal - * frequency. All other rates require a precision of 2000 ppm and thus a - * crystal! - * Since F_CPU should be defined to your actual clock rate anyway, you should - * not need to modify this setting. - */ -#define USB_CFG_CHECK_CRC 0 -/* Define this to 1 if you want that the driver checks integrity of incoming - * data packets (CRC checks). CRC checks cost quite a bit of code size and are - * currently only available for 18 MHz crystal clock. You must choose - * USB_CFG_CLOCK_KHZ = 18000 if you enable this option. - */ - -/* ----------------------- Optional Hardware Config ------------------------ */ - -/* #define USB_CFG_PULLUP_IOPORTNAME D */ -/* If you connect the 1.5k pullup resistor from D- to a port pin instead of - * V+, you can connect and disconnect the device from firmware by calling - * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). - * This constant defines the port on which the pullup resistor is connected. - */ -/* #define USB_CFG_PULLUP_BIT 4 */ -/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined - * above) where the 1.5k pullup resistor is connected. See description - * above for details. - */ - -/* --------------------------- Functional Range ---------------------------- */ - -#define USB_CFG_HAVE_INTRIN_ENDPOINT 1 -/* Define this to 1 if you want to compile a version with two endpoints: The - * default control endpoint 0 and an interrupt-in endpoint (any other endpoint - * number). - */ -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 1 -/* Define this to 1 if you want to compile a version with three endpoints: The - * default control endpoint 0, an interrupt-in endpoint 3 (or the number - * configured below) and a catch-all default interrupt-in endpoint as above. - * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature. - */ -#define USB_CFG_EP3_NUMBER 3 -/* If the so-called endpoint 3 is used, it can now be configured to any other - * endpoint number (except 0) with this macro. Default if undefined is 3. - */ -/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */ -/* The above macro defines the startup condition for data toggling on the - * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. - * Since the token is toggled BEFORE sending any data, the first packet is - * sent with the oposite value of this configuration! - */ -#define USB_CFG_IMPLEMENT_HALT 0 -/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature - * for endpoint 1 (interrupt endpoint). Although you may not need this feature, - * it is required by the standard. We have made it a config option because it - * bloats the code considerably. - */ -#define USB_CFG_SUPPRESS_INTR_CODE 0 -/* Define this to 1 if you want to declare interrupt-in endpoints, but don't - * want to send any data over them. If this macro is defined to 1, functions - * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if - * you need the interrupt-in endpoints in order to comply to an interface - * (e.g. HID), but never want to send any data. This option saves a couple - * of bytes in flash memory and the transmit buffers in RAM. - */ -#define USB_CFG_INTR_POLL_INTERVAL 10 -/* If you compile a version with endpoint 1 (interrupt-in), this is the poll - * interval. The value is in milliseconds and must not be less than 10 ms for - * low speed devices. - */ -#define USB_CFG_IS_SELF_POWERED 0 -/* Define this to 1 if the device has its own power supply. Set it to 0 if the - * device is powered from the USB bus. - */ -#define USB_CFG_MAX_BUS_POWER 100 -/* Set this variable to the maximum USB bus power consumption of your device. - * The value is in milliamperes. [It will be divided by two since USB - * communicates power requirements in units of 2 mA.] - */ -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -/* Set this to 1 if you want usbFunctionWrite() to be called for control-out - * transfers. Set it to 0 if you don't need it and want to save a couple of - * bytes. - */ -#define USB_CFG_IMPLEMENT_FN_READ 0 -/* Set this to 1 if you need to send control replies which are generated - * "on the fly" when usbFunctionRead() is called. If you only want to send - * data from a static buffer, set it to 0 and return the data from - * usbFunctionSetup(). This saves a couple of bytes. - */ -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 -/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. - * You must implement the function usbFunctionWriteOut() which receives all - * interrupt/bulk data sent to any endpoint other than 0. The endpoint number - * can be found in 'usbRxToken'. - */ -#define USB_CFG_HAVE_FLOWCONTROL 0 -/* Define this to 1 if you want flowcontrol over USB data. See the definition - * of the macros usbDisableAllRequests() and usbEnableAllRequests() in - * usbdrv.h. - */ -#define USB_CFG_DRIVER_FLASH_PAGE 0 -/* If the device has more than 64 kBytes of flash, define this to the 64 k page - * where the driver's constants (descriptors) are located. Or in other words: - * Define this to 1 for boot loaders on the ATMega128. - */ -#define USB_CFG_LONG_TRANSFERS 0 -/* Define this to 1 if you want to send/receive blocks of more than 254 bytes - * in a single control-in or control-out transfer. Note that the capability - * for long transfers increases the driver size. - */ -/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */ -/* This macro is a hook if you want to do unconventional things. If it is - * defined, it's inserted at the beginning of received message processing. - * If you eat the received message and don't want default processing to - * proceed, do a return after doing your things. One possible application - * (besides debugging) is to flash a status LED on each packet. - */ -/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ -/* This macro is a hook if you need to know when an USB RESET occurs. It has - * one parameter which distinguishes between the start of RESET state and its - * end. - */ -/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */ -/* This macro (if defined) is executed when a USB SET_ADDRESS request was - * received. - */ -#define USB_COUNT_SOF 1 -/* define this macro to 1 if you need the global variable "usbSofCount" which - * counts SOF packets. This feature requires that the hardware interrupt is - * connected to D- instead of D+. - */ -/* #ifdef __ASSEMBLER__ - * macro myAssemblerMacro - * in YL, TCNT0 - * sts timer0Snapshot, YL - * endm - * #endif - * #define USB_SOF_HOOK myAssemblerMacro - * This macro (if defined) is executed in the assembler module when a - * Start Of Frame condition is detected. It is recommended to define it to - * the name of an assembler macro which is defined here as well so that more - * than one assembler instruction can be used. The macro may use the register - * YL and modify SREG. If it lasts longer than a couple of cycles, USB messages - * immediately after an SOF pulse may be lost and must be retried by the host. - * What can you do with this hook? Since the SOF signal occurs exactly every - * 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in - * designs running on the internal RC oscillator. - * Please note that Start Of Frame detection works only if D- is wired to the - * interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES! - */ -#define USB_CFG_CHECK_DATA_TOGGLING 0 -/* define this macro to 1 if you want to filter out duplicate data packets - * sent by the host. Duplicates occur only as a consequence of communication - * errors, when the host does not receive an ACK. Please note that you need to - * implement the filtering yourself in usbFunctionWriteOut() and - * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable - * for each control- and out-endpoint to check for duplicate packets. - */ -#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 -/* define this macro to 1 if you want the function usbMeasureFrameLength() - * compiled in. This function can be used to calibrate the AVR's RC oscillator. - */ -#define USB_USE_FAST_CRC 0 -/* The assembler module has two implementations for the CRC algorithm. One is - * faster, the other is smaller. This CRC routine is only used for transmitted - * messages where timing is not critical. The faster routine needs 31 cycles - * per byte while the smaller one needs 61 to 69 cycles. The faster routine - * may be worth the 32 bytes bigger code size if you transmit lots of data and - * run the AVR close to its limit. - */ - -/* -------------------------- Device Description --------------------------- */ - -#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) -/* USB vendor ID for the device, low byte first. If you have registered your - * own Vendor ID, define it here. Otherwise you may use one of obdev's free - * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) -/* This is the ID of the product, low byte first. It is interpreted in the - * scope of the vendor ID. If you have registered your own VID with usb.org - * or if you have licensed a PID from somebody else, define it here. Otherwise - * you may use one of obdev's free shared VID/PID pairs. See the file - * USB-IDs-for-free.txt for details! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_VERSION 0x00, 0x01 -/* Version number of the device: Minor number first, then major number. - */ -#define USB_CFG_VENDOR_NAME 't', '.', 'm', '.', 'k', '.' -#define USB_CFG_VENDOR_NAME_LEN 6 -/* These two values define the vendor name returned by the USB device. The name - * must be given as a list of characters under single quotes. The characters - * are interpreted as Unicode (UTF-16) entities. - * If you don't want a vendor name string, undefine these macros. - * ALWAYS define a vendor name containing your Internet domain name if you use - * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for - * details. - */ -#define USB_CFG_DEVICE_NAME 'H', 'H', 'K', 'B', ' ', 'm', 'o', 'd' -#define USB_CFG_DEVICE_NAME_LEN 8 -/* Same as above for the device name. If you don't want a device name, undefine - * the macros. See the file USB-IDs-for-free.txt before you assign a name if - * you use a shared VID/PID. - */ -/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */ -/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */ -/* Same as above for the serial number. If you don't want a serial number, - * undefine the macros. - * It may be useful to provide the serial number through other means than at - * compile time. See the section about descriptor properties below for how - * to fine tune control over USB descriptors such as the string descriptor - * for the serial number. - */ -#define USB_CFG_DEVICE_CLASS 0 -#define USB_CFG_DEVICE_SUBCLASS 0 -/* See USB specification if you want to conform to an existing device class. - * Class 0xff is "vendor specific". - */ -#define USB_CFG_INTERFACE_CLASS 3 /* HID */ -#define USB_CFG_INTERFACE_SUBCLASS 1 /* Boot */ -#define USB_CFG_INTERFACE_PROTOCOL 1 /* Keyboard */ -/* See USB specification if you want to conform to an existing device class or - * protocol. The following classes must be set at interface level: - * HID class is 3, no subclass and protocol required (but may be useful!) - * CDC class is 2, use subclass 2 and protocol 1 for ACM - */ -#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0 -/* Define this to the length of the HID report descriptor, if you implement - * an HID device. Otherwise don't define it or define it to 0. - * If you use this define, you must add a PROGMEM character array named - * "usbHidReportDescriptor" to your code which contains the report descriptor. - * Don't forget to keep the array and this define in sync! - */ - -/* #define USB_PUBLIC static */ -/* Use the define above if you #include usbdrv.c instead of linking against it. - * This technique saves a couple of bytes in flash memory. - */ - -/* ------------------- Fine Control over USB Descriptors ------------------- */ -/* If you don't want to use the driver's default USB descriptors, you can - * provide our own. These can be provided as (1) fixed length static data in - * flash memory, (2) fixed length static data in RAM or (3) dynamically at - * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more - * information about this function. - * Descriptor handling is configured through the descriptor's properties. If - * no properties are defined or if they are 0, the default descriptor is used. - * Possible properties are: - * + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched - * at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is - * used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if - * you want RAM pointers. - * + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found - * in static memory is in RAM, not in flash memory. - * + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash), - * the driver must know the descriptor's length. The descriptor itself is - * found at the address of a well known identifier (see below). - * List of static descriptor names (must be declared PROGMEM if in flash): - * char usbDescriptorDevice[]; - * char usbDescriptorConfiguration[]; - * char usbDescriptorHidReport[]; - * char usbDescriptorString0[]; - * int usbDescriptorStringVendor[]; - * int usbDescriptorStringDevice[]; - * int usbDescriptorStringSerialNumber[]; - * Other descriptors can't be provided statically, they must be provided - * dynamically at runtime. - * - * Descriptor properties are or-ed or added together, e.g.: - * #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18)) - * - * The following descriptors are defined: - * USB_CFG_DESCR_PROPS_DEVICE - * USB_CFG_DESCR_PROPS_CONFIGURATION - * USB_CFG_DESCR_PROPS_STRINGS - * USB_CFG_DESCR_PROPS_STRING_0 - * USB_CFG_DESCR_PROPS_STRING_VENDOR - * USB_CFG_DESCR_PROPS_STRING_PRODUCT - * USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER - * USB_CFG_DESCR_PROPS_HID - * USB_CFG_DESCR_PROPS_HID_REPORT - * USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver) - * - * Note about string descriptors: String descriptors are not just strings, they - * are Unicode strings prefixed with a 2 byte header. Example: - * int serialNumberDescriptor[] = { - * USB_STRING_DESCRIPTOR_HEADER(6), - * 'S', 'e', 'r', 'i', 'a', 'l' - * }; - */ - -#define USB_CFG_DESCR_PROPS_DEVICE 0 -#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC -//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 -#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC -//#define USB_CFG_DESCR_PROPS_HID 0 -#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC -//#define USB_CFG_DESCR_PROPS_HID_REPORT 0 -#define USB_CFG_DESCR_PROPS_UNKNOWN 0 - -/* ----------------------- Optional MCU Description ------------------------ */ - -/* The following configurations have working defaults in usbdrv.h. You - * usually don't need to set them explicitly. Only if you want to run - * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt - * interrupt than INT0, you may have to define some of these. - */ -/* #define USB_INTR_CFG MCUCR */ -/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ -/* #define USB_INTR_CFG_CLR 0 */ -/* #define USB_INTR_ENABLE GIMSK */ -/* #define USB_INTR_ENABLE_BIT INT0 */ -/* #define USB_INTR_PENDING GIFR */ -/* #define USB_INTR_PENDING_BIT INTF0 */ -/* #define USB_INTR_VECTOR INT0_vect */ - -/* Set INT1 for D- falling edge to count SOF */ -/* #define USB_INTR_CFG EICRA */ -#define USB_INTR_CFG_SET ((1 << ISC11) | (0 << ISC10)) -/* #define USB_INTR_CFG_CLR 0 */ -/* #define USB_INTR_ENABLE EIMSK */ -#define USB_INTR_ENABLE_BIT INT1 -/* #define USB_INTR_PENDING EIFR */ -#define USB_INTR_PENDING_BIT INTF1 -#define USB_INTR_VECTOR INT1_vect - -#endif /* __usbconfig_h_included__ */ diff --git a/keyboard/hhkb/rn42.mk b/keyboard/hhkb/rn42.mk deleted file mode 100644 index fd6f7db1a8..0000000000 --- a/keyboard/hhkb/rn42.mk +++ /dev/null @@ -1,12 +0,0 @@ -RN42_DIR = rn42 - -SRC += serial_uart.c \ - rn42/suart.S \ - rn42/rn42.c \ - rn42/rn42_task.c \ - rn42/battery.c \ - rn42/main.c - -OPT_DEFS += -DPROTOCOL_RN42 - -VPATH += $(RN42_DIR) diff --git a/keyboard/hhkb/rn42/MEMO.txt b/keyboard/hhkb/rn42/MEMO.txt deleted file mode 100644 index 0363c2f433..0000000000 --- a/keyboard/hhkb/rn42/MEMO.txt +++ /dev/null @@ -1,255 +0,0 @@ -Memo of deveopment -================== -just memo, NOT WORTH READING - -Bug: -- Factory Reset PIO4 doesn't work - - the reason is unclear - 12/08 NOT LOOK INTO ANY MORE - - WORKAROUND: use serial pins(3.3V, GND, RX and TX) - - SF,1 and R,1 to set factory defalult - - -Todo: -- LED cover and switch knob and new Slide Switch -- RN42 auto configuration - - configure the module as HID device every time powering up - - this'll reduce work load of assembly - -- move rn42 to protocol directory when it becomes reusable stack - -- sendchar() in lufa.c no buffer - - no buffering. character lost can be caused. -- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256). - -- BT operations - - disconnect - - new connection - - remove connection - -- sendchar() in lufa.c block loop - DONE 11/29 - - block loop when powered with AC adapter - - FrameNumber is not updated when adapter powered - -Improving: -- ADC resolution - AVR120 - AVR32138 - - Enhancing ADC resolution by oversampling - AVR121 http://www.atmel.com/images/doc8003.pdf - - disable digital input buffer DIDR(7.8.6) - -Design: -- suspend.h - DONE 11/26 - - remove argument from suspend_power_down() for backward compatitibility -- remove MCU dependent power saving code from core/keyboard - DONE 11/23 - - it should be located in project matrix.c -- HHKB matrix.c needs matrix_prev? - - is_modified() is obsolete now. really needs? -- ADC: removing AREF capacitor C10 - - seems to be better while usb powered - - still bad while battery powered - http://electronics.stackexchange.com/questions/105849/avcc-and-capacitor-using-adc -- ADC: smaller resistors for voltage dividor - - 1K + 1K: not improved. - 11/27 - - -LUFA: -USB connection check: state of USB deivce -- USB_DeviceState: - USB_Deivce_State_t { Unattached, Powered, Default, Addressed, Configured*, Suspended* } - Unattached: unpluged - Powered: pluged with power adapter - Default: enumerate process bigin - Addressed: addressed - Configured: enumerated - Suspended: suspended - -- USB_IsInitialized: state of LUFA core setup - becomes true in USB_Init() USBController_AVR8.c - becomes false in USB_Disable() USBController_AVR8.c -- USB_VBUS_GetStatus(): state of VBUS(power/connection) -- USB_Disable() detaches, disables all interrupts, controller, PLL, regulater. - -- When connect to power adapter - - event happened: CW or CSW or C or DDC - - USB state: not configured - -- USB evnets - - USB connect: CSWRWRW - - USB connect but fail to enumeration: CWRWRWRWS - - USB disconnect: D - - Power adapter connect: CW, CSW, C - - Power adapter disconnect: D - - -Power saving: -- Pro2 current consumption - - active: 138.2mA(no device on Hub) - - suspended: 30.9mA(WakeUp enabled DIPSW6) - - suspended: 0mA->46.0mA(WakeUp disabled DIPSW6) -- Pro current consumption - - active: 54.0mA - - suspended: 40.5mA(WakeUp enabled DIPSW6) - - suspended: 0.3mA(WakeUp disabled DIPSW6) - -- RN42 3.3V - - disconnected(Idle): 5mA (config mode) - - connected(Active): - SW,0000: 23-26mA - SW,0010: 27-29mA worse than 0000 for unknown reason - SW,0020: 17-19mA mouse NG - SW,0030: 13-16mA laggy mouse NG - SW,0050: 10-13mA laggy mouse NG - -- matrix power saving - - power saving while externally powered and not while unpluged -- confirm suspend mode lufa.c: matrix_power_*, suspend_wakeup_condition -- 8MHz clock -- When not connected in a few minutes get into deep sleep to save battery life -- CTS is needed for waking up from deep sleep? How deep sleep is activated? -- firmware controlled 3.3V DC converter to switch on/off BT module -- sleep MCU and BT module(keyboard is not used) -- deep sleep MCU and BT module(keyboard is not used for long time) -- deep sleep MCU and turn off BT module(keyboard is not used and not connected) -- Battery ADC; switching, high resistance - - switching gnd end of divider with PF4 - - high resistor 100K/1M? - capacitor 10nF - http://www.eevblog.com/forum/beginners/measuring-battery-voltage-without-consuming-current/ -- During USB suspend change clock source to internal RC from external Xtal(6.8) -- FRZCLK: you can freeze clock for power saving. still WAKEUPI and VBUSTI interrupts are available while freezing.(21.7.3) -- Suspend: Clear Suspend Bit, Freeze clock, disable PLL, MCU sleep(21.13) -- Voltage reference(8.1.1) - - to reduce power consumption while power down mode -- unset ADEN before sleep(24.7) - - - - - - - -Lipo ----- -850mA lasts around 9 hours(07/28) - -Sparkfun Polymer Lithium Ion Battery 850mAh: -https://www.sparkfun.com/products/341 -Lipo Cell spec: -https://www.sparkfun.com/datasheets/Batteries/063048%20Li-polymer.pdf -Protection spec: -http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Prototyping/BatteryProtection.pdf - min typical max - over-charge 4.255 4.280 4.305 - over-charge discover? 4.030 4.080 4.130 - over-discharge 2.827 2.900 2.973 - over-discharge discover 3.022 3.100 3.178 - -ADC voltage monitor: voltage divider 10K+10K(0.5) - ADC=V*0.5/2.56*1024 - - V ADC - ------------------ - 4.20 0x347(839) - 3.10 0x26b(619) - - - - -TROUBLE SHOOT -------------- -07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive. - Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before. - -07/18 On Linux, had an USB related trouble; keyboard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it. - -12/07 rn42_rts() read 1 every time. R12 broke in open mode(no coductive), idk why, too much heat with soldering? and PF1 pin was not soldered. - It resolved with resoldering PF1 and new resistor on R12. - - - - -Done: -- low battery alert(solid light) 09/04 -- *** Rev.E BT test *** - DONE - - with MCP73832, new Schottky, tantalum caps - DONE 12/07 - * MCP73832 doesn't leak from Vcc pin when unpluged and battery powered - 34mV vs 2.07V(MCP73831) at Vcc pin - MCP73832 doesn't need revese protection diode D5 - * PMEG2010ER is very low VF while reverse current/voltage is high - VF=0.96 vs 1.98(RB160M-30TR)with Fluke 175 - Anode of D11 is 680mV vs 20mV(RB160M-30TR) - 780mV is still low < 1.4V VBUS plugin detection(21.11) - this doesn't cause false VBUS detect - and 780mV on MCP73832 Vcc pin is also no problem. - D5 can be removed. - - ADC divider switching - DONE 12/07 - * Drain and Source of Q4 Pch was reversed wrongly on Rev.E. - - - reverse current from Lipo charger - DONE 12/07 - * MCP73832 has no recverse current from Vcc pin unlike MCP73831 - - -- Rev.F design - DONE - - current measure point - DONE 12/08 - - change value of cap 68->47 - DONE 12/08 - - PPTC land pattern: no solder jumper, use 0Ohm resistor instead - CANCEL 12/08 - - Q4 Pch FET: wrong Drain and Source - DONE 12/08 - - D5 can be removed. - DONE 12/08 - - - -- BT_INDICATOR LED turns on wrongly when touching line or pin. -- pull-up enabled on PF6/GPIO2 08/30 -- Lipo charger configuration: fast charge time: USB charger spec? -- used 2kohm -- use LED of charger to alarm low battery. LED should be powered directly from Lipo? - cancel; powered from VUSB -- Use RTS in serial_uart.c to resolve missing chars from help message of RN-42 - done -- CTS/RTS lines are needed? just connect in loop back if no flow control is needed. - done -- add IO pin to charger status CHRG; LED control(low) and detect charge status(input HiZ) 07.24 -- LINKED: add trace on PIO2 to PF6 07.24 -- Lipo voltage ADC sensing -- Lipo charger MCP73831: needs capacitor 4.7uF *2 -- USB connection check - 07.01 -- BT on/off check: whether RX line is pulled up? - checking RTS 07.01 -- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01 -- Under voltage lock out UVLO for protection of Lipo - Lipo has discharge protection at 3.100V 07.01 -- Power saving: HHKB scan, BT radio control - 9h with 850mAh, this is enough 07.01 -- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04 - -- wrongly suspended when powered from adapter without USB connection - DONE - - suspend event may occur when plug into adapter - - and never wake until conected to real USB line - - without debug print via USB no problem; CSW(wake just after suspend as real USB line) - - seems like USB print causes this problem after suspended - -- lose USB connection during power-down mode - DONE - - USB initialize code in main() causes this - WRONG - - Do not power-down during USB connection is active - DONE 11/11 - (USB_DeviceState == USB_DEVICE_Configured) is used to check USB connection - matrix_power_down() matrix.c - 11/23 - -- with Nexus5 keyboard and mouse are very laggy. - Not confirmed. 01/15 - -- switch BT host connections - CANCEL 01/15 - - switch next connection - cannot switch connection with version 6.15 at least - -- When given power only from wall wart adapter - DONE? not confirmed 01/15 - - it sleeps. it should not sleep - - Configured state without USB connection? - -- timer is slow while power down - DONE 11/26 - - time out interrupt is lost while power down? - - interrupt of watchdog timer compensates timer counter(avr/suspend.c) - -- repeated CHARGING/FULL_CHARGED - No longer problem 01/15 - - In LTC sharp pulses are observed. - - MCP has no pulse but still has a problem. - - needs more wait before read pin state? - NO - -- USB plug-in fails while BT - No longer problem 01/15 - - it ends in suspend state - - maybe, not responsive to host enumeration process due to power-down. - - matrix_power_down() only when state is unattached - 11/26 - - need to observe a while - diff --git a/keyboard/hhkb/rn42/PowerSave.txt b/keyboard/hhkb/rn42/PowerSave.txt deleted file mode 100644 index 4b9c8f415d..0000000000 --- a/keyboard/hhkb/rn42/PowerSave.txt +++ /dev/null @@ -1,88 +0,0 @@ -Power Saving -============ - - -MCU+HHKB Power Comsumption --------------------------- -Battery drive: - idle 18.9mA - active 35.8mA - -USB powered: - 40.0mA - 52mA 01/17 - -Other keyboards: -HHKB Pro 55mA -HHKB Pro2 140mA -HHKB Pro 42mA(Alt) -HHKB Pro2 52mA(Alt BT controller USB mode) -HHKB Pro2 88mA(Alt BT controller BT mode connected) -HHKB Pro2 68mA(Alt BT controller BT mode config mode) -Poker X 6mA -Infinity 24mA(TMK) - 65mA(kiibohd) - - -HHKB key switch power control ------------------------------ -MOS FET Nch: BSS138 or IRLML6344T, either works and no apparent difference. -Normally on(pull-up) or off(pull-down)? interms of power saving it prefers pull-down? - -Pull-down will be better for power saving, normally off. - - - -Used Timer ----------- - -8MHz clock ----------- -1) 16MHz xtal with system prescaler div2: F_CPU=8MHz, F_USB=16MHz -2) 8MHz xtal with div1: F_CPU=8MHz, F_USB=8MHz -Hardware USART doesn't work at 115200bps with 8MHz(F_CPU). - -workaround: -a) use Sotwre serial for communcation with RN-42 -b) reduce baud of RN-42 to lower rate;(factory default is 115200bps) -10/03 - - - -Slave mode ----------- -Discovery/Inquire -Connect/Page - -SI,0012 -SJ,0012 -InqWindw=0100 -PagWindw=0100 - - -Sniff mode ----------- -0.625ms * <hex> -SW,0320 Very sluggish. Type is not lost but very slow to register. -SW,0160 Still sluggish. may transposed? can type but ... - Mouse point move intermittently -SW,0020 feel a bit late like stumble(20ms) -SW,0010 feel no latency(10ms) - - -Deep sleep ----------- -SW,8010 - - -TX power --------- -SY,fff4 - - -IO pins -------- -S%,1000 status led and connection control don't work - GPIO5: status LED - GPIO6: Connection control - GPIO2: linked status diff --git a/keyboard/hhkb/rn42/RN42.txt b/keyboard/hhkb/rn42/RN42.txt deleted file mode 100644 index 64c3fdd4ec..0000000000 --- a/keyboard/hhkb/rn42/RN42.txt +++ /dev/null @@ -1,408 +0,0 @@ -RN-42 Bluetooth Module Support -============================== -Bluetooth controller board works with HHKB Pro2, JP, Type-S and Type-S JP and it supports both USB and Bluetooth as keyboard output protocol. Bluetooth module Roving Networks/Microchip RN-42 is installed on the board. - - -RN-42: -http://www.microchip.com/wwwproducts/Devices.aspx?product=RN42 - - -Capabitlities: -- USB keyboard functions - completely equivarent to USB controller including mouse keys and NKRO. -- Switching between USB and Bluetooth - You can switch the two connections with BT switch or key combination. -- RN-42 config mode - You can change power/connection configuration of the module if needed. -- Low battery alert - Red LED turns on when low voltage. -- RN-42 status indicator - LED indicates status of Bluetooth connection. -- Pairing - The module stores up to 8 connections. -- Auto connect - The module connects the last connected device automatically. -- iOS support - works as keyboard with iPhone5. No tested completely. -- Android support - works as keyboard and mouse with Nexus5. No tested completely. -- Mouse keys over BT - Note that iOS doesn't accept mouse device. - - -Limitations: -- Short battery life - Around 12hr with 1000mAh -- No connection switching - RN-42 auto-connects to the last connected device. - Some of consumer products can switch between devices, for example Logitech K480. - http://www.logitech.com/en-us/product/multi-device-keyboard-k480?crid=26 -- HHKB JP requires case modification for BT switch and LEDs. - without switch power controlled by MCU? Probably using 3.3V regulator enable pin power of RN-42 can be controlled. - -NOTE: -- LIPO BATTERY IS VERY DANGEROUS, TAKE EXTRA CARE OF YOUR SAFETY AND PROPERTY. -- RN-42 version 6.15 is supported. -- No NKRO over Bluetooth -- Check you country's wiress regulation and certification of RN-42. - -Bugs: - -Todos: - - -Lipo Battery ------------- -You can use 3.7V Lithium Ion battery with JST PH 2pin connector and protection circuit. -Battery space inside HHKB is around 54mm x 50mm and its height is 7mm. - -Sparkfun 850mAh -https://www.sparkfun.com/products/341 -Sparkfun 1000mAh -https://www.sparkfun.com/products/339 - -Sparkfun 2000mAh battery won't fit due to its size. - -Learn about Lipo battery: -https://learn.adafruit.com/li-ion-and-lipoly-batteries - - - - - -LED Status ----------- -Configuring 10 times per sec -Startup/configuration timer 2 times per sec -Discoverable/Inquiring/Idle once per sec -Connected solid on - - -RN-42 Magic Command --------------------- -Magic key combination is 'LShift+RShift' by default in case of HHKB. - -Here is help. - - ----- Bluetooth RN-42 Help ----- - i: RN-42 info - b: battery voltage - Del: enter/exit RN-42 config mode - Slck: RN-42 initialize - p: pairing - u: toggle Force USB mode - - RN-42 info: displays information of the module on console. - battery voltage: displays current voltage of battery and uptime. - RN-42 initialize: does factory reset and configures RN-42 - pairing: enters Pairing mode. - toggle Force USB mode: switch between USB and Bluetooth - - -RN-42 Config mode ------------------ -You can tune/operate RN-42 yourself with config(command) mode. - -1. hook up USB cable -2. run `hid_listen` command in console -3. turn on Bluetooth switch -4. press LShift+RShift+Delete(Fn+~) you will see output like followings: - - Entering config mode ... - CMD - v - Ver 6.15 04/26/2013 - (c) Roving Networks - -5. do config with RN-42 commands. See documentations of RN-42. -6. to exit also press LShift+RShift+Delete(Fn+~) - - Exiting config mode ... - --- - END - - -RN-42 Initial Configuration ---------------------------- -RN-42 is configured as SPP device at factory reset, you need to configure it as HID device. This is needed just once first time. - -1. hook up USB cable -2. run `hid_listen` command in console -3. turn on Bluetooth switch -4. press LShift+RShift+ScrLk(Fn+O) you will see output like followings: - - Entering config mode ... - CMD - Ver 6.15 04/26/2013 - (c) Roving Networks - ECHO ON - SF,1 - AOK - S-,TmkBT - AOK - SS,Keyboard/Mouse - AOK - SM,4 - AOK - SW,8000 - AOK - S~,6 - AOK - SH,003C - AOK - SY,FFF4 - AOK - R,1 - Reboot! - Exiting config mode ... - -5. output of command 'X' after cofiguration - - Ver 6.15 04/26/2013 - (c) Roving Networks - ***Settings*** - BTA=00066667BBE9 - BTName=TmkBT-BBE9 - Baudrt(SW4)=115K - Mode =DTR - Authen=1 - PinCod=1234 - Bonded=0 - Rem=NONE SET - ***ADVANCED Settings*** - SrvName= Keyboard/Mouse - SrvClass=0000 - DevClass=1F00 - InqWindw=0100 - PagWindw=0100 - CfgTimer=255 - StatuStr=NULL - HidFlags=3c - DTRtimer=8 - KeySwapr=0 - ***OTHER Settings*** - Profile= HID - CfgChar= $ - SniffEna=8000 - LowPower=0 - TX Power=fff4 - IOPorts= 0 - IOValues=0 - Sleeptmr=0 - DebugMod=0 - RoleSwch=0 - - -Switch to USB mode ------------------- -You can switch between USB and Bluetooth with pressing 'LShift+RShift+u'. - - -Pairing mode ------------- -This disconnects current connect and enter pairing mode. - - - - -For deveropment -=============== - -RN-42 Serial Connection ------------------------ -UART: 115200bps, 8bit, 1-stopbit, non-parity, no flow control -SSP: 115200bps, 8bit, 1-stopbit, non-parity, no flow control(via Bluetooth) - -To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD') and type '+' to get local echo. To exit type '---'(you will see 'END'). - - -RN-42 Commands --------------- -S-,tmkBT // Device name -SS,keyboard/mouse // service name -SM,4 // Auto Connect DTR mode -SW,8010 // Sniff enable 0x10*0.625ms=10ms; 50ms is laggish and not much power save -S~,6 // HID profile -S~,0 // SPP profile -SH,003C // HID register -SY,0004 // Transmit power -SC,0000 // COD: 000005C0 (see HID spec/Bluegiga doc) -SD,05C0 // bit 12-8 7 6 5-0 - // 00101 1 1 0 - // peripheral pointing keybaord joystick, gamepad, ... -SM,6 // Pairing mode: auto connect -SM,4 // Master mode: Connection can be controled with GPIO6 -SF,1 // Factroy reset -R,1 // reboot -SR,Z // removes all remote addresses for reconnecting. - // can be used to connect another host -SR,I // registers last inquiry address - - -Operation Modes ---------------- -SM,3 Auto Connect Master mode -SM,4 Auto Connect DTR Mode uses GPIO6 to make and break connection(Mode =DTR) - confirm: auto connect works and control connection with GPIO6 -SM,5 Auto Connect ANY Mode (Mode =ANY) - each time GPIO is set, make inquiry and connect to the first found device -SM,6 automatically reconnect(Mode =Pair) - confirm: auto connect works well but difficult to enter command mode. - - -HID flag register ------------------ -SH,0200 -GH - -10 0000 0000(0200) default -00 0011 1000(0038) Combo -|| | | |\_\____ number of paired devices to which the module can reconnect -|| | | \_______ send out reports over UART (0xFF <len> <data>) -|| \__\_________ descriptor type -|\______________ toggle virtual keyboard on iOS when first connected -\_______________ Force HID mode if GPIO11 is high on power-up - - Descriptor type: - 0000: keybaord - 0001: Game Pad - 0010: Mouse - 0011: Combo - 0100: Joystick - 1xxx: reserved - - -Out report - Indicator ----------------------- -0xFE 0x02 0x01 <LED_state> - - -Apple iOS ---------- -Keyboard can be used with iPhone, but mouse cannot. - - -Android -------- -3.7.1.5 Note: To connect with Android phone the modules must wake up 11ms every 2.5seconds. - - -Power Management ----------------- -Inquiry and Page window Idle or Active (3.1.1) - Downside: delay in discovery or connection time - SI, // set inquiry scan window(discovery) on/off duty? - SJ, // set page scan window(connection) - This reduces averaege power >20mA to 5mA(3mA in Sniff mode) - -Sniff mode Transmit - Sniff mode is disabled by default and radio is active continuously when connected.(25-30mA) - In Sniff mode the radio wakes up intermittently and sleeps in very low power mode.(2mA) - SW,<val> // set interval timer(*0.625ms) 0000-7FFF - -Deep sleep Idle (3.1.2) - In this mode the module shuts down completly and only draws about 300uA. To enable this set the most signifant bit(0x8000) of Sniff interaval timer. - SW,8320 // deep sleep enable(interval=0x320*0.625=500ms) - In normal sleep the firmware is still running in idle mode, and wakes up about 20 times per second to check ports, update LEDs, etc. During deep sleep, the firmware actually stops runnig some tasks and the LEDs only update about once per second. - To wake from deep sleep there are three ways: (in worst case wake up takes 5ms) - *send a charactor to the UART(first charactor will be lost) - *toggle CTS low to high and wait 5ms - *wake automatically every slot time(<val>*0.625ms) - Once the radio is awake it stay active for exactly 1 second of inactivity and then sleeps again. - Downside: latency and data loss - -Disable Output driver Idle or Active (3.1.3) - S%,1000 // set all GPIO pins(0-11) to inputs. - -Lower Transmit Power Idle or Active (3.1.4) - SY,<hex> // transmit power setting(takes effect after a power cycle and reboot) - Downside: reducing effective range - - -Optimizig for Latency ---------------------- -By default the firmware is optimized for throughput. -SQ,16 // set latency bit -SQ,0 // unset latency bit - - -Configuration timer settings ----------------------------- -Remote configuration is used for the module to be configured with various commands over Bluetooth(SPP profile only?). - -The module has remote configuration timer to allow remote configuration over Bluetooth after power up in Slave mode. In Master modes the remote configuration timer is set to 0(no remote configuration). (In Trigger Master mode the timer is used as an idle timer to break the connection after time expires with no charactors receive.) - ST,0 // no remote, no local when connected - ST,<1-252> // local and remote with timeout in seconds from power up - ST,253 // local only without timeout - ST,254 // remote only without timeout - ST,255 // local and remote without timeout - - -Commands --------- -S7, 7bit mode -SA, Authenticaiton -SB, Send break -SC, Service class -SD, Device class -SM,<val> Operation mode -SP,<string> Pin code(alpahnumeric) -SQ,<mask> Special configuration(GPIO, discovery mode, low latency, reboot, UART) -SR,<hex> Store remote address -SR,Z Erase all address -SS,<string> Set service name(1-20)** -ST,<val> Remote configuration timer(Master:0, Slave:0-255, Triger:as idle timer) -SU,<val> UART baud rate -SW,<val> low-power sniff mode** deep sleep and wake up every 625us * <val> -SX,<0|1> bonding enable only acceps device that matches the stored address -SY,<hex> power setting** -SZ,<val> non-standard raw baud rate <val>=baud*0.004096 -S~,<val> Profile 0:SPP, 5:APL, 6:HID -S-,<string> Device name -15 alphanumeric charactors -S?,<0|1> role switch enable -S$,<char> command mode char -$|,<hex> low-power connect mode deep sleep/active(discoverable and connectable) cycle -D display basic setting -E display extended setting -GB display the device's Bluetooth address -GF display Bluetooth address of connected device -GK show connection status -GR show remote address for reconnecting -G& show GPIO pin -G<char> show stored setting -+ toggle local echo on/off -& show GPIO 3,4,6,7(DIP switch) -C connect to stored remote address -C,<address> connect last address -CFI connect and go into fast data mode -CFR connect and go into fast data mode -CT,<address>,<val> connect to the address and disconnect after val? -F,1 fast data mod: -H display help -I,<time>,<cod> inquiry scan with <cod> -IN,<time>,<cod> inquiry scan with <cod>, return without BT name -IR inquiry scan with 0055AA -IS inquiry scan with 001F00 -J hide pin code -K, kill disconnects current connection -L link quality -M show modem signlal status -O display other settings -P,<char> pass through? -Q quiet mode make the module not discoverable -Q,0 discoverable and connectable -Q,1 not discoverable and not connectable -Q,2 not discoverable and connectable -Q,? display current quiet mode -R,1 reboot -T,<0|1> pass received data while in command mode -U,<baud>,<parity> change UART setting tentatively -V display firmware version -W wake from quiet mode enable discovery and connection -Z deep sleep mode(<2mA) - - -Reset to Factory Default ------------------------- -SF,1 -R,1 diff --git a/keyboard/hhkb/rn42/battery.c b/keyboard/hhkb/rn42/battery.c deleted file mode 100644 index 7e868c9646..0000000000 --- a/keyboard/hhkb/rn42/battery.c +++ /dev/null @@ -1,130 +0,0 @@ -#include <avr/io.h> -#include <util/delay.h> -#include "battery.h" - - -/* - * Battery - */ -void battery_init(void) -{ - // blink - battery_led(LED_ON); _delay_ms(500); - battery_led(LED_OFF); _delay_ms(500); - battery_led(LED_ON); _delay_ms(500); - battery_led(LED_OFF); _delay_ms(500); - // LED indicates charger status - battery_led(LED_CHARGER); - - // ADC setting for voltage monitor - // Ref:2.56V band-gap, Input:ADC0(PF0), Prescale:128(16MHz/128=125KHz) - ADMUX = (1<<REFS1) | (1<<REFS0); - ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0); - // digital input buffer disable(24.9.5) - DIDR0 = (1<<ADC0D) | (1<<ADC4D) | (1<<ADC7D); - DIDR1 = (1<<AIN0D); - DIDR2 = (1<<ADC8D) | (1<<ADC9D) | (1<<ADC11D) | (1<<ADC12D) | (1<<ADC13D); - - // ADC disable voltate divider(PF4) - DDRF |= (1<<4); - PORTF &= ~(1<<4); -} - -// Indicator for battery -void battery_led(battery_led_t val) -{ - if (val == LED_TOGGLE) { - // Toggle LED - DDRF |= (1<<5); - PINF |= (1<<5); - } else if (val == LED_ON) { - // On overriding charger status - DDRF |= (1<<5); - PORTF &= ~(1<<5); - } else if (val == LED_OFF) { - // Off overriding charger status - DDRF |= (1<<5); - PORTF |= (1<<5); - } else { - // Display charger status - DDRF &= ~(1<<5); - PORTF &= ~(1<<5); - } -} - -bool battery_charging(void) -{ - if (!(USBSTA&(1<<VBUS))) return false; - - // Charger Status: - // MCP73831 MCP73832 LTC4054 Status - // Hi-Z Hi-Z Hi-Z Shutdown/No Battery - // Low Low Low Charging - // Hi Hi-Z Hi-Z Charged - - // preserve last register status - uint8_t ddrf_prev = DDRF; - uint8_t portf_prev = PORTF; - - // Input with pullup - DDRF &= ~(1<<5); - PORTF |= (1<<5); - _delay_ms(1); - bool charging = PINF&(1<<5) ? false : true; - - // restore last register status - DDRF = (DDRF&~(1<<5)) | (ddrf_prev&(1<<5)); - PORTF = (PORTF&~(1<<5)) | (portf_prev&(1<<5)); - - // TODO: With MCP73831 this can not get stable status when charging. - // LED is powered from PSEL line(USB or Lipo) - // due to weak low output of STAT pin? - // due to pull-up'd via resitor and LED? - return charging; -} - -// Returns voltage in mV -uint16_t battery_voltage(void) -{ - // ADC disable voltate divider(PF4) - DDRF |= (1<<4); - PORTF |= (1<<4); - - volatile uint16_t bat; - ADCSRA |= (1<<ADEN); - _delay_ms(1); // wait for charging S/H capacitance - - ADCSRA |= (1<<ADSC); - while (ADCSRA & (1<<ADSC)) ; - bat = ADC; - - ADCSRA &= ~(1<<ADEN); - - // ADC disable voltate divider(PF4) - DDRF |= (1<<4); - PORTF &= ~(1<<4); - - return (bat - BATTERY_ADC_OFFSET) * BATTERY_ADC_RESOLUTION; -} - -static bool low_voltage(void) { - static bool low = false; - uint16_t v = battery_voltage(); - if (v < BATTERY_VOLTAGE_LOW_LIMIT) { - low = true; - } else if (v > BATTERY_VOLTAGE_LOW_RECOVERY) { - low = false; - } - return low; -} - -battery_status_t battery_status(void) -{ - if (USBSTA&(1<<VBUS)) { - /* powered */ - return battery_charging() ? CHARGING : FULL_CHARGED; - } else { - /* not powered */ - return low_voltage() ? LOW_VOLTAGE : DISCHARGING; - } -} diff --git a/keyboard/hhkb/rn42/battery.h b/keyboard/hhkb/rn42/battery.h deleted file mode 100644 index 180d4dcfaa..0000000000 --- a/keyboard/hhkb/rn42/battery.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef POWER_H -#define POWER_H - -#include <stdint.h> -#include <stdbool.h> - -typedef enum { - FULL_CHARGED, - CHARGING, - DISCHARGING, - LOW_VOLTAGE, - UNKNOWN, -} battery_status_t; - -typedef enum { - LED_CHARGER = 0, - LED_ON, - LED_OFF, - LED_TOGGLE, -} battery_led_t; - -/* Battery API */ -void battery_init(void); -void battery_led(battery_led_t val); -bool battery_charging(void); -uint16_t battery_voltage(void); -battery_status_t battery_status(void); - -#define BATTERY_VOLTAGE_LOW_LIMIT 3500 -#define BATTERY_VOLTAGE_LOW_RECOVERY 3700 -// ADC offset:16, resolution:5mV -#define BATTERY_ADC_OFFSET 16 -#define BATTERY_ADC_RESOLUTION 5 - -#endif diff --git a/keyboard/hhkb/rn42/main.c b/keyboard/hhkb/rn42/main.c deleted file mode 100644 index 83d9950388..0000000000 --- a/keyboard/hhkb/rn42/main.c +++ /dev/null @@ -1,111 +0,0 @@ -#include <avr/io.h> -#include <avr/power.h> -#include <avr/wdt.h> -#include "lufa.h" -#include "print.h" -#include "sendchar.h" -#include "rn42.h" -#include "rn42_task.h" -#include "serial.h" -#include "keyboard.h" -#include "keycode.h" -#include "action.h" -#include "action_util.h" -#include "wait.h" -#include "suart.h" -#include "suspend.h" - -static int8_t sendchar_func(uint8_t c) -{ - xmit(c); // SUART - sendchar(c); // LUFA - return 0; -} - -static void SetupHardware(void) -{ - /* Disable watchdog if enabled by bootloader/fuses */ - MCUSR &= ~(1 << WDRF); - wdt_disable(); - - /* Disable clock division */ - clock_prescale_set(clock_div_1); - - // Leonardo needs. Without this USB device is not recognized. - USB_Disable(); - - USB_Init(); - - // for Console_Task - USB_Device_EnableSOFEvents(); - print_set_sendchar(sendchar_func); - - // SUART PD0:output, PD1:input - DDRD |= (1<<0); - PORTD |= (1<<0); - DDRD &= ~(1<<1); - PORTD |= (1<<1); -} - -int main(void) __attribute__ ((weak)); -int main(void) -{ - SetupHardware(); - sei(); - - /* wait for USB startup to get ready for debug output */ - uint8_t timeout = 255; // timeout when USB is not available(Bluetooth) - while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) { - wait_ms(4); -#if defined(INTERRUPT_CONTROL_ENDPOINT) - ; -#else - USB_USBTask(); -#endif - } - print("\nUSB init\n"); - - rn42_init(); - rn42_task_init(); - print("RN-42 init\n"); - - /* init modules */ - keyboard_init(); - - if (!rn42_rts()) { - host_set_driver(&rn42_driver); - } else { - host_set_driver(&lufa_driver); - } - -#ifdef SLEEP_LED_ENABLE - sleep_led_init(); -#endif - - print("Keyboard start\n"); - while (1) { - while (rn42_rts() && // RN42 is off - USB_DeviceState == DEVICE_STATE_Suspended) { - print("[s]"); - matrix_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { - USB_Device_SendRemoteWakeup(); - } - } - - keyboard_task(); - -#if !defined(INTERRUPT_CONTROL_ENDPOINT) - USB_USBTask(); -#endif - - rn42_task(); - } -} diff --git a/keyboard/hhkb/rn42/rn42.c b/keyboard/hhkb/rn42/rn42.c deleted file mode 100644 index 756285d7bb..0000000000 --- a/keyboard/hhkb/rn42/rn42.c +++ /dev/null @@ -1,237 +0,0 @@ -#include <avr/io.h> -#include "host.h" -#include "host_driver.h" -#include "serial.h" -#include "rn42.h" -#include "print.h" -#include "timer.h" -#include "wait.h" - - -/* Host driver */ -static uint8_t keyboard_leds(void); -static void send_keyboard(report_keyboard_t *report); -static void send_mouse(report_mouse_t *report); -static void send_system(uint16_t data); -static void send_consumer(uint16_t data); - -host_driver_t rn42_driver = { - keyboard_leds, - send_keyboard, - send_mouse, - send_system, - send_consumer -}; - - -void rn42_init(void) -{ - // JTAG disable for PORT F. write JTD bit twice within four cycles. - MCUCR |= (1<<JTD); - MCUCR |= (1<<JTD); - - // PF7: BT connection control(high: connect, low: disconnect) - rn42_autoconnect(); - - // PF6: linked(input without pull-up) - DDRF &= ~(1<<6); - PORTF |= (1<<6); - - // PF1: RTS(low: allowed to send, high: not allowed) - DDRF &= ~(1<<1); - PORTF &= ~(1<<1); - - // PD5: CTS(low: allow to send, high:not allow) - DDRD |= (1<<5); - PORTD &= ~(1<<5); - - serial_init(); -} - -int16_t rn42_getc(void) -{ - return serial_recv2(); -} - -const char *rn42_gets(uint16_t timeout) -{ - static char s[24]; - uint16_t t = timer_read(); - uint8_t i = 0; - int16_t c; - while (i < 23 && timer_elapsed(t) < timeout) { - if ((c = rn42_getc()) != -1) { - if ((char)c == '\r') continue; - if ((char)c == '\n') break; - s[i++] = c; - } - } - s[i] = '\0'; - return s; -} - -void rn42_putc(uint8_t c) -{ - serial_send(c); -} - -void rn42_puts(char *s) -{ - while (*s) - serial_send(*s++); -} - -bool rn42_autoconnecting(void) -{ - // GPIO6 for control connection(high: auto connect, low: disconnect) - // Note that this needs config: SM,4(Auto-Connect DTR Mode) - return (PORTF & (1<<7) ? true : false); -} - -void rn42_autoconnect(void) -{ - // hi to auto connect - DDRF |= (1<<7); - PORTF |= (1<<7); -} - -void rn42_disconnect(void) -{ - // low to disconnect - DDRF |= (1<<7); - PORTF &= ~(1<<7); -} - -bool rn42_rts(void) -{ - // low when RN-42 is powered and ready to receive - return PINF&(1<<1); -} - -void rn42_cts_hi(void) -{ - // not allow to send - PORTD |= (1<<5); -} - -void rn42_cts_lo(void) -{ - // allow to send - PORTD &= ~(1<<5); -} - -bool rn42_linked(void) -{ - // RN-42 GPIO2 - // Hi-Z: Not powered - // High: Linked - // Low: Connecting - return PINF&(1<<6); -} - - -static uint8_t leds = 0; -static uint8_t keyboard_leds(void) { return leds; } -void rn42_set_leds(uint8_t l) { leds = l; } - -static void send_keyboard(report_keyboard_t *report) -{ - // wake from deep sleep -/* - PORTD |= (1<<5); // high - wait_ms(5); - PORTD &= ~(1<<5); // low -*/ - - serial_send(0xFD); // Raw report mode - serial_send(9); // length - serial_send(1); // descriptor type - serial_send(report->mods); - serial_send(0x00); - serial_send(report->keys[0]); - serial_send(report->keys[1]); - serial_send(report->keys[2]); - serial_send(report->keys[3]); - serial_send(report->keys[4]); - serial_send(report->keys[5]); -} - -static void send_mouse(report_mouse_t *report) -{ - // wake from deep sleep -/* - PORTD |= (1<<5); // high - wait_ms(5); - PORTD &= ~(1<<5); // low -*/ - - serial_send(0xFD); // Raw report mode - serial_send(5); // length - serial_send(2); // descriptor type - serial_send(report->buttons); - serial_send(report->x); - serial_send(report->y); - serial_send(report->v); -} - -static void send_system(uint16_t data) -{ - // Table 5-6 of RN-BT-DATA-UB - // 81,82,83 scan codes can be used? -} - - -static uint16_t usage2bits(uint16_t usage) -{ - switch (usage) { - case AC_HOME: return 0x01; - case AL_EMAIL: return 0x02; - case AC_SEARCH: return 0x04; - //case AL_KBD_LAYOUT: return 0x08; // Apple virtual keybaord toggle - case AUDIO_VOL_UP: return 0x10; - case AUDIO_VOL_DOWN: return 0x20; - case AUDIO_MUTE: return 0x40; - case TRANSPORT_PLAY_PAUSE: return 0x80; - case TRANSPORT_NEXT_TRACK: return 0x100; - case TRANSPORT_PREV_TRACK: return 0x200; - case TRANSPORT_STOP: return 0x400; - case TRANSPORT_STOP_EJECT: return 0x800; - //case return 0x1000; // Fast forward - //case return 0x2000; // Rewind - //case return 0x4000; // Stop/eject - //case return 0x8000; // Internet browser - }; - return 0; -} - -static void send_consumer(uint16_t data) -{ - uint16_t bits = usage2bits(data); - serial_send(0xFD); // Raw report mode - serial_send(3); // length - serial_send(3); // descriptor type - serial_send(bits&0xFF); - serial_send((bits>>8)&0xFF); -} - - -/* Null driver for config_mode */ -static uint8_t config_keyboard_leds(void); -static void config_send_keyboard(report_keyboard_t *report); -static void config_send_mouse(report_mouse_t *report); -static void config_send_system(uint16_t data); -static void config_send_consumer(uint16_t data); - -host_driver_t rn42_config_driver = { - config_keyboard_leds, - config_send_keyboard, - config_send_mouse, - config_send_system, - config_send_consumer -}; - -static uint8_t config_keyboard_leds(void) { return leds; } -static void config_send_keyboard(report_keyboard_t *report) {} -static void config_send_mouse(report_mouse_t *report) {} -static void config_send_system(uint16_t data) {} -static void config_send_consumer(uint16_t data) {} diff --git a/keyboard/hhkb/rn42/rn42.h b/keyboard/hhkb/rn42/rn42.h deleted file mode 100644 index db6916fe86..0000000000 --- a/keyboard/hhkb/rn42/rn42.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef RN42_H -#define RN42_H - -#include <stdbool.h> - -host_driver_t rn42_driver; -host_driver_t rn42_config_driver; - -void rn42_init(void); -int16_t rn42_getc(void); -const char *rn42_gets(uint16_t timeout); -void rn42_putc(uint8_t c); -void rn42_puts(char *s); -bool rn42_autoconnecting(void); -void rn42_autoconnect(void); -void rn42_disconnect(void); -bool rn42_rts(void); -void rn42_cts_hi(void); -void rn42_cts_lo(void); -bool rn42_linked(void); -void rn42_set_leds(uint8_t l); - -#endif diff --git a/keyboard/hhkb/rn42/rn42_task.c b/keyboard/hhkb/rn42/rn42_task.c deleted file mode 100644 index 84001b3f1a..0000000000 --- a/keyboard/hhkb/rn42/rn42_task.c +++ /dev/null @@ -1,478 +0,0 @@ -#include <stdint.h> -#include <string.h> -#include <avr/pgmspace.h> -#include <avr/eeprom.h> -#include "keycode.h" -#include "serial.h" -#include "host.h" -#include "action.h" -#include "action_util.h" -#include "lufa.h" -#include "rn42_task.h" -#include "print.h" -#include "debug.h" -#include "timer.h" -#include "wait.h" -#include "command.h" -#include "battery.h" - -static bool config_mode = false; -static bool force_usb = false; - -static void status_led(bool on) -{ - if (on) { - DDRE |= (1<<6); - PORTE &= ~(1<<6); - } else { - DDRE |= (1<<6); - PORTE |= (1<<6); - } -} - -void rn42_task_init(void) -{ - battery_init(); -} - -void rn42_task(void) -{ - int16_t c; - // Raw mode: interpret output report of LED state - while ((c = rn42_getc()) != -1) { - // LED Out report: 0xFE, 0x02, 0x01, <leds> - // To get the report over UART set bit3 with SH, command. - static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT; - switch (state) { - case LED_INIT: - if (c == 0xFE) state = LED_FE; - else { - if (0x0 <= c && c <= 0x7f) xprintf("%c", c); - else xprintf(" %02X", c); - } - break; - case LED_FE: - if (c == 0x02) state = LED_02; - else state = LED_INIT; - break; - case LED_02: - if (c == 0x01) state = LED_01; - else state = LED_INIT; - break; - case LED_01: - dprintf("LED status: %02X\n", c); - rn42_set_leds(c); - state = LED_INIT; - break; - default: - state = LED_INIT; - } - } - - /* Bluetooth mode when ready */ - if (!config_mode && !force_usb) { - if (!rn42_rts() && host_get_driver() != &rn42_driver) { - clear_keyboard(); - host_set_driver(&rn42_driver); - } else if (rn42_rts() && host_get_driver() != &lufa_driver) { - clear_keyboard(); - host_set_driver(&lufa_driver); - } - } - - - static uint16_t prev_timer = 0; - uint16_t e = timer_elapsed(prev_timer); - if (e > 1000) { - /* every second */ - prev_timer += e/1000*1000; - - /* Low voltage alert */ - uint8_t bs = battery_status(); - if (bs == LOW_VOLTAGE) { - battery_led(LED_ON); - } else { - battery_led(LED_CHARGER); - } - - /* every minute */ - uint32_t t = timer_read32()/1000; - if (t%60 == 0) { - uint16_t v = battery_voltage(); - uint8_t h = t/3600; - uint8_t m = t%3600/60; - uint8_t s = t%60; - dprintf("%02u:%02u:%02u\t%umV\n", h, m, s, v); - /* TODO: xprintf doesn't work for this. - xprintf("%02u:%02u:%02u\t%umV\n", (t/3600), (t%3600/60), (t%60), v); - */ - } - } - - - /* Connection monitor */ - if (!rn42_rts() && rn42_linked()) { - status_led(true); - } else { - status_led(false); - } -} - - - -/****************************************************************************** - * Command - ******************************************************************************/ -static host_driver_t *prev_driver = &rn42_driver; - -static void print_rn42(void) -{ - int16_t c; - while ((c = rn42_getc()) != -1) { - xprintf("%c", c); - } -} - -static void clear_rn42(void) -{ - while (rn42_getc() != -1) ; -} - -#define SEND_STR(str) send_str(PSTR(str)) -#define SEND_COMMAND(cmd) send_command(PSTR(cmd)) - -static void send_str(const char *str) -{ - uint8_t c; - while ((c = pgm_read_byte(str++))) - rn42_putc(c); -} - -static const char *send_command(const char *cmd) -{ - static const char *s; - send_str(cmd); - wait_ms(500); - s = rn42_gets(100); - xprintf("%s\r\n", s); - print_rn42(); - return s; -} - -static void enter_command_mode(void) -{ - prev_driver = host_get_driver(); - clear_keyboard(); - host_set_driver(&rn42_config_driver); // null driver; not to send a key to host - rn42_disconnect(); - while (rn42_linked()) ; - - print("Entering config mode ...\n"); - wait_ms(1100); // need 1 sec - SEND_COMMAND("$$$"); - wait_ms(600); // need 1 sec - print_rn42(); - const char *s = SEND_COMMAND("v\r\n"); - if (strncmp("v", s, 1) != 0) SEND_COMMAND("+\r\n"); // local echo on -} - -static void exit_command_mode(void) -{ - print("Exiting config mode ...\n"); - SEND_COMMAND("---\r\n"); // exit - - rn42_autoconnect(); - clear_keyboard(); - host_set_driver(prev_driver); -} - -static void init_rn42(void) -{ - // RN-42 configure - if (!config_mode) enter_command_mode(); - SEND_COMMAND("SF,1\r\n"); // factory defaults - SEND_COMMAND("S-,TmkBT\r\n"); - SEND_COMMAND("SS,Keyboard/Mouse\r\n"); - SEND_COMMAND("SM,4\r\n"); // auto connect(DTR) - SEND_COMMAND("SW,8000\r\n"); // Sniff disable - SEND_COMMAND("S~,6\r\n"); // HID profile - SEND_COMMAND("SH,003C\r\n"); // combo device, out-report, 4-reconnect - SEND_COMMAND("SY,FFF4\r\n"); // transmit power -12 - SEND_COMMAND("R,1\r\n"); - if (!config_mode) exit_command_mode(); -} - -#if 0 -// Switching connections -// NOTE: Remote Address doesn't work in the way manual says. -// EEPROM address for link store -#define RN42_LINK0 (uint8_t *)128 -#define RN42_LINK1 (uint8_t *)140 -#define RN42_LINK2 (uint8_t *)152 -#define RN42_LINK3 (uint8_t *)164 -static void store_link(uint8_t *eeaddr) -{ - enter_command_mode(); - SEND_STR("GR\r\n"); // remote address - const char *s = rn42_gets(500); - if (strcmp("GR", s) == 0) s = rn42_gets(500); // ignore local echo - xprintf("%s(%d)\r\n", s, strlen(s)); - if (strlen(s) == 12) { - for (int i = 0; i < 12; i++) { - eeprom_update_byte(eeaddr+i, *(s+i)); - dprintf("%c ", *(s+i)); - } - dprint("\r\n"); - } - exit_command_mode(); -} - -static void restore_link(const uint8_t *eeaddr) -{ - enter_command_mode(); - SEND_COMMAND("SR,Z\r\n"); // remove remote address - SEND_STR("SR,"); // set remote address from EEPROM - for (int i = 0; i < 12; i++) { - uint8_t c = eeprom_read_byte(eeaddr+i); - rn42_putc(c); - dprintf("%c ", c); - } - dprintf("\r\n"); - SEND_COMMAND("\r\n"); - SEND_COMMAND("R,1\r\n"); // reboot - exit_command_mode(); -} - -static const char *get_link(uint8_t * eeaddr) -{ - static char s[13]; - for (int i = 0; i < 12; i++) { - uint8_t c = eeprom_read_byte(eeaddr+i); - s[i] = c; - } - s[12] = '\0'; - return s; -} -#endif - -static void pairing(void) -{ - enter_command_mode(); - SEND_COMMAND("SR,Z\r\n"); // remove remote address - SEND_COMMAND("R,1\r\n"); // reboot - exit_command_mode(); -} - -bool command_extra(uint8_t code) -{ - uint32_t t; - uint16_t b; - switch (code) { - case KC_H: - case KC_SLASH: /* ? */ - print("\n\n----- Bluetooth RN-42 Help -----\n"); - print("i: RN-42 info\n"); - print("b: battery voltage\n"); - print("Del: enter/exit RN-42 config mode\n"); - print("Slck: RN-42 initialize\n"); -#if 0 - print("1-4: restore link\n"); - print("F1-F4: store link\n"); -#endif - print("p: pairing\n"); - - if (config_mode) { - return true; - } else { - print("u: toggle Force USB mode\n"); - return false; // to display default command help - } - case KC_P: - pairing(); - return true; -#if 0 - /* Store link address to EEPROM */ - case KC_F1: - store_link(RN42_LINK0); - return true; - case KC_F2: - store_link(RN42_LINK1); - return true; - case KC_F3: - store_link(RN42_LINK2); - return true; - case KC_F4: - store_link(RN42_LINK3); - return true; - /* Restore link address to EEPROM */ - case KC_1: - restore_link(RN42_LINK0); - return true; - case KC_2: - restore_link(RN42_LINK1); - return true; - case KC_3: - restore_link(RN42_LINK2); - return true; - case KC_4: - restore_link(RN42_LINK3); - return true; -#endif - case KC_I: - print("\n----- RN-42 info -----\n"); - xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA"); - xprintf("force_usb: %X\n", force_usb); - xprintf("rn42: %s\n", rn42_rts() ? "OFF" : (rn42_linked() ? "CONN" : "ON")); - xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting()); - xprintf("config_mode: %X\n", config_mode); - xprintf("USB State: %s\n", - (USB_DeviceState == DEVICE_STATE_Unattached) ? "Unattached" : - (USB_DeviceState == DEVICE_STATE_Powered) ? "Powered" : - (USB_DeviceState == DEVICE_STATE_Default) ? "Default" : - (USB_DeviceState == DEVICE_STATE_Addressed) ? "Addressed" : - (USB_DeviceState == DEVICE_STATE_Configured) ? "Configured" : - (USB_DeviceState == DEVICE_STATE_Suspended) ? "Suspended" : "?"); - xprintf("battery: "); - switch (battery_status()) { - case FULL_CHARGED: xprintf("FULL"); break; - case CHARGING: xprintf("CHARG"); break; - case DISCHARGING: xprintf("DISCHG"); break; - case LOW_VOLTAGE: xprintf("LOW"); break; - default: xprintf("?"); break; - }; - xprintf("\n"); - xprintf("RemoteWakeupEnabled: %X\n", USB_Device_RemoteWakeupEnabled); - xprintf("VBUS: %X\n", USBSTA&(1<<VBUS)); - t = timer_read32()/1000; - uint8_t d = t/3600/24; - uint8_t h = t/3600; - uint8_t m = t%3600/60; - uint8_t s = t%60; - xprintf("uptime: %02u %02u:%02u:%02u\n", d, h, m, s); -#if 0 - xprintf("LINK0: %s\r\n", get_link(RN42_LINK0)); - xprintf("LINK1: %s\r\n", get_link(RN42_LINK1)); - xprintf("LINK2: %s\r\n", get_link(RN42_LINK2)); - xprintf("LINK3: %s\r\n", get_link(RN42_LINK3)); -#endif - return true; - case KC_B: - // battery monitor - t = timer_read32()/1000; - b = battery_voltage(); - xprintf("BAT: %umV\t", b); - xprintf("%02u:", t/3600); - xprintf("%02u:", t%3600/60); - xprintf("%02u\n", t%60); - return true; - case KC_U: - if (config_mode) return false; - if (force_usb) { - print("Auto mode\n"); - force_usb = false; - } else { - print("USB mode\n"); - force_usb = true; - clear_keyboard(); - host_set_driver(&lufa_driver); - } - return true; - case KC_DELETE: - /* RN-42 Command mode */ - if (rn42_autoconnecting()) { - enter_command_mode(); - - command_state = CONSOLE; - config_mode = true; - } else { - exit_command_mode(); - - command_state = ONESHOT; - config_mode = false; - } - return true; - case KC_SCROLLLOCK: - init_rn42(); - return true; - default: - if (config_mode) - return true; - else - return false; // yield to default command - } - return true; -} - -/* - * RN-42 Command mode - * sends charactors to the module - */ -static uint8_t code2asc(uint8_t code); -bool command_console_extra(uint8_t code) -{ - rn42_putc(code2asc(code)); - return true; -} - -// convert keycode into ascii charactor -static uint8_t code2asc(uint8_t code) -{ - bool shifted = (get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))) ? true : false; - switch (code) { - case KC_A: return (shifted ? 'A' : 'a'); - case KC_B: return (shifted ? 'B' : 'b'); - case KC_C: return (shifted ? 'C' : 'c'); - case KC_D: return (shifted ? 'D' : 'd'); - case KC_E: return (shifted ? 'E' : 'e'); - case KC_F: return (shifted ? 'F' : 'f'); - case KC_G: return (shifted ? 'G' : 'g'); - case KC_H: return (shifted ? 'H' : 'h'); - case KC_I: return (shifted ? 'I' : 'i'); - case KC_J: return (shifted ? 'J' : 'j'); - case KC_K: return (shifted ? 'K' : 'k'); - case KC_L: return (shifted ? 'L' : 'l'); - case KC_M: return (shifted ? 'M' : 'm'); - case KC_N: return (shifted ? 'N' : 'n'); - case KC_O: return (shifted ? 'O' : 'o'); - case KC_P: return (shifted ? 'P' : 'p'); - case KC_Q: return (shifted ? 'Q' : 'q'); - case KC_R: return (shifted ? 'R' : 'r'); - case KC_S: return (shifted ? 'S' : 's'); - case KC_T: return (shifted ? 'T' : 't'); - case KC_U: return (shifted ? 'U' : 'u'); - case KC_V: return (shifted ? 'V' : 'v'); - case KC_W: return (shifted ? 'W' : 'w'); - case KC_X: return (shifted ? 'X' : 'x'); - case KC_Y: return (shifted ? 'Y' : 'y'); - case KC_Z: return (shifted ? 'Z' : 'z'); - case KC_1: return (shifted ? '!' : '1'); - case KC_2: return (shifted ? '@' : '2'); - case KC_3: return (shifted ? '#' : '3'); - case KC_4: return (shifted ? '$' : '4'); - case KC_5: return (shifted ? '%' : '5'); - case KC_6: return (shifted ? '^' : '6'); - case KC_7: return (shifted ? '&' : '7'); - case KC_8: return (shifted ? '*' : '8'); - case KC_9: return (shifted ? '(' : '9'); - case KC_0: return (shifted ? ')' : '0'); - case KC_ENTER: return '\n'; - case KC_ESCAPE: return 0x1B; - case KC_BSPACE: return '\b'; - case KC_TAB: return '\t'; - case KC_SPACE: return ' '; - case KC_MINUS: return (shifted ? '_' : '-'); - case KC_EQUAL: return (shifted ? '+' : '='); - case KC_LBRACKET: return (shifted ? '{' : '['); - case KC_RBRACKET: return (shifted ? '}' : ']'); - case KC_BSLASH: return (shifted ? '|' : '\\'); - case KC_NONUS_HASH: return (shifted ? '|' : '\\'); - case KC_SCOLON: return (shifted ? ':' : ';'); - case KC_QUOTE: return (shifted ? '"' : '\''); - case KC_GRAVE: return (shifted ? '~' : '`'); - case KC_COMMA: return (shifted ? '<' : ','); - case KC_DOT: return (shifted ? '>' : '.'); - case KC_SLASH: return (shifted ? '?' : '/'); - case KC_DELETE: return '\0'; // Delete to disconnect - default: return ' '; - } -} diff --git a/keyboard/hhkb/rn42/rn42_task.h b/keyboard/hhkb/rn42/rn42_task.h deleted file mode 100644 index 8f6c3ab64d..0000000000 --- a/keyboard/hhkb/rn42/rn42_task.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef RN42_TASK_H -#define RN42_TASK_H - -#include <stdbool.h> -#include "rn42.h" - -void rn42_task_init(void); -void rn42_task(void); - -#endif diff --git a/keyboard/hhkb/rn42/suart.S b/keyboard/hhkb/rn42/suart.S deleted file mode 100644 index 9fa5452928..0000000000 --- a/keyboard/hhkb/rn42/suart.S +++ /dev/null @@ -1,156 +0,0 @@ -;---------------------------------------------------------------------------;
-; Software implemented UART module ;
-; (C)ChaN, 2005 (http://elm-chan.org/) ;
-;---------------------------------------------------------------------------;
-; Bit rate settings:
-;
-; 1MHz 2MHz 4MHz 6MHz 8MHz 10MHz 12MHz 16MHz 20MHz
-; 2.4kbps 138 - - - - - - - -
-; 4.8kbps 68 138 - - - - - - -
-; 9.6kbps 33 68 138 208 - - - - -
-; 19.2kbps - 33 68 102 138 173 208 - -
-; 38.4kbps - - 33 50 68 85 102 138 172
-; 57.6kbps - - 21 33 44 56 68 91 114
-; 115.2kbps - - - - 21 27 33 44 56
-
-.nolist
-#include <avr/io.h>
-.list
-
-#define BPS 44 /* Bit delay. (see above table) */
-#define BIDIR 0 /* 0:Separated Tx/Rx, 1:Shared Tx/Rx */
-
-#define OUT_1 sbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 1 */
-#define OUT_0 cbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 0 */
-#define SKIP_IN_1 sbis _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 1 */
-#define SKIP_IN_0 sbic _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 0 */
-
-
-
-#ifdef SPM_PAGESIZE
-.macro _LPMI reg
- lpm \reg, Z+
-.endm
-.macro _MOVW dh,dl, sh,sl
- movw \dl, \sl
-.endm
-#else
-.macro _LPMI reg
- lpm
- mov \reg, r0
- adiw ZL, 1
-.endm
-.macro _MOVW dh,dl, sh,sl
- mov \dl, \sl
- mov \dh, \sh
-.endm
-#endif
-
-
-
-;---------------------------------------------------------------------------;
-; Transmit a byte in serial format of N81
-;
-;Prototype: void xmit (uint8_t data);
-;Size: 16 words
-
-.global xmit
-.func xmit
-xmit:
-#if BIDIR
- ldi r23, BPS-1 ;Pre-idle time for bidirectional data line
-5: dec r23 ;
- brne 5b ;/
-#endif
- in r0, _SFR_IO_ADDR(SREG) ;Save flags
-
- com r24 ;C = start bit
- ldi r25, 10 ;Bit counter
- cli ;Start critical section
-
-1: ldi r23, BPS-1 ;----- Bit transferring loop
-2: dec r23 ;Wait for a bit time
- brne 2b ;/
- brcs 3f ;MISO = bit to be sent
- OUT_1 ;
-3: brcc 4f ;
- OUT_0 ;/
-4: lsr r24 ;Get next bit into C
- dec r25 ;All bits sent?
- brne 1b ; no, coutinue
-
- out _SFR_IO_ADDR(SREG), r0 ;End of critical section
- ret
-.endfunc
-
-
-
-;---------------------------------------------------------------------------;
-; Receive a byte
-;
-;Prototype: uint8_t rcvr (void);
-;Size: 19 words
-
-.global rcvr
-.func rcvr
-rcvr:
- in r0, _SFR_IO_ADDR(SREG) ;Save flags
-
- ldi r24, 0x80 ;Receiving shift reg
- cli ;Start critical section
-
-1: SKIP_IN_1 ;Wait for idle
- rjmp 1b
-2: SKIP_IN_0 ;Wait for start bit
- rjmp 2b
- ldi r25, BPS/2 ;Wait for half bit time
-3: dec r25
- brne 3b
-
-4: ldi r25, BPS ;----- Bit receiving loop
-5: dec r25 ;Wait for a bit time
- brne 5b ;/
- lsr r24 ;Next bit
- SKIP_IN_0 ;Get a data bit into r24.7
- ori r24, 0x80
- brcc 4b ;All bits received? no, continue
-
- out _SFR_IO_ADDR(SREG), r0 ;End of critical section
- ret
-.endfunc
-
-
-; Not wait for start bit. This should be called after detecting start bit.
-.global recv
-.func recv
-recv:
- in r0, _SFR_IO_ADDR(SREG) ;Save flags
-
- ldi r24, 0x80 ;Receiving shift reg
- cli ;Start critical section
-
-;1: SKIP_IN_1 ;Wait for idle
-; rjmp 1b
-;2: SKIP_IN_0 ;Wait for start bit
-; rjmp 2b
- ldi r25, BPS/2 ;Wait for half bit time
-3: dec r25
- brne 3b
-
-4: ldi r25, BPS ;----- Bit receiving loop
-5: dec r25 ;Wait for a bit time
- brne 5b ;/
- lsr r24 ;Next bit
- SKIP_IN_0 ;Get a data bit into r24.7
- ori r24, 0x80
- brcc 4b ;All bits received? no, continue
-
- ldi r25, BPS/2 ;Wait for half bit time
-6: dec r25
- brne 6b
-7: SKIP_IN_1 ;Wait for stop bit
- rjmp 7b
-
- out _SFR_IO_ADDR(SREG), r0 ;End of critical section
- ret
-.endfunc
diff --git a/keyboard/hhkb/rn42/suart.h b/keyboard/hhkb/rn42/suart.h deleted file mode 100644 index 72725b998f..0000000000 --- a/keyboard/hhkb/rn42/suart.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SUART
-#define SUART
-
-void xmit(uint8_t);
-uint8_t rcvr(void);
-uint8_t recv(void);
-
-#endif /* SUART */
diff --git a/keyboard/hhkb_qmk/README.md b/keyboard/hhkb_qmk/README.md deleted file mode 100644 index 389407b3aa..0000000000 --- a/keyboard/hhkb_qmk/README.md +++ /dev/null @@ -1,180 +0,0 @@ -hhkb_qmk keyboard firmware -====================== - -## Quantum MK Firmware - -You have access to a bunch of goodies! Check out the Makefile to enable/disable some of the features. Uncomment the `#` to enable them. Setting them to `no` does nothing and will only confuse future you. - - BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - MIDI_ENABLE = yes # MIDI controls - # UNICODE_ENABLE = yes # Unicode support - this is commented out, just as an example. You have to use #, not // - BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID - -## Quick aliases to common actions - -Your keymap can include shortcuts to common operations (called "function actions" in tmk). - -### Switching and toggling layers - -`MO(layer)` - momentary switch to *layer*. As soon as you let go of the key, the layer is deactivated and you pop back out to the previous layer. When you apply this to a key, that same key must be set as `KC_TRNS` on the destination layer. Otherwise, you won't make it back to the original layer when you release the key (and you'll get a keycode sent). You can only switch to layers *above* your current layer. If you're on layer 0 and you use `MO(1)`, that will switch to layer 1 just fine. But if you include `MO(3)` on layer 5, that won't do anything for you -- because layer 3 is lower than layer 5 on the stack. - -`LT(layer, kc)` - momentary switch to *layer* when held, and *kc* when tapped. Like `MO()`, this only works upwards in the layer stack (`layer` must be higher than the current layer). - -`TG(layer)` - toggles a layer on or off. As with `MO()`, you should set this key as `KC_TRNS` in the destination layer so that tapping it again actually toggles back to the original layer. Only works upwards in the layer stack. - -### Fun with modifier keys - -* `LSFT(kc)` - applies left Shift to *kc* (keycode) - `S(kc)` is an alias -* `RSFT(kc)` - applies right Shift to *kc* -* `LCTL(kc)` - applies left Control to *kc* -* `RCTL(kc)` - applies right Control to *kc* -* `LALT(kc)` - applies left Alt to *kc* -* `RALT(kc)` - applies right Alt to *kc* -* `LGUI(kc)` - applies left GUI (command/win) to *kc* -* `RGUI(kc)` - applies right GUI (command/win) to *kc* - -You can also chain these, like this: - - LALT(LCTL(KC_DEL)) -- this makes a key that sends Alt, Control, and Delete in a single keypress. - -The following shortcuts automatically add `LSFT()` to keycodes to get commonly used symbols. Their long names are also available and documented in `/quantum/keymap_common.h`. - - KC_TILD ~ - KC_EXLM ! - KC_AT @ - KC_HASH # - KC_DLR $ - KC_PERC % - KC_CIRC ^ - KC_AMPR & - KC_ASTR * - KC_LPRN ( - KC_RPRN ) - KC_UNDS _ - KC_PLUS + - KC_LCBR { - KC_RCBR } - KC_PIPE | - KC_COLN : - -`MT(mod, kc)` - is *mod* (modifier key - MOD_LCTL, MOD_LSFT) when held, and *kc* when tapped. In other words, you can have a key that sends Esc (or the letter O or whatever) when you tap it, but works as a Control key or a Shift key when you hold it down. - -These are the values you can use for the `mod` in `MT()` (right-hand modifiers are not available): - - * MOD_LCTL - * MOD_LSFT - * MOD_LALT - * MOD_LGUI - -These can also be combined like `MOD_LCTL | MOD_LSFT` e.g. `MT(MOD_LCTL | MOD_LSFT, KC_ESC)` which would activate Control and Shift when held, and send Escape when tapped. - -We've added shortcuts to make common modifier/tap (mod-tap) mappings more compact: - - * `CTL_T(kc)` - is LCTL when held and *kc* when tapped - * `SFT_T(kc)` - is LSFT when held and *kc* when tapped - * `ALT_T(kc)` - is LALT when held and *kc* when tapped - * `GUI_T(kc)` - is LGUI when held and *kc* when tapped - * `ALL_T(kc)` - is Hyper (all mods) when held and *kc* when tapped. To read more about what you can do with a Hyper key, see [this blog post by Brett Terpstra](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/) - -### Temporarily setting the default layer - -`DF(layer)` - sets default layer to *layer*. The default layer is the one at the "bottom" of the layer stack - the ultimate fallback layer. This currently does not persist over power loss. When you plug the keyboard back in, layer 0 will always be the default. It is theoretically possible to work around that, but that's not what `DF` does. - -### Remember: These are just aliases - -These functions work the same way that their `ACTION_*` functions do - they're just quick aliases. To dig into all of the tmk ACTION_* functions, please see the [TMK documentation](https://github.com/jackhumbert/qmk_firmware/blob/master/tmk_core/doc/keymap.md#2-action). - -Instead of using `FNx` when defining `ACTION_*` functions, you can use `F(x)` - the benefit here is being able to use more than 32 function actions (up to 4096), if you happen to need them. - -## Macro shortcuts: Send a whole string when pressing just one key - -Instead of using the `ACTION_MACRO` function, you can simply use `M(n)` to access macro *n* - *n* will get passed into the `action_get_macro` as the `id`, and you can use a switch statement to trigger it. This gets called on the keydown and keyup, so you'll need to use an if statement testing `record->event.pressed` (see keymap_default.c). - -```c -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. -{ - switch(id) { - case 0: // this would trigger when you hit a key mapped as M(0) - if (record->event.pressed) { - return MACRO( I(255), T(H), T(E), T(L), T(L), W(255), T(O), END ); // this sends the string 'hello' when the macro executes - } - break; - } - return MACRO_NONE; -}; -``` -A macro can include the following commands: - -* I() change interval of stroke in milliseconds. -* D() press key. -* U() release key. -* T() type key(press and release). -* W() wait (milliseconds). -* END end mark. - -So above you can see the stroke interval changed to 255ms between each keystroke, then a bunch of keys being typed, waits a while, then the macro ends. - -Note: Using macros to have your keyboard send passwords for you is a bad idea. - -### Additional keycode aliases for software-implemented layouts (Colemak, Dvorak, etc) - -Everything is assuming you're in Qwerty (in software) by default, but there is built-in support for using a Colemak or Dvorak layout by including this at the top of your keymap: - - #include "keymap_<layout>.h" - -Where <layout> is "colemak" or "dvorak". After including this line, you will get access to: - - * `CM_*` for all of the Colemak-equivalent characters - * `DV_*` for all of the Dvorak-equivalent characters - -These implementations assume you're using Colemak or Dvorak on your OS, not on your keyboard - this is referred to as a software-implemented layout. If your computer is in Qwerty and your keymap is in Colemak or Dvorak, this is referred to as a firmware-implemented layout, and you won't need these features. - -To give an example, if you're using software-implemented Colemak, and want to get an `F`, you would use `CM_F` - `KC_F` under these same circumstances would result in `T`. - -## Additional language support - -In `quantum/keymap_extras/`, you'll see various language files - these work the same way as the alternative layout ones do. Most are defined by their two letter country/language code followed by an underscore and a 4-letter abbreviation of its name. `FR_UGRV` which will result in a `ù` when using a software-implemented AZERTY layout. It's currently difficult to send such characters in just the firmware (but it's being worked on - see Unicode support). - -## Unicode support - -You can currently send 4 hex digits with your OS-specific modifier key (RALT for OSX with the "Unicode Hex Input" layout) - this is currently limited to supporting one OS at a time, and requires a recompile for switching. 8 digit hex codes are being worked on. The keycode function is `UC(n)`, where *n* is a 4 digit hexidecimal. Enable from the Makefile. - -## Other firmware shortcut keycodes - -* `RESET` - puts the MCU in DFU mode for flashing new firmware (with `make dfu`) -* `DEBUG` - the firmware into debug mode - you'll need hid_listen to see things -* `BL_ON` - turns the backlight on -* `BL_OFF` - turns the backlight off -* `BL_<n>` - sets the backlight to level *n* -* `BL_INC` - increments the backlight level by one -* `BL_DEC` - decrements the backlight level by one -* `BL_TOGG` - toggles the backlight -* `BL_STEP` - steps through the backlight levels - -Enable the backlight from the Makefile. - -## MIDI functionalty - -This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile. - -## Bluetooth functionality - -This requires [some hardware changes](https://www.reddit.com/r/MechanicalKeyboards/comments/3psx0q/the_planck_keyboard_with_bluetooth_guide_and/?ref=search_posts), but can be enabled via the Makefile. The firmware will still output characters via USB, so be aware of this when charging via a computer. It would make sense to have a switch on the Bluefruit to turn it off at will. - -## Building - -Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. - -Depending on which keymap you would like to use, you will have to compile slightly differently. - -### Default -To build with the default keymap, simply run `make`. - -### Other Keymaps -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a file in the keymaps folder named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. - -To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: -``` -$ make KEYMAP=[default|jack|<name>] -``` -Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. diff --git a/keyboard/hhkb_qmk/config.h b/keyboard/hhkb_qmk/config.h deleted file mode 100644 index ee66e44571..0000000000 --- a/keyboard/hhkb_qmk/config.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xCAFE -#define DEVICE_VER 0x0104 -#define MANUFACTURER q.m.k -#define PRODUCT HHKB mod -#define DESCRIPTION q.m.k keyboard firmware for HHKB - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 8 - -#define TAPPING_TERM 200 - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* 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_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* - * Feature disable options - * These options are also useful to firmware size reduction. -*/ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboard/hhkb_qmk/hhkb_avr.h b/keyboard/hhkb_qmk/hhkb_avr.h deleted file mode 100644 index 7ea6322c73..0000000000 --- a/keyboard/hhkb_qmk/hhkb_avr.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef HHKB_AVR_H -#define HHKB_AVR_H - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <avr/interrupt.h> -#include <util/delay.h> - - -// Timer resolution check -#if (1000000/TIMER_RAW_FREQ > 20) -# error "Timer resolution(>20us) is not enough for HHKB matrix scan tweak on V-USB." -#endif - - -/* - * HHKB Matrix I/O - * - * row: HC4051[A,B,C] selects scan row0-7 - * row-ext: [En0,En1] row extention for JP - * col: LS145[A,B,C,D] selects scan col0-7 and enable(D) - * key: on: 0/off: 1 - * prev: hysteresis control: assert(1) when previous key state is on - */ - - -#if defined(__AVR_ATmega32U4__) -/* - * For TMK HHKB alt controller(ATMega32U4) - * - * row: PB0-2 - * col: PB3-5,6 - * key: PD7(pull-uped) - * prev: PB7 - * power: PD4(L:off/H:on) - * row-ext: PC6,7 for HHKB JP(active low) - */ -static inline void KEY_ENABLE(void) { (PORTB &= ~(1<<6)); } -static inline void KEY_UNABLE(void) { (PORTB |= (1<<6)); } -static inline bool KEY_STATE(void) { return (PIND & (1<<7)); } -static inline void KEY_PREV_ON(void) { (PORTB |= (1<<7)); } -static inline void KEY_PREV_OFF(void) { (PORTB &= ~(1<<7)); } -#ifdef HHKB_POWER_SAVING -static inline void KEY_POWER_ON(void) { - DDRB = 0xFF; PORTB = 0x40; // change pins output - DDRD |= (1<<4); PORTD |= (1<<4); // MOS FET switch on - /* Without this wait you will miss or get false key events. */ - _delay_ms(5); // wait for powering up -} -static inline void KEY_POWER_OFF(void) { - /* input with pull-up consumes less than without it when pin is open. */ - DDRB = 0x00; PORTB = 0xFF; // change pins input with pull-up - DDRD |= (1<<4); PORTD &= ~(1<<4); // MOS FET switch off -} -static inline bool KEY_POWER_STATE(void) { return PORTD & (1<<4); } -#else -static inline void KEY_POWER_ON(void) {} -static inline void KEY_POWER_OFF(void) {} -static inline bool KEY_POWER_STATE(void) { return true; } -#endif -static inline void KEY_INIT(void) -{ - /* row,col,prev: output */ - DDRB = 0xFF; - PORTB = 0x40; // unable - /* key: input with pull-up */ - DDRD &= ~0x80; - PORTD |= 0x80; -#ifdef HHKB_JP - /* row extention for HHKB JP */ - DDRC |= (1<<6|1<<7); - PORTC |= (1<<6|1<<7); -#endif - KEY_UNABLE(); - KEY_PREV_OFF(); - - KEY_POWER_OFF(); -} -static inline void KEY_SELECT(uint8_t ROW, uint8_t COL) -{ - PORTB = (PORTB & 0xC0) | (((COL) & 0x07)<<3) | ((ROW) & 0x07); -#ifdef HHKB_JP - if ((ROW) & 0x08) PORTC = (PORTC & ~(1<<6|1<<7)) | (1<<6); - else PORTC = (PORTC & ~(1<<6|1<<7)) | (1<<7); -#endif -} - - -#elif defined(__AVR_AT90USB1286__) -/* - * For Teensy++(AT90USB1286) - * - * HHKB pro HHKB pro2 - * row: PB0-2 (6-8) (5-7) - * col: PB3-5,6 (9-12) (8-11) - * key: PE6(pull-uped) (4) (3) - * prev: PE7 (5) (4) - * - * TODO: convert into 'staitc inline' function - */ -#define KEY_INIT() do { \ - DDRB |= 0x7F; \ - DDRE |= (1<<7); \ - DDRE &= ~(1<<6); \ - PORTE |= (1<<6); \ -} while (0) -#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \ - (((COL) & 0x07)<<3) | \ - ((ROW) & 0x07)) -#define KEY_ENABLE() (PORTB &= ~(1<<6)) -#define KEY_UNABLE() (PORTB |= (1<<6)) -#define KEY_STATE() (PINE & (1<<6)) -#define KEY_PREV_ON() (PORTE |= (1<<7)) -#define KEY_PREV_OFF() (PORTE &= ~(1<<7)) -#define KEY_POWER_ON() -#define KEY_POWER_OFF() -#define KEY_POWER_STATE() true - - -#else -# error "define code for matrix scan" -#endif - - -#if 0 -// For ATMega328P with V-USB -// -// #elif defined(__AVR_ATmega328P__) -// Ports for V-USB -// key: PB0(pull-uped) -// prev: PB1 -// row: PB2-4 -// col: PC0-2,3 -// power: PB5(Low:on/Hi-z:off) -#define KEY_INIT() do { \ - DDRB |= 0x3E; \ - DDRB &= ~(1<<0); \ - PORTB |= 1<<0; \ - DDRC |= 0x0F; \ - KEY_UNABLE(); \ - KEY_PREV_OFF(); \ -} while (0) -#define KEY_SELECT(ROW, COL) do { \ - PORTB = (PORTB & 0xE3) | ((ROW) & 0x07)<<2; \ - PORTC = (PORTC & 0xF8) | ((COL) & 0x07); \ -} while (0) -#define KEY_ENABLE() (PORTC &= ~(1<<3)) -#define KEY_UNABLE() (PORTC |= (1<<3)) -#define KEY_STATE() (PINB & (1<<0)) -#define KEY_PREV_ON() (PORTB |= (1<<1)) -#define KEY_PREV_OFF() (PORTB &= ~(1<<1)) -// Power supply switching -#define KEY_POWER_ON() do { \ - KEY_INIT(); \ - PORTB &= ~(1<<5); \ - _delay_ms(1); \ -} while (0) -#define KEY_POWER_OFF() do { \ - DDRB &= ~0x3F; \ - PORTB &= ~0x3F; \ - DDRC &= ~0x0F; \ - PORTC &= ~0x0F; \ -} while (0) -#endif - -#endif diff --git a/keyboard/hhkb_qmk/matrix.c b/keyboard/hhkb_qmk/matrix.c deleted file mode 100644 index 14fae0b82c..0000000000 --- a/keyboard/hhkb_qmk/matrix.c +++ /dev/null @@ -1,196 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * scan matrix - */ -#include <stdint.h> -#include <stdbool.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "timer.h" -#include "matrix.h" -#include "hhkb_avr.h" -#include <avr/wdt.h> -#include "suspend.h" -#include "lufa.h" - - -// matrix power saving -#define MATRIX_POWER_SAVE 10000 -static uint32_t matrix_last_modified = 0; - -// matrix state buffer(1:on, 0:off) -static matrix_row_t *matrix; -static matrix_row_t *matrix_prev; -static matrix_row_t _matrix0[MATRIX_ROWS]; -static matrix_row_t _matrix1[MATRIX_ROWS]; - - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ -#ifdef DEBUG - debug_enable = true; - debug_keyboard = true; -#endif - - KEY_INIT(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; - matrix = _matrix0; - matrix_prev = _matrix1; -} - -uint8_t matrix_scan(void) -{ - uint8_t *tmp; - - tmp = matrix_prev; - matrix_prev = matrix; - matrix = tmp; - - // power on - if (!KEY_POWER_STATE()) KEY_POWER_ON(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - for (uint8_t col = 0; col < MATRIX_COLS; col++) { - KEY_SELECT(row, col); - _delay_us(5); - - // Not sure this is needed. This just emulates HHKB controller's behaviour. - if (matrix_prev[row] & (1<<col)) { - KEY_PREV_ON(); - } - _delay_us(10); - - // NOTE: KEY_STATE is valid only in 20us after KEY_ENABLE. - // If V-USB interrupts in this section we could lose 40us or so - // and would read invalid value from KEY_STATE. - uint8_t last = TIMER_RAW; - - KEY_ENABLE(); - - // Wait for KEY_STATE outputs its value. - // 1us was ok on one HHKB, but not worked on another. - // no wait doesn't work on Teensy++ with pro(1us works) - // no wait does work on tmk PCB(8MHz) with pro2 - // 1us wait does work on both of above - // 1us wait doesn't work on tmk(16MHz) - // 5us wait does work on tmk(16MHz) - // 5us wait does work on tmk(16MHz/2) - // 5us wait does work on tmk(8MHz) - // 10us wait does work on Teensy++ with pro - // 10us wait does work on 328p+iwrap with pro - // 10us wait doesn't work on tmk PCB(8MHz) with pro2(very lagged scan) - _delay_us(5); - - if (KEY_STATE()) { - matrix[row] &= ~(1<<col); - } else { - matrix[row] |= (1<<col); - } - - // Ignore if this code region execution time elapses more than 20us. - // MEMO: 20[us] * (TIMER_RAW_FREQ / 1000000)[count per us] - // MEMO: then change above using this rule: a/(b/c) = a*1/(b/c) = a*(c/b) - if (TIMER_DIFF_RAW(TIMER_RAW, last) > 20/(1000000/TIMER_RAW_FREQ)) { - matrix[row] = matrix_prev[row]; - } - - _delay_us(5); - KEY_PREV_OFF(); - KEY_UNABLE(); - - // NOTE: KEY_STATE keep its state in 20us after KEY_ENABLE. - // This takes 25us or more to make sure KEY_STATE returns to idle state. -#ifdef HHKB_JP - // Looks like JP needs faster scan due to its twice larger matrix - // or it can drop keys in fast key typing - _delay_us(30); -#else - _delay_us(75); -#endif - } - if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32(); - } - // power off - if (KEY_POWER_STATE() && - (USB_DeviceState == DEVICE_STATE_Suspended || - USB_DeviceState == DEVICE_STATE_Unattached ) && - timer_elapsed32(matrix_last_modified) > MATRIX_POWER_SAVE) { - KEY_POWER_OFF(); - suspend_power_down(); - } - return 1; -} - -bool matrix_is_modified(void) -{ - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - if (matrix[i] != matrix_prev[i]) - return true; - } - return false; -} - -inline -bool matrix_has_ghost(void) -{ - return false; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & (1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 01234567\n"); - for (uint8_t row = 0; row < matrix_rows(); row++) { - xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row))); - } -} - -void matrix_power_up(void) { - KEY_POWER_ON(); -} -void matrix_power_down(void) { - KEY_POWER_OFF(); -} diff --git a/keyboard/hid_liber/Makefile.lufa b/keyboard/hid_liber/Makefile.lufa deleted file mode 100644 index 5fc4156a9e..0000000000 --- a/keyboard/hid_liber/Makefile.lufa +++ /dev/null @@ -1,138 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = hid_liber_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -ansi: OPT_DEFS += -DLAYOUT_ANSI -ansi: all - -iso: OPT_DEFS += -DLAYOUT_ISO -iso: all - -custom: OPT_DEFS += -DLAYOUT_CUSTOM -custom: all - -alaricljs: OPT_DEFS += -DLAYOUT_ALARICLJS -alaricljs: all diff --git a/keyboard/hid_liber/Makefile.pjrc b/keyboard/hid_liber/Makefile.pjrc deleted file mode 100644 index 326bbe86f5..0000000000 --- a/keyboard/hid_liber/Makefile.pjrc +++ /dev/null @@ -1,111 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = hid_liber_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -#MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -ansi: OPT_DEFS += -DLAYOUT_ANSI -ansi: all - -iso: OPT_DEFS += -DLAYOUT_ISO -iso: all - -custom: OPT_DEFS += -DLAYOUT_CUSTOM -custom: all - -alaricljs: OPT_DEFS += -DLAYOUT_ALARICLJS -alaricljs: all diff --git a/keyboard/hid_liber/README.md b/keyboard/hid_liber/README.md deleted file mode 100644 index a5534ce711..0000000000 --- a/keyboard/hid_liber/README.md +++ /dev/null @@ -1,17 +0,0 @@ -hid_liberation firmware -====================== -DIY daughterboard for Filco Majestouch TKL developed by Geekhack and Deskthority communities. -The PCB was engineered by bpiphany. - -## Wiki on Deskthority.net -- [Instructions](http://deskthority.net/wiki/HID_Liberation_Device_-_Instructions) -- [Assembly Instructions](http://deskthority.net/wiki/HID_Liberation_Device_-_DIY_Instructions) - - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.[pjrc|lufa] [ansi|iso|custom|alaricljs] - -Use `Makefile.pjrc` if you want to use PJRC stack or use `Makefile.lufa` for LUFA stack. diff --git a/keyboard/hid_liber/config.h b/keyboard/hid_liber/config.h deleted file mode 100644 index 968ccf5500..0000000000 --- a/keyboard/hid_liber/config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xB919 -#define DEVICE_VER 0x0001 -#define MANUFACTURER t.m.k. -#define PRODUCT HID Liberation - - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for HID Liberation - - -/* matrix size */ -#define MATRIX_ROWS 18 -#define MATRIX_COLS 8 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 8 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c deleted file mode 100644 index 433a620975..0000000000 --- a/keyboard/hid_liber/keymap.c +++ /dev/null @@ -1,125 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * Keymap for HID Liberator controller - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -// Convert physical keyboard layout to matrix array. -// This is a macro to define keymap easily in keyboard layout form. -#define KEYMAP( \ - KG1, KH7, KJ7, KJ6, KJ1, KO5, KL1, KA6, KA7, KD7, KD5, KD1, KD2, KB5, KB3, KO3, \ - KG7, KG5, KH5, KJ5, KI5, KI7, KK7, KK5, KL5, KA5, KC5, KC7, KL7, KD6, KQ7, KN7, KM7, \ - KG6, KG3, KH3, KJ3, KI3, KI6, KK6, KK3, KL3, KA3, KC3, KC6, KL6, KD4, KP7, KN5, KM5, \ - KH6, KG4, KH4, KJ4, KI4, KI1, KK1, KK4, KL4, KA4, KC4, KC1, KD0, \ - KF6, KH1, KG0, KH0, KJ0, KI0, KI2, KK2, KK0, KL0, KA0, KC2, KF4, KN1, \ - KO7, KE6, KB1, KP1, KB2, KR4, KA2, KO0, KN2, KP2, KQ2 \ -) { \ -/* 0 1 2 3 4 5 6 7 */ \ -/* A */ { KC_##KA0, KC_NO , KC_##KA2, KC_##KA3, KC_##KA4, KC_##KA5, KC_##KA6, KC_##KA7 }, \ -/* B */ { KC_NO , KC_##KB1, KC_##KB2, KC_##KB3, KC_NO , KC_##KB5, KC_NO , KC_NO }, \ -/* C */ { KC_NO , KC_##KC1, KC_##KC2, KC_##KC3, KC_##KC4, KC_##KC5, KC_##KC6, KC_##KC7 }, \ -/* D */ { KC_##KD0, KC_##KD1, KC_##KD2, KC_NO , KC_##KD4, KC_##KD5, KC_##KD6, KC_##KD7 }, \ -/* E */ { KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_##KE6, KC_NO }, \ -/* F */ { KC_NO , KC_NO , KC_NO , KC_NO , KC_##KF4, KC_NO , KC_##KF6, KC_NO }, \ -/* G */ { KC_##KG0, KC_##KG1, KC_NO , KC_##KG3, KC_##KG4, KC_##KG5, KC_##KG6, KC_##KG7 }, \ -/* H */ { KC_##KH0, KC_##KH1, KC_NO , KC_##KH3, KC_##KH4, KC_##KH5, KC_##KH6, KC_##KH7 }, \ -/* I */ { KC_##KI0, KC_##KI1, KC_##KI2, KC_##KI3, KC_##KI4, KC_##KI5, KC_##KI6, KC_##KI7 }, \ -/* J */ { KC_##KJ0, KC_##KJ1, KC_NO , KC_##KJ3, KC_##KJ4, KC_##KJ5, KC_##KJ6, KC_##KJ7 }, \ -/* K */ { KC_##KK0, KC_##KK1, KC_##KK2, KC_##KK3, KC_##KK4, KC_##KK5, KC_##KK6, KC_##KK7 }, \ -/* L */ { KC_##KL0, KC_##KL1, KC_NO , KC_##KL3, KC_##KL4, KC_##KL5, KC_##KL6, KC_##KL7 }, \ -/* M */ { KC_NO , KC_NO , KC_NO , KC_NO , KC_NO , KC_##KM5, KC_NO , KC_##KM7 }, \ -/* N */ { KC_NO , KC_##KN1, KC_##KN2, KC_NO , KC_NO , KC_##KN5, KC_NO , KC_##KN7 }, \ -/* O */ { KC_##KO0, KC_NO , KC_NO , KC_##KO3, KC_NO , KC_##KO5, KC_NO , KC_##KO7 }, \ -/* P */ { KC_NO , KC_##KP1, KC_##KP2, KC_NO , KC_NO , KC_NO , KC_NO , KC_##KP7 }, \ -/* Q */ { KC_NO , KC_NO , KC_##KQ2, KC_NO , KC_NO , KC_NO , KC_NO , KC_##KQ7 }, \ -/* R */ { KC_NO , KC_NO , KC_NO , KC_NO , KC_##KR4, KC_NO , KC_NO , KC_NO } \ -} - -/* - * Tenkeyless keyboard default layout, ISO & ANSI (ISO is between Left Shift - * and Z, and the ANSI \ key above Return/Enter is used for the additional ISO - * switch in the ASD row next to enter. Use NUBS as keycode for the first and - * NUHS as the keycode for the second. - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|ISO| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ - -/* - * Add different layouts. If no layout is defined the default layout will be set to ANSI. -*/ -#if defined(LAYOUT_CUSTOM) - #include "keymap_custom.h" -#elif defined(LAYOUT_ALARICLJS) - #include "keymap_alaricljs.h" -#elif defined(LAYOUT_ISO) - #include "keymap_iso.h" -#elif defined(LAYOUT_ANSI) - #include "keymap_ansi.h" -#else - #include "keymap_ansi.h" -#endif - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/hid_liber/keymap_alaricljs.h b/keyboard/hid_liber/keymap_alaricljs.h deleted file mode 100644 index 8903fc683b..0000000000 --- a/keyboard/hid_liber/keymap_alaricljs.h +++ /dev/null @@ -1,61 +0,0 @@ -// hid_liber alaricljs -// this was the standard layout when hid_liber was merged into tmk's firmware - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Layer 0: Default ANSI - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |FN1 | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|iso| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ - - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR, SLCK, BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, INS, HOME, PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, DEL, END, PGDN, \ - FN1, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, \ - LSFT, NUBS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, \ - LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL, LEFT, DOWN, RGHT), - -/* Layer 1: - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Slp| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9|Mut|V- |V+ |Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I|MSt|Ply|Prv|Nxt|Media| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |FN1 | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|iso| Z| X|Clc| V| B| N| M| ,| .| /|Caps | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ - - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR, SLCK, SLEP, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9,MUTE, VOLD, VOLU, BSPC, INS, HOME, PGUP, \ - TAB, Q, W, E, R, T, Y, U, I,MSTP,MPLY, MPRV, MNXT, MSEL, DEL, END, PGDN, \ - FN1, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, \ - LSFT, NUBS, Z, X,CALC, V, B, N, M, COMM, DOT, SLSH, CAPS, UP, \ - LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL, LEFT, DOWN, RGHT), - -}; - -static const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // activate layer 1 when FN1 pressed -}; diff --git a/keyboard/hid_liber/keymap_ansi.h b/keyboard/hid_liber/keymap_ansi.h deleted file mode 100644 index 8ce85a4997..0000000000 --- a/keyboard/hid_liber/keymap_ansi.h +++ /dev/null @@ -1,32 +0,0 @@ -// hid_liber ANSI - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Layer 0: Default ANSI - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|iso| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ - - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR, SLCK, BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, INS, HOME, PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, DEL, END, PGDN, \ - CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, \ - LSFT, NUBS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, \ - LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL, LEFT, DOWN, RGHT), - -}; - -static const uint16_t PROGMEM fn_actions[] = {}; diff --git a/keyboard/hid_liber/keymap_custom.h b/keyboard/hid_liber/keymap_custom.h deleted file mode 100644 index 03e1a1bfaf..0000000000 --- a/keyboard/hid_liber/keymap_custom.h +++ /dev/null @@ -1,64 +0,0 @@ -// hid_liber custom -// ANSI layout with FN key instead of APP button -// Layer 1 has mediakeys on the nav cluster and keypad numbers for alt-codes - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Layer 0: Default ANSI - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|iso| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|FN1|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ - - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR, SLCK, BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, INS, HOME, PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, DEL, END, PGDN, \ - CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, \ - LSFT, NUBS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, \ - LCTL, LGUI, LALT, SPC, RALT, RGUI, FN1, RCTL, LEFT, DOWN, RGHT), - -/* - * Layer 1: Media Keys - * Keypad numbers instead of normal numbers - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ |KP1|KP2|KP3|KP4|KP5|KP6|KP7|KP8|KP9|KP0| -| =|Backsp | |Ins|Med|Vl+| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|Mut|Vl-| - * |-----------------------------------------------------------| `-----------' - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|iso| Z| X| C| V| B| N| M| ,| .| /|Shift | |Ply| - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|FN1|Ctl| |Prv|Stp|Nxt| - * `-----------------------------------------------------------' `-----------' - */ - - KEYMAP(\ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \ - TRNS, P1, P2, P3, P4, P5, P6, P7, P8, P9, P0, TRNS, TRNS, TRNS, TRNS, MSEL, VOLU, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MUTE, VOLD, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MPLY, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, TRNS, MPRV, MSTP, MNXT), - -}; - -static const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // activate layer 1 when FN1 pressed -}; diff --git a/keyboard/hid_liber/keymap_iso.h b/keyboard/hid_liber/keymap_iso.h deleted file mode 100644 index c18453675b..0000000000 --- a/keyboard/hid_liber/keymap_iso.h +++ /dev/null @@ -1,32 +0,0 @@ -// hid_liber ISO - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Layer 0: Default ISO - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|iso| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ - - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR, SLCK, BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BSPC, INS, HOME, PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, NUHS, DEL, END, PGDN, \ - CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, \ - LSFT, NUBS, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, \ - LCTL, LGUI, LALT, SPC, RALT, RGUI, APP, RCTL, LEFT, DOWN, RGHT), - -}; - -static const uint16_t PROGMEM fn_actions[] = {}; diff --git a/keyboard/hid_liber/led.c b/keyboard/hid_liber/led.c deleted file mode 100644 index e577424c59..0000000000 --- a/keyboard/hid_liber/led.c +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - PORTB &= ~(1<<5); - else - PORTB |= (1<<5); - - if (usb_led & (1<<USB_LED_SCROLL_LOCK)) - PORTB &= ~(1<<6); - else - PORTB |= (1<<6); -} diff --git a/keyboard/hid_liber/matrix.c b/keyboard/hid_liber/matrix.c deleted file mode 100644 index adf6ac8c42..0000000000 --- a/keyboard/hid_liber/matrix.c +++ /dev/null @@ -1,231 +0,0 @@ -/* Copyright 2012 Jun Wako <wakojun@gmail.com> - * - * This is heavily based on hid_liber/board.{c|h}. - * https://github.com/BathroomEpiphanies/AVR-Keyboard - * - * Copyright (c) 2012 Fredrik Atmer, Bathroom Epiphanies Inc - * http://bathroomepiphanies.com - * - * As for liscensing consult with the original files or its author. - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -// bit array of key state(1:on, 0:off) -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - - -#define _DDRA (uint8_t *const)&DDRA -#define _DDRB (uint8_t *const)&DDRB -#define _DDRC (uint8_t *const)&DDRC -#define _DDRD (uint8_t *const)&DDRD -#define _DDRE (uint8_t *const)&DDRE -#define _DDRF (uint8_t *const)&DDRF - -#define _PINA (uint8_t *const)&PINA -#define _PINB (uint8_t *const)&PINB -#define _PINC (uint8_t *const)&PINC -#define _PIND (uint8_t *const)&PIND -#define _PINE (uint8_t *const)&PINE -#define _PINF (uint8_t *const)&PINF - -#define _PORTA (uint8_t *const)&PORTA -#define _PORTB (uint8_t *const)&PORTB -#define _PORTC (uint8_t *const)&PORTC -#define _PORTD (uint8_t *const)&PORTD -#define _PORTE (uint8_t *const)&PORTE -#define _PORTF (uint8_t *const)&PORTF - -#define _BIT0 0x01 -#define _BIT1 0x02 -#define _BIT2 0x04 -#define _BIT3 0x08 -#define _BIT4 0x10 -#define _BIT5 0x20 -#define _BIT6 0x40 -#define _BIT7 0x80 - -/* Specifies the ports and pin numbers for the rows */ -static -uint8_t *const row_ddr[MATRIX_ROWS] = { - _DDRB, _DDRB, - _DDRC, _DDRC, - _DDRD, _DDRD, _DDRD, _DDRD, _DDRD, _DDRD, _DDRD, _DDRD, - _DDRF, _DDRF, _DDRF, _DDRF, _DDRF, _DDRF}; - -static -uint8_t *const row_port[MATRIX_ROWS] = { - _PORTB, _PORTB, - _PORTC, _PORTC, - _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, _PORTD, - _PORTF, _PORTF, _PORTF, _PORTF, _PORTF, _PORTF}; - -static -uint8_t *const row_pin[MATRIX_ROWS] = { - _PINB, _PINB, - _PINC, _PINC, - _PIND, _PIND, _PIND, _PIND, _PIND, _PIND, _PIND, _PIND, - _PINF, _PINF, _PINF, _PINF, _PINF, _PINF}; - -static -const uint8_t row_bit[MATRIX_ROWS] = { - _BIT4, _BIT7, - _BIT6, _BIT7, - _BIT0, _BIT1, _BIT2, _BIT3, _BIT4, _BIT5, _BIT6, _BIT7, - _BIT0, _BIT1, _BIT4, _BIT5, _BIT6, _BIT7}; - -static -const uint8_t mask = 0x0E; - -/* Specifies the ports and pin numbers for the columns */ -static -const uint8_t col_bit[MATRIX_COLS] = { 0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E}; - -static -inline void pull_column(int col) { - PORTB = col_bit[col] | (PORTB & ~mask); -} - -static -inline void release_column(int col) { -} - -/* PORTB is set as input with pull-up resistors - PORTC,D,E,F are set to high output */ -static -void setup_io_pins(void) { - uint8_t row; - DDRB |= 0x0E; - PORTB &= ~0x0E; - for(row = 0; row < MATRIX_ROWS; row++) { - *row_ddr[row] &= ~row_bit[row]; - *row_port[row] &= ~row_bit[row]; - } -} - -static -void setup_leds(void) { - DDRB |= 0x60; - PORTB |= 0x60; -} - - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // To use PORTF disable JTAG with writing JTD bit twice within four cycles. - MCUCR |= (1<<JTD); - MCUCR |= (1<<JTD); - - // initialize row and col - setup_io_pins(); - setup_leds(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { // 0-7 - pull_column(col); // output hi on theline - _delay_us(5); // without this wait it won't read stable value. - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { // 0-17 - bool prev_bit = matrix_debouncing[row] & (1<<col); - bool curr_bit = *row_pin[row] & row_bit[row]; - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - if (debouncing) { - dprintf("bounce!: %02X\n", debouncing); - } - debouncing = DEBOUNCE; - } - } - release_column(col); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - // NOTE: no longer used - return true; -} - -inline -bool matrix_has_ghost(void) -{ - return false; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 01234567\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - phex(row); print(": "); - pbin_reverse(matrix_get_row(row)); - print("\n"); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - for (uint8_t j = 0; j < MATRIX_COLS; j++) { - if (matrix_is_on(i, j)) - count++; - } - } - return count; -} diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile deleted file mode 100644 index e740b6adbc..0000000000 --- a/keyboard/infinity/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -PROJECT = infinity - -TMK_DIR = ../../tmk_core -MBED_DIR = $(TMK_DIR)/tool/mbed/mbed-sdk - -#VPATH += $(MBED_DIR):$(TMK_DIR) -vpath %.s .:$(MBED_DIR):$(TMK_DIR) -vpath %.c .:$(MBED_DIR):$(TMK_DIR) -vpath %.cpp .:$(MBED_DIR):$(TMK_DIR) - -OBJDIR = ./build - -OBJECTS = \ - $(OBJDIR)/matrix.o \ - $(OBJDIR)/keymap_common.o \ - $(OBJDIR)/led.o \ - $(OBJDIR)/main.o - -ifdef KEYMAP - OBJECTS := $(OBJDIR)/keymap_$(KEYMAP).o $(OBJECTS) -else - OBJECTS := $(OBJDIR)/keymap.o $(OBJECTS) -endif - -CONFIG_H = config.h - -INCLUDE_PATHS = -I. - - -# Build Options -# Comment out to disable -#BOOTMAGIC_ENABLE = yes -#MOUSEKEY_ENABLE = yes - - -include mbed-infinity.mk -include $(TMK_DIR)/tool/mbed/mbed.mk -include $(TMK_DIR)/tool/mbed/common.mk -include $(TMK_DIR)/tool/mbed/gcc.mk - -program: $(OBJDIR)/$(PROJECT).bin - dfu-util -D $(OBJDIR)/$(PROJECT).bin diff --git a/keyboard/infinity/README b/keyboard/infinity/README deleted file mode 100644 index 53d1c91737..0000000000 --- a/keyboard/infinity/README +++ /dev/null @@ -1,81 +0,0 @@ -Infinity -======== -Massdrop Infinity Keyboard: -https://www.massdrop.com/buy/infinity-keyboard-kit - -kiibohd controller(MD1): -https://github.com/kiibohd/controller - -DFU bootloader: -https://github.com/kiibohd/controller/tree/master/Bootloader - -Program with bootloader: - $ dfu-util -D kiibohd.dfu.bin - -Pinout: -https://github.com/kiibohd/controller/blob/master/Scan/MD1/pinout - -MCHCK compatible: -https://mchck.org/about/ - -MCU Freescale MK20DX128VLF5 48-QFP: -http://cache.freescale.com/files/32bit/doc/data_sheet/K20P48M50SF0.pdf - - - -Pin Usage -========= -Key Matrix: - Strobe(output high): PTB0 PTB1 PTB2 PTB3 PTB16 PTB17 PTC4 PTC5 PTD0 - Sense(input with pull-down): PTD1 PTD2 PTD3 PTD4 PTD5 PTD6 PTD7 - - -SWD pinout: - SWD_CLK(PTA0) SWD_DIO(PTA3) - SWD pins are placed next to reset button; SWD_CLK, SWD_DIO, GND, VCC from top. - Note that RESET is also needed to get full control with OpenOCD. - -LED: - PTA19(turns on with output high) - - - -Memory map -========== -kiibohd bootloader: Lib/mk20dx128vlf5.bootloader.ld -0x0000_0000 +-------------------+ -----------------+---------------+ Vector table - | .vectors | ------------. | StackPointer0 | of Bootloader - | .startup | \ | ResetHandler1 | - | .rodata | `--+---------------+ 0xF8 -0x0000_0400 | .flashconfig(0x10)| - _0410 | .text | - | .init | -0x0000_1000 +-------------------+ -----------------+---------------+ Vector table - | _app_rom | ------------. | | of App - | | \ | | - | | `--+---------------+ - | | - ~ ~ - | | -0x07FF_FFFF +-------------------+ 128KB - - -0x1FFF_E000 +-------------------+ -----------------+---------------+ Vector table - _E0F8 | | ------------. | | of App(copied) - | | \ | | - | | `--+---------------+ mbed NVIC - | | - | RAM | - | 8KB| -0x2000_0000 +-------------------+ - | | - | | - | | - | | - | RAM | - | 8KB| -0x2000_2000 +-------------------+ _estack - - - - diff --git a/keyboard/infinity/config.h b/keyboard/infinity/config.h deleted file mode 100644 index dc734dbdbe..0000000000 --- a/keyboard/infinity/config.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2014 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#if 0 -// duplicated name against mbed USBDeivce -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3BED -#endif -#define DEVICE_VER 0x0001 -#define MANUFACTURER tmk. -#define PRODUCT Infinitiy -#define DESCRIPTION Massdrop Infinity keyboard firmware by tmk - - -/* matrix size */ -#define MATRIX_ROWS 9 // Strobe -#define MATRIX_COLS 7 // Sense - -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - - -/* for prototype */ -//#define INFINITY_PROTOTYPE - -#endif diff --git a/keyboard/infinity/keymap.c b/keyboard/infinity/keymap.c deleted file mode 100644 index 4726cee653..0000000000 --- a/keyboard/infinity/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `|BSp| - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| - * |-----------------------------------------------------------| - * |Contro| A| S| D| F| G| H| J| K| L| ;| '|Enter | - * |-----------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0| - * |-----------------------------------------------------------' - * | |Gui|Alt | Space |Alt |Gui| | | - * `-----------------------------------------------------------' - */ - [0] = - KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS, GRV, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \ - LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,ENT, \ - LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,FN0, \ - NO, LGUI,LALT, SPC, RALT,RGUI,NO, NO), - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | |Backs| - * |-----------------------------------------------------------| - * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter | - * |-----------------------------------------------------------| - * | | | | | | | +| -|End|PgD|Dow| | | - * `-----------------------------------------------------------' - * | |Gui|Alt | Space |Alt |Gui| | | - * `-----------------------------------------------------------' - */ - [1] = - KEYMAP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, BSPC, \ - TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,PENT, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), -}; - diff --git a/keyboard/infinity/keymap_common.c b/keyboard/infinity/keymap_common.c deleted file mode 100644 index fdb1769e1c..0000000000 --- a/keyboard/infinity/keymap_common.c +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "keymap_common.h" - - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} diff --git a/keyboard/infinity/keymap_common.h b/keyboard/infinity/keymap_common.h deleted file mode 100644 index b0f765bfeb..0000000000 --- a/keyboard/infinity/keymap_common.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -Copyright 2014 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include <stdint.h> -#include <stdbool.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - - -#ifdef INFINITY_PROTOTYPE - -/* Infinity prototype */ -#define KEYMAP( \ - K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \ - K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, \ - K13, K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, \ - K54, K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, \ - K06, K16, K26, K36, K46, K56, K66, K76 \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06 }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16 }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26 }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36 }, \ - { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46 }, \ - { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56 }, \ - { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66 }, \ - { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76 }, \ - { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86 } \ -} - -#else - -/* Infinity production */ -#define KEYMAP( \ - K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K51, \ - K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, K13, \ - K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, K54, \ - K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, K06, \ - K16, K26, K36, K46, K56, K66, K76, K86 \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06 }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16 }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26 }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36 }, \ - { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46 }, \ - { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56 }, \ - { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66 }, \ - { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76 }, \ - { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86 } \ -} - -#endif - -#endif diff --git a/keyboard/infinity/led.c b/keyboard/infinity/led.c deleted file mode 100644 index b7e638b254..0000000000 --- a/keyboard/infinity/led.c +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdint.h" -#include "led.h" - - -/* HHKB has no LEDs */ -void led_set(uint8_t usb_led) -{ -} diff --git a/keyboard/infinity/main.cpp b/keyboard/infinity/main.cpp deleted file mode 100644 index 847668a1de..0000000000 --- a/keyboard/infinity/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "MK20D5.h" -#include "wait.h" -#include "gpio_api.h" -#include "PinNames.h" -#include "matrix.h" -#include "timer.h" - -#include "action.h" -#include "keycode.h" -#include "host.h" -#include "host_driver.h" -#include "mbed_driver.h" - - -int main() { - gpio_t led; - gpio_init_out(&led, PTA19); - - uint16_t t = 0; - - host_set_driver(&mbed_driver); - keyboard_init(); - - while(1) { - keyboard_task(); - - bool matrix_on = false; - matrix_scan(); - for (int i = 0; i < MATRIX_ROWS; i++) { - if (matrix_get_row(i)) { - matrix_on = true; - break; - } - } - if (matrix_on) - gpio_write(&led, 1); - else { - if (timer_elapsed(t) > 500) { - gpio_write(&led, !gpio_read(&led)); - t = timer_read(); - } - } - } -} diff --git a/keyboard/infinity/matrix.c b/keyboard/infinity/matrix.c deleted file mode 100644 index 478a40fd9e..0000000000 --- a/keyboard/infinity/matrix.c +++ /dev/null @@ -1,107 +0,0 @@ -#include <stdint.h> -#include <stdbool.h> -#include "gpio_api.h" -#include "timer.h" -#include "wait.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -#define DEBOUNCE 5 -#endif - -/* - * Infinity Pinusage: - * Column pins are input with internal pull-down. Row pins are output and strobe with high. - * Key is high or 1 when it turns on. - * - * col: { PTD1, PTD2, PTD3, PTD4, PTD5, PTD6, PTD7 } - * row: { PTB0, PTB1, PTB2, PTB3, PTB16, PTB17, PTC4, PTC5, PTD0 } - */ -static gpio_t col[MATRIX_COLS]; -static gpio_t row[MATRIX_ROWS]; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; -static bool debouncing = false; -static uint16_t debouncing_time = 0; - - -void matrix_init(void) -{ - /* Column(sense) */ - gpio_init_in_ex(&col[0], PTD1, PullDown); - gpio_init_in_ex(&col[1], PTD2, PullDown); - gpio_init_in_ex(&col[2], PTD3, PullDown); - gpio_init_in_ex(&col[3], PTD4, PullDown); - gpio_init_in_ex(&col[4], PTD5, PullDown); - gpio_init_in_ex(&col[5], PTD6, PullDown); - gpio_init_in_ex(&col[6], PTD7, PullDown); - - /* Row(strobe) */ - gpio_init_out_ex(&row[0], PTB0, 0); - gpio_init_out_ex(&row[1], PTB1, 0); - gpio_init_out_ex(&row[2], PTB2, 0); - gpio_init_out_ex(&row[3], PTB3, 0); - gpio_init_out_ex(&row[4], PTB16, 0); - gpio_init_out_ex(&row[5], PTB17, 0); - gpio_init_out_ex(&row[6], PTC4, 0); - gpio_init_out_ex(&row[7], PTC5, 0); - gpio_init_out_ex(&row[8], PTD0, 0); -} - -uint8_t matrix_scan(void) -{ - for (int i = 0; i < MATRIX_ROWS; i++) { - matrix_row_t r = 0; - - gpio_write(&row[i], 1); - wait_us(1); // need wait to settle pin state - for (int j = 0; j < MATRIX_COLS; j++) { - if (gpio_read(&col[j])) { - r |= (1<<j); - } - } - gpio_write(&row[i], 0); - - if (matrix_debouncing[i] != r) { - matrix_debouncing[i] = r; - debouncing = true; - debouncing_time = timer_read(); - } - } - - if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) { - for (int i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - debouncing = false; - } -/* - if (debouncing) { - if (--debouncing) { - return 0; - } else { - for (int i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } -*/ - return 1; -} - -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & (1<<col)); -} - -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ -} diff --git a/keyboard/infinity/mbed-infinity.mk b/keyboard/infinity/mbed-infinity.mk deleted file mode 100644 index 2c8d2e4372..0000000000 --- a/keyboard/infinity/mbed-infinity.mk +++ /dev/null @@ -1,49 +0,0 @@ -# based on Makefile exported form mbed.org -# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded - -CPU = -mcpu=cortex-m4 -mthumb - -CC_SYMBOLS += \ - -DTARGET_INFINITY \ - -DTARGET_K20D50M \ - -DTARGET_M4 \ - -DTARGET_CORTEX_M \ - -DTARGET_Freescale \ - -DTOOLCHAIN_GCC_ARM \ - -DTOOLCHAIN_GCC \ - -D__CORTEX_M4 \ - -DARM_MATH_CM4 \ - -D__MBED__=1 - -OBJECTS += \ - $(OBJDIR)/mbed-infinity/cmsis_nvic.o \ - $(OBJDIR)/mbed-infinity/system_MK20D5.o \ - $(OBJDIR)/mbed-infinity/USBHAL_KL25Z.o \ - $(OBJDIR)/mbed-infinity/startup_MK20D5.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/analogin_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/gpio_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/gpio_irq_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/i2c_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/pinmap.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/port_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/pwmout_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/rtc_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/serial_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/sleep.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/spi_api.o \ - $(OBJDIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/us_ticker.o - -INCLUDE_PATHS += \ - -Imbed \ - -I$(MBED_DIR)/libraries/mbed/targets \ - -I$(MBED_DIR)/libraries/mbed/targets/cmsis \ - -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale \ - -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20XX \ - -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20XX/TARGET_K20D50M \ - -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20XX/TARGET_K20D50M/TOOLCHAIN_GCC_ARM \ - -I$(MBED_DIR)/libraries/mbed/targets/hal \ - -I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_Freescale \ - -I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX \ - -I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/TARGET_K20D50M - -LINKER_SCRIPT = mbed-infinity/infinity.ld diff --git a/keyboard/infinity/mbed-infinity/README b/keyboard/infinity/mbed-infinity/README deleted file mode 100644 index 43051c9003..0000000000 --- a/keyboard/infinity/mbed-infinity/README +++ /dev/null @@ -1,83 +0,0 @@ -mbed fix for Infinity -===================== -Without linker script patch it doesn't place vector table in final binary. -And clock is configured to 48MHz using internal clock reference and FLL multiplication. - - -mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/system_MK20D5.c - Fix SystemInit: clock setup for internal clock. Inifinity has no external Xtal. - -mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/cmsis_nvic.c - Fix NVIC vector address of firmware 0x1000 instead of 0x0 - -mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/MK20D5.ld - Fix memory map for Infinity bootloader - Flash starts at 0x1000 - No flash config bytes sector - -USBDevice/USBDevice/USBHAL_KL25Z.cpp - Fix USB clock setup, see below. - - -2015/01/04 Based on mbed-sdk @2f63fa7d78a26. - - - -Kinetis USB config -================== -Clock source: Internal reference clock wth FLL - SIM_SOPT[USBSRC] = 1(MCGPLLCLK/MCGFLLCLK) - SIM_SOPT[PLLSEL] = 0(MCGFLLCLK) - -Clock dividor: - SIM_CLKDIV2[USBDIV] = 0 - SIM_CLKDIV2[USBFAC] = 0 - -Clock enable: - SIM_SCGC4[USBOTG] = 1 - - - -Infinity bootloader change -========================== -After @2c7542e(2015/01) Infinity bootloader doesn't disable watchdog timer and keyboard firmware has to do it itself. mbed disables watchdog in startup sequence but unfortunately timer is timed out bofore that. - -We have to do that in earlier phase of mbed startup sequence. - - -mbed starup sequence files: -mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/startup_M20D5.s -mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/system_MK20D5.c - -Infinity booloader change commit: -https://github.com/kiibohd/controller/commit/2c7542e2e7f0b8a99edf563dc53164fe1a439483 - -discussion: -https://geekhack.org/index.php?topic=41989.msg1686616#msg1686616 - - -WORKAROUND ----------- -Call SystemInit early in Reset_Handler. - -$ diff -u ../../mbed-sdk/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/startup_MK20D5.s mbed-infinity ---- ../../mbed-sdk/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/startup_MK20D5.s 2015-03-22 10:33:22.779866000 +0900 -+++ mbed-infinity/startup_MK20D5.s 2015-03-22 10:32:56.483866000 +0900 -@@ -147,6 +147,8 @@ - * __etext: End of code section, i.e., begin of data sections to copy from. - * __data_start__/__data_end__: RAM address range that data should be - * copied to. Both must be aligned to 4 bytes boundary. */ -+ ldr r0, =SystemInit -+ blx r0 - - ldr r1, =__etext - ldr r2, =__data_start__ -@@ -161,8 +163,6 @@ - - .Lflash_to_ram_loop_end: - -- ldr r0, =SystemInit -- blx r0 - ldr r0, =_start - bx r0 - .pool diff --git a/keyboard/infinity/mbed-infinity/USBHAL_KL25Z.cpp b/keyboard/infinity/mbed-infinity/USBHAL_KL25Z.cpp deleted file mode 100644 index 90f02fa322..0000000000 --- a/keyboard/infinity/mbed-infinity/USBHAL_KL25Z.cpp +++ /dev/null @@ -1,557 +0,0 @@ -/* Copyright (c) 2010-2011 mbed.org, MIT License -* -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software -* and associated documentation files (the "Software"), to deal in the Software without -* restriction, including without limitation the rights to use, copy, modify, merge, publish, -* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all copies or -* substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING -* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -#if defined(TARGET_KL25Z) | defined(TARGET_KL43Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D50M) | defined(TARGET_K64F) | defined(TARGET_K22F) - -#include "USBHAL.h" - -USBHAL * USBHAL::instance; - -static volatile int epComplete = 0; - -// Convert physical endpoint number to register bit -#define EP(endpoint) (1<<(endpoint)) - -// Convert physical to logical -#define PHY_TO_LOG(endpoint) ((endpoint)>>1) - -// Get endpoint direction -#define IN_EP(endpoint) ((endpoint) & 1U ? true : false) -#define OUT_EP(endpoint) ((endpoint) & 1U ? false : true) - -#define BD_OWN_MASK (1<<7) -#define BD_DATA01_MASK (1<<6) -#define BD_KEEP_MASK (1<<5) -#define BD_NINC_MASK (1<<4) -#define BD_DTS_MASK (1<<3) -#define BD_STALL_MASK (1<<2) - -#define TX 1 -#define RX 0 -#define ODD 0 -#define EVEN 1 -// this macro waits a physical endpoint number -#define EP_BDT_IDX(ep, dir, odd) (((ep * 4) + (2 * dir) + (1 * odd))) - -#define SETUP_TOKEN 0x0D -#define IN_TOKEN 0x09 -#define OUT_TOKEN 0x01 -#define TOK_PID(idx) ((bdt[idx].info >> 2) & 0x0F) - -// for each endpt: 8 bytes -typedef struct BDT { - uint8_t info; // BD[0:7] - uint8_t dummy; // RSVD: BD[8:15] - uint16_t byte_count; // BD[16:32] - uint32_t address; // Addr -} BDT; - - -// there are: -// * 16 bidirectionnal endpt -> 32 physical endpt -// * as there are ODD and EVEN buffer -> 32*2 bdt -__attribute__((__aligned__(512))) BDT bdt[NUMBER_OF_PHYSICAL_ENDPOINTS * 2]; -uint8_t * endpoint_buffer[(NUMBER_OF_PHYSICAL_ENDPOINTS - 2) * 2]; -uint8_t * endpoint_buffer_iso[2*2]; - -static uint8_t set_addr = 0; -static uint8_t addr = 0; - -static uint32_t Data1 = 0x55555555; - -static uint32_t frameNumber() { - return((USB0->FRMNUML | (USB0->FRMNUMH << 8)) & 0x07FF); -} - -uint32_t USBHAL::endpointReadcore(uint8_t endpoint, uint8_t *buffer) { - return 0; -} - -USBHAL::USBHAL(void) { - // Disable IRQ - NVIC_DisableIRQ(USB0_IRQn); - -#if defined(TARGET_K64F) - MPU->CESR=0; -#endif - // fill in callback array - epCallback[0] = &USBHAL::EP1_OUT_callback; - epCallback[1] = &USBHAL::EP1_IN_callback; - epCallback[2] = &USBHAL::EP2_OUT_callback; - epCallback[3] = &USBHAL::EP2_IN_callback; - epCallback[4] = &USBHAL::EP3_OUT_callback; - epCallback[5] = &USBHAL::EP3_IN_callback; - epCallback[6] = &USBHAL::EP4_OUT_callback; - epCallback[7] = &USBHAL::EP4_IN_callback; - epCallback[8] = &USBHAL::EP5_OUT_callback; - epCallback[9] = &USBHAL::EP5_IN_callback; - epCallback[10] = &USBHAL::EP6_OUT_callback; - epCallback[11] = &USBHAL::EP6_IN_callback; - epCallback[12] = &USBHAL::EP7_OUT_callback; - epCallback[13] = &USBHAL::EP7_IN_callback; - epCallback[14] = &USBHAL::EP8_OUT_callback; - epCallback[15] = &USBHAL::EP8_IN_callback; - epCallback[16] = &USBHAL::EP9_OUT_callback; - epCallback[17] = &USBHAL::EP9_IN_callback; - epCallback[18] = &USBHAL::EP10_OUT_callback; - epCallback[19] = &USBHAL::EP10_IN_callback; - epCallback[20] = &USBHAL::EP11_OUT_callback; - epCallback[21] = &USBHAL::EP11_IN_callback; - epCallback[22] = &USBHAL::EP12_OUT_callback; - epCallback[23] = &USBHAL::EP12_IN_callback; - epCallback[24] = &USBHAL::EP13_OUT_callback; - epCallback[25] = &USBHAL::EP13_IN_callback; - epCallback[26] = &USBHAL::EP14_OUT_callback; - epCallback[27] = &USBHAL::EP14_IN_callback; - epCallback[28] = &USBHAL::EP15_OUT_callback; - epCallback[29] = &USBHAL::EP15_IN_callback; - -#if defined(TARGET_KL43Z) - // enable USBFS clock - SIM->SCGC4 |= SIM_SCGC4_USBFS_MASK; - - // enable the IRC48M clock - USB0->CLK_RECOVER_IRC_EN |= USB_CLK_RECOVER_IRC_EN_IRC_EN_MASK; - - // enable the USB clock recovery tuning - USB0->CLK_RECOVER_CTRL |= USB_CLK_RECOVER_CTRL_CLOCK_RECOVER_EN_MASK; - - // choose usb src clock - SIM->SOPT2 |= SIM_SOPT2_USBSRC_MASK; -#elif defined(TARGET_INFINITY) - // USB clock source: FLL - SIM->SOPT2 |= SIM_SOPT2_USBSRC_MASK; - - // enable OTG clock - SIM->SCGC4 |= SIM_SCGC4_USBOTG_MASK; -#else - // choose usb src as PLL - SIM->SOPT2 &= ~SIM_SOPT2_PLLFLLSEL_MASK; - SIM->SOPT2 |= (SIM_SOPT2_USBSRC_MASK | (1 << SIM_SOPT2_PLLFLLSEL_SHIFT)); - - // enable OTG clock - SIM->SCGC4 |= SIM_SCGC4_USBOTG_MASK; -#endif - - // Attach IRQ - instance = this; - NVIC_SetVector(USB0_IRQn, (uint32_t)&_usbisr); - NVIC_EnableIRQ(USB0_IRQn); - - // USB Module Configuration - // Reset USB Module - USB0->USBTRC0 |= USB_USBTRC0_USBRESET_MASK; - while(USB0->USBTRC0 & USB_USBTRC0_USBRESET_MASK); - - // Set BDT Base Register - USB0->BDTPAGE1 = (uint8_t)((uint32_t)bdt>>8); - USB0->BDTPAGE2 = (uint8_t)((uint32_t)bdt>>16); - USB0->BDTPAGE3 = (uint8_t)((uint32_t)bdt>>24); - - // Clear interrupt flag - USB0->ISTAT = 0xff; - - // USB Interrupt Enablers - USB0->INTEN |= USB_INTEN_TOKDNEEN_MASK | - USB_INTEN_SOFTOKEN_MASK | - USB_INTEN_ERROREN_MASK | - USB_INTEN_USBRSTEN_MASK; - - // Disable weak pull downs - USB0->USBCTRL &= ~(USB_USBCTRL_PDE_MASK | USB_USBCTRL_SUSP_MASK); - - USB0->USBTRC0 |= 0x40; -} - -USBHAL::~USBHAL(void) { } - -void USBHAL::connect(void) { - // enable USB - USB0->CTL |= USB_CTL_USBENSOFEN_MASK; - // Pull up enable - USB0->CONTROL |= USB_CONTROL_DPPULLUPNONOTG_MASK; -} - -void USBHAL::disconnect(void) { - // disable USB - USB0->CTL &= ~USB_CTL_USBENSOFEN_MASK; - // Pull up disable - USB0->CONTROL &= ~USB_CONTROL_DPPULLUPNONOTG_MASK; - - //Free buffers if required: - for (int i = 0; i<(NUMBER_OF_PHYSICAL_ENDPOINTS - 2) * 2; i++) { - free(endpoint_buffer[i]); - endpoint_buffer[i] = NULL; - } - free(endpoint_buffer_iso[2]); - endpoint_buffer_iso[2] = NULL; - free(endpoint_buffer_iso[0]); - endpoint_buffer_iso[0] = NULL; -} - -void USBHAL::configureDevice(void) { - // not needed -} - -void USBHAL::unconfigureDevice(void) { - // not needed -} - -void USBHAL::setAddress(uint8_t address) { - // we don't set the address now otherwise the usb controller does not ack - // we set a flag instead - // see usbisr when an IN token is received - set_addr = 1; - addr = address; -} - -bool USBHAL::realiseEndpoint(uint8_t endpoint, uint32_t maxPacket, uint32_t flags) { - uint32_t handshake_flag = 0; - uint8_t * buf; - - if (endpoint > NUMBER_OF_PHYSICAL_ENDPOINTS - 1) { - return false; - } - - uint32_t log_endpoint = PHY_TO_LOG(endpoint); - - if ((flags & ISOCHRONOUS) == 0) { - handshake_flag = USB_ENDPT_EPHSHK_MASK; - if (IN_EP(endpoint)) { - if (endpoint_buffer[EP_BDT_IDX(log_endpoint, TX, ODD)] == NULL) - endpoint_buffer[EP_BDT_IDX(log_endpoint, TX, ODD)] = (uint8_t *) malloc (64*2); - buf = &endpoint_buffer[EP_BDT_IDX(log_endpoint, TX, ODD)][0]; - } else { - if (endpoint_buffer[EP_BDT_IDX(log_endpoint, RX, ODD)] == NULL) - endpoint_buffer[EP_BDT_IDX(log_endpoint, RX, ODD)] = (uint8_t *) malloc (64*2); - buf = &endpoint_buffer[EP_BDT_IDX(log_endpoint, RX, ODD)][0]; - } - } else { - if (IN_EP(endpoint)) { - if (endpoint_buffer_iso[2] == NULL) - endpoint_buffer_iso[2] = (uint8_t *) malloc (1023*2); - buf = &endpoint_buffer_iso[2][0]; - } else { - if (endpoint_buffer_iso[0] == NULL) - endpoint_buffer_iso[0] = (uint8_t *) malloc (1023*2); - buf = &endpoint_buffer_iso[0][0]; - } - } - - // IN endpt -> device to host (TX) - if (IN_EP(endpoint)) { - USB0->ENDPOINT[log_endpoint].ENDPT |= handshake_flag | // ep handshaking (not if iso endpoint) - USB_ENDPT_EPTXEN_MASK; // en TX (IN) tran - bdt[EP_BDT_IDX(log_endpoint, TX, ODD )].address = (uint32_t) buf; - bdt[EP_BDT_IDX(log_endpoint, TX, EVEN)].address = 0; - } - // OUT endpt -> host to device (RX) - else { - USB0->ENDPOINT[log_endpoint].ENDPT |= handshake_flag | // ep handshaking (not if iso endpoint) - USB_ENDPT_EPRXEN_MASK; // en RX (OUT) tran. - bdt[EP_BDT_IDX(log_endpoint, RX, ODD )].byte_count = maxPacket; - bdt[EP_BDT_IDX(log_endpoint, RX, ODD )].address = (uint32_t) buf; - bdt[EP_BDT_IDX(log_endpoint, RX, ODD )].info = BD_OWN_MASK | BD_DTS_MASK; - bdt[EP_BDT_IDX(log_endpoint, RX, EVEN)].info = 0; - } - - Data1 |= (1 << endpoint); - - return true; -} - -// read setup packet -void USBHAL::EP0setup(uint8_t *buffer) { - uint32_t sz; - endpointReadResult(EP0OUT, buffer, &sz); -} - -void USBHAL::EP0readStage(void) { - Data1 &= ~1UL; // set DATA0 - bdt[0].info = (BD_DTS_MASK | BD_OWN_MASK); -} - -void USBHAL::EP0read(void) { - uint32_t idx = EP_BDT_IDX(PHY_TO_LOG(EP0OUT), RX, 0); - bdt[idx].byte_count = MAX_PACKET_SIZE_EP0; -} - -uint32_t USBHAL::EP0getReadResult(uint8_t *buffer) { - uint32_t sz; - endpointReadResult(EP0OUT, buffer, &sz); - return sz; -} - -void USBHAL::EP0write(uint8_t *buffer, uint32_t size) { - endpointWrite(EP0IN, buffer, size); -} - -void USBHAL::EP0getWriteResult(void) { -} - -void USBHAL::EP0stall(void) { - stallEndpoint(EP0OUT); -} - -EP_STATUS USBHAL::endpointRead(uint8_t endpoint, uint32_t maximumSize) { - endpoint = PHY_TO_LOG(endpoint); - uint32_t idx = EP_BDT_IDX(endpoint, RX, 0); - bdt[idx].byte_count = maximumSize; - return EP_PENDING; -} - -EP_STATUS USBHAL::endpointReadResult(uint8_t endpoint, uint8_t * buffer, uint32_t *bytesRead) { - uint32_t n, sz, idx, setup = 0; - uint8_t not_iso; - uint8_t * ep_buf; - - uint32_t log_endpoint = PHY_TO_LOG(endpoint); - - if (endpoint > NUMBER_OF_PHYSICAL_ENDPOINTS - 1) { - return EP_INVALID; - } - - // if read on a IN endpoint -> error - if (IN_EP(endpoint)) { - return EP_INVALID; - } - - idx = EP_BDT_IDX(log_endpoint, RX, 0); - sz = bdt[idx].byte_count; - not_iso = USB0->ENDPOINT[log_endpoint].ENDPT & USB_ENDPT_EPHSHK_MASK; - - //for isochronous endpoint, we don't wait an interrupt - if ((log_endpoint != 0) && not_iso && !(epComplete & EP(endpoint))) { - return EP_PENDING; - } - - if ((log_endpoint == 0) && (TOK_PID(idx) == SETUP_TOKEN)) { - setup = 1; - } - - // non iso endpoint - if (not_iso) { - ep_buf = endpoint_buffer[idx]; - } else { - ep_buf = endpoint_buffer_iso[0]; - } - - for (n = 0; n < sz; n++) { - buffer[n] = ep_buf[n]; - } - - if (((Data1 >> endpoint) & 1) == ((bdt[idx].info >> 6) & 1)) { - if (setup && (buffer[6] == 0)) // if no setup data stage, - Data1 &= ~1UL; // set DATA0 - else - Data1 ^= (1 << endpoint); - } - - if (((Data1 >> endpoint) & 1)) { - bdt[idx].info = BD_DTS_MASK | BD_DATA01_MASK | BD_OWN_MASK; - } - else { - bdt[idx].info = BD_DTS_MASK | BD_OWN_MASK; - } - - USB0->CTL &= ~USB_CTL_TXSUSPENDTOKENBUSY_MASK; - *bytesRead = sz; - - epComplete &= ~EP(endpoint); - return EP_COMPLETED; -} - -EP_STATUS USBHAL::endpointWrite(uint8_t endpoint, uint8_t *data, uint32_t size) { - uint32_t idx, n; - uint8_t * ep_buf; - - if (endpoint > NUMBER_OF_PHYSICAL_ENDPOINTS - 1) { - return EP_INVALID; - } - - // if write on a OUT endpoint -> error - if (OUT_EP(endpoint)) { - return EP_INVALID; - } - - idx = EP_BDT_IDX(PHY_TO_LOG(endpoint), TX, 0); - bdt[idx].byte_count = size; - - - // non iso endpoint - if (USB0->ENDPOINT[PHY_TO_LOG(endpoint)].ENDPT & USB_ENDPT_EPHSHK_MASK) { - ep_buf = endpoint_buffer[idx]; - } else { - ep_buf = endpoint_buffer_iso[2]; - } - - for (n = 0; n < size; n++) { - ep_buf[n] = data[n]; - } - - if ((Data1 >> endpoint) & 1) { - bdt[idx].info = BD_OWN_MASK | BD_DTS_MASK; - } else { - bdt[idx].info = BD_OWN_MASK | BD_DTS_MASK | BD_DATA01_MASK; - } - - Data1 ^= (1 << endpoint); - - return EP_PENDING; -} - -EP_STATUS USBHAL::endpointWriteResult(uint8_t endpoint) { - if (epComplete & EP(endpoint)) { - epComplete &= ~EP(endpoint); - return EP_COMPLETED; - } - - return EP_PENDING; -} - -void USBHAL::stallEndpoint(uint8_t endpoint) { - USB0->ENDPOINT[PHY_TO_LOG(endpoint)].ENDPT |= USB_ENDPT_EPSTALL_MASK; -} - -void USBHAL::unstallEndpoint(uint8_t endpoint) { - USB0->ENDPOINT[PHY_TO_LOG(endpoint)].ENDPT &= ~USB_ENDPT_EPSTALL_MASK; -} - -bool USBHAL::getEndpointStallState(uint8_t endpoint) { - uint8_t stall = (USB0->ENDPOINT[PHY_TO_LOG(endpoint)].ENDPT & USB_ENDPT_EPSTALL_MASK); - return (stall) ? true : false; -} - -void USBHAL::remoteWakeup(void) { - // [TODO] -} - - -void USBHAL::_usbisr(void) { - instance->usbisr(); -} - - -void USBHAL::usbisr(void) { - uint8_t i; - uint8_t istat = USB0->ISTAT; - - // reset interrupt - if (istat & USB_ISTAT_USBRST_MASK) { - // disable all endpt - for(i = 0; i < 16; i++) { - USB0->ENDPOINT[i].ENDPT = 0x00; - } - - // enable control endpoint - realiseEndpoint(EP0OUT, MAX_PACKET_SIZE_EP0, 0); - realiseEndpoint(EP0IN, MAX_PACKET_SIZE_EP0, 0); - - Data1 = 0x55555555; - USB0->CTL |= USB_CTL_ODDRST_MASK; - - USB0->ISTAT = 0xFF; // clear all interrupt status flags - USB0->ERRSTAT = 0xFF; // clear all error flags - USB0->ERREN = 0xFF; // enable error interrupt sources - USB0->ADDR = 0x00; // set default address - - return; - } - - // resume interrupt - if (istat & USB_ISTAT_RESUME_MASK) { - USB0->ISTAT = USB_ISTAT_RESUME_MASK; - } - - // SOF interrupt - if (istat & USB_ISTAT_SOFTOK_MASK) { - USB0->ISTAT = USB_ISTAT_SOFTOK_MASK; - // SOF event, read frame number - SOF(frameNumber()); - } - - // stall interrupt - if (istat & 1<<7) { - if (USB0->ENDPOINT[0].ENDPT & USB_ENDPT_EPSTALL_MASK) - USB0->ENDPOINT[0].ENDPT &= ~USB_ENDPT_EPSTALL_MASK; - USB0->ISTAT |= USB_ISTAT_STALL_MASK; - } - - // token interrupt - if (istat & 1<<3) { - uint32_t num = (USB0->STAT >> 4) & 0x0F; - uint32_t dir = (USB0->STAT >> 3) & 0x01; - uint32_t ev_odd = (USB0->STAT >> 2) & 0x01; - - // setup packet - if ((num == 0) && (TOK_PID((EP_BDT_IDX(num, dir, ev_odd))) == SETUP_TOKEN)) { - Data1 &= ~0x02; - bdt[EP_BDT_IDX(0, TX, EVEN)].info &= ~BD_OWN_MASK; - bdt[EP_BDT_IDX(0, TX, ODD)].info &= ~BD_OWN_MASK; - - // EP0 SETUP event (SETUP data received) - EP0setupCallback(); - - } else { - // OUT packet - if (TOK_PID((EP_BDT_IDX(num, dir, ev_odd))) == OUT_TOKEN) { - if (num == 0) - EP0out(); - else { - epComplete |= (1 << EP(num)); - if ((instance->*(epCallback[EP(num) - 2]))()) { - epComplete &= ~(1 << EP(num)); - } - } - } - - // IN packet - if (TOK_PID((EP_BDT_IDX(num, dir, ev_odd))) == IN_TOKEN) { - if (num == 0) { - EP0in(); - if (set_addr == 1) { - USB0->ADDR = addr & 0x7F; - set_addr = 0; - } - } - else { - epComplete |= (1 << (EP(num) + 1)); - if ((instance->*(epCallback[EP(num) + 1 - 2]))()) { - epComplete &= ~(1 << (EP(num) + 1)); - } - } - } - } - - USB0->ISTAT = USB_ISTAT_TOKDNE_MASK; - } - - // sleep interrupt - if (istat & 1<<4) { - USB0->ISTAT |= USB_ISTAT_SLEEP_MASK; - } - - // error interrupt - if (istat & USB_ISTAT_ERROR_MASK) { - USB0->ERRSTAT = 0xFF; - USB0->ISTAT |= USB_ISTAT_ERROR_MASK; - } -} - - -#endif diff --git a/keyboard/infinity/mbed-infinity/cmsis_nvic.c b/keyboard/infinity/mbed-infinity/cmsis_nvic.c deleted file mode 100644 index 985c1d33f5..0000000000 --- a/keyboard/infinity/mbed-infinity/cmsis_nvic.c +++ /dev/null @@ -1,55 +0,0 @@ -/* mbed Microcontroller Library - * CMSIS-style functionality to support dynamic vectors - ******************************************************************************* - * Copyright (c) 2011 ARM Limited. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of ARM Limited nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************* - */ -#include "cmsis_nvic.h" - -#define NVIC_RAM_VECTOR_ADDRESS (0x1FFFE000) // Vectors positioned at start of RAM -#define NVIC_FLASH_VECTOR_ADDRESS (0x1000) // Initial vector position in flash - -void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) { - uint32_t *vectors = (uint32_t*)SCB->VTOR; - uint32_t i; - - // Copy and switch to dynamic vectors if the first time called - if (SCB->VTOR == NVIC_FLASH_VECTOR_ADDRESS) { - uint32_t *old_vectors = vectors; - vectors = (uint32_t*)NVIC_RAM_VECTOR_ADDRESS; - for (i=0; i<NVIC_NUM_VECTORS; i++) { - vectors[i] = old_vectors[i]; - } - SCB->VTOR = (uint32_t)NVIC_RAM_VECTOR_ADDRESS; - } - vectors[IRQn + 16] = vector; -} - -uint32_t NVIC_GetVector(IRQn_Type IRQn) { - uint32_t *vectors = (uint32_t*)SCB->VTOR; - return vectors[IRQn + 16]; -} diff --git a/keyboard/infinity/mbed-infinity/infinity.ld b/keyboard/infinity/mbed-infinity/infinity.ld deleted file mode 100644 index decdaa26e0..0000000000 --- a/keyboard/infinity/mbed-infinity/infinity.ld +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Linker script for Massdrop Infinity - * Infinity has bootloader in top 4KB sector of flash and app should be placed after the area. - * - * based on mbed.org K20 ARM GCC linker script file: MK20D5.ld - */ - -MEMORY -{ - /* Infinity blootloader uses 4KB */ - FLASH (rx) : ORIGIN = 4K, LENGTH = 128K - 4K - RAM (rwx) : ORIGIN = 0x1FFFE0F8, LENGTH = 16K - 0xF8 -} - -/* Linker script to place sections and symbol values. Should be used together - * with other linker script that defines memory regions FLASH and RAM. - * It references following symbols, which must be defined in code: - * _reset_init : Entry of reset handler - * - * It defines following symbols, which code can use without definition: - * __exidx_start - * __exidx_end - * __etext - * __data_start__ - * __preinit_array_start - * __preinit_array_end - * __init_array_start - * __init_array_end - * __fini_array_start - * __fini_array_end - * __data_end__ - * __bss_start__ - * __bss_end__ - * __end__ - * end - * __HeapLimit - * __StackLimit - * __StackTop - * __stack - */ -ENTRY(Reset_Handler) - -SECTIONS -{ - .text : - { - __vector_table = .; - KEEP(*(.isr_vector)) - *(.text.Reset_Handler) - *(.text.System_Init) - . = ALIGN(4); - - *(.text*) - - KEEP(*(.init)) - KEEP(*(.fini)) - - /* .ctors */ - *crtbegin.o(.ctors) - *crtbegin?.o(.ctors) - *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors) - *(SORT(.ctors.*)) - *(.ctors) - - /* .dtors */ - *crtbegin.o(.dtors) - *crtbegin?.o(.dtors) - *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors) - *(SORT(.dtors.*)) - *(.dtors) - - *(.rodata*) - - KEEP(*(.eh_frame*)) - } > FLASH - - .ARM.extab : - { - *(.ARM.extab* .gnu.linkonce.armextab.*) - } > FLASH - - __exidx_start = .; - .ARM.exidx : - { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > FLASH - __exidx_end = .; - - __etext = .; - - .data : AT (__etext) - { - __data_start__ = .; - *(vtable) - *(.data*) - - . = ALIGN(4); - /* preinit data */ - PROVIDE_HIDDEN (__preinit_array_start = .); - KEEP(*(.preinit_array)) - PROVIDE_HIDDEN (__preinit_array_end = .); - - . = ALIGN(4); - /* init data */ - PROVIDE_HIDDEN (__init_array_start = .); - KEEP(*(SORT(.init_array.*))) - KEEP(*(.init_array)) - PROVIDE_HIDDEN (__init_array_end = .); - - - . = ALIGN(4); - /* finit data */ - PROVIDE_HIDDEN (__fini_array_start = .); - KEEP(*(SORT(.fini_array.*))) - KEEP(*(.fini_array)) - PROVIDE_HIDDEN (__fini_array_end = .); - - . = ALIGN(4); - /* All data end */ - __data_end__ = .; - - } > RAM - - .bss : - { - __bss_start__ = .; - *(.bss*) - *(COMMON) - __bss_end__ = .; - } > RAM - - .heap : - { - __end__ = .; - end = __end__; - *(.heap*) - __HeapLimit = .; - } > RAM - - /* .stack_dummy section doesn't contains any symbols. It is only - * used for linker to calculate size of stack sections, and assign - * values to stack symbols later */ - .stack_dummy : - { - *(.stack) - } > RAM - - /* Set stack top to end of RAM, and stack limit move down by - * size of stack_dummy section */ - __StackTop = ORIGIN(RAM) + LENGTH(RAM); - __StackLimit = __StackTop - SIZEOF(.stack_dummy); - PROVIDE(__stack = __StackTop); - - /* Check if data + heap + stack exceeds RAM limit */ - ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack") -} diff --git a/keyboard/infinity/mbed-infinity/startup_MK20D5.s b/keyboard/infinity/mbed-infinity/startup_MK20D5.s deleted file mode 100644 index 7a8d7ba45a..0000000000 --- a/keyboard/infinity/mbed-infinity/startup_MK20D5.s +++ /dev/null @@ -1,259 +0,0 @@ -/* File: startup_MK20D5.s - * Purpose: startup file for Cortex-M4 devices. Should use with - * GCC for ARM Embedded Processors - * Version: V1.3 - * Date: 08 Feb 2012 - * - * Copyright (c) 2012, ARM Limited - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the ARM Limited nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL ARM LIMITED BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - .syntax unified - .arch armv7-m - - .section .stack - .align 3 -#ifdef __STACK_SIZE - .equ Stack_Size, __STACK_SIZE -#else - .equ Stack_Size, 0x400 -#endif - .globl __StackTop - .globl __StackLimit -__StackLimit: - .space Stack_Size - .size __StackLimit, . - __StackLimit -__StackTop: - .size __StackTop, . - __StackTop - - .section .heap - .align 3 -#ifdef __HEAP_SIZE - .equ Heap_Size, __HEAP_SIZE -#else - .equ Heap_Size, 0xC00 -#endif - .globl __HeapBase - .globl __HeapLimit -__HeapBase: - .if Heap_Size - .space Heap_Size - .endif - .size __HeapBase, . - __HeapBase -__HeapLimit: - .size __HeapLimit, . - __HeapLimit - - .section .isr_vector - .align 2 - .globl __isr_vector -__isr_vector: - .long __StackTop /* Top of Stack */ - .long Reset_Handler /* Reset Handler */ - .long NMI_Handler /* NMI Handler */ - .long HardFault_Handler /* Hard Fault Handler */ - .long MemManage_Handler /* MPU Fault Handler */ - .long BusFault_Handler /* Bus Fault Handler */ - .long UsageFault_Handler /* Usage Fault Handler */ - .long 0 /* Reserved */ - .long 0 /* Reserved */ - .long 0 /* Reserved */ - .long 0 /* Reserved */ - .long SVC_Handler /* SVCall Handler */ - .long DebugMon_Handler /* Debug Monitor Handler */ - .long 0 /* Reserved */ - .long PendSV_Handler /* PendSV Handler */ - .long SysTick_Handler /* SysTick Handler */ - - /* External interrupts */ - .long DMA0_IRQHandler /* 0: Watchdog Timer */ - .long DMA1_IRQHandler /* 1: Real Time Clock */ - .long DMA2_IRQHandler /* 2: Timer0 / Timer1 */ - .long DMA3_IRQHandler /* 3: Timer2 / Timer3 */ - .long DMA_Error_IRQHandler /* 4: MCIa */ - .long 0 /* 5: MCIb */ - .long FTFL_IRQHandler /* 6: UART0 - DUT FPGA */ - .long Read_Collision_IRQHandler /* 7: UART1 - DUT FPGA */ - .long LVD_LVW_IRQHandler /* 8: UART2 - DUT FPGA */ - .long LLW_IRQHandler /* 9: UART4 - not connected */ - .long Watchdog_IRQHandler /* 10: AACI / AC97 */ - .long I2C0_IRQHandler /* 11: CLCD Combined Interrupt */ - .long SPI0_IRQHandler /* 12: Ethernet */ - .long I2S0_Tx_IRQHandler /* 13: USB Device */ - .long I2S0_Rx_IRQHandler /* 14: USB Host Controller */ - .long UART0_LON_IRQHandler /* 15: Character LCD */ - .long UART0_RX_TX_IRQHandler /* 16: Flexray */ - .long UART0_ERR_IRQHandler /* 17: CAN */ - .long UART1_RX_TX_IRQHandler /* 18: LIN */ - .long UART1_ERR_IRQHandler /* 19: I2C ADC/DAC */ - .long UART2_RX_TX_IRQHandler /* 20: Reserved */ - .long UART2_ERR_IRQHandler /* 21: Reserved */ - .long ADC0_IRQHandler /* 22: Reserved */ - .long CMP0_IRQHandler /* 23: Reserved */ - .long CMP1_IRQHandler /* 24: Reserved */ - .long FTM0_IRQHandler /* 25: Reserved */ - .long FTM1_IRQHandler /* 26: Reserved */ - .long CMT_IRQHandler /* 27: Reserved */ - .long RTC_IRQHandler /* 28: Reserved - CPU FPGA CLCD */ - .long RTC_Seconds_IRQHandler /* 29: Reserved - CPU FPGA */ - .long PIT0_IRQHandler /* 30: UART3 - CPU FPGA */ - .long PIT1_IRQHandler /* 31: SPI Touchscreen - CPU FPGA */ - .long PIT2_IRQHandler - .long PIT3_IRQHandler - .long PDB0_IRQHandler - .long USB0_IRQHandler - .long USBDCD_IRQHandler - .long TSI0_IRQHandler - .long MCG_IRQHandler - .long LPTimer_IRQHandler - .long PORTA_IRQHandler - .long PORTB_IRQHandler - .long PORTC_IRQHandler - .long PORTD_IRQHandler - .long PORTE_IRQHandler - .long SWI_IRQHandler - .size __isr_vector, . - __isr_vector - - .section .text.Reset_Handler - .thumb - .thumb_func - .align 2 - .globl Reset_Handler - .type Reset_Handler, %function -Reset_Handler: -/* Loop to copy data from read only memory to RAM. The ranges - * of copy from/to are specified by following symbols evaluated in - * linker script. - * __etext: End of code section, i.e., begin of data sections to copy from. - * __data_start__/__data_end__: RAM address range that data should be - * copied to. Both must be aligned to 4 bytes boundary. */ - ldr r0, =SystemInit - blx r0 - - ldr r1, =__etext - ldr r2, =__data_start__ - ldr r3, =__data_end__ - -.Lflash_to_ram_loop: - cmp r2, r3 - ittt lt - ldrlt r0, [r1], #4 - strlt r0, [r2], #4 - blt .Lflash_to_ram_loop - -.Lflash_to_ram_loop_end: - - ldr r0, =_start - bx r0 - .pool - .size Reset_Handler, . - Reset_Handler - - .text -/* Macro to define default handlers. Default handler - * will be weak symbol and just dead loops. They can be - * overwritten by other handlers */ - .macro def_default_handler handler_name - .align 1 - .thumb_func - .weak \handler_name - .type \handler_name, %function -\handler_name : - b . - .size \handler_name, . - \handler_name - .endm - - def_default_handler NMI_Handler - def_default_handler HardFault_Handler - def_default_handler MemManage_Handler - def_default_handler BusFault_Handler - def_default_handler UsageFault_Handler - def_default_handler SVC_Handler - def_default_handler DebugMon_Handler - def_default_handler PendSV_Handler - def_default_handler SysTick_Handler - def_default_handler Default_Handler - - .macro def_irq_default_handler handler_name - .weak \handler_name - .set \handler_name, Default_Handler - .endm - - def_irq_default_handler DMA0_IRQHandler - def_irq_default_handler DMA1_IRQHandler - def_irq_default_handler DMA2_IRQHandler - def_irq_default_handler DMA3_IRQHandler - def_irq_default_handler DMA_Error_IRQHandler - def_irq_default_handler FTFL_IRQHandler - def_irq_default_handler Read_Collision_IRQHandler - def_irq_default_handler LVD_LVW_IRQHandler - def_irq_default_handler LLW_IRQHandler - def_irq_default_handler Watchdog_IRQHandler - def_irq_default_handler I2C0_IRQHandler - def_irq_default_handler SPI0_IRQHandler - def_irq_default_handler I2S0_Tx_IRQHandler - def_irq_default_handler I2S0_Rx_IRQHandler - def_irq_default_handler UART0_LON_IRQHandler - def_irq_default_handler UART0_RX_TX_IRQHandler - def_irq_default_handler UART0_ERR_IRQHandler - def_irq_default_handler UART1_RX_TX_IRQHandler - def_irq_default_handler UART1_ERR_IRQHandler - def_irq_default_handler UART2_RX_TX_IRQHandler - def_irq_default_handler UART2_ERR_IRQHandler - def_irq_default_handler ADC0_IRQHandler - def_irq_default_handler CMP0_IRQHandler - def_irq_default_handler CMP1_IRQHandler - def_irq_default_handler FTM0_IRQHandler - def_irq_default_handler FTM1_IRQHandler - def_irq_default_handler CMT_IRQHandler - def_irq_default_handler RTC_IRQHandler - def_irq_default_handler RTC_Seconds_IRQHandler - def_irq_default_handler PIT0_IRQHandler - def_irq_default_handler PIT1_IRQHandler - def_irq_default_handler PIT2_IRQHandler - def_irq_default_handler PIT3_IRQHandler - def_irq_default_handler PDB0_IRQHandler - def_irq_default_handler USB0_IRQHandler - def_irq_default_handler USBDCD_IRQHandler - def_irq_default_handler TSI0_IRQHandler - def_irq_default_handler MCG_IRQHandler - def_irq_default_handler LPTimer_IRQHandler - def_irq_default_handler PORTA_IRQHandler - def_irq_default_handler PORTB_IRQHandler - def_irq_default_handler PORTC_IRQHandler - def_irq_default_handler PORTD_IRQHandler - def_irq_default_handler PORTE_IRQHandler - def_irq_default_handler SWI_IRQHandler - def_irq_default_handler DEF_IRQHandler - -/* Flash protection region, placed at 0x400 */ - .text - .thumb - .align 2 - .section .kinetis_flash_config_field,"a",%progbits -kinetis_flash_config: - .long 0xffffffff - .long 0xffffffff - .long 0xffffffff - .long 0xfffffffe - - .end diff --git a/keyboard/infinity/mbed-infinity/system_MK20D5.c b/keyboard/infinity/mbed-infinity/system_MK20D5.c deleted file mode 100644 index 4f4e2a2624..0000000000 --- a/keyboard/infinity/mbed-infinity/system_MK20D5.c +++ /dev/null @@ -1,299 +0,0 @@ -/* -** ################################################################### -** Compilers: ARM Compiler -** Freescale C/C++ for Embedded ARM -** GNU C Compiler -** IAR ANSI C/C++ Compiler for ARM -** -** Reference manuals: K20P64M50SF0RM Rev. 1, Oct 2011 -** K20P32M50SF0RM Rev. 1, Oct 2011 -** K20P48M50SF0RM Rev. 1, Oct 2011 -** -** Version: rev. 1.0, 2011-12-15 -** -** Abstract: -** Provides a system configuration function and a global variable that -** contains the system frequency. It configures the device and initializes -** the oscillator (PLL) that is part of the microcontroller device. -** -** Copyright: 2011 Freescale Semiconductor, Inc. All Rights Reserved. -** -** http: www.freescale.com -** mail: support@freescale.com -** -** Revisions: -** - rev. 1.0 (2011-12-15) -** Initial version -** -** ################################################################### -*/ - -/** - * @file MK20D5 - * @version 1.0 - * @date 2011-12-15 - * @brief Device specific configuration file for MK20D5 (implementation file) - * - * Provides a system configuration function and a global variable that contains - * the system frequency. It configures the device and initializes the oscillator - * (PLL) that is part of the microcontroller device. - */ - -#include <stdint.h> -#include "MK20D5.h" - -#define DISABLE_WDOG 1 - -#define CLOCK_SETUP 3 -/* Predefined clock setups - 0 ... Multipurpose Clock Generator (MCG) in FLL Engaged Internal (FEI) mode - Reference clock source for MCG module is the slow internal clock source 32.768kHz - Core clock = 41.94MHz, BusClock = 41.94MHz - 1 ... Multipurpose Clock Generator (MCG) in PLL Engaged External (PEE) mode - Reference clock source for MCG module is an external crystal 8MHz - Core clock = 48MHz, BusClock = 48MHz - 2 ... Multipurpose Clock Generator (MCG) in Bypassed Low Power External (BLPE) mode - Core clock/Bus clock derived directly from an external crystal 8MHz with no multiplication - Core clock = 8MHz, BusClock = 8MHz -*/ - -/*---------------------------------------------------------------------------- - Define clock source values - *----------------------------------------------------------------------------*/ -#if (CLOCK_SETUP == 0) - #define CPU_XTAL_CLK_HZ 8000000u /* Value of the external crystal or oscillator clock frequency in Hz */ - #define CPU_XTAL32k_CLK_HZ 32768u /* Value of the external 32k crystal or oscillator clock frequency in Hz */ - #define CPU_INT_SLOW_CLK_HZ 32768u /* Value of the slow internal oscillator clock frequency in Hz */ - #define CPU_INT_FAST_CLK_HZ 4000000u /* Value of the fast internal oscillator clock frequency in Hz */ - #define DEFAULT_SYSTEM_CLOCK 41943040u /* Default System clock value */ -#elif (CLOCK_SETUP == 1) - #define CPU_XTAL_CLK_HZ 8000000u /* Value of the external crystal or oscillator clock frequency in Hz */ - #define CPU_XTAL32k_CLK_HZ 32768u /* Value of the external 32k crystal or oscillator clock frequency in Hz */ - #define CPU_INT_SLOW_CLK_HZ 32768u /* Value of the slow internal oscillator clock frequency in Hz */ - #define CPU_INT_FAST_CLK_HZ 4000000u /* Value of the fast internal oscillator clock frequency in Hz */ - #define DEFAULT_SYSTEM_CLOCK 48000000u /* Default System clock value */ -#elif (CLOCK_SETUP == 2) - #define CPU_XTAL_CLK_HZ 8000000u /* Value of the external crystal or oscillator clock frequency in Hz */ - #define CPU_XTAL32k_CLK_HZ 32768u /* Value of the external 32k crystal or oscillator clock frequency in Hz */ - #define CPU_INT_SLOW_CLK_HZ 32768u /* Value of the slow internal oscillator clock frequency in Hz */ - #define CPU_INT_FAST_CLK_HZ 4000000u /* Value of the fast internal oscillator clock frequency in Hz */ - #define DEFAULT_SYSTEM_CLOCK 8000000u /* Default System clock value */ -#elif (CLOCK_SETUP == 3) - /* for Infinity */ - #define CPU_XTAL_CLK_HZ 8000000u - #define CPU_XTAL32k_CLK_HZ 32768u - #define CPU_INT_SLOW_CLK_HZ 32768u - #define CPU_INT_FAST_CLK_HZ 4000000u - #define DEFAULT_SYSTEM_CLOCK 48000000u -#endif - - -/* ---------------------------------------------------------------------------- - -- Core clock - ---------------------------------------------------------------------------- */ - -uint32_t SystemCoreClock = DEFAULT_SYSTEM_CLOCK; - -/* ---------------------------------------------------------------------------- - -- SystemInit() - ---------------------------------------------------------------------------- */ - -void SystemInit (void) { -#if (DISABLE_WDOG) - /* Disable the WDOG module */ - /* WDOG_UNLOCK: WDOGUNLOCK=0xC520 */ - WDOG->UNLOCK = (uint16_t)0xC520u; /* Key 1 */ - /* WDOG_UNLOCK : WDOGUNLOCK=0xD928 */ - WDOG->UNLOCK = (uint16_t)0xD928u; /* Key 2 */ - /* WDOG_STCTRLH: ??=0,DISTESTWDOG=0,BYTESEL=0,TESTSEL=0,TESTWDOG=0,??=0,STNDBYEN=1,WAITEN=1,STOPEN=1,DBGEN=0,ALLOWUPDATE=1,WINEN=0,IRQRSTEN=0,CLKSRC=1,WDOGEN=0 */ - WDOG->STCTRLH = (uint16_t)0x01D2u; -#endif /* (DISABLE_WDOG) */ -#if (CLOCK_SETUP == 0) - /* SIM->CLKDIV1: OUTDIV1=0,OUTDIV2=0,OUTDIV3=1,OUTDIV4=1,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0 */ - SIM->CLKDIV1 = (uint32_t)0x00110000u; /* Update system prescalers */ - /* Switch to FEI Mode */ - /* MCG->C1: CLKS=0,FRDIV=0,IREFS=1,IRCLKEN=1,IREFSTEN=0 */ - MCG->C1 = (uint8_t)0x06u; - /* MCG->C2: ??=0,??=0,RANGE0=0,HGO=0,EREFS=0,LP=0,IRCS=0 */ - MCG->C2 = (uint8_t)0x00u; - /* MCG_C4: DMX32=0,DRST_DRS=1 */ - MCG->C4 = (uint8_t)((MCG->C4 & (uint8_t)~(uint8_t)0xC0u) | (uint8_t)0x20u); - /* MCG->C5: ??=0,PLLCLKEN=0,PLLSTEN=0,PRDIV0=0 */ - MCG->C5 = (uint8_t)0x00u; - /* MCG->C6: LOLIE=0,PLLS=0,CME=0,VDIV0=0 */ - MCG->C6 = (uint8_t)0x00u; - while((MCG->S & MCG_S_IREFST_MASK) == 0u) { /* Check that the source of the FLL reference clock is the internal reference clock. */ - } - while((MCG->S & 0x0Cu) != 0x00u) { /* Wait until output of the FLL is selected */ - } -#elif (CLOCK_SETUP == 1) - /* SIM->CLKDIV1: OUTDIV1=0,OUTDIV2=0,OUTDIV3=1,OUTDIV4=1,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0 */ - SIM->CLKDIV1 = (uint32_t)0x00110000u; /* Update system prescalers */ - /* Switch to FBE Mode */ - /* OSC0->CR: ERCLKEN=0,??=0,EREFSTEN=0,??=0,SC2P=0,SC4P=0,SC8P=0,SC16P=0 */ - OSC0->CR = (uint8_t)0x00u; - /* MCG->C7: OSCSEL=0 */ - MCG->C7 = (uint8_t)0x00u; - /* MCG->C2: ??=0,??=0,RANGE0=2,HGO=0,EREFS=1,LP=0,IRCS=0 */ - MCG->C2 = (uint8_t)0x24u; - /* MCG->C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */ - MCG->C1 = (uint8_t)0x9Au; - /* MCG->C4: DMX32=0,DRST_DRS=0 */ - MCG->C4 &= (uint8_t)~(uint8_t)0xE0u; - /* MCG->C5: ??=0,PLLCLKEN=0,PLLSTEN=0,PRDIV0=3 */ - MCG->C5 = (uint8_t)0x03u; - /* MCG->C6: LOLIE=0,PLLS=0,CME=0,VDIV0=0 */ - MCG->C6 = (uint8_t)0x00u; - while((MCG->S & MCG_S_OSCINIT0_MASK) == 0u) { /* Check that the oscillator is running */ - } -#if 0 /* ARM: THIS CHECK IS REMOVED DUE TO BUG WITH SLOW IRC IN REV. 1.0 */ - while((MCG->S & MCG_S_IREFST_MASK) != 0u) { /* Check that the source of the FLL reference clock is the external reference clock. */ - } -#endif - while((MCG->S & 0x0Cu) != 0x08u) { /* Wait until external reference clock is selected as MCG output */ - } - /* Switch to PBE Mode */ - /* MCG_C5: ??=0,PLLCLKEN=0,PLLSTEN=0,PRDIV0=3 */ - MCG->C5 = (uint8_t)0x03u; - /* MCG->C6: LOLIE=0,PLLS=1,CME=0,VDIV0=0 */ - MCG->C6 = (uint8_t)0x40u; - while((MCG->S & MCG_S_PLLST_MASK) == 0u) { /* Wait until the source of the PLLS clock has switched to the PLL */ - } - while((MCG->S & MCG_S_LOCK0_MASK) == 0u) { /* Wait until locked */ - } - /* Switch to PEE Mode */ - /* MCG->C1: CLKS=0,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */ - MCG->C1 = (uint8_t)0x1Au; - while((MCG->S & 0x0Cu) != 0x0Cu) { /* Wait until output of the PLL is selected */ - } - while((MCG->S & MCG_S_LOCK0_MASK) == 0u) { /* Wait until locked */ - } -#elif (CLOCK_SETUP == 2) - /* SIM_CLKDIV1: OUTDIV1=0,OUTDIV2=0,OUTDIV3=1,OUTDIV4=1,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0,??=0 */ - SIM->CLKDIV1 = (uint32_t)0x00110000u; /* Update system prescalers */ - /* Switch to FBE Mode */ - /* OSC0->CR: ERCLKEN=0,??=0,EREFSTEN=0,??=0,SC2P=0,SC4P=0,SC8P=0,SC16P=0 */ - OSC0->CR = (uint8_t)0x00u; - /* MCG->C7: OSCSEL=0 */ - MCG->C7 = (uint8_t)0x00u; - /* MCG->C2: ??=0,??=0,RANGE0=2,HGO=0,EREFS=1,LP=0,IRCS=0 */ - MCG->C2 = (uint8_t)0x24u; - /* MCG->C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=1,IREFSTEN=0 */ - MCG->C1 = (uint8_t)0x9Au; - /* MCG->C4: DMX32=0,DRST_DRS=0 */ - MCG->C4 &= (uint8_t)~(uint8_t)0xE0u; - /* MCG->C5: ??=0,PLLCLKEN=0,PLLSTEN=0,PRDIV0=0 */ - MCG->C5 = (uint8_t)0x00u; - /* MCG->C6: LOLIE=0,PLLS=0,CME=0,VDIV0=0 */ - MCG->C6 = (uint8_t)0x00u; - while((MCG->S & MCG_S_OSCINIT0_MASK) == 0u) { /* Check that the oscillator is running */ - } -#if 0 /* ARM: THIS CHECK IS REMOVED DUE TO BUG WITH SLOW IRC IN REV. 1.0 */ - while((MCG->S & MCG_S_IREFST_MASK) != 0u) { /* Check that the source of the FLL reference clock is the external reference clock. */ - } -#endif - while((MCG->S & 0x0CU) != 0x08u) { /* Wait until external reference clock is selected as MCG output */ - } - /* Switch to BLPE Mode */ - /* MCG->C2: ??=0,??=0,RANGE0=2,HGO=0,EREFS=1,LP=0,IRCS=0 */ - MCG->C2 = (uint8_t)0x24u; - -#elif (CLOCK_SETUP == 3) - /* for Infinity FEI: 48MHz */ - - /* OUTDIV1(core/system): 48/1, OUTDIV2(bus): 48/1, OUTDIV4(flash): 48/2 */ - SIM->CLKDIV1 = SIM_CLKDIV1_OUTDIV1(0) | SIM_CLKDIV1_OUTDIV2(0) | SIM_CLKDIV1_OUTDIV4(1); - MCG->C1 = MCG_C1_IREFS_MASK | MCG_C1_IRCLKEN_MASK; - /* 32.768KHz x FLL(1464) = 48MHz */ - MCG->C4 = MCG_C4_DMX32_MASK | MCG_C4_DRST_DRS(1); - /* USB clock source: MCGPLLCLK/MCGFLLCLK */ - //SIM->SOPT2 = SIM_SOPT2_USBSRC_MASK | SIM_SOPT2_TRACECLKSEL_MASK; - - while((MCG->S & MCG_S_IREFST_MASK) == 0u) { } - while((MCG->S & 0x0Cu) != 0x00u) { } -#endif -} - -/* ---------------------------------------------------------------------------- - -- SystemCoreClockUpdate() - ---------------------------------------------------------------------------- */ - -void SystemCoreClockUpdate (void) { - uint32_t MCGOUTClock; /* Variable to store output clock frequency of the MCG module */ - uint8_t Divider; - - if ((MCG->C1 & MCG_C1_CLKS_MASK) == 0x0u) { - /* Output of FLL or PLL is selected */ - if ((MCG->C6 & MCG_C6_PLLS_MASK) == 0x0u) { - /* FLL is selected */ - if ((MCG->C1 & MCG_C1_IREFS_MASK) == 0x0u) { - /* External reference clock is selected */ - if ((MCG->C7 & MCG_C7_OSCSEL_MASK) == 0x0u) { - MCGOUTClock = CPU_XTAL_CLK_HZ; /* System oscillator drives MCG clock */ - } else { /* (!((MCG->C7 & MCG_C7_OSCSEL_MASK) == 0x0u)) */ - MCGOUTClock = CPU_XTAL32k_CLK_HZ; /* RTC 32 kHz oscillator drives MCG clock */ - } /* (!((MCG->C7 & MCG_C7_OSCSEL_MASK) == 0x0u)) */ - Divider = (uint8_t)(1u << ((MCG->C1 & MCG_C1_FRDIV_MASK) >> MCG_C1_FRDIV_SHIFT)); - MCGOUTClock = (MCGOUTClock / Divider); /* Calculate the divided FLL reference clock */ - if ((MCG->C2 & MCG_C2_RANGE0_MASK) != 0x0u) { - MCGOUTClock /= 32u; /* If high range is enabled, additional 32 divider is active */ - } /* ((MCG->C2 & MCG_C2_RANGE0_MASK) != 0x0u) */ - } else { /* (!((MCG->C1 & MCG_C1_IREFS_MASK) == 0x0u)) */ - MCGOUTClock = CPU_INT_SLOW_CLK_HZ; /* The slow internal reference clock is selected */ - } /* (!((MCG->C1 & MCG_C1_IREFS_MASK) == 0x0u)) */ - /* Select correct multiplier to calculate the MCG output clock */ - switch (MCG->C4 & (MCG_C4_DMX32_MASK | MCG_C4_DRST_DRS_MASK)) { - case 0x0u: - MCGOUTClock *= 640u; - break; - case 0x20u: - MCGOUTClock *= 1280u; - break; - case 0x40u: - MCGOUTClock *= 1920u; - break; - case 0x60u: - MCGOUTClock *= 2560u; - break; - case 0x80u: - MCGOUTClock *= 732u; - break; - case 0xA0u: - MCGOUTClock *= 1464u; - break; - case 0xC0u: - MCGOUTClock *= 2197u; - break; - case 0xE0u: - MCGOUTClock *= 2929u; - break; - default: - break; - } - } else { /* (!((MCG->C6 & MCG_C6_PLLS_MASK) == 0x0u)) */ - /* PLL is selected */ - Divider = (1u + (MCG->C5 & MCG_C5_PRDIV0_MASK)); - MCGOUTClock = (uint32_t)(CPU_XTAL_CLK_HZ / Divider); /* Calculate the PLL reference clock */ - Divider = ((MCG->C6 & MCG_C6_VDIV0_MASK) + 24u); - MCGOUTClock *= Divider; /* Calculate the MCG output clock */ - } /* (!((MCG->C6 & MCG_C6_PLLS_MASK) == 0x0u)) */ - } else if ((MCG->C1 & MCG_C1_CLKS_MASK) == 0x40u) { - /* Internal reference clock is selected */ - if ((MCG->C2 & MCG_C2_IRCS_MASK) == 0x0u) { - MCGOUTClock = CPU_INT_SLOW_CLK_HZ; /* Slow internal reference clock selected */ - } else { /* (!((MCG->C2 & MCG_C2_IRCS_MASK) == 0x0u)) */ - MCGOUTClock = CPU_INT_FAST_CLK_HZ / (1 << ((MCG->SC & MCG_SC_FCRDIV_MASK) >> MCG_SC_FCRDIV_SHIFT)); /* Fast internal reference clock selected */ - } /* (!((MCG->C2 & MCG_C2_IRCS_MASK) == 0x0u)) */ - } else if ((MCG->C1 & MCG_C1_CLKS_MASK) == 0x80u) { - /* External reference clock is selected */ - if ((MCG->C7 & MCG_C7_OSCSEL_MASK) == 0x0u) { - MCGOUTClock = CPU_XTAL_CLK_HZ; /* System oscillator drives MCG clock */ - } else { /* (!((MCG->C7 & MCG_C7_OSCSEL_MASK) == 0x0u)) */ - MCGOUTClock = CPU_XTAL32k_CLK_HZ; /* RTC 32 kHz oscillator drives MCG clock */ - } /* (!((MCG->C7 & MCG_C7_OSCSEL_MASK) == 0x0u)) */ - } else { /* (!((MCG->C1 & MCG_C1_CLKS_MASK) == 0x80u)) */ - /* Reserved value */ - return; - } /* (!((MCG->C1 & MCG_C1_CLKS_MASK) == 0x80u)) */ - SystemCoreClock = (MCGOUTClock / (1u + ((SIM->CLKDIV1 & SIM_CLKDIV1_OUTDIV1_MASK) >> SIM_CLKDIV1_OUTDIV1_SHIFT))); -} diff --git a/keyboard/infinity/tool/README b/keyboard/infinity/tool/README deleted file mode 100644 index 698314e250..0000000000 --- a/keyboard/infinity/tool/README +++ /dev/null @@ -1,103 +0,0 @@ -OpenOCD config files for Kinetis -================================ -http://nemuisan.blog.bai.ne.jp/?eid=192848#OPENOCD - -These are needed for debug and programing bootloader with SWD. To flash keyboard firmware use 'dfu-util'. - -Flash security of Freescale kinetis ------------------------------------ -If FSEC of flash config is changed accidentally SWD/JTAG you can't get debug access until doing 'mdm mass_erase' with JTAG, CMSIS-DAP or OpenSAD adapter. HLA(high level adapter) like stlink doesn't work for this. - - -Example -------- -Debug: - $ openocd -s tool -f tool/openocd.cfg - $ arm-none-eabi-gdb build/infinity.elf -ex "target remote localhost:3333" - -Flash bootloader: - $ openocd -s tool -f tool/openocd.cfg -c "mt_flash kiibohd_bootloader.bin" - - -Infinity SWD pinout -------------------- -SWD pins are placed next to reset button; SWD_CLK, SWD_DIO, GND, 5V from top. -Note that RESET is also needed to get full control with OpenOCD. - - -------- - | ___ o |CLK - ||RST| o |DIO - ||BTN| o |GND - | --- o |5V - -------- - - -Kinetis sercure state ----------------------- -openocd 0.9.0 - -Warn : *********** ATTENTION! ATTENTION! ATTENTION! ATTENTION! ********** -Warn : **** **** -Warn : **** Your Kinetis MCU is in secured state, which means that, **** -Warn : **** with exception for very basic communication, JTAG/SWD **** -Warn : **** interface will NOT work. In order to restore its **** -Warn : **** functionality please issue 'kinetis mdm mass_erase' **** -Warn : **** command, power cycle the MCU and restart OpenOCD. **** -Warn : **** **** -Warn : *********** ATTENTION! ATTENTION! ATTENTION! ATTENTION! ********** - - -Info : MDM: Chip is unsecured. Continuing. -target state: halted -target halted due to debug-request, current mode: Thread -xPSR: 0x01000000 pc: 0xfffffffe msp: 0xfffffffc -auto erase enabled -Info : Probing flash info for bank 0 -Warn : flash configuration field erased, please reset the device -wrote 4096 bytes from file kiibohd_bootloader.bin in 2.442562s (1.638 KiB/s) -Info : MDM: Chip is unsecured. Continuing. - - - - -Open On-Chip Debugger 0.9.0-dev-00346-g3e1dfdc-dirty (2015-03-21-20:41) -Licensed under GNU GPL v2 -For bug reports, read - http://openocd.sourceforge.net/doc/doxygen/bugs.html -Info : only one transport option; autoselect 'cmsis-dap' -Kinetis MUST need Hardware SRST Control to Recover Secure-State! -adapter_nsrst_delay: 200 -srst_only separate srst_gates_jtag srst_open_drain connect_deassert_srst -Info : add flash_bank kinetis k20.pflash -cortex_m reset_config sysresetreq -adapter speed: 1000 kHz -srst_only separate srst_nogate srst_open_drain connect_assert_srst -Info : CMSIS-DAP: SWD Supported -Info : CMSIS-DAP: Interface Initialised (SWD) -Info : CMSIS-DAP: FW Version = 1.0 -Info : SWCLK/TCK = 0 SWDIO/TMS = 1 TDI = 0 TDO = 0 nTRST = 0 nRESET = 1 -Info : Connecting under reset -Info : DAP_SWJ Sequence (reset: 50+ '1' followed by 0) -Info : CMSIS-DAP: Interface ready -Info : clock speed 1000 kHz -Info : IDCODE 0x2ba01477 -Warn : Adapter returned success despite SSTICKYERR being set. -Warn : Adapter returned success despite SSTICKYERR being set. -Warn : Adapter returned success despite SSTICKYERR being set. -Warn : Adapter returned success despite SSTICKYERR being set. -Info : k20.cpu: hardware has 6 breakpoints, 4 watchpoints -Info : MDM: Chip is unsecured. Continuing. -Info : MDM: Chip is unsecured. Continuing. -target state: halted -target halted due to debug-request, current mode: Thread -xPSR: 0x01000000 pc: 0xfffffffe msp: 0xfffffffc -auto erase enabled -Info : Probing flash info for bank 0 -Warn : flash configuration field erased, please reset the device -wrote 4096 bytes from file kiibohd_bootloader.bin in 2.446902s (1.635 KiB/s) -Info : MDM: Chip is unsecured. Continuing. -Info : Halt timed out, wake up GDB. -Error: timed out while waiting for target halted -Runtime Error: tool/k20dx32_flash.cfg:81: -in procedure 'mt_flash' -in procedure 'halt' called at file "tool/k20dx32_flash.cfg", line 81 diff --git a/keyboard/infinity/tool/k20dx32_flash.cfg b/keyboard/infinity/tool/k20dx32_flash.cfg deleted file mode 100644 index 1e3deb0910..0000000000 --- a/keyboard/infinity/tool/k20dx32_flash.cfg +++ /dev/null @@ -1,139 +0,0 @@ -# FreeScale Kinetis K20 devices with 32kB Flash and 8kB Local On-Chip SRAM, -# Nemuisan's Special for MK20DN32VFT5,MK20DX32VFT5,MK10DN32VFT5,MK10DX32VFT5 - - -# 0.8.0 has no these procs -proc using_jtag {} { - set _TRANSPORT [ transport select ] - expr { [ string first "jtag" $_TRANSPORT ] != -1 } -} - -proc using_swd {} { - set _TRANSPORT [ transport select ] - expr { [ string first "swd" $_TRANSPORT ] != -1 } -} - -proc using_hla {} { - set _TRANSPORT [ transport select ] - expr { [ string first "hla" $_TRANSPORT ] != -1 } -} - -source [find target/swj-dp.tcl] - -if { [info exists CHIPNAME] } { - set _CHIPNAME $CHIPNAME -} else { - set _CHIPNAME k20 -} - -if { [info exists ENDIAN] } { - set _ENDIAN $ENDIAN -} else { - set _ENDIAN little -} - -if { [info exists CPUTAPID] } { - set _CPUTAPID $CPUTAPID -} else { - if { [using_jtag] } { - set _CPUTAPID 0x4BA00477 - } { - # this is the SW-DP tap id not the jtag tap id - set _CPUTAPID 0x2BA01477 - } -} - -# Work-area is a space in RAM used for flash programming -# By default use 8kB -if { [info exists WORKAREASIZE] == 0 } { - set _WORKAREASIZE 0x2000 -} - -# Select "srst_only", Nemuisan said so! -echo "Kinetis MUST need Hardware SRST Control to Recover Secure-State!" -adapter_nsrst_delay 200 -reset_config srst_only - -swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID -set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME cortex_m -chain-position $_TARGETNAME - -# It is important that "kinetis mdm check_security" is called for -# 'examine-end' event and not 'eximine-start'. Calling it in 'examine-start' -# causes "kinetis mdm check_security" to fail the first time openocd -# calls it when it tries to connect after the CPU has been power-cycled. -$_CHIPNAME.cpu configure -event examine-end { - kinetis mdm check_security -# Uncomment when gone into s*ck'n secured state! -# kinetis mdm mass_erase -} - -# K20 has minimun 8kB of SRAM and starts at 1FFFF000. -$_TARGETNAME configure -work-area-phys 0x1FFFF000 -work-area-size $_WORKAREASIZE -work-area-backup 0 -rtos auto - -# MK20DN32VFT5,MK20DX32VFT5,MK10DN32VFT5,MK10DX32VFT5 has 32kB of flash memory. -flash bank $_CHIPNAME.pflash kinetis 0x00000000 0x8000 0 4 $_TARGETNAME - - -proc mt_flash {IMGFILE} { - flash write_image erase $IMGFILE - reset run - halt - verify_image $IMGFILE - reset run - shutdown -} - -proc mt_flash_bin {IMGFILE OFFSET} { - flash write_image erase $IMGFILE $OFFSET bin - reset run - halt - verify_image $IMGFILE $OFFSET bin - reset run - shutdown -} - -proc mt_flash_hex {IMGFILE} { - flash write_image erase $IMGFILE 0 ihex - reset run - halt - verify_image $IMGFILE 0 ihex - reset run - shutdown -} - -proc mt_flash_srec {IMGFILE} { - flash write_image erase $IMGFILE 0 s19 - reset run - halt - verify_image $IMGFILE 0 s19 - reset run - shutdown -} - -proc mass_erase {} { - kinetis mdm mass_erase -} - -proc eraser {} { -# Verbose procedure confirmed erase routine - flash info 0 -# CAUTION! "flash erase_sector 0 0 last" goes into secure state!!! -# USE "mass_erase" command instead of -# flash erase_sector 0 0 last - mass_erase - shutdown -} - -#debug_level 3 -# HLA doesn't have cortex_m commands -if {![using_hla]} { - # if srst is not fitted use SYSRESETREQ to - # perform a soft reset - cortex_m reset_config sysresetreq -} -adapter_khz 1000 -reset_config srst_only srst_nogate connect_assert_srst -gdb_target_description disable -init -reset init diff --git a/keyboard/infinity/tool/openocd.cfg b/keyboard/infinity/tool/openocd.cfg deleted file mode 100644 index 2b0a63b933..0000000000 --- a/keyboard/infinity/tool/openocd.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# mchack openocd -# https://github.com/mchck/mchck/wiki/Openocd -# -# adapter: frdm-kl05z with cmsis-dap firmware -# inteface: cmsis-dap -# transport: hla_swd -# target: MK20DX128VLF5 Freescale Kinetis - -# adapter/interface -source [find interface/cmsis-dap.cfg] - -# CPU -source [find k20dx32_flash.cfg] diff --git a/keyboard/jd45/Makefile b/keyboard/jd45/Makefile index f6a8d10c58..d270a6f8a7 100644 --- a/keyboard/jd45/Makefile +++ b/keyboard/jd45/Makefile @@ -56,7 +56,7 @@ SRC = jd45.c \ ifdef KEYMAP SRC := keymaps/keymaps/(KEYMAP).c $(SRC) else - SRC := keymaps/keymaps/default.c $(SRC) + SRC := keymaps/default.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/jd45/config.h b/keyboard/jd45/config.h index 1b81fe32ed..ffedb6a1a9 100644 --- a/keyboard/jd45/config.h +++ b/keyboard/jd45/config.h @@ -30,11 +30,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key matrix size */ #define MATRIX_ROWS 4 -#define MATRIX_COLS 13 +#define MATRIX_COLS 13 /* Planck PCB default pin-out */ -#define COLS (int []){F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0} -#define ROWS (int []){F0, F1, F5, B4} +#define MATRIX_ROW_PINS { F0, F1, F5, B4 } +#define MATRIX_COL_PINS { F4, D7, B5, B6, C6, C7, D4, D6, D5, D0, D1, D2, B0 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -46,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/hhkb_qmk/Makefile b/keyboard/kc60_v2/Makefile index 21ba261a23..33ece31647 100644 --- a/keyboard/hhkb_qmk/Makefile +++ b/keyboard/kc60_v2/Makefile @@ -27,7 +27,7 @@ # make flip-ee = Download the eeprom file to the device, using Atmel FLIP # (must have Atmel FLIP installed). # -# make debug = Start either simulavr or avarice as specified for debugging, +# make debug = Start either simulavr or avarice as specified for debugging, # with avr-gdb or avr-insight as the front end for debugging. # # make filename.s = Just compile filename.c into the assembler code only. @@ -39,7 +39,7 @@ #---------------------------------------------------------------------------- # Target file name (without extension). -TARGET = hhkb_qmk +TARGET = kc60 # Directory common source filess exist @@ -50,13 +50,12 @@ TMK_DIR = ../../tmk_core TARGET_DIR = . # # project specific files -SRC = hhkb_qmk.c \ - matrix.c +SRC = kc60.c ifdef KEYMAP - SRC := keymaps/keymaps/$(KEYMAP).c $(SRC) + SRC := keymaps/$(KEYMAP).c $(SRC) else - SRC := keymaps/keymaps/default.c $(SRC) + SRC := keymaps/default.c $(SRC) endif CONFIG_H = config.h @@ -108,29 +107,45 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -#OPT_DEFS += -DBOOTLOADER_SIZE=4096 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 -# as per original hasu settings -OPT_DEFS += -DBOOTLOADER_SIZE=512 # Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -CUSTOM_MATRIX = yes # Custom matrix file for the HHKB +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +KEYBOARD_LOCK_ENABLE = yes # Allow locking of keyboard via magic key # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -# MIDI_ENABLE = YES # MIDI controls -# UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +ifdef KEYMAP + +ifeq ("$(wildcard keymaps/$(KEYMAP).c)","") +ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","") + include keymaps/$(KEYMAP)/makefile.mk +endif +endif + +else + +ifneq ("$(wildcard keymaps/default/makefile.mk)","") + include keymaps/default/makefile.mk +endif + +endif + # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax @@ -139,11 +154,5 @@ VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) VPATH += $(TMK_DIR) -debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION -debug-on: all - -debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT -debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) -debug-off: all - include $(TOP_DIR)/quantum/quantum.mk + diff --git a/keyboard/kc60_v2/README.md b/keyboard/kc60_v2/README.md new file mode 100644 index 0000000000..4be448d15c --- /dev/null +++ b/keyboard/kc60_v2/README.md @@ -0,0 +1,24 @@ +kc60 keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent README.md](/README.md). + +## Building + +Download or clone the whole firmware and navigate to the keyboard/kc60 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default +To build with the default keymap, simply run `make`. + +### Other Keymaps +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` in the keymaps folder, and see keymap document (you can find in top README.md) and existent keymap files. + +To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: +``` +$ make KEYMAP=[default|jack|<name>] +``` +Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. diff --git a/keyboard/kc60_v2/config.h b/keyboard/kc60_v2/config.h new file mode 100644 index 0000000000..16bc1cbb29 --- /dev/null +++ b/keyboard/kc60_v2/config.h @@ -0,0 +1,161 @@ +/* +Copyright 2012 Jun Wako <wakojun@gmail.com> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER You +#define PRODUCT kc60v2 +#define DESCRIPTION A custom keyboard + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ + +// Possible pins for columns include: F1 F0 E6 D7 D6 D4 C7 C6 B7 B5 B4 B3 B1 B0 +// Pins for rows include: D0 D1 F6 F7 D5 +#define MATRIX_ROW_PINS { D0, D1, F6, F7, D5 } +#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +#define BACKLIGHT_LEVELS 3 + +/* 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 + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboard/kc60_v2/kc60.c b/keyboard/kc60_v2/kc60.c new file mode 100644 index 0000000000..0a578b2b88 --- /dev/null +++ b/keyboard/kc60_v2/kc60.c @@ -0,0 +1,111 @@ +#include "kc60.h" + +__attribute__ ((weak)) + void matrix_init_user(void) { + // leave this function blank - it can be defined in a keymap file + }; + +__attribute__ ((weak)) + void matrix_scan_user(void) { + // leave this function blank - it can be defined in a keymap file + } + +__attribute__ ((weak)) + bool process_action_user(keyrecord_t *record) { + // leave this function blank - it can be defined in a keymap file + return true; + } + +__attribute__ ((weak)) + void led_set_user(uint8_t usb_led) { + // leave this function blank - it can be defined in a keymap file + } + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + +#ifdef BACKLIGHT_ENABLE + backlight_init_ports(); +#endif + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_action_kb(keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_action_user(record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} + +#ifdef BACKLIGHT_ENABLE +#define CHANNEL OCR1B + +void backlight_init_ports() +{ + + // Setup PB6 as output and output low. + DDRB |= (1<<6); + PORTB &= ~(1<<6); + + // Use full 16-bit resolution. + ICR1 = 0xFFFF; + + // I could write a wall of text here to explain... but TL;DW + // Go read the ATmega32u4 datasheet. + // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on + + // Pin PB7 = OCR1C (Timer 1, Channel C) + // Compare Output Mode = Clear on compare match, Channel C = COM1B1=1 COM1C0=0 + // (i.e. start high, go low when counter matches.) + // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0 + // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1 + + TCCR1A = _BV(COM1B1) | _BV(WGM11); // = 0b00001010; + TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001; + + backlight_init(); +} + +void backlight_set(uint8_t level) +{ + // Prevent backlight blink on lowest level + PORTB &= ~(_BV(PORTB6)); + + if ( level == 0 ) + { + // Turn off PWM control on PB6, revert to output low. + TCCR1A &= ~(_BV(COM1B1)); + CHANNEL = 0x0; + } + else if ( level == BACKLIGHT_LEVELS) + { + // Turn on PWM control of PB6 + TCCR1A |= _BV(COM1B1); + // Set the brightness + CHANNEL = 0xFFFF; + } + else + { + // Turn on PWM control of PB6 + TCCR1A |= _BV(COM1B1); + // Set the brightness + CHANNEL = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2)); + } +} + +#endif diff --git a/keyboard/kc60_v2/kc60.h b/keyboard/kc60_v2/kc60.h new file mode 100644 index 0000000000..d346a55028 --- /dev/null +++ b/keyboard/kc60_v2/kc60.h @@ -0,0 +1,36 @@ +#ifndef KC60_H +#define KC60_H + +#include "matrix.h" +#include "keymap_common.h" +#ifdef BACKLIGHT_ENABLE +#include "backlight.h" +#endif +#include <avr/io.h> +#include <stddef.h> + +// This a shortcut to help you visually see your layout. +// The first section contains all of the arguements +// The second converts the arguments into a multi-dimensional array +#define KEYMAP( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ + K40, K41, K42, K45, K4A, K4B, K4C, K4D \ + ) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ + { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO,K4A, K4B, K4C, K4D } \ +} + +void matrix_init_user(void); +void matrix_scan_user(void); +bool process_action_user(keyrecord_t *record); + +void led_set_user(uint8_t usb_led); +void backlight_init_ports(void); + +#endif diff --git a/keyboard/kc60_v2/keymaps/default.c b/keyboard/kc60_v2/keymaps/default.c new file mode 100644 index 0000000000..6f8352c695 --- /dev/null +++ b/keyboard/kc60_v2/keymaps/default.c @@ -0,0 +1,24 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "kc60.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = KEYMAP( /* Basic QWERTY */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, RESET \ + ), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + return MACRO_NONE; +}; diff --git a/keyboard/kitten_paw/Makefile.lufa b/keyboard/kitten_paw/Makefile.lufa deleted file mode 100644 index a45a3edb96..0000000000 --- a/keyboard/kitten_paw/Makefile.lufa +++ /dev/null @@ -1,117 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = kittenpaw_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# List C source files here. (C dependencies are automatically generated.) -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - -# MCU name -MCU = atmega32u2 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -#CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/kitten_paw/README.md b/keyboard/kitten_paw/README.md deleted file mode 100644 index 1cc8c1016e..0000000000 --- a/keyboard/kitten_paw/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Kitten Paw controller firmware -====================== -Custom controller for the Costar Majestouch keyboard designed by bpiphany. - -*Note that this is not the official firmware* - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.lufa - -At the moment only the LUFA stack is supported. - - -Bootloader ---------- -To enter bootloader by hardware use a magnet above the controller before connecting the usb cable. - -It is still possible to use Boot Magic and Command (LSFT+RSFT+PAUS) to access the bootloader though. diff --git a/keyboard/kitten_paw/config.h b/keyboard/kitten_paw/config.h deleted file mode 100644 index a29ca313e9..0000000000 --- a/keyboard/kitten_paw/config.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Costar -#define PRODUCT Majestouch - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for Majestouch - -/* matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 18 - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/kitten_paw/keymap.c b/keyboard/kitten_paw/keymap.c deleted file mode 100644 index e9ad9efe1a..0000000000 --- a/keyboard/kitten_paw/keymap.c +++ /dev/null @@ -1,102 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "debug.h" -#include "keymap.h" - -/* - Matrix col/row mapping - - ,----. ,-------------------. ,-------------------. ,-------------------. ,--------------. - |06/6| |07/4|08/4|08/2|08/6| |15/5|11/6|12/2|12/4| |14/4|14/5|14/6|14/0| |13/5|13/7|15/7| - `----' `-------------------' `-------------------' `-------------------' `--------------' - ,-------------------------------------------------------------------------. ,--------------. ,-------------------. - |06/4|06/5|07/5|08/5|09/5|09/4|10/4|10/5|11/5|12/5|05/5|05/4|11/4| 14/2| |17/4|02/4|04/4| |16/1|17/1|04/1|04/0| - |-------------------------------------------------------------------------| |--------------| |-------------------| - |06/2 |06/7|07/7|08/7|09/7|09/2|10/2|10/7|11/7|12/7|05/7|05/2|11/2| 14/3| |16/4|02/5|04/5| |16/7|17/7|04/7| | - |-------------------------------------------------------------------------| '--------------' |-------------- 02/7| - |02/7 |06/3|07/3|08/3|09/3|09/6|10/6|10/3|11/3|12/3|05/3|05/6| 14/1| |16/2|17/2|04/2| | - |-------------------------------------------------------------------------| ,----. |-------------------| - |01/2 |06/1|07/1|08/1|09/1|09/0|10/0|10/1|11/1|12/1|05/0| 01/3| |02/6| |16/3|17/3|04/3| | - |-------------------------------------------------------------------------| ,--------------. |-------------- 02/3| - |15/4|03/2|13/6| 16/6 |13/0|0/3|12/0|15/1| |02/0|16/0|17/0| | 17/6 |04/6| | - `-------------------------------------------------------------------------' `--------------' `-------------------' -*/ - -#define KEYMAP( \ - KG6, KH4, KI4, KI2, KI6, KP5, KL6, KM2, KM4, KO4, KO5, KO6, KO0, KN5, KN7, KP7, \ - KG4, KG5, KH5, KI5, KJ5, KJ4, KK4, KK5, KL5, KM5, KF5, KF4, KL4, KO2, KR4, KC4, KE4, KQ1, KR1, KE1, KE0, \ - KG2, KG7, KH7, KI7, KJ7, KJ2, KK2, KK7, KL7, KM7, KF7, KF2, KL2, KO3, KQ4, KC5, KE5, KQ7, KR7, KE7, KC7, \ - KH2, KG3, KH3, KI3, KJ3, KJ6, KK6, KK3, KL3, KM3, KF3, KF6, KO1, KQ2, KR2, KE2, \ - KB2, KH6, KG1, KH1, KI1, KJ1, KJ0, KK0, KK1, KL1, KM1, KF0, KB3, KC6, KQ3, KR3, KE3, KC3, \ - KP4, KD2, KN6, KQ6, KN0, KA3, KM0, KP1, KC0, KQ0, KR0, KR6, KE6 \ -) { \ -/* 0 1 2 3 4 5 6 7 */ \ -/* A 0 */ {KC_NO, KC_NO, KC_NO, KC_##KA3, KC_NO, KC_NO, KC_NO, KC_NO },\ -/* B 1 */ {KC_NO, KC_NO, KC_##KB2, KC_##KB3, KC_NO, KC_NO, KC_NO, KC_NO },\ -/* C 2 */ {KC_##KC0, KC_NO, KC_NO, KC_##KC3, KC_##KC4, KC_##KC5, KC_##KC6, KC_##KC7},\ -/* D 3 */ {KC_NO, KC_NO, KC_##KD2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO },\ -/* E 4 */ {KC_##KE0, KC_##KE1, KC_##KE2, KC_##KE3, KC_##KE4, KC_##KE5, KC_##KE6, KC_##KE7},\ -/* F 5 */ {KC_##KF0, KC_NO, KC_##KF2, KC_##KF3, KC_##KF4, KC_##KF5, KC_##KF6, KC_##KF7},\ -/* G 6 */ {KC_NO, KC_##KG1, KC_##KG2, KC_##KG3, KC_##KG4, KC_##KG5, KC_##KG6, KC_##KG7},\ -/* H 7 */ {KC_NO, KC_##KH1, KC_##KH2, KC_##KH3, KC_##KH4, KC_##KH5, KC_##KH6, KC_##KH7},\ -/* I 8 */ {KC_NO, KC_##KI1, KC_##KI2, KC_##KI3, KC_##KI4, KC_##KI5, KC_##KI6, KC_##KI7},\ -/* J 9 */ {KC_##KJ0, KC_##KJ1, KC_##KJ2, KC_##KJ3, KC_##KJ4, KC_##KJ5, KC_##KJ6, KC_##KJ7},\ -/* K 10 */ {KC_##KK0, KC_##KK1, KC_##KK2, KC_##KK3, KC_##KK4, KC_##KK5, KC_##KK6, KC_##KK7},\ -/* L 11 */ {KC_NO, KC_##KL1, KC_##KL2, KC_##KL3, KC_##KL4, KC_##KL5, KC_##KL6, KC_##KL7},\ -/* M 12 */ {KC_##KM0, KC_##KM1, KC_##KM2, KC_##KM3, KC_##KM4, KC_##KM5, KC_NO, KC_##KM7},\ -/* N 13 */ {KC_##KN0, KC_NO, KC_NO, KC_NO, KC_NO, KC_##KN5, KC_##KN6, KC_##KN7},\ -/* O 14 */ {KC_##KO0, KC_##KO1, KC_##KO2, KC_##KO3, KC_##KO4, KC_##KO5, KC_##KO6, KC_NO },\ -/* P 15 */ {KC_NO, KC_##KP1, KC_NO, KC_NO, KC_##KP4, KC_##KP5, KC_NO, KC_##KP7},\ -/* Q 16 */ {KC_##KQ0, KC_##KQ1, KC_##KQ2, KC_##KQ3, KC_##KQ4, KC_NO, KC_##KQ6, KC_##KQ7},\ -/* R 17 */ {KC_##KR0, KC_##KR1, KC_##KR2, KC_##KR3, KC_##KR4, KC_NO, KC_##KR6, KC_##KR7} \ -} - -#include "keymap_ansi.h" - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]); - } else { - return pgm_read_byte(&keymaps[0][(key.col)][(key.row)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/kitten_paw/keymap_ansi.h b/keyboard/kitten_paw/keymap_ansi.h deleted file mode 100644 index ed1088baa9..0000000000 --- a/keyboard/kitten_paw/keymap_ansi.h +++ /dev/null @@ -1,23 +0,0 @@ - -static const uint8_t PROGMEM keymaps[][MATRIX_COLS][MATRIX_ROWS] = { - /* Layer 0: Standard ANSI layer */ - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, PPLS, \ - CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, \ - LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, PENT, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI, FN0,RCTL, LEFT,DOWN,RGHT, P0, PDOT), \ - /* Layer 1: Function layer */ - KEYMAP(\ - CALC,MYCM,WSCH,WHOM,MAIL,VOLD,VOLU,MSEL,MSTP,MPLY,MPRV,MNXT,TRNS, WAKE, PWR,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS) -}; - -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1) -}; diff --git a/keyboard/kitten_paw/led.c b/keyboard/kitten_paw/led.c deleted file mode 100644 index da5dbd7ae2..0000000000 --- a/keyboard/kitten_paw/led.c +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - -/* LED pin configuration - * - * Scroll Lock PB7 - * CAPS PC6 - * NUMLOCK PC5 - * - */ -void led_set(uint8_t usb_led) -{ - DDRB |= (1<<7); - DDRC |= (1<<5) | (1<<6); - - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - { - PORTC &= ~(1<<6); - } - else - { - PORTC |= (1<<6); - } - - if (usb_led & (1<<USB_LED_NUM_LOCK)) - { - PORTC &= ~(1<<5); - } - else - { - PORTC |= (1<<5); - } - - if (usb_led & (1<<USB_LED_SCROLL_LOCK)) - { - PORTB &= ~(1<<7); - } - else - { - PORTB |= (1<<7); - } -} diff --git a/keyboard/kitten_paw/matrix.c b/keyboard/kitten_paw/matrix.c deleted file mode 100644 index 08d64c5f4c..0000000000 --- a/keyboard/kitten_paw/matrix.c +++ /dev/null @@ -1,239 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint8_t read_rows(void); -static void init_rows(void); -static void unselect_cols(void); -static void select_col(uint8_t col); - -inline uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - unselect_cols(); - init_rows(); - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { - select_col(col); - _delay_us(3); - uint8_t rows = read_rows(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - debouncing = DEBOUNCE; - } - } - unselect_cols(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop32(matrix[i]); - } - return count; -} - -/* Row pin configuration - * - * row: 0 1 2 3 4 5 6 7 - * pin: PC2 PB1 PB2 PB3 PC7 PB4 PB5 PB6 - * - */ -static void init_rows(void) -{ - DDRC &= ~0b10000100; - DDRB &= ~0b01111110; - PORTC |= 0b10000100; - PORTB |= 0b01111110; -} - -static uint8_t read_rows(void) -{ - return (PINC&(1<<2) ? 0 : (1<<0)) | - (PINB&(1<<1) ? 0 : (1<<1)) | - (PINB&(1<<2) ? 0 : (1<<2)) | - (PINB&(1<<3) ? 0 : (1<<3)) | - (PINC&(1<<7) ? 0 : (1<<4)) | - (PINB&(1<<4) ? 0 : (1<<5)) | - (PINB&(1<<5) ? 0 : (1<<6)) | - (PINB&(1<<6) ? 0 : (1<<7)); -} - -/* These columns uses two 74HC42 4 to 10 bit demultiplexers (low active). - * - * COL PD1 PD0 PD2 PD6 PD5 PD4 - * 12 1 1 0 0 0 0 - * 11 1 1 0 0 0 1 - * 10 1 1 0 0 1 0 - * 9 1 1 0 0 1 1 - * 8 1 1 0 1 0 0 - * 7 1 1 0 1 0 1 - * 6 1 1 0 1 1 0 - * 5 1 1 0 1 1 1 - * 4 1 1 1 0 0 0 - * 3 1 1 1 0 0 1 - - * COL PD2 PD6 PD1 PD0 PD5 PD4 - * 2 1 1 0 0 0 0 - * 1 1 1 0 0 0 1 - * 0 1 1 0 0 1 0 - * 17 1 1 0 0 1 1 - * 16 1 1 0 1 0 0 - * 1 1 0 1 0 1 - * 1 1 0 1 1 0 - * 15 1 1 0 1 1 1 - * 14 1 1 1 0 0 0 - * 13 1 1 1 0 0 1 - */ -static void unselect_cols(void) -{ - DDRD |= 0b01110111; - PORTD &= ~0b01110111; -} - -static void select_col(uint8_t col) -{ - switch (col) { - case 0: - PORTD |= (1<<5) | (1<<6) | (1<<2); - break; - case 1: - PORTD |= (1<<4) | (1<<6) | (1<<2); - break; - case 2: - PORTD |= (1<<6) | (1<<2); - break; - case 3: - PORTD |= (1<<4) | (1<<2) | (1<<0) | (1<<1); - break; - case 4: - PORTD |= (1<<2) | (1<<0) | (1<<1); - break; - case 5: - PORTD |= (1<<4) | (1<<5) | (1<<6) | (1<<0) | (1<<1); - break; - case 6: - PORTD |= (1<<5) | (1<<6) | (1<<0) | (1<<1); - break; - case 7: - PORTD |= (1<<4) | (1<<6) | (1<<0) | (1<<1); - break; - case 8: - PORTD |= (1<<6) | (1<<0) | (1<<1); - break; - case 9: - PORTD |= (1<<4) | (1<<5) | (1<<0) | (1<<1); - break; - case 10: - PORTD |= (1<<5) | (1<<0) | (1<<1); - break; - case 11: - PORTD |= (1<<4) | (1<<0) | (1<<1); - break; - case 12: - PORTD |= (1<<0) | (1<<1); - break; - case 13: - PORTD |= (1<<4) | (1<<1) | (1<<6) | (1<<2); - break; - case 14: - PORTD |= (1<<1) | (1<<6) | (1<<2); - break; - case 15: - PORTD |= (1<<4) | (1<<5) | (1<<0) | (1<<6) | (1<<2); - break; - case 16: - PORTD |= (1<<0) | (1<<6) | (1<<2); - break; - case 17: - PORTD |= (1<<4) | (1<<5) | (1<<6) | (1<<2); - break; - } -} diff --git a/keyboard/kmac/Makefile.lufa b/keyboard/kmac/Makefile.lufa deleted file mode 100644 index 9745f43cd4..0000000000 --- a/keyboard/kmac/Makefile.lufa +++ /dev/null @@ -1,130 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = kmac_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap.c \ - matrix.c \ - led.c \ - backlight.c - -CONFIG_H = config.h - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 8000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -winkey: OPT_DEFS += -DLAYOUT_WINKEY -winkey: all - -winkeyless: OPT_DEFS += -DLAYOUT_WINKEYLESS -winkeyless: all diff --git a/keyboard/kmac/Makefile.pjrc b/keyboard/kmac/Makefile.pjrc deleted file mode 100644 index b32d935bdf..0000000000 --- a/keyboard/kmac/Makefile.pjrc +++ /dev/null @@ -1,101 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = kmac_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c \ - backlight.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -#MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 8000000 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+5000) -EXTRAKEY_ENABLE = yes # Audio control and System control(+600) -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover(+500) -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -winkey: OPT_DEFS += -DLAYOUT_WINKEY -winkey: all - -winkeyless: OPT_DEFS += -DLAYOUT_WINKEYLESS -winkeyless: all diff --git a/keyboard/kmac/README.md b/keyboard/kmac/README.md deleted file mode 100644 index dc35870caa..0000000000 --- a/keyboard/kmac/README.md +++ /dev/null @@ -1,110 +0,0 @@ -KMAC keyboard firmware -====================== -Korean custom keyboard designed by Byungho Kim and KBDMania community. - -*Note that this is not the official firmware* - -Supported models ----------------- -At the moment only the TKL models is supported. - - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.[pjrc|lufa] [winkey|winkeyless] - -Use `Makefile.pjrc` if you want to use PJRC stack or use `Makefile.lufa` for LUFA stack. - - -Bootloader ---------- -The PCB is hardwired to run the bootloader if the key at the `Caps Lock` position is held down when connecting the keyboard. - -It is still possible to use Boot Magic and Command to access the bootloader though. - - -Keymap ------- -There are 2 different types of PCB. -They each have their own keymap file. - -To customize a keymap: - 1. Edit the file that corresponds to your PCB. - 2. Specify your layout when building. - -### 1. Winkey -This is the default keymap. - -See [keymap_winkey.h](keymap_winkey.h) for detail. - -#### 1.0. Winkey Default Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - |-----------------------------------------------------------| '-----------' - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return | - |-----------------------------------------------------------| ,---. - |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - |-----------------------------------------------------------| ,-----------. - |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 1.1. Winkey Media Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Led| | | | | | | | | | | | | | | | | | |Slp| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt|Media| | | | | - |-----------------------------------------------------------| '-----------' - | | | | | | | | | | | | | | - |-----------------------------------------------------------| ,---. - | | | |Clc| | | | | | | |Caps | | | - |-----------------------------------------------------------| ,-----------. - | | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' - - -### 2. Winkeyless -Layout with 1.5 unit modifiers. - -See [keymap_winkeyless.h](keymap_winkeyless.h) for detail. - -#### 2.0. Winkeyless Default Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - |-----------------------------------------------------------| '-----------' - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return | - |-----------------------------------------------------------| ,---. - |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - |-----------------------------------------------------------| ,-----------. - |Ctl |Gui|Alt | Space |Alt |Gui|Ctl | |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 2.1. Winkeyless Media Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Led| | | | | | | | | | | | | | | | | | |Slp| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt|Media| | | | | - |-----------------------------------------------------------| '-----------' - | | | | | | | | | | | | | | - |-----------------------------------------------------------| ,---. - | | | |Clc| | | | | | | |Caps | | | - |-----------------------------------------------------------| ,-----------. - | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' diff --git a/keyboard/kmac/backlight.c b/keyboard/kmac/backlight.c deleted file mode 100644 index af38f658ae..0000000000 --- a/keyboard/kmac/backlight.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2013 Mathias Andersson <wraul@dbox.se> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "backlight.h" - -/* Backlight pin configuration - * F-row: High PB1 - * W: Low PB4 - * A: Low PB2 - * S: Low PB3 - * D: Low PD7 - */ -void backlight_set(uint8_t level) -{ - // Set as output. - DDRB |= (1<<1) | (1<<2) | (1<<3) | (1<<4); - DDRD |= (1<<7); - - // F-row - if(level & (1<<0)) - { - PORTB |= (1<<1); - } - else - { - PORTB &= ~(1<<1); - } - // WASD - if(level & (1<<1)) - { - PORTB &= ~(1<<4); - PORTB &= ~(1<<2); - PORTB &= ~(1<<3); - PORTD &= ~(1<<7); - } - else - { - PORTB |= (1<<4); - PORTB |= (1<<2); - PORTB |= (1<<3); - PORTD |= (1<<7); - } -} diff --git a/keyboard/kmac/config.h b/keyboard/kmac/config.h deleted file mode 100644 index c88df94517..0000000000 --- a/keyboard/kmac/config.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -Copyright 2013 Mathias Andersson <wraul@dbox.se> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER KBDMania -#define PRODUCT KMAC - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for KMAC - -/* matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 3 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/kmac/keymap.c b/keyboard/kmac/keymap.c deleted file mode 100644 index 1ffa60387e..0000000000 --- a/keyboard/kmac/keymap.c +++ /dev/null @@ -1,97 +0,0 @@ -/* -Copyright 2013 Mathias Andersson <wraul@dbox.se> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * Keymap for KMAC controller - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "debug.h" -#include "keymap.h" - -// Convert physical keyboard layout to matrix array. -// This is a macro to define keymap easily in keyboard layout form. -#define KEYMAP( \ - K5A, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2N, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1P, \ - K0A, K0B, K0C, K0G, K0K, K0L, K0M, K0N, K0O, K0P, K0Q \ -) { \ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ \ -/* 5 */ { KC_##K5A, KC_NO, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F, KC_##K5G, KC_##K5H, KC_##K5I, KC_##K5J, KC_##K5K, KC_##K5L, KC_##K5M, KC_##K5N, KC_##K5O, KC_##K5P, KC_##K5Q}, \ -/* 4 */ { KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F, KC_##K4G, KC_##K4H, KC_##K4I, KC_##K4J, KC_##K4K, KC_##K4L, KC_##K4M, KC_##K4N, KC_##K4O, KC_##K4P, KC_##K4Q}, \ -/* 3 */ { KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F, KC_##K3G, KC_##K3H, KC_##K3I, KC_##K3J, KC_##K3K, KC_##K3L, KC_##K3M, KC_##K3N, KC_##K3O, KC_##K3P, KC_##K3Q}, \ -/* 2 */ { KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F, KC_##K2G, KC_##K2H, KC_##K2I, KC_##K2J, KC_##K2K, KC_##K2L, KC_NO, KC_##K2N, KC_NO, KC_NO, KC_NO }, \ -/* 1 */ { KC_##K1A, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F, KC_##K1G, KC_##K1H, KC_##K1I, KC_##K1J, KC_##K1K, KC_##K1L, KC_NO, KC_NO, KC_##K1N, KC_NO, KC_##K1P, KC_NO }, \ -/* 0 */ { KC_##K0A, KC_##K0B, KC_##K0C, KC_NO, KC_NO, KC_##K0G, KC_NO, KC_NO, KC_##K0K, KC_NO, KC_##K0L, KC_NO, KC_##K0M, KC_##K0N, KC_##K0O, KC_##K0P, KC_##K0Q} \ -} - -#define KEYMAP_WINKEYLESS( \ - K5A, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2N, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1P, \ - K0A, K0B, K0C, K0G, K0L, K0M, K0N, K0O, K0P, K0Q \ -) KEYMAP( \ - K5A, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2N, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1P, \ - K0A, K0B, K0C, K0G, K0L, K0M, NO, K0N, K0O, K0P, K0Q \ -) - -#if defined(LAYOUT_WINKEYLESS) - #include "keymap_winkeyless.h" -#else - #include "keymap_winkey.h" -#endif - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/kmac/keymap_winkey.h b/keyboard/kmac/keymap_winkey.h deleted file mode 100644 index 3379789ecf..0000000000 --- a/keyboard/kmac/keymap_winkey.h +++ /dev/null @@ -1,24 +0,0 @@ -// KMAC Winkey -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP(\ - FN1, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_BACKLIGHT_STEP() -}; - diff --git a/keyboard/kmac/keymap_winkeyless.h b/keyboard/kmac/keymap_winkeyless.h deleted file mode 100644 index 939ee379b7..0000000000 --- a/keyboard/kmac/keymap_winkeyless.h +++ /dev/null @@ -1,24 +0,0 @@ -// KMAC Winkeyless -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP_WINKEYLESS(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI,RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP_WINKEYLESS(\ - FN1, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_BACKLIGHT_STEP() -}; - diff --git a/keyboard/kmac/led.c b/keyboard/kmac/led.c deleted file mode 100644 index 7fa008a43e..0000000000 --- a/keyboard/kmac/led.c +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - - -/* LED pin configuration - * Scroll Lock: Low PE6 - * Caps Lock: Low PB0 - */ -void led_set(uint8_t usb_led) -{ - // Set as output. - DDRB |= (1<<0); - DDRE |= (1<<6); - - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - { - // Output low. - PORTB &= ~(1<<0); - } - else - { - // Output high. - PORTB |= (1<<0); - } - - if (usb_led & (1<<USB_LED_SCROLL_LOCK)) - { - // Output low. - PORTE &= ~(1<<6); - } - else - { - // Output high. - PORTE |= (1<<6); - } -} diff --git a/keyboard/kmac/matrix.c b/keyboard/kmac/matrix.c deleted file mode 100644 index 5248a29b9d..0000000000 --- a/keyboard/kmac/matrix.c +++ /dev/null @@ -1,283 +0,0 @@ -/* -Copyright 2013 Mathias Andersson <wraul@dbox.se> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint8_t read_rows(void); -static uint8_t read_caps(void); -static void init_rows(void); -static void unselect_cols(void); -static void select_col(uint8_t col); - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - unselect_cols(); - init_rows(); - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { // 0-16 - select_col(col); - _delay_us(3); // TODO: Determine the correct value needed here. - uint8_t rows = read_rows(); - // Use the otherwise unused col: 0 row: 3 for caps lock. - if(col == 0) { - rows |= read_caps(); - } - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { // 0-5 - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - if (debouncing) { - dprint("bounce!: "); dprintf("%02X", debouncing); dprintln(); - } - debouncing = DEBOUNCE; - } - } - unselect_cols(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop32(matrix[i]); - } - return count; -} - -/* Row pin configuration - * row: 0 1 2 3 4 5 - * pin: D0 D1 D2 D3 D5 B7 - * - * Caps lock uses its own pin PE2 - */ -static void init_rows(void) -{ - // Input (DDR:0, PORT:0) - DDRD &= ~0b00101111; - PORTD &= ~0b00101111; - DDRB &= ~(1<<7); - PORTB &= ~(1<<7); - - // Input with pull-up (DDR:0, PORT:1) - DDRE &= ~(1<<2); - PORTE |= (1<<2); -} - -static uint8_t read_rows(void) -{ - return (PIND&(1<<0) ? (1<<0) : 0) | - (PIND&(1<<1) ? (1<<1) : 0) | - (PIND&(1<<2) ? (1<<2) : 0) | - (PIND&(1<<3) ? (1<<3) : 0) | - (PIND&(1<<5) ? (1<<4) : 0) | - (PINB&(1<<7) ? (1<<5) : 0); -} - -static uint8_t read_caps(void) -{ - return PINE&(1<<2) ? 0 : (1<<3); -} - -/* Columns 0 - 15 - * These columns uses two 74HC237D 3 to 8 bit demultiplexers. - * col / pin: PC6 PB6 PF0 PF1 PC7 - * 0: 1 0 0 0 0 - * 1: 1 0 1 0 0 - * 2: 1 0 0 1 0 - * 3: 1 0 1 1 0 - * 4: 1 0 0 0 1 - * 5: 1 0 1 0 1 - * 6: 1 0 0 1 1 - * 7: 1 0 1 1 1 - * 8: 0 1 0 0 0 - * 9: 0 1 1 0 0 - * 10: 0 1 0 1 0 - * 11: 0 1 1 1 0 - * 12: 0 1 0 0 1 - * 13: 0 1 1 0 1 - * 14: 0 1 0 1 1 - * 15: 0 1 1 1 1 - * - * col: 16 - * pin: PB5 - */ -static void unselect_cols(void) -{ - DDRB |= (1<<5) | (1<<6); - PORTB &= ~((1<<5) | (1<<6)); - - DDRC |= (1<<6) | (1<<7); - PORTC &= ~((1<<6) | (1<<7)); - - DDRF |= (1<<0) | (1<<1); - PORTF &= ~((1<<0) | (1<<1)); -} - -static void select_col(uint8_t col) -{ - // Output high (DDR:1, PORT:1) to select - switch (col) { - case 0: - PORTC |= (1<<6); - break; - case 1: - PORTC |= (1<<6); - PORTF |= (1<<0); - break; - case 2: - PORTC |= (1<<6); - PORTF |= (1<<1); - break; - case 3: - PORTC |= (1<<6); - PORTF |= (1<<0) | (1<<1); - break; - case 4: - PORTC |= (1<<6); - PORTC |= (1<<7); - break; - case 5: - PORTC |= (1<<6); - PORTF |= (1<<0); - PORTC |= (1<<7); - break; - case 6: - PORTC |= (1<<6); - PORTF |= (1<<1); - PORTC |= (1<<7); - break; - case 7: - PORTC |= (1<<6); - PORTF |= (1<<0) | (1<<1); - PORTC |= (1<<7); - break; - case 8: - PORTB |= (1<<6); - break; - case 9: - PORTB |= (1<<6); - PORTF |= (1<<0); - break; - case 10: - PORTB |= (1<<6); - PORTF |= (1<<1); - break; - case 11: - PORTB |= (1<<6); - PORTF |= (1<<0) | (1<<1); - break; - case 12: - PORTB |= (1<<6); - PORTC |= (1<<7); - break; - case 13: - PORTB |= (1<<6); - PORTF |= (1<<0); - PORTC |= (1<<7); - break; - case 14: - PORTB |= (1<<6); - PORTF |= (1<<1); - PORTC |= (1<<7); - break; - case 15: - PORTB |= (1<<6); - PORTF |= (1<<0) | (1<<1); - PORTC |= (1<<7); - break; - case 16: - PORTB |= (1<<5); - break; - } -} diff --git a/keyboard/lightpad/Makefile.lufa b/keyboard/lightpad/Makefile.lufa deleted file mode 100644 index 88fb90ec4b..0000000000 --- a/keyboard/lightpad/Makefile.lufa +++ /dev/null @@ -1,117 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = lightpad_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# List C source files here. (C dependencies are automatically generated.) -SRC = keymap.c \ - matrix.c \ - led.c \ - backlight.c - -CONFIG_H = config.h - -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 8000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -#CONSOLE_ENABLE = yes # Console for debug(+400) -#COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/lightpad/README.md b/keyboard/lightpad/README.md deleted file mode 100644 index b21cccc6a2..0000000000 --- a/keyboard/lightpad/README.md +++ /dev/null @@ -1,24 +0,0 @@ -Lightpad keypad firmware -====================== -Korean custom keypad designed by Duck. - -*Note that this is not the official firmware* - - -Supported models ----------------- -All pcb options are supported. - - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.lufa - - -Bootloader ---------- -The PCB is hardwired to run the bootloader if the key at the `top left` position is held down when connecting the keyboard. - -It is still possible to use Boot Magic and Command to access the bootloader though. diff --git a/keyboard/lightpad/backlight.c b/keyboard/lightpad/backlight.c deleted file mode 100644 index 693c566fc5..0000000000 --- a/keyboard/lightpad/backlight.c +++ /dev/null @@ -1,129 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "backlight.h" - -/* Backlight pin configuration - * - * FN1 PB0 (low) - * FN2 PB5 (low) - * FN3 PB4 (low) - * FN4 PD7 (low) - * REAR PD6 (high) - * NUMPAD PB2 (high) - * NUMLOCK PB1 (low) - */ -void backlight_init_ports() { - DDRB |= (1<<0) | (1<<1) | (1<<2) | (1<<4) | (1<<5); - DDRD |= (1<<6) | (1<<7); - - backlight_disable_numlock(); -} - -void backlight_set(uint8_t level) { - (level & BACKLIGHT_FN1) ? backlight_enable_fn1() : backlight_disable_fn1(); - (level & BACKLIGHT_FN2) ? backlight_enable_fn2() : backlight_disable_fn2(); - (level & BACKLIGHT_FN3) ? backlight_enable_fn3() : backlight_disable_fn3(); - (level & BACKLIGHT_FN4) ? backlight_enable_fn4() : backlight_disable_fn4(); - (level & BACKLIGHT_NUMPAD) ? backlight_enable_numpad() : backlight_disable_numpad(); - (level & BACKLIGHT_REAR) ? backlight_enable_rear() : backlight_disable_rear(); -} - -void backlight_enable_fn1() { - PORTB &= ~(1<<0); -} - -void backlight_disable_fn1() { - PORTB |= (1<<0); -} - -void backlight_invert_fn1() { - PORTB ^= (1<<0); -} - -void backlight_enable_fn2() { - PORTB &= ~(1<<5); -} - -void backlight_disable_fn2() { - PORTB |= (1<<5); -} - -void backlight_invert_fn2() { - PORTB ^= (1<<5); -} - -void backlight_enable_fn3() { - PORTB &= ~(1<<4); -} - -void backlight_disable_fn3() { - PORTB |= (1<<4); -} - -void backlight_invert_fn3() { - PORTB ^= (1<<4); -} - -void backlight_enable_fn4() { - PORTD &= ~(1<<7); -} - -void backlight_disable_fn4() { - PORTD |= (1<<7); -} - -void backlight_invert_fn4() { - PORTD ^= (1<<7); -} - -void backlight_enable_numpad() { - PORTB |= (1<<2); -} - -void backlight_disable_numpad() { - PORTB &= ~(1<<2); -} - -void backlight_invert_numpad() { - PORTB ^= (1<<2); -} - -void backlight_enable_numlock() { - PORTB &= ~(1<<1); -} - -void backlight_disable_numlock() { - PORTB |= (1<<1); -} - -void backlight_invert_numlock() { - PORTB ^= (1<<1); -} - -void backlight_enable_rear() { - PORTD |= (1<<6); -} - -void backlight_disable_rear() { - PORTD &= ~(1<<6); -} - -void backlight_invert_rear() { - PORTD ^= (1<<6); -} diff --git a/keyboard/lightpad/backlight.h b/keyboard/lightpad/backlight.h deleted file mode 100644 index 3b3cfd9aea..0000000000 --- a/keyboard/lightpad/backlight.h +++ /dev/null @@ -1,39 +0,0 @@ - -enum backlight_level { - BACKLIGHT_FN1 = 0b0000001, - BACKLIGHT_FN2 = 0b0000010, - BACKLIGHT_FN3 = 0b0000100, - BACKLIGHT_FN4 = 0b0001000, - BACKLIGHT_NUMPAD = 0b0010000, - BACKLIGHT_REAR = 0b0100000, -}; - -void backlight_init_ports(void); - -void backlight_invert_fn1(void); -void backlight_enable_fn1(void); -void backlight_disable_fn1(void); - -void backlight_invert_fn2(void); -void backlight_enable_fn2(void); -void backlight_disable_fn2(void); - -void backlight_invert_fn3(void); -void backlight_enable_fn3(void); -void backlight_disable_fn3(void); - -void backlight_invert_fn4(void); -void backlight_enable_fn4(void); -void backlight_disable_fn4(void); - -void backlight_invert_numlock(void); -void backlight_enable_numlock(void); -void backlight_disable_numlock(void); - -void backlight_enable_numpad(void); -void backlight_disable_numpad(void); -void backlight_invert_numpad(void); - -void backlight_enable_rear(void); -void backlight_disable_rear(void); -void backlight_invert_rear(void); diff --git a/keyboard/lightpad/config.h b/keyboard/lightpad/config.h deleted file mode 100644 index 7f5a596c0c..0000000000 --- a/keyboard/lightpad/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Duck -#define PRODUCT Lightpad - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for Lightpad - -/* matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 4 - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 1 - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/lightpad/keymap.c b/keyboard/lightpad/keymap.c deleted file mode 100644 index 2ca79a81b5..0000000000 --- a/keyboard/lightpad/keymap.c +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "debug.h" -#include "keymap.h" - -/* Map physical keyboard layout to matrix array */ -#define KEYMAP( \ - K5A, K5B, K5C, K5D, \ - K4A, K4B, K4C, K4D, \ - K3A, K3B, K3C, K3D, \ - K2A, K2B, K2C, \ - K1A, K1B, K1C, K1D, \ - K0A, K0B, K0C \ -) { \ -/* 0 1 2 3 */ \ -/* 5 */ { KC_##K5A, KC_##K5B, KC_##K5C, KC_##K5D}, \ -/* 4 */ { KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D}, \ -/* 3 */ { KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D}, \ -/* 2 */ { KC_##K2A, KC_##K2B, KC_##K2C, KC_NO}, \ -/* 1 */ { KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D}, \ -/* 0 */ { KC_##K0A, KC_##K0B, KC_##K0C, KC_NO, } \ -} - -#include "keymap_lightpad.h" - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/lightpad/keymap_lightpad.h b/keyboard/lightpad/keymap_lightpad.h deleted file mode 100644 index 9333964e39..0000000000 --- a/keyboard/lightpad/keymap_lightpad.h +++ /dev/null @@ -1,29 +0,0 @@ -#include "backlight.h" - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - KEYMAP(\ - FN0, F1, DEL, BSPC, \ - NLCK,PSLS,PAST,PMNS, \ - P7, P8, P9, PPLS, \ - P4, P5, P6, \ - P1, P2, P3, PENT, \ - P0, NO, PDOT), \ - KEYMAP(\ - TRNS,PGDN,PGUP,MUTE, \ - MSEL,MPRV,MNXT,VOLD, \ - P7, P8, P9, VOLU, \ - FN4, FN5, FN6, \ - FN1, FN2, FN3, MPLY, \ - FN7, NO, MSTP) -}; - -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FN1), - [2] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FN2), - [3] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FN3), - [4] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FN4), - [5] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_NUMPAD), - [6] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_REAR), - [7] = ACTION_BACKLIGHT_TOGGLE() -}; diff --git a/keyboard/lightpad/led.c b/keyboard/lightpad/led.c deleted file mode 100644 index ebfac3af89..0000000000 --- a/keyboard/lightpad/led.c +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - -void led_set(uint8_t usb_led) { - (usb_led & (1<<USB_LED_NUM_LOCK)) ? backlight_enable_numlock() : backlight_disable_numlock(); -} diff --git a/keyboard/lightpad/matrix.c b/keyboard/lightpad/matrix.c deleted file mode 100644 index 87d338395b..0000000000 --- a/keyboard/lightpad/matrix.c +++ /dev/null @@ -1,205 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" -#include "eeconfig.h" -#include "action_layer.h" -#include "backlight.h" - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint8_t read_rows(void); -static uint8_t read_fwkey(void); -static void init_rows(void); -static void unselect_cols(void); -static void select_col(uint8_t col); - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void misc_init(void) { -} - -void matrix_init(void) -{ - backlight_init_ports(); - unselect_cols(); - init_rows(); - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { - select_col(col); - _delay_us(3); - uint8_t rows = read_rows(); - // Use the otherwise unused col: 0 row: 0 for firmware key - if(col == 0) { - rows |= read_fwkey(); - } - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - if (debouncing) { - dprint("bounce!: "); dprintf("%02X", debouncing); dprintln(); - } - debouncing = DEBOUNCE; - } - } - unselect_cols(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop32(matrix[i]); - } - return count; -} - -/* Row configuration - * - * row: 0 1 2 3 4 5 - * pin: PD0 PD1 PD2 PD3 PD5 PB7 - * - * Firmware uses pin PE2 - */ -static void init_rows(void) -{ - DDRD &= ~0b00101111; - PORTD |= 0b00101111; - - DDRB &= ~0b10000000; - PORTB |= 0b10000000; - - DDRE &= ~0b00000100; - PORTE |= 0b00000100; -} - -static uint8_t read_rows(void) -{ - return (PIND&(1<<0) ? (1<<0) : 0) | - (PIND&(1<<1) ? (1<<1) : 0) | - (PIND&(1<<2) ? (1<<2) : 0) | - (PIND&(1<<3) ? (1<<3) : 0) | - (PIND&(1<<5) ? (1<<4) : 0) | - (PINB&(1<<7) ? (1<<5) : 0); -} - -static uint8_t read_fwkey(void) -{ - return PINE&(1<<2) ? 0 : (1<<0); -} - -/* Column configuration - * - * col: 0 1 2 3 - * pin: PF0 PF1 PC7 PC6 - */ -static void unselect_cols(void) -{ - DDRF |= 0b00000011; - PORTF &= ~0b00000011; - DDRC |= 0b11000000; - PORTC &= ~0b11000000; -} - -static void select_col(uint8_t col) -{ - switch (col) { - case 0: - PORTF |= (1<<0); - break; - case 1: - PORTF |= (1<<1); - break; - case 2: - PORTC |= (1<<7); - break; - case 3: - PORTC |= (1<<6); - break; - } -} diff --git a/keyboard/lightsaber/Makefile.lufa b/keyboard/lightsaber/Makefile.lufa deleted file mode 100644 index 99090c4367..0000000000 --- a/keyboard/lightsaber/Makefile.lufa +++ /dev/null @@ -1,126 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = lightsaber_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC = keymap.c \ - matrix.c \ - led.c \ - backlight.c - -CONFIG_H = config.h - - -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 8000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -winkey: OPT_DEFS += -DLAYOUT_WINKEY -winkey: all diff --git a/keyboard/lightsaber/Makefile.pjrc b/keyboard/lightsaber/Makefile.pjrc deleted file mode 100644 index 0f6d399470..0000000000 --- a/keyboard/lightsaber/Makefile.pjrc +++ /dev/null @@ -1,94 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = lightsaber_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c \ - backlight.c - -CONFIG_H = config.h - - -# MCU name -MCU = atmega32u4 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 8000000 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+5000) -EXTRAKEY_ENABLE = yes # Audio control and System control(+600) -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover(+500) -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -winkey: OPT_DEFS += -DLAYOUT_WINKEY -winkey: all diff --git a/keyboard/lightsaber/README.md b/keyboard/lightsaber/README.md deleted file mode 100644 index 9dcd693095..0000000000 --- a/keyboard/lightsaber/README.md +++ /dev/null @@ -1,26 +0,0 @@ -Lightsaber keyboard firmware -====================== -Korean custom keyboard designed by Duck. - -*Note that this is not the official firmware* - -Supported models ----------------- -All pcb options are supported. - - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.[pjrc|lufa] - -Use `Makefile.pjrc` if you want to use PJRC stack or use `Makefile.lufa` for LUFA stack. - - -Bootloader ---------- -The PCB is hardwired to run the bootloader if the key at the `one above backspace` position is held down when connecting the keyboard. - -It is still possible to use Boot Magic and Command to access the bootloader though. - diff --git a/keyboard/lightsaber/backlight.c b/keyboard/lightsaber/backlight.c deleted file mode 100644 index 59b8b4a633..0000000000 --- a/keyboard/lightsaber/backlight.c +++ /dev/null @@ -1,86 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "backlight.h" - -/* Backlight pin configuration - * - * Alphas PB1 (high) - * Numeric PB2 (high) - * Mod+Num PB3 (high) - * Backside PD6 (high) - * TopRight PD7 (low) - * F-Row PE6 (high) - */ - -void backlight_set(uint8_t level) -{ - // Set as output. - DDRB |= (1<<1) | (1<<2) | (1<<3); - DDRD |= (1<<6) | (1<<7); - DDRE |= (1<<6); - - if (level & BACKLIGHT_ALPHA) - { - PORTB |= (1<<1); - } - else - { - PORTB &= ~(1<<1); - } - if (level & BACKLIGHT_NUMERIC) - { - PORTB |= (1<<2); - } - else - { - PORTB &= ~(1<<2); - } - if (level & BACKLIGHT_MODNUM) - { - PORTB |= (1<<3); - } - else - { - PORTB &= ~(1<<3); - } - if (level & BACKLIGHT_BACKSIDE) - { - PORTD |= (1<<6); - } - else - { - PORTD &= ~(1<<6); - } - if (level & BACKLIGHT_TOPRIGHT) - { - PORTD &= ~(1<<7); - } - else - { - PORTD |= (1<<7); - } - if (level & BACKLIGHT_FROW) - { - PORTE |= (1<<6); - } - else - { - PORTE &= ~(1<<6); - } -} diff --git a/keyboard/lightsaber/backlight.h b/keyboard/lightsaber/backlight.h deleted file mode 100644 index 6dc7967a62..0000000000 --- a/keyboard/lightsaber/backlight.h +++ /dev/null @@ -1,9 +0,0 @@ - -enum backlight_level { - BACKLIGHT_ALPHA = 0b0000001, - BACKLIGHT_NUMERIC = 0b0000010, - BACKLIGHT_MODNUM = 0b0000100, - BACKLIGHT_BACKSIDE = 0b0001000, - BACKLIGHT_TOPRIGHT = 0b0010000, - BACKLIGHT_FROW = 0b0100000, -}; diff --git a/keyboard/lightsaber/config.h b/keyboard/lightsaber/config.h deleted file mode 100644 index d971d038e3..0000000000 --- a/keyboard/lightsaber/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright 2013 Mathias Andersson <wraul@dbox.se> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Duck -#define PRODUCT Lightsaber - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for Lightsaber - -/* matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 18 - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 1 - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/lightsaber/keymap.c b/keyboard/lightsaber/keymap.c deleted file mode 100644 index 477da9d865..0000000000 --- a/keyboard/lightsaber/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * Keymap for Lightsaber controller - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "debug.h" -#include "keymap.h" - -// Convert physical keyboard layout to matrix array. -// This is a macro to define keymap easily in keyboard layout form. -#define KEYMAP( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, K2R, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0G, K0K, K0L, K0M, K0N, K0O, K0P, K0Q, K0R \ -) { \ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 */ \ -/* 5 */ { KC_##K5A, KC_##K5B, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F, KC_##K5G, KC_##K5H, KC_##K5I, KC_##K5J, KC_##K5K, KC_##K5L, KC_##K5M, KC_##K5N, KC_##K5O, KC_##K5P, KC_##K5Q, KC_##K5R}, \ -/* 4 */ { KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F, KC_##K4G, KC_##K4H, KC_##K4I, KC_##K4J, KC_##K4K, KC_##K4L, KC_##K4M, KC_##K4N, KC_##K4O, KC_##K4P, KC_##K4Q, KC_##K4R}, \ -/* 3 */ { KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F, KC_##K3G, KC_##K3H, KC_##K3I, KC_##K3J, KC_##K3K, KC_##K3L, KC_##K3M, KC_##K3N, KC_##K3O, KC_##K3P, KC_##K3Q, KC_##K3R}, \ -/* 2 */ { KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F, KC_##K2G, KC_##K2H, KC_##K2I, KC_##K2J, KC_##K2K, KC_##K2L, KC_##K2M, KC_##K2N, KC_##K2O, KC_##K2P, KC_##K2Q, KC_##K2R}, \ -/* 1 */ { KC_##K1A, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F, KC_##K1G, KC_##K1H, KC_##K1I, KC_##K1J, KC_##K1K, KC_##K1L, KC_NO, KC_##K1M, KC_##K1N, KC_##K1O, KC_##K1P, KC_##K1Q, KC_##K1R}, \ -/* 0 */ { KC_##K0A, KC_##K0B, KC_##K0C, KC_NO, KC_NO, KC_##K0G, KC_NO, KC_NO, KC_##K0K, KC_NO, KC_##K0L, KC_NO, KC_##K0M, KC_##K0N, KC_##K0O, KC_##K0P, KC_##K0Q, KC_##K0R} \ -} - -#include "keymap_winkey.h" - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/lightsaber/keymap_winkey.h b/keyboard/lightsaber/keymap_winkey.h deleted file mode 100644 index 3e8367083c..0000000000 --- a/keyboard/lightsaber/keymap_winkey.h +++ /dev/null @@ -1,29 +0,0 @@ -#include "backlight.h" - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, INS, PSCR, SLCK, BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, NUMLOCK,KP_SLASH,KP_ASTERISK,KP_MINUS, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, KP_7, KP_8, KP_9, KP_PLUS, \ - CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT,FN0, ENT, KP_4, KP_5, KP_6, NO, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH,NO, RSFT, KP_1, KP_2, KP_3, KP_ENTER, \ - LCTL,LGUI,LALT, SPC, NO, RALT,RGUI,RCTL, KP_0, NO, KP_DOT, NO), \ - KEYMAP(\ - CALC,MYCM,WSCH,WHOM,MAIL,MUTE,VOLD,VOLU,MSEL,MSTP,MPLY,MPRV,MNXT,TRNS, TRNS, WAKE, PWR, SLEP, \ - FN1, FN2, FN3, FN4, FN5, FN6, FN7, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS, TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS, TRNS, \ - TRNS,TRNS,TRNS,TRNS,PGDN,TRNS,LEFT,DOWN,UP ,RGHT,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS, TRNS, \ - TRNS, TRNS,TRNS,TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS, TRNS, TRNS, TRNS) -}; - -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_BACKLIGHT_TOGGLE(), - [2] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_ALPHA), - [3] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_MODNUM), - [4] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_NUMERIC), - [5] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_FROW), - [6] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_BACKSIDE), - [7] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_TOPRIGHT) -}; diff --git a/keyboard/lightsaber/led.c b/keyboard/lightsaber/led.c deleted file mode 100644 index c3f85427f5..0000000000 --- a/keyboard/lightsaber/led.c +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - -/* LED pin configuration - * - * Caps PB0 (low) - * NumLock PB4 (low) - * - */ -void led_set(uint8_t usb_led) -{ - // Set as output. - DDRB |= (1<<0) | (1<<4); - - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - { - // Output low. - PORTB &= ~(1<<0); - } - else - { - // Output high. - PORTB |= (1<<0); - } - - if (usb_led & (1<<USB_LED_NUM_LOCK)) - { - // Output low. - PORTB &= ~(1<<4); - } - else - { - // Output high. - PORTB |= (1<<4); - } -} diff --git a/keyboard/lightsaber/matrix.c b/keyboard/lightsaber/matrix.c deleted file mode 100644 index e3eca84df8..0000000000 --- a/keyboard/lightsaber/matrix.c +++ /dev/null @@ -1,292 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint8_t read_rows(void); -static uint8_t read_fwkey(void); -static void init_rows(void); -static void unselect_cols(void); -static void select_col(uint8_t col); - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - unselect_cols(); - init_rows(); - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { // 0-17 - select_col(col); - _delay_us(3); // TODO: Determine the correct value needed here. - uint8_t rows = read_rows(); - // Use the otherwise unused col: 12 row: 3 for firmware. - if(col == 12) { - rows |= read_fwkey(); - } - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { // 0-5 - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - if (debouncing) { - dprint("bounce!: "); dprintf("%02X", debouncing); dprintln(); - } - debouncing = DEBOUNCE; - } - } - unselect_cols(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop32(matrix[i]); - } - return count; -} - -/* Row pin configuration - * row: 0 1 2 3 4 5 - * pin: PD0 PD1 PD2 PD3 PD5 PB7 - * - * Firmware uses its own pin PE2 - */ -static void init_rows(void) -{ - // Input (DDR:0, PORT:0) - DDRD &= ~0b00101111; - PORTD &= ~0b00101111; - DDRB &= ~(1<<7); - PORTB &= ~(1<<7); - - // Input with pull-up (DDR:0, PORT:1) - DDRE &= ~(1<<2); - PORTE |= (1<<2); -} - -static uint8_t read_rows(void) -{ - return (PIND&(1<<0) ? (1<<0) : 0) | - (PIND&(1<<1) ? (1<<1) : 0) | - (PIND&(1<<2) ? (1<<2) : 0) | - (PIND&(1<<3) ? (1<<3) : 0) | - (PIND&(1<<5) ? (1<<4) : 0) | - (PINB&(1<<7) ? (1<<5) : 0); -} - -static uint8_t read_fwkey(void) -{ - return PINE&(1<<2) ? 0 : (1<<3); -} - -/* Columns 0 - 15 - * These columns uses two 74HC237D 3 to 8 bit demultiplexers. - * col / pin: PC6 PB6 PF0 PF1 PC7 - * 0: 1 0 0 0 0 - * 1: 1 0 1 0 0 - * 2: 1 0 0 1 0 - * 3: 1 0 1 1 0 - * 4: 1 0 0 0 1 - * 5: 1 0 1 0 1 - * 6: 1 0 0 1 1 - * 7: 1 0 1 1 1 - * 8: 0 1 0 0 0 - * 9: 0 1 1 0 0 - * 10: 0 1 0 1 0 - * 11: 0 1 1 1 0 - * 12: 0 1 0 0 1 - * 13: 0 1 1 0 1 - * 14: 0 1 0 1 1 - * 15: 0 1 1 1 1 - * - * col: 16 - * pin: PB5 - * - * col: 17 - * pin: PD4 - */ -static void unselect_cols(void) -{ - DDRB |= (1<<5) | (1<<6); - PORTB &= ~((1<<5) | (1<<6)); - - DDRC |= (1<<6) | (1<<7); - PORTC &= ~((1<<6) | (1<<7)); - - DDRD |= (1<<4); - PORTD &= ~(1<<4); - - DDRF |= (1<<0) | (1<<1); - PORTF &= ~((1<<0) | (1<<1)); -} - -static void select_col(uint8_t col) -{ - // Output high (DDR:1, PORT:1) to select - switch (col) { - case 0: - PORTC |= (1<<6); - break; - case 1: - PORTC |= (1<<6); - PORTF |= (1<<0); - break; - case 2: - PORTC |= (1<<6); - PORTF |= (1<<1); - break; - case 3: - PORTC |= (1<<6); - PORTF |= (1<<0) | (1<<1); - break; - case 4: - PORTC |= (1<<6); - PORTC |= (1<<7); - break; - case 5: - PORTC |= (1<<6); - PORTF |= (1<<0); - PORTC |= (1<<7); - break; - case 6: - PORTC |= (1<<6); - PORTF |= (1<<1); - PORTC |= (1<<7); - break; - case 7: - PORTC |= (1<<6); - PORTF |= (1<<0) | (1<<1); - PORTC |= (1<<7); - break; - case 8: - PORTB |= (1<<6); - break; - case 9: - PORTB |= (1<<6); - PORTF |= (1<<0); - break; - case 10: - PORTB |= (1<<6); - PORTF |= (1<<1); - break; - case 11: - PORTB |= (1<<6); - PORTF |= (1<<0) | (1<<1); - break; - case 12: - PORTB |= (1<<6); - PORTC |= (1<<7); - break; - case 13: - PORTB |= (1<<6); - PORTF |= (1<<0); - PORTC |= (1<<7); - break; - case 14: - PORTB |= (1<<6); - PORTF |= (1<<1); - PORTC |= (1<<7); - break; - case 15: - PORTB |= (1<<6); - PORTF |= (1<<0) | (1<<1); - PORTC |= (1<<7); - break; - case 16: - PORTB |= (1<<5); - break; - case 17: - PORTD |= (1<<4); - break; - } -} diff --git a/keyboard/macway/Makefile.lufa b/keyboard/macway/Makefile.lufa deleted file mode 100644 index 8fff93ada5..0000000000 --- a/keyboard/macway/Makefile.lufa +++ /dev/null @@ -1,121 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = macway_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#NKRO_ENABLE = yes # USB Nkey Rollover - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -#OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/macway/Makefile.pjrc b/keyboard/macway/Makefile.pjrc deleted file mode 100644 index 6ee25b61af..0000000000 --- a/keyboard/macway/Makefile.pjrc +++ /dev/null @@ -1,97 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = macway_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -#MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = yes # Commands for debug and configuration -#NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex - - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/macway/config.h b/keyboard/macway/config.h deleted file mode 100644 index e87da1ffa6..0000000000 --- a/keyboard/macway/config.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xBEE0 -#define DEVICE_VER 0x0202 -#define MANUFACTURER t.m.k. -#define PRODUCT Macway mod - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for Macway mod - -/* matrix size */ -#define MATRIX_ROWS 9 -#define MATRIX_COLS 8 - -/* define if matrix has ghost */ -#define MATRIX_HAS_GHOST - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 5 - -/* legacy keymap support */ -#define USE_LEGACY_KEYMAP - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* PS/2 mouse */ -#ifdef PS2_MOUSE_ENABLE -# define PS2_CLOCK_PORT PORTF -# define PS2_CLOCK_PIN PINF -# define PS2_CLOCK_DDR DDRF -# define PS2_CLOCK_BIT 0 -# define PS2_DATA_PORT PORTF -# define PS2_DATA_PIN PINF -# define PS2_DATA_DDR DDRF -# define PS2_DATA_BIT 1 -#endif - -#endif diff --git a/keyboard/macway/doc/back.jpg b/keyboard/macway/doc/back.jpg Binary files differdeleted file mode 100644 index 0774401f69..0000000000 --- a/keyboard/macway/doc/back.jpg +++ /dev/null diff --git a/keyboard/macway/doc/case.jpg b/keyboard/macway/doc/case.jpg Binary files differdeleted file mode 100644 index c776d5e054..0000000000 --- a/keyboard/macway/doc/case.jpg +++ /dev/null diff --git a/keyboard/macway/doc/keys.jpg b/keyboard/macway/doc/keys.jpg Binary files differdeleted file mode 100644 index f340ebe8e4..0000000000 --- a/keyboard/macway/doc/keys.jpg +++ /dev/null diff --git a/keyboard/macway/doc/side.jpg b/keyboard/macway/doc/side.jpg Binary files differdeleted file mode 100644 index bdf8268f25..0000000000 --- a/keyboard/macway/doc/side.jpg +++ /dev/null diff --git a/keyboard/macway/doc/switch.jpg b/keyboard/macway/doc/switch.jpg Binary files differdeleted file mode 100644 index a1500d707d..0000000000 --- a/keyboard/macway/doc/switch.jpg +++ /dev/null diff --git a/keyboard/macway/doc/teensy.jpg b/keyboard/macway/doc/teensy.jpg Binary files differdeleted file mode 100644 index 07207475d5..0000000000 --- a/keyboard/macway/doc/teensy.jpg +++ /dev/null diff --git a/keyboard/macway/doc/wiring.jpg b/keyboard/macway/doc/wiring.jpg Binary files differdeleted file mode 100644 index 0f3490f105..0000000000 --- a/keyboard/macway/doc/wiring.jpg +++ /dev/null diff --git a/keyboard/macway/doc/withHHKB.jpg b/keyboard/macway/doc/withHHKB.jpg Binary files differdeleted file mode 100644 index 9921856e7b..0000000000 --- a/keyboard/macway/doc/withHHKB.jpg +++ /dev/null diff --git a/keyboard/macway/doc/withThinkPad.jpg b/keyboard/macway/doc/withThinkPad.jpg Binary files differdeleted file mode 100644 index 231c61d036..0000000000 --- a/keyboard/macway/doc/withThinkPad.jpg +++ /dev/null diff --git a/keyboard/macway/keymap.c b/keyboard/macway/keymap.c deleted file mode 100644 index b77348494a..0000000000 --- a/keyboard/macway/keymap.c +++ /dev/null @@ -1,195 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * Keymap for Macway mod - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "print.h" -#include "debug.h" -#include "util.h" -#include "keymap.h" - - -// Convert physical keyboard layout to matrix array. -// This is a macro to define keymap easily in keyboard layout form. -#define KEYMAP( \ - K11, K10, K20, K30, K40, K41, K51, K50, K60, K70, K80, K81, K61, K02, \ - K12, K13, K23, K33, K43, K42, K52, K53, K63, K73, K83, K82, K62, K01, \ - K15, K14, K24, K34, K44, K45, K55, K54, K64, K74, K84, K85, K06, \ - K67, K16, K26, K36, K46, K47, K57, K56, K66, K76, K87, K32, K35, \ - K75, K22, K00, K07, K21, K04, K37, K27, K17 \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_NO, KC_##K04, KC_NO, KC_##K06, KC_##K07 }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_NO, KC_##K26, KC_##K27 }, \ - { KC_##K30, KC_NO, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \ - { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47 }, \ - { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \ - { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_NO, KC_##K66, KC_##K67 }, \ - { KC_##K70, KC_NO, KC_NO, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO }, \ - { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_NO, KC_##K87 } \ -} - -#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)])) - - -// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. -static const uint8_t PROGMEM fn_layer[] = { - 0, // Fn0 - 1, // Fn1 - 2, // Fn2 - 3, // Fn3 - 4, // Fn4 - 0, // Fn5 - 3, // Fn6 - 3 // Fn7 -}; - -// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. -// See layer.c for details. -static const uint8_t PROGMEM fn_keycode[] = { - KC_NO, // Fn0 - KC_NO, // Fn1 - KC_SLSH, // Fn2 - KC_SCLN, // Fn3 - KC_SPC, // Fn4 - KC_NO, // Fn5 - KC_NO, // Fn6 - KC_NO // Fn7 -}; - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default Layer - * ,-----------------------------------------------------------. - * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | - * |-----------------------------------------------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | - * |-----------------------------------------------------' | - * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Return | - * |-----------------------------------------------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn1| - * |-----------------------------------------------------------| - * |Fn7|Gui |Alt |Fn4 |Alt |Gui|Fn6|Fn6|Ctr| - * `-----------------------------------------------------------' - */ - KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \ - LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,ENT, \ - LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,FN1, \ - FN7, LGUI,LALT,FN4, RALT,GRV, FN6, FN6, RCTL), - - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete | - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | - * |-----------------------------------------------------' | - * |Contro|VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter | - * |-----------------------------------------------------------| - * |Shift | | | | | | +| -|End|PgD|Dow|Shift |xxx| - * |-----------------------------------------------------------| - * | |Gui |Alt | |Alt |Gui| | |Ctr| - * `-----------------------------------------------------------' - */ - KEYMAP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, \ - CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,BRK, UP, INS, NLCK,\ - LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \ - LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,FN1, \ - NO, LGUI,LALT,SPC, RALT,NO, NO, NO, RCTL), - - - /* Layer 2: Vi mode (Quote/Rmeta) - * ,-----------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| ` | - * |-----------------------------------------------------------| - * | \ |Hom|PgD|Up |PgU|End|Hom|PgD|PgU|End| | | | | - * |-----------------------------------------------------' | - * |Contro| |Lef|Dow|Rig| |Lef|Dow|Up |Rig| | | \ | - * |-----------------------------------------------------------| - * |Shift | | | | | |Hom|PgD|PgU|End|xxx|Shift | | - * |-----------------------------------------------------------| - * | |Gui |Alt |Space |Alt |Gui|Fn6|Fn6|Ctr| - * `-----------------------------------------------------------' - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, GRV, \ - BSLS,HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, NO, \ - LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, BSLS, \ - LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, RSFT,NO, \ - NO, LGUI,LALT,SPC, RALT,RGUI,FN6, FN6, RCTL), - - - /* Layer 3: Mouse mode (Semicolon) - * ,-----------------------------------------------------------. - * | `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| ` | - * |-----------------------------------------------------------| - * | \ |MwL|MwD|McU|MwU|MwR|MwL|MwD|MwU|MwR| | | | | - * |-----------------------------------------------------' | - * |Contro| |McL|McD|McR| |McL|McD|McU|McR|xxx| | \ | - * |-----------------------------------------------------------| - * |Shift | | |Mb1|Mb2|Mb3|Mb2|Mb1| | | |Shift | | - * |-----------------------------------------------------------| - * |xxx|Gui |Alt |Mb1 |Alt | | | | | - * `-----------------------------------------------------------' - * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel - */ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, GRV, \ - BSLS,WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, NO, \ - LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, BSLS, \ - LSFT,NO, NO, BTN1,BTN2,BTN3,BTN2,BTN1,NO, NO, NO, RSFT,NO, \ - FN7, LGUI,LALT,BTN1,RALT,NO, FN6, FN6, NO), - - - /* Layer 4: Matias half keyboard style (Space) - * ,-----------------------------------------------------------. - * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete | - * |-----------------------------------------------------------| - * |Backs| P| O| I| U| Y| T| R| E| W| Q|Tab|Tab| | - * |-----------------------------------------------------' | - * |Contro| ;| L| K| J| H| G| F| D| S| A|Con|Control | - * |-----------------------------------------------------------| - * |Shift | /| .| ,| M| N| B| V| C| X| Z|Shift | | - * |-----------------------------------------------------------| - * | |Gui |Alt |xxxxxxxxxxxxxxxxxxxxxx|Alt |Gui| | |Ctr| - * `-----------------------------------------------------------' - */ - KEYMAP(MINS,0, 9, 8, 7, 6, 5, 4, 3, 2, 1, NO, NO, ESC, \ - BSPC,P, O, I, U, Y, T, R, E, W, Q, TAB, TAB, TAB, \ - LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \ - LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT,NO, \ - NO, LGUI,LALT,FN4, RALT,RGUI,NO, NO, RCTL), -}; - - -uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) -{ - return KEYCODE(layer, row, col); -} - -uint8_t keymap_fn_layer(uint8_t index) -{ - return pgm_read_byte(&fn_layer[index]); -} - -uint8_t keymap_fn_keycode(uint8_t index) -{ - return pgm_read_byte(&fn_keycode[index]); -} diff --git a/keyboard/macway/led.c b/keyboard/macway/led.c deleted file mode 100644 index f76545f0ba..0000000000 --- a/keyboard/macway/led.c +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ -} diff --git a/keyboard/macway/matrix.c b/keyboard/macway/matrix.c deleted file mode 100644 index 3d10b304d4..0000000000 --- a/keyboard/macway/matrix.c +++ /dev/null @@ -1,217 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * scan matrix - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 5 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -#ifdef MATRIX_HAS_GHOST -static bool matrix_has_ghost_in_row(uint8_t row); -#endif -static matrix_row_t read_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); - - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // initialize row and col - unselect_rows(); - // Input with pull-up(DDR:0, PORT:1) - DDRB = 0x00; - PORTB = 0xFF; - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - _delay_us(30); // without this wait read unstable value. - matrix_row_t cols = read_cols(); - if (matrix_debouncing[i] != cols) { - matrix_debouncing[i] = cols; - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); - } - debouncing = DEBOUNCE; - } - unselect_rows(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 01234567\n"); - for (uint8_t row = 0; row < matrix_rows(); row++) { - phex(row); print(": "); - pbin_reverse(matrix_get_row(row)); -#ifdef MATRIX_HAS_GHOST - if (matrix_has_ghost_in_row(row)) { - print(" <ghost"); - } -#endif - print("\n"); - } -} - -#ifdef MATRIX_HAS_GHOST -inline -static bool matrix_has_ghost_in_row(uint8_t row) -{ - // no ghost exists in case less than 2 keys on - if (((matrix[row] - 1) & matrix[row]) == 0) - return false; - - // ghost exists in case same state as other row - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - if (i != row && (matrix[i] & matrix[row])) - return true; - } - return false; -} -#endif - -inline -static matrix_row_t read_cols(void) -{ - return ~PINB; -} - -inline -static void unselect_rows(void) -{ - // Hi-Z(DDR:0, PORT:0) to unselect - DDRC &= ~0b01000000; // PC: 6 - PORTC &= ~0b01000000; - DDRD &= ~0b11100111; // PD: 7,6,5,2,1,0 - PORTD &= ~0b11100111; - DDRF &= ~0b11000000; // PF: 7,6 - PORTF &= ~0b11000000; -} - -inline -static void select_row(uint8_t row) -{ - // Output low(DDR:1, PORT:0) to select - // row: 0 1 2 3 4 5 6 7 8 - // pin: PD0, PD5, PD7, PF6, PD6, PD1, PD2, PC6, PF7 - switch (row) { - case 0: - DDRD |= (1<<0); - PORTD &= ~(1<<0); - break; - case 1: - DDRD |= (1<<5); - PORTD &= ~(1<<5); - break; - case 2: - DDRD |= (1<<7); - PORTD &= ~(1<<7); - break; - case 3: - DDRF |= (1<<6); - PORTF &= ~(1<<6); - break; - case 4: - DDRD |= (1<<6); - PORTD &= ~(1<<6); - break; - case 5: - DDRD |= (1<<1); - PORTD &= ~(1<<1); - break; - case 6: - DDRD |= (1<<2); - PORTD &= ~(1<<2); - break; - case 7: - DDRC |= (1<<6); - PORTC &= ~(1<<6); - break; - case 8: - DDRF |= (1<<7); - PORTF &= ~(1<<7); - break; - } -} diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile deleted file mode 100644 index b9c88fdd31..0000000000 --- a/keyboard/mbed_onekey/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -PROJECT = mbed_onekey - -TMK_DIR = ../../tmk_core -MBED_DIR = $(TMK_DIR)/mbed-sdk - -#VPATH += $(MBED_DIR):$(TMK_DIR) -vpath %.s .:$(MBED_DIR):$(TMK_DIR) -vpath %.c .:$(MBED_DIR):$(TMK_DIR) -vpath %.cpp .:$(MBED_DIR):$(TMK_DIR) - -OBJDIR = ./build - -OBJECTS = \ - $(OBJDIR)/./main.o - -CONFIG_H = config.h - -SYS_OBJECTS = - -INCLUDE_PATHS = -I. - -LIBRARY_PATHS = -LIBRARIES = - -# Build Options -# Comment out to disable -#BOOTMAGIC_ENABLE = yes -#MOUSEKEY_ENABLE = yes - - -include $(TMK_DIR)/tool/mbed/mbed.mk -include $(TMK_DIR)/tool/mbed/common.mk -include $(TMK_DIR)/tool/mbed/gcc.mk diff --git a/keyboard/mbed_onekey/config.h b/keyboard/mbed_onekey/config.h deleted file mode 100644 index a3aadd0389..0000000000 --- a/keyboard/mbed_onekey/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -#endif diff --git a/keyboard/mbed_onekey/main.cpp b/keyboard/mbed_onekey/main.cpp deleted file mode 100644 index 71342e7ec3..0000000000 --- a/keyboard/mbed_onekey/main.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "mbed.h" -#include "action.h" -#include "keycode.h" -#include "host.h" -#include "mbed_driver.h" - - -// Button and LEDs of LPC11U35 board -DigitalIn isp(P0_1); // ISP button -DigitalOut led_red(P0_20); -DigitalOut led_green(P0_21); - - -int main(void) { - isp.mode(PullUp); - led_red = 1; - led_green = 0; - - host_set_driver(&mbed_driver); - - bool last_isp = isp; - while (1) { - if (last_isp == isp) continue; - last_isp = isp; - if (last_isp == 0) { - led_red = 0; // on - register_code(KC_A); - } else { - led_red = 1; // off - unregister_code(KC_A); - } - } -} diff --git a/keyboard/nerd/Makefile b/keyboard/nerd/Makefile deleted file mode 100644 index 30149345ce..0000000000 --- a/keyboard/nerd/Makefile +++ /dev/null @@ -1,126 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = nerd_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# project specific files -SRC = keymap_common.c \ - matrix.c \ - backlight.c - -ifdef LAYOUT - OPT_DEFS += -DNERD_LAYOUT_$(LAYOUT) -endif - -ifdef KEYMAP - SRC := keymap_$(LAYOUT)_$(KEYMAP).c $(SRC) -endif - -CONFIG_H = config.h - -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 8000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/nerd/README.md b/keyboard/nerd/README.md deleted file mode 100644 index 5b4acd3ba9..0000000000 --- a/keyboard/nerd/README.md +++ /dev/null @@ -1,52 +0,0 @@ -NerD keyboard firmware -======================== - -Korean Keyboard designed by GON. - -*Note that this is not the official firmware* - - -Hardware revision ------------------ - -This firmware was developed and tested for NerD pcb version 1.61 and 2.0. - - -Supported features ------------------- - -* All layout options are supported -* All leds are supported -* 60% and 80% (TKL) pcbs are supported - - -Changing Bootloader -------------------- - -You can't simply just upload this firmware to a new NerD board because the original -bootloader won't accept DFU connections. - -You can change the bootloader of the keyboard with an ISP programmer of your choice. -The bootloader pins are easy to access on the NerD pcb. - -*Be aware that after changing the bootloader the official configuration software -won't work anymore and you'll lose your warrenty. GON won't provide any support for this firmware.* - - -Build ------ - -For building you have to specify two build-options, LAYOUT and KEYMAP. The layout option defines -pcb layout and can be either 60% or 80% at the momemnt. The keymap option selects your -preferred keymapping. - -Move to this directory then just run `make LAYOUT=60 KEYMAP=ansi150` - -to compile a firmware for a 60% pcb with ANSI 150 key mapping. - - -Jump to Bootloader ------------------- - -You can jump to bootloader by software if you have a macro defined for this in your keymap. The -default command is (LSFT+RSFT+PAUS) to access the bootloader by software jump. diff --git a/keyboard/nerd/backlight.c b/keyboard/nerd/backlight.c deleted file mode 100644 index 2dc85c7532..0000000000 --- a/keyboard/nerd/backlight.c +++ /dev/null @@ -1,81 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "backlight.h" -#include "led.h" - -void backlight_init_ports() -{ - DDRB |= 0b11100000; // PB7 (switch), PB6 (pcb), PB5 (caps) -} - -void led_set(uint8_t usb_led) -{ - (usb_led & (1<<USB_LED_CAPS_LOCK)) ? backlight_caps_enable() : backlight_caps_disable(); -} - -void backlight_set(uint8_t level) -{ - (level & BACKLIGHT_SWITCH) ? backlight_switch_enable() : backlight_switch_disable(); - (level & BACKLIGHT_PCB) ? backlight_pcb_enable() : backlight_pcb_disable(); -} - -void backlight_switch_enable() -{ - PORTB |= 0b10000000; -} - -void backlight_switch_disable() -{ - PORTB &= ~0b10000000; -} - -void backlight_switch_invert() -{ - PORTB ^= 0b10000000; -} - -void backlight_pcb_enable() -{ - PORTB |= 0b01000000; -} - -void backlight_pcb_disable() -{ - PORTB &= ~0b01000000; -} - -void backlight_pcb_invert() -{ - PORTB ^= 0b01000000; -} - -void backlight_caps_enable() -{ - PORTB |= 0b00100000; -} - -void backlight_caps_disable() -{ - PORTB &= ~0b00100000; -} - -void backlight_caps_invert() -{ - PORTB ^= 0b00100000; -} diff --git a/keyboard/nerd/backlight.h b/keyboard/nerd/backlight.h deleted file mode 100644 index 4c75d9db65..0000000000 --- a/keyboard/nerd/backlight.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef BACKLIGHT_H -#define BACKLIGHT_H - -enum backlight_level { - BACKLIGHT_SWITCH = 0b0000001, - BACKLIGHT_PCB = 0b0000010, -}; - -void backlight_init_ports(void); - -void backlight_switch_invert(void); -void backlight_switch_enable(void); -void backlight_switch_disable(void); - -void backlight_pcb_invert(void); -void backlight_pcb_enable(void); -void backlight_pcb_disable(void); - -void backlight_caps_invert(void); -void backlight_caps_enable(void); -void backlight_caps_disable(void); - -#endif // BACKLIGHT_H diff --git a/keyboard/nerd/config.h b/keyboard/nerd/config.h deleted file mode 100644 index ac2e6989d6..0000000000 --- a/keyboard/nerd/config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef CONFIG_H -#define CONFIG_H - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER GON -#define PRODUCT NerD -#define DESCRIPTION t.m.k. keyboard firmware for NerD - -/* key matrix size */ -#define MATRIX_ROWS 9 -#define MATRIX_COLS 10 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 2 - -/* 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_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/nerd/keymap_60_ansi150.c b/keyboard/nerd/keymap_60_ansi150.c deleted file mode 100644 index f85836ab55..0000000000 --- a/keyboard/nerd/keymap_60_ansi150.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "keymap_common.h" -#include "backlight.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default */ - KEYMAP_ANSI150(GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, \ - ESC, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT, \ - LCTL,LGUI,LALT, SPC, RALT,FN0 ,RCTL), - /* Layer 1: Space Fn */ - KEYMAP_ANSI150(TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS, FN1, TRNS,FN0, TRNS), - /* Layer 2: Functions */ - KEYMAP_ANSI150(SLEP,F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, MUTE, \ - TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,PAUS,HOME,INS, END, MPLY,VOLD,VOLU,FN3, \ - CAPS,MS_L,MS_D,MS_R,PGDN,TRNS,LEFT,DOWN,UP ,RGHT,MPRV,MNXT, FN2, \ - UP, TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - LEFT,DOWN,RGHT, TRNS, TRNS,TRNS,TRNS) -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(2), - [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), - [2] = ACTION_LAYER_TOGGLE(1), - [3] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_SWITCH) -}; diff --git a/keyboard/nerd/keymap_80_ansi150.c b/keyboard/nerd/keymap_80_ansi150.c deleted file mode 100644 index 72a7d83c9b..0000000000 --- a/keyboard/nerd/keymap_80_ansi150.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "keymap_common.h" -#include "backlight.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Layer 0: Default */ - KEYMAP_ANSI150(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ - CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,FN0, RCTL, LEFT,DOWN,RGHT), - /* Layer 1: Space Fn */ - KEYMAP_ANSI150(TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ - ESC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS,TRNS,TRNS, FN1, TRNS,FN0, TRNS, TRNS,TRNS,TRNS), - /* Layer 2: Functions */ - KEYMAP_ANSI150(SLEP, MYCM,WSCH,WHOM,MAIL,VOLD,VOLU,MUTE,MSEL,MPLY,MPRV,MNXT,MSTP, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,END, TRNS,TRNS,TRNS,TRNS,TRNS,HOME,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ - TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,TRNS,TRNS,INS, TRNS,TRNS,TRNS,TRNS,FN3, TRNS,TRNS,TRNS, \ - CAPS,MS_L,MS_D,MS_R,PGDN,TRNS,LEFT,DOWN,UP ,RGHT,TRNS,TRNS, FN2, \ - TRNS, TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS), -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(2), - [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), - [2] = ACTION_LAYER_TOGGLE(1), - [3] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_SWITCH) -}; diff --git a/keyboard/nerd/keymap_common.c b/keyboard/nerd/keymap_common.c deleted file mode 100644 index 29ec4e53ef..0000000000 --- a/keyboard/nerd/keymap_common.c +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "keymap_common.h" - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} diff --git a/keyboard/nerd/keymap_common.h b/keyboard/nerd/keymap_common.h deleted file mode 100644 index e116635918..0000000000 --- a/keyboard/nerd/keymap_common.h +++ /dev/null @@ -1,89 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include <stdint.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - -#define KEYMAP( \ - K08, K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68, K69, K88, K89, \ - K00, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, K80, K81, K84, \ - K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, K82, K83, K85, \ - K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, K71, K65, \ - K07, K79, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, K67, K86, \ - K06, K05, K78, K70, K72, K73, K74, K75, K76, K77, K87 \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09 }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19 }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29 }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39 }, \ - { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49 }, \ - { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57, KC_##K58, KC_##K59 }, \ - { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_##K68, KC_##K69 }, \ - { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77, KC_##K78, KC_##K79 }, \ - { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_##K87, KC_##K88, KC_##K89 } \ -} - -#ifdef NERD_LAYOUT_60 - #define KEYMAP_ANSI150( \ - K08, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, \ - K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, \ - K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, K65, \ - K07, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, \ - K06, K05, K78, K70, K73, K74, K75 \ - ) KEYMAP( \ - K08, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, \ - NO, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, NO, NO, NO, \ - K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, NO, NO, NO, \ - K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, NO, K65, \ - K07, NO, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, NO, NO, \ - K06, K05, K78, K70, NO, K73, K74, K75, NO, NO, NO \ - ) -#endif - -#ifdef NERD_LAYOUT_80 - #define KEYMAP_ANSI150( \ - K08, K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68, K69, K88, K89, \ - K00, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, K80, K81, K84, \ - K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, K82, K83, K85, \ - K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, K65, \ - K07, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, K86, \ - K06, K05, K78, K70, K73, K74, K75, K76, K77, K87 \ - ) KEYMAP( \ - K08, K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68, K69, K88, K89, \ - K00, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, K80, K81, K84, \ - K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, K82, K83, K85, \ - K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, NO, K65, \ - K07, NO, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, NO, K86, \ - K06, K05, K78, K70, NO, K73, K74, K75, K76, K77, K87 \ - ) -#endif - -#endif // KEYMAP_COMMON_H diff --git a/keyboard/nerd/matrix.c b/keyboard/nerd/matrix.c deleted file mode 100644 index eb5a9ab4f1..0000000000 --- a/keyboard/nerd/matrix.c +++ /dev/null @@ -1,221 +0,0 @@ -/* -Copyright 2014 Ralf Schmitt <ralf@bunkertor.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" -#include "backlight.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 5 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint16_t read_inputs(void); -static void init_inputs(void); -static void init_outputs(void); -static void reset_inputs(void); -static void reset_outputs(void); -static void select_output(uint8_t col); - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - backlight_init_ports(); - init_inputs(); - init_outputs(); - - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { - reset_inputs(); - reset_outputs(); - select_output(col); - _delay_us(3); - uint16_t rows = read_inputs(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - if (debouncing) { - dprint("bounce!: "); dprintf("%02X", debouncing); dprintln(); - } - debouncing = DEBOUNCE; - } - } - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - phex(row); print(": "); - pbin_reverse16(matrix_get_row(row)); - print("\n"); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop16(matrix[i]); - } - return count; -} - -static void init_inputs(void) -{ - DDRE &= ~0b01000000; // PE6 (Col 0) - DDRB &= ~0b00001111; // PB0 (Col 1), PB1 (Col 2), PB2 (Col 3), PB3 (Col 4) - DDRF &= ~0b00000001; // PF0 (Col 5) - DDRD &= ~0b00100011; // PD0 (Col 6), PD1 (Col 8 TKL), PD5 (Col 7) -} - -static uint16_t read_inputs(void) -{ - return (PINE&(1<<6) ? 0 : (1<<0)) | // PE6 (Col 0) - (PINB&(1<<0) ? 0 : (1<<1)) | // PB0 (Col 1) - (PINB&(1<<1) ? 0 : (1<<2)) | // PB1 (Col 2) - (PINB&(1<<2) ? 0 : (1<<3)) | // PB2 (Col 3) - (PINB&(1<<3) ? 0 : (1<<4)) | // PB3 (Col 4) - (PINF&(1<<0) ? 0 : (1<<5)) | // PF0 (Col 5) - (PIND&(1<<0) ? 0 : (1<<6)) | // PD0 (Col 6) - (PIND&(1<<5) ? 0 : (1<<7)) | // PD5 (Col 7) - (PIND&(1<<1) ? 0 : (1<<8)); // PD1 (Col 8 TKL) -} - -static void reset_inputs(void) -{ - PORTE |= 0b01000000; // PE6 (Col 0) - PORTB |= 0b00001111; // PB0 (Col 1), PB1 (Col 2), PB2 (Col 3), PB3 (Col 4) - PORTF |= 0b00000001; // PF0 (Col 5) - PORTD |= 0b00100011; // PD0 (Col 6), PD1 (Col 8 TKL), PD5 (Col 7) -} - -static void init_outputs(void) -{ - DDRB |= 0b00010000; // PB4 (Row 0) - DDRE |= 0b00000100; // PE2 (Row 1) - DDRF |= 0b11110010; // PF4 (Row 2), PF7 (Row 3), PF1 (Row 4), PF6 (Row 5), PF5 (Row 7) - DDRC |= 0b11000000; // PC6 (Row 6), PC7 (Row 9) - DDRD |= 0b10000000; // PD7 (Row 8) -} - -static void reset_outputs(void) -{ - PORTB |= 0b00010000; // PB4 (Row 0) - PORTE |= 0b00000100; // PE2 (Row 1) - PORTF |= 0b11110010; // PF4 (Row 2), PF7 (Row 3), PF1 (Row 4), PF6 (Row 5), PF5 (Row 7) - PORTC |= 0b11000000; // PC6 (Row 6), PC7 (Row 9) - PORTD |= 0b10000000; // PD7 (Row 8) -} - -static void select_output(uint8_t col) -{ - switch (col) { - case 0: - PORTB &= ~(1<<4); - break; - case 1: - PORTE &= ~(1<<2); - break; - case 2: - PORTF &= ~(1<<4); - break; - case 3: - PORTF &= ~(1<<7); - break; - case 4: - PORTF &= ~(1<<1); - break; - case 5: - PORTF &= ~(1<<6); - break; - case 6: - PORTC &= ~(1<<6); - break; - case 7: - PORTF &= ~(1<<5); - break; - case 8: - PORTD &= ~(1<<7); - break; - case 9: - PORTC &= ~(1<<7); - break; - } -} diff --git a/keyboard/onekey/Makefile b/keyboard/onekey/Makefile deleted file mode 100644 index 0b54e7d25c..0000000000 --- a/keyboard/onekey/Makefile +++ /dev/null @@ -1,132 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = onekey_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# project specific files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -#EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -#COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -#PS2_USE_BUSYWAIT = yes # uses primitive reference code -#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin -#PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened) - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/protocol.mk -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/onekey/Makefile.pjrc b/keyboard/onekey/Makefile.pjrc deleted file mode 100644 index ebf0710f73..0000000000 --- a/keyboard/onekey/Makefile.pjrc +++ /dev/null @@ -1,103 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = onekey_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# project specific files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -MCU = atmega32u4 -#MCU = at90usb1286 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+5000) -#EXTRAKEY_ENABLE = yes # Audio control and System control(+600) -CONSOLE_ENABLE = yes # Console for debug -#COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover(+500) - -PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -PS2_USE_BUSYWAIT = yes # uses primitive reference code -#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin -#PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened) - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/protocol.mk -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/onekey/Makefile.vusb b/keyboard/onekey/Makefile.vusb deleted file mode 100644 index fb1fbdfea2..0000000000 --- a/keyboard/onekey/Makefile.vusb +++ /dev/null @@ -1,88 +0,0 @@ -# Target file name (without extension). -TARGET = onekey_vusb - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = atmega168p -MCU = atmega328p - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 12000000 - - -# Build Options -# comment out to disable the options. -# -#MOUSEKEY_ENABLE = yes # Mouse keys -#EXTRAKEY_ENABLE = yes # Audio control and System control -#NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -AVRDUDE = avrdude -# Type: avrdude -c ? to get a full listing. -AVRDUDE_PROGRAMMER = usbasp -AVRDUDE_PORT = -AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex -#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep - -# Uncomment the following if you want avrdude's erase cycle counter. -# Note that this counter needs to be initialized first using -Yn, -# see avrdude manual. -#AVRDUDE_ERASE_COUNTER = -y - -# Uncomment the following if you do /not/ wish a verification to be -# performed after programming the device. -#AVRDUDE_NO_VERIFY = -V - -# Increase verbosity level. Please use this when submitting bug -# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude> -# to submit bug reports. -#AVRDUDE_VERBOSE = -v -v - -#AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS = -p $(MCU) -c $(AVRDUDE_PROGRAMMER) -AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY) -AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE) -AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER) - -PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBasp 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=2048 - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - - -include $(TMK_DIR)/protocol.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/protocol/vusb.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/onekey/README.md b/keyboard/onekey/README.md deleted file mode 100644 index 7413f3880e..0000000000 --- a/keyboard/onekey/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Onekey -====== -Just one key keyboard for example. It sends 'a' key if pins PB0 and PB1 are short-circuited. - -https://github.com/tmk/tmk_keyboard/issues/56 diff --git a/keyboard/onekey/config.h b/keyboard/onekey/config.h deleted file mode 100644 index bf1d2b1ed3..0000000000 --- a/keyboard/onekey/config.h +++ /dev/null @@ -1,156 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1111 -#define DEVICE_VER 0x0001 -#define MANUFACTURER geekhack -#define PRODUCT Onekey -#define DESCRIPTION t.m.k. keyboard firmware for Onekey - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* 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_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - - - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - - -/* PS/2 mouse */ -#ifdef PS2_USE_BUSYWAIT -# define PS2_CLOCK_PORT PORTD -# define PS2_CLOCK_PIN PIND -# define PS2_CLOCK_DDR DDRD -# define PS2_CLOCK_BIT 1 -# define PS2_DATA_PORT PORTD -# define PS2_DATA_PIN PIND -# define PS2_DATA_DDR DDRD -# define PS2_DATA_BIT 2 -#endif - - -/* PS/2 mouse interrupt version */ -#ifdef PS2_USE_INT -/* uses INT1 for clock line(ATMega32U4) */ -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 1 -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 2 - -#define PS2_INT_INIT() do { \ - EICRA |= ((1<<ISC11) | \ - (0<<ISC10)); \ -} while (0) -#define PS2_INT_ON() do { \ - EIMSK |= (1<<INT1); \ -} while (0) -#define PS2_INT_OFF() do { \ - EIMSK &= ~(1<<INT1); \ -} while (0) -#define PS2_INT_VECT INT1_vect -#endif - - -/* PS/2 mouse USART version */ -#ifdef PS2_USE_USART -#if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) -/* XCK for clock line and RXD for data line */ -#define PS2_CLOCK_PORT PORTD -#define PS2_CLOCK_PIN PIND -#define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 5 -#define PS2_DATA_PORT PORTD -#define PS2_DATA_PIN PIND -#define PS2_DATA_DDR DDRD -#define PS2_DATA_BIT 2 - -/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ -/* set DDR of CLOCK as input to be slave */ -#define PS2_USART_INIT() do { \ - PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \ - PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \ - UCSR1C = ((1 << UMSEL10) | \ - (3 << UPM10) | \ - (0 << USBS1) | \ - (3 << UCSZ10) | \ - (0 << UCPOL1)); \ - UCSR1A = 0; \ - UBRR1H = 0; \ - UBRR1L = 0; \ -} while (0) -#define PS2_USART_RX_INT_ON() do { \ - UCSR1B = ((1 << RXCIE1) | \ - (1 << RXEN1)); \ -} while (0) -#define PS2_USART_RX_POLL_ON() do { \ - UCSR1B = (1 << RXEN1); \ -} while (0) -#define PS2_USART_OFF() do { \ - UCSR1C = 0; \ - UCSR1B &= ~((1 << RXEN1) | \ - (1 << TXEN1)); \ -} while (0) -#define PS2_USART_RX_READY (UCSR1A & (1<<RXC1)) -#define PS2_USART_RX_DATA UDR1 -#define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1))) -#define PS2_USART_RX_VECT USART1_RX_vect -#endif -#endif - -#endif diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c deleted file mode 100644 index dce4e9191e..0000000000 --- a/keyboard/onekey/keymap.c +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - {{KC_A}}, -}; - -/* - * Fn action definition - */ -static const uint16_t PROGMEM fn_actions[] = { -}; - - - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/onekey/led.c b/keyboard/onekey/led.c deleted file mode 100644 index 2d52fbf1c3..0000000000 --- a/keyboard/onekey/led.c +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ -} diff --git a/keyboard/onekey/matrix.c b/keyboard/onekey/matrix.c deleted file mode 100644 index 29df868321..0000000000 --- a/keyboard/onekey/matrix.c +++ /dev/null @@ -1,176 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * scan matrix - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 5 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static matrix_row_t read_cols(void); -static void init_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); - - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - debug_enable = true; - debug_matrix = true; - debug_mouse = true; - // initialize row and col - unselect_rows(); - init_cols(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - _delay_us(30); // without this wait read unstable value. - matrix_row_t cols = read_cols(); - if (matrix_debouncing[i] != cols) { - matrix_debouncing[i] = cols; - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); - } - debouncing = DEBOUNCE; - } - unselect_rows(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - phex(row); print(": "); - pbin_reverse16(matrix_get_row(row)); - print("\n"); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop16(matrix[i]); - } - return count; -} - -/* Column pin configuration - * col: 0 - * pin: B0 - */ -static void init_cols(void) -{ - // Input with pull-up(DDR:0, PORT:1) - DDRB &= ~(1<<0); - PORTB |= (1<<0); -} - -static matrix_row_t read_cols(void) -{ - return (PINB&(1<<0) ? 0 : (1<<0)); -} - -/* Row pin configuration - * row: 0 - * pin: B1 - */ -static void unselect_rows(void) -{ - // Hi-Z(DDR:0, PORT:0) to unselect - DDRB &= ~0b00000010; - PORTB &= ~0b00000010; -} - -static void select_row(uint8_t row) -{ - // Output low(DDR:1, PORT:0) to select - switch (row) { - case 0: - DDRB |= (1<<1); - PORTB &= ~(1<<1); - break; - } -} diff --git a/keyboard/onekey/usbconfig.h b/keyboard/onekey/usbconfig.h deleted file mode 100644 index d0ca4c717e..0000000000 --- a/keyboard/onekey/usbconfig.h +++ /dev/null @@ -1,377 +0,0 @@ -/* Name: usbconfig.h - * Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers - * Author: Christian Starkjohann - * Creation Date: 2005-04-01 - * Tabsize: 4 - * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) - * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $ - */ - -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ - - -/* -General Description: -This file is an example configuration (with inline documentation) for the USB -driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is -also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may -wire the lines to any other port, as long as D+ is also wired to INT0 (or any -other hardware interrupt, as long as it is the highest level interrupt, see -section at the end of this file). -*/ - -/* ---------------------------- Hardware Config ---------------------------- */ - -#define USB_CFG_IOPORTNAME D -/* This is the port where the USB bus is connected. When you configure it to - * "B", the registers PORTB, PINB and DDRB will be used. - */ -#define USB_CFG_DMINUS_BIT 3 -/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected. - * This may be any bit in the port. - */ -#define USB_CFG_DPLUS_BIT 2 -/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected. - * This may be any bit in the port. Please note that D+ must also be connected - * to interrupt pin INT0! [You can also use other interrupts, see section - * "Optional MCU Description" below, or you can connect D- to the interrupt, as - * it is required if you use the USB_COUNT_SOF feature. If you use D- for the - * interrupt, the USB interrupt will also be triggered at Start-Of-Frame - * markers every millisecond.] - */ -#define USB_CFG_CLOCK_KHZ (F_CPU/1000) -/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000, - * 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code - * require no crystal, they tolerate +/- 1% deviation from the nominal - * frequency. All other rates require a precision of 2000 ppm and thus a - * crystal! - * Since F_CPU should be defined to your actual clock rate anyway, you should - * not need to modify this setting. - */ -#define USB_CFG_CHECK_CRC 0 -/* Define this to 1 if you want that the driver checks integrity of incoming - * data packets (CRC checks). CRC checks cost quite a bit of code size and are - * currently only available for 18 MHz crystal clock. You must choose - * USB_CFG_CLOCK_KHZ = 18000 if you enable this option. - */ - -/* ----------------------- Optional Hardware Config ------------------------ */ - -/* #define USB_CFG_PULLUP_IOPORTNAME D */ -/* If you connect the 1.5k pullup resistor from D- to a port pin instead of - * V+, you can connect and disconnect the device from firmware by calling - * the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h). - * This constant defines the port on which the pullup resistor is connected. - */ -/* #define USB_CFG_PULLUP_BIT 4 */ -/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined - * above) where the 1.5k pullup resistor is connected. See description - * above for details. - */ - -/* --------------------------- Functional Range ---------------------------- */ - -#define USB_CFG_HAVE_INTRIN_ENDPOINT 1 -/* Define this to 1 if you want to compile a version with two endpoints: The - * default control endpoint 0 and an interrupt-in endpoint (any other endpoint - * number). - */ -#define USB_CFG_HAVE_INTRIN_ENDPOINT3 1 -/* Define this to 1 if you want to compile a version with three endpoints: The - * default control endpoint 0, an interrupt-in endpoint 3 (or the number - * configured below) and a catch-all default interrupt-in endpoint as above. - * You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature. - */ -#define USB_CFG_EP3_NUMBER 3 -/* If the so-called endpoint 3 is used, it can now be configured to any other - * endpoint number (except 0) with this macro. Default if undefined is 3. - */ -/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */ -/* The above macro defines the startup condition for data toggling on the - * interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1. - * Since the token is toggled BEFORE sending any data, the first packet is - * sent with the oposite value of this configuration! - */ -#define USB_CFG_IMPLEMENT_HALT 0 -/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature - * for endpoint 1 (interrupt endpoint). Although you may not need this feature, - * it is required by the standard. We have made it a config option because it - * bloats the code considerably. - */ -#define USB_CFG_SUPPRESS_INTR_CODE 0 -/* Define this to 1 if you want to declare interrupt-in endpoints, but don't - * want to send any data over them. If this macro is defined to 1, functions - * usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if - * you need the interrupt-in endpoints in order to comply to an interface - * (e.g. HID), but never want to send any data. This option saves a couple - * of bytes in flash memory and the transmit buffers in RAM. - */ -#define USB_CFG_INTR_POLL_INTERVAL 10 -/* If you compile a version with endpoint 1 (interrupt-in), this is the poll - * interval. The value is in milliseconds and must not be less than 10 ms for - * low speed devices. - */ -#define USB_CFG_IS_SELF_POWERED 0 -/* Define this to 1 if the device has its own power supply. Set it to 0 if the - * device is powered from the USB bus. - */ -#define USB_CFG_MAX_BUS_POWER 100 -/* Set this variable to the maximum USB bus power consumption of your device. - * The value is in milliamperes. [It will be divided by two since USB - * communicates power requirements in units of 2 mA.] - */ -#define USB_CFG_IMPLEMENT_FN_WRITE 1 -/* Set this to 1 if you want usbFunctionWrite() to be called for control-out - * transfers. Set it to 0 if you don't need it and want to save a couple of - * bytes. - */ -#define USB_CFG_IMPLEMENT_FN_READ 0 -/* Set this to 1 if you need to send control replies which are generated - * "on the fly" when usbFunctionRead() is called. If you only want to send - * data from a static buffer, set it to 0 and return the data from - * usbFunctionSetup(). This saves a couple of bytes. - */ -#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0 -/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints. - * You must implement the function usbFunctionWriteOut() which receives all - * interrupt/bulk data sent to any endpoint other than 0. The endpoint number - * can be found in 'usbRxToken'. - */ -#define USB_CFG_HAVE_FLOWCONTROL 0 -/* Define this to 1 if you want flowcontrol over USB data. See the definition - * of the macros usbDisableAllRequests() and usbEnableAllRequests() in - * usbdrv.h. - */ -#define USB_CFG_DRIVER_FLASH_PAGE 0 -/* If the device has more than 64 kBytes of flash, define this to the 64 k page - * where the driver's constants (descriptors) are located. Or in other words: - * Define this to 1 for boot loaders on the ATMega128. - */ -#define USB_CFG_LONG_TRANSFERS 0 -/* Define this to 1 if you want to send/receive blocks of more than 254 bytes - * in a single control-in or control-out transfer. Note that the capability - * for long transfers increases the driver size. - */ -/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */ -/* This macro is a hook if you want to do unconventional things. If it is - * defined, it's inserted at the beginning of received message processing. - * If you eat the received message and don't want default processing to - * proceed, do a return after doing your things. One possible application - * (besides debugging) is to flash a status LED on each packet. - */ -/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */ -/* This macro is a hook if you need to know when an USB RESET occurs. It has - * one parameter which distinguishes between the start of RESET state and its - * end. - */ -/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */ -/* This macro (if defined) is executed when a USB SET_ADDRESS request was - * received. - */ -#define USB_COUNT_SOF 0 -/* define this macro to 1 if you need the global variable "usbSofCount" which - * counts SOF packets. This feature requires that the hardware interrupt is - * connected to D- instead of D+. - */ -/* #ifdef __ASSEMBLER__ - * macro myAssemblerMacro - * in YL, TCNT0 - * sts timer0Snapshot, YL - * endm - * #endif - * #define USB_SOF_HOOK myAssemblerMacro - * This macro (if defined) is executed in the assembler module when a - * Start Of Frame condition is detected. It is recommended to define it to - * the name of an assembler macro which is defined here as well so that more - * than one assembler instruction can be used. The macro may use the register - * YL and modify SREG. If it lasts longer than a couple of cycles, USB messages - * immediately after an SOF pulse may be lost and must be retried by the host. - * What can you do with this hook? Since the SOF signal occurs exactly every - * 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in - * designs running on the internal RC oscillator. - * Please note that Start Of Frame detection works only if D- is wired to the - * interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES! - */ -#define USB_CFG_CHECK_DATA_TOGGLING 0 -/* define this macro to 1 if you want to filter out duplicate data packets - * sent by the host. Duplicates occur only as a consequence of communication - * errors, when the host does not receive an ACK. Please note that you need to - * implement the filtering yourself in usbFunctionWriteOut() and - * usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable - * for each control- and out-endpoint to check for duplicate packets. - */ -#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0 -/* define this macro to 1 if you want the function usbMeasureFrameLength() - * compiled in. This function can be used to calibrate the AVR's RC oscillator. - */ -#define USB_USE_FAST_CRC 0 -/* The assembler module has two implementations for the CRC algorithm. One is - * faster, the other is smaller. This CRC routine is only used for transmitted - * messages where timing is not critical. The faster routine needs 31 cycles - * per byte while the smaller one needs 61 to 69 cycles. The faster routine - * may be worth the 32 bytes bigger code size if you transmit lots of data and - * run the AVR close to its limit. - */ - -/* -------------------------- Device Description --------------------------- */ - -#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF) -/* USB vendor ID for the device, low byte first. If you have registered your - * own Vendor ID, define it here. Otherwise you may use one of obdev's free - * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF) -/* This is the ID of the product, low byte first. It is interpreted in the - * scope of the vendor ID. If you have registered your own VID with usb.org - * or if you have licensed a PID from somebody else, define it here. Otherwise - * you may use one of obdev's free shared VID/PID pairs. See the file - * USB-IDs-for-free.txt for details! - * *** IMPORTANT NOTE *** - * This template uses obdev's shared VID/PID pair for Vendor Class devices - * with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand - * the implications! - */ -#define USB_CFG_DEVICE_VERSION 0x00, 0x01 -/* Version number of the device: Minor number first, then major number. - */ -#define USB_CFG_VENDOR_NAME 't', '.', 'm', '.', 'k', '.' -#define USB_CFG_VENDOR_NAME_LEN 6 -/* These two values define the vendor name returned by the USB device. The name - * must be given as a list of characters under single quotes. The characters - * are interpreted as Unicode (UTF-16) entities. - * If you don't want a vendor name string, undefine these macros. - * ALWAYS define a vendor name containing your Internet domain name if you use - * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for - * details. - */ -#define USB_CFG_DEVICE_NAME 'P', 'S', '/', '2', ' ', 'k', 'e', 'y', 'b', 'o', 'a', 'r', 'd', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 't', 'e', 'r' -#define USB_CFG_DEVICE_NAME_LEN 23 -/* Same as above for the device name. If you don't want a device name, undefine - * the macros. See the file USB-IDs-for-free.txt before you assign a name if - * you use a shared VID/PID. - */ -/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */ -/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */ -/* Same as above for the serial number. If you don't want a serial number, - * undefine the macros. - * It may be useful to provide the serial number through other means than at - * compile time. See the section about descriptor properties below for how - * to fine tune control over USB descriptors such as the string descriptor - * for the serial number. - */ -#define USB_CFG_DEVICE_CLASS 0 -#define USB_CFG_DEVICE_SUBCLASS 0 -/* See USB specification if you want to conform to an existing device class. - * Class 0xff is "vendor specific". - */ -#define USB_CFG_INTERFACE_CLASS 3 /* HID */ -#define USB_CFG_INTERFACE_SUBCLASS 1 /* Boot */ -#define USB_CFG_INTERFACE_PROTOCOL 1 /* Keyboard */ -/* See USB specification if you want to conform to an existing device class or - * protocol. The following classes must be set at interface level: - * HID class is 3, no subclass and protocol required (but may be useful!) - * CDC class is 2, use subclass 2 and protocol 1 for ACM - */ -#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0 -/* Define this to the length of the HID report descriptor, if you implement - * an HID device. Otherwise don't define it or define it to 0. - * If you use this define, you must add a PROGMEM character array named - * "usbHidReportDescriptor" to your code which contains the report descriptor. - * Don't forget to keep the array and this define in sync! - */ - -/* #define USB_PUBLIC static */ -/* Use the define above if you #include usbdrv.c instead of linking against it. - * This technique saves a couple of bytes in flash memory. - */ - -/* ------------------- Fine Control over USB Descriptors ------------------- */ -/* If you don't want to use the driver's default USB descriptors, you can - * provide our own. These can be provided as (1) fixed length static data in - * flash memory, (2) fixed length static data in RAM or (3) dynamically at - * runtime in the function usbFunctionDescriptor(). See usbdrv.h for more - * information about this function. - * Descriptor handling is configured through the descriptor's properties. If - * no properties are defined or if they are 0, the default descriptor is used. - * Possible properties are: - * + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched - * at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is - * used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if - * you want RAM pointers. - * + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found - * in static memory is in RAM, not in flash memory. - * + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash), - * the driver must know the descriptor's length. The descriptor itself is - * found at the address of a well known identifier (see below). - * List of static descriptor names (must be declared PROGMEM if in flash): - * char usbDescriptorDevice[]; - * char usbDescriptorConfiguration[]; - * char usbDescriptorHidReport[]; - * char usbDescriptorString0[]; - * int usbDescriptorStringVendor[]; - * int usbDescriptorStringDevice[]; - * int usbDescriptorStringSerialNumber[]; - * Other descriptors can't be provided statically, they must be provided - * dynamically at runtime. - * - * Descriptor properties are or-ed or added together, e.g.: - * #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18)) - * - * The following descriptors are defined: - * USB_CFG_DESCR_PROPS_DEVICE - * USB_CFG_DESCR_PROPS_CONFIGURATION - * USB_CFG_DESCR_PROPS_STRINGS - * USB_CFG_DESCR_PROPS_STRING_0 - * USB_CFG_DESCR_PROPS_STRING_VENDOR - * USB_CFG_DESCR_PROPS_STRING_PRODUCT - * USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER - * USB_CFG_DESCR_PROPS_HID - * USB_CFG_DESCR_PROPS_HID_REPORT - * USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver) - * - * Note about string descriptors: String descriptors are not just strings, they - * are Unicode strings prefixed with a 2 byte header. Example: - * int serialNumberDescriptor[] = { - * USB_STRING_DESCRIPTOR_HEADER(6), - * 'S', 'e', 'r', 'i', 'a', 'l' - * }; - */ - -#define USB_CFG_DESCR_PROPS_DEVICE 0 -#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC -//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0 -#define USB_CFG_DESCR_PROPS_STRINGS 0 -#define USB_CFG_DESCR_PROPS_STRING_0 0 -#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0 -#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0 -#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0 -//#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC -#define USB_CFG_DESCR_PROPS_HID 0 -#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC -//#define USB_CFG_DESCR_PROPS_HID_REPORT 0 -#define USB_CFG_DESCR_PROPS_UNKNOWN 0 - -/* ----------------------- Optional MCU Description ------------------------ */ - -/* The following configurations have working defaults in usbdrv.h. You - * usually don't need to set them explicitly. Only if you want to run - * the driver on a device which is not yet supported or with a compiler - * which is not fully supported (such as IAR C) or if you use a differnt - * interrupt than INT0, you may have to define some of these. - */ -/* #define USB_INTR_CFG MCUCR */ -/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */ -/* #define USB_INTR_CFG_CLR 0 */ -/* #define USB_INTR_ENABLE GIMSK */ -/* #define USB_INTR_ENABLE_BIT INT0 */ -/* #define USB_INTR_PENDING GIFR */ -/* #define USB_INTR_PENDING_BIT INTF0 */ -/* #define USB_INTR_VECTOR INT0_vect */ - -#endif /* __usbconfig_h_included__ */ diff --git a/keyboard/phantom/Makefile.lufa b/keyboard/phantom/Makefile.lufa deleted file mode 100644 index a0b3b1444d..0000000000 --- a/keyboard/phantom/Makefile.lufa +++ /dev/null @@ -1,137 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = phantom_lufa - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - - -# Boot Section Size in bytes -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=512 - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -ansi: OPT_DEFS += -DLAYOUT_ANSI -ansi: all - -ansi_150: OPT_DEFS += -DLAYOUT_ANSI_150 -ansi_150: all - -iso: OPT_DEFS += -DLAYOUT_ISO -iso: all - -iso_150: OPT_DEFS += -DLAYOUT_ISO_150 -iso_150: all - -7bit: OPT_DEFS += -DLAYOUT_7BIT -7bit: all diff --git a/keyboard/phantom/Makefile.pjrc b/keyboard/phantom/Makefile.pjrc deleted file mode 100644 index 7bf5f80f40..0000000000 --- a/keyboard/phantom/Makefile.pjrc +++ /dev/null @@ -1,108 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = phantom_pjrc - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = keymap.c \ - matrix.c \ - led.c - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -#MCU = at90usb162 # Teensy 1.0 -MCU = atmega32u4 # Teensy 2.0 -#MCU = at90usb646 # Teensy++ 1.0 -#MCU = at90usb1286 # Teensy++ 2.0 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -#MOUSEKEY_ENABLE = yes # Mouse keys(+5000) -EXTRAKEY_ENABLE = yes # Audio control and System control(+600) -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover(+500) -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include $(TMK_DIR)/protocol/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -ansi: OPT_DEFS += -DLAYOUT_ANSI -ansi: all - -ansi_150: OPT_DEFS += -DLAYOUT_ANSI_150 -ansi_150: all - -iso: OPT_DEFS += -DLAYOUT_ISO -iso: all - -iso_150: OPT_DEFS += -DLAYOUT_ISO_150 -iso_150: all - -7bit: OPT_DEFS += -DLAYOUT_7BIT -7bit: all diff --git a/keyboard/phantom/README.md b/keyboard/phantom/README.md deleted file mode 100644 index 368ae97e85..0000000000 --- a/keyboard/phantom/README.md +++ /dev/null @@ -1,248 +0,0 @@ -Phantom keyboard firmware -====================== -DIY keyboard developed by Geekhack and Deskthority communities. -The PCB was engineered by bpiphany from the original idea of HaveANiceDay. - -## Wiki on Deskthority.net -- [Info](http://deskthority.net/wiki/Phantom) -- [Assembly Instructions](http://deskthority.net/wiki/Phantom) - - -Build ------ -Move to this directory then just run `make` like: - - $ make -f Makefile.[pjrc|lufa] [ansi|ansi_150|iso|iso_150|7bit] - -Use `Makefile.pjrc` if you want to use PJRC stack or use `Makefile.lufa` for LUFA stack. - - -LEDs ----- -It is possible to configure the LEDs in 2 different ways. - -### 1. LED Brightness -The brightness of the LEDs can be controlled by software. - -To select brightness edit [config.h](config.h) and set `LED_BRIGHTNESS` to a value -between 0 and 255: - - #define LED_BRIGHTNESS 250 - - -### 2. Sleep LED -It is possible to have the LEDs fade in and out when the computer is suspended. - -To enable this feature, uncomment the `SLEEP_LED_ENABLE` line in the makefile you are using: - - SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend - -*Note that this will set the LEDs to full brightness as this feature can't be combined with the brightness control.* - - -Keymap ------- -The PCB supports multiple physical layouts. -Each layout have their own keymap file. - -*Note that only the ANSI keymap is tested on actual hardware.* - -To customize a keymap: - -1. Edit the file that corresponds to your layout. -2. Specify your layout when building. - -See [keymap.c](keymap.c) to define your own custom layout. - - -### 1. ANSI -This is the default keymap. - -See [keymap_ansi.h](keymap_ansi.h) for detail. - -#### 1.0. ANSI Default Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - |-----------------------------------------------------------| '-----------' - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return | - |-----------------------------------------------------------| ,---. - |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - |-----------------------------------------------------------| ,-----------. - |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 1.1. ANSI Media Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - | | | | | | | | | | | | | | | | | | | |Slp| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt|Media| | | | | - |-----------------------------------------------------------| '-----------' - | | | | | | | | | | | | | | - |-----------------------------------------------------------| ,---. - | | | |Clc| | | | | | | |Caps | | | - |-----------------------------------------------------------| ,-----------. - | | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' - - -### 2. ANSI 150 -Layout with 1.5 unit modifiers. - -See [keymap_ansi_150.h](keymap_ansi_150.h) for detail. - -#### 2.0. ANSI 150 Default Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - |-----------------------------------------------------------| '-----------' - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return | - |-----------------------------------------------------------| ,---. - |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - |-----------------------------------------------------------| ,-----------. - |Ctl |Gui|Alt | Space |Alt |Gui|Ctl | |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 2.1. ANSI 150 Media Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - | | | | | | | | | | | | | | | | | | | |Slp| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt|Media| | | | | - |-----------------------------------------------------------| '-----------' - | | | | | | | | | | | | | | - |-----------------------------------------------------------| ,---. - | | | |Clc| | | | | | | |Caps | | | - |-----------------------------------------------------------| ,-----------. - | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' - - -### 3. ISO -ISO layout. - -See [keymap_iso.h](keymap_iso.h) for detail. - -#### 3.0. ISO Default Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | |Del|End|PgD| - |------------------------------------------------------` Ret| '-----------' - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '| #| | - |-----------------------------------------------------------| ,---. - |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - |-----------------------------------------------------------| ,-----------. - |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 3.1. ISO Media Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - | | | | | | | | | | | | | | | | | | | |Slp| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt| | | | | | - |------------------------------------------------------` Med| '-----------' - | | | | | | | | | | | | | | | - |-----------------------------------------------------------| ,---. - | | | | |Clc| | | | | | | |Caps | | | - |-----------------------------------------------------------| ,-----------. - | | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' - - -### 4. ISO 150 -ISO layout with 1.5 unit modifiers. - -See [keymap_iso_150.h](keymap_iso_150.h) for detail. - -#### 4.0. ISO 150 Default Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | |Del|End|PgD| - |------------------------------------------------------` Ret| '-----------' - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '| #| | - |-----------------------------------------------------------| ,---. - |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - |-----------------------------------------------------------| ,-----------. - |Ctl |Gui|Alt | Space |Alt |Gui|Ctl | |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 4.1. ISO 150 Media Layer - ,---. ,---------------. ,---------------. ,---------------. ,-----------. - | | | | | | | | | | | | | | | | | | | |Slp| - `---' `---------------' `---------------' `---------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt| | | | | | - |------------------------------------------------------` Med| '-----------' - | | | | | | | | | | | | | | | - |-----------------------------------------------------------| ,---. - | | | | |Clc| | | | | | | |Caps | | | - |-----------------------------------------------------------| ,-----------. - | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' - - -### 5. 7bit -Layout using all the available keys on the PCB. - -This keymap is only provided as an example of what can be done using this layout. -No real thought has been put into this keymap. - -See [keymap_7bit.h](keymap_7bit.h) for detail. - -#### 5.0. 7bit Default Layer - ,-----------------------------------------------------------. ,-----------. - |Esc|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|V- |V+ | |PrS|ScL|Pau| - `-----------------------------------------------------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| (| )| |Ins|Hom|PgU| - |-----------------------------------------------------------| |-----------| - |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs| |Del|End|PgD| - |-----------------------------------------------------------| |-----------| - |Fn0 | A| S| D| F| G| H| J| K| L| ;| '| \| Ret| |Stp|Ply|Med| - |-----------------------------------------------------------| |-----------| - |Cap|Shif| Z| X| C| V| B| N| M| ,| .| /|Shift |Cap| |Prv|Up |Nxt| - |-----------------------------------------------------------| |-----------| - |Ctrl |Gui|Alt |Spc |Bspc |Del|Ret |Alt |Gui |App|Ctrl | |Lef|Dow|Rig| - `-----------------------------------------------------------' `-----------' - -#### 5.1. 7bit Media Layer - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | | | | | | | | | |Slp| - `-----------------------------------------------------------' `-----------' - ,-----------------------------------------------------------. ,-----------. - | | | | | | | | | | |Mut|V- |V+ | | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | |Stp|Ply|Prv|Nxt|Media| | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | | | | | | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | | | | | | | | | | | - |-----------------------------------------------------------| |-----------| - | | | | | | | | | | | | | | | | - `-----------------------------------------------------------' `-----------' diff --git a/keyboard/phantom/config.h b/keyboard/phantom/config.h deleted file mode 100644 index 6f5389336e..0000000000 --- a/keyboard/phantom/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6057 -#define DEVICE_VER 0x0001 -#define MANUFACTURER t.m.k. -#define PRODUCT Phantom - -/* message strings */ -#define DESCRIPTION t.m.k. keyboard firmware for Phantom - -/* matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if need no debouncing */ -#define DEBOUNCE 7 - -/* Set LED brightness 0-255. - * This have no effect if sleep LED is enabled. */ -#define LED_BRIGHTNESS 250 - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -#endif diff --git a/keyboard/phantom/keymap.c b/keyboard/phantom/keymap.c deleted file mode 100644 index a040434f24..0000000000 --- a/keyboard/phantom/keymap.c +++ /dev/null @@ -1,151 +0,0 @@ -/* -Copyright 2011 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * Keymap for Phantom controller - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "debug.h" -#include "keymap.h" - -// Convert physical keyboard layout to matrix array. -// This is a macro to define keymap easily in keyboard layout form. -#define KEYMAP( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2P, K2Q, K2R, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0F, K0G, K0H, K0K, K0L, K0M, K0N, K0P, K0Q, K0R \ -) { \ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ \ -/* 5 */ { KC_##K5A, KC_##K4A, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F, KC_##K5H, KC_##K5I, KC_##K5J, KC_##K5K, KC_##K5L, KC_##K5M, KC_##K5N, KC_##K5O, KC_##K5P, KC_##K5Q, KC_##K5R}, \ -/* 4 */ { KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F, KC_##K4G, KC_##K4H, KC_##K4I, KC_##K4J, KC_##K4K, KC_##K4L, KC_##K4M, KC_##K4N, KC_##K4O, KC_##K4P, KC_##K4Q, KC_##K4R}, \ -/* 3 */ { KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F, KC_##K3G, KC_##K3H, KC_##K3I, KC_##K3J, KC_##K3K, KC_##K3L, KC_##K3M, KC_##K3N, KC_##K3P, KC_##K3Q, KC_##K3R}, \ -/* 2 */ { KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F, KC_##K2G, KC_##K2H, KC_##K2I, KC_##K2J, KC_##K2K, KC_##K2L, KC_##K2M, KC_##K2N, KC_##K2P, KC_##K2Q, KC_##K2R}, \ -/* 1 */ { KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F, KC_##K1G, KC_##K1H, KC_##K1I, KC_##K1J, KC_##K1K, KC_##K1L, KC_##K1M, KC_##K1N, KC_##K1P, KC_##K1Q, KC_##K1R}, \ -/* 0 */ { KC_##K0A, KC_##K0B, KC_##K0C, KC_##K5B, KC_##K0D, KC_##K0F, KC_##K5G, KC_##K0G, KC_##K0H, KC_NO, KC_##K0K, KC_##K0L, KC_##K0M, KC_##K0N, KC_##K0P, KC_##K0Q, KC_##K0R} \ -} - -#define KEYMAP_ANSI( \ - K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2N, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1Q, \ - K0A, K0B, K0C, K0G, K0K, K0L, K0M, K0N, K0P, K0Q, K0R \ -) KEYMAP( \ - K5A, NO, K5C, K5D, K5E, K5F, NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, NO, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, NO, K2N, NO, NO, NO, \ - K1A, NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, NO, K1N, NO, K1Q, NO, \ - K0A, K0B, K0C, NO, NO, K0G, NO, K0K, K0L, K0M, K0N, K0P, K0Q, K0R \ -) - -#define KEYMAP_ANSI_150( \ - K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2N, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1Q, \ - K0A, K0B, K0C, K0G, K0L, K0M, K0N, K0P, K0Q, K0R \ -) KEYMAP( \ - K5A, NO, K5C, K5D, K5E, K5F, NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, NO, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, NO, K2N, NO, NO, NO, \ - K1A, NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, NO, K1N, NO, K1Q, NO, \ - K0A, K0B, K0C, NO, NO, K0G, NO, NO, K0L, K0M, K0N, K0P, K0Q, K0R \ -) - -#define KEYMAP_ISO( \ - K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1Q, \ - K0A, K0B, K0C, K0G, K0K, K0L, K0M, K0N, K0P, K0Q, K0R \ -) KEYMAP( \ - K5A, NO, K5C, K5D, K5E, K5F, NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, NO, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, NO, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, NO, NO, NO, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, NO, K1N, NO, K1Q, NO, \ - K0A, K0B, K0C, NO, NO, K0G, NO, K0K, K0L, K0M, K0N, K0P, K0Q, K0R \ -) - -#define KEYMAP_ISO_150( \ - K5A, K5C, K5D, K5E, K5F, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1N, K1Q, \ - K0A, K0B, K0C, K0G, K0L, K0M, K0N, K0P, K0Q, K0R \ -) KEYMAP( \ - K5A, NO, K5C, K5D, K5E, K5F, NO, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, NO, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, NO, K3P, K3Q, K3R, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, NO, NO, NO, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, NO, K1N, NO, K1Q, NO, \ - K0A, K0B, K0C, NO, NO, K0G, NO, NO, K0L, K0M, K0N, K0P, K0Q, K0R \ -) - -#if defined(LAYOUT_7BIT) - #include "keymap_7bit.h" -#elif defined(LAYOUT_ISO_150) - #include "keymap_iso_150.h" -#elif defined(LAYOUT_ISO) - #include "keymap_iso.h" -#elif defined(LAYOUT_ANSI_150) - #include "keymap_ansi_150.h" -#else - #include "keymap_ansi.h" -#endif - -#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - action_t action; - if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { - action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); - } else { - action.code = ACTION_NO; - } - return action; -} diff --git a/keyboard/phantom/keymap_7bit.h b/keyboard/phantom/keymap_7bit.h deleted file mode 100644 index e6c4eabb22..0000000000 --- a/keyboard/phantom/keymap_7bit.h +++ /dev/null @@ -1,42 +0,0 @@ -// Phantom 7bit -/* - * 7bit: - * - * ,-----------------------------------------------------------. ,-----------. - * |Esc|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|V- |V+ | |PrS|ScL|Pau| - * `-----------------------------------------------------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| (| )| |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs| |Del|End|PgD| - * |-----------------------------------------------------------| |-----------| - * |Fn0 | A| S| D| F| G| H| J| K| L| ;| '| \| Ret| |MSt|Ply|Med| - * |-----------------------------------------------------------| |-----------| - * |Cap|Shif| Z| X| C| V| B| N| M| ,| .| /|Shift |Cap| |Prv|Up |Nxt| - * |-----------------------------------------------------------| |-----------| - * |Ctrl |Gui|Alt |Spc |Bspc |Del|Ret |Alt |Gui |App|Ctrl | |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty + a few media keys */ - KEYMAP(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, VOLD,VOLU, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, FN1, FN2, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT,BSLS,ENT, MSTP,MPLY,MSEL, \ - CAPS,LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,CAPS, MPRV,UP, MNXT, \ - LCTL,LGUI,LALT,SPC, BSPC,DEL, ENT, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP(\ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), - [1] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [2] = ACTION_MODS_KEY(MOD_LSFT, KC_0) -}; diff --git a/keyboard/phantom/keymap_ansi.h b/keyboard/phantom/keymap_ansi.h deleted file mode 100644 index 96a4c9dfb3..0000000000 --- a/keyboard/phantom/keymap_ansi.h +++ /dev/null @@ -1,22 +0,0 @@ -// Phantom ANSI -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP_ANSI(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP_ANSI(\ - TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1) -}; diff --git a/keyboard/phantom/keymap_ansi_150.h b/keyboard/phantom/keymap_ansi_150.h deleted file mode 100644 index 7fdb9eb19a..0000000000 --- a/keyboard/phantom/keymap_ansi_150.h +++ /dev/null @@ -1,22 +0,0 @@ -// Phantom ANSI 150 -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP_ANSI_150(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, \ - LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI,RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP_ANSI_150(\ - TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU,TRNS, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ - TRNS, TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1) -}; diff --git a/keyboard/phantom/keymap_iso.h b/keyboard/phantom/keymap_iso.h deleted file mode 100644 index 970f622eee..0000000000 --- a/keyboard/phantom/keymap_iso.h +++ /dev/null @@ -1,22 +0,0 @@ -// Phantom ISO -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP_ISO(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT,NUHS,ENT, \ - LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP_ISO(\ - TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1) -}; diff --git a/keyboard/phantom/keymap_iso_150.h b/keyboard/phantom/keymap_iso_150.h deleted file mode 100644 index ab9acda1c0..0000000000 --- a/keyboard/phantom/keymap_iso_150.h +++ /dev/null @@ -1,22 +0,0 @@ -// Phantom ISO 150 -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: qwerty */ - KEYMAP_ISO_150(\ - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, \ - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, DEL, END, PGDN, \ - FN0, A, S, D, F, G, H, J, K, L, SCLN,QUOT,NUHS,ENT, \ - LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, \ - LCTL,LGUI,LALT, SPC, RALT,RGUI,RCTL, LEFT,DOWN,RGHT), - /* 1: media keys */ - KEYMAP_ISO_150(\ - TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,SLEP, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MUTE,VOLD,VOLU, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,MSTP,MPLY,MPRV,MNXT,MSEL, TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,CALC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, CAPS, TRNS, \ - TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS) -}; -static const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1) -}; diff --git a/keyboard/phantom/led.c b/keyboard/phantom/led.c deleted file mode 100644 index 41582b6aaf..0000000000 --- a/keyboard/phantom/led.c +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "led.h" - - -void led_set(uint8_t usb_led) -{ - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - { - // Output high. - DDRB |= (1<<6); - PORTB |= (1<<6); - } - else - { - // Output low. - DDRB &= ~(1<<6); - PORTB &= ~(1<<6); - } - - if (usb_led & (1<<USB_LED_SCROLL_LOCK)) - { - // Output high. - DDRB |= (1<<7); - PORTB |= (1<<7); - } - else - { - // Output low. - DDRB &= ~(1<<7); - PORTB &= ~(1<<7); - } -} diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c deleted file mode 100644 index 6c3ae49c3a..0000000000 --- a/keyboard/phantom/matrix.c +++ /dev/null @@ -1,274 +0,0 @@ -/* Copyright 2012 Jun Wako <wakojun@gmail.com> - * - * This is heavily based on phantom/board.{c|h}. - * https://github.com/BathroomEpiphanies/AVR-Keyboard - * - * Copyright (c) 2012 Fredrik Atmer, Bathroom Epiphanies Inc - * http://bathroomepiphanies.com - * - * As for liscensing consult with the original files or its author. - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 0 -#endif -static uint8_t debouncing = DEBOUNCE; - -// bit array of key state(1:on, 0:off) -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static uint8_t read_rows(void); -static void init_rows(void); -static void unselect_cols(void); -static void select_col(uint8_t col); - -#ifndef SLEEP_LED_ENABLE -/* LEDs are on output compare pins OC1B OC1C - This activates fast PWM mode on them. - Prescaler 256 and 8-bit counter results in - 16000000/256/256 = 244 Hz blink frequency. - LED_A: Caps Lock - LED_B: Scroll Lock */ -/* Output on PWM pins are turned off when the timer - reaches the value in the output compare register, - and are turned on when it reaches TOP (=256). */ -static -void setup_leds(void) -{ - TCCR1A |= // Timer control register 1A - (1<<WGM10) | // Fast PWM 8-bit - (1<<COM1B1)| // Clear OC1B on match, set at TOP - (1<<COM1C1); // Clear OC1C on match, set at TOP - TCCR1B |= // Timer control register 1B - (1<<WGM12) | // Fast PWM 8-bit - (1<<CS12); // Prescaler 256 - OCR1B = LED_BRIGHTNESS; // Output compare register 1B - OCR1C = LED_BRIGHTNESS; // Output compare register 1C - // LEDs: LED_A -> PORTB6, LED_B -> PORTB7 - DDRB |= (1<<6) | (1<<7); - PORTB &= ~((1<<6) | (1<<7)); -} -#endif - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // To use PORTF disable JTAG with writing JTD bit twice within four cycles. - MCUCR |= (1<<JTD); - MCUCR |= (1<<JTD); - - // initialize row and col - unselect_cols(); - init_rows(); -#ifndef SLEEP_LED_ENABLE - setup_leds(); -#endif - - // initialize matrix state: all keys off - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t col = 0; col < MATRIX_COLS; col++) { // 0-16 - select_col(col); - _delay_us(3); // without this wait it won't read stable value. - uint8_t rows = read_rows(); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { // 0-5 - bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col); - bool curr_bit = rows & (1<<row); - if (prev_bit != curr_bit) { - matrix_debouncing[row] ^= ((matrix_row_t)1<<col); - if (debouncing) { - dprint("bounce!: "); dprintf("%02X", debouncing); dprintln(); - } - debouncing = DEBOUNCE; - } - } - unselect_cols(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row))); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop32(matrix[i]); - } - return count; -} - -/* Row pin configuration - * row: 0 1 2 3 4 5 - * pin: B5 B4 B3 B2 B1 B0 - */ -static void init_rows(void) -{ - // Input with pull-up(DDR:0, PORT:1) - DDRB &= ~0b00111111; - PORTB |= 0b00111111; -} - -static uint8_t read_rows(void) -{ - return (PINB&(1<<5) ? 0 : (1<<0)) | - (PINB&(1<<4) ? 0 : (1<<1)) | - (PINB&(1<<3) ? 0 : (1<<2)) | - (PINB&(1<<2) ? 0 : (1<<3)) | - (PINB&(1<<1) ? 0 : (1<<4)) | - (PINB&(1<<0) ? 0 : (1<<5)); -} - -/* Column pin configuration - * col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 - * pin: D5 C7 C6 D4 D0 E6 F0 F1 F4 F5 F6 F7 D7 D6 D1 D2 D3 - */ -static void unselect_cols(void) -{ - // Hi-Z(DDR:0, PORT:0) to unselect - DDRC |= 0b11000000; // PC: 7 6 - PORTC |= 0b11000000; - DDRD |= 0b11111111; // PD: 7 6 5 4 3 2 1 0 - PORTD |= 0b11111111; - DDRE |= 0b01000000; // PE: 6 - PORTE |= 0b01000000; - DDRF |= 0b11110011; // PF: 7 6 5 4 1 0 - PORTF |= 0b11110011; -} - -static void select_col(uint8_t col) -{ - // Output low(DDR:1, PORT:0) to select - switch (col) { - case 0: - DDRD |= (1<<5); - PORTD &= ~(1<<5); - break; - case 1: - DDRC |= (1<<7); - PORTC &= ~(1<<7); - break; - case 2: - DDRC |= (1<<6); - PORTC &= ~(1<<6); - break; - case 3: - DDRD |= (1<<4); - PORTD &= ~(1<<4); - break; - case 4: - DDRD |= (1<<0); - PORTD &= ~(1<<0); - break; - case 5: - DDRE |= (1<<6); - PORTE &= ~(1<<6); - break; - case 6: - DDRF |= (1<<0); - PORTF &= ~(1<<0); - break; - case 7: - DDRF |= (1<<1); - PORTF &= ~(1<<1); - break; - case 8: - DDRF |= (1<<4); - PORTF &= ~(1<<4); - break; - case 9: - DDRF |= (1<<5); - PORTF &= ~(1<<5); - break; - case 10: - DDRF |= (1<<6); - PORTF &= ~(1<<6); - break; - case 11: - DDRF |= (1<<7); - PORTF &= ~(1<<7); - break; - case 12: - DDRD |= (1<<7); - PORTD &= ~(1<<7); - break; - case 13: - DDRD |= (1<<6); - PORTD &= ~(1<<6); - break; - case 14: - DDRD |= (1<<1); - PORTD &= ~(1<<1); - break; - case 15: - DDRD |= (1<<2); - PORTD &= ~(1<<2); - break; - case 16: - DDRD |= (1<<3); - PORTD &= ~(1<<3); - break; - } -} diff --git a/keyboard/planck/.gitignore b/keyboard/planck/.gitignore new file mode 100644 index 0000000000..6e92f57d46 --- /dev/null +++ b/keyboard/planck/.gitignore @@ -0,0 +1 @@ +tags diff --git a/keyboard/planck/config.h b/keyboard/planck/config.h index 7d64f09773..b648931081 100644 --- a/keyboard/planck/config.h +++ b/keyboard/planck/config.h @@ -33,8 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COLS 12 /* Planck PCB default pin-out */ -#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } -#define ROWS (int []){ D0, D5, B5, B6 } +#define MATRIX_ROW_PINS { D0, D5, B5, B6 } +#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -46,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/planck/keymaps/alexey.c b/keyboard/planck/keymaps/alexey/alexey.c index 89af4112c6..89af4112c6 100644 --- a/keyboard/planck/keymaps/alexey.c +++ b/keyboard/planck/keymaps/alexey/alexey.c diff --git a/keyboard/planck/keymaps/angerthosenear.c b/keyboard/planck/keymaps/angerthosenear/angerthosenear.c index cdf60632e4..cdf60632e4 100644 --- a/keyboard/planck/keymaps/angerthosenear.c +++ b/keyboard/planck/keymaps/angerthosenear/angerthosenear.c diff --git a/keyboard/planck/keymaps/austin.c b/keyboard/planck/keymaps/austin/austin.c index 49fc98a587..49fc98a587 100644 --- a/keyboard/planck/keymaps/austin.c +++ b/keyboard/planck/keymaps/austin/austin.c diff --git a/keyboard/planck/keymaps/bone2planck.c b/keyboard/planck/keymaps/bone2planck/bone2planck.c index a99e7719f9..a99e7719f9 100644 --- a/keyboard/planck/keymaps/bone2planck.c +++ b/keyboard/planck/keymaps/bone2planck/bone2planck.c diff --git a/keyboard/planck/keymaps/brandon.c b/keyboard/planck/keymaps/brandon/brandon.c index 2b89f86db2..2b89f86db2 100644 --- a/keyboard/planck/keymaps/brandon.c +++ b/keyboard/planck/keymaps/brandon/brandon.c diff --git a/keyboard/planck/keymaps/charlie.c b/keyboard/planck/keymaps/charlie/charlie.c index 88f454d789..88f454d789 100644 --- a/keyboard/planck/keymaps/charlie.c +++ b/keyboard/planck/keymaps/charlie/charlie.c diff --git a/keyboard/planck/keymaps/daniel.c b/keyboard/planck/keymaps/daniel/daniel.c index 234e48ff4a..234e48ff4a 100644 --- a/keyboard/planck/keymaps/daniel.c +++ b/keyboard/planck/keymaps/daniel/daniel.c diff --git a/keyboard/planck/keymaps/david.c b/keyboard/planck/keymaps/david/david.c index f483084801..f483084801 100644 --- a/keyboard/planck/keymaps/david.c +++ b/keyboard/planck/keymaps/david/david.c diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c index ac4937b69e..3d62898171 100644 --- a/keyboard/planck/keymaps/default/keymap.c +++ b/keyboard/planck/keymaps/default/keymap.c @@ -19,8 +19,7 @@ extern keymap_config_t keymap_config; #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _MUSIC 5 -#define _PLOVER 6 +#define _PLOVER 5 #define _ADJUST 16 // Macro name shortcuts @@ -30,14 +29,9 @@ extern keymap_config_t keymap_config; #define LOWER M(_LOWER) #define RAISE M(_RAISE) #define M_BL 5 -#define AUD_OFF M(6) -#define AUD_ON M(7) -#define MUS_OFF M(8) -#define MUS_ON M(9) -#define VC_IN M(10) -#define VC_DE M(11) #define PLOVER M(12) #define EXT_PLV M(13) +#define TOG_OUT M(14) // Fillers to make layering more clear #define _______ KC_TRNS @@ -105,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' @@ -113,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = { {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, - {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, @@ -123,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' @@ -131,27 +125,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, - {_______, 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_NUHS, KC_NUBS, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, -/* Music (reserved for process_action_user) - * - */ -[_MUSIC] = { - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} -}, - /* Plover layer (http://opensteno.org) * ,-----------------------------------------------------------------------------------. * | # | # | # | # | # | # | # | # | # | # | # | # | * |------+------+------+------+------+-------------+------+------+------+------+------| * | | S | T | P | H | * | * | F | P | L | T | D | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | S | K | W | R | * | * | R | B | G | S | Z | + * |TogOut| S | K | W | R | * | * | R | B | G | S | Z | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Exit | | | A | O | | E | U | | | | * `-----------------------------------------------------------------------------------' @@ -160,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_PLOVER] = { {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, - {XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {TOG_OUT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, {EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX} }, @@ -177,8 +161,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = { {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, - {_______, VC_DE, VC_IN, MUS_ON, MUS_OFF, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} } @@ -190,22 +174,16 @@ const uint16_t PROGMEM fn_actions[] = { }; #ifdef AUDIO_ENABLE -float tone_startup[][2] = { - {440.0*pow(2.0,(31)/12.0), 12}, - {440.0*pow(2.0,(28)/12.0), 8}, - {440.0*pow(2.0,(19)/12.0), 8}, - {440.0*pow(2.0,(24)/12.0), 8}, - {440.0*pow(2.0,(28)/12.0), 20} -}; +float tone_startup[][2] = SONG(STARTUP_SOUND); float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); float tone_plover[][2] = SONG(PLOVER_SOUND); float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); -float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); -float goodbye[][2] = SONG(GOODBYE_SOUND); +float tone_goodbye[][2] = SONG(GOODBYE_SOUND); #endif @@ -269,53 +247,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) unregister_code(KC_RSFT); } break; - case 6: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_off(); - #endif - } - break; - case 7: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_on(); - PLAY_NOTE_ARRAY(tone_startup, false, 0); - #endif - } - break; - case 8: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - layer_off(_MUSIC); - stop_all_notes(); - #endif - } - break; - case 9: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(music_scale, false, 0); - layer_on(_MUSIC); - #endif - } - break; - case 10: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - voice_iterate(); - PLAY_NOTE_ARRAY(music_scale, false, 0); - #endif - } - break; - case 11: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - voice_deiterate(); - PLAY_NOTE_ARRAY(music_scale, false, 0); - #endif - } - break; case 12: if (record->event.pressed) { #ifdef AUDIO_ENABLE @@ -325,7 +256,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) layer_off(_RAISE); layer_off(_LOWER); layer_off(_ADJUST); - layer_off(_MUSIC); layer_on(_PLOVER); if (!eeconfig_is_enabled()) { eeconfig_init(); @@ -343,37 +273,44 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) layer_off(_PLOVER); } break; - + case 14: + if (record->event.pressed) { + return MACRO( D(E), D(R), D(F), D(V), D(O), D(L), U(E), U(R), U(F), U(V), U(O), U(L), END ); + } + break; } return MACRO_NONE; }; void matrix_init_user(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // stops the tick - PLAY_NOTE_ARRAY(tone_startup, false, 0); - #endif + #ifdef AUDIO_ENABLE + startup_user(); + #endif } #ifdef AUDIO_ENABLE -void play_goodbye_tone() + +void startup_user() { - PLAY_NOTE_ARRAY(goodbye, false, 0); - _delay_ms(150); + _delay_ms(20); // gets rid of tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); } -uint8_t starting_note = 0x0C; -int offset = 0; - -void process_action_user(keyrecord_t *record) { +void shutdown_user() +{ + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} - if (IS_LAYER_ON(_MUSIC)) { - if (record->event.pressed) { - play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); - } else { - stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); - } - } +void music_on_user(void) +{ + music_scale_user(); +} +void music_scale_user(void) +{ + PLAY_NOTE_ARRAY(music_scale, false, 0); } + #endif diff --git a/keyboard/planck/keymaps/dzobert.c b/keyboard/planck/keymaps/dzobert/dzobert.c index 665e9c20b6..665e9c20b6 100644 --- a/keyboard/planck/keymaps/dzobert.c +++ b/keyboard/planck/keymaps/dzobert/dzobert.c diff --git a/keyboard/planck/keymaps/experimental/README.md b/keyboard/planck/keymaps/experimental/README.md new file mode 100644 index 0000000000..de9680b498 --- /dev/null +++ b/keyboard/planck/keymaps/experimental/README.md @@ -0,0 +1,2 @@ +# The Default Planck Layout + diff --git a/keyboard/planck/keymaps/experimental/keymap.c b/keyboard/planck/keymaps/experimental/keymap.c new file mode 100644 index 0000000000..4b9c15e084 --- /dev/null +++ b/keyboard/planck/keymaps/experimental/keymap.c @@ -0,0 +1,333 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "planck.h" +#include "action_layer.h" +#ifdef AUDIO_ENABLE + #include "audio.h" +#endif + +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _PLOVER 5 +#define _ADJUST 16 + +// Macro name shortcuts +#define QWERTY M(_QWERTY) +#define COLEMAK M(_COLEMAK) +#define DVORAK M(_DVORAK) +#define LOWER M(_LOWER) +#define RAISE M(_RAISE) +#define M_BL 5 +#define PLOVER M(12) +#define EXT_PLV M(13) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = { + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = { + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, + {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | O | E | U | I | D | H | T | N | S | / | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = { + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, + {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = { + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, + {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = { + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUHS, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +/* Plover layer (http://opensteno.org) + * ,-----------------------------------------------------------------------------------. + * | # | # | # | # | # | # | # | # | # | # | # | # | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | S | T | P | H | * | * | F | P | L | T | D | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | S | K | W | R | * | * | R | B | G | S | Z | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Exit | | | A | O | | E | U | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_PLOVER] = { + {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, + {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, + {XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX} +}, + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|Musoff| | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = { + {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +} + + +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +#ifdef AUDIO_ENABLE +float tone_startup[][2] = { + {440.0*pow(2.0,(31)/12.0), 12}, + {440.0*pow(2.0,(28)/12.0), 8}, + {440.0*pow(2.0,(19)/12.0), 8}, + {440.0*pow(2.0,(24)/12.0), 8}, + {440.0*pow(2.0,(28)/12.0), 20} +}; + +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); +float tone_plover[][2] = SONG(PLOVER_SOUND); +float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); + +float goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistant_default_layer_set(1UL<<_QWERTY); + } + break; + case _COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistant_default_layer_set(1UL<<_COLEMAK); + } + break; + case _DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistant_default_layer_set(1UL<<_DVORAK); + } + break; + case _LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + #ifdef BACKLIGHT_ENABLE + breathing_speed_set(2); + breathing_pulse(); + #endif + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + break; + case _RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + #ifdef BACKLIGHT_ENABLE + breathing_speed_set(2); + breathing_pulse(); + #endif + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + break; + case M_BL: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + break; + case 12: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + stop_all_notes(); + PLAY_NOTE_ARRAY(tone_plover, false, 0); + #endif + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); + } + break; + case 13: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); + #endif + layer_off(_PLOVER); + } + break; + + } + return MACRO_NONE; +}; + +void matrix_init_user(void) { + #ifdef AUDIO_ENABLE + _delay_ms(20); // stops the tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); + #endif +} + +#ifdef AUDIO_ENABLE + void play_goodbye_tone(void) + { + PLAY_NOTE_ARRAY(goodbye, false, 0); + _delay_ms(150); + } +#endif + +LEADER_EXTERNS(); + +#define LEADER_TIMEOUT 300 + +void matrix_scan_user(void) { + LEADER_DICTIONARY() { + leading = false; + leader_end(); + + SEQ_ONE_KEY(KC_F) { + register_code(KC_S); + unregister_code(KC_S); + } + SEQ_TWO_KEYS(KC_A, KC_S) { + register_code(KC_H); + unregister_code(KC_H); + } + SEQ_THREE_KEYS(KC_A, KC_S, KC_D) { + register_code(KC_LGUI); + register_code(KC_S); + unregister_code(KC_S); + unregister_code(KC_LGUI); + } + } +} diff --git a/keyboard/planck/keymaps/experimental/makefile.mk b/keyboard/planck/keymaps/experimental/makefile.mk new file mode 100644 index 0000000000..6c1e05b65a --- /dev/null +++ b/keyboard/planck/keymaps/experimental/makefile.mk @@ -0,0 +1,5 @@ +AUDIO_ENABLE = yes +NKRO_ENABLE = yes +MIDI_ENABLE = yes +BACKLIGHT_ENABLE = no +COMMAND_ENABLE = no
\ No newline at end of file diff --git a/keyboard/planck/keymaps/gabriel.c b/keyboard/planck/keymaps/gabriel/gabriel.c index 805484488b..805484488b 100644 --- a/keyboard/planck/keymaps/gabriel.c +++ b/keyboard/planck/keymaps/gabriel/gabriel.c diff --git a/keyboard/planck/keymaps/jacob/Keyboard Layout.PNG b/keyboard/planck/keymaps/jacob/Keyboard Layout.PNG Binary files differnew file mode 100644 index 0000000000..40f0b89429 --- /dev/null +++ b/keyboard/planck/keymaps/jacob/Keyboard Layout.PNG diff --git a/keyboard/planck/keymaps/jacob/keymap.c b/keyboard/planck/keymaps/jacob/keymap.c new file mode 100644 index 0000000000..5e6e8498e2 --- /dev/null +++ b/keyboard/planck/keymaps/jacob/keymap.c @@ -0,0 +1,56 @@ +#include "planck.h" +#include "action_layer.h" +#ifdef BACKLIGHT_ENABLE + #include "backlight.h" +#endif + +//Simple Keymap where CTRL, WINKEY, and ALT keys are placed in a more familiar location for Windows users. +//Focus of this particular keymap is to enable easy transition from more traditional keyboards to OLKB Planck. + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +#define _QW 0 +#define _LW 1 +#define _RS 2 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QW] = { /* Qwerty */ + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MT(MOD_RSFT, KC_ENT)}, + {KC_LCTL, KC_LGUI, KC_LALT, M(0), MO(_LW), KC_SPC, KC_SPC, MO(_RS), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} + }, + [_RS] = { /* RAISE */ + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL }, + {KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 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} + }, + [_LW] = { /* LOWER */ + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL }, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, 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[] = { + +}; + +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) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; diff --git a/keyboard/planck/keymaps/jacob/readme.md b/keyboard/planck/keymaps/jacob/readme.md new file mode 100644 index 0000000000..2a4be4ebce --- /dev/null +++ b/keyboard/planck/keymaps/jacob/readme.md @@ -0,0 +1 @@ +Focus of this particular keymap is to enable easy transition from more traditional keyboards to OLKB Planck.
\ No newline at end of file diff --git a/keyboard/planck/keymaps/joe.c b/keyboard/planck/keymaps/joe/joe.c index 5b7bbe2bbb..5b7bbe2bbb 100644 --- a/keyboard/planck/keymaps/joe.c +++ b/keyboard/planck/keymaps/joe/joe.c diff --git a/keyboard/planck/keymaps/kyle.c b/keyboard/planck/keymaps/kyle/kyle.c index da32b74f96..da32b74f96 100644 --- a/keyboard/planck/keymaps/kyle.c +++ b/keyboard/planck/keymaps/kyle/kyle.c diff --git a/keyboard/planck/keymaps/leo.c b/keyboard/planck/keymaps/leo/leo.c index 6d66441822..6d66441822 100644 --- a/keyboard/planck/keymaps/leo.c +++ b/keyboard/planck/keymaps/leo/leo.c diff --git a/keyboard/planck/keymaps/lucas.c b/keyboard/planck/keymaps/lucas/lucas.c index 27672e1bbc..27672e1bbc 100644 --- a/keyboard/planck/keymaps/lucas.c +++ b/keyboard/planck/keymaps/lucas/lucas.c diff --git a/keyboard/planck/keymaps/lukas.c b/keyboard/planck/keymaps/lukas/lukas.c index 6fd95378b1..6fd95378b1 100644 --- a/keyboard/planck/keymaps/lukas.c +++ b/keyboard/planck/keymaps/lukas/lukas.c diff --git a/keyboard/planck/keymaps/max.c b/keyboard/planck/keymaps/max/max.c index 7fb29bc7a4..7fb29bc7a4 100644 --- a/keyboard/planck/keymaps/max.c +++ b/keyboard/planck/keymaps/max/max.c diff --git a/keyboard/planck/keymaps/mollat.c b/keyboard/planck/keymaps/mollat/mollat.c index e7c71efd47..e7c71efd47 100644 --- a/keyboard/planck/keymaps/mollat.c +++ b/keyboard/planck/keymaps/mollat/mollat.c diff --git a/keyboard/planck/keymaps/monkey.c b/keyboard/planck/keymaps/monkey/monkey.c index 21a2c146ab..21a2c146ab 100644 --- a/keyboard/planck/keymaps/monkey.c +++ b/keyboard/planck/keymaps/monkey/monkey.c diff --git a/keyboard/planck/keymaps/nico.c b/keyboard/planck/keymaps/nico/nico.c index e81fd80a44..e81fd80a44 100644 --- a/keyboard/planck/keymaps/nico.c +++ b/keyboard/planck/keymaps/nico/nico.c diff --git a/keyboard/planck/keymaps/numpad.c b/keyboard/planck/keymaps/numpad/numpad.c index 7de4372ab0..7de4372ab0 100644 --- a/keyboard/planck/keymaps/numpad.c +++ b/keyboard/planck/keymaps/numpad/numpad.c diff --git a/keyboard/planck/keymaps/pete/README.md b/keyboard/planck/keymaps/pete/README.md new file mode 100644 index 0000000000..3cf594f3a9 --- /dev/null +++ b/keyboard/planck/keymaps/pete/README.md @@ -0,0 +1,14 @@ +# Planck Layout by Pete + +This layout is based on the default layout but uses a FN key in the bottom left corner instead of the shift / backlight key. +On the FN layer you can do the following things + +- Step through back light +- Put a mac to sleep +- The Fxx keys in a block to click with the right hand +- The delete key in the upper right corner +- Quick access to screenshot functions +- Control volume and media playback +- Home/PgDown/PgUp/End buttons where the arrow keys are + +Pressing the lower and raise buttons allows to reset and change from QWERT to Colemak or Dvorak. diff --git a/keyboard/planck/keymaps/pete/keymap.c b/keyboard/planck/keymaps/pete/keymap.c new file mode 100644 index 0000000000..57cab65a31 --- /dev/null +++ b/keyboard/planck/keymaps/pete/keymap.c @@ -0,0 +1,223 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "planck.h" +#include "action_layer.h" +#ifdef AUDIO_ENABLE + #include "audio.h" +#endif +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _FCT 5 +#define _SETUP 6 +#define _MICMUTE 16 + +// Macro name shortcuts +#define QWERTY M(_QWERTY) +#define COLEMAK M(_COLEMAK) +#define DVORAK M(_DVORAK) +#define LOWER M(_LOWER) +#define RAISE M(_RAISE) +#define FCT M(_FCT) +#define MICMUTE M(_MICMUTE) + +#define MACPRNT LGUI(LSFT(KC_3)) +#define MACPRNT2 LGUI(LSFT(KC_4)) +#define CYCLWIN LGUI(KC_GRV) +#define MAC_SLEP LSFT(LCTL(KC_POWER)) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[_QWERTY] = { + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {FCT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +[_COLEMAK] = { + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, + {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {FCT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +[_DVORAK] = { + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, + {FCT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +[_LOWER] = { + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, + {_______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +[_RAISE] = { + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {_______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +[_FCT] = { /* Function */ + {BL_STEP, MAC_SLEP,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_DELT}, + {_______, MICMUTE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, MACPRNT}, + {_______, CYCLWIN, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, MACPRNT2}, + {FCT, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDOWN,KC_PGUP,KC_END } +}, + +[_SETUP] = { /* Setup */ + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, _______} +} +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +#ifdef AUDIO_ENABLE +float tone_startup[][2] = { + {440.0*pow(2.0,(31)/12.0), 12}, + {440.0*pow(2.0,(28)/12.0), 8}, + {440.0*pow(2.0,(19)/12.0), 8}, + {440.0*pow(2.0,(24)/12.0), 8}, + {440.0*pow(2.0,(28)/12.0), 20} +}; + +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); +float tone_plover[][2] = SONG(PLOVER_SOUND); +float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); + +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); +float goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistant_default_layer_set(1UL<<_QWERTY); + } + break; + case _COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistant_default_layer_set(1UL<<_COLEMAK); + } + break; + case _DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistant_default_layer_set(1UL<<_DVORAK); + } + break; + case _LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _SETUP); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _SETUP); + } + break; + case _RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _SETUP); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _SETUP); + } + break; + case _FCT: + if (record->event.pressed) { + layer_on(_FCT); + } else { + layer_off(_FCT); + } + break; + case _MICMUTE: + if (record->event.pressed) { + register_code(KC_RSFT); + register_code(KC_RCTL); + register_code(KC_RALT); + register_code(KC_RGUI); + } else { + unregister_code(KC_RSFT); + unregister_code(KC_RCTL); + unregister_code(KC_RALT); + unregister_code(KC_RGUI); + } + break; + + } + return MACRO_NONE; +}; + +void matrix_init_user(void) { + #ifdef AUDIO_ENABLE + _delay_ms(20); // stops the tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); + #endif +} + +#ifdef AUDIO_ENABLE +void play_goodbye_tone() +{ + PLAY_NOTE_ARRAY(goodbye, false, 0); + _delay_ms(150); +} + +uint8_t starting_note = 0x0C; +int offset = 0; + +void process_action_user(keyrecord_t *record) { + + if (IS_LAYER_ON(_MUSIC)) { + if (record->event.pressed) { + play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); + } else { + stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); + } + } + +} +#endif diff --git a/keyboard/planck/keymaps/pete/makefile.mk b/keyboard/planck/keymaps/pete/makefile.mk new file mode 100644 index 0000000000..812264cb35 --- /dev/null +++ b/keyboard/planck/keymaps/pete/makefile.mk @@ -0,0 +1,2 @@ +AUDIO_ENABLE = no +NKRO_ENABLE = yes
\ No newline at end of file diff --git a/keyboard/planck/keymaps/pvc/config.h b/keyboard/planck/keymaps/pvc/config.h index 7d64f09773..b648931081 100644 --- a/keyboard/planck/keymaps/pvc/config.h +++ b/keyboard/planck/keymaps/pvc/config.h @@ -33,8 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COLS 12 /* Planck PCB default pin-out */ -#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } -#define ROWS (int []){ D0, D5, B5, B6 } +#define MATRIX_ROW_PINS { D0, D5, B5, B6 } +#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -46,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/planck/keymaps/pvc/keymap.c b/keyboard/planck/keymaps/pvc/keymap.c index 27850b2154..2fc5f0da16 100644 --- a/keyboard/planck/keymaps/pvc/keymap.c +++ b/keyboard/planck/keymaps/pvc/keymap.c @@ -8,42 +8,44 @@ #include "song_list.h" #endif -#define LAYER_QWERTY 0 -#define LAYER_COLEMAK 1 -#define LAYER_DVORAK 2 -#define LAYER_LOWER 3 -#define LAYER_RAISE 4 -#define LAYER_FUNCTION 5 -#define LAYER_MOUSE 6 -#define LAYER_MUSIC 7 -#define LAYER_ADJUST 8 - -#define MACRO_QWERTY 0 -#define MACRO_COLEMAK 1 -#define MACRO_DVORAK 2 -#define MACRO_LOWER 3 -#define MACRO_RAISE 4 -#define MACRO_FUNCTION 5 -#define MACRO_MOUSE 6 -#define MACRO_TIMBRE_1 7 -#define MACRO_TIMBRE_2 8 -#define MACRO_TIMBRE_3 9 -#define MACRO_TIMBRE_4 10 -#define MACRO_TEMPO_U 11 -#define MACRO_TEMPO_D 12 -#define MACRO_TONE_DEFAULT 13 -#define MACRO_MUSIC_ON 14 -#define MACRO_MUSIC_OFF 15 -#define MACRO_AUDIO_ON 16 -#define MACRO_AUDIO_OFF 17 -#define MACRO_INC_VOICE 18 -#define MACRO_DEC_VOICE 19 +#define LAYER_QWERTY 0 +#define LAYER_COLEMAK 1 +#define LAYER_DVORAK 2 +#define LAYER_UPPER 3 +#define LAYER_LOWER 4 +#define LAYER_FUNCTION 5 +#define LAYER_MOUSE 6 +#define LAYER_ADJUST 7 + +#define MACRO_QWERTY 0 +#define MACRO_COLEMAK 1 +#define MACRO_DVORAK 2 +#define MACRO_UPPER 3 +#define MACRO_LOWER 4 +#define MACRO_FUNCTION 5 +#define MACRO_MOUSE 6 +#define MACRO_TIMBRE_1 7 +#define MACRO_TIMBRE_2 8 +#define MACRO_TIMBRE_3 9 +#define MACRO_TIMBRE_4 10 +#define MACRO_TEMPO_U 11 +#define MACRO_TEMPO_D 12 +#define MACRO_TONE_DEFAULT 13 +#define MACRO_MUSIC_TOGGLE 14 +#define MACRO_AUDIO_TOGGLE 16 +#define MACRO_INC_VOICE 18 +#define MACRO_DEC_VOICE 19 +#define MACRO_BACKLIGHT 20 +#define MACRO_BREATH_TOGGLE 21 +#define MACRO_BREATH_SPEED_INC 23 +#define MACRO_BREATH_SPEED_DEC 24 +#define MACRO_BREATH_DEFAULT 25 #define M_QWRTY M(MACRO_QWERTY) #define M_COLMK M(MACRO_COLEMAK) #define M_DVORK M(MACRO_DVORAK) +#define M_UPPER M(MACRO_UPPER) #define M_LOWER M(MACRO_LOWER) -#define M_RAISE M(MACRO_RAISE) #define M_FUNCT M(MACRO_FUNCTION) #define M_MOUSE M(MACRO_MOUSE) #define TIMBR_1 M(MACRO_TIMBRE_1) @@ -53,12 +55,13 @@ #define TMPO_UP M(MACRO_TEMPO_U) #define TMPO_DN M(MACRO_TEMPO_D) #define TMPO_DF M(MACRO_TONE_DEFAULT) +#define M_BACKL M(MACRO_BACKLIGHT) +#define M_BRTOG M(MACRO_BREATH_TOGGLE) +#define M_BSPDU M(MACRO_BREATH_SPEED_INC) +#define M_BSPDD M(MACRO_BREATH_SPEED_DEC) +#define M_BDFLT M(MACRO_BREATH_DEFAULT) -#define MUS_ON M(MACRO_MUSIC_ON) -#define MUS_OFF M(MACRO_MUSIC_OFF) -#define AUD_OFF M(MACRO_AUDIO_OFF) -#define AUD_ON M(MACRO_AUDIO_ON) #define VC_UP M(MACRO_INC_VOICE) #define VC_DOWN M(MACRO_DEC_VOICE) @@ -74,6 +77,7 @@ #define SC_ACLS LALT(KC_F4) #define SC_CCLS LCTL(KC_F4) +#define OS_SHFT KC_FN0 #define _______ KC_TRNS #define XXXXXXX KC_NO @@ -88,17 +92,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| * | ESC | A | S | D | F | G | H | J | K | L | ; | ' | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | ENTER | + * | LSHIFT | Z | X | C | V | B | N | M | , | . | UP | ENTER | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | + * | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | SHIFT | LEFT | DOWN | RIGHT | * '-----------------------------------------------------------------------------------------------------------' */ - [LAYER_QWERTY] = { /* QWERTY */ - { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC }, - { KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, - { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, + [LAYER_QWERTY] = { // QWERTY + { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC }, + { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT }, + { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT }, }, /* COLEMAK @@ -107,77 +111,77 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| * | BACKSP | A | R | S | T | D | H | N | E | I | O | ' | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | ENTER | + * | LSHIFT | Z | X | C | V | B | K | M | , | . | UP | ENTER | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | + * | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | SHIFT | LEFT | DOWN | RIGHT | * '-----------------------------------------------------------------------------------------------------------' */ - [LAYER_COLEMAK] = { /* COLEMAK */ + [LAYER_COLEMAK] = { // COLEMAK { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_ESC }, - { KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, - { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, + { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, + { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT }, + { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT }, }, /* DVORAK * .-----------------------------------------------------------------------------------------------------------. * | TAB | ' | , | . | P | Y | F | G | C | R | L | BACKSP | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | ESC | A | O | E | U | I | D | H | T | N | S | ' | + * | ESC | A | O | E | U | I | D | H | T | N | S | / | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | ENTER | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | + * | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | * '-----------------------------------------------------------------------------------------------------------' */ - [LAYER_DVORAK] = { /* DVORAK */ + [LAYER_DVORAK] = { // DVORAK { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC }, { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH }, { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, - { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, + { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, }, -/* Raise +/* UPPER * .-----------------------------------------------------------------------------------------------------------. - * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | DEL | + * | PRINT | F1 | F2 | F3 | F4 | NUM LK | / | 7 | 8 | 9 | - | DEL | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | XXXXXX | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | [ | ] | \ | + * | CAP LK | F5 | F6 | F7 | F8 | SCR LK | * | 4 | 5 | 6 | + | INS | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LSHIFT | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ENTER | - * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | BACKSP | BACKSP | LOWER | PG UP | PG DN | HOME | END | + * | | F9 | F10 | F11 | F12 | PAUSE | | 1 | 2 | 3 | ENTER | HOME | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | | | | | | 0 | 0 | | RALT | . | ENTER | END | * '-----------------------------------------------------------------------------------------------------------' */ - [LAYER_RAISE] = { /* RAISED */ - { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL }, - { XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS }, - { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END }, + [LAYER_UPPER] = { // UPPER + { KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, KC_DEL }, + { KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_SLCK, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_INS }, + { _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_HOME }, + { _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, KC_END }, }, - -/* LOWERED +/* LOWER * .-----------------------------------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | INS | + * | | $ | { | [ | ( | % | # | ) | ] | } | @ | PG UP | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | XXXXXX | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * | | ^ | * | + | - | ; | : | _ | ' | " | ` | PG DN | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LSHIFT | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ENTER | - * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | BACKSP | BACKSP | LOWER | PG UP | PG DN | HOME | END | + * | | | | & | ! | ~ | / | \ | = | < | > | ? | HOME | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | | | | | | | | | | | | END | * '-----------------------------------------------------------------------------------------------------------' */ - [LAYER_LOWER] = { /* LOWERED */ - { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_INS }, - { XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS }, - { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END }, + [LAYER_LOWER] = { // LOWER + { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, KC_PGUP }, + { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, KC_PGDN }, + { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, KC_HOME }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END }, }, + /* FUNCTION * .-----------------------------------------------------------------------------------------------------------. * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | PAUSE | @@ -186,10 +190,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| * | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MUTE | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | LCTRL | LWIN | FN | LALT | RAISE | PLAY | PLAY | LOWER | VOL UP | VOL DN | NEXT | PREV | + * | LCTRL | LWIN | FN | LALT | UPPER | PLAY | PLAY | LOWER | VOL UP | VOL DN | NEXT | PREV | * '-----------------------------------------------------------------------------------------------------------' */ - [LAYER_FUNCTION] = { /* FUNCTION */ + [LAYER_FUNCTION] = { // FUNCTION { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS }, { KC_CAPS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_PSCR }, { KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE }, @@ -198,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef MOUSEKEY_ENABLE - [LAYER_MOUSE] = { /* MOUSE */ + [LAYER_MOUSE] = { // MOUSE { KC_ESC, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC }, { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, { _______, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_D }, @@ -207,21 +211,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #endif - [LAYER_MUSIC] = { /* MUSIC */ - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_RAISE, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, - }, - - [LAYER_ADJUST] = { /* ADJUST */ - { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, MUS_ON, MUS_OFF, AUD_ON, AUD_OFF }, + [LAYER_ADJUST] = { // ADJUST + { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, _______, MU_TOG, AU_TOG }, { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______ }, - { _______, _______, _______, _______, _______, RESET, _______, M_MOUSE, _______, _______, _______, _______ }, - { _______, _______, _______, _______, _______, _______, _______, _______, VC_UP, VC_DOWN, _______, _______ }, + { _______, _______, _______, _______, M_BACKL, RESET, _______, M_MOUSE, _______, _______, MUV_IN, _______ }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MUV_DE, _______ }, }, - /* [LAYER_EMPTY] = { { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, @@ -261,6 +257,7 @@ void persistant_default_layer_set(uint16_t default_layer) } const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_MODS_ONESHOT(MOD_LSFT), }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -304,25 +301,25 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) if (record->event.pressed) { layer_on(LAYER_LOWER); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } else { layer_off(LAYER_LOWER); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } break; - case MACRO_RAISE: + case MACRO_UPPER: if (record->event.pressed) { - layer_on(LAYER_RAISE); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + layer_on(LAYER_UPPER); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } else { - layer_off(LAYER_RAISE); - update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); + layer_off(LAYER_UPPER); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); } break; @@ -337,6 +334,15 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } break; + +#ifdef BACKLIGHT_ENABLE + case MACRO_BACKLIGHT: + if (record->event.pressed) + { + backlight_step(); + } +#endif + #ifdef MOUSEKEY_ENABLE case MACRO_MOUSE: @@ -382,65 +388,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } break; - case MACRO_AUDIO_OFF: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - audio_off(); - #endif - } - break; - - case MACRO_AUDIO_ON: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - audio_on(); - PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); - #endif - } - break; - - case MACRO_MUSIC_ON: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); - layer_on(LAYER_MUSIC); - #endif - } - break; - - case MACRO_MUSIC_OFF: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - layer_off(LAYER_MUSIC); - stop_all_notes(); - #endif - } - break; - - case MACRO_INC_VOICE: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - voice_iterate(); - PLAY_NOTE_ARRAY(music_scale, false, STACCATO); - #endif - } - break; - - case MACRO_DEC_VOICE: - if (record->event.pressed) - { - #ifdef AUDIO_ENABLE - voice_deiterate(); - PLAY_NOTE_ARRAY(music_scale, false, STACCATO); - #endif - } - break; - #endif /* AUDIO_ENABLE */ default: @@ -453,31 +400,10 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) #ifdef AUDIO_ENABLE - -void process_action_user(keyrecord_t *record) -{ - - uint8_t starting_note = 0x0C; - int offset = 7; - - if (IS_LAYER_ON(LAYER_MUSIC)) - { - if (record->event.pressed) - { - play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); - } - else - { - stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); - } - } -} - - void matrix_init_user(void) { set_voice(default_voice); - play_startup_tone(); + startup_user(); println("Matrix Init"); } @@ -521,16 +447,32 @@ void led_set_user(uint8_t usb_led) } -void play_startup_tone() +void startup_user() { _delay_ms(10); // gets rid of tick PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); } -void play_goodbye_tone() +void shutdown_user() { PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); - _delay_ms(1000); + _delay_ms(2000); + stop_all_notes(); +} + +void audio_on_user(void) +{ + PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); +} + +void music_on_user(void) +{ + PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); +} + +void music_scale_user(void) +{ + PLAY_NOTE_ARRAY(music_scale, false, STACCATO); } #endif /* AUDIO_ENABLE */
\ No newline at end of file diff --git a/keyboard/planck/keymaps/pvc/makefile.mk b/keyboard/planck/keymaps/pvc/makefile.mk index 4b9e34c53f..f7798b09d5 100644 --- a/keyboard/planck/keymaps/pvc/makefile.mk +++ b/keyboard/planck/keymaps/pvc/makefile.mk @@ -1,11 +1,12 @@ BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) +CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 +AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. @@ -13,4 +14,4 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -CONFIG_H = keymaps/$(KEYMAP)/config.h +CONFIG_H = keymaps/$(KEYMAP)/config.h
\ No newline at end of file diff --git a/keyboard/planck/keymaps/tak3over.c b/keyboard/planck/keymaps/tak3over/tak3over.c index 7d8243dfac..7d8243dfac 100644 --- a/keyboard/planck/keymaps/tak3over.c +++ b/keyboard/planck/keymaps/tak3over/tak3over.c diff --git a/keyboard/planck/keymaps/unicode/keymap.c b/keyboard/planck/keymaps/unicode/keymap.c new file mode 100644 index 0000000000..d73e7e09d4 --- /dev/null +++ b/keyboard/planck/keymaps/unicode/keymap.c @@ -0,0 +1,326 @@ +/* + Copyright + 2015 Jack Humbert <jack.humb@gmail.com> + 2016 Francois Marlier <fmarlier@gmail.com> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + For more info on how this works per OS, see here + https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input +*/ + + +#include "planck.h" +#include "action_layer.h" +#ifdef AUDIO_ENABLE + #include "audio.h" +#endif +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _PLOVER 5 +#define _ADJUST 16 + +// Macro name shortcuts +#define QWERTY M(_QWERTY) +#define COLEMAK M(_COLEMAK) +#define DVORAK M(_DVORAK) +#define LOWER M(_LOWER) +#define RAISE M(_RAISE) +#define M_BL 5 +#define PLOVER M(12) +#define EXT_PLV M(13) +#define TOG_OUT M(14) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = { + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = { + {KC_TAB, UC_q, UC_w, UC_f, UC_p, UC_g, UC_j, UC_l, UC_u, UC_y, UC_SCLN, UC_BSPC}, + {KC_ESC, UC_a, UC_r, UC_s, UC_t, UC_d, UC_h, UC_n, UC_e, UC_i, UC_o, UC_QUOT}, + {KC_LSFT, UC_z, UC_x, UC_c, UC_v, UC_b, UC_k, UC_m, UC_COMM, UC_DOT, UC_SLSH, KC_ENT}, + {KC_TRNS, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | O | E | U | I | D | H | T | N | S | / | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = { + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, + {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = { + {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, + {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Next | Vol- | Vol+ | Play | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = { + {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, + {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} +}, + +/* Plover layer (http://opensteno.org) + * ,-----------------------------------------------------------------------------------. + * | # | # | # | # | # | # | # | # | # | # | # | # | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | S | T | P | H | * | * | F | P | L | T | D | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * |TogOut| S | K | W | R | * | * | R | B | G | S | Z | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Exit | | | A | O | | E | U | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_PLOVER] = { + {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, + {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, + {TOG_OUT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX} +}, + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|Musoff| | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = { + {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +} + + +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +#ifdef AUDIO_ENABLE +float tone_startup[][2] = { + {440.0*pow(2.0,(31)/12.0), 12}, + {440.0*pow(2.0,(28)/12.0), 8}, + {440.0*pow(2.0,(19)/12.0), 8}, + {440.0*pow(2.0,(24)/12.0), 8}, + {440.0*pow(2.0,(28)/12.0), 20} +}; + +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); +float tone_plover[][2] = SONG(PLOVER_SOUND); +float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); + +float goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistant_default_layer_set(1UL<<_QWERTY); + } + break; + case _COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistant_default_layer_set(1UL<<_COLEMAK); + } + break; + case _DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistant_default_layer_set(1UL<<_DVORAK); + } + break; + case _LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + break; + case _RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + break; + case M_BL: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + break; + case 12: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + stop_all_notes(); + PLAY_NOTE_ARRAY(tone_plover, false, 0); + #endif + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); + } + break; + case 13: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); + #endif + layer_off(_PLOVER); + } + break; + case 14: + if (record->event.pressed) { + return MACRO( D(E), D(R), D(F), D(V), D(O), D(L), U(E), U(R), U(F), U(V), U(O), U(L), END ); + } + break; + } + return MACRO_NONE; +}; + +void matrix_init_user(void) { + #ifdef AUDIO_ENABLE + _delay_ms(20); // stops the tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); + #endif +} + +#ifdef AUDIO_ENABLE +void play_goodbye_tone() +{ + PLAY_NOTE_ARRAY(goodbye, false, 0); + _delay_ms(150); +} +#endif + + diff --git a/keyboard/planck/keymaps/unicode/makefile.mk b/keyboard/planck/keymaps/unicode/makefile.mk new file mode 100644 index 0000000000..9b27b08bed --- /dev/null +++ b/keyboard/planck/keymaps/unicode/makefile.mk @@ -0,0 +1 @@ +UNICODE_ENABLE = yes # Unicode diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c index 6558501504..da7b3a1702 100644 --- a/keyboard/planck/planck.c +++ b/keyboard/planck/planck.c @@ -7,7 +7,12 @@ __attribute__ ((weak)) void matrix_scan_user(void) {} __attribute__ ((weak)) -void process_action_user(keyrecord_t *record) {} +bool process_action_user(keyrecord_t *record) { + return true; +} + +__attribute__ ((weak)) +void led_set_user(uint8_t usb_led) {} void matrix_init_kb(void) { #ifdef BACKLIGHT_ENABLE @@ -29,12 +34,26 @@ void matrix_scan_kb(void) { matrix_scan_user(); } -void process_action_kb(keyrecord_t *record) { - process_action_user(record); +bool process_action_kb(keyrecord_t *record) { + return process_action_user(record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); } #ifdef BACKLIGHT_ENABLE #define CHANNEL OCR1C +#define BREATHING_NO_HALT 0 +#define BREATHING_HALT_OFF 1 +#define BREATHING_HALT_ON 2 + +static uint8_t breath_intensity; +static uint8_t breath_speed; +static uint16_t breathing_index; +static uint8_t breathing_halt; void backlight_init_ports() { @@ -60,22 +79,22 @@ void backlight_init_ports() TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001; backlight_init(); + breathing_defaults(); } void backlight_set(uint8_t level) { + // Prevent backlight blink on lowest level + PORTB &= ~(_BV(PORTB7)); + if ( level == 0 ) { // Turn off PWM control on PB7, revert to output low. TCCR1A &= ~(_BV(COM1C1)); CHANNEL = 0x0; - // Prevent backlight blink on lowest level - PORTB &= ~(_BV(PORTB7)); } else if ( level == BACKLIGHT_LEVELS ) { - // Prevent backlight blink on lowest level - PORTB &= ~(_BV(PORTB7)); // Turn on PWM control of PB7 TCCR1A |= _BV(COM1C1); // Set the brightness @@ -83,13 +102,205 @@ void backlight_set(uint8_t level) } else { - // Prevent backlight blink on lowest level - PORTB &= ~(_BV(PORTB7)); // Turn on PWM control of PB7 TCCR1A |= _BV(COM1C1); // Set the brightness CHANNEL = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2)); } + breathing_intensity_default(); +} + + +void breathing_enable(void) +{ + if (get_backlight_level() == 0) + { + breathing_index = 0; + } + else + { + // Set breathing_index to be at the midpoint (brightest point) + breathing_index = 0x20 << breath_speed; + } + + breathing_halt = BREATHING_NO_HALT; + + // Enable breathing interrupt + TIMSK1 |= _BV(OCIE1A); +} + +void breathing_pulse(void) +{ + if (get_backlight_level() == 0) + { + breathing_index = 0; + } + else + { + // Set breathing_index to be at the midpoint + 1 (brightest point) + breathing_index = 0x21 << breath_speed; + } + + breathing_halt = BREATHING_HALT_ON; + + // Enable breathing interrupt + TIMSK1 |= _BV(OCIE1A); +} + +void breathing_disable(void) +{ + // Disable breathing interrupt + TIMSK1 &= ~_BV(OCIE1A); + backlight_set(get_backlight_level()); +} + +void breathing_self_disable(void) +{ + if (get_backlight_level() == 0) + { + breathing_halt = BREATHING_HALT_OFF; + } + else + { + breathing_halt = BREATHING_HALT_ON; + } + + //backlight_set(get_backlight_level()); +} + +void breathing_toggle(void) +{ + if (!is_breathing()) + { + if (get_backlight_level() == 0) + { + breathing_index = 0; + } + else + { + // Set breathing_index to be at the midpoint + 1 (brightest point) + breathing_index = 0x21 << breath_speed; + } + + breathing_halt = BREATHING_NO_HALT; + } + + // Toggle breathing interrupt + TIMSK1 ^= _BV(OCIE1A); + + // Restore backlight level + if (!is_breathing()) + { + backlight_set(get_backlight_level()); + } +} + +bool is_breathing(void) +{ + return (TIMSK1 && _BV(OCIE1A)); +} + +void breathing_intensity_default(void) +{ + //breath_intensity = (uint8_t)((uint16_t)100 * (uint16_t)get_backlight_level() / (uint16_t)BACKLIGHT_LEVELS); + breath_intensity = ((BACKLIGHT_LEVELS - get_backlight_level()) * ((BACKLIGHT_LEVELS + 1) / 2)); +} + +void breathing_intensity_set(uint8_t value) +{ + breath_intensity = value; +} + +void breathing_speed_default(void) +{ + breath_speed = 4; +} + +void breathing_speed_set(uint8_t value) +{ + bool is_breathing_now = is_breathing(); + uint8_t old_breath_speed = breath_speed; + + if (is_breathing_now) + { + // Disable breathing interrupt + TIMSK1 &= ~_BV(OCIE1A); + } + + breath_speed = value; + + if (is_breathing_now) + { + // Adjust index to account for new speed + breathing_index = (( (uint8_t)( (breathing_index) >> old_breath_speed ) ) & 0x3F) << breath_speed; + + // Enable breathing interrupt + TIMSK1 |= _BV(OCIE1A); + } + } +void breathing_speed_inc(uint8_t value) +{ + if ((uint16_t)(breath_speed - value) > 10 ) + { + breathing_speed_set(0); + } + else + { + breathing_speed_set(breath_speed - value); + } +} + +void breathing_speed_dec(uint8_t value) +{ + if ((uint16_t)(breath_speed + value) > 10 ) + { + breathing_speed_set(10); + } + else + { + breathing_speed_set(breath_speed + value); + } +} + +void breathing_defaults(void) +{ + breathing_intensity_default(); + breathing_speed_default(); + breathing_halt = BREATHING_NO_HALT; +} + +/* Breathing Sleep LED brighness(PWM On period) table + * (64[steps] * 4[duration]) / 64[PWM periods/s] = 4 second breath cycle + * + * http://www.wolframalpha.com/input/?i=%28sin%28+x%2F64*pi%29**8+*+255%2C+x%3D0+to+63 + * (0..63).each {|x| p ((sin(x/64.0*PI)**8)*255).to_i } + */ +static const uint8_t breathing_table[64] PROGMEM = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 6, 10, + 15, 23, 32, 44, 58, 74, 93, 113, 135, 157, 179, 199, 218, 233, 245, 252, +255, 252, 245, 233, 218, 199, 179, 157, 135, 113, 93, 74, 58, 44, 32, 23, + 15, 10, 6, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +ISR(TIMER1_COMPA_vect) +{ + // CHANNEL = (pgm_read_byte(&breathing_table[ ( (uint8_t)( (breathing_index++) >> breath_speed ) ) & 0x3F ] )) * breath_intensity; + + + uint8_t local_index = ( (uint8_t)( (breathing_index++) >> breath_speed ) ) & 0x3F; + + if (((breathing_halt == BREATHING_HALT_ON) && (local_index == 0x20)) || ((breathing_halt == BREATHING_HALT_OFF) && (local_index == 0x3F))) + { + // Disable breathing interrupt + TIMSK1 &= ~_BV(OCIE1A); + } + + CHANNEL = (uint16_t)(((uint16_t)pgm_read_byte(&breathing_table[local_index]) * 257)) >> breath_intensity; + +} + + + #endif
\ No newline at end of file diff --git a/keyboard/planck/planck.h b/keyboard/planck/planck.h index c5b59d9998..8aec6b2627 100644 --- a/keyboard/planck/planck.h +++ b/keyboard/planck/planck.h @@ -1,19 +1,7 @@ #ifndef PLANCK_H #define PLANCK_H -#include "matrix.h" -#include "keymap_common.h" -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif -#ifdef RGBLIGHT_ENABLE - #include "rgblight.h" -#endif -#include <stddef.h> -#include <avr/io.h> -#ifdef MIDI_ENABLE - #include <keymap_midi.h> -#endif +#include "quantum.h" #define PLANCK_MIT( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ @@ -43,6 +31,24 @@ void matrix_init_user(void); void matrix_scan_user(void); -void process_action_user(keyrecord_t *record); +bool process_action_user(keyrecord_t *record); + +void led_set_user(uint8_t usb_led); +void backlight_init_ports(void); + +void breathing_enable(void); +void breathing_pulse(void); +void breathing_disable(void); +void breathing_self_disable(void); +void breathing_toggle(void); +bool is_breathing(void); + + +void breathing_defaults(void); +void breathing_intensity_default(void); +void breathing_speed_default(void); +void breathing_speed_set(uint8_t value); +void breathing_speed_inc(uint8_t value); +void breathing_speed_dec(uint8_t value); #endif diff --git a/keyboard/preonic/config.h b/keyboard/preonic/config.h index bb9d29dab7..e8d0e82fc9 100644 --- a/keyboard/preonic/config.h +++ b/keyboard/preonic/config.h @@ -33,8 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COLS 12 /* Planck PCB default pin-out */ -#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } -#define ROWS (int []){ D2, D5, B5, B6, D3 } +#define MATRIX_ROW_PINS { D2, D5, B5, B6, D3 } +#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -46,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 3 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c index b3aa14dcbe..06e6647136 100644 --- a/keyboard/preonic/keymaps/default/keymap.c +++ b/keyboard/preonic/keymaps/default/keymap.c @@ -14,7 +14,6 @@ #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _MUSIC 5 #define _ADJUST 16 // Macro name shortcuts @@ -24,12 +23,6 @@ #define LOWER M(_LOWER) #define RAISE M(_RAISE) #define M_BL 5 -#define AUD_OFF M(6) -#define AUD_ON M(7) -#define MUS_OFF M(8) -#define MUS_ON M(9) -#define VC_IN M(10) -#define VC_DE M(11) // Fillers to make layering more clear #define _______ KC_TRNS @@ -108,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' @@ -117,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL}, {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, - {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______}, + {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, @@ -129,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+-------------+------+------+------+------+------| * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | F7 | F8 | F9 | F10 | F11 | F12 | | | | |Enter | + * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Next | Vol- | Vol+ | Play | * `-----------------------------------------------------------------------------------' @@ -138,21 +131,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, - {_______, 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_NUHS, KC_NUBS, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} }, -/* Music (reserved for process_action_user) - * - */ -[_MUSIC] = { - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, - {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} -}, - /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | @@ -169,8 +151,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AUD_ON, AUD_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, - {_______, VC_DE, VC_IN, MUS_ON, MUS_OFF, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} } @@ -193,7 +175,6 @@ float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); -float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); float goodbye[][2] = SONG(GOODBYE_SOUND); #endif @@ -257,53 +238,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) unregister_code(KC_RSFT); } break; - case 6: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_off(); - #endif - } - break; - case 7: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - audio_on(); - PLAY_NOTE_ARRAY(start_up, false, 0); - #endif - } - break; - case 8: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - layer_off(_MUSIC); - stop_all_notes(); - #endif - } - break; - case 9: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(music_scale, false, 0); - layer_on(_MUSIC); - #endif - } - break; - case 10: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - voice_iterate(); - PLAY_NOTE_ARRAY(music_scale, false, 0); - #endif - } - break; - case 11: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - voice_deiterate(); - PLAY_NOTE_ARRAY(music_scale, false, 0); - #endif - } - break; } return MACRO_NONE; }; @@ -318,21 +252,6 @@ void matrix_init_user(void) { #ifdef AUDIO_ENABLE -uint8_t starting_note = 0x0C; -int offset = 0; - -void process_action_user(keyrecord_t *record) { - - if (IS_LAYER_ON(_MUSIC)) { - if (record->event.pressed) { - play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF); - } else { - stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row))); - } - } - -} - void play_goodbye_tone() { PLAY_NOTE_ARRAY(goodbye, false, 0); diff --git a/keyboard/preonic/preonic.c b/keyboard/preonic/preonic.c index 211f8d0296..13e05c65a7 100644 --- a/keyboard/preonic/preonic.c +++ b/keyboard/preonic/preonic.c @@ -11,8 +11,8 @@ void matrix_scan_user(void) { }; __attribute__ ((weak)) -void process_action_user(keyrecord_t *record) { - +bool process_action_user(keyrecord_t *record) { + return true; }; void matrix_init_kb(void) { @@ -36,8 +36,8 @@ void matrix_scan_kb(void) { matrix_scan_user(); }; -void process_action_kb(keyrecord_t *record) { - process_action_user(record); +bool process_action_kb(keyrecord_t *record) { + return process_action_user(record); } #ifdef BACKLIGHT_ENABLE diff --git a/keyboard/preonic/preonic.h b/keyboard/preonic/preonic.h index 030acdadb4..feb8797744 100644 --- a/keyboard/preonic/preonic.h +++ b/keyboard/preonic/preonic.h @@ -1,19 +1,7 @@ #ifndef PREONIC_H #define PREONIC_H -#include "matrix.h" -#include "keymap_common.h" -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif -#ifdef RGBLIGHT_ENABLE - #include "rgblight.h" -#endif -#include <stddef.h> -#include <avr/io.h> -#ifdef MIDI_ENABLE - #include <keymap_midi.h> -#endif +#include "quantum.h" #define PREONIC_MIT( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ @@ -47,6 +35,6 @@ void matrix_init_user(void); void matrix_scan_user(void); -void process_action_kb(keyrecord_t *record); +bool process_action_kb(keyrecord_t *record); #endif diff --git a/keyboard/quark/Makefile b/keyboard/quark/Makefile deleted file mode 100644 index f79445e23b..0000000000 --- a/keyboard/quark/Makefile +++ /dev/null @@ -1,155 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = quark_lufa - -# Directory common source filess exist -TOP_DIR = ../.. - -# Directory keyboard dependent files exist -TARGET_DIR = . - - - -# # project specific files -ifdef COMMON - - SRC = keymap_common.c \ - matrix.c \ - led.c \ - backlight.c - -ifdef KEYMAP - SRC := common_keymaps/keymap_$(KEYMAP).c $(SRC) -else - SRC := common_keymaps/keymap_jack.c $(SRC) -endif - -else - -SRC = extended_keymap_common.c \ - matrix.c \ - led.c \ - backlight.c - -ifdef KEYMAP - SRC := extended_keymaps/extended_keymap_$(KEYMAP).c $(SRC) -else - SRC := extended_keymaps/extended_keymap_default.c $(SRC) -endif - -endif - -CONFIG_H = config.h - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality - -# Optimize size but this may cause error "relocation truncated to fit" -#EXTRALDFLAGS = -Wl,--relax - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) - -include $(TOP_DIR)/protocol/lufa.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk diff --git a/keyboard/quark/Makefile.pjrc b/keyboard/quark/Makefile.pjrc deleted file mode 100644 index be83ba18b1..0000000000 --- a/keyboard/quark/Makefile.pjrc +++ /dev/null @@ -1,116 +0,0 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - -# Target file name (without extension). -TARGET = gh60_pjrc - -# Directory common source filess exist -TOP_DIR = ../.. - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# project specific files -SRC = keymap_common.c \ - matrix.c \ - led.c - -ifdef KEYMAP - SRC := keymap_$(KEYMAP).c $(SRC) -else - SRC := keymap_jack.c $(SRC) -endif - -CONFIG_H = config.h - - -# MCU name, you MUST set this to match the board you are using -# type "make clean" after changing this, so all files will be rebuilt -MCU = atmega32u4 -#MCU = at90usb1286 - - -# Processor frequency. -# Normally the first thing your program should do is set the clock prescaler, -# so your program will run at the correct speed. You should also set this -# variable to same clock speed. The _delay_ms() macro uses this, and many -# examples use this variable to calculate timings. Do not add a "UL" here. -F_CPU = 16000000 - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+5000) -EXTRAKEY_ENABLE = yes # Audio control and System control(+600) -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover(+500) -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TOP_DIR) - -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk - -plain: OPT_DEFS += -DKEYMAP_PLAIN -plain: all - -poker: OPT_DEFS += -DKEYMAP_POKER -poker: all - -poker_set: OPT_DEFS += -DKEYMAP_POKER_SET -poker_set: all - -poker_bit: OPT_DEFS += -DKEYMAP_POKER_BIT -poker_bit: all diff --git a/keyboard/quark/README.md b/keyboard/quark/README.md deleted file mode 100644 index 59afbab1ae..0000000000 --- a/keyboard/quark/README.md +++ /dev/null @@ -1,53 +0,0 @@ -Quark keyboard firmware -====================== -DIY/Assembled compact 40% keyboard by [Ortholinear Keyboards](http://ortholinearkeyboards.com). - -## Extended Keymap -If you include extended_keymap_common.h instead of keymap_common.h at the top of your file, you'll have access to a bunch of goodies: - -- Use `LSFT()`, `LCTL()`, et. al. (listed in extended_keymap_common.h) as modifiers for keys (daisy-chain-able) -- Use `FUNC(1)` instead of `FN1` (etc.) to access the function layers beyond the 32 function layer limit -- Use `CM_F` instead of `KC_F` to get the ColeMak equivilent for shortcuts (maps backwards) -- Use `MACRODOWN()` instead of `MACRO()` to easily make a keydown macro (`CM_*` works here too) - -### Some notes on usage: - -- The `KEYMAP()` macro is unable to be used due to the bitwise modifications that take place - refer to extended_keymap_jack.c to see how to set things up with the `KC_` prefix -- Keep an eye on the Makefile - this needs to include the correct files to work -- Don't forget to use `const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {` instead of the 8bit equivilent - -## Build - -Follow [this guide](http://deskthority.net/workshop-f7/how-to-build-your-very-own-keyboard-firmware-t7177.html) to setup your development environment before anything else. Abbreviated instructions are provide at the [bottom of this document](https://github.com/rswiernik/tmk_keyboard/tree/rswiernik_dev/keyboard/quark#environment-setup) - -Download the whole firmware [here](https://github.com/jackhumbert/tmk_keyboard/archive/master.zip) and navigate to the keyboard/quark folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex that you can load with the Teensy app onto your Planck (once you've hit reset/shorted GND & RST). - -Depending on which keymap you would like to use, you will have to compile slightly differently. - -####Default -To build with the default keymap, simply move to the tmk\_keyboard/keyboard/quark/ and run `make` as follows: -``` -$ make -``` - -## Keymap -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. - -####**Extended Keymaps** - -To build the firmware binary hex file with an extended keymap just do `make` with `KEYMAP` option like: -``` -$ make KEYMAP=[common|jack|<name>] -``` -_The only applicable keymaps will work with this option._ Extended keymaps follow the format **__extended\_keymap\_\<name\>.c__** - -####**Common Keymaps** - -Building with a common keymap is as simple as adding the COMMON option. Note that only -``` -$ make KEYMAP=[common|jack|<name>] COMMON=true -``` -_The only applicable keymaps will work with this option._ Common keymaps follow the format **__keymap\_\<name\>.c__** - -## Notable TMK forks (which some of the keymap files are from) -- (add yours) diff --git a/keyboard/quark/backlight.c b/keyboard/quark/backlight.c deleted file mode 100644 index ee7e31ee9c..0000000000 --- a/keyboard/quark/backlight.c +++ /dev/null @@ -1,46 +0,0 @@ - -#include <avr/io.h> -#include "backlight.h" - - -void backlight_init_ports() -{ - // Setup PB7 as output and output low. - DDRB |= (1<<7); - PORTB &= ~(1<<7); - - // Use full 16-bit resolution. - ICR1 = 0xFFFF; - - // I could write a wall of text here to explain... but TL;DW - // Go read the ATmega32u4 datasheet. - // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on - - // Pin PB7 = OCR1C (Timer 1, Channel C) - // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0 - // (i.e. start high, go low when counter matches.) - // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0 - // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1 - - TCCR1A = _BV(COM1C1) | _BV(WGM11); // = 0b00001010; - TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001; - - // Default to zero duty cycle. - OCR1C = 0x0000; -} - -void backlight_set(uint8_t level) -{ - if ( level == 0 ) - { - // Turn off PWM control on PB7, revert to output low. - TCCR1A &= ~(_BV(COM1C1)); - } - else - { - // Turn on PWM control of PB7 - TCCR1A |= _BV(COM1C1); - OCR1C = level << 12 | 0x0FFF; - } -} - diff --git a/keyboard/quark/backlight.h b/keyboard/quark/backlight.h deleted file mode 100644 index 0fe1f4a72b..0000000000 --- a/keyboard/quark/backlight.h +++ /dev/null @@ -1,2 +0,0 @@ - -void backlight_init_ports(void); diff --git a/keyboard/quark/common_keymaps/keymap_brett.c b/keyboard/quark/common_keymaps/keymap_brett.c deleted file mode 100644 index 97d832b47a..0000000000 --- a/keyboard/quark/common_keymaps/keymap_brett.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - LCTL, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, - TAB, LGUI, RSFT, LALT, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL, - TRNS, F1, F2, F3, F4, F5, F6, 4, 5, 6, QUOT, TRNS, - TRNS, F7, F8, F9, F10, F11, F12, 1, 2, 3, TRNS, PGUP, - MPRV, MNXT, TRNS, MUTE, TRNS, TRNS, FN1, 0, 0, TRNS, PGDN), -[2] = KEYMAP( /* LOWER */ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS, - TRNS, TRNS, TRNS, PAUSE, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, BSLS, EQL, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - MPLY, MSTP, VOLU, VOLD, FN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboard/quark/common_keymaps/keymap_dotcom.c b/keyboard/quark/common_keymaps/keymap_dotcom.c deleted file mode 100644 index 347f6dea91..0000000000 --- a/keyboard/quark/common_keymaps/keymap_dotcom.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - FN1, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, LBRC, - LCTL, BSLS, QUOT, LALT, FN22, SPC, LEFT, UP, DOWN, RGHT, RBRC), -[1] = KEYMAP( - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, DEL, - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, TRNS, TRNS, TRNS, - TRNS, FN18, FN19, FN22, EQL, MINS, FN20, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, TRNS, VOLD, VOLU, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), -}; diff --git a/keyboard/quark/common_keymaps/keymap_jack.c b/keyboard/quark/common_keymaps/keymap_jack.c deleted file mode 100644 index c74812121f..0000000000 --- a/keyboard/quark/common_keymaps/keymap_jack.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Jack */ - TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC, - ESC, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - RSFT, LCTL, LALT, LGUI, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Jack colemak */ - TAB, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, - ESC, A, R, S, T, D, H, N, E, I, O, QUOT, - LSFT, Z, X, C, V, B, K, M, COMM, DOT, SLSH, ENT, - FN3, LCTL, LALT, LGUI, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT), -[2] = KEYMAP( /* Jack RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY), -[3] = KEYMAP( /* Jack LOWER */ - FN22, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay - - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboard/quark/common_keymaps/keymap_joe.c b/keyboard/quark/common_keymaps/keymap_joe.c deleted file mode 100644 index 07122b702c..0000000000 --- a/keyboard/quark/common_keymaps/keymap_joe.c +++ /dev/null @@ -1,107 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Joe colemak */ - ESC, Q, W, F, P, G, J, L, U, Y, SCLN, MINS, - BSPC, A, R, S, T, D, H, N, E, I, O, ENT, - TAB, Z, X, C, V, B, K, M, COMM, DOT, SLSH, QUOT, - LCTL, LGUI, LALT, LSFT, FN1, SPC, FN0, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Joe qwerty */ - ESC, Q, W, E, R, T, Y, U, I, O, P, MINS, - BSPC, A, S, D, F, G, H, J, K, L, SCLN, ENT, - TAB, Z, X, C, V, B, N, M, COMM, DOT, SLSH, QUOT, - LCTL, LGUI, LALT, LSFT, FN1, SPC, FN0, LEFT, DOWN, UP, RGHT), -[2] = KEYMAP( /* Joe RAISE */ - F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, - DEL, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, TRNS, - BSLS, FN5, FN6, TRNS, TRNS, MENU, CAPS, INS, PSCR, LBRC, RBRC, FN21, - TRNS, TRNS, TRNS, TRNS, FN2, TRNS, FN0, FN26, FN27, FN28, FN29), -[3] = KEYMAP( /* Joe LOWER */ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN7, FN8, FN9, FN30, FN31, - DEL, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS, - FN25, FN3, FN4, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN23, FN24, EQL, - TRNS, TRNS, TRNS, TRNS, FN1, TRNS, FN2, HOME, PGDN, PGUP, END), -[4] = KEYMAP( /* Joe LOWER + RAISE */ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY), -}; - -enum macro_id { - M_Q0, - M_Q1, - M_Q2, - M_Q3, - M_Q4 -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - [1] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(4), // to Fn overlay - - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [5] = ACTION_MODS_KEY(MOD_LCTL, KC_PGDN), - [6] = ACTION_MODS_KEY(MOD_LCTL, KC_PGUP), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [7] = ACTION_MACRO(M_Q0), - [8] = ACTION_MACRO(M_Q1), - [9] = ACTION_MACRO(M_Q2), - [30] = ACTION_MACRO(M_Q3), - [31] = ACTION_MACRO(M_Q4), - - [26] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_LEFT), - [27] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_DOWN), - [28] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_UP), - [29] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_RGHT), - -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - keyevent_t event = record->event; - switch (id) { - case M_Q0: - return event.pressed ? - MACRO( D(LSFT), T(SCLN), U(LSFT), T(SLSH), END ) : - MACRO_NONE; - case M_Q1: - return event.pressed ? - MACRO( D(LSFT), T(SCLN), T(9), U(LSFT), END ) : - MACRO_NONE; - case M_Q2: - return event.pressed ? - MACRO( D(LSFT), T(0), T(SCLN), U(LSFT), END ) : - MACRO_NONE; - case M_Q3: - return event.pressed ? - MACRO( D(LSFT), T(9), T(SCLN), U(LSFT), END ) : - MACRO_NONE; - case M_Q4: - return event.pressed ? - MACRO( D(LSFT), T(SCLN), T(0), U(LSFT), END ) : - MACRO_NONE; - - } - return MACRO_NONE; -}
\ No newline at end of file diff --git a/keyboard/quark/common_keymaps/keymap_matthew.c b/keyboard/quark/common_keymaps/keymap_matthew.c deleted file mode 100644 index 56e7003a97..0000000000 --- a/keyboard/quark/common_keymaps/keymap_matthew.c +++ /dev/null @@ -1,70 +0,0 @@ -// by Matthew Pepers - https://github.com/pepers - -/* grid planck layout - modified programmer dvorak -,-----------------------------------------------------------------------------------------------. -| pause | @ | | | ^ | | | | | * | # | $ | del | -| esc | ; : | , < | . > | P | Y | F | G | G | C | R | bkspc | -| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | -|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| -| & | / | { | ( | [ | = | ! | ] | ) | } | \ | + | -| ` ~ | A | O | E | U | I | D | H | T | N | S | - _ | -| % | 7 | 5 | 3 | 1 | 9 | 0 | 2 | 4 | 6 | 8 | ? | -|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| -| | | | | | | | | | | | prtsc | -| tab | ' " | Q | J | K | X | B | M | W | V | Z | retrn | -| | | | | | | | | | | | insrt | -|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------| -| | | | | | | | | | | | | -| lctrl | lgui | lalt | ralt | lower | shift | space | raise | left | down | up | right | -| | | | | | | | | home | pgdn | pgup | end | -`-----------------------------------------------------------------------------------------------' -*/ - -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: dvorak */ - [0] = KEYMAP_GRID( ESC, SCLN, COMM, DOT, P, Y, F, G, C, R, L, BSPC, \ - GRV, A, O, E, U, I, D, H, T, N, S, MINS, \ - TAB, QUOT, Q, J, K, X, B, M, W, V, Z, ENT, \ - LCTL, LGUI, LALT, RALT, FN1, LSFT, SPC, FN2, LEFT, DOWN, UP, RGHT), - - /* 1: lower (FN1) */ - [1] = KEYMAP_GRID( F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, \ - FN17, 7, 5, 3, 1, 9, 0, 2, 4, 6, 8, FN18, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, INS, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP, END), - - /* 2: raise (FN2) */ - [2] = KEYMAP_GRID(PAUS, FN19, FN20, FN21, TRNS, TRNS, TRNS, TRNS, FN22, FN23, FN24, DEL, \ - FN10, SLSH, FN11, FN12, LBRC, EQL, FN13, RBRC, FN14, FN15, BSLS, FN16, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR, \ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), - -}; - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // lower Fn layer - [2] = ACTION_LAYER_MOMENTARY(2), // raise Fn layer - - // lower row1 - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // % - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_SLASH), // ? - - // raise row0 - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @ - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLASH), // | - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // # - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $ - - // raise row1 - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRACKET), // { - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // ! - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRACKET), // } - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_EQUAL), // + -}; diff --git a/keyboard/quark/common_keymaps/keymap_nathan.c b/keyboard/quark/common_keymaps/keymap_nathan.c deleted file mode 100644 index 5a0900b66d..0000000000 --- a/keyboard/quark/common_keymaps/keymap_nathan.c +++ /dev/null @@ -1,153 +0,0 @@ -// Author: Nathan Ross Powell <nathanrospowell@gmail.com> -// https://github.com/nathanrosspowell/tmk_keyboard/blob/planck-jack/keyboard/planck/keymap_nathan.c - -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* 0: main layer - * ,-----------------------------------------------------------------------. - * |Tab | q | w | e | r | t | y | u | i | o | p | BS | - * |-----------------------------------------------------------------------| - * |Ctrl | a | s | d | f | g | h | j | k | l | ; | Ret | - * |-----------------------------------------------------------------------| - * |Shift| z | x | c | v | b | n | m | [ | ( | { | < | - * |-----------------------------------------------------------------------| - * |Meta | \ | / | Alt |Lower|Space|Space|Upper|Left |Down | Up |Right| - * `-----------------------------------------------------------------------' - */ - [0] = KEYMAP_GRID( - TAB, Q, W, E, R, T, Y, U, I, O, P, BSPC, - LCTL, A, S, D, F, G, H, J, K, L, SCLN, ENT, - RSFT, Z, X, C, V, B, N, M, LBRC, FN10, FN11, FN12, - LGUI, BSLS, SLSH, LALT, FN0, SPC, SPC, FN1, LEFT, DOWN, UP, RGHT), - - /* 1: fn left/lower layer - * The top row are Visual Studio combos: - * 'Run', 'Breakpoint', 'Step over', 'Step into', 'Set cursor to line' - * 2nd row are key combos: - * 'ctrl-alt-delete', 'ctrl-shift-escape' - * 3rd row are macros keys: - * 'P0' - 'P5' execute a script on Windows machines - * ,-----------------------------------------------------------------------. - * | ESC | F5 | F9 | F10 | F11 |S+F11|CSF10|NLock|Num7 |Num8 |Num9 | Del | - * |-----------------------------------------------------------------------| - * | |C/A/D|C/S/E| Ins |Print|Pause|SLock|Num0 |Num4 |Num5 |Num6 |Num= | - * |-----------------------------------------------------------------------| - * | | P0 | P1 | P2 | P3 | P4 | P5 |Num. |Num1 |Num2 |Num3 |Num/ | - * |-----------------------------------------------------------------------| - * | |User | | | | | | |Home |PgDn |PgUp | End | - * `-----------------------------------------------------------------------' - */ - [1] = KEYMAP_GRID( - ESC, F5, F9, F10, F11, FN30, FN31, NLCK, P7, P8, P9, DEL, - TRNS, FN16, FN17, INS, PSCR, PAUS, SLCK, P0, P4, P5, P6, PEQL, - TRNS, FN2, FN3, FN4, FN5, FN6, FN7, PDOT, P1, P2, P3, PSLS, - TRNS, FN8, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP, END ), - - /* 2: fn right/raise layer - * ,-----------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 |F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | - * |-----------------------------------------------------------------------| - * | | ! | @ | # | $ | % | ^ | & | * | - | + | = | - * |-----------------------------------------------------------------------| - * | | _ | ' | " | ` | ~ | , | . | ] | ) | } | > | - * |-----------------------------------------------------------------------| - * | |NextT|PrevT| | | | Esc | |Mute |Vol- |Vol+ | P/P | - * `-----------------------------------------------------------------------' - */ - [2] = KEYMAP_GRID( - F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, - TRNS, FN18, FN19, FN20, FN21, FN22, FN23, FN24, FN25, MINS, FN26, PAST, - TRNS, FN27, QUOT, FN28, GRV, FN29, COMM, DOT, RBRC, FN13, FN14, FN15, - TRNS, MNXT, MPRV, TRNS, TRNS, TRNS, ESC, TRNS, MUTE, VOLD, VOLU, MPLY ), -}; - -enum macro_id { - M_P0, - M_P1, - M_P2, - M_P3, - M_P4, - M_P5, - M_USERNAME -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_MOMENTARY(1), // left/lower layer - [1] = ACTION_LAYER_MOMENTARY(2), // right/raise layer - // Program macros - [2] = ACTION_MACRO(M_P0), - [3] = ACTION_MACRO(M_P1), - [4] = ACTION_MACRO(M_P2), - [5] = ACTION_MACRO(M_P3), - [6] = ACTION_MACRO(M_P4), - [7] = ACTION_MACRO(M_P5), - [8] = ACTION_MACRO(M_USERNAME), - // Braces - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // { - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_COMMA), // < - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // } - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_DOT), // > - // Combo - [16] = ACTION_MODS_KEY(MOD_LALT | MOD_LCTL, KC_DEL), // Ctrl+Alt+Delete - [17] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_ESC), // Ctrl+Shft+Escape - // Symbols - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // ! - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @ - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // # - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $ - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // % - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [26] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + - [27] = ACTION_MODS_KEY(MOD_LSFT, KC_MINUS), // _ - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOTE), // " - [29] = ACTION_MODS_KEY(MOD_LSFT, KC_GRAVE), // ~ - // Debugging - [30] = ACTION_MODS_KEY(MOD_LSFT, KC_F11), // Step into - [31] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_F10), // Set cursor to line - }; - -// Run a script and pass a key number to it. This is Windows specific and the script needs to be on your path. -// *open run dialog* keypress.py [PRG_NUM] -#define ADD_PYTHON_PROGRAM_ON_WIN( PRG_NUM ) MACRO( D(LGUI), T(R), U(LGUI), W(100), T(K), T(E), T(Y), T(P), T(R), T(E), T(S), T(S), T(DOT), T(P), T(Y), T(SPC), T(PRG_NUM), END ) -// *return* -#define RUN_PYTHON_PROGRAM_ON_WIN MACRO( T(ENT), END ) - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - keyevent_t event = record->event; - switch (id) { - case M_P0: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 0 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P1: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 1 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P2: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 2 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P3: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 3 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P4: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 4 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_P5: - return event.pressed ? - ADD_PYTHON_PROGRAM_ON_WIN( 5 ) : - RUN_PYTHON_PROGRAM_ON_WIN; - case M_USERNAME: - return event.pressed ? - MACRO( T(N), T(A), T(T), T(H), T(A), T(N), T(R), T(O), T(S), T(S), T(P), T(O), T(W), T(E), T(L), T(L), END ) : - MACRO_NONE; - } - return MACRO_NONE; -} diff --git a/keyboard/quark/common_keymaps/keymap_peasant.c b/keyboard/quark/common_keymaps/keymap_peasant.c deleted file mode 100644 index ddacb614e6..0000000000 --- a/keyboard/quark/common_keymaps/keymap_peasant.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = KEYMAP( /* Native */ - ESC, Q, W, E, R, T, Y, U, I, O, P, FN2, - BSPC, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - TAB, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - DEL, LCTL, NO, LSFT, LALT, SPC, NO, LEFT, DOWN, UP, RGHT), - [1] = KEYMAP( /* QWERTY->PHOTOSHOP */ - DELETE, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, FN1, - O, G, S, U, T, FN27, F21, F10, F11, F7, F8, F9, - TAB, FN4, FN5, FN6, F1, FN7, F18, F19, F23, F20, F22, FN9, - COMM, DOT, FN10, FN11, FN3, SPC, FN12, F2, FN8, F3, F14), - [2] = KEYMAP( /* 2: FN3 PHOTOSHOP */ - ESC, FN25, FN26, NO, NO, NO, NO, NO, NO, NO, NO, NO, - NO, NO, NO, NO, NO, NO, NO, NO, NO, FN19, FN20, FN21, - C, NO, FN22, FN5, NO, FN23, NO, NO, NO, NO, FN13, NO, - FN14, FN15, FN16, FN17, FN3, SPC, FN18, NO, NO, F24, NO), -}; - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_DEFAULT_LAYER_SET(0), // set Qwerty layout - [2] = ACTION_DEFAULT_LAYER_SET(1), // set Photoshop presets - [3] = ACTION_LAYER_ON_OFF(2), // Photoshop function layer - - [4] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F9), // photo folder AHK - [5] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_I), // select inverse - [6] = ACTION_MODS_KEY(MOD_LSFT, KC_M), // marquee select - [7] = ACTION_MODS_KEY(MOD_LALT, KC_BSPC), // fill - [8] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_X), // warp - [9] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT | MOD_LSFT, KC_F12), // merge all new layer - [10] = ACTION_MODS_KEY(MOD_LCTL, KC_MINS), // zoom out - [11] = ACTION_MODS_KEY(MOD_LCTL, KC_H), // RBG sliders - [12] = ACTION_MODS_KEY(MOD_LCTL, KC_S), // save - [13] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_F5), // layer mask from transparancy - [14] = ACTION_MODS_KEY(MOD_LALT, KC_LBRC), // prev layer - [15] = ACTION_MODS_KEY(MOD_LALT, KC_RBRC), // next layer - [16] = ACTION_MODS_KEY(MOD_LCTL, KC_EQL), // zoom in - [17] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_H), // HSV sliders - [18] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F11), // save as PNG - [19] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F7), // gaussian blur - [20] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F8), // motion blur - [21] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_X), // liquify filter - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // prev layer blending - [23] = ACTION_MODS_KEY(MOD_LSFT | MOD_LALT, KC_N), // normal layer blending - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // next layer blending - [25] = ACTION_MODS_KEY(MOD_LCTL, KC_Z), // step back - [26] = ACTION_MODS_KEY(MOD_LCTL, KC_Y), // step forward - [27] = ACTION_MODS_KEY(MOD_LCTL, KC_R), // rasterize - -}; diff --git a/keyboard/quark/common_keymaps/keymap_reed.c b/keyboard/quark/common_keymaps/keymap_reed.c deleted file mode 100644 index 1aa24e10de..0000000000 --- a/keyboard/quark/common_keymaps/keymap_reed.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "keymap_common.h" - -/* - * BUILD: - * Simply run the command below in the keyboard/planck directory - * to build against this keymap - * - * make KEYMAP=reed COMMON_KEYMAP=true - * - * - * DETAILS: - * - * This layout works off of Jack's layout, making some changes that I - * feel significantly improve the function of the keyboard. Major changes - * include adding a "gaming mode" that will allow users to still access - * the number keys 1 through 4 easily for games that require it. Also - * included is the ability to use the tap/hold function for easy use of - * right shift and thumb shift with their tapped companions. - * - */ -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP_GRID( /* Reed */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, FN5, - LCTL, CAPS, LALT, LGUI, FN2, FN7, SPC, FN1, LEFT, DOWN, UP, RGHT), - -[1] = KEYMAP_GRID( /* Reed EXTREME GAMING */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, FN5, - LCTL, 1, 2, 3, 4, SPC, FN2, FN1, LEFT, DOWN, UP, RGHT), - -[2] = KEYMAP_GRID( /* Reed RAISE */ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY), - -[3] = KEYMAP_GRID( /* Reed LOWER */ - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, DEL, - TRNS, TRNS, INS, HOME, PGUP, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, TRNS, DEL, END, PGDN, F11, F12, F13, TRNS, VOLD, VOLU, TRNS, - TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, MPRV, MUTE, MPLY, MNXT), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - RAISE - [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay - LOWER - - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - // Actions for the tap/hold modifiers listed above - [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT), - [7] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPC), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboard/quark/common_keymaps/keymap_sean.c b/keyboard/quark/common_keymaps/keymap_sean.c deleted file mode 100644 index 4fe07f701a..0000000000 --- a/keyboard/quark/common_keymaps/keymap_sean.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = KEYMAP( /* Matrix Dvorak */ - QUOT, COMM, DOT, P, Y, SLSH, EQL, F, G, C, R, L, - A, O, E, U, I, ESC, BSPC, D, H, T, N, S, - SCLN, Q, J, K, X, TAB, ENT, B, M, W, V, Z, - LSFT, LCTL, LALT, LGUI, FN1, SPC, FN2, LEFT, DOWN, UP, RGHT), - - [1] = KEYMAP( /* Matrix Qwerty */ - Q, W, E, R, T, QUOT, EQL, Y, U, I, O, P, - A, S, D, F, G, ESC, BSPC, H, J, K, L, SCLN, - Z, X, C, V, B, TAB, ENT, N, M, COMM, DOT, SLSH, - LSFT, LCTL, LALT, LGUI, FN1, SPC, FN2, LEFT, DOWN, UP, RGHT), - - [2] = KEYMAP( /* fn1 lower */ - F1, F2, F3, F4, F5, TRNS, TRNS, F6, F7, F8, F9, F10, - 1, 2, 3, 4, 5, F18, DEL, 6, 7, 8, 9, 0, - FN3, FN4, TRNS, GRV, MINS, TRNS, TRNS, BSLS, LBRC, RBRC, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN5, HOME, PGDN, PGUP, END), - - [3] = KEYMAP( /* fn2 raise */ - F1, F2, F3, F4, F5, TRNS, TRNS, F6, F7, F8, F9, F10, - F11, F12, F13, F14, F15, F18, DEL, F16, F17, F18, F19, F20, - FN3, FN4, TRNS, TRNS, TRNS, TRNS, TRNS, EJCT, PWR, LSFT,PAUSE, RSFT, - LEFT, DOWN, UP, RGHT, FN5, TRNS, TRNS, MNXT, VOLD, VOLU, MUTE), - - [4] = KEYMAP( /* lower + raise */ - LEFT, DOWN, UP, RGHT, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN, UP, RGHT, - HOME, PGDN, PGUP, END, TRNS, F18, DEL, TRNS, HOME, PGDN, PGUP, END, - FN3, FN4, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, EJCT, PWR, MPLY, RSFT, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MNXT, VOLD, VOLU, MUTE), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay LOWER - [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay RAISE - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - [5] = ACTION_LAYER_MOMENTARY(4), // to Fn overlay LOWER + RAISE - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), -}; diff --git a/keyboard/quark/common_keymaps/keymap_shane.c b/keyboard/quark/common_keymaps/keymap_shane.c deleted file mode 100644 index d4e40fe63a..0000000000 --- a/keyboard/quark/common_keymaps/keymap_shane.c +++ /dev/null @@ -1,100 +0,0 @@ -// https://github.com/shanecelis/tmk_keyboard/blob/master/keyboard/planck/keymap_shane.c - -#include "keymap_common.h" -#include "action_layer.h" -#include "action.h" -#include "action_util.h" - -/* - Shane's Planck Layout - http://www.keyboard-layout-editor.com/#/layouts/015d9011102619d7695c86ffe57cf441 -*/ -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = KEYMAP_AND_SWAP( /* Base */ - TAB, Q, W, E, R, T, Y, U, I, O, P, MINS, - LCTL, A, S, D, F, G, H, J, K, L, SCLN, BSPC, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, FN5, - /*ALPHA*/FN3, /*HYPER*/ /*SUPER*/LGUI, /*META*/LALT, LCTL, FN2, FN6, FN1, LEFT, DOWN, UP, RGHT), - [2] = KEYMAP_AND_SWAP( /* More modifiers */ - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, RCTL, RALT, RGUI, TRNS), - [4] = KEYMAP_AND_SWAP( /* WASD */ - TRNS, TRNS, UP, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, LEFT, DOWN, RIGHT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), - [6] = KEYMAP_AND_SWAP( /* Raise/FN1 */ - FN23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, EQL, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, ENT, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, BSLS, TRNS, - PAUS, TRNS, TRNS, TRNS, TRNS, BSPC, TRNS, MUTE, PGUP, PGDN, MNXT), - [8] = KEYMAP_AND_SWAP( /* Lower/FN2 */ - ESC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN19, FN20, TRNS, - TRNS, TRNS, TRNS, TRNS, CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN24, FN25, LBRC, RBRC, TRNS, TRNS, - FN4, TRNS, TRNS, TRNS, TRNS, ENT, TRNS, MPLY, VOLD, VOLU, MPRV), -}; - -enum function_id { - SPACE_FN, -}; - -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - switch (id) { - case SPACE_FN: - if (record->event.pressed) { - // Change the keyboard maps. - // Whatever even layer's are on, turn on the odd one's too. - for (uint8_t i = 0; i < 9; i += 2) { - if (layer_state & (1UL << i)) - layer_on(i + 1); - } - layer_on(1); - } else { - // turn off all the even layers. - for (uint8_t i = 0; i < 9; i += 2) - layer_off(i + 1); - - if (record->tap.count != 0) { - // Space was tapped rather than used like a modifier. - // So send a space up and down event. - add_key(KC_SPC); - send_keyboard_report(); - del_key(KC_SPC); - send_keyboard_report(); - } - } - break; - } -} - - - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(6), // to fist Fn overlay - [2] = ACTION_LAYER_MOMENTARY(8), // to second Fn overlay - [3] = ACTION_LAYER_TOGGLE(2), // toggle more modifiers - [4] = ACTION_LAYER_TOGGLE(4), // toggle wasd - [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT), - [6] = ACTION_FUNCTION_TAP(SPACE_FN), - - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [26] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), -}; diff --git a/keyboard/quark/common_keymaps/keymap_simon.c b/keyboard/quark/common_keymaps/keymap_simon.c deleted file mode 100644 index 37951364be..0000000000 --- a/keyboard/quark/common_keymaps/keymap_simon.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Jack */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, DOT, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SCLN, DEL, - LCTL, ENT, LALT, CAPS, FN2, SPC, FN1, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Jack RAISE */ - TRNS, F1, F2, F3, F4, NO, FN11, FN9, FN12, NO, FN14, TRNS, - TRNS, F5, F6, F7, F8, FN16, SLSH, MINS, EQL, LBRC, FN8, TRNS, - TRNS, F9, F10, F11, F12, F15, F16, FN22, SCLN, MINS, QUOT, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -[2] = KEYMAP( /* Jack LOWER */ - FN22, 1, 2, 3, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - TRNS, 4, 5, 6, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, 7, 8, 9, 0, FN28, FN15, F7, F8, F9, F10, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - - [8] = ACTION_MODS_KEY(MOD_LSFT, KC_SLSH), - [9] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - - [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), -}; diff --git a/keyboard/quark/common_keymaps/keymap_tim.c b/keyboard/quark/common_keymaps/keymap_tim.c deleted file mode 100644 index 7444f3877b..0000000000 --- a/keyboard/quark/common_keymaps/keymap_tim.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, - LCTL, LALT, DEL, LGUI, FN2, SPC, FN1, F2, F5, F9, F12), -[2] = KEYMAP( /* RAISE */ - TRNS, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, BSPC, - GRV, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS, EQL, LBRC, RBRC, BSLS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, FN29, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, TRNS, TRNS, TRNS, TRNS), -[3] = KEYMAP( /* LOWER */ - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC, - FN22, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, FN29, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(3), // to Fn overlay - - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), - [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), - [29] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT), -}; diff --git a/keyboard/quark/common_keymaps/keymap_wilba.c b/keyboard/quark/common_keymaps/keymap_wilba.c deleted file mode 100644 index 9781f8fcd8..0000000000 --- a/keyboard/quark/common_keymaps/keymap_wilba.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "keymap_common.h" - -const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Wilba */ - FN27, FN28, FN29, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - LCTL, LGUI, LALT, RSFT, FN1, SPC, FN2, LEFT, DOWN, UP, RGHT), -[1] = KEYMAP( /* Wilba Alternate */ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, ENT, - LCTL, LGUI, LALT, RSFT, FN1, SPC, FN2, LEFT, DOWN, UP, RGHT), -[2] = KEYMAP( /* Wilba LOWER */ - TRNS, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, TRNS, - TRNS, F11, F12, LBRC, RBRC, FN20, EQL, FN23, FN24, MINS, FN21, TRNS, - TRNS, BSLS, GRV, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, FN1, TRNS, TRNS, MNXT, VOLD, VOLU, MPLY), -[3] = KEYMAP( /* Wilba RAISE */ - TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, TRNS, - TRNS, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, TRNS, - TRNS, FN25, FN22, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, - TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN2, TRNS, TRNS, TRNS, TRNS), -}; -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(2), // LOWER - [2] = ACTION_LAYER_MOMENTARY(3), // RAISE - - [3] = ACTION_DEFAULT_LAYER_SET(0), - [4] = ACTION_DEFAULT_LAYER_SET(1), - - [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // ! - [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @ - [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // # - [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $ - [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // % - [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^ - [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // & - [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // * - [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // ( - [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // ) - - [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // _ - [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // + - [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // ~ - [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // { - [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // } - [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // | - - [26] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE), - - [27] = ACTION_BACKLIGHT_TOGGLE(), - [28] = ACTION_BACKLIGHT_INCREASE(), - [29] = ACTION_BACKLIGHT_DECREASE() - -}; diff --git a/keyboard/quark/extended_keymap_common.c b/keyboard/quark/extended_keymap_common.c deleted file mode 100644 index f8fc3209fb..0000000000 --- a/keyboard/quark/extended_keymap_common.c +++ /dev/null @@ -1,184 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "extended_keymap_common.h" -#include "report.h" -#include "keycode.h" -#include "action_layer.h" -#include "action.h" -#include "action_macro.h" -#include "debug.h" - - -static action_t keycode_to_action(uint16_t keycode); - - -/* converts key to action */ -action_t action_for_key(uint8_t layer, keypos_t key) -{ - // 16bit keycodes - important - uint16_t keycode = keymap_key_to_keycode(layer, key); - - if (keycode >= 0x0100 && keycode < 0x2000) { - // Has a modifier - action_t action; - // Split it up - action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); - return action; - } else if (keycode >= 0x2000 && keycode < 0x3000) { - // Is a shortcut for function layer, pull last 12bits - return keymap_func_to_action(keycode & 0xFFF); - } else if (keycode >= 0x3000 && keycode < 0x4000) { - action_t action; - action.code = ACTION_MACRO(keycode & 0xFF); - return action; - } - - switch (keycode) { - case KC_FN0 ... KC_FN31: - return keymap_fn_to_action(keycode); -#ifdef BOOTMAGIC_ENABLE - case KC_CAPSLOCK: - case KC_LOCKING_CAPS: - if (keymap_config.swap_control_capslock || keymap_config.capslock_to_control) { - return keycode_to_action(KC_LCTL); - } - return keycode_to_action(keycode); - case KC_LCTL: - if (keymap_config.swap_control_capslock) { - return keycode_to_action(KC_CAPSLOCK); - } - return keycode_to_action(KC_LCTL); - case KC_LALT: - if (keymap_config.swap_lalt_lgui) { - if (keymap_config.no_gui) { - return keycode_to_action(ACTION_NO); - } - return keycode_to_action(KC_LGUI); - } - return keycode_to_action(KC_LALT); - case KC_LGUI: - if (keymap_config.swap_lalt_lgui) { - return keycode_to_action(KC_LALT); - } - if (keymap_config.no_gui) { - return keycode_to_action(ACTION_NO); - } - return keycode_to_action(KC_LGUI); - case KC_RALT: - if (keymap_config.swap_ralt_rgui) { - if (keymap_config.no_gui) { - return keycode_to_action(ACTION_NO); - } - return keycode_to_action(KC_RGUI); - } - return keycode_to_action(KC_RALT); - case KC_RGUI: - if (keymap_config.swap_ralt_rgui) { - return keycode_to_action(KC_RALT); - } - if (keymap_config.no_gui) { - return keycode_to_action(ACTION_NO); - } - return keycode_to_action(KC_RGUI); - case KC_GRAVE: - if (keymap_config.swap_grave_esc) { - return keycode_to_action(KC_ESC); - } - return keycode_to_action(KC_GRAVE); - case KC_ESC: - if (keymap_config.swap_grave_esc) { - return keycode_to_action(KC_GRAVE); - } - return keycode_to_action(KC_ESC); - case KC_BSLASH: - if (keymap_config.swap_backslash_backspace) { - return keycode_to_action(KC_BSPACE); - } - return keycode_to_action(KC_BSLASH); - case KC_BSPACE: - if (keymap_config.swap_backslash_backspace) { - return keycode_to_action(KC_BSLASH); - } - return keycode_to_action(KC_BSPACE); -#endif - default: - return keycode_to_action(keycode); - } -} - - -/* Macro */ -__attribute__ ((weak)) -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - return MACRO_NONE; -} - -/* Function */ -__attribute__ ((weak)) -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -} - -/* translates keycode to action */ -static action_t keycode_to_action(uint16_t keycode) -{ - action_t action; - switch (keycode) { - case KC_A ... KC_EXSEL: - case KC_LCTRL ... KC_RGUI: - action.code = ACTION_KEY(keycode); - break; - case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE: - action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode)); - break; - case KC_AUDIO_MUTE ... KC_WWW_FAVORITES: - action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode)); - break; - case KC_MS_UP ... KC_MS_ACCEL2: - action.code = ACTION_MOUSEKEY(keycode); - break; - case KC_TRNS: - action.code = ACTION_TRANSPARENT; - break; - default: - action.code = ACTION_NO; - break; - } - return action; -} - - -/* translates key to keycode */ -uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - // Read entire word (16bits) - return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint16_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} - -action_t keymap_func_to_action(uint16_t keycode) -{ - // For FUNC without 8bit limit - return (action_t){ .code = pgm_read_word(&fn_actions[(int)keycode]) }; -} diff --git a/keyboard/quark/extended_keymap_common.h b/keyboard/quark/extended_keymap_common.h deleted file mode 100644 index 66712459c6..0000000000 --- a/keyboard/quark/extended_keymap_common.h +++ /dev/null @@ -1,152 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef KEYMAP_H -#define KEYMAP_H - -#include <stdint.h> -#include <stdbool.h> -#include "action.h" -#include <avr/pgmspace.h> -#include "keycode.h" -#include "keymap.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" - -#ifdef BOOTMAGIC_ENABLE -/* NOTE: Not portable. Bit field order depends on implementation */ -typedef union { - uint16_t raw; - struct { - bool swap_control_capslock:1; - bool capslock_to_control:1; - bool swap_lalt_lgui:1; - bool swap_ralt_rgui:1; - bool no_gui:1; - bool swap_grave_esc:1; - bool swap_backslash_backspace:1; - bool nkro:1; - }; -} keymap_config_t; -keymap_config_t keymap_config; -#endif - -/* translates key to keycode */ -uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint16_t keycode); - -/* translates Fn keycode to action */ -action_t keymap_func_to_action(uint16_t keycode); - -extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - -// Ability to use mods in layouts -#define LCTL(kc) kc | 0x0100 -#define LSFT(kc) kc | 0x0200 -#define LALT(kc) kc | 0x0400 -#define LGUI(kc) kc | 0x0800 -#define RCTL(kc) kc | 0x1100 -#define RSFT(kc) kc | 0x1200 -#define RALT(kc) kc | 0x1400 -#define RGUI(kc) kc | 0x1800 - -// Alias for function layers than expand past FN31 -#define FUNC(kc) kc | 0x2000 - -// Aliases -#define S(kc) LSFT(kc) -#define F(kc) FUNC(kc) - -// For software implementation of colemak -#define CM_Q KC_Q -#define CM_W KC_W -#define CM_F KC_E -#define CM_P KC_R -#define CM_G KC_T -#define CM_J KC_Y -#define CM_L KC_U -#define CM_U KC_I -#define CM_Y KC_O -#define CM_SCLN KC_P - -#define CM_A KC_A -#define CM_R KC_S -#define CM_S KC_D -#define CM_T KC_F -#define CM_D KC_G -#define CM_H KC_H -#define CM_N KC_J -#define CM_E KC_K -#define CM_I KC_L -#define CM_O KC_SCLN - -#define CM_Z KC_Z -#define CM_X KC_X -#define CM_C KC_C -#define CM_V KC_V -#define CM_B KC_B -#define CM_K KC_N -#define CM_M KC_M -#define CM_COMM KC_COMM -#define CM_DOT KC_DOT -#define CM_SLSH KC_SLSH - -// Make it easy to support these in macros -#define KC_CM_Q CM_Q -#define KC_CM_W CM_W -#define KC_CM_F CM_F -#define KC_CM_P CM_P -#define KC_CM_G CM_G -#define KC_CM_J CM_J -#define KC_CM_L CM_L -#define KC_CM_U CM_U -#define KC_CM_Y CM_Y -#define KC_CM_SCLN CM_SCLN - -#define KC_CM_A CM_A -#define KC_CM_R CM_R -#define KC_CM_S CM_S -#define KC_CM_T CM_T -#define KC_CM_D CM_D -#define KC_CM_H CM_H -#define KC_CM_N CM_N -#define KC_CM_E CM_E -#define KC_CM_I CM_I -#define KC_CM_O CM_O - -#define KC_CM_Z CM_Z -#define KC_CM_X CM_X -#define KC_CM_C CM_C -#define KC_CM_V CM_V -#define KC_CM_B CM_B -#define KC_CM_K CM_K -#define KC_CM_M CM_M -#define KC_CM_COMM CM_COMM -#define KC_CM_DOT CM_DOT -#define KC_CM_SLSH CM_SLSH - -#define M(kc) kc | 0x3000 - -#define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) - -#endif diff --git a/keyboard/quark/extended_keymaps/extended_keymap_default.c b/keyboard/quark/extended_keymaps/extended_keymap_default.c deleted file mode 100644 index 7ddc1aad96..0000000000 --- a/keyboard/quark/extended_keymaps/extended_keymap_default.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "extended_keymap_common.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = { - {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - { KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_NO, KC_ENT}, - {KC_CAPS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT}, - { KC_LCTL, KC_LALT, KC_LGUI, KC_NO, FUNC(2), KC_SPC, KC_NO, KC_NO, FUNC(1), KC_LEFT, KC_DOWN, KC_RGHT} -}, -[1] = { - {KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL}, - { KC_TAB, KC_A, KC_S,S(KC_BSLS), S(KC_COMM),S(KC_DOT),S(KC_MINS),S(KC_GRV),S(KC_LBRC), S(KC_RBRC), KC_NO, KC_ENT}, - {KC_CAPS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_SCLN, S(KC_SCLN), KC_HOME, KC_PGUP, KC_RSFT}, - { KC_LCTL, KC_LALT, KC_LGUI, KC_NO, FUNC(2), KC_SPC, KC_NO, KC_NO, FUNC(1), KC_SCLN, KC_QUOT, KC_SLSH} -}, -[2] = { - {KC_ESC, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_BSPC}, - { KC_TAB, KC_A, KC_S, KC_D, KC_BSLS, KC_SLSH, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, KC_ENT}, - {KC_CAPS, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, S(KC_7), S(KC_EQL), KC_COMM, KC_UP, KC_RSFT}, - { KC_LCTL, KC_LALT, KC_LGUI, KC_NO, FUNC(2), KC_SPC, KC_NO, KC_NO, FUNC(1), KC_LEFT, KC_DOWN, KC_RGHT} -} -}; - - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay - [2] = ACTION_LAYER_MOMENTARY(2), // to Fn overlay - -}; - -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: - return MACRO_NONE; - break; - } - return MACRO_NONE; -}; diff --git a/keyboard/quark/keymap_common.c b/keyboard/quark/keymap_common.c deleted file mode 100644 index fdb1769e1c..0000000000 --- a/keyboard/quark/keymap_common.c +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "keymap_common.h" - - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} diff --git a/keyboard/quark/keymap_common.h b/keyboard/quark/keymap_common.h deleted file mode 100644 index c74c7e9a28..0000000000 --- a/keyboard/quark/keymap_common.h +++ /dev/null @@ -1,86 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include <stdint.h> -#include <stdbool.h> -#include <avr/pgmspace.h> -#include "keycode.h" -#include "action.h" -#include "action_macro.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - - -// MIT Layout -/* - * ,-----------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | - * `-----------------------------------------------------------------------' - */ -#define KEYMAP( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K37, K38, K39, K3A, K3B \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_NO, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \ -} - -// Grid Layout -/* - * ,-----------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-----------------------------------------------------------------------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------------------' - */ -#define KEYMAP_GRID( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B \ -) { \ - { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B }, \ - { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B }, \ - { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B }, \ - { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B } \ -} - - -#endif diff --git a/keyboard/quark/led.c b/keyboard/quark/led.c deleted file mode 100644 index 1f36434883..0000000000 --- a/keyboard/quark/led.c +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <avr/io.h> -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ - // Using PE6 Caps Lock LED - if (usb_led & (1<<USB_LED_CAPS_LOCK)) - { - // Output high. - DDRE |= (1<<6); - PORTE |= (1<<6); - } - else - { - // Output low. - DDRE &= ~(1<<6); - PORTE &= ~(1<<6); - } -} diff --git a/keyboard/quark/matrix.c b/keyboard/quark/matrix.c deleted file mode 100644 index 2f2dbdb108..0000000000 --- a/keyboard/quark/matrix.c +++ /dev/null @@ -1,193 +0,0 @@ -/* -Copyright 2012 Jun Wako -Generated by planckkeyboard.com (2014 Jack Humbert) - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* - * scan matrix - */ -#include <stdint.h> -#include <stdbool.h> -#include <avr/io.h> -#include <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" - - -#ifndef DEBOUNCE -# define DEBOUNCE 10 -#endif -static uint8_t debouncing = DEBOUNCE; - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; -static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -static matrix_row_t read_cols(void); -static void init_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // initialize row and col - unselect_rows(); - init_cols(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - matrix_debouncing[i] = 0; - } -} - -uint8_t matrix_scan(void) -{ - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - _delay_us(30); // without this wait read unstable value. - matrix_row_t cols = read_cols(); - if (matrix_debouncing[i] != cols) { - matrix_debouncing[i] = cols; - if (debouncing) { - debug("bounce!: "); debug_hex(debouncing); debug("\n"); - } - debouncing = DEBOUNCE; - } - unselect_rows(); - } - - if (debouncing) { - if (--debouncing) { - _delay_ms(1); - } else { - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - matrix[i] = matrix_debouncing[i]; - } - } - } - - return 1; -} - -bool matrix_is_modified(void) -{ - if (debouncing) return false; - return true; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1<col)); -} - -inline -matrix_row_t matrix_get_row(uint8_t row) -{ - return matrix[row]; -} - -void matrix_print(void) -{ - print("\nr/c 0123456789ABCDEF\n"); - for (uint8_t row = 0; row < MATRIX_ROWS; row++) { - phex(row); print(": "); - pbin_reverse16(matrix_get_row(row)); - print("\n"); - } -} - -uint8_t matrix_key_count(void) -{ - uint8_t count = 0; - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - count += bitpop16(matrix[i]); - } - return count; -} - -static void init_cols(void) -{ - DDRB &= ~(1<<6 | 1<<5 | 1<<4); - PORTB |= (1<<6 | 1<<5 | 1<<4); - DDRD &= ~(1<<7 | 1<<6 | 1<<4); - PORTD |= (1<<7 | 1<<6 | 1<<4); - DDRF &= ~(1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7); - PORTF |= (1<<0 | 1<<1 | 1<<4 | 1<<5 | 1<<6 | 1<<7); - -} - -static matrix_row_t read_cols(void) -{ - return (PIND&(1<<4) ? 0 : (1<<0)) | - (PIND&(1<<6) ? 0 : (1<<1)) | - (PIND&(1<<7) ? 0 : (1<<2)) | - (PINB&(1<<4) ? 0 : (1<<3)) | - (PINB&(1<<5) ? 0 : (1<<4)) | - (PINB&(1<<6) ? 0 : (1<<5)) | - (PINF&(1<<7) ? 0 : (1<<6)) | - (PINF&(1<<6) ? 0 : (1<<7)) | - (PINF&(1<<5) ? 0 : (1<<8)) | - (PINF&(1<<4) ? 0 : (1<<9)) | - (PINF&(1<<1) ? 0 : (1<<10)) | - (PINF&(1<<0) ? 0 : (1<<11)); - -} - -static void unselect_rows(void) -{ - DDRB &= ~(1<<0 | 1<<1 | 1<<2 | 1<<3); - PORTB |= (1<<0 | 1<<1 | 1<<2 | 1<<3); - -} - -static void select_row(uint8_t row) -{ - switch (row) { - case 0: - DDRB |= (1<<0); - PORTB &= ~(1<<0); - break; - case 1: - DDRB |= (1<<1); - PORTB &= ~(1<<1); - break; - case 2: - DDRB |= (1<<2); - PORTB &= ~(1<<2); - break; - case 3: - DDRB |= (1<<3); - PORTB &= ~(1<<3); - break; - - } -} diff --git a/keyboard/retro_refit/config.h b/keyboard/retro_refit/config.h index 05fceb92b2..f2194e550c 100644 --- a/keyboard/retro_refit/config.h +++ b/keyboard/retro_refit/config.h @@ -33,8 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COLS 8 // See note in retro_refit.h for an explanation of how this matrix is wired up -#define COLS (int []){ B0, B1, B2, B3, D2, D3, C7, D5 } -#define ROWS (int []){ D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } +#define MATRIX_ROW_PINS { D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } +#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D3, C7, D5 } +#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -46,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_LEVELS 0 /* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 +#define DEBOUNCING_DELAY 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -119,4 +120,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -#endif
\ No newline at end of file +#endif |
