gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-03-06 11:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Improvements to flasher

Browse Source
This commit is contained in:
Louis Orleans 2017-09-11 22:18:05 -07:00
parent 47ad8cb9a1
commit cf1feccc72
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
flasher/commands.js
View File

@ -1,16 +1,18 @@
const Inquirer = require('inquirer'); const Inquirer = require('inquirer');
const Chalk = require('chalk');
const { Echo, Exec, IdentifyKeyboard } = require('./util'); const { Echo, Exec, IdentifyKeyboard, Sleep } = require('./util');
async function Upload (keymap, path, right = false) { async function Upload (keyboard, keymap, path, right = false) {
await Build(keymap, path, right); await Build(keyboard, keymap, path, right);
// Find a keyboard to flash // Find a keyboard to flash
let board; let board;
while (board == null) { while (board == null) {
board = IdentifyKeyboard(undefined, path); board = IdentifyKeyboard(undefined, path);
if (board == null) { if (board == null) {
Echo(`Put your keyboard in flash mode`); Echo(Chalk.yellow`Put your keyboard in flash mode`);
await Sleep(1000);
} }
} }
if (board.length > 1) { if (board.length > 1) {
@ -28,22 +30,22 @@ async function Upload (keymap, path, right = false) {
board = board[0]; board = board[0];
} }
Echo(`Building for ${board.name} (${board.path})`); Echo(Chalk.blue(`Building for ${board.name} (${board.path})`));
await Flash(keymap, board, right); await Flash(keyboard, keymap, board, right);
} }
module.exports.Upload = Upload; module.exports.Upload = Upload;
async function Build (keymap, path, right = false) { async function Build (keyboard, keymap, path, right = false) {
Echo(`Building ${right ? 'right' : 'left'}`); Echo(Chalk.blue(`Building ${right ? 'right' : 'left'}`));
await Exec(`make ergodox_infinity-${keymap} ${right ? 'MASTER=right' : ''}`); await Exec(`make ${keyboard}-${keymap} ${right ? 'MASTER=right' : ''}`);
await Exec(`make ergodox_infinity-${keymap}-.build/ergodox_infinity_${keymap}.bin ${right ? 'MASTER=right' : ''}`); await Exec(`make ${keyboard}-${keymap}-.build/${keyboard}_${keymap}.bin ${right ? 'MASTER=right' : ''}`);
Echo(`Built ${right ? 'right' : 'left'}`, ''); Echo(Chalk.green(`Built ${right ? 'right' : 'left'}`), '');
} }
module.exports.Build = Build; module.exports.Build = Build;
async function Flash (keymap, board, right = false) { async function Flash (keyboard, keymap, board, right = false) {
Echo(`Flashing ${right ? 'right' : 'left'}`); Echo(Chalk.blue(`Flashing ${right ? 'right' : 'left'}`));
await Exec(`dfu-util --device ${board.id} --path ${board.path} -D .build/ergodox_infinity_${keymap}.bin`); await Exec(`dfu-util --device ${board.id} --path ${board.path} -D .build/${keyboard}_${keymap}.bin`);
Echo(`Flashed ${right ? 'right' : 'left'}`, ''); Echo(Chalk.green(`Flashed ${right ? 'right' : 'left'}`), '');
} }
module.exports.Flash = Flash; module.exports.Flash = Flash;

9
flasher/index.js
View File

@ -11,21 +11,22 @@ if (!process.cwd().endsWith('/qmk_firmware')) {
} }
Commander Commander
.option('-k --keyboard [name]', 'Keyboard name', 'ergodox_infinity')
.option('-m --keymap [name]', 'Keymap name', 'default') .option('-m --keymap [name]', 'Keymap name', 'default')
.option('-p --path [path]', 'DFU device path') .option('-p --path [path]', 'DFU device path')
.option('--half [half]', 'Which half to program (left, right)') .option('--half [half]', 'Which half to program (left, right)')
.parse(process.argv); .parse(process.argv);
(async () => { (async () => {
Echo(`Keymap: ${Commander.keymap}`); Echo(`${Commander.keyboard} / ${Commander.keymap}`);
if (Commander.half != null) { if (Commander.half != null) {
await Upload(Commander.keymap, Commander.path, Commander.half === 'right'); await Upload(Commander.keyboard, Commander.keymap, Commander.path, Commander.half === 'right');
} else { } else {
// Build both halves // Build both halves
await Upload(Commander.keymap); await Upload(Commander.keyboard, Commander.keymap);
await Upload(Commander.keymap, undefined, true); await Upload(Commander.keyboard, Commander.keymap, undefined, true);
} }
})(); })();

5
flasher/util.js
View File

@ -45,3 +45,8 @@ function Echo (...logs) {
} }
} }
module.exports.Echo = Echo; module.exports.Echo = Echo;
function Sleep (duration) {
return new Promise(resolve => setTimeout(resolve, duration));
}
module.exports.Sleep = Sleep;