From 1c5f59c8f373fdcc1f82c780a9a2dba188a30c95 Mon Sep 17 00:00:00 2001 From: aplyard Date: Mon, 6 Apr 2020 00:59:19 +0300 Subject: [PATCH 01/37] Create test.txt --- keyboards/aplx6/test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 keyboards/aplx6/test.txt diff --git a/keyboards/aplx6/test.txt b/keyboards/aplx6/test.txt new file mode 100644 index 000000000000..e69de29bb2d1 From a83104fff46532c7304756deccdf4f4b77b36f3d Mon Sep 17 00:00:00 2001 From: aplyard Date: Tue, 7 Apr 2020 17:50:45 +0300 Subject: [PATCH 02/37] aplx6 --- keyboards/aplx6/aplx6.c | 19 +++++++++ keyboards/aplx6/aplx6.h | 16 ++++++++ keyboards/aplx6/config.h | 53 ++++++++++++++++++++++++++ keyboards/aplx6/keymaps/Media/keymap.c | 38 ++++++++++++++++++ keyboards/aplx6/rules.mk | 32 ++++++++++++++++ 5 files changed, 158 insertions(+) create mode 100644 keyboards/aplx6/aplx6.c create mode 100644 keyboards/aplx6/aplx6.h create mode 100644 keyboards/aplx6/config.h create mode 100644 keyboards/aplx6/keymaps/Media/keymap.c create mode 100644 keyboards/aplx6/rules.mk diff --git a/keyboards/aplx6/aplx6.c b/keyboards/aplx6/aplx6.c new file mode 100644 index 000000000000..3a294c199836 --- /dev/null +++ b/keyboards/aplx6/aplx6.c @@ -0,0 +1,19 @@ +/* +Copyright 2020 April Aplyard + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "aplx6.h" + diff --git a/keyboards/aplx6/aplx6.h b/keyboards/aplx6/aplx6.h new file mode 100644 index 000000000000..34eccaabac2d --- /dev/null +++ b/keyboards/aplx6/aplx6.h @@ -0,0 +1,16 @@ +//#ifndef APLX6_H +//#define APLX6_H + +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + k000, k001, k002, \ + k100, k101, k102 \ +) \ +{ \ + { k000, k001, k002 }, \ + { k100, k101, k102 } \ +} + diff --git a/keyboards/aplx6/config.h b/keyboards/aplx6/config.h new file mode 100644 index 000000000000..c775b5909955 --- /dev/null +++ b/keyboards/aplx6/config.h @@ -0,0 +1,53 @@ +/* +Copyright 2020 April Aplyard + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xE0E0 +#define PRODUCT_ID 0x0030 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Aplyard +#define PRODUCT Aplx6 +#define DESCRIPTION Aplx6 MediaPad + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 3 + +/* pin-out */ +#define MATRIX_ROW_PINS { B5, F6 } +#define MATRIX_COL_PINS { B6, F5, F4 } +#define UNUSED_PINS + + +/* ws2812 RGB LED */ +//#define RGB_DI_PIN X + +//#define RGBLIGHT_ANIMATIONS +//#define RGBLED_NUM X // Number of LEDs + + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define TAPPING_TERM 200 + +#endif diff --git a/keyboards/aplx6/keymaps/Media/keymap.c b/keyboards/aplx6/keymaps/Media/keymap.c new file mode 100644 index 000000000000..4c4f612a3816 --- /dev/null +++ b/keyboards/aplx6/keymaps/Media/keymap.c @@ -0,0 +1,38 @@ +#include QMK_KEYBOARD_H + +#define _MAIN 0 +#define _FN 1 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap __MAIN: Default Layer + * ,--------------------------------. + * | .------. |-----|-----|-----| | + * | | | |Play |VolUp| Fn | | + * | | Pro | |-----|-----|-----| | + * | | Micro| --------------------| + * | | | |-----|-----|-----| | + * | '------' |Prev |VolD |Next | | + * | |||||| |-----|-----|-----| | + * '--------------------------------' + */ + [_MAIN] = LAYOUT( + KC_MPLY, KC_VOLU, MO(1), + KC_MPRV, KC_VOLD, KC_MNXT + ), + /* Keymap __FN: Second Layer + * ,--------------------------------. + * | .------. |-----|-----|-----| | + * | | | |Calc |PgUp |TRANS| | + * | | Pro | |-----|-----|-----| | + * | | Micro| --------------------| + * | | | |-----|-----|-----| | + * | '------' |MyPC | PgD |RESET| | + * | |||||| |-----|-----|-----| | + * '--------------------------------' + */ + + [_FN] = LAYOUT( + KC_CALC, KC_PGUP, _______, + KC_MYCM, KC_PGDN, RESET + ) +}; diff --git a/keyboards/aplx6/rules.mk b/keyboards/aplx6/rules.mk new file mode 100644 index 000000000000..0906a040d549 --- /dev/null +++ b/keyboards/aplx6/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # 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 +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = yes # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend From bf988d9c7a8ef003169523b2c10597b7c46e719d Mon Sep 17 00:00:00 2001 From: aplyard Date: Tue, 7 Apr 2020 17:52:42 +0300 Subject: [PATCH 03/37] Delete test.txt --- keyboards/aplx6/test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/aplx6/test.txt diff --git a/keyboards/aplx6/test.txt b/keyboards/aplx6/test.txt deleted file mode 100644 index e69de29bb2d1..000000000000 From 12dce9b331de2e24255f1c7f9dffb300fdb8b144 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Tue, 7 Apr 2020 21:43:19 +0300 Subject: [PATCH 04/37] fff --- keyboards/aplx6/ffff | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/aplx6/ffff diff --git a/keyboards/aplx6/ffff b/keyboards/aplx6/ffff new file mode 100644 index 000000000000..98d03acc98ed --- /dev/null +++ b/keyboards/aplx6/ffff @@ -0,0 +1 @@ +fff From 2cff153326cfd35d5949476f7f72cebc155f6f02 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Tue, 7 Apr 2020 21:44:26 +0300 Subject: [PATCH 05/37] Delete ffff --- keyboards/aplx6/ffff | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/aplx6/ffff diff --git a/keyboards/aplx6/ffff b/keyboards/aplx6/ffff deleted file mode 100644 index 98d03acc98ed..000000000000 --- a/keyboards/aplx6/ffff +++ /dev/null @@ -1 +0,0 @@ -fff From c2e36ba2c7c4a1a1911250ddd8ffc035cd341626 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Tue, 7 Apr 2020 21:47:19 +0300 Subject: [PATCH 06/37] test compile --- .gitignore | 1 - aplx6_Media.hex | 1028 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1028 insertions(+), 1 deletion(-) create mode 100644 aplx6_Media.hex diff --git a/.gitignore b/.gitignore index 0e80cdb6c4bf..eabb4ad8a997 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ *.bin *.eep *.elf -*.hex *.qmk !util/bootloader.hex !quantum/tools/eeprom_reset.hex diff --git a/aplx6_Media.hex b/aplx6_Media.hex new file mode 100644 index 000000000000..a73d37fda9ab --- /dev/null +++ b/aplx6_Media.hex @@ -0,0 +1,1028 @@ +:100000000C941C010C9463010C9463010C94630127 +:100010000C9463010C9463010C9463010C946301D0 +:100020000C9463010C9463010C94B51C0C94891D11 +:100030000C9405150C9463010C9463010C946301FA +:100040000C9463010C9463010C9463010C946301A0 +:100050000C9463010C946B150C9463010C94630174 +:100060000C9463010C9463010C9463010C94630180 +:100070000C9463010C9463010C9463010C94630170 +:100080000C9463010C9463010C9463010C94630160 +:100090000C9463010C9463010C9463010C94630150 +:1000A0000C9463010C9463010C946301AE00A900ED +:1000B0000151AC00AA00AB00B2004B000100B3003C +:1000C0004E00005C0403300000000C03410070008F +:1000D0006C007800360000001003410070006C00D6 +:1000E0007900610072006400000004030904090241 +:1000F0003B00020100A0FA09040000010301010015 +:100100000921110100012240000705810308000AAE +:10011000090401000103000000092111010001226E +:10012000BC000705820320000A1201100100000034 +:1001300008E0E0300001000102030105010902A10D +:100140000185020901A100050919012905150025EC +:10015000019505750181029501750381010501096C +:100160003009311581257F950275088106093815FA +:1001700081257F950175088106050C0A38021581D5 +:10018000257F950175088106C0C005010980A10180 +:10019000850319012AB700150126B70095017510CE +:1001A0008100C0050C0901A101850419012AA002E2 +:1001B000150126A002950175108100C005010906F0 +:1001C000A1018505050719E029E715002501950816 +:1001D000750181020507190029EF1500250195F029 +:1001E000750181020508190129059505750191021E +:1001F000950175039101C005010906A101050719C3 +:10020000E029E71500250195087501810295017522 +:100210000881010507190029FF150026FF00950632 +:1002200075088100050819012905950575019102D8 +:10023000950175039101C00011241FBECFEFDAE0D4 +:10024000DEBFCDBF04B603FE27C080914802909167 +:100250004902A0914A02B0914B028730904BA740CF +:10026000B04BD1F4109248021092490210924A0207 +:1002700010924B0214BE84B7877F84BF0FB6F894E8 +:10028000A895809160008861809360001092600062 +:100290000FBEE0E0F8E3099511E0A0E0B1E0EAEA82 +:1002A000FFE302C005900D92AC37B107D9F722E009 +:1002B000ACE7B1E001C01D92A834B207E1F70E949B +:1002C000E6190C94AB1F0C940000CF93DF939C01B4 +:1002D0003A9521153F4168F5EC01CC27D170DC013E +:1002E000AA27B270AC01442754709C0122273870B1 +:1002F00094FF11C080E1CD2B09F480E0AB2B09F015 +:100300008062452B09F08064232B09F08068FB0193 +:10031000DF91CF91099481E0CD2B09F480E0AB2BE4 +:1003200009F08260452B09F08460232B81F38860FB +:10033000EECFDF91CF910895CF93DF93EC01805EF4 +:100340009109089720F060ED7CE0209711F463E4B8 +:100350007AE0CE010E9465018C2FDF91CF910C9441 +:10036000B309CF93DF93EC010E94010ACE01805EB6 +:100370009109089720F067ED7CE0209711F46AE47A +:100380007AE0CE01DF91CF910C946501CF93DF939A +:10039000EC010E949C01CE01DF91CF910C94B10140 +:1003A00081E0089581E008950C94D20108950C94A1 +:1003B000D6011F93CF93DF9300D000D00F92CDB71B +:1003C000DEB749835A836B8320918C0189819A819E +:1003D00021111BC06623A9F00E940912182F682F53 +:1003E00089819A810E94B41169817A81812F0F904D +:1003F0000F900F900F900F90DF91CF911F910C9461 +:100400009A020E94E111182FEFCF0E940912698110 +:100410007A81EDCFFC0140815181628173818481B9 +:100420000C94D901CF93DF93EC010E940A02BE0124 +:10043000DF91CF910C94D7010E945013811102C01B +:100440000E94ED130E94C0050C94A6040C94A9040C +:10045000282F2F7041F0822F90E02A3010F44D9613 +:1004600008950697089587E290E0089508950C9402 +:10047000360281E008950C943902CF93C82F0E9470 +:1004800037028C2FCF910C943B0208950E94F40CFC +:100490000E9445022FEF84E39CE021508040904071 +:1004A000E1F700C000000C948F150F931F93CF93BA +:1004B000DF93EC010E940A028C01BE010E94D4016C +:1004C000882359F1BE01C8010E943706882329F10B +:1004D000BE01C8010E94D9068823F9F0BE01C801F7 +:1004E0000E941A078823C9F0BE01C8010E943D0876 +:1004F000882399F08A81882339F001158CE5180743 +:1005000051F00E3D1C4579F0CE01DF91CF911F9146 +:100510000F910C94D0010E94460280E0DF91CF91B0 +:100520001F910F9108950E94ED13F7CF90E080E0A6 +:1005300008950895972F70E023E0929F600D711D3C +:100540001124FB0196E0899FE00DF11D1124EE0FAF +:10055000FF1FE455FF4F859194910895FC01EE0F24 +:10056000FF1FEC53FF4F859194910895CF93DF9334 +:100570000E949A020E94CB03EC01811520E59207AC +:1005800008F042C0811530E4930708F0BDC0883EF2 +:10059000910528F5803E910508F09DC0883A9105A7 +:1005A00088F4853A910508F08FC08130910509F4EF +:1005B00092C0009709F48FC0049708F08CC0D0E077 +:1005C000C0E089C08F3B910508F489C0805C910927 +:1005D000C03CD105A0F30E94AE02EC017CC08115A5 +:1005E000904250F4C11581E0D80708F074C0C03FB4 +:1005F000D10528F3D0656FC0C11590E3D90708F085 +:1006000079C0CE019F70E7CF811525E5920758F597 +:10061000811534E5930708F0A6C0811542E59407DB +:1006200050F4C11581E5D80708F471C0DC2FCC2740 +:10063000C16FD06A50C0982F969596959E012370F1 +:100640003327C115D34508F07FC0C1E0D0E002C018 +:10065000CC0FDD1F2A95E2F720E2929FC001112402 +:10066000C82BD92B6FC0C11589E5D807A8F4C115CF +:1006700098E5D90708F07CC0C11526E5D20708F037 +:100680009ECF8C2F0E946204C82FD0E0DC2FCC2795 +:10069000CC27DF71D0621FC0C1153AE5D30708F43B +:1006A0006CC0CE0190568115904208F088CF8D2FF6 +:1006B0008F710E94620490E0982F882788279F718D +:1006C0009C012C2BE901E6CFC55AD0E0CD5BDE4F73 +:1006D000C881D0E0D064CE01DF91CF910895C85A8F +:1006E000D0E0CC0FDD1FCB5EDE4F0990D881C02D4E +:1006F000D464F1CFCE019927D3FF03C0EC01D86CAD +:10070000EACFEC01D06CE7CFDF70D06AE4CFCE0146 +:10071000E4E096958795EA95E1F783702C2F26956E +:100720002695237090E2299F90011124382B8C2F5D +:100730008370C1E0D0E002C0CC0FDD1F8A95E2F7E4 +:10074000C22BD32BDC68C7CFC1E0D0E002C0CC0FF6 +:10075000DD1F2A95E2F730E2939FC0011124C82BD8 +:10076000D92BDA68B8CFD82FCC27C46FD06AB3CFD3 +:10077000DC2FCC27C06FD06AAECF8C2F8F700E9439 +:10078000620434E0D695C7953A95E1F7CF709C2F77 +:10079000EC01D069A0CF82389105B1F1B0F481337A +:1007A000910509F475C048F48932910509F469C0CE +:1007B0008A32910509F473C008958533910509F4CF +:1007C00059C08933910501F10895833E9105A9F13E +:1007D00038F4803E9105F9F0823E910549F1089583 +:1007E000863E9105A9F1873E9105C9F1843E9105A8 +:1007F00019F520913A0221FF1FC08091390284FD32 +:1008000014C087EE90E00895209139022370A1F082 +:1008100080EE90E008952091390220FD47C030918C +:100820003A0230FF09C024FF44C090E080E004C0D9 +:100830002091390222FDF7CF08952091390222FD3F +:100840003BC030913A0230FDE3CF24FFF5CFEDCF2E +:100850002091390223FFF0CF24FDE7CFD2CF2091A2 +:10086000390223FD2CC030913A0231FFEECF84EEE5 +:1008700090E008952091390225FFDECF89E290E0D3 +:1008800008952091390225FFD7CF85E390E00895A0 +:100890002091390226FFD0CF8AE290E0089520917E +:1008A000390226FFC9CF81E390E0089589E390E003 +:1008B000089583EE90E0089582EE90E0089586EE2C +:1008C00090E008959091390292FF06C0282F287178 +:1008D0002830F9F4877F846093FF06C0282F2871A1 +:1008E0002831F1F4877E846120913A0220FF06C00E +:1008F000382F38713830D9F4877F816021FF06C0E6 +:10090000282F28712831D1F4877E816194FD877E5C +:100910000895282F24712430F9F68B7F8860DCCF6E +:10092000282F2471243101F78B7E8861DDCF382F89 +:100930003171313019F78E7F8860E0CF282F217117 +:10094000213121F78E7E8861E1CF08950C94A504B2 +:1009500008950C94A804E82FF0E0E45DFD4F808139 +:100960000895089580EA8A95F1F70895CF93DF936B +:1009700025982D9A86988E9AA6E4B1E049E451E034 +:10098000C1E0D0E08D91E82FE295EF70F0E061A139 +:100990008F709E0101C0220F8A95EAF7922F9095E1 +:1009A000962391A382A1822B82A34A175B0751F75A +:1009B00010922A0210922C0210922B0210922D02F9 +:1009C00082E00E947405DF91CF910C941C024F923B +:1009D0005F927F928F929F92AF92BF92CF92DF925F +:1009E000EF92FF920F931F93CF93DF930AE212E0EF +:1009F00099E4A92E91E0B92E912CCC24C394D12C4A +:100A0000D8017C90F80111928F01D5018D915D0183 +:100A1000C82FC295CF70D0E099A18F70760101C028 +:100A2000EE0C8A95EAF7892F8E2989A38AA18E2C4C +:100A3000809488218AA30E94B20486E4482E81E033 +:100A4000582E30E020E0F8013197D2014D912D0170 +:100A5000842F82958F7090E0DC0190968C9160815C +:100A600090E04F7002C0959587954A95E2F780FD1A +:100A700039C08C2D022E01C0880F0A94EAF7862B0C +:100A800080832F5F3F4F23303105F9F689A18822FB +:100A900089A28AA1E82AEAA281E09081971101C087 +:100AA00080E0982AB2E00C321B0709F0A9CF292D6B +:100AB00042E06CE272E08AE292E00E9475050E94D8 +:100AC0002602892DDF91CF911F910F91FF90EF901A +:100AD000DF90CF90BF90AF909F908F907F905F906E +:100AE0004F90089580E0CBCF0895FF920F931F930E +:100AF000CF93DF93F82E092F162FD72FC42F222341 +:100B000049F081E080937E010E94351590937D012C +:100B100080937C0180917E018823A1F080917C01EB +:100B200090917D010E944115069760F0EF2DF02F06 +:100B3000A12FBD2FCE0FDF2FD11DEC17FD0741F4E4 +:100B400010927E01DF91CF911F910F91FF90089538 +:100B500081918D93F2CFCF93DF93EC0197FF0CC07F +:100B6000FB018281882341F00E94D605CE019F7748 +:100B70000E941A060E94020681E0DF91CF9108953B +:100B80008CE090E00E94691F90E0B0E0A0E08093CC +:100B90002E0290932F02A0933002B0933102089559 +:100BA00060912E028CE090E00C94771F0E949E12C0 +:100BB000809332020E94B11280912E02813089F01E +:100BC000882359F0823091F08430B9F08FE39CE9AA +:100BD0000197F1F700C00000089582EE0E94B3096A +:100BE000F5CF88E193E00E94C601F0CF82EE0E942B +:100BF000B30987E50E94300AE9CF86EE0E94300AE9 +:100C000088E1F8CF80912E02813071F0882341F085 +:100C1000823031F0843061F0809132020C94AE1257 +:100C200082EE0E94010AF8CF8CE20E94300AF4CFD3 +:100C300088E2FBCF0F931F93CF93DF938C01CCE01F +:100C4000D0E0C8010C2E02C0969587950A94E2F771 +:100C50008F700E9428020E94300A2497CC3F8FEFA9 +:100C6000D80779F7DF91CF911F910F9108950F93D6 +:100C70001F93CF93DF93EC018B01FB0182818823CB +:100C800071F0C33EFCE5DF0719F188F4C13EECE5E5 +:100C9000DE07C9F081E0C23EFCE5DF0789F0B8015C +:100CA000CE01DF91CF911F910F910C94AB05C43E03 +:100CB0008CE5D80779F084E0C53EECE5DE0779F7EE +:100CC00080932E0202C010922E020E94D005E7CF20 +:100CD00082E0F6CF83E0F4CF0F931F93CF93DF939F +:100CE000C62FD42F022FFC0182818823C9F0609384 +:100CF00081010E9435159093800180937F0180E2ED +:100D00008C0F883008F050C0C77081E001C0880F98 +:100D1000CA95EAF7DF91CF911F910F910C94430A86 +:100D200010918101161335C080917F01909180014F +:100D30000E944115883C910560F5C0E2CD0F1D175A +:100D4000B9F080E2810F883040F4177081E001C073 +:100D5000880F1A95EAF70E944A0AC83048F481E0E1 +:100D60009D2F977001C0880F9A95EAF70E94430A59 +:100D7000802F0E94300AC830B8F4D77081E001C0DB +:100D8000880FDA95EAF7DF91CF911F910F910C94BC +:100D90004A0A80E28C0F883038F4C77081E001C0C5 +:100DA000880FCA95EAF7EFCFDF91CF911F910F918E +:100DB00008959C01CB01233F4CE5340731F190F4B9 +:100DC000283DFCE53F07E9F0293D4CE5340769F192 +:100DD000273D3C4579F426E241EE61EE0E946C0627 +:100DE00080E00895253FFCE53F07B9F090F0263FED +:100DF0003C45B9F0FC0182818823D1F01092810139 +:100E0000089527E245EE65EEE9CF26E241EE60EE79 +:100E1000E5CF27E245EE64EEE1CF26E241EE62EE59 +:100E2000DDCF27E245EE66EED9CF28E241E0EBCFF9 +:100E300081E00895CF93DF93EC01FB018281882349 +:100E400009F419C1C230FCE5DF07C0F1C6319CE5E9 +:100E5000D90730F09E012A5F3C452930310570F5F5 +:100E60000E94631390933A0280933902C031ECE5FB +:100E7000DE0709F4CFC008F05BC0C8308CE5D807A6 +:100E800009F4B6C088F5C430ECE5DE0709F4A8C063 +:100E9000C0F4C2308CE5D80709F49CC080913902B7 +:100EA0008260C330DC4509F498C08091390290918A +:100EB0003A020E9471130E94F40C80E0DF91CF91FE +:100EC0000895809139028061C630ECE5DE0709F4AF +:100ED00084C0809139028860C730DC4508F47DC049 +:100EE00080913902806279C0CC308CE5D80709F452 +:100EF00089C070F4809139028C60CA30ECE5DE075D +:100F000009F46BC008F478C0809139028E7F65C007 +:100F1000CE308CE5D80709F479C0809139028B7FF7 +:100F2000CF30DC4508F459C0809139028F7E55C01E +:100F3000CB3FECE5DE0709F457C030F5C3318CE553 +:100F4000D80709F46FC078F4C131ECE5DE0709F485 +:100F500065C0C231DC4509F0A8CF0E94F40C809135 +:100F600039028F773AC0C5318CE5D80709F462C0E1 +:100F700008F476C080913A028160CA3FDC4509F0EE +:100F800094CF80933A0291CFCF3FFCE5DF0709F47D +:100F90004DC088F480913A028D7FCD3F9CE5D90702 +:100FA00081F380913A028E7FCE3FDC4550F38091F1 +:100FB0003A028360E6CFC130FDE5DF0709F459C08E +:100FC00008F444C080E0C230DD4509F06ECF0E94D5 +:100FD000EF136BCF8091390281608093390265CF26 +:100FE000809139028460F9CF80913A028260C9CF42 +:100FF000809139028064F1CF0E94F40C8091390213 +:101000008068EBCF809139028D7FE7CF80913902E4 +:10101000877FE3CF809139028F7DDFCF80913902C6 +:101020008F7BDBCF80913902837FD7CF80913A02CB +:101030008C7FA7CF8091390282FB992790F921E01C +:10104000922790FB82F990FB83F9C7CF80913A02F7 +:10105000982F909591708E7F892B90FB81F991CF7D +:101060000E94F40C90913902892F97FB87F98058E0 +:10107000B4CF81E0ACCF81E021CFCF93DF93EB0100 +:1010800086319C4511F50E949E129A81992399F010 +:101090008A7A91E009F490E090938201811109C06D +:1010A00089E20E9479120E94ED1280E0DF91CF91D7 +:1010B000089585E3F6CF80918201811104C089E211 +:1010C0000E948012F0CF85E3FBCF81E0EFCF9093B9 +:1010D0008801809387010895E0918701F09188014C +:1010E000309721F00190F081E02D099480E008957F +:1010F000E0918701F0918801309799F020911401D7 +:10110000222359F02091390227FF07C0DC012C91DE +:1011100011962C93119725E02C930280F381E02DFA +:1011200009940895E0918701F0918801309739F092 +:1011300022E0DC012C930480F581E02D09940895D0 +:1011400020918501309186012817390771F090931D +:10115000860180938501E0918701F09188013097A5 +:1011600021F00680F781E02D0994089520918301F4 +:10117000309184012817390771F09093840180938E +:101180008301E0918701F0918801309721F000847C +:10119000F185E02D0994089585B7806885BF85B7EE +:1011A000806885BF0895089508950C94D308089524 +:1011B0000C94D7080E94CC080E94D4080C94D5083F +:1011C00081E008950E942C150E94B6040E94A0158B +:1011D0000C94D808AF92BF92CF92DF92EF92FF9219 +:1011E0000F931F93CF93DF93CDB7DEB72A970FB638 +:1011F000F894DEBF0FBECDBF0E94E7040E94E00856 +:10120000882309F45FC08AE8A82E81E0B82E10E098 +:1012100000E0C02E802F0E94AB04E82EF501D19093 +:101220005F01D81609F44BC08091F70181FD0E943F +:10123000B10480E0FF24F394DE249D2D9F21D1F1A1 +:101240008E83CF82EF2081E009F480E088870E94BE +:1012500035158160782F9A8789874E815F816885EF +:101260008A850E948409F801E657FE4F8081F8269E +:10127000F0820E942D170E946C08909189018917B5 +:1012800091F10E946C08809389012A960FB6F89418 +:10129000DEBF0FBECDBFDF91CF911F910F91FF90A9 +:1012A000EF90DF90CF90BF90AF900C943D0201E0A3 +:1012B00010E0AFCF8F5FFF0C833009F0BECF01305D +:1012C0001105A9F78FEF89838A831B820E94351548 +:1012D0008160782F9D838C8349815A816B818D81B8 +:1012E0000E948409C6CF2A960FB6F894DEBF0FBEBF +:1012F000CDBFDF91CF911F910F91FF90EF90DF90C5 +:10130000CF90BF90AF900895CF93DF93CDB7DEB766 +:101310002B970FB6F894DEBF0FBECDBF4F83588713 +:1013200069877A878B871E821D8285E0FE0137964A +:10133000DE01119601900D928A95E1F749815A815B +:101340006B817C818D819E812B960FB6F894DEBFD8 +:101350000FBECDBFDF91CF910C94940FFC01808123 +:1013600091810C944B12CF93C82F882309F447C066 +:101370008CEF8C0F813AA0F46C2F8091000190913A +:1013800001010E940814882329F08C2F0E948012EA +:101390000E94ED128C2F0E947912CF910C94ED12C5 +:1013A00080E28C0F883048F4C77081E001C0880F5C +:1013B000CA95EAF70E94A112F0CFEBE5EC0FE330FB +:1013C00040F4F0E0E758FE4F808190E0CF910C941C +:1013D000A008E8E5EC0FE73150F4F0E0EE0FFF1F56 +:1013E000E55BFE4F80819181CF910C94B608C03FA0 +:1013F00030F08C2F0E943B16CF910C942217CF9186 +:101400000895882361F19CEF980F913A20F40E948F +:1014100080120C94ED1290E2980F983050F487707F +:1014200091E001C0990F8A95EAF7892F0E94A712CF +:10143000F0CF9BE5980F933020F490E080E00C947F +:10144000A00898E5980F973120F490E080E00C9484 +:10145000B608803F20F00E94A3160C94221708952E +:10146000CF93C82F0E94B309C93349F42FEF87EEF9 +:1014700093E0215080409040E1F700C000008C2FA5 +:10148000CF910C94010A882321F00E94A1120C94A0 +:10149000ED120895882321F00E94A7120C94ED12FA +:1014A0000895BF92CF92DF92EF92FF920F931F9316 +:1014B000CF93DF936C01D62FC72FFC0105810295D6 +:1014C0000F70128111110E94C1120E949712E82E12 +:1014D000882371F01123B1F080E28D0F883090F0F5 +:1014E00082E00E9438130E94971291E0E82EE926CC +:1014F000BC2EB2949FE0B922EB2DF0E0E355F04E04 +:101500000C944F1FE12CF4CF0C2F0F70C07F11F003 +:101510000295007F1123A9F0002359F080E28D0F7E +:10152000883010F0D11109C0802F0E94A1120E94B2 +:10153000ED128D2F0E94B30914C0802F0E94B412A7 +:10154000F6CF8D2F0E94010A002359F080E28D0F03 +:10155000883010F0D1112CC0802F0E94A7120E9459 +:10156000ED122B2D2850330B2430310520F40E942E +:101570006C080E943D02EE2009F4D5C10E9493122E +:1015800080FDD1C1F60112820E948D120E941811B5 +:10159000C6010E94B40C0E948D12DF91CF911F9161 +:1015A0000F91FF90EF90DF90CF90BF900C94391186 +:1015B000802F0E94BA12D3CFFC2FFF70FF2EC07F66 +:1015C000C03219F0F29480EFF822DD2369F0D130B7 +:1015D00049F1112391F1002351F1F601858180FF3A +:1015E000A8CF8F70858323C0112381F0011106C01D +:1015F0000E94D4128F290E94430AB3CF0130C1F751 +:101600000E94D4128F290E94DA12ABCF011106C0BA +:101610000E94E3128F2D0E944A0AA3CF013009F4E1 +:10162000A0CFF6CF112329F0063008F09ACF8F2DE6 +:10163000E2CF053008F095CFEDCF002359F3D93331 +:1016400049F4FFEF27EE33E0F15020403040E1F75E +:1016500000C000008D2F0E94010A83CF8C2F869539 +:101660008695837069F0813009F07BCF8D2F9C2F98 +:101670009370111102C090E080E00E94B60871CF13 +:101680008D2F9C2F9370111102C090E080E00E947A +:10169000A00867CF112309F1D53F99F0D63FB9F0E3 +:1016A000D43F49F480913302909134028160909349 +:1016B0003402809333028D2F0E943B160E94221722 +:1016C00050CF80913302909134028260F0CF8091AC +:1016D0003302909134028460EACFD53F89F0D63F3F +:1016E000A9F0D43F49F480913302909134028E7F67 +:1016F00090933402809333028D2F0E94A316DECF85 +:1017000080913302909134028D7FF2CF8091330229 +:10171000909134028B7FECCF8C2F837009F041C005 +:1017200011111FCF4D2F429546954770440F440F1E +:101730000D2F0F7010E030E020E0042E04C0000FE9 +:10174000111F221F331F0A94D2F760E070E0CB0113 +:10175000D4FF0FC06FE070E080E090E004C0660F3F +:10176000771F881F991F4A95D2F7609570958095CD +:101770009095C695C695C370602B712B822B932BC9 +:10178000C23049F058F4C13019F00E94CA10E9CEB5 +:101790000E94B810E6CE0E94DC10E3CE0E94B61084 +:1017A000E0CE8695112311F08C2F8170882309F4E7 +:1017B000D8CE4D2F429546954770440F440F0D2FBC +:1017C0000F7010E030E020E0042E04C0000F111F65 +:1017D000221F331F0A94D2F760E070E0CB01D4FFE0 +:1017E0000FC06FE070E080E090E004C0660F771FEC +:1017F000881F991F4A95D2F76095709580959095AE +:10180000C695C695C370602B712B822B932BC2306B +:1018100049F058F4C13019F00E948F11A2CE0E94F5 +:101820007D119FCE0E94A1119CCE0E94F21099CEF4 +:10183000CF70112329F08C2F0E9418118D2FDBCE31 +:101840008D2F0E944A0A8C2F0E9439118ACED23FD6 +:1018500089F160F4D03FC9F0D13F29F1112309F497 +:1018600042C0011166CE8C2F8F7121C0D33F39F158 +:10187000D43FA1F7112369F1CF718C2F0E94181169 +:1018800063E08C2F0E9423136CCE112341F00530AE +:1018900008F067CE8C2F8F710E945C1162CE0630EB +:1018A00008F05FCEF7CF8C2F8F71112369F20E9461 +:1018B000181157CE8C2F8F711123C9F3C5CF112367 +:1018C00029F08C2F8F710E9403114BCE0E94FE10C5 +:1018D00048CE81E00E943813023008F442CE82E004 +:1018E0000E9438133ECE002359F0D93309F0B2CE0E +:1018F0008FEF97EEE3E081509040E040E1F7A8CE13 +:101900008C2F8F71A1CF4C2F4F706D2FC6010E946D +:1019100096020E942E1025CE4C2F4F706D2FC601BF +:101920000E9499021ECEDF91CF911F910F91FF90DF +:10193000EF90DF90CF90BF9008950F931F93CF93B8 +:10194000DF93EC01688179818A810E9455128C01B4 +:101950000E94B3110E94B510B801CE01DF91CF9162 +:101960001F910F910C94510ACF93DF93EC018B815F +:101970009C81892B29F08881998189238F3F19F4D3 +:10198000DF91CF910895CE010E9455028823C1F3C3 +:10199000CE010E949D0CCE01DF91CF910C941202DA +:1019A000882321F00E94B4120C94ED12089588232C +:1019B00021F00E94BA120C94ED1208950E94C112F7 +:1019C0000E94D1120E94ED120E9447180E94221715 +:1019D00090E080E00E94A00890E080E00C94B608BF +:1019E0000E9487120C94DE0C0E94B1120C94F00C31 +:1019F000E92FE295EF70E250EE3070F4F0E0E3543E +:101A0000F04E0C944F1F803F19F020F4883E20F4D4 +:101A100081E00895843FE1F380E00895883EC0F3BB +:101A2000813FD1F7F5CF93FB882780F908950E9475 +:101A30004B120C94F80CCF93DF9300D000D00F9290 +:101A4000CDB7DEB70F900F900F900F900F90DF91F2 +:101A5000CF910895CF93DF9300D000D000D0CDB7C1 +:101A6000DEB726960FB6F894DEBF0FBECDBFDF916E +:101A7000CF9108951F93CF93DF93C0918D0116E00E +:101A800080918E018C1304C0DF91CF911F91089536 +:101A9000D0E01C9FF0011D9FF00D1124E157FE4F77 +:101AA0004081518162817381848195810E942A0DD8 +:101AB0002196C770E5CF4091BF015091C001609160 +:101AC000C1017091C2018091C3019091C4010C9435 +:101AD0002A0D1F93CF93DF938091C401807FC1F4BF +:101AE0008091C1018823A1F080918D01C0918E0168 +:101AF0006091BF017091C0014091C2015091C3013A +:101B0000D62FD723DA01A095B09516E0C81304C0EC +:101B1000DF91CF911F91089590E04115510511F08B +:101B2000DF3F31F401968770F1CF2A0F3B1F17C0BA +:101B3000189FF001199FF00D1124E157FE4F2181EC +:101B40002713F0CF20812613EDCF22812111EACF78 +:101B5000238134812417350740F3241B350B283C9F +:101B6000310500F72091C4012F7020612093C4013A +:101B700026E0289FF001299FF00D1124EC56FE4F1E +:101B800080818F70806180838FEB91E00E94B40C24 +:101B9000DF91CF911F910C943A0DBF92CF92DF92BB +:101BA000EF92FF920F931F93CF93DF93CDB7DEB7E2 +:101BB00061970FB6F894DEBF0FBECDBF8C0185E0F4 +:101BC000F801DE011D9601900D928A95E1F7D8018A +:101BD0004C9111965C9111971296EC90129780910E +:101BE000C2019091C301009709F47FC12091BF0108 +:101BF0003091C001622F63236F3F09F476C11396C1 +:101C0000CD90DC90B090C101BB2009F411C1C81681 +:101C1000D906D0F1F601E81BF90BCF01FF24F394AC +:101C2000883C910508F0F12C8091C401982F907F99 +:101C3000FF2009F4B8C091117FC0FE2C351329C0D4 +:101C4000241327C0E11025C08F7080618093C401E8 +:101C50000E945B0D8FEB91E00E94B40C8091C40157 +:101C6000D80115968C938F2D61960FB6F894DEBF30 +:101C70000FBECDBFDF91CF911F910F91FF90EF90DD +:101C8000DF90CF90BF900895809590958C0D9D1D0D +:101C9000C5CFCD2829F0852F84238F3F09F041C17E +:101CA00080E0B82FB170DB2E80FF3CC080918D01A9 +:101CB00020918E0136E0821315C04D875E878D8599 +:101CC0009E850E944B12292F22952F702230F0F012 +:101CD000243018F59F70F1F0F8019581907FD1F4D0 +:101CE000D12C1EC090E0389FF001399FF00D1124D7 +:101CF000E157FE4F6181651306C06081641303C024 +:101D00006281E6120FC001968770D5CF9F7011F0E7 +:101D1000882331F3805E883018F3C8010E94B40C28 +:101D2000FD2CA1CFEE2009F49ECF8091C4018160EB +:101D30008093C401F12C97CF351306C0241304C03F +:101D4000D801EE2009F49AC04D875E878D859E8567 +:101D50000E94170D882319F1EE2009F18091C4012A +:101D6000803270F02091BF013091C00138872F83FD +:101D70001986DB86CA868C87CE0107960E94B40C32 +:101D800086E0F801AFEBB1E001900D928A95E1F7A2 +:101D90000E94690D0E945B0DFF24F39464CFC8017B +:101DA0000E94B40CF9CF911113C07C2DD98AC88A36 +:101DB0006E2D89890E941B0D8FEB91E00E94B40C5F +:101DC00086E0EFEBF1E0DF011D928A95E9F763C051 +:101DD000351312C0241310C0E1100EC0F801858322 +:101DE000C8010E94B40CEFEBF1E086E0DF011D9228 +:101DF0008A95E9F7FB2C37CF4D875E878D859E85C9 +:101E00000E94170D882359F2EE2049F28091C401F7 +:101E1000803208F4B5CF2091BF013091C0013A83E0 +:101E200029831B82DD82CC828E83CE010196A6CFD0 +:101E3000C816D90698F1F601E81BF90BCF01F12C71 +:101E4000883C910508F049C0FE2CEE2009F4A7CF8C +:101E5000351332C0241330C08091C40180FD23C0EB +:101E6000982F907F01F1D80115968C931597903F8C +:101E700039F0982F907F905F8F70892B15968C93F7 +:101E8000C8010E94B40C86E0F801AFEBB1E001900C +:101E90000D928A95E1F70E945B0DE5CE80959095B5 +:101EA0008C0D9D1DCCCF86E0F801AFEBB1E0019029 +:101EB0000D928A95E1F7D7CE4D875E878D859E85F9 +:101EC0000E94170D81115CCF8091C40181608093C5 +:101ED000C401C8010E94B40CC6CE7C2DD98AC88A20 +:101EE0006E2D89890E941B0D6BCFEE2009F457CF10 +:101EF0004D875E878D859E850E94170DF82E88235D +:101F000009F44DCF86E0F801AFEBB1E001900D92FE +:101F10008A95E1F78FEB91E00E94AE090E94690D6E +:101F2000BACF81E08E25BDCE1F93CF93DF93CDB77F +:101F3000DEB72C970FB6F894DEBF0FBECDBF4F8330 +:101F4000588769877A878B879C87CE0107960E947E +:101F5000CD0D882369F08A859B85892B39F04F81C7 +:101F60005885842F85238F3F09F071C016E05FC02C +:101F700086E0FE013796DE01119601900D928A955A +:101F8000E1F78A859B85892B89F388859F81892341 +:101F90008F3F61F320918E0130E0C9010196877077 +:101FA000992740918D014817190671F40E94F40C8D +:101FB00010928E0110928D0186E0EFEBF1E0DF01CF +:101FC0001D928A95E9F7D2CF96E0929FD001939F18 +:101FD000B00D1124A157BE4FFE01319601900D9214 +:101FE0009A95E1F780938E010E943A0DBFCF819FB1 +:101FF000C001112481579E4F0E94CD0D8823E9F026 +:10200000E0918D011E9FF0011124E157FE4F4081A8 +:10201000518162817381848195810E942A0D809112 +:102020008D0190E001968770992780938D018091B2 +:102030008D0190918E018913DACF2C960FB6F8940A +:10204000DEBF0FBECDBFDF91CF911F91089569858F +:102050007A858B859C850E942A0D88CFEF92FF920E +:102060000F931F93CF93DF938C01892B81F0F12C79 +:10207000EE24E394E8012196F8018491843770F40A +:10208000843008F05FC08130B1F08230A1F1DF917F +:10209000CF911F910F91FF90EF900895853709F42C +:1020A0004CC008F43DC09CE7980F903780F78F77BD +:1020B0000E94010A49C00E5F1F4FFE01849190E209 +:1020C000980F983060F48770FE2D01C0FF0F8A953D +:1020D000EAF78F2F0E94C4120E94ED1202C00E94E4 +:1020E000B3098F2D815030F2EFE9FFE03197F1F71E +:1020F00000C00000F7CF0E5F1F4FFE01849190E2F9 +:10210000980F983050F48770FE2D01C0FF0F8A950C +:10211000EAF78F2F0E94CA12DFCF0E94010AE1CF97 +:102120000E5F1F4FFE01C491C150D8F28FE99FE0AE +:102130000197F1F700C00000F7CF0E5F1F4FFE01BF +:10214000F490CFCF0E94B3098E01CBCF08950C94A9 +:10215000A6100E94A7106093CE017093CF018093C8 +:10216000D0019093D1010C94DE0C08950C94A91029 +:102170000F931F930091CE011091CF012091D001B8 +:102180003091D101602B712B822B932B1F910F91DA +:102190000C94A9100F931F930091CE011091CF01C1 +:1021A0002091D0013091D1016023712382239323A8 +:1021B0001F910F910C94A9100F931F930091CE01C2 +:1021C0001091CF012091D0013091D101602771276A +:1021D000822793271F910F910C94A9100C94A6109D +:1021E0000C94EE100E94F0106093CA017093CB0122 +:1021F0008093CC019093CD010C94DE0C60E070E0F4 +:10220000CB010C94F2100F931F9341E050E060E07B +:1022100070E08A019B0104C0000F111F221F331FB1 +:102220008A95D2F7C901B8011F910F910C94F21051 +:102230000F931F9341E050E060E070E004C0440F52 +:10224000551F661F771F8A95D2F78091CA0190911A +:10225000CB01A091CC01B091CD018A019B01082B4B +:10226000192B2A2B3B2BC901B8011F910F910C94FC +:10227000F2100F931F9341E050E060E070E004C063 +:10228000440F551F661F771F8A95D2F7CB01BA01FD +:1022900060957095809590950091CA011091CB0141 +:1022A0002091CC013091CD016023712382239323AF +:1022B0001F910F910C94F2100F931F9341E050E087 +:1022C00060E070E004C0440F551F661F771F8A95B9 +:1022D000D2F78091CA019091CB01A091CC01B0912D +:1022E000CD018A019B01082719272A273B27C9010D +:1022F000B8011F910F910C94F2100F931F9300914E +:10230000CA011091CB012091CC013091CD01602BFD +:10231000712B822B932B1F910F910C94F2100F9322 +:102320001F930091CA011091CB012091CC013091F3 +:10233000CD0160237123822393231F910F910C946D +:10234000F2100F931F930091CA011091CB012091BD +:10235000CC013091CD0160277127822793271F91EF +:102360000F910C94F2100895E92FEE0F9E0F890F34 +:10237000982F977041E001C0440F9A95EAF786952F +:102380008695869595E0899FF0011124EB53FE4FC9 +:1023900030E020E070E05191DF011197CB01022E77 +:1023A00002C0969587950A94E2F7817081958527FA +:1023B000842385278C932F5F3F4F2530310559F7B4 +:1023C0000895E92FEE0F9E0F890F982F977086952D +:1023D0008695869525E0829FF0011124EB53FE4FF0 +:1023E00050E040E080E0219130E0092E02C03695B7 +:1023F00027950A94E2F721703327042E01C0220F9B +:102400000A94EAF7822B4F5F5F4F4530510559F729 +:102410000895BF92CF92DF92EF92FF920F931F9396 +:10242000CF93DF938C01C090CA01D090CB01E09094 +:10243000CC01F090CD018091CE019091CF01A0917F +:10244000D001B091D101C82AD92AEA2AFB2ACFE1CA +:10245000D0E0BC2ED701C6010C2E04C0B695A795BE +:10246000979587950A94D2F780FD0EC0219788F73B +:10247000B12C8B2DDF91CF911F910F91FF90EF9099 +:10248000DF90CF90BF900895B8018C2F0E94B602C4 +:10249000019761F3EECFCF93DF93EC010E94091215 +:1024A000BE01DF91CF910C94B6021F93CF93DF93BF +:1024B000EB0190918C01992331F0CB01DF91CF9109 +:1024C0001F910C944B12882379F0CB010E940912C2 +:1024D000182F682FCE010E94B411BE01812FDF9109 +:1024E000CF911F910C94B602CB010E94E111182FDD +:1024F000F4CF682F80910001909101010C94881411 +:10250000682F80910001909101010C9493148091A7 +:102510000001909101010C949E148091D201859547 +:102520008595859508958091D20187700895909141 +:10253000D201977081E009F480E008958091F6015E +:1025400008959091F601892B8093F6010895809566 +:102550009091F60198239093F60108958093F601E7 +:1025600008951092F60108959091F501892B8093BA +:10257000F501089580959091F50198239093F501C8 +:1025800008951092F50108959091F401892B80939C +:10259000F401089580959091F40198239093F401AB +:1025A00008951092F40108958091D301089508953B +:1025B0000C94D7129091D301981721F08093D301F6 +:1025C0000C94D81208958091D301882329F0109299 +:1025D000D30180E00C94D8120895E0910001F091AD +:1025E00001018091F6018083E0910001F0910101E9 +:1025F00080819091F501892B8083E0910001F09119 +:10260000010180819091F401892B80839091D30105 +:10261000992381F0E0910001F09101018081892BE3 +:10262000808380910001909101010E94F413811137 +:102630000E94E31280910001909101010C947808AE +:1026400008950C94201398E0899F90011124622B27 +:102650006093D2010E9418118091D20185958595D1 +:1026600085950C9421131092D20180E00C942113D3 +:102670009091D201809589238093D201282F2770D1 +:1026800071F4282F082E000C330B9217130639F023 +:102690008595859585950E9439110C94331308957D +:1026A00090E080E00E94711F21E08C3E9E4F09F077 +:1026B00020E0822F089582E090E00C94691F83E06F +:1026C00090E00C94691FCF9384E090E00E94691F12 +:1026D000C82F81E290E00E94691F982F8C2FCF9124 +:1026E0000895CF93C92F682F84E090E00E94771F50 +:1026F0006C2F81E290E0CF910C94771FAB01BC016D +:102700008FE090E00C94891FAB01BC0183E190E065 +:102710000C94891F60E070E0CB010C94841360E09E +:1027200070E0CB010E947E130C948A136CEE7EEF56 +:1027300090E080E00E94951F60E082E090E00E94BF +:10274000771F60E083E090E00E94771F1092CE0137 +:102750001092CF011092D0011092D10160E084E07C +:1027600090E00E94771F60E081E290E00E94771F76 +:1027700060E085E090E00E94771F60E086E090E0F6 +:102780000E94771F6FEF87E090E00E94771F40E084 +:1027900050E0BA0188E090E00E94891F60E08DE07F +:1027A00090E00E94771F40E050E0BA0188E190E09D +:1027B0000E94891F60E087E190E00E94771F40E05F +:1027C00050E0BA018CE190E00E94891F60E080E255 +:1027D00090E00E94771F0C948F130C949613682F2F +:1027E0008EE090E00C94771FFC01329680911401EA +:1027F000882321F0809139029EE187FF96E080E0F6 +:10280000915008F4089521912223D1F38F5FF8CFDE +:10281000662301F1209114012223F1F02091390265 +:1028200027FF1AC0462F4695469546954E3190F49F +:10283000677021E030E002C0220F331F6A95E2F793 +:10284000840F911DFC01828190E02823392381E0CF +:10285000232B69F480E00895FC01329608962191BB +:10286000261721F0E817F907D1F7F4CF81E0089592 +:102870009C01FC0132969FEF80E04191461751F098 +:102880009F3F19F4411101C0982F8F5F8630A9F73F +:102890009F3F09F40895290F311D97FD3A95F901DD +:1028A00062830895FC01329608962191261303C095 +:1028B000DF0111971C92E817F907B9F70895E62F81 +:1028C000E695E695E695EE3168F4E80FF92FF11DEF +:1028D000677021E030E001C0220F6A95EAF782813B +:1028E000822B82830895E62FE695E695E695EE31F4 +:1028F00070F4E80FF92FF11D677021E030E001C09E +:10290000220F6A95EAF72095828128232283089571 +:1029100020911401222329F02091390227FD0C94E3 +:102920005F140C94381420911401222329F0209173 +:10293000390227FD0C9473140C945214FC01329646 +:1029400080911401882351F08091390287FF06C0DD +:102950008EE1DF011D928A95E9F7089586E0F9CFAF +:10296000089508950C94B1140E94B21480913F020E +:10297000843049F11092F80188E190E020E40FB62C +:10298000F894A895809360000FBE2093600080E0CB +:102990000E943D020E94B21483B7817F846083BF8E +:1029A00083B7816083BF7894889583B78E7F83BF18 +:1029B0000FB6F894A89580916000886180936000BC +:1029C000109260000FBE089508950E94B0140E94F6 +:1029D000E7040E94E41480E00E94AB0491E08111BE +:1029E00007C081E00E94AB0491E0811101C090E03A +:1029F000892F089508950C94FA140E94F40C0E94F3 +:102A00006C080E943D020C94FB141F921FB61F928B +:102A100011248F939F93AF93BF938091F8018111FD +:102A200013C08091350290913602A0913702B09187 +:102A300038024196A11DB11D809335029093360254 +:102A4000A0933702B0933802BF91AF919F918F91BD +:102A50001F901FBE1F90189582E084BD93E095BD26 +:102A60009AEF97BD80936E0008952FB7F8948091E8 +:102A7000350290913602A0913702B09138022FBFF3 +:102A80000895CF92DF92EF92FF920F931F932FB78B +:102A9000F89440913502509136026091370270915E +:102AA00038022FBF6A017B01EE24FF248C0130E045 +:102AB00020E0C016D106E206F30650F0481B590B81 +:102AC000CA011F910F91FF90EF90DF90CF90089572 +:102AD00041505109F3CF78941F921FB61F921124D1 +:102AE0008F939F93AF93BF9380913502909136025D +:102AF000A0913702B09138020196A11DB11D8093BB +:102B0000350290933602A0933702B0933802BF91FA +:102B1000AF919F918F911F901FBE1F90189587E7CF +:102B200097E7909301088093000888E19AE00FB638 +:102B3000F894A895809360000FBE90936000FFCF3B +:102B40000E945013811102C00E94ED130E945B137A +:102B50008093F7010E94631390933A0280933902A5 +:102B60000E945F13682F70E090E080E00C94B61034 +:102B70008091000280FF12C06091070185E0689F8C +:102B8000B001112475956795759567956038710545 +:102B9000A8F561157105A1F1862F089581FF09C07F +:102BA0006091070185E0689FB001112475956795D4 +:102BB000EDCF6091070182FD0AC08091FF0188235B +:102BC000D1F09091060160910701891728F085E006 +:102BD000689FB0011124DACF869FB001112485E0EF +:102BE000869F9001879F300D1124692F70E0C901E5 +:102BF0000E943B1FCBCF65E070E0CECF8FE70895FA +:102C000081E008958091000280FF0CC06091030173 +:102C100070E075956795759567956115710549F132 +:102C2000862F089581FF06C06091030170E07595BD +:102C30006795F3CF6091030182FD0BC09091FF0176 +:102C40009923A1F06091020180910301961738F059 +:102C5000682F70E06038710500F38FE70895899F51 +:102C6000C001112470E00E943B1FF4CF61E070E0CE +:102C7000D7CF81E00895803F31F40E94B815819547 +:102C8000809304020895813F19F40E94B815F8CF8B +:102C9000823F31F40E94B815819580930302089514 +:102CA000833F19F40E94B815F8CF893F29F40E9498 +:102CB00002168093050208958A3F21F40E940216AD +:102CC0008195F7CF8B3F31F40E9402168195809356 +:102CD000060208958C3F19F40E940216F8CF843F33 +:102CE00031F4809102028160809302020895853F51 +:102CF00021F4809102028260F7CF863F21F4809117 +:102D000002028460F1CF873F21F480910202886043 +:102D1000EBCF883F21F4809102028061E5CF8D3FA7 +:102D200031F48091000281608093000208958E3F0B +:102D300021F4809100028260F7CF8F3FB9F7809134 +:102D400000028460F1CF90910302803F41F48091B2 +:102D5000040287FD10920402992371F00895813FC7 +:102D600029F4809104021816ACF3F6CF823F81F467 +:102D700097FFF2CF10920302809104029091050216 +:102D8000892B90910602892B49F71092FF01089533 +:102D9000833F19F4191674F3DFCF893F39F480911A +:102DA00005021816CCF610920502D6CF8A3F29F4F8 +:102DB0008091050287FFD0CFF6CF8B3F39F4809109 +:102DC000060287FFC9CF10920602C6CF8C3F29F4B6 +:102DD000809106021816BCF3BFCF843F31F4809176 +:102DE00002028E7F80930202B7CF853F21F480914B +:102DF00002028D7FF7CF863F21F4809102028B7F04 +:102E0000F1CF873F21F480910202877FEBCF883F8B +:102E100021F4809102028F7EE5CF8D3F31F48091C5 +:102E200000028E7F8093000297CF8E3F21F4809125 +:102E300000028D7FF7CF8F3F09F08ECF8091000287 +:102E40008B7FF0CF81E092E00E9492080E943515BE +:102E50009093FE018093FD010895CF93DF9300D0FE +:102E600000D000D0CDB7DEB786E0E1E0F2E0DE01D1 +:102E7000119601900D928A95E1F78091030290914D +:102E80000402892B81F08091FB019091FC010E944A +:102E90004115AC019091FF01992331F18091080116 +:102EA0008417150670F18091050290910602892B16 +:102EB00091F08091F9019091FA010E944115AC01C5 +:102EC0009091FF01992309F478C08091040184173F +:102ED000150608F480C026960FB6F894DEBF0FBE24 +:102EE000CDBFDF91CF910895209109018AE0289FFD +:102EF0009001112424173507B0F69F5F9093FF01CE +:102F000002C09F3FD1F710920502109206028091F5 +:102F10000302181624F40E94B815809303028091CE +:102F2000030287FF05C00E94B815819580930302B4 +:102F300080910402181624F40E94B81580930402AC +:102F40008091040287FF05C00E94B8158195809387 +:102F50000402309103023323A1F0209104022223C2 +:102F600081F045EB3403C00111249923F1F09093D3 +:102F7000030245EB2403900111243323D1F0309355 +:102F800004020E9422178091FD019091FE0190930E +:102F9000FC018093FB0186E0FE013196A1E0B2E0E6 +:102FA00001900D928A95E1F77ECF81E08093030234 +:102FB000E0CF81E080930402E4CF209105018AE014 +:102FC000289F900111242417350708F084CF9F5FB4 +:102FD0009093FF0102C09F3FD1F71092030210921D +:102FE000040280910502181624F40E9402168093B0 +:102FF00005028091050287FF05C00E940216819597 +:103000008093050280910602181624F40E9402168D +:10301000809306028091060287FF05C00E94021677 +:10302000819580930602309105023323A1F020910F +:103030000602222381F045EB3403C00111249923B9 +:10304000F1F09093050245EB240390011124332302 +:10305000D1F0309306020E9422178091FD019091D9 +:10306000FE019093FA018093F90186E0FE0131960A +:10307000A1E0B2E001900D928A95E1F72CCF81E0BA +:1030800080930502E0CF81E080930602E4CF86E0E2 +:10309000E1E0F2E0DF011D928A95E9F71092FF016D +:1030A000109200020895809127020895CF93DF9334 +:1030B00000D00F92CDB7DEB790913F02943019F552 +:1030C00089837B836A8382E08093E9008FEF90910C +:1030D000E800815095FD06C095ED9A95F1F7000046 +:1030E0008111F5CF8091E80085FF0DC050E040E0F0 +:1030F00063E070E0CE0101960E94AA1A8091E80078 +:103100008E778093E8000F900F900F90DF91CF9112 +:103110000895CF93DF93EC010E948D1A823011F055 +:10312000843031F4BE0184E0DF91CF910C945618C5 +:10313000DF91CF910895BC0183E00C945618CF9392 +:10314000DF93EC010E948D1A823011F08430F9F483 +:1031500082E08093E9008FEF9091E800815095FD27 +:1031600006C095ED9A95F1F700008111F5CF809199 +:10317000E80085FF0CC050E040E066E070E0CE0162 +:103180000E94AA1A8091E8008E778093E800DF9170 +:10319000CF910895CF93DF93EC010E948D1A823076 +:1031A00011F08430B9F5809114018823B1F1809138 +:1031B000390287FF32C060E282E08093E9008FEF3E +:1031C0009091E800815095FD06C095ED9A95F1F734 +:1031D00000008111F5CF8091E80085FF1BC0809130 +:1031E000140170E050E040E0811104C050E040E084 +:1031F00068E070E0CE010E94AA1A8091E8008E7704 +:103200008093E80080E2FE01A7E0B2E001900D9219 +:103210008A95E1F7DF91CF91089568E081E0CDCF05 +:1032200080913E02811109C00E943A1C0E94971CA5 +:103230008091E20084608093E200089510923E0243 +:103240000895089508950C94FD1442E061EC81E026 +:103250000E94B61B42E261EC82E00C94B61B8091A6 +:103260004102833009F45FC030F48130C1F1823013 +:1032700009F49BC008958A3009F487C08B3009F4A3 +:103280006DC0893009F04EC080914002813209F052 +:1032900049C08091440290914502029708F042C0D3 +:1032A0008091E800877F8093E8008091E80082FFAA +:1032B00035C09091F3008091F200029729F480913B +:1032C000F1008B7F813021F48091F10080932702FF +:1032D0008091E8008B778093E8000C94EA1B809142 +:1032E0004002813AF9F48091E800877F8093E800FA +:1032F0008091440290914502892B61F460E287E05D +:1033000092E070E00E94F91A8091E8008B77809338 +:10331000E800089560E090E080E0F3CF80913F0204 +:103320008111C3CF089580914002813AD9F78091ED +:10333000440290914502892BA9F78091E800877F8C +:103340008093E8008091E80080FFFCCF8091140119 +:103350008093F1008091E8008E77BDCF809140028C +:10336000813201F78091440290914502892BD1F678 +:103370008091E800877F8093E8000E94EA1B80919B +:103380004202809314010C94F40C8091400281322B +:1033900049F68091E800877F8093E8000E94EA1B4D +:1033A0008091430280932802089580914002813ADF +:1033B00009F0B8CF8091E800877F8093E800809182 +:1033C000E80080FFFCCF80912802C2CF84B7877FBE +:1033D00084BF0FB6F894A8958091600088618093AF +:1033E0006000109260000FBE80E890E00FB6F89485 +:1033F00080936100909361000FBE0E94DA080E94E2 +:103400003A1C0E94971C8091E20084608093E20045 +:1034100078940E94201F0E94E2088AE091E00E94B6 +:10342000670880913F02853019F00E94EA08F9CFC1 +:103430000E94B41480913D02882399F30E94E51400 +:10344000882379F30E94941AECCF0C94271A292F21 +:1034500033272330310519F168F42130310509F49F +:103460004AC02230310509F44BC090E080E030E0E2 +:1034700020E028C02132310579F122323105A9F747 +:1034800080E490E027EF31E061157105D9F08CEB15 +:1034900090E02BE331E061307105A1F0E6CF992790 +:1034A0008130910599F0009741F08230910589F0C3 +:1034B0000397D9F6E4ECF0E002C0EAEEF0E0849184 +:1034C00090E09F01FA01318320830895E8EDF0E058 +:1034D000F6CFEAECF0E0F3CF89E090E020E031E0D5 +:1034E0006115710579F389E090E029E131E06130FF +:1034F000710541F3BACF82E190E029E231E0E2CFF9 +:103500008BE390E02EEE30E0DDCF80913F028430FF +:1035100011F482E0089581E00895809129028111DB +:1035200002C00C94851A089580E189BD82E189BDAD +:1035300009B400FEFDCF8091D8008F7D8093D80024 +:103540008091E00082608093E0008091E00081FD46 +:10355000FCCF0895AF92BF92CF92DF92FF920F936C +:103560001F93CF93DF936C01EB018A010E94091C2A +:10357000F82E811123C00115110539F0F801808161 +:103580009181C81BD90BC80ED91EB12CA12C209734 +:10359000A9F08091E80085FD22C08091E8008E7737 +:1035A0008093E80001151105A1F0F8018081918157 +:1035B000A80EB91EB182A08285E0F82E8F2DDF9172 +:1035C000CF911F910F91FF90DF90CF90BF90AF9060 +:1035D00008950E94091C8823D1F2F82EEFCFF6013E +:1035E00081916F018093F1002197FFEFAF1ABF0A1D +:1035F000CECFFC0180914602909147028617970733 +:10360000A0F06115710529F49091E8009E779093E0 +:10361000E80090E06115710551F4911108C08091A6 +:10362000E80082FF34C080E00895BC01F2CF8091B1 +:103630003F028823C1F18530C1F18091E80083FD0C +:1036400030C08091E80082FDEACF8091E80080FFE1 +:10365000E1CF8091F3002091F200382F61157105C0 +:1036600019F02830310558F091E02830310509F083 +:1036700090E02091E8002E772093E800CBCF819155 +:103680008093F100615071092F5F3F4FE7CF809128 +:103690003F02882341F0853041F08091E80083FFAC +:1036A000BECF81E0089582E0089583E00895FC0193 +:1036B000809146029091470286179707A0F0611506 +:1036C000710529F48091E8008E778093E80090E0FE +:1036D0006115710551F4911108C08091E80082FFD5 +:1036E00035C080E00895BC01F2CF80913F0288236D +:1036F000C9F18530C9F18091E80083FD31C0809126 +:10370000E80082FDEACF8091E80080FFE1CF809160 +:10371000F3002091F200382F6115710519F028305F +:10372000310558F091E02830310509F090E08091A2 +:10373000E8008E778093E800CBCF84918093F100EE +:103740003196615071092F5F3F4FE6CF80913F0264 +:10375000882341F0853041F08091E80083FFBDCFA0 +:1037600081E0089582E0089583E00895982F9730CE +:1037700028F08F708093E90081E008959093E9002C +:10378000242F762F50E0981731F07091EC002091A3 +:10379000ED005091F00021FD02C09F5FE8CF309115 +:1037A000EB003E7F3093EB003091ED003D7F309396 +:1037B000ED003091EB0031603093EB007093EC0042 +:1037C0002093ED005093F0002091EE0027FDE5CF0F +:1037D00080E008958091400287FF13C08091E80047 +:1037E00082FF06C08091E8008B778093E80004C0D8 +:1037F00080913F028111F2CF089580913F0288238A +:10380000D9F38091E80080FFF8CF8091E8008E77AF +:10381000ECCF2091E4003091E50095E6A9012091DC +:10382000EC00822F817020FF06C08091E80080FFAD +:1038300006C080E008952091E80022FD1AC0809122 +:103840003F02882389F0853089F08091EB0085FD67 +:103850000FC02091E4003091E50042175307F9F2C0 +:103860009150E1F684E0089582E0089583E00895A0 +:1038700081E008950E94A81C0E94B01CE0EEF0E0D8 +:10388000808181608083E8EDF0E080818F778083A4 +:1038900019BCA7EDB0E08C918E7F8C9380818F7ED8 +:1038A000808310923E0208950F931F93CF93DF936E +:1038B0000E94A81C0E94B01CC8EDD0E088818F77C0 +:1038C000888388818068888388818F7D888319BCFC +:1038D00010923F0210923B0210923D0210923C0265 +:1038E00000EE10E0F80180818B7F80838881816009 +:1038F000888342E060E080E00E94B61BE1EEF0E0E9 +:1039000080818E7F8083E2EEF0E080818160808321 +:10391000808188608083F80180818E7F80838881A8 +:1039200080618883DF91CF911F910F910895E8ED19 +:10393000F0E080818F7E8083E7EDF0E08081816020 +:10394000808384E082BF81E080933E020C94541C0B +:10395000E8EDF0E080818E7F80831092E200089590 +:103960001092DA001092E10008951F920F920FB6A4 +:103970000F9211242F933F934F935F936F937F93F5 +:103980008F939F93AF93BF93EF93FF938091E10049 +:1039900082FF0BC08091E20082FF07C08091E100AE +:1039A0008B7F8093E1000E941F1F8091DA0080FFCF +:1039B00019C08091D80080FF15C08091DA008E7FF9 +:1039C0008093DA008091D90080FF96C080E189BDA4 +:1039D00082E189BD09B400FEFDCF81E080933F0202 +:1039E0000E9410198091E10080FF19C08091E200CF +:1039F00080FF15C08091E2008E7F8093E20080916D +:103A0000E20080618093E2008091D8008062809320 +:103A1000D80019BC85E080933F020E942219809152 +:103A2000E10084FF2BC08091E20084FF27C080E189 +:103A300089BD82E189BD89B5982F917080FFFBCF48 +:103A40008091D8008F7D8093D8008091E1008F7E97 +:103A50008093E1008091E2008F7E8093E20080916C +:103A6000E20081608093E20080913B02882309F4A8 +:103A700049C084E080933F020E9423198091E100B5 +:103A800083FF29C08091E20083FF25C08091E1007F +:103A9000877F8093E10082E080933F0210923B0297 +:103AA0008091E1008E7F8093E1008091E2008E7F23 +:103AB0008093E2008091E20080618093E20042E026 +:103AC00060E080E00E94B61B8091F00088608093E7 +:103AD000F0000E942119FF91EF91BF91AF919F914A +:103AE0008F917F916F915F914F913F912F910F90A7 +:103AF0000FBE0F901F90189519BC10923F020E94A4 +:103B00001E1970CF8091E30087FD93E090933F02F0 +:103B1000B3CF1F920F920FB60F9211242F933F93A2 +:103B20004F935F936F937F938F939F93AF93BF93C5 +:103B3000CF93DF93EF93FF93D091E900DF708091F3 +:103B4000EC00C82FC17080FDC0E81092E9008091A0 +:103B5000F000877F8093F00078940E94CD1D109232 +:103B6000E9008091F00088608093F000CD2BCF7049 +:103B7000C093E900FF91EF91DF91CF91BF91AF9199 +:103B80009F918F917F916F915F914F913F912F9175 +:103B90000F900FBE0F901F9018951F93CF93DF9338 +:103BA000CDB7DEB7AA970FB6F894DEBF0FBECDBF74 +:103BB00080E492E02091F100FC012193CF01F2E03A +:103BC00088349F07B9F70E942F198091E80083FF7E +:103BD0001EC180914002909141029A3008F017C1B5 +:103BE000E92FF0E0E553F04E0C944F1F803899F028 +:103BF000823809F00CC1809144028F70873008F040 +:103C000006C18093E9008091EB0085FB882780F94D +:103C10001092E90006C080913C0290913D02911102 +:103C200082609091E800977F9093E8008093F10084 +:103C30001092F1008091E8008E77E5C0882309F4A6 +:103C4000D3C0823009F0E3C0809142028111D6C016 +:103C5000809144028F702FEF280F263008F0D7C0D4 +:103C60008093E9002091EB0020FFC8C0933031F42D +:103C70008091EB0080628093EB00C0C09091EB00DC +:103C800090619093EB0021E030E001C0220F8A9513 +:103C9000EAF72093EA001092EA008091EB00886036 +:103CA000EACF8111B4C0109142021F778091E300E6 +:103CB0008078812B8093E3008091E800877F809358 +:103CC000E8000E94EA1B8091E80080FFFCCF809111 +:103CD000E30080688093E30082E0111183E0809329 +:103CE0003F0295C08058823008F091C08091420216 +:103CF000909143028C3D23E09207A1F583E08A83F3 +:103D00008AE289834FB7F894DE01139620E03EE003 +:103D100051E2E32FF0E050935700E49120FF03C0FD +:103D2000E295EF703F5FEF708E2F90E0EA30C0F0C9 +:103D3000C7968D939D932F5F243159F74FBF809184 +:103D4000E800877F8093E8006AE270E0CE01019688 +:103D50000E94F91A8091E8008B778093E80057C0A1 +:103D6000C096E7CF6091440270914502AE014F5F6B +:103D70005F4F0E94251ABC01892B09F448C090911D +:103D8000E800977F9093E80089819A810E94571BF1 +:103D9000E1CF8038E1F58091E800877F8093E800EB +:103DA00080913B028093F10045CF811130C090910A +:103DB0004202923060F58091E800877F8093E800AE +:103DC00090933B020E94EA1B80913B02882311F0F2 +:103DD00084E005C08091E30087FDFACF81E0809305 +:103DE0003F020E94251913C080914202813079F46C +:103DF00081E0933009F080E080933D021092E90069 +:103E00008091E800877F8093E8000E94EA1B809100 +:103E1000E80083FF0AC08091E800877F8093E80074 +:103E20008091EB0080628093EB00AA960FB6F89425 +:103E3000DEBF0FBECDBFDF91CF911F9108950895D2 +:103E4000CF9380913F028823A1F0C091E900CF7009 +:103E50009091EC00892F817090FD80E8C82B109222 +:103E6000E9008091E80083FD0E94CD1DCF70C093D2 +:103E7000E900CF91089597FB072E16F4009407D020 +:103E800077FD09D00E94551F07FC05D03EF49095A0 +:103E900081959F4F0895709561957F4F0895EE0F1E +:103EA000FF1F0590F491E02D0994AA1BBB1B51E163 +:103EB00007C0AA1FBB1FA617B70710F0A61BB70B9A +:103EC000881F991F5A95A9F780959095BC01CD013F +:103ED0000895F999FECF92BD81BDF89A992780B5D2 +:103EE0000895A8E1B0E042E050E00C949D1F262F19 +:103EF000F999FECF92BD81BDF89A019700B40216E0 +:103F000039F01FBA20BD0FB6F894FA9AF99A0FBE8D +:103F100008950396272F0E94781F0E94771F252F50 +:103F20000E94781F242F0C94781F0196272F0E943F +:103F3000781F0C94771FDC01CB01FC01F999FECFAF +:103F400006C0F2BDE1BDF89A319600B40D92415021 +:103F50005040B8F70895F894FFCF840A840ADC0A29 +:103F6000DC0A2E0B4A0BB10AB10A8C0B180C270C79 +:103F7000270C830CB10AB10A8C0C030D030D0C0D38 +:103F80000C0D0E0D0C0D0C0D0C0D030D030D130D72 +:103F90000C0D0C0D130DF61D1E1E071F1E1E071FF8 +:0A3FA000511E721E071FC91ED51E18 +:103FAA00D4012808641E140A321E5318CA189F180E +:103FBA009B18891801E200E900EA00B500B600B7CB +:103FCA0000CD008301CC008A0192019401210223D1 +:103FDA000224022502260227022A02B300B4006F35 +:103FEA0000700081828336F5F435F6E200E900EAD2 +:103FFA0000B500B600B700CD008301CC008A01925B +:10400A000194012102230224022502260227022A00 +:0C401A0002B300B4006F007000818283CC +:00000001FF From 4676149ef7765f08b52626d335eeba666ad15e3a Mon Sep 17 00:00:00 2001 From: Aplyard Date: Tue, 7 Apr 2020 22:03:21 +0300 Subject: [PATCH 07/37] Create README.md --- keyboards/aplx6/README.md | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 keyboards/aplx6/README.md diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md new file mode 100644 index 000000000000..b593885be43c --- /dev/null +++ b/keyboards/aplx6/README.md @@ -0,0 +1,72 @@ +# Aplx6 +https://github.com/Aplyard/Aplx6 + +A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. +Designed to be assembled as a sandwich with a blank pcb, using m2.5 screws and spacers. +Diodes : 1N4148 + +--- + +![Front](https://i.imgur.com/lUg9GAo.png) + +![Back](https://i.imgur.com/iAHtHV7.png) + +![Blank](https://i.imgur.com/EnqIhSW.png) + +--- + +**Can support Rgb underglow (WS2812)** + +Just wire them to any of the unused ProMicro pins. +Don't forget to edit-uncomment the [config.h](https://github.com/Aplyard/Aplx6/blob/master/qmk/config.h) and the [rules.mk](https://github.com/Aplyard/Aplx6/blob/master/qmk/rules.mk) +for RGB underglow support or even add your own functions and modes. +Used pins can be found in [config.h](https://github.com/Aplyard/Aplx6/blob/master/qmk/config.h) or in the [KiCad Schematic](https://github.com/Aplyard/Aplx6/blob/master/kiCad/xd6.sch) +All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/) along with the +2 pins mod. + +--- + +**Default Keymap Layout is [Media](https://github.com/Aplyard/Aplx6/blob/master/qmk/keymaps/Media/keymap.c)** (no RGB shortcuts) + + + +|Default|Layer|(0)| +|--|--|--| +| Play|VolUp|Fn| +|Prev|VolDown|Next| + +========================= +| Fn |Layer|(1) +|--|--|--| +|Calc|PgUp|KC_TRANS| +|MyPc|PgDown|RESET + +--- + +Make example for this keyboard (after setting up your build environment): + + make aplx6:Media + +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. + +--- +****Designed in**:** +[KiCad](https://github.com/KiCad) + +**Components Footprints & Libraries :** +[keebs.pretty](https://github.com/egladman/keebs.pretty) +[keyboard_parts.pretty +](https://github.com/tmk/keyboard_parts.pretty) +[ProMicro KiCad](https://github.com/Biacco42/ProMicroKiCad) + +**Usefull Links:** +[Qmk Online Configurator](https://config.qmk.fm/#) + +**Alternatives of qmk that worked for me:** +[Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/) +[Keyboard Plate & Case Builder](http://builder.swillkb.com/) +[Firmware Builder](https://kbfirmware.com/) + +--- +Keyboard Maintainer: Aplyard +Hardware Supported: Pro Micro ATmega32U4 +Hardware Availability: Aplyard From 79b2bb254db64e534bd4aabce96d4b9cbaead78e Mon Sep 17 00:00:00 2001 From: Aplyard Date: Tue, 7 Apr 2020 22:13:11 +0300 Subject: [PATCH 08/37] edited --- .../aplx6/Hex Test Compilation/aplx6_Media.hex | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename aplx6_Media.hex => keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex (100%) diff --git a/aplx6_Media.hex b/keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex similarity index 100% rename from aplx6_Media.hex rename to keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex From e34ccd73187166354402ff49cef4d50576acbced Mon Sep 17 00:00:00 2001 From: Aplyard Date: Wed, 8 Apr 2020 00:08:30 +0300 Subject: [PATCH 09/37] requests --- .gitignore | 1 + .../Hex Test Compilation/aplx6_Media.hex | 1028 ----------------- keyboards/aplx6/aplx6.h | 4 - keyboards/aplx6/config.h | 6 +- .../aplx6/keymaps/{Media => default}/keymap.c | 0 5 files changed, 2 insertions(+), 1037 deletions(-) delete mode 100644 keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex rename keyboards/aplx6/keymaps/{Media => default}/keymap.c (100%) diff --git a/.gitignore b/.gitignore index eabb4ad8a997..0e80cdb6c4bf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.bin *.eep *.elf +*.hex *.qmk !util/bootloader.hex !quantum/tools/eeprom_reset.hex diff --git a/keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex b/keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex deleted file mode 100644 index a73d37fda9ab..000000000000 --- a/keyboards/aplx6/Hex Test Compilation/aplx6_Media.hex +++ /dev/null @@ -1,1028 +0,0 @@ -:100000000C941C010C9463010C9463010C94630127 -:100010000C9463010C9463010C9463010C946301D0 -:100020000C9463010C9463010C94B51C0C94891D11 -:100030000C9405150C9463010C9463010C946301FA -:100040000C9463010C9463010C9463010C946301A0 -:100050000C9463010C946B150C9463010C94630174 -:100060000C9463010C9463010C9463010C94630180 -:100070000C9463010C9463010C9463010C94630170 -:100080000C9463010C9463010C9463010C94630160 -:100090000C9463010C9463010C9463010C94630150 -:1000A0000C9463010C9463010C946301AE00A900ED -:1000B0000151AC00AA00AB00B2004B000100B3003C -:1000C0004E00005C0403300000000C03410070008F -:1000D0006C007800360000001003410070006C00D6 -:1000E0007900610072006400000004030904090241 -:1000F0003B00020100A0FA09040000010301010015 -:100100000921110100012240000705810308000AAE -:10011000090401000103000000092111010001226E -:10012000BC000705820320000A1201100100000034 -:1001300008E0E0300001000102030105010902A10D -:100140000185020901A100050919012905150025EC -:10015000019505750181029501750381010501096C -:100160003009311581257F950275088106093815FA -:1001700081257F950175088106050C0A38021581D5 -:10018000257F950175088106C0C005010980A10180 -:10019000850319012AB700150126B70095017510CE -:1001A0008100C0050C0901A101850419012AA002E2 -:1001B000150126A002950175108100C005010906F0 -:1001C000A1018505050719E029E715002501950816 -:1001D000750181020507190029EF1500250195F029 -:1001E000750181020508190129059505750191021E -:1001F000950175039101C005010906A101050719C3 -:10020000E029E71500250195087501810295017522 -:100210000881010507190029FF150026FF00950632 -:1002200075088100050819012905950575019102D8 -:10023000950175039101C00011241FBECFEFDAE0D4 -:10024000DEBFCDBF04B603FE27C080914802909167 -:100250004902A0914A02B0914B028730904BA740CF -:10026000B04BD1F4109248021092490210924A0207 -:1002700010924B0214BE84B7877F84BF0FB6F894E8 -:10028000A895809160008861809360001092600062 -:100290000FBEE0E0F8E3099511E0A0E0B1E0EAEA82 -:1002A000FFE302C005900D92AC37B107D9F722E009 -:1002B000ACE7B1E001C01D92A834B207E1F70E949B -:1002C000E6190C94AB1F0C940000CF93DF939C01B4 -:1002D0003A9521153F4168F5EC01CC27D170DC013E -:1002E000AA27B270AC01442754709C0122273870B1 -:1002F00094FF11C080E1CD2B09F480E0AB2B09F015 -:100300008062452B09F08064232B09F08068FB0193 -:10031000DF91CF91099481E0CD2B09F480E0AB2BE4 -:1003200009F08260452B09F08460232B81F38860FB -:10033000EECFDF91CF910895CF93DF93EC01805EF4 -:100340009109089720F060ED7CE0209711F463E4B8 -:100350007AE0CE010E9465018C2FDF91CF910C9441 -:10036000B309CF93DF93EC010E94010ACE01805EB6 -:100370009109089720F067ED7CE0209711F46AE47A -:100380007AE0CE01DF91CF910C946501CF93DF939A -:10039000EC010E949C01CE01DF91CF910C94B10140 -:1003A00081E0089581E008950C94D20108950C94A1 -:1003B000D6011F93CF93DF9300D000D00F92CDB71B -:1003C000DEB749835A836B8320918C0189819A819E -:1003D00021111BC06623A9F00E940912182F682F53 -:1003E00089819A810E94B41169817A81812F0F904D -:1003F0000F900F900F900F90DF91CF911F910C9461 -:100400009A020E94E111182FEFCF0E940912698110 -:100410007A81EDCFFC0140815181628173818481B9 -:100420000C94D901CF93DF93EC010E940A02BE0124 -:10043000DF91CF910C94D7010E945013811102C01B -:100440000E94ED130E94C0050C94A6040C94A9040C -:10045000282F2F7041F0822F90E02A3010F44D9613 -:1004600008950697089587E290E0089508950C9402 -:10047000360281E008950C943902CF93C82F0E9470 -:1004800037028C2FCF910C943B0208950E94F40CFC -:100490000E9445022FEF84E39CE021508040904071 -:1004A000E1F700C000000C948F150F931F93CF93BA -:1004B000DF93EC010E940A028C01BE010E94D4016C -:1004C000882359F1BE01C8010E943706882329F10B -:1004D000BE01C8010E94D9068823F9F0BE01C801F7 -:1004E0000E941A078823C9F0BE01C8010E943D0876 -:1004F000882399F08A81882339F001158CE5180743 -:1005000051F00E3D1C4579F0CE01DF91CF911F9146 -:100510000F910C94D0010E94460280E0DF91CF91B0 -:100520001F910F9108950E94ED13F7CF90E080E0A6 -:1005300008950895972F70E023E0929F600D711D3C -:100540001124FB0196E0899FE00DF11D1124EE0FAF -:10055000FF1FE455FF4F859194910895FC01EE0F24 -:10056000FF1FEC53FF4F859194910895CF93DF9334 -:100570000E949A020E94CB03EC01811520E59207AC -:1005800008F042C0811530E4930708F0BDC0883EF2 -:10059000910528F5803E910508F09DC0883A9105A7 -:1005A00088F4853A910508F08FC08130910509F4EF -:1005B00092C0009709F48FC0049708F08CC0D0E077 -:1005C000C0E089C08F3B910508F489C0805C910927 -:1005D000C03CD105A0F30E94AE02EC017CC08115A5 -:1005E000904250F4C11581E0D80708F074C0C03FB4 -:1005F000D10528F3D0656FC0C11590E3D90708F085 -:1006000079C0CE019F70E7CF811525E5920758F597 -:10061000811534E5930708F0A6C0811542E59407DB -:1006200050F4C11581E5D80708F471C0DC2FCC2740 -:10063000C16FD06A50C0982F969596959E012370F1 -:100640003327C115D34508F07FC0C1E0D0E002C018 -:10065000CC0FDD1F2A95E2F720E2929FC001112402 -:10066000C82BD92B6FC0C11589E5D807A8F4C115CF -:1006700098E5D90708F07CC0C11526E5D20708F037 -:100680009ECF8C2F0E946204C82FD0E0DC2FCC2795 -:10069000CC27DF71D0621FC0C1153AE5D30708F43B -:1006A0006CC0CE0190568115904208F088CF8D2FF6 -:1006B0008F710E94620490E0982F882788279F718D -:1006C0009C012C2BE901E6CFC55AD0E0CD5BDE4F73 -:1006D000C881D0E0D064CE01DF91CF910895C85A8F -:1006E000D0E0CC0FDD1FCB5EDE4F0990D881C02D4E -:1006F000D464F1CFCE019927D3FF03C0EC01D86CAD -:10070000EACFEC01D06CE7CFDF70D06AE4CFCE0146 -:10071000E4E096958795EA95E1F783702C2F26956E -:100720002695237090E2299F90011124382B8C2F5D -:100730008370C1E0D0E002C0CC0FDD1F8A95E2F7E4 -:10074000C22BD32BDC68C7CFC1E0D0E002C0CC0FF6 -:10075000DD1F2A95E2F730E2939FC0011124C82BD8 -:10076000D92BDA68B8CFD82FCC27C46FD06AB3CFD3 -:10077000DC2FCC27C06FD06AAECF8C2F8F700E9439 -:10078000620434E0D695C7953A95E1F7CF709C2F77 -:10079000EC01D069A0CF82389105B1F1B0F481337A -:1007A000910509F475C048F48932910509F469C0CE -:1007B0008A32910509F473C008958533910509F4CF -:1007C00059C08933910501F10895833E9105A9F13E -:1007D00038F4803E9105F9F0823E910549F1089583 -:1007E000863E9105A9F1873E9105C9F1843E9105A8 -:1007F00019F520913A0221FF1FC08091390284FD32 -:1008000014C087EE90E00895209139022370A1F082 -:1008100080EE90E008952091390220FD47C030918C -:100820003A0230FF09C024FF44C090E080E004C0D9 -:100830002091390222FDF7CF08952091390222FD3F -:100840003BC030913A0230FDE3CF24FFF5CFEDCF2E -:100850002091390223FFF0CF24FDE7CFD2CF2091A2 -:10086000390223FD2CC030913A0231FFEECF84EEE5 -:1008700090E008952091390225FFDECF89E290E0D3 -:1008800008952091390225FFD7CF85E390E00895A0 -:100890002091390226FFD0CF8AE290E0089520917E -:1008A000390226FFC9CF81E390E0089589E390E003 -:1008B000089583EE90E0089582EE90E0089586EE2C -:1008C00090E008959091390292FF06C0282F287178 -:1008D0002830F9F4877F846093FF06C0282F2871A1 -:1008E0002831F1F4877E846120913A0220FF06C00E -:1008F000382F38713830D9F4877F816021FF06C0E6 -:10090000282F28712831D1F4877E816194FD877E5C -:100910000895282F24712430F9F68B7F8860DCCF6E -:10092000282F2471243101F78B7E8861DDCF382F89 -:100930003171313019F78E7F8860E0CF282F217117 -:10094000213121F78E7E8861E1CF08950C94A504B2 -:1009500008950C94A804E82FF0E0E45DFD4F808139 -:100960000895089580EA8A95F1F70895CF93DF936B -:1009700025982D9A86988E9AA6E4B1E049E451E034 -:10098000C1E0D0E08D91E82FE295EF70F0E061A139 -:100990008F709E0101C0220F8A95EAF7922F9095E1 -:1009A000962391A382A1822B82A34A175B0751F75A -:1009B00010922A0210922C0210922B0210922D02F9 -:1009C00082E00E947405DF91CF910C941C024F923B -:1009D0005F927F928F929F92AF92BF92CF92DF925F -:1009E000EF92FF920F931F93CF93DF930AE212E0EF -:1009F00099E4A92E91E0B92E912CCC24C394D12C4A -:100A0000D8017C90F80111928F01D5018D915D0183 -:100A1000C82FC295CF70D0E099A18F70760101C028 -:100A2000EE0C8A95EAF7892F8E2989A38AA18E2C4C -:100A3000809488218AA30E94B20486E4482E81E033 -:100A4000582E30E020E0F8013197D2014D912D0170 -:100A5000842F82958F7090E0DC0190968C9160815C -:100A600090E04F7002C0959587954A95E2F780FD1A -:100A700039C08C2D022E01C0880F0A94EAF7862B0C -:100A800080832F5F3F4F23303105F9F689A18822FB -:100A900089A28AA1E82AEAA281E09081971101C087 -:100AA00080E0982AB2E00C321B0709F0A9CF292D6B -:100AB00042E06CE272E08AE292E00E9475050E94D8 -:100AC0002602892DDF91CF911F910F91FF90EF901A -:100AD000DF90CF90BF90AF909F908F907F905F906E -:100AE0004F90089580E0CBCF0895FF920F931F930E -:100AF000CF93DF93F82E092F162FD72FC42F222341 -:100B000049F081E080937E010E94351590937D012C -:100B100080937C0180917E018823A1F080917C01EB -:100B200090917D010E944115069760F0EF2DF02F06 -:100B3000A12FBD2FCE0FDF2FD11DEC17FD0741F4E4 -:100B400010927E01DF91CF911F910F91FF90089538 -:100B500081918D93F2CFCF93DF93EC0197FF0CC07F -:100B6000FB018281882341F00E94D605CE019F7748 -:100B70000E941A060E94020681E0DF91CF9108953B -:100B80008CE090E00E94691F90E0B0E0A0E08093CC -:100B90002E0290932F02A0933002B0933102089559 -:100BA00060912E028CE090E00C94771F0E949E12C0 -:100BB000809332020E94B11280912E02813089F01E -:100BC000882359F0823091F08430B9F08FE39CE9AA -:100BD0000197F1F700C00000089582EE0E94B3096A -:100BE000F5CF88E193E00E94C601F0CF82EE0E942B -:100BF000B30987E50E94300AE9CF86EE0E94300AE9 -:100C000088E1F8CF80912E02813071F0882341F085 -:100C1000823031F0843061F0809132020C94AE1257 -:100C200082EE0E94010AF8CF8CE20E94300AF4CFD3 -:100C300088E2FBCF0F931F93CF93DF938C01CCE01F -:100C4000D0E0C8010C2E02C0969587950A94E2F771 -:100C50008F700E9428020E94300A2497CC3F8FEFA9 -:100C6000D80779F7DF91CF911F910F9108950F93D6 -:100C70001F93CF93DF93EC018B01FB0182818823CB -:100C800071F0C33EFCE5DF0719F188F4C13EECE5E5 -:100C9000DE07C9F081E0C23EFCE5DF0789F0B8015C -:100CA000CE01DF91CF911F910F910C94AB05C43E03 -:100CB0008CE5D80779F084E0C53EECE5DE0779F7EE -:100CC00080932E0202C010922E020E94D005E7CF20 -:100CD00082E0F6CF83E0F4CF0F931F93CF93DF939F -:100CE000C62FD42F022FFC0182818823C9F0609384 -:100CF00081010E9435159093800180937F0180E2ED -:100D00008C0F883008F050C0C77081E001C0880F98 -:100D1000CA95EAF7DF91CF911F910F910C94430A86 -:100D200010918101161335C080917F01909180014F -:100D30000E944115883C910560F5C0E2CD0F1D175A -:100D4000B9F080E2810F883040F4177081E001C073 -:100D5000880F1A95EAF70E944A0AC83048F481E0E1 -:100D60009D2F977001C0880F9A95EAF70E94430A59 -:100D7000802F0E94300AC830B8F4D77081E001C0DB -:100D8000880FDA95EAF7DF91CF911F910F910C94BC -:100D90004A0A80E28C0F883038F4C77081E001C0C5 -:100DA000880FCA95EAF7EFCFDF91CF911F910F918E -:100DB00008959C01CB01233F4CE5340731F190F4B9 -:100DC000283DFCE53F07E9F0293D4CE5340769F192 -:100DD000273D3C4579F426E241EE61EE0E946C0627 -:100DE00080E00895253FFCE53F07B9F090F0263FED -:100DF0003C45B9F0FC0182818823D1F01092810139 -:100E0000089527E245EE65EEE9CF26E241EE60EE79 -:100E1000E5CF27E245EE64EEE1CF26E241EE62EE59 -:100E2000DDCF27E245EE66EED9CF28E241E0EBCFF9 -:100E300081E00895CF93DF93EC01FB018281882349 -:100E400009F419C1C230FCE5DF07C0F1C6319CE5E9 -:100E5000D90730F09E012A5F3C452930310570F5F5 -:100E60000E94631390933A0280933902C031ECE5FB -:100E7000DE0709F4CFC008F05BC0C8308CE5D807A6 -:100E800009F4B6C088F5C430ECE5DE0709F4A8C063 -:100E9000C0F4C2308CE5D80709F49CC080913902B7 -:100EA0008260C330DC4509F498C08091390290918A -:100EB0003A020E9471130E94F40C80E0DF91CF91FE -:100EC0000895809139028061C630ECE5DE0709F4AF -:100ED00084C0809139028860C730DC4508F47DC049 -:100EE00080913902806279C0CC308CE5D80709F452 -:100EF00089C070F4809139028C60CA30ECE5DE075D -:100F000009F46BC008F478C0809139028E7F65C007 -:100F1000CE308CE5D80709F479C0809139028B7FF7 -:100F2000CF30DC4508F459C0809139028F7E55C01E -:100F3000CB3FECE5DE0709F457C030F5C3318CE553 -:100F4000D80709F46FC078F4C131ECE5DE0709F485 -:100F500065C0C231DC4509F0A8CF0E94F40C809135 -:100F600039028F773AC0C5318CE5D80709F462C0E1 -:100F700008F476C080913A028160CA3FDC4509F0EE -:100F800094CF80933A0291CFCF3FFCE5DF0709F47D -:100F90004DC088F480913A028D7FCD3F9CE5D90702 -:100FA00081F380913A028E7FCE3FDC4550F38091F1 -:100FB0003A028360E6CFC130FDE5DF0709F459C08E -:100FC00008F444C080E0C230DD4509F06ECF0E94D5 -:100FD000EF136BCF8091390281608093390265CF26 -:100FE000809139028460F9CF80913A028260C9CF42 -:100FF000809139028064F1CF0E94F40C8091390213 -:101000008068EBCF809139028D7FE7CF80913902E4 -:10101000877FE3CF809139028F7DDFCF80913902C6 -:101020008F7BDBCF80913902837FD7CF80913A02CB -:101030008C7FA7CF8091390282FB992790F921E01C -:10104000922790FB82F990FB83F9C7CF80913A02F7 -:10105000982F909591708E7F892B90FB81F991CF7D -:101060000E94F40C90913902892F97FB87F98058E0 -:10107000B4CF81E0ACCF81E021CFCF93DF93EB0100 -:1010800086319C4511F50E949E129A81992399F010 -:101090008A7A91E009F490E090938201811109C06D -:1010A00089E20E9479120E94ED1280E0DF91CF91D7 -:1010B000089585E3F6CF80918201811104C089E211 -:1010C0000E948012F0CF85E3FBCF81E0EFCF9093B9 -:1010D0008801809387010895E0918701F09188014C -:1010E000309721F00190F081E02D099480E008957F -:1010F000E0918701F0918801309799F020911401D7 -:10110000222359F02091390227FF07C0DC012C91DE -:1011100011962C93119725E02C930280F381E02DFA -:1011200009940895E0918701F0918801309739F092 -:1011300022E0DC012C930480F581E02D09940895D0 -:1011400020918501309186012817390771F090931D -:10115000860180938501E0918701F09188013097A5 -:1011600021F00680F781E02D0994089520918301F4 -:10117000309184012817390771F09093840180938E -:101180008301E0918701F0918801309721F000847C -:10119000F185E02D0994089585B7806885BF85B7EE -:1011A000806885BF0895089508950C94D308089524 -:1011B0000C94D7080E94CC080E94D4080C94D5083F -:1011C00081E008950E942C150E94B6040E94A0158B -:1011D0000C94D808AF92BF92CF92DF92EF92FF9219 -:1011E0000F931F93CF93DF93CDB7DEB72A970FB638 -:1011F000F894DEBF0FBECDBF0E94E7040E94E00856 -:10120000882309F45FC08AE8A82E81E0B82E10E098 -:1012100000E0C02E802F0E94AB04E82EF501D19093 -:101220005F01D81609F44BC08091F70181FD0E943F -:10123000B10480E0FF24F394DE249D2D9F21D1F1A1 -:101240008E83CF82EF2081E009F480E088870E94BE -:1012500035158160782F9A8789874E815F816885EF -:101260008A850E948409F801E657FE4F8081F8269E -:10127000F0820E942D170E946C08909189018917B5 -:1012800091F10E946C08809389012A960FB6F89418 -:10129000DEBF0FBECDBFDF91CF911F910F91FF90A9 -:1012A000EF90DF90CF90BF90AF900C943D0201E0A3 -:1012B00010E0AFCF8F5FFF0C833009F0BECF01305D -:1012C0001105A9F78FEF89838A831B820E94351548 -:1012D0008160782F9D838C8349815A816B818D81B8 -:1012E0000E948409C6CF2A960FB6F894DEBF0FBEBF -:1012F000CDBFDF91CF911F910F91FF90EF90DF90C5 -:10130000CF90BF90AF900895CF93DF93CDB7DEB766 -:101310002B970FB6F894DEBF0FBECDBF4F83588713 -:1013200069877A878B871E821D8285E0FE0137964A -:10133000DE01119601900D928A95E1F749815A815B -:101340006B817C818D819E812B960FB6F894DEBFD8 -:101350000FBECDBFDF91CF910C94940FFC01808123 -:1013600091810C944B12CF93C82F882309F447C066 -:101370008CEF8C0F813AA0F46C2F8091000190913A -:1013800001010E940814882329F08C2F0E948012EA -:101390000E94ED128C2F0E947912CF910C94ED12C5 -:1013A00080E28C0F883048F4C77081E001C0880F5C -:1013B000CA95EAF70E94A112F0CFEBE5EC0FE330FB -:1013C00040F4F0E0E758FE4F808190E0CF910C941C -:1013D000A008E8E5EC0FE73150F4F0E0EE0FFF1F56 -:1013E000E55BFE4F80819181CF910C94B608C03FA0 -:1013F00030F08C2F0E943B16CF910C942217CF9186 -:101400000895882361F19CEF980F913A20F40E948F -:1014100080120C94ED1290E2980F983050F487707F -:1014200091E001C0990F8A95EAF7892F0E94A712CF -:10143000F0CF9BE5980F933020F490E080E00C947F -:10144000A00898E5980F973120F490E080E00C9484 -:10145000B608803F20F00E94A3160C94221708952E -:10146000CF93C82F0E94B309C93349F42FEF87EEF9 -:1014700093E0215080409040E1F700C000008C2FA5 -:10148000CF910C94010A882321F00E94A1120C94A0 -:10149000ED120895882321F00E94A7120C94ED12FA -:1014A0000895BF92CF92DF92EF92FF920F931F9316 -:1014B000CF93DF936C01D62FC72FFC0105810295D6 -:1014C0000F70128111110E94C1120E949712E82E12 -:1014D000882371F01123B1F080E28D0F883090F0F5 -:1014E00082E00E9438130E94971291E0E82EE926CC -:1014F000BC2EB2949FE0B922EB2DF0E0E355F04E04 -:101500000C944F1FE12CF4CF0C2F0F70C07F11F003 -:101510000295007F1123A9F0002359F080E28D0F7E -:10152000883010F0D11109C0802F0E94A1120E94B2 -:10153000ED128D2F0E94B30914C0802F0E94B412A7 -:10154000F6CF8D2F0E94010A002359F080E28D0F03 -:10155000883010F0D1112CC0802F0E94A7120E9459 -:10156000ED122B2D2850330B2430310520F40E942E -:101570006C080E943D02EE2009F4D5C10E9493122E -:1015800080FDD1C1F60112820E948D120E941811B5 -:10159000C6010E94B40C0E948D12DF91CF911F9161 -:1015A0000F91FF90EF90DF90CF90BF900C94391186 -:1015B000802F0E94BA12D3CFFC2FFF70FF2EC07F66 -:1015C000C03219F0F29480EFF822DD2369F0D130B7 -:1015D00049F1112391F1002351F1F601858180FF3A -:1015E000A8CF8F70858323C0112381F0011106C01D -:1015F0000E94D4128F290E94430AB3CF0130C1F751 -:101600000E94D4128F290E94DA12ABCF011106C0BA -:101610000E94E3128F2D0E944A0AA3CF013009F4E1 -:10162000A0CFF6CF112329F0063008F09ACF8F2DE6 -:10163000E2CF053008F095CFEDCF002359F3D93331 -:1016400049F4FFEF27EE33E0F15020403040E1F75E -:1016500000C000008D2F0E94010A83CF8C2F869539 -:101660008695837069F0813009F07BCF8D2F9C2F98 -:101670009370111102C090E080E00E94B60871CF13 -:101680008D2F9C2F9370111102C090E080E00E947A -:10169000A00867CF112309F1D53F99F0D63FB9F0E3 -:1016A000D43F49F480913302909134028160909349 -:1016B0003402809333028D2F0E943B160E94221722 -:1016C00050CF80913302909134028260F0CF8091AC -:1016D0003302909134028460EACFD53F89F0D63F3F -:1016E000A9F0D43F49F480913302909134028E7F67 -:1016F00090933402809333028D2F0E94A316DECF85 -:1017000080913302909134028D7FF2CF8091330229 -:10171000909134028B7FECCF8C2F837009F041C005 -:1017200011111FCF4D2F429546954770440F440F1E -:101730000D2F0F7010E030E020E0042E04C0000FE9 -:10174000111F221F331F0A94D2F760E070E0CB0113 -:10175000D4FF0FC06FE070E080E090E004C0660F3F -:10176000771F881F991F4A95D2F7609570958095CD -:101770009095C695C695C370602B712B822B932BC9 -:10178000C23049F058F4C13019F00E94CA10E9CEB5 -:101790000E94B810E6CE0E94DC10E3CE0E94B61084 -:1017A000E0CE8695112311F08C2F8170882309F4E7 -:1017B000D8CE4D2F429546954770440F440F0D2FBC -:1017C0000F7010E030E020E0042E04C0000F111F65 -:1017D000221F331F0A94D2F760E070E0CB01D4FFE0 -:1017E0000FC06FE070E080E090E004C0660F771FEC -:1017F000881F991F4A95D2F76095709580959095AE -:10180000C695C695C370602B712B822B932BC2306B -:1018100049F058F4C13019F00E948F11A2CE0E94F5 -:101820007D119FCE0E94A1119CCE0E94F21099CEF4 -:10183000CF70112329F08C2F0E9418118D2FDBCE31 -:101840008D2F0E944A0A8C2F0E9439118ACED23FD6 -:1018500089F160F4D03FC9F0D13F29F1112309F497 -:1018600042C0011166CE8C2F8F7121C0D33F39F158 -:10187000D43FA1F7112369F1CF718C2F0E94181169 -:1018800063E08C2F0E9423136CCE112341F00530AE -:1018900008F067CE8C2F8F710E945C1162CE0630EB -:1018A00008F05FCEF7CF8C2F8F71112369F20E9461 -:1018B000181157CE8C2F8F711123C9F3C5CF112367 -:1018C00029F08C2F8F710E9403114BCE0E94FE10C5 -:1018D00048CE81E00E943813023008F442CE82E004 -:1018E0000E9438133ECE002359F0D93309F0B2CE0E -:1018F0008FEF97EEE3E081509040E040E1F7A8CE13 -:101900008C2F8F71A1CF4C2F4F706D2FC6010E946D -:1019100096020E942E1025CE4C2F4F706D2FC601BF -:101920000E9499021ECEDF91CF911F910F91FF90DF -:10193000EF90DF90CF90BF9008950F931F93CF93B8 -:10194000DF93EC01688179818A810E9455128C01B4 -:101950000E94B3110E94B510B801CE01DF91CF9162 -:101960001F910F910C94510ACF93DF93EC018B815F -:101970009C81892B29F08881998189238F3F19F4D3 -:10198000DF91CF910895CE010E9455028823C1F3C3 -:10199000CE010E949D0CCE01DF91CF910C941202DA -:1019A000882321F00E94B4120C94ED12089588232C -:1019B00021F00E94BA120C94ED1208950E94C112F7 -:1019C0000E94D1120E94ED120E9447180E94221715 -:1019D00090E080E00E94A00890E080E00C94B608BF -:1019E0000E9487120C94DE0C0E94B1120C94F00C31 -:1019F000E92FE295EF70E250EE3070F4F0E0E3543E -:101A0000F04E0C944F1F803F19F020F4883E20F4D4 -:101A100081E00895843FE1F380E00895883EC0F3BB -:101A2000813FD1F7F5CF93FB882780F908950E9475 -:101A30004B120C94F80CCF93DF9300D000D00F9290 -:101A4000CDB7DEB70F900F900F900F900F90DF91F2 -:101A5000CF910895CF93DF9300D000D000D0CDB7C1 -:101A6000DEB726960FB6F894DEBF0FBECDBFDF916E -:101A7000CF9108951F93CF93DF93C0918D0116E00E -:101A800080918E018C1304C0DF91CF911F91089536 -:101A9000D0E01C9FF0011D9FF00D1124E157FE4F77 -:101AA0004081518162817381848195810E942A0DD8 -:101AB0002196C770E5CF4091BF015091C001609160 -:101AC000C1017091C2018091C3019091C4010C9435 -:101AD0002A0D1F93CF93DF938091C401807FC1F4BF -:101AE0008091C1018823A1F080918D01C0918E0168 -:101AF0006091BF017091C0014091C2015091C3013A -:101B0000D62FD723DA01A095B09516E0C81304C0EC -:101B1000DF91CF911F91089590E04115510511F08B -:101B2000DF3F31F401968770F1CF2A0F3B1F17C0BA -:101B3000189FF001199FF00D1124E157FE4F2181EC -:101B40002713F0CF20812613EDCF22812111EACF78 -:101B5000238134812417350740F3241B350B283C9F -:101B6000310500F72091C4012F7020612093C4013A -:101B700026E0289FF001299FF00D1124EC56FE4F1E -:101B800080818F70806180838FEB91E00E94B40C24 -:101B9000DF91CF911F910C943A0DBF92CF92DF92BB -:101BA000EF92FF920F931F93CF93DF93CDB7DEB7E2 -:101BB00061970FB6F894DEBF0FBECDBF8C0185E0F4 -:101BC000F801DE011D9601900D928A95E1F7D8018A -:101BD0004C9111965C9111971296EC90129780910E -:101BE000C2019091C301009709F47FC12091BF0108 -:101BF0003091C001622F63236F3F09F476C11396C1 -:101C0000CD90DC90B090C101BB2009F411C1C81681 -:101C1000D906D0F1F601E81BF90BCF01FF24F394AC -:101C2000883C910508F0F12C8091C401982F907F99 -:101C3000FF2009F4B8C091117FC0FE2C351329C0D4 -:101C4000241327C0E11025C08F7080618093C401E8 -:101C50000E945B0D8FEB91E00E94B40C8091C40157 -:101C6000D80115968C938F2D61960FB6F894DEBF30 -:101C70000FBECDBFDF91CF911F910F91FF90EF90DD -:101C8000DF90CF90BF900895809590958C0D9D1D0D -:101C9000C5CFCD2829F0852F84238F3F09F041C17E -:101CA00080E0B82FB170DB2E80FF3CC080918D01A9 -:101CB00020918E0136E0821315C04D875E878D8599 -:101CC0009E850E944B12292F22952F702230F0F012 -:101CD000243018F59F70F1F0F8019581907FD1F4D0 -:101CE000D12C1EC090E0389FF001399FF00D1124D7 -:101CF000E157FE4F6181651306C06081641303C024 -:101D00006281E6120FC001968770D5CF9F7011F0E7 -:101D1000882331F3805E883018F3C8010E94B40C28 -:101D2000FD2CA1CFEE2009F49ECF8091C4018160EB -:101D30008093C401F12C97CF351306C0241304C03F -:101D4000D801EE2009F49AC04D875E878D859E8567 -:101D50000E94170D882319F1EE2009F18091C4012A -:101D6000803270F02091BF013091C00138872F83FD -:101D70001986DB86CA868C87CE0107960E94B40C32 -:101D800086E0F801AFEBB1E001900D928A95E1F7A2 -:101D90000E94690D0E945B0DFF24F39464CFC8017B -:101DA0000E94B40CF9CF911113C07C2DD98AC88A36 -:101DB0006E2D89890E941B0D8FEB91E00E94B40C5F -:101DC00086E0EFEBF1E0DF011D928A95E9F763C051 -:101DD000351312C0241310C0E1100EC0F801858322 -:101DE000C8010E94B40CEFEBF1E086E0DF011D9228 -:101DF0008A95E9F7FB2C37CF4D875E878D859E85C9 -:101E00000E94170D882359F2EE2049F28091C401F7 -:101E1000803208F4B5CF2091BF013091C0013A83E0 -:101E200029831B82DD82CC828E83CE010196A6CFD0 -:101E3000C816D90698F1F601E81BF90BCF01F12C71 -:101E4000883C910508F049C0FE2CEE2009F4A7CF8C -:101E5000351332C0241330C08091C40180FD23C0EB -:101E6000982F907F01F1D80115968C931597903F8C -:101E700039F0982F907F905F8F70892B15968C93F7 -:101E8000C8010E94B40C86E0F801AFEBB1E001900C -:101E90000D928A95E1F70E945B0DE5CE80959095B5 -:101EA0008C0D9D1DCCCF86E0F801AFEBB1E0019029 -:101EB0000D928A95E1F7D7CE4D875E878D859E85F9 -:101EC0000E94170D81115CCF8091C40181608093C5 -:101ED000C401C8010E94B40CC6CE7C2DD98AC88A20 -:101EE0006E2D89890E941B0D6BCFEE2009F457CF10 -:101EF0004D875E878D859E850E94170DF82E88235D -:101F000009F44DCF86E0F801AFEBB1E001900D92FE -:101F10008A95E1F78FEB91E00E94AE090E94690D6E -:101F2000BACF81E08E25BDCE1F93CF93DF93CDB77F -:101F3000DEB72C970FB6F894DEBF0FBECDBF4F8330 -:101F4000588769877A878B879C87CE0107960E947E -:101F5000CD0D882369F08A859B85892B39F04F81C7 -:101F60005885842F85238F3F09F071C016E05FC02C -:101F700086E0FE013796DE01119601900D928A955A -:101F8000E1F78A859B85892B89F388859F81892341 -:101F90008F3F61F320918E0130E0C9010196877077 -:101FA000992740918D014817190671F40E94F40C8D -:101FB00010928E0110928D0186E0EFEBF1E0DF01CF -:101FC0001D928A95E9F7D2CF96E0929FD001939F18 -:101FD000B00D1124A157BE4FFE01319601900D9214 -:101FE0009A95E1F780938E010E943A0DBFCF819FB1 -:101FF000C001112481579E4F0E94CD0D8823E9F026 -:10200000E0918D011E9FF0011124E157FE4F4081A8 -:10201000518162817381848195810E942A0D809112 -:102020008D0190E001968770992780938D018091B2 -:102030008D0190918E018913DACF2C960FB6F8940A -:10204000DEBF0FBECDBFDF91CF911F91089569858F -:102050007A858B859C850E942A0D88CFEF92FF920E -:102060000F931F93CF93DF938C01892B81F0F12C79 -:10207000EE24E394E8012196F8018491843770F40A -:10208000843008F05FC08130B1F08230A1F1DF917F -:10209000CF911F910F91FF90EF900895853709F42C -:1020A0004CC008F43DC09CE7980F903780F78F77BD -:1020B0000E94010A49C00E5F1F4FFE01849190E209 -:1020C000980F983060F48770FE2D01C0FF0F8A953D -:1020D000EAF78F2F0E94C4120E94ED1202C00E94E4 -:1020E000B3098F2D815030F2EFE9FFE03197F1F71E -:1020F00000C00000F7CF0E5F1F4FFE01849190E2F9 -:10210000980F983050F48770FE2D01C0FF0F8A950C -:10211000EAF78F2F0E94CA12DFCF0E94010AE1CF97 -:102120000E5F1F4FFE01C491C150D8F28FE99FE0AE -:102130000197F1F700C00000F7CF0E5F1F4FFE01BF -:10214000F490CFCF0E94B3098E01CBCF08950C94A9 -:10215000A6100E94A7106093CE017093CF018093C8 -:10216000D0019093D1010C94DE0C08950C94A91029 -:102170000F931F930091CE011091CF012091D001B8 -:102180003091D101602B712B822B932B1F910F91DA -:102190000C94A9100F931F930091CE011091CF01C1 -:1021A0002091D0013091D1016023712382239323A8 -:1021B0001F910F910C94A9100F931F930091CE01C2 -:1021C0001091CF012091D0013091D101602771276A -:1021D000822793271F910F910C94A9100C94A6109D -:1021E0000C94EE100E94F0106093CA017093CB0122 -:1021F0008093CC019093CD010C94DE0C60E070E0F4 -:10220000CB010C94F2100F931F9341E050E060E07B -:1022100070E08A019B0104C0000F111F221F331FB1 -:102220008A95D2F7C901B8011F910F910C94F21051 -:102230000F931F9341E050E060E070E004C0440F52 -:10224000551F661F771F8A95D2F78091CA0190911A -:10225000CB01A091CC01B091CD018A019B01082B4B -:10226000192B2A2B3B2BC901B8011F910F910C94FC -:10227000F2100F931F9341E050E060E070E004C063 -:10228000440F551F661F771F8A95D2F7CB01BA01FD -:1022900060957095809590950091CA011091CB0141 -:1022A0002091CC013091CD016023712382239323AF -:1022B0001F910F910C94F2100F931F9341E050E087 -:1022C00060E070E004C0440F551F661F771F8A95B9 -:1022D000D2F78091CA019091CB01A091CC01B0912D -:1022E000CD018A019B01082719272A273B27C9010D -:1022F000B8011F910F910C94F2100F931F9300914E -:10230000CA011091CB012091CC013091CD01602BFD -:10231000712B822B932B1F910F910C94F2100F9322 -:102320001F930091CA011091CB012091CC013091F3 -:10233000CD0160237123822393231F910F910C946D -:10234000F2100F931F930091CA011091CB012091BD -:10235000CC013091CD0160277127822793271F91EF -:102360000F910C94F2100895E92FEE0F9E0F890F34 -:10237000982F977041E001C0440F9A95EAF786952F -:102380008695869595E0899FF0011124EB53FE4FC9 -:1023900030E020E070E05191DF011197CB01022E77 -:1023A00002C0969587950A94E2F7817081958527FA -:1023B000842385278C932F5F3F4F2530310559F7B4 -:1023C0000895E92FEE0F9E0F890F982F977086952D -:1023D0008695869525E0829FF0011124EB53FE4FF0 -:1023E00050E040E080E0219130E0092E02C03695B7 -:1023F00027950A94E2F721703327042E01C0220F9B -:102400000A94EAF7822B4F5F5F4F4530510559F729 -:102410000895BF92CF92DF92EF92FF920F931F9396 -:10242000CF93DF938C01C090CA01D090CB01E09094 -:10243000CC01F090CD018091CE019091CF01A0917F -:10244000D001B091D101C82AD92AEA2AFB2ACFE1CA -:10245000D0E0BC2ED701C6010C2E04C0B695A795BE -:10246000979587950A94D2F780FD0EC0219788F73B -:10247000B12C8B2DDF91CF911F910F91FF90EF9099 -:10248000DF90CF90BF900895B8018C2F0E94B602C4 -:10249000019761F3EECFCF93DF93EC010E94091215 -:1024A000BE01DF91CF910C94B6021F93CF93DF93BF -:1024B000EB0190918C01992331F0CB01DF91CF9109 -:1024C0001F910C944B12882379F0CB010E940912C2 -:1024D000182F682FCE010E94B411BE01812FDF9109 -:1024E000CF911F910C94B602CB010E94E111182FDD -:1024F000F4CF682F80910001909101010C94881411 -:10250000682F80910001909101010C9493148091A7 -:102510000001909101010C949E148091D201859547 -:102520008595859508958091D20187700895909141 -:10253000D201977081E009F480E008958091F6015E -:1025400008959091F601892B8093F6010895809566 -:102550009091F60198239093F60108958093F601E7 -:1025600008951092F60108959091F501892B8093BA -:10257000F501089580959091F50198239093F501C8 -:1025800008951092F50108959091F401892B80939C -:10259000F401089580959091F40198239093F401AB -:1025A00008951092F40108958091D301089508953B -:1025B0000C94D7129091D301981721F08093D301F6 -:1025C0000C94D81208958091D301882329F0109299 -:1025D000D30180E00C94D8120895E0910001F091AD -:1025E00001018091F6018083E0910001F0910101E9 -:1025F00080819091F501892B8083E0910001F09119 -:10260000010180819091F401892B80839091D30105 -:10261000992381F0E0910001F09101018081892BE3 -:10262000808380910001909101010E94F413811137 -:102630000E94E31280910001909101010C947808AE -:1026400008950C94201398E0899F90011124622B27 -:102650006093D2010E9418118091D20185958595D1 -:1026600085950C9421131092D20180E00C942113D3 -:102670009091D201809589238093D201282F2770D1 -:1026800071F4282F082E000C330B9217130639F023 -:102690008595859585950E9439110C94331308957D -:1026A00090E080E00E94711F21E08C3E9E4F09F077 -:1026B00020E0822F089582E090E00C94691F83E06F -:1026C00090E00C94691FCF9384E090E00E94691F12 -:1026D000C82F81E290E00E94691F982F8C2FCF9124 -:1026E0000895CF93C92F682F84E090E00E94771F50 -:1026F0006C2F81E290E0CF910C94771FAB01BC016D -:102700008FE090E00C94891FAB01BC0183E190E065 -:102710000C94891F60E070E0CB010C94841360E09E -:1027200070E0CB010E947E130C948A136CEE7EEF56 -:1027300090E080E00E94951F60E082E090E00E94BF -:10274000771F60E083E090E00E94771F1092CE0137 -:102750001092CF011092D0011092D10160E084E07C -:1027600090E00E94771F60E081E290E00E94771F76 -:1027700060E085E090E00E94771F60E086E090E0F6 -:102780000E94771F6FEF87E090E00E94771F40E084 -:1027900050E0BA0188E090E00E94891F60E08DE07F -:1027A00090E00E94771F40E050E0BA0188E190E09D -:1027B0000E94891F60E087E190E00E94771F40E05F -:1027C00050E0BA018CE190E00E94891F60E080E255 -:1027D00090E00E94771F0C948F130C949613682F2F -:1027E0008EE090E00C94771FFC01329680911401EA -:1027F000882321F0809139029EE187FF96E080E0F6 -:10280000915008F4089521912223D1F38F5FF8CFDE -:10281000662301F1209114012223F1F02091390265 -:1028200027FF1AC0462F4695469546954E3190F49F -:10283000677021E030E002C0220F331F6A95E2F793 -:10284000840F911DFC01828190E02823392381E0CF -:10285000232B69F480E00895FC01329608962191BB -:10286000261721F0E817F907D1F7F4CF81E0089592 -:102870009C01FC0132969FEF80E04191461751F098 -:102880009F3F19F4411101C0982F8F5F8630A9F73F -:102890009F3F09F40895290F311D97FD3A95F901DD -:1028A00062830895FC01329608962191261303C095 -:1028B000DF0111971C92E817F907B9F70895E62F81 -:1028C000E695E695E695EE3168F4E80FF92FF11DEF -:1028D000677021E030E001C0220F6A95EAF782813B -:1028E000822B82830895E62FE695E695E695EE31F4 -:1028F00070F4E80FF92FF11D677021E030E001C09E -:10290000220F6A95EAF72095828128232283089571 -:1029100020911401222329F02091390227FD0C94E3 -:102920005F140C94381420911401222329F0209173 -:10293000390227FD0C9473140C945214FC01329646 -:1029400080911401882351F08091390287FF06C0DD -:102950008EE1DF011D928A95E9F7089586E0F9CFAF -:10296000089508950C94B1140E94B21480913F020E -:10297000843049F11092F80188E190E020E40FB62C -:10298000F894A895809360000FBE2093600080E0CB -:102990000E943D020E94B21483B7817F846083BF8E -:1029A00083B7816083BF7894889583B78E7F83BF18 -:1029B0000FB6F894A89580916000886180936000BC -:1029C000109260000FBE089508950E94B0140E94F6 -:1029D000E7040E94E41480E00E94AB0491E08111BE -:1029E00007C081E00E94AB0491E0811101C090E03A -:1029F000892F089508950C94FA140E94F40C0E94F3 -:102A00006C080E943D020C94FB141F921FB61F928B -:102A100011248F939F93AF93BF938091F8018111FD -:102A200013C08091350290913602A0913702B09187 -:102A300038024196A11DB11D809335029093360254 -:102A4000A0933702B0933802BF91AF919F918F91BD -:102A50001F901FBE1F90189582E084BD93E095BD26 -:102A60009AEF97BD80936E0008952FB7F8948091E8 -:102A7000350290913602A0913702B09138022FBFF3 -:102A80000895CF92DF92EF92FF920F931F932FB78B -:102A9000F89440913502509136026091370270915E -:102AA00038022FBF6A017B01EE24FF248C0130E045 -:102AB00020E0C016D106E206F30650F0481B590B81 -:102AC000CA011F910F91FF90EF90DF90CF90089572 -:102AD00041505109F3CF78941F921FB61F921124D1 -:102AE0008F939F93AF93BF9380913502909136025D -:102AF000A0913702B09138020196A11DB11D8093BB -:102B0000350290933602A0933702B0933802BF91FA -:102B1000AF919F918F911F901FBE1F90189587E7CF -:102B200097E7909301088093000888E19AE00FB638 -:102B3000F894A895809360000FBE90936000FFCF3B -:102B40000E945013811102C00E94ED130E945B137A -:102B50008093F7010E94631390933A0280933902A5 -:102B60000E945F13682F70E090E080E00C94B61034 -:102B70008091000280FF12C06091070185E0689F8C -:102B8000B001112475956795759567956038710545 -:102B9000A8F561157105A1F1862F089581FF09C07F -:102BA0006091070185E0689FB001112475956795D4 -:102BB000EDCF6091070182FD0AC08091FF0188235B -:102BC000D1F09091060160910701891728F085E006 -:102BD000689FB0011124DACF869FB001112485E0EF -:102BE000869F9001879F300D1124692F70E0C901E5 -:102BF0000E943B1FCBCF65E070E0CECF8FE70895FA -:102C000081E008958091000280FF0CC06091030173 -:102C100070E075956795759567956115710549F132 -:102C2000862F089581FF06C06091030170E07595BD -:102C30006795F3CF6091030182FD0BC09091FF0176 -:102C40009923A1F06091020180910301961738F059 -:102C5000682F70E06038710500F38FE70895899F51 -:102C6000C001112470E00E943B1FF4CF61E070E0CE -:102C7000D7CF81E00895803F31F40E94B815819547 -:102C8000809304020895813F19F40E94B815F8CF8B -:102C9000823F31F40E94B815819580930302089514 -:102CA000833F19F40E94B815F8CF893F29F40E9498 -:102CB00002168093050208958A3F21F40E940216AD -:102CC0008195F7CF8B3F31F40E9402168195809356 -:102CD000060208958C3F19F40E940216F8CF843F33 -:102CE00031F4809102028160809302020895853F51 -:102CF00021F4809102028260F7CF863F21F4809117 -:102D000002028460F1CF873F21F480910202886043 -:102D1000EBCF883F21F4809102028061E5CF8D3FA7 -:102D200031F48091000281608093000208958E3F0B -:102D300021F4809100028260F7CF8F3FB9F7809134 -:102D400000028460F1CF90910302803F41F48091B2 -:102D5000040287FD10920402992371F00895813FC7 -:102D600029F4809104021816ACF3F6CF823F81F467 -:102D700097FFF2CF10920302809104029091050216 -:102D8000892B90910602892B49F71092FF01089533 -:102D9000833F19F4191674F3DFCF893F39F480911A -:102DA00005021816CCF610920502D6CF8A3F29F4F8 -:102DB0008091050287FFD0CFF6CF8B3F39F4809109 -:102DC000060287FFC9CF10920602C6CF8C3F29F4B6 -:102DD000809106021816BCF3BFCF843F31F4809176 -:102DE00002028E7F80930202B7CF853F21F480914B -:102DF00002028D7FF7CF863F21F4809102028B7F04 -:102E0000F1CF873F21F480910202877FEBCF883F8B -:102E100021F4809102028F7EE5CF8D3F31F48091C5 -:102E200000028E7F8093000297CF8E3F21F4809125 -:102E300000028D7FF7CF8F3F09F08ECF8091000287 -:102E40008B7FF0CF81E092E00E9492080E943515BE -:102E50009093FE018093FD010895CF93DF9300D0FE -:102E600000D000D0CDB7DEB786E0E1E0F2E0DE01D1 -:102E7000119601900D928A95E1F78091030290914D -:102E80000402892B81F08091FB019091FC010E944A -:102E90004115AC019091FF01992331F18091080116 -:102EA0008417150670F18091050290910602892B16 -:102EB00091F08091F9019091FA010E944115AC01C5 -:102EC0009091FF01992309F478C08091040184173F -:102ED000150608F480C026960FB6F894DEBF0FBE24 -:102EE000CDBFDF91CF910895209109018AE0289FFD -:102EF0009001112424173507B0F69F5F9093FF01CE -:102F000002C09F3FD1F710920502109206028091F5 -:102F10000302181624F40E94B815809303028091CE -:102F2000030287FF05C00E94B815819580930302B4 -:102F300080910402181624F40E94B81580930402AC -:102F40008091040287FF05C00E94B8158195809387 -:102F50000402309103023323A1F0209104022223C2 -:102F600081F045EB3403C00111249923F1F09093D3 -:102F7000030245EB2403900111243323D1F0309355 -:102F800004020E9422178091FD019091FE0190930E -:102F9000FC018093FB0186E0FE013196A1E0B2E0E6 -:102FA00001900D928A95E1F77ECF81E08093030234 -:102FB000E0CF81E080930402E4CF209105018AE014 -:102FC000289F900111242417350708F084CF9F5FB4 -:102FD0009093FF0102C09F3FD1F71092030210921D -:102FE000040280910502181624F40E9402168093B0 -:102FF00005028091050287FF05C00E940216819597 -:103000008093050280910602181624F40E9402168D -:10301000809306028091060287FF05C00E94021677 -:10302000819580930602309105023323A1F020910F -:103030000602222381F045EB3403C00111249923B9 -:10304000F1F09093050245EB240390011124332302 -:10305000D1F0309306020E9422178091FD019091D9 -:10306000FE019093FA018093F90186E0FE0131960A -:10307000A1E0B2E001900D928A95E1F72CCF81E0BA -:1030800080930502E0CF81E080930602E4CF86E0E2 -:10309000E1E0F2E0DF011D928A95E9F71092FF016D -:1030A000109200020895809127020895CF93DF9334 -:1030B00000D00F92CDB7DEB790913F02943019F552 -:1030C00089837B836A8382E08093E9008FEF90910C -:1030D000E800815095FD06C095ED9A95F1F7000046 -:1030E0008111F5CF8091E80085FF0DC050E040E0F0 -:1030F00063E070E0CE0101960E94AA1A8091E80078 -:103100008E778093E8000F900F900F90DF91CF9112 -:103110000895CF93DF93EC010E948D1A823011F055 -:10312000843031F4BE0184E0DF91CF910C945618C5 -:10313000DF91CF910895BC0183E00C945618CF9392 -:10314000DF93EC010E948D1A823011F08430F9F483 -:1031500082E08093E9008FEF9091E800815095FD27 -:1031600006C095ED9A95F1F700008111F5CF809199 -:10317000E80085FF0CC050E040E066E070E0CE0162 -:103180000E94AA1A8091E8008E778093E800DF9170 -:10319000CF910895CF93DF93EC010E948D1A823076 -:1031A00011F08430B9F5809114018823B1F1809138 -:1031B000390287FF32C060E282E08093E9008FEF3E -:1031C0009091E800815095FD06C095ED9A95F1F734 -:1031D00000008111F5CF8091E80085FF1BC0809130 -:1031E000140170E050E040E0811104C050E040E084 -:1031F00068E070E0CE010E94AA1A8091E8008E7704 -:103200008093E80080E2FE01A7E0B2E001900D9219 -:103210008A95E1F7DF91CF91089568E081E0CDCF05 -:1032200080913E02811109C00E943A1C0E94971CA5 -:103230008091E20084608093E200089510923E0243 -:103240000895089508950C94FD1442E061EC81E026 -:103250000E94B61B42E261EC82E00C94B61B8091A6 -:103260004102833009F45FC030F48130C1F1823013 -:1032700009F49BC008958A3009F487C08B3009F4A3 -:103280006DC0893009F04EC080914002813209F052 -:1032900049C08091440290914502029708F042C0D3 -:1032A0008091E800877F8093E8008091E80082FFAA -:1032B00035C09091F3008091F200029729F480913B -:1032C000F1008B7F813021F48091F10080932702FF -:1032D0008091E8008B778093E8000C94EA1B809142 -:1032E0004002813AF9F48091E800877F8093E800FA -:1032F0008091440290914502892B61F460E287E05D -:1033000092E070E00E94F91A8091E8008B77809338 -:10331000E800089560E090E080E0F3CF80913F0204 -:103320008111C3CF089580914002813AD9F78091ED -:10333000440290914502892BA9F78091E800877F8C -:103340008093E8008091E80080FFFCCF8091140119 -:103350008093F1008091E8008E77BDCF809140028C -:10336000813201F78091440290914502892BD1F678 -:103370008091E800877F8093E8000E94EA1B80919B -:103380004202809314010C94F40C8091400281322B -:1033900049F68091E800877F8093E8000E94EA1B4D -:1033A0008091430280932802089580914002813ADF -:1033B00009F0B8CF8091E800877F8093E800809182 -:1033C000E80080FFFCCF80912802C2CF84B7877FBE -:1033D00084BF0FB6F894A8958091600088618093AF -:1033E0006000109260000FBE80E890E00FB6F89485 -:1033F00080936100909361000FBE0E94DA080E94E2 -:103400003A1C0E94971C8091E20084608093E20045 -:1034100078940E94201F0E94E2088AE091E00E94B6 -:10342000670880913F02853019F00E94EA08F9CFC1 -:103430000E94B41480913D02882399F30E94E51400 -:10344000882379F30E94941AECCF0C94271A292F21 -:1034500033272330310519F168F42130310509F49F -:103460004AC02230310509F44BC090E080E030E0E2 -:1034700020E028C02132310579F122323105A9F747 -:1034800080E490E027EF31E061157105D9F08CEB15 -:1034900090E02BE331E061307105A1F0E6CF992790 -:1034A0008130910599F0009741F08230910589F0C3 -:1034B0000397D9F6E4ECF0E002C0EAEEF0E0849184 -:1034C00090E09F01FA01318320830895E8EDF0E058 -:1034D000F6CFEAECF0E0F3CF89E090E020E031E0D5 -:1034E0006115710579F389E090E029E131E06130FF -:1034F000710541F3BACF82E190E029E231E0E2CFF9 -:103500008BE390E02EEE30E0DDCF80913F028430FF -:1035100011F482E0089581E00895809129028111DB -:1035200002C00C94851A089580E189BD82E189BDAD -:1035300009B400FEFDCF8091D8008F7D8093D80024 -:103540008091E00082608093E0008091E00081FD46 -:10355000FCCF0895AF92BF92CF92DF92FF920F936C -:103560001F93CF93DF936C01EB018A010E94091C2A -:10357000F82E811123C00115110539F0F801808161 -:103580009181C81BD90BC80ED91EB12CA12C209734 -:10359000A9F08091E80085FD22C08091E8008E7737 -:1035A0008093E80001151105A1F0F8018081918157 -:1035B000A80EB91EB182A08285E0F82E8F2DDF9172 -:1035C000CF911F910F91FF90DF90CF90BF90AF9060 -:1035D00008950E94091C8823D1F2F82EEFCFF6013E -:1035E00081916F018093F1002197FFEFAF1ABF0A1D -:1035F000CECFFC0180914602909147028617970733 -:10360000A0F06115710529F49091E8009E779093E0 -:10361000E80090E06115710551F4911108C08091A6 -:10362000E80082FF34C080E00895BC01F2CF8091B1 -:103630003F028823C1F18530C1F18091E80083FD0C -:1036400030C08091E80082FDEACF8091E80080FFE1 -:10365000E1CF8091F3002091F200382F61157105C0 -:1036600019F02830310558F091E02830310509F083 -:1036700090E02091E8002E772093E800CBCF819155 -:103680008093F100615071092F5F3F4FE7CF809128 -:103690003F02882341F0853041F08091E80083FFAC -:1036A000BECF81E0089582E0089583E00895FC0193 -:1036B000809146029091470286179707A0F0611506 -:1036C000710529F48091E8008E778093E80090E0FE -:1036D0006115710551F4911108C08091E80082FFD5 -:1036E00035C080E00895BC01F2CF80913F0288236D -:1036F000C9F18530C9F18091E80083FD31C0809126 -:10370000E80082FDEACF8091E80080FFE1CF809160 -:10371000F3002091F200382F6115710519F028305F -:10372000310558F091E02830310509F090E08091A2 -:10373000E8008E778093E800CBCF84918093F100EE -:103740003196615071092F5F3F4FE6CF80913F0264 -:10375000882341F0853041F08091E80083FFBDCFA0 -:1037600081E0089582E0089583E00895982F9730CE -:1037700028F08F708093E90081E008959093E9002C -:10378000242F762F50E0981731F07091EC002091A3 -:10379000ED005091F00021FD02C09F5FE8CF309115 -:1037A000EB003E7F3093EB003091ED003D7F309396 -:1037B000ED003091EB0031603093EB007093EC0042 -:1037C0002093ED005093F0002091EE0027FDE5CF0F -:1037D00080E008958091400287FF13C08091E80047 -:1037E00082FF06C08091E8008B778093E80004C0D8 -:1037F00080913F028111F2CF089580913F0288238A -:10380000D9F38091E80080FFF8CF8091E8008E77AF -:10381000ECCF2091E4003091E50095E6A9012091DC -:10382000EC00822F817020FF06C08091E80080FFAD -:1038300006C080E008952091E80022FD1AC0809122 -:103840003F02882389F0853089F08091EB0085FD67 -:103850000FC02091E4003091E50042175307F9F2C0 -:103860009150E1F684E0089582E0089583E00895A0 -:1038700081E008950E94A81C0E94B01CE0EEF0E0D8 -:10388000808181608083E8EDF0E080818F778083A4 -:1038900019BCA7EDB0E08C918E7F8C9380818F7ED8 -:1038A000808310923E0208950F931F93CF93DF936E -:1038B0000E94A81C0E94B01CC8EDD0E088818F77C0 -:1038C000888388818068888388818F7D888319BCFC -:1038D00010923F0210923B0210923D0210923C0265 -:1038E00000EE10E0F80180818B7F80838881816009 -:1038F000888342E060E080E00E94B61BE1EEF0E0E9 -:1039000080818E7F8083E2EEF0E080818160808321 -:10391000808188608083F80180818E7F80838881A8 -:1039200080618883DF91CF911F910F910895E8ED19 -:10393000F0E080818F7E8083E7EDF0E08081816020 -:10394000808384E082BF81E080933E020C94541C0B -:10395000E8EDF0E080818E7F80831092E200089590 -:103960001092DA001092E10008951F920F920FB6A4 -:103970000F9211242F933F934F935F936F937F93F5 -:103980008F939F93AF93BF93EF93FF938091E10049 -:1039900082FF0BC08091E20082FF07C08091E100AE -:1039A0008B7F8093E1000E941F1F8091DA0080FFCF -:1039B00019C08091D80080FF15C08091DA008E7FF9 -:1039C0008093DA008091D90080FF96C080E189BDA4 -:1039D00082E189BD09B400FEFDCF81E080933F0202 -:1039E0000E9410198091E10080FF19C08091E200CF -:1039F00080FF15C08091E2008E7F8093E20080916D -:103A0000E20080618093E2008091D8008062809320 -:103A1000D80019BC85E080933F020E942219809152 -:103A2000E10084FF2BC08091E20084FF27C080E189 -:103A300089BD82E189BD89B5982F917080FFFBCF48 -:103A40008091D8008F7D8093D8008091E1008F7E97 -:103A50008093E1008091E2008F7E8093E20080916C -:103A6000E20081608093E20080913B02882309F4A8 -:103A700049C084E080933F020E9423198091E100B5 -:103A800083FF29C08091E20083FF25C08091E1007F -:103A9000877F8093E10082E080933F0210923B0297 -:103AA0008091E1008E7F8093E1008091E2008E7F23 -:103AB0008093E2008091E20080618093E20042E026 -:103AC00060E080E00E94B61B8091F00088608093E7 -:103AD000F0000E942119FF91EF91BF91AF919F914A -:103AE0008F917F916F915F914F913F912F910F90A7 -:103AF0000FBE0F901F90189519BC10923F020E94A4 -:103B00001E1970CF8091E30087FD93E090933F02F0 -:103B1000B3CF1F920F920FB60F9211242F933F93A2 -:103B20004F935F936F937F938F939F93AF93BF93C5 -:103B3000CF93DF93EF93FF93D091E900DF708091F3 -:103B4000EC00C82FC17080FDC0E81092E9008091A0 -:103B5000F000877F8093F00078940E94CD1D109232 -:103B6000E9008091F00088608093F000CD2BCF7049 -:103B7000C093E900FF91EF91DF91CF91BF91AF9199 -:103B80009F918F917F916F915F914F913F912F9175 -:103B90000F900FBE0F901F9018951F93CF93DF9338 -:103BA000CDB7DEB7AA970FB6F894DEBF0FBECDBF74 -:103BB00080E492E02091F100FC012193CF01F2E03A -:103BC00088349F07B9F70E942F198091E80083FF7E -:103BD0001EC180914002909141029A3008F017C1B5 -:103BE000E92FF0E0E553F04E0C944F1F803899F028 -:103BF000823809F00CC1809144028F70873008F040 -:103C000006C18093E9008091EB0085FB882780F94D -:103C10001092E90006C080913C0290913D02911102 -:103C200082609091E800977F9093E8008093F10084 -:103C30001092F1008091E8008E77E5C0882309F4A6 -:103C4000D3C0823009F0E3C0809142028111D6C016 -:103C5000809144028F702FEF280F263008F0D7C0D4 -:103C60008093E9002091EB0020FFC8C0933031F42D -:103C70008091EB0080628093EB00C0C09091EB00DC -:103C800090619093EB0021E030E001C0220F8A9513 -:103C9000EAF72093EA001092EA008091EB00886036 -:103CA000EACF8111B4C0109142021F778091E300E6 -:103CB0008078812B8093E3008091E800877F809358 -:103CC000E8000E94EA1B8091E80080FFFCCF809111 -:103CD000E30080688093E30082E0111183E0809329 -:103CE0003F0295C08058823008F091C08091420216 -:103CF000909143028C3D23E09207A1F583E08A83F3 -:103D00008AE289834FB7F894DE01139620E03EE003 -:103D100051E2E32FF0E050935700E49120FF03C0FD -:103D2000E295EF703F5FEF708E2F90E0EA30C0F0C9 -:103D3000C7968D939D932F5F243159F74FBF809184 -:103D4000E800877F8093E8006AE270E0CE01019688 -:103D50000E94F91A8091E8008B778093E80057C0A1 -:103D6000C096E7CF6091440270914502AE014F5F6B -:103D70005F4F0E94251ABC01892B09F448C090911D -:103D8000E800977F9093E80089819A810E94571BF1 -:103D9000E1CF8038E1F58091E800877F8093E800EB -:103DA00080913B028093F10045CF811130C090910A -:103DB0004202923060F58091E800877F8093E800AE -:103DC00090933B020E94EA1B80913B02882311F0F2 -:103DD00084E005C08091E30087FDFACF81E0809305 -:103DE0003F020E94251913C080914202813079F46C -:103DF00081E0933009F080E080933D021092E90069 -:103E00008091E800877F8093E8000E94EA1B809100 -:103E1000E80083FF0AC08091E800877F8093E80074 -:103E20008091EB0080628093EB00AA960FB6F89425 -:103E3000DEBF0FBECDBFDF91CF911F9108950895D2 -:103E4000CF9380913F028823A1F0C091E900CF7009 -:103E50009091EC00892F817090FD80E8C82B109222 -:103E6000E9008091E80083FD0E94CD1DCF70C093D2 -:103E7000E900CF91089597FB072E16F4009407D020 -:103E800077FD09D00E94551F07FC05D03EF49095A0 -:103E900081959F4F0895709561957F4F0895EE0F1E -:103EA000FF1F0590F491E02D0994AA1BBB1B51E163 -:103EB00007C0AA1FBB1FA617B70710F0A61BB70B9A -:103EC000881F991F5A95A9F780959095BC01CD013F -:103ED0000895F999FECF92BD81BDF89A992780B5D2 -:103EE0000895A8E1B0E042E050E00C949D1F262F19 -:103EF000F999FECF92BD81BDF89A019700B40216E0 -:103F000039F01FBA20BD0FB6F894FA9AF99A0FBE8D -:103F100008950396272F0E94781F0E94771F252F50 -:103F20000E94781F242F0C94781F0196272F0E943F -:103F3000781F0C94771FDC01CB01FC01F999FECFAF -:103F400006C0F2BDE1BDF89A319600B40D92415021 -:103F50005040B8F70895F894FFCF840A840ADC0A29 -:103F6000DC0A2E0B4A0BB10AB10A8C0B180C270C79 -:103F7000270C830CB10AB10A8C0C030D030D0C0D38 -:103F80000C0D0E0D0C0D0C0D0C0D030D030D130D72 -:103F90000C0D0C0D130DF61D1E1E071F1E1E071FF8 -:0A3FA000511E721E071FC91ED51E18 -:103FAA00D4012808641E140A321E5318CA189F180E -:103FBA009B18891801E200E900EA00B500B600B7CB -:103FCA0000CD008301CC008A0192019401210223D1 -:103FDA000224022502260227022A02B300B4006F35 -:103FEA0000700081828336F5F435F6E200E900EAD2 -:103FFA0000B500B600B700CD008301CC008A01925B -:10400A000194012102230224022502260227022A00 -:0C401A0002B300B4006F007000818283CC -:00000001FF diff --git a/keyboards/aplx6/aplx6.h b/keyboards/aplx6/aplx6.h index 34eccaabac2d..6990d388e734 100644 --- a/keyboards/aplx6/aplx6.h +++ b/keyboards/aplx6/aplx6.h @@ -1,8 +1,4 @@ -//#ifndef APLX6_H -//#define APLX6_H - #pragma once - #include "quantum.h" #define LAYOUT( \ diff --git a/keyboards/aplx6/config.h b/keyboards/aplx6/config.h index c775b5909955..fe6aadff37d7 100644 --- a/keyboards/aplx6/config.h +++ b/keyboards/aplx6/config.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once #include "config_common.h" @@ -48,6 +47,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define TAPPING_TERM 200 - -#endif diff --git a/keyboards/aplx6/keymaps/Media/keymap.c b/keyboards/aplx6/keymaps/default/keymap.c similarity index 100% rename from keyboards/aplx6/keymaps/Media/keymap.c rename to keyboards/aplx6/keymaps/default/keymap.c From 63990130068c38b8dfae0b26e9948f527ab96df9 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:54:53 +0300 Subject: [PATCH 10/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index b593885be43c..ac0a9c6c0686 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -1,5 +1,7 @@ # Aplx6 -https://github.com/Aplyard/Aplx6 + +![Front](https://i.imgur.com/lUg9GAo.png) +![Back](https://i.imgur.com/iAHtHV7.png) A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to be assembled as a sandwich with a blank pcb, using m2.5 screws and spacers. From ecdc1e788d0599c50ae3c2c13275566014d5d91d Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:55:18 +0300 Subject: [PATCH 11/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index ac0a9c6c0686..bdb703d5fcaa 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -3,9 +3,7 @@ ![Front](https://i.imgur.com/lUg9GAo.png) ![Back](https://i.imgur.com/iAHtHV7.png) -A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. -Designed to be assembled as a sandwich with a blank pcb, using m2.5 screws and spacers. -Diodes : 1N4148 +A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to be assembled as a sandwich with a blank PCB, using M2.5 screws and spacers, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. --- From 00ccf14d95afafbf6f4a22efd6037cef603501af Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:55:29 +0300 Subject: [PATCH 12/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index bdb703d5fcaa..978f7dd79c1b 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -5,15 +5,6 @@ A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to be assembled as a sandwich with a blank PCB, using M2.5 screws and spacers, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. ---- - -![Front](https://i.imgur.com/lUg9GAo.png) - -![Back](https://i.imgur.com/iAHtHV7.png) - -![Blank](https://i.imgur.com/EnqIhSW.png) - ---- **Can support Rgb underglow (WS2812)** From 5f7e3f50080f53bc2ae738f51baddb285650de95 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:55:53 +0300 Subject: [PATCH 13/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 978f7dd79c1b..7f1849b7690a 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -6,7 +6,7 @@ A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to be assembled as a sandwich with a blank PCB, using M2.5 screws and spacers, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. -**Can support Rgb underglow (WS2812)** +## RGB Underglow (WS2812) Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncomment the [config.h](https://github.com/Aplyard/Aplx6/blob/master/qmk/config.h) and the [rules.mk](https://github.com/Aplyard/Aplx6/blob/master/qmk/rules.mk) From 72c3f1c004724e7179e1b9d418b4b6b055e054cc Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:56:03 +0300 Subject: [PATCH 14/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 7f1849b7690a..f53dc1ea88b0 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -8,11 +8,7 @@ A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to ## RGB Underglow (WS2812) -Just wire them to any of the unused ProMicro pins. -Don't forget to edit-uncomment the [config.h](https://github.com/Aplyard/Aplx6/blob/master/qmk/config.h) and the [rules.mk](https://github.com/Aplyard/Aplx6/blob/master/qmk/rules.mk) -for RGB underglow support or even add your own functions and modes. -Used pins can be found in [config.h](https://github.com/Aplyard/Aplx6/blob/master/qmk/config.h) or in the [KiCad Schematic](https://github.com/Aplyard/Aplx6/blob/master/kiCad/xd6.sch) -All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/) along with the +2 pins mod. +Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncomment the `config.h` and the `rules.mk` for RGB underglow support, or even add your own functions and modes. Used pins can be found in `config.h` or in the [KiCad Schematic](https://github.com/Aplyard/Aplx6/blob/master/kiCad/xd6.sch). All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/) along with the +2 pins mod. --- From 29878d0a0de04b69da671d7157f74c327bb2920b Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:56:14 +0300 Subject: [PATCH 15/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index f53dc1ea88b0..5aedc3e14f8f 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -33,7 +33,7 @@ Make example for this keyboard (after setting up your build environment): make aplx6:Media -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). --- ****Designed in**:** From b6786f26df96d9c1a6d7189a6dd13a386fabc18e Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:56:26 +0300 Subject: [PATCH 16/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 5aedc3e14f8f..0101852fd15b 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -54,6 +54,3 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to [Firmware Builder](https://kbfirmware.com/) --- -Keyboard Maintainer: Aplyard -Hardware Supported: Pro Micro ATmega32U4 -Hardware Availability: Aplyard From f61543e1c798ef15da5ef22a775cead7b55ac075 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:56:39 +0300 Subject: [PATCH 17/37] Update keyboards/aplx6/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/aplx6/rules.mk b/keyboards/aplx6/rules.mk index 0906a040d549..b2c1233984e9 100644 --- a/keyboards/aplx6/rules.mk +++ b/keyboards/aplx6/rules.mk @@ -12,8 +12,7 @@ MCU = atmega32u4 BOOTLOADER = caterina # Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically +# change yes to no to disable # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys From d7139357a6b53823ed9c72e208d94ca6b865c39f Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:56:54 +0300 Subject: [PATCH 18/37] Update keyboards/aplx6/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/rules.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/keyboards/aplx6/rules.mk b/keyboards/aplx6/rules.mk index b2c1233984e9..d2d1078d3229 100644 --- a/keyboards/aplx6/rules.mk +++ b/keyboards/aplx6/rules.mk @@ -19,13 +19,15 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +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 = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs UNICODE_ENABLE = yes # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend From 7381233dc1d95e06c5286944aadc5d02fe008266 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:57:14 +0300 Subject: [PATCH 19/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 0101852fd15b..24d735c40b08 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -10,7 +10,9 @@ A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncomment the `config.h` and the `rules.mk` for RGB underglow support, or even add your own functions and modes. Used pins can be found in `config.h` or in the [KiCad Schematic](https://github.com/Aplyard/Aplx6/blob/master/kiCad/xd6.sch). All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/) along with the +2 pins mod. ---- +* Keyboard Maintainer: Aplyard +* Hardware Supported: Aplx6 PCB, Pro Micro (ATmega32U4) +* Hardware Availability: Aplyard **Default Keymap Layout is [Media](https://github.com/Aplyard/Aplx6/blob/master/qmk/keymaps/Media/keymap.c)** (no RGB shortcuts) From 26594d88dd56363a536b025d75229bc38a99d227 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:57:23 +0300 Subject: [PATCH 20/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 24d735c40b08..6257a58d9cb5 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -33,7 +33,7 @@ Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncommen Make example for this keyboard (after setting up your build environment): - make aplx6:Media + make aplx6:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 86b398917007cc09c99e9499b76f20c151f5865d Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:57:36 +0300 Subject: [PATCH 21/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 6257a58d9cb5..e2b13db8184b 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -14,23 +14,6 @@ Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncommen * Hardware Supported: Aplx6 PCB, Pro Micro (ATmega32U4) * Hardware Availability: Aplyard -**Default Keymap Layout is [Media](https://github.com/Aplyard/Aplx6/blob/master/qmk/keymaps/Media/keymap.c)** (no RGB shortcuts) - - - -|Default|Layer|(0)| -|--|--|--| -| Play|VolUp|Fn| -|Prev|VolDown|Next| - -========================= -| Fn |Layer|(1) -|--|--|--| -|Calc|PgUp|KC_TRANS| -|MyPc|PgDown|RESET - ---- - Make example for this keyboard (after setting up your build environment): make aplx6:default From 05bea6b8f17149c0c2284d9bff406356265ca2b8 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Thu, 9 Apr 2020 19:04:36 +0300 Subject: [PATCH 22/37] pins update --- keyboards/aplx6/README.md | 4 ++-- keyboards/aplx6/config.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index b593885be43c..8b22e17990f7 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -7,11 +7,11 @@ Diodes : 1N4148 --- -![Front](https://i.imgur.com/lUg9GAo.png) +![Front](https://i.imgur.com/flhSvAG.png) ![Back](https://i.imgur.com/iAHtHV7.png) -![Blank](https://i.imgur.com/EnqIhSW.png) +![Pop](https://i.imgur.com/IYnIp4m.png) --- diff --git a/keyboards/aplx6/config.h b/keyboards/aplx6/config.h index fe6aadff37d7..accf72b315af 100644 --- a/keyboards/aplx6/config.h +++ b/keyboards/aplx6/config.h @@ -32,8 +32,8 @@ along with this program. If not, see . #define MATRIX_COLS 3 /* pin-out */ -#define MATRIX_ROW_PINS { B5, F6 } -#define MATRIX_COL_PINS { B6, F5, F4 } +#define MATRIX_ROW_PINS { E6, B3 } +#define MATRIX_COL_PINS { F&, B6, F4 } #define UNUSED_PINS From 51cee7fb7cbe5218d29c91c0839b2c33b701c566 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Thu, 9 Apr 2020 19:09:44 +0300 Subject: [PATCH 23/37] update --- keyboards/aplx6/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 24159a48c516..66c6700956b9 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -1,7 +1,7 @@ # Aplx6 -![Front](https://i.imgur.com/lUg9GAo.png) -![Back](https://i.imgur.com/iAHtHV7.png) +![Front](https://i.imgur.com/flhSvAG.png) +![Back](https://i.imgur.com/PXqNmUh.png) A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to be assembled as a sandwich with a blank PCB, using M2.5 screws and spacers, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. From 94e34cf8b710802e5780100faeca4f4066914de7 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Thu, 9 Apr 2020 19:12:22 +0300 Subject: [PATCH 24/37] update pins --- keyboards/aplx6/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/config.h b/keyboards/aplx6/config.h index accf72b315af..8db06d93cfb4 100644 --- a/keyboards/aplx6/config.h +++ b/keyboards/aplx6/config.h @@ -33,7 +33,7 @@ along with this program. If not, see . /* pin-out */ #define MATRIX_ROW_PINS { E6, B3 } -#define MATRIX_COL_PINS { F&, B6, F4 } +#define MATRIX_COL_PINS { F7, B6, F4 } #define UNUSED_PINS From b5396e879953828222768feac6a1faf8593bc4ce Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 21:45:01 +0300 Subject: [PATCH 25/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 66c6700956b9..83fdab273703 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -10,7 +10,7 @@ A stylish (2x3) 6-key MediaPad for your music and browser shortcuts. Designed to Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncomment the `config.h` and the `rules.mk` for RGB underglow support, or even add your own functions and modes. Used pins can be found in `config.h` or in the [KiCad Schematic](https://github.com/Aplyard/Aplx6/blob/master/kiCad/xd6.sch). All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/) along with the +2 pins mod. -* Keyboard Maintainer: Aplyard +* Keyboard Maintainer: [Aplyard](https://github.com/Aplyard) * Hardware Supported: Aplx6 PCB, Pro Micro (ATmega32U4) * Hardware Availability: Aplyard @@ -38,4 +38,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to [Keyboard Plate & Case Builder](http://builder.swillkb.com/) [Firmware Builder](https://kbfirmware.com/) ---- \ No newline at end of file +--- From 1ebb45580adcdfd63518456f31217f841c4ac32a Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Thu, 9 Apr 2020 21:45:15 +0300 Subject: [PATCH 26/37] Update keyboards/aplx6/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/aplx6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 83fdab273703..55e73ea2da5a 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -12,7 +12,7 @@ Just wire them to any of the unused ProMicro pins. Don't forget to edit-uncommen * Keyboard Maintainer: [Aplyard](https://github.com/Aplyard) * Hardware Supported: Aplx6 PCB, Pro Micro (ATmega32U4) -* Hardware Availability: Aplyard +* Hardware Availability: [GitHub](https://github.com/Aplyard/Aplx6) Make example for this keyboard (after setting up your build environment): From 0e41e9d4bcd488bfe5820637c1c3a33e7c84ca32 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Sat, 18 Apr 2020 23:52:34 +0300 Subject: [PATCH 27/37] initial commit --- keyboards/aplx2/README.md | 34 ++++++++++++++++++++ keyboards/aplx2/aplx2.c | 19 +++++++++++ keyboards/aplx2/aplx2.h | 8 +++++ keyboards/aplx2/config.h | 41 ++++++++++++++++++++++++ keyboards/aplx2/keymaps/default/keymap.c | 16 +++++++++ keyboards/aplx2/rules.mk | 33 +++++++++++++++++++ 6 files changed, 151 insertions(+) create mode 100644 keyboards/aplx2/README.md create mode 100644 keyboards/aplx2/aplx2.c create mode 100644 keyboards/aplx2/aplx2.h create mode 100644 keyboards/aplx2/config.h create mode 100644 keyboards/aplx2/keymaps/default/keymap.c create mode 100644 keyboards/aplx2/rules.mk diff --git a/keyboards/aplx2/README.md b/keyboards/aplx2/README.md new file mode 100644 index 000000000000..67048542c9eb --- /dev/null +++ b/keyboards/aplx2/README.md @@ -0,0 +1,34 @@ +# Aplx2 + +![Front](https://i.imgur.com/cN4WfaQ.jpg) + +A simple 2% keyboard for osu!. Designed to be assembled as a sandwich with a Pro Micro, using M3 x 16mm screws, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. + +****Layout**:** +The default layout is: Z , X . +Used pins can be found in `config.h`. All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/). + +* Keyboard Maintainer: [Aplyard](https://github.com/Aplyard) +* Hardware Supported: Pro Micro (ATmega32U4) +* Hardware Availability: [GitHub](https://github.com/Aplyard/Aplx2), [Thingiverse](https://www.thingiverse.com/thing:4294608) + +Make example for this keyboard (after setting up your build environment): + + make aplx2:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +--- +****Designed in**:** +Fusion360 +[Keyboard Plate & Case Builder](http://builder.swillkb.com/) + + +**Usefull Links:** +[Qmk Online Configurator](https://config.qmk.fm/#) + +**Alternatives of qmk that worked for me:** +[Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/) +[Firmware Builder](https://kbfirmware.com/) + +--- diff --git a/keyboards/aplx2/aplx2.c b/keyboards/aplx2/aplx2.c new file mode 100644 index 000000000000..e3dd174542e4 --- /dev/null +++ b/keyboards/aplx2/aplx2.c @@ -0,0 +1,19 @@ +/* +Copyright 2020 April Aplyard + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "aplx2.h" + diff --git a/keyboards/aplx2/aplx2.h b/keyboards/aplx2/aplx2.h new file mode 100644 index 000000000000..616c8777e708 --- /dev/null +++ b/keyboards/aplx2/aplx2.h @@ -0,0 +1,8 @@ +#pragma once +#include "quantum.h" + +#define LAYOUT( \ + K00, K01 \ +) { \ + { K00 , K01 } \ +} diff --git a/keyboards/aplx2/config.h b/keyboards/aplx2/config.h new file mode 100644 index 000000000000..041f956b8da2 --- /dev/null +++ b/keyboards/aplx2/config.h @@ -0,0 +1,41 @@ +/* +Copyright 2020 April Aplyard + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xE0E0 +#define PRODUCT_ID 0x0030 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Aplyard +#define PRODUCT Aplx2 +#define DESCRIPTION Aplx2% osu! + +/* key matrix size */ +#define MATRIX_ROWS 1 +#define MATRIX_COLS 2 + +/* pin-out */ +#define MATRIX_ROW_PINS { D1 } +#define MATRIX_COL_PINS { B5, D3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + diff --git a/keyboards/aplx2/keymaps/default/keymap.c b/keyboards/aplx2/keymaps/default/keymap.c new file mode 100644 index 000000000000..b99a7df0610d --- /dev/null +++ b/keyboards/aplx2/keymaps/default/keymap.c @@ -0,0 +1,16 @@ +#include QMK_KEYBOARD_H + +#define _MAIN 0 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap __MAIN: Default Layer + * ,---------------. + * | |-----|-----| | + * | | Ζ | Χ | | + * | |-----|-----| | + * '---------------' + */ + [_MAIN] = LAYOUT( + KC_Z, KC_X + ), +}; diff --git a/keyboards/aplx2/rules.mk b/keyboards/aplx2/rules.mk new file mode 100644 index 000000000000..d2d1078d3229 --- /dev/null +++ b/keyboards/aplx2/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs +UNICODE_ENABLE = yes # Unicode From e7da4e0b8ed2a7311015f0033e14d3aa2acd87d6 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Sat, 18 Apr 2020 23:54:27 +0300 Subject: [PATCH 28/37] Update aplx2.h --- keyboards/aplx2/aplx2.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/keyboards/aplx2/aplx2.h b/keyboards/aplx2/aplx2.h index 616c8777e708..a47b064b96ab 100644 --- a/keyboards/aplx2/aplx2.h +++ b/keyboards/aplx2/aplx2.h @@ -1,3 +1,20 @@ +/* +Copyright 2020 April Aplyard + +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 . +*/ + #pragma once #include "quantum.h" From 1ae82393e6056804fb83f555f26d77cb5cafefc6 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Sun, 19 Apr 2020 19:25:52 +0300 Subject: [PATCH 29/37] Update keyboards/aplx2/README.md Co-Authored-By: Ryan --- keyboards/aplx2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx2/README.md b/keyboards/aplx2/README.md index 67048542c9eb..395855078517 100644 --- a/keyboards/aplx2/README.md +++ b/keyboards/aplx2/README.md @@ -19,7 +19,7 @@ Make example for this keyboard (after setting up your build environment): See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). --- -****Designed in**:** +**Designed in:** Fusion360 [Keyboard Plate & Case Builder](http://builder.swillkb.com/) From 789895ef5235bf9cc4d2f194b085ca18eefbcee2 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Sun, 19 Apr 2020 19:26:01 +0300 Subject: [PATCH 30/37] Update keyboards/aplx6/README.md Co-Authored-By: Ryan --- keyboards/aplx6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 55e73ea2da5a..4f66df1471a9 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -21,7 +21,7 @@ Make example for this keyboard (after setting up your build environment): See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). --- -****Designed in**:** +**Designed in:** [KiCad](https://github.com/KiCad) **Components Footprints & Libraries :** From 505ce25fc5f966a4af045093efcb93daa692a3b2 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Sun, 19 Apr 2020 19:26:11 +0300 Subject: [PATCH 31/37] Update keyboards/aplx6/README.md Co-Authored-By: Ryan --- keyboards/aplx6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx6/README.md b/keyboards/aplx6/README.md index 4f66df1471a9..cf0afff7a18e 100644 --- a/keyboards/aplx6/README.md +++ b/keyboards/aplx6/README.md @@ -24,7 +24,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to **Designed in:** [KiCad](https://github.com/KiCad) -**Components Footprints & Libraries :** +**Components Footprints & Libraries:** [keebs.pretty](https://github.com/egladman/keebs.pretty) [keyboard_parts.pretty ](https://github.com/tmk/keyboard_parts.pretty) From ab866754f17bf707f07ecc163671efd6971cc9de Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Sun, 19 Apr 2020 19:26:19 +0300 Subject: [PATCH 32/37] Update keyboards/aplx2/README.md Co-Authored-By: Ryan --- keyboards/aplx2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/aplx2/README.md b/keyboards/aplx2/README.md index 395855078517..7fb13593bb08 100644 --- a/keyboards/aplx2/README.md +++ b/keyboards/aplx2/README.md @@ -4,7 +4,7 @@ A simple 2% keyboard for osu!. Designed to be assembled as a sandwich with a Pro Micro, using M3 x 16mm screws, your choice of MX- or Alps-compatible switches, and 1N4148 diodes. -****Layout**:** +**Layout:** The default layout is: Z , X . Used pins can be found in `config.h`. All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/). From 44a3126913e912fdf290e23bb774afbeaa431588 Mon Sep 17 00:00:00 2001 From: Aplyard Date: Mon, 20 Apr 2020 00:18:01 +0300 Subject: [PATCH 33/37] folder change --- keyboards/{ => handwired}/aplx2/README.md | 0 keyboards/{ => handwired}/aplx2/aplx2.c | 0 keyboards/{ => handwired}/aplx2/aplx2.h | 0 keyboards/{ => handwired}/aplx2/config.h | 0 keyboards/{ => handwired}/aplx2/keymaps/default/keymap.c | 0 keyboards/{ => handwired}/aplx2/rules.mk | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{ => handwired}/aplx2/README.md (100%) rename keyboards/{ => handwired}/aplx2/aplx2.c (100%) rename keyboards/{ => handwired}/aplx2/aplx2.h (100%) rename keyboards/{ => handwired}/aplx2/config.h (100%) rename keyboards/{ => handwired}/aplx2/keymaps/default/keymap.c (100%) rename keyboards/{ => handwired}/aplx2/rules.mk (100%) diff --git a/keyboards/aplx2/README.md b/keyboards/handwired/aplx2/README.md similarity index 100% rename from keyboards/aplx2/README.md rename to keyboards/handwired/aplx2/README.md diff --git a/keyboards/aplx2/aplx2.c b/keyboards/handwired/aplx2/aplx2.c similarity index 100% rename from keyboards/aplx2/aplx2.c rename to keyboards/handwired/aplx2/aplx2.c diff --git a/keyboards/aplx2/aplx2.h b/keyboards/handwired/aplx2/aplx2.h similarity index 100% rename from keyboards/aplx2/aplx2.h rename to keyboards/handwired/aplx2/aplx2.h diff --git a/keyboards/aplx2/config.h b/keyboards/handwired/aplx2/config.h similarity index 100% rename from keyboards/aplx2/config.h rename to keyboards/handwired/aplx2/config.h diff --git a/keyboards/aplx2/keymaps/default/keymap.c b/keyboards/handwired/aplx2/keymaps/default/keymap.c similarity index 100% rename from keyboards/aplx2/keymaps/default/keymap.c rename to keyboards/handwired/aplx2/keymaps/default/keymap.c diff --git a/keyboards/aplx2/rules.mk b/keyboards/handwired/aplx2/rules.mk similarity index 100% rename from keyboards/aplx2/rules.mk rename to keyboards/handwired/aplx2/rules.mk From 96f772e45be12baf2d34332078c7419c95b8fdba Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Fri, 24 Apr 2020 13:05:24 +0300 Subject: [PATCH 34/37] Update keyboards/handwired/aplx2/README.md Co-Authored-By: Drashna Jaelre --- keyboards/handwired/aplx2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/aplx2/README.md b/keyboards/handwired/aplx2/README.md index 7fb13593bb08..990bcc1fdfb7 100644 --- a/keyboards/handwired/aplx2/README.md +++ b/keyboards/handwired/aplx2/README.md @@ -14,7 +14,7 @@ Used pins can be found in `config.h`. All ProMicro pins can be found [here](http Make example for this keyboard (after setting up your build environment): - make aplx2:default + make handwired/aplx2:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 0231ad34d62658790faae4b71a4f520e1e03739f Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Fri, 24 Apr 2020 13:05:59 +0300 Subject: [PATCH 35/37] Update keyboards/handwired/aplx2/README.md Co-Authored-By: Drashna Jaelre --- keyboards/handwired/aplx2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/aplx2/README.md b/keyboards/handwired/aplx2/README.md index 990bcc1fdfb7..fa1243264204 100644 --- a/keyboards/handwired/aplx2/README.md +++ b/keyboards/handwired/aplx2/README.md @@ -6,7 +6,7 @@ A simple 2% keyboard for osu!. Designed to be assembled as a sandwich with a Pro **Layout:** The default layout is: Z , X . -Used pins can be found in `config.h`. All ProMicro pins can be found [here](https://golem.hu/article/pro-micro-pinout/). +Used pins can be found in `config.h`. All ProMicro pins can be found [here](https://cdn.sparkfun.com/datasheets/Dev/Arduino/Boards/ProMicro16MHzv1.pdf). * Keyboard Maintainer: [Aplyard](https://github.com/Aplyard) * Hardware Supported: Pro Micro (ATmega32U4) From 1e2b448e6bdad5a7f5a0a202a075d7566ac28d61 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Fri, 24 Apr 2020 13:08:05 +0300 Subject: [PATCH 36/37] latest suggestion --- keyboards/handwired/aplx2/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/aplx2/rules.mk b/keyboards/handwired/aplx2/rules.mk index d2d1078d3229..af9df6087f33 100644 --- a/keyboards/handwired/aplx2/rules.mk +++ b/keyboards/handwired/aplx2/rules.mk @@ -30,4 +30,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs -UNICODE_ENABLE = yes # Unicode +UNICODE_ENABLE = no # Unicode From b41491bbca907b2940ef02a446429d98b845da31 Mon Sep 17 00:00:00 2001 From: Aplyard <40563350+Aplyard@users.noreply.github.com> Date: Sun, 26 Apr 2020 16:52:20 +0300 Subject: [PATCH 37/37] Update keyboards/handwired/aplx2/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/handwired/aplx2/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/aplx2/README.md b/keyboards/handwired/aplx2/README.md index fa1243264204..424d964817f4 100644 --- a/keyboards/handwired/aplx2/README.md +++ b/keyboards/handwired/aplx2/README.md @@ -1,6 +1,6 @@ # Aplx2 -![Front](https://i.imgur.com/cN4WfaQ.jpg) +![Front](https://i.imgur.com/cN4WfaQl.jpg) A simple 2% keyboard for osu!. Designed to be assembled as a sandwich with a Pro Micro, using M3 x 16mm screws, your choice of MX- or Alps-compatible switches, and 1N4148 diodes.