3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-21 12:56:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.7.49

Browse source 
moved convertHtml.py to script directory
This commit is contained in:
lumapu 2023-09-11 23:29:43 +02:00
parent 9dd689b395
commit 64fafa1d36
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/web/html/convert.py → scripts/convertHtml.py
View file

@ -147,9 +147,7 @@ def convert2Header(inFile, version):
f.close() f.close()
# delete all files in the 'h' dir # delete all files in the 'h' dir
wd = 'h' wd = 'web/html/h'
if os.getcwd()[-4:] != "html":
wd = "web/html/" + wd
if os.path.exists(wd): if os.path.exists(wd):
for f in os.listdir(wd): for f in os.listdir(wd):
@ -160,8 +158,7 @@ if os.path.exists(wd):
os.remove(os.path.join(wd, f)) os.remove(os.path.join(wd, f))
# grab all files with following extensions # 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 types = ('*.html', '*.css', '*.js', '*.ico') # the tuple of file types
files_grabbed = [] files_grabbed = []
for files in types: for files in types:

3
src/hm/miPayload.h
View file

@ -585,12 +585,13 @@ class MiPayload {
if(!*complete) { if(!*complete) {
//we got some delayed status msgs?!? //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]) { if (mPayload[iv->id].stsAB[CH0] && mPayload[iv->id].dataAB[CH0]) {
miComplete(iv); miComplete(iv);
return true; return true;
} }
return false; return false;
}
DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX)); DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX));
if (txCmd >= 0x36 && txCmd <= 0x39) { if (txCmd >= 0x36 && txCmd <= 0x39) {

2
src/platformio.ini
View file

@ -20,7 +20,7 @@ monitor_speed = 115200
extra_scripts = extra_scripts =
pre:../scripts/auto_firmware_version.py pre:../scripts/auto_firmware_version.py
pre:web/html/convert.py pre:../scripts/convertHtml.py
pre:../scripts/applyPatches.py pre:../scripts/applyPatches.py
lib_deps = lib_deps =