Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck
9 years ago
commit
c2e1d69f27
@ -1,41 +1,63 @@
|
|||||||
@echo off
|
@SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
|
||||||
setx /M test test > nul 2>&1
|
@ECHO OFF
|
||||||
if NOT ["%errorlevel%"]==["0"] (
|
|
||||||
echo FAILED. Rerun with administrator privileges.
|
SET STARTINGDIR=%CD%
|
||||||
pause
|
|
||||||
exit
|
:: Check for admin privilages
|
||||||
|
SETX /M test test > nul 2>&1
|
||||||
|
IF NOT ["%ERRORLEVEL%"]==["0"] (
|
||||||
|
ECHO FAILED. Rerun with administrator privileges.
|
||||||
|
GOTO ExitBatch
|
||||||
)
|
)
|
||||||
|
|
||||||
echo ------------------------------------------
|
:: Make sure path to MinGW exists - if so, CD to it
|
||||||
echo Installing wget and unzip
|
SET MINGWPATH="C:\MinGW\bin"
|
||||||
echo ------------------------------------------
|
IF NOT EXIST !MINGWPATH! (ECHO Path not found: %MINGWPATH% && GOTO ExitBatch)
|
||||||
|
CD /D %MINGWPATH%
|
||||||
|
|
||||||
|
|
||||||
|
ECHO ------------------------------------------
|
||||||
|
ECHO Installing wget and unzip
|
||||||
|
ECHO ------------------------------------------
|
||||||
mingw-get install msys-wget-bin msys-unzip-bin
|
mingw-get install msys-wget-bin msys-unzip-bin
|
||||||
cd \MinGW\bin
|
|
||||||
|
|
||||||
mkdir temp
|
MKDIR temp
|
||||||
cd temp
|
CD temp
|
||||||
echo ------------------------------------------
|
|
||||||
echo Installing dfu-programmer.
|
ECHO ------------------------------------------
|
||||||
echo ------------------------------------------
|
ECHO Installing dfu-programmer.
|
||||||
|
ECHO ------------------------------------------
|
||||||
wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
|
wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
|
||||||
unzip dfu-programmer-win-0.7.2.zip
|
unzip dfu-programmer-win-0.7.2.zip
|
||||||
copy dfu-programmer.exe ..
|
COPY dfu-programmer.exe ..
|
||||||
|
|
||||||
echo ------------------------------------------
|
ECHO ------------------------------------------
|
||||||
echo Downloading driver
|
ECHO Downloading driver
|
||||||
echo ------------------------------------------
|
ECHO ------------------------------------------
|
||||||
wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
|
wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
|
||||||
unzip libusb-win32-bin-1.2.6.0.zip
|
unzip libusb-win32-bin-1.2.6.0.zip
|
||||||
cp libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
|
COPY libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
|
||||||
|
|
||||||
|
ECHO ------------------------------------------
|
||||||
|
ECHO Installing driver. Accept prompt.
|
||||||
|
ECHO ------------------------------------------
|
||||||
|
IF EXIST "%WinDir%\System32\PnPUtil.exe" (%WinDir%\System32\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)
|
||||||
|
IF EXIST "%WinDir%\Sysnative\PnPUtil.exe" (%WinDir%\Sysnative\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)
|
||||||
|
|
||||||
|
ECHO FAILED. Could not find PnPUtil.exe in "%WinDir%\System32" or "%WinDir%\Sysnative".
|
||||||
|
|
||||||
|
:PNPUTILFOUND
|
||||||
|
|
||||||
echo ------------------------------------------
|
:: Wait then delete directory
|
||||||
echo Installing driver. Accept prompt.
|
ping -n 5 127.0.0.1 > NUL 2>&1
|
||||||
echo ------------------------------------------
|
CD ..
|
||||||
pnputil -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf
|
RD /s /q temp
|
||||||
|
|
||||||
cd ..
|
ECHO ------------------------------------------
|
||||||
rm -rf temp
|
ECHO Finished!
|
||||||
|
|
||||||
echo ------------------------------------------
|
:ExitBatch
|
||||||
echo Finished!
|
CD /D %STARTINGDIR%
|
||||||
pause
|
ENDLOCAL
|
||||||
|
PAUSE
|
||||||
|
EXIT /b
|
||||||
@ -0,0 +1,69 @@
|
|||||||
|
// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
|
||||||
|
// this is the style you want to emulate.
|
||||||
|
|
||||||
|
#include "planck.h"
|
||||||
|
#include "backlight.h"
|
||||||
|
|
||||||
|
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
||||||
|
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||||
|
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||||
|
// entirely and just use numbers.
|
||||||
|
#define _QW 0
|
||||||
|
#define _CM 1
|
||||||
|
#define _DV 2
|
||||||
|
#define _LW 3
|
||||||
|
#define _RS 4
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[_QW] = { /* Qwerty */
|
||||||
|
{KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC},
|
||||||
|
{KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT},
|
||||||
|
{KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT },
|
||||||
|
{M(0), KC_ESC, KC_LALT, KC_LGUI, F(1), KC_SPC, KC_SPC, F(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
|
||||||
|
},
|
||||||
|
[_CM] = { /* Colemak */
|
||||||
|
{KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC},
|
||||||
|
{KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT},
|
||||||
|
{KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT },
|
||||||
|
{M(0), KC_ESC, KC_LALT, KC_LGUI, F(1), KC_SPC, KC_SPC, F(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
|
||||||
|
},
|
||||||
|
[_DV] = { /* Dvorak */
|
||||||
|
{KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC},
|
||||||
|
{KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH},
|
||||||
|
{KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT },
|
||||||
|
{M(0), KC_ESC, KC_LALT, KC_LGUI, F(1), KC_SPC, KC_SPC, F(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
|
||||||
|
},
|
||||||
|
[_RS] = { /* RAISE */
|
||||||
|
{KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC},
|
||||||
|
{KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS},
|
||||||
|
{KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_QW), DF(_CM), DF(_DV), RESET, KC_TRNS},
|
||||||
|
{M(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14, KC_F15, KC_TRNS, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY}
|
||||||
|
},
|
||||||
|
[_LW] = { /* LOWER */
|
||||||
|
{KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},
|
||||||
|
{KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
|
||||||
|
{KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, DF(_QW), DF(_CM), DF(_DV), RESET, KC_TRNS},
|
||||||
|
{M(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14, KC_F15, KC_TRNS, KC_MFFD, KC_VOLD, KC_VOLU, KC_MPLY}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const uint16_t PROGMEM fn_actions[] = {
|
||||||
|
[1] = ACTION_LAYER_TAP_KEY(MO(_LW), KC_BSPC), // Tap for backspace, hold for LOWER
|
||||||
|
[2] = ACTION_LAYER_TAP_KEY(MO(_RS), KC_ENT), // Tap for enter, hold for RAISE
|
||||||
|
};
|
||||||
|
|
||||||
|
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
||||||
|
{
|
||||||
|
// MACRODOWN only works in this function
|
||||||
|
switch(id) {
|
||||||
|
case 0:
|
||||||
|
if (record->event.pressed) {
|
||||||
|
register_code(KC_RSFT);
|
||||||
|
backlight_step();
|
||||||
|
} else {
|
||||||
|
unregister_code(KC_RSFT);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return MACRO_NONE;
|
||||||
|
};
|
||||||
Loading…
Reference in new issue