Merge branch 'master' into meshdebug
This commit is contained in:
commit
8b171c946a
|
@ -1,9 +1,16 @@
|
||||||
dwim: build setup
|
default: build setup
|
||||||
|
|
||||||
all: dwim run
|
all: build setup run
|
||||||
|
|
||||||
build:
|
redo: rebuild setup run
|
||||||
cd ../../firmware && make clean && make && make l0dables
|
|
||||||
|
build: cleanbuild rebuild
|
||||||
|
|
||||||
|
cleanbuild:
|
||||||
|
cd ../../firmware && make clean
|
||||||
|
|
||||||
|
rebuild:
|
||||||
|
cd ../../firmware && make && make l0dables
|
||||||
|
|
||||||
setup:
|
setup:
|
||||||
cp ../../firmware/firmware.bin .
|
cp ../../firmware/firmware.bin .
|
||||||
|
@ -18,10 +25,10 @@ setup:
|
||||||
cd ../crypto && make clean && make generate-keys
|
cd ../crypto && make clean && make generate-keys
|
||||||
cp ../crypto/generate-keys .
|
cp ../crypto/generate-keys .
|
||||||
@echo
|
@echo
|
||||||
@echo Now run ./smartflash
|
@echo "Now run ./smartflash (as root)"
|
||||||
|
|
||||||
run:
|
run:
|
||||||
./smartflash
|
sudo ./smartflash
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f firmware.bin generate-keys
|
rm -f firmware.bin generate-keys
|
||||||
|
|
Loading…
Reference in New Issue