Merge branch 'master' of https://github.com/system76/ec
This commit is contained in:
commit
131d936a98
@ -28,8 +28,8 @@ CFLAGS+=-I$(BUILD)/include
|
||||
INCLUDE+=$(BUILD)/include/scratch.h
|
||||
|
||||
flash: $(BUILD)/ec.rom
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example flash --release
|
||||
sudo ecflash/target/release/examples/flash $<
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example isp --release
|
||||
sudo ecflash/target/release/examples/isp --internal $<
|
||||
|
||||
isp: $(BUILD)/ec.rom
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example isp --release
|
||||
|
@ -28,8 +28,8 @@ CFLAGS+=-I$(BUILD)/include
|
||||
INCLUDE+=$(BUILD)/include/scratch.h
|
||||
|
||||
flash: $(BUILD)/ec.rom
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example flash --release
|
||||
sudo ecflash/target/release/examples/flash $<
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example isp --release
|
||||
sudo ecflash/target/release/examples/isp --internal $<
|
||||
|
||||
isp: $(BUILD)/ec.rom
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example isp --release
|
||||
|
@ -9,7 +9,7 @@ LAYOUT(
|
||||
K_TAB, K_Q, K_W, K_E, K_R, K_T, K_Y, K_U, K_I, K_O, K_P, K_BRACE_OPEN, K_BRACE_CLOSE, K_BACKSLASH, K_PGUP,
|
||||
KT_FN, K_A, K_S, K_D, K_F, K_G, K_H, K_J, K_K, K_L, K_SEMICOLON, K_QUOTE, K_ENTER, K_PGDN,
|
||||
K_LEFT_SHIFT, K_Z, K_X, K_C, K_V, K_B, K_N, K_M, K_COMMA, K_PERIOD, K_SLASH, K_RIGHT_SHIFT, K_UP, K_END,
|
||||
K_LEFT_CTRL, KT_FN, K_LEFT_SUPER, K_LEFT_ALT, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT
|
||||
K_LEFT_CTRL, KT_FN, K_LEFT_ALT, K_LEFT_SUPER, K_SPACE, KT_FN, K_RIGHT_ALT, K_RIGHT_CTRL, K_LEFT, K_DOWN, K_RIGHT
|
||||
),
|
||||
LAYOUT(
|
||||
K_ESC, K_TOUCHPAD, K_F2, K_MUTE, K_F4, K_VOLUME_DOWN, K_VOLUME_UP, K_F7, KT_SCI | SCI_BRIGHTNESS_DOWN, KT_SCI | SCI_BRIGHTNESS_UP, K_F10, KT_SCI | SCI_AIRPLANE_MODE, KT_SCI | SCI_SUSPEND, 0 /*prtsc*/, 0 /*pause*/, K_INSERT, K_DEL,
|
||||
|
@ -28,8 +28,8 @@ CFLAGS+=-I$(BUILD)/include
|
||||
INCLUDE+=$(BUILD)/include/scratch.h
|
||||
|
||||
flash: $(BUILD)/ec.rom
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example flash --release
|
||||
sudo ecflash/target/release/examples/flash $<
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example isp --release
|
||||
sudo ecflash/target/release/examples/isp --internal $<
|
||||
|
||||
isp: $(BUILD)/ec.rom
|
||||
cargo build --manifest-path ecflash/Cargo.toml --example isp --release
|
||||
|
Loading…
x
Reference in New Issue
Block a user