shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

small script fixes

Browse Source
This commit is contained in:
Conor Patrick 2018-12-08 23:28:43 -05:00
parent 5dd3355bd8
commit 09778c7c51
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
targets/stm32l442/src/device.c
View File

@ -177,6 +177,8 @@ void heartbeat()
{ {
state = !state; state = !state;
} }
#ifdef LED_WINK_VALUE
if (wink_time) if (wink_time)
{ {
if (millis() - winkt1 > 120) if (millis() - winkt1 > 120)
@ -184,7 +186,7 @@ void heartbeat()
winkt1 = millis(); winkt1 = millis();
if (winkt2++ & 1) if (winkt2++ & 1)
{ {
led_rgb(LED_WINK_VALUE * (LED_MAX_SCALER - LED_MIN_SCALER)/2); led_rgb(LED_WINK_VALUE * (LED_MAX_SCALER - LED_MIN_SCALER)/2);
} }
else else
{ {
@ -194,6 +196,7 @@ void heartbeat()
} }
} }
else else
#endif
{ {
if (but) if (but)
led_rgb(((val * r)<<8) | ((val*b) << 16) | (val*g)); led_rgb(((val * r)<<8) | ((val*b) << 16) | (val*g));
@ -423,10 +426,9 @@ led_rgb(0x001040);
delay(50); delay(50);
#if SKIP_BUTTON_CHECK_FAST
done: done:
return 1; return 1;
#endif
fail: fail:
return 0; return 0;

5
tools/programmer.py
View File

@ -132,11 +132,6 @@ class Programmer():
self.exchange(SoloBootloader.done,0,sig) self.exchange(SoloBootloader.done,0,sig)
def wink(self,): def wink(self,):
"""
If solo is configured as solo hacker or something similar,
this command will tell the token to boot directly to the bootloader
so it can be reprogrammed
"""
self.send_data_hid(CTAPHID.WINK,b'') self.send_data_hid(CTAPHID.WINK,b'')
def enter_solo_bootloader(self,): def enter_solo_bootloader(self,):

7
tools/sign_firmware.py
View File

@ -21,11 +21,12 @@ def get_firmware_object(sk_name, hex_file):
fw = open(hex_file,'r').read() fw = open(hex_file,'r').read()
fw = base64.b64encode(fw.encode()) fw = base64.b64encode(fw.encode())
fw = to_websafe(fw.decode()) fw = to_websafe(fw.decode())
ih = IntelHex()
ih.fromfile(hex_file, format='hex')
# start of firmware and the size of the flash region allocated for it. # start of firmware and the size of the flash region allocated for it.
# TODO put this somewhere else. # TODO put this somewhere else.
START = ih.segments()[0][0] START = ih.segments()[0][0]
END = ((0x08000000 + ((128-19)*2024))-8) END = ((0x08000000 + ((128-19)*2048))-8)
ih = IntelHex(hex_file) ih = IntelHex(hex_file)
segs = ih.segments() segs = ih.segments()
@ -56,7 +57,7 @@ if __name__ == '__main__':
if len(sys.argv) != 4: if len(sys.argv) != 4:
print('usage: %s <signing-key.pem> <app.hex> <output.json>' % sys.argv[0]) print('usage: %s <signing-key.pem> <app.hex> <output.json>' % sys.argv[0])
msg = get_firmware_object(sys.argv[1],sys.argv[2]) msg = get_firmware_object(sys.argv[1],sys.argv[2])
print('Saving signed firmware to firmware.json') print('Saving signed firmware to', sys.argv[3])
wfile = open(sys.argv[3],'wb+') wfile = open(sys.argv[3],'wb+')
wfile.write(json.dumps(msg).encode()) wfile.write(json.dumps(msg).encode())
wfile.close() wfile.close()

4
web/js/wallet.js
View File

@ -1426,8 +1426,8 @@ async function run_tests() {
async function test_bootloader() async function test_bootloader()
{ {
var start = 0x8000; var start = 10 * 2048;
var size = 186 * 1024 - 8; var size = 198 * 1024 - 8;
var num_pages = 64; var num_pages = 64;
var p = await dev.is_bootloader(); var p = await dev.is_bootloader();