mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-21 04:46:10 +02:00
0.7.49
moved convertHtml.py to script directory
This commit is contained in:
parent
9dd689b395
commit
64fafa1d36
3 changed files with 5 additions and 7 deletions
|
@ -147,9 +147,7 @@ def convert2Header(inFile, version):
|
|||
f.close()
|
||||
|
||||
# delete all files in the 'h' dir
|
||||
wd = 'h'
|
||||
if os.getcwd()[-4:] != "html":
|
||||
wd = "web/html/" + wd
|
||||
wd = 'web/html/h'
|
||||
|
||||
if os.path.exists(wd):
|
||||
for f in os.listdir(wd):
|
||||
|
@ -160,8 +158,7 @@ if os.path.exists(wd):
|
|||
os.remove(os.path.join(wd, f))
|
||||
|
||||
# grab all files with following extensions
|
||||
if os.getcwd()[-4:] != "html":
|
||||
os.chdir('./web/html')
|
||||
os.chdir('./web/html')
|
||||
types = ('*.html', '*.css', '*.js', '*.ico') # the tuple of file types
|
||||
files_grabbed = []
|
||||
for files in types:
|
|
@ -585,12 +585,13 @@ class MiPayload {
|
|||
|
||||
if(!*complete) {
|
||||
//we got some delayed status msgs?!?
|
||||
if (txCmd == 0x09 || txCmd == 0x11)
|
||||
if ((txCmd == 0x09) || (txCmd == 0x11)) {
|
||||
if (mPayload[iv->id].stsAB[CH0] && mPayload[iv->id].dataAB[CH0]) {
|
||||
miComplete(iv);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX));
|
||||
if (txCmd >= 0x36 && txCmd <= 0x39) {
|
||||
|
|
|
@ -20,7 +20,7 @@ monitor_speed = 115200
|
|||
|
||||
extra_scripts =
|
||||
pre:../scripts/auto_firmware_version.py
|
||||
pre:web/html/convert.py
|
||||
pre:../scripts/convertHtml.py
|
||||
pre:../scripts/applyPatches.py
|
||||
|
||||
lib_deps =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue