5.10.0 20171201 * Upgrade library ArduinoJson to 5.11.2 * Upgrade library IRRemoteEsp8266 to 2.2.1 + 2 commits but disabled some protocols (code size reduction) * Upgrade library NeoPixelBus to 2.2.9 * Upgrade library OneWire to 2.3.3 + 6 commits and disabled CRC lookup-table (#define ONEWIRE_CRC8_TABLE 0) (code size reduction) * Update library PubSubClient to 2.6 + 9 commits and additional delay (#790) * Update core_esp8266_wiring_digital.c to latest (staged) level * Patch library I2Cdevlib-Core for esp8266-core 2.4.0-rc2 compatibility * Remove command EnergyReset 1..3 now replaced by ENergyReset1 to EnergyReset3 * Remove spaces in JSON messages (code size reduction) * Renamed xsns_05_ds18x20.ino to xsns_05_ds18x20_legacy.ino still using library OneWire and providing dynamic sensor scan * Fix possible iram1_0_seg compile error by shrinking ICACHE_RAM_ATTR code usage * Fix PWM watchdog timeout if Dimmer is set to 100 or Color set to 0xFF (#1146) * Fix Sonoff Bridge Learn Mode hang caused by unrecognised RF code (#1181) * Fix blank console log window by using XML character encoding (#1187) * Fix wrong response name for command HlwISet (#1214) * Fix DHT type sensor timeout recognition by distinguish "signal already there" from "timeout" (#1233) * Add fixed color options 1..12 to command Color * Add + (plus) and - (minus) to commands Dimmer (+10/-10), Speed and Scheme * Add + (plus) and - (minus) to command Color to select 1 out of 12 preset colors * Add + (plus) and - (minus) to command Ct to control ColdWarm led ColorTemperature (+34/-34) * Add commands EnergyReset1 0..42500, EnergyReset2 0..42500 and EnergyReset3 0..42500000 * to (Re)set Energy Today, Yesterday or Total respectively in Wh (#406, #685, #1202) * Add optional ADS1115 driver as alternative for unsupported I2Cdevlib in esp8266-core 2.4.0-rc2 * Add support for INA219 Voltage and Current sensor to be enabled in user_config.h with define USE_INA219 * Add support for Arilux LC11 (Clearing RF home code when selecting no Arilux module) * Add support for WS2812 RGBW ledstrips to be enabled in user_config.h with define USE_WS2812_CTYPE (#1156) * Add SettingsSaveAll routine to command SaveData to be used before controlled power down (#1202) * Add option PUSHBUTTON_TOGGLE (SwitchMode 7) to allow toggling on any switch change (#1221) * Add new xdrv_05_ds18x20.ino free from library OneWire and add the following features: * Add support for DS1822 * Add forced setting of 12-bit resolution for selected device types (#1222) * Add read temperature retry counter (#1215) * Fix lost sensors by performing sensor probe at restart only thereby removing dynamic sensor probe (#1215) * Fix sensor address sorting using ascending sort on sensor type followed by sensor address * Rewrite JSON resulting in shorter message allowing more sensors in default firmware image: * "DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6} * Add additional define in user_config.h to select either single sensor (defines disabled), new multi sensor (USE_DS18X20) or legacy multi sensor (USE_DS18X20_LEGACY) * Add clock support for more different pixel counts (#1226) * Add support for Sonoff Dual R2 (#1249) * Add FriendlyName to web page tab and add program information to web page footer (#1275)
182 lines
5.8 KiB
Python
182 lines
5.8 KiB
Python
#!/usr/bin/env python
|
|
import os
|
|
import os.path
|
|
import sys
|
|
import shutil
|
|
from subprocess import call
|
|
import importlib
|
|
import unittest
|
|
import re
|
|
|
|
from testcases import settings
|
|
|
|
|
|
class Workspace(object):
|
|
|
|
def __init__(self):
|
|
self.root_dir = os.getcwd()
|
|
self.build_dir = os.path.join(self.root_dir, "tmpbin")
|
|
self.log_dir = os.path.join(self.root_dir, "logs")
|
|
self.tests_dir = os.path.join(self.root_dir, "testcases")
|
|
self.examples_dir = os.path.join(self.root_dir, "../PubSubClient/examples")
|
|
self.examples = []
|
|
self.tests = []
|
|
if not os.path.isdir("../PubSubClient"):
|
|
raise Exception("Cannot find PubSubClient library")
|
|
try:
|
|
return __import__('ino')
|
|
except ImportError:
|
|
raise Exception("ino tool not installed")
|
|
|
|
def init(self):
|
|
if os.path.isdir(self.build_dir):
|
|
shutil.rmtree(self.build_dir)
|
|
os.mkdir(self.build_dir)
|
|
if os.path.isdir(self.log_dir):
|
|
shutil.rmtree(self.log_dir)
|
|
os.mkdir(self.log_dir)
|
|
|
|
os.chdir(self.build_dir)
|
|
call(["ino", "init"])
|
|
|
|
shutil.copytree("../../PubSubClient", "lib/PubSubClient")
|
|
|
|
filenames = []
|
|
for root, dirs, files in os.walk(self.examples_dir):
|
|
filenames += [os.path.join(root, f) for f in files if f.endswith(".ino")]
|
|
filenames.sort()
|
|
for e in filenames:
|
|
self.examples.append(Sketch(self, e))
|
|
|
|
filenames = []
|
|
for root, dirs, files in os.walk(self.tests_dir):
|
|
filenames += [os.path.join(root, f) for f in files if f.endswith(".ino")]
|
|
filenames.sort()
|
|
for e in filenames:
|
|
self.tests.append(Sketch(self, e))
|
|
|
|
def clean(self):
|
|
shutil.rmtree(self.build_dir)
|
|
|
|
|
|
class Sketch(object):
|
|
def __init__(self, wksp, fn):
|
|
self.w = wksp
|
|
self.filename = fn
|
|
self.basename = os.path.basename(self.filename)
|
|
self.build_log = os.path.join(self.w.log_dir, "%s.log" % (os.path.basename(self.filename),))
|
|
self.build_err_log = os.path.join(self.w.log_dir, "%s.err.log" % (os.path.basename(self.filename),))
|
|
self.build_upload_log = os.path.join(self.w.log_dir, "%s.upload.log" % (os.path.basename(self.filename),))
|
|
|
|
def build(self):
|
|
sys.stdout.write(" Build: ")
|
|
sys.stdout.flush()
|
|
|
|
# Copy sketch over, replacing IP addresses as necessary
|
|
fin = open(self.filename, "r")
|
|
lines = fin.readlines()
|
|
fin.close()
|
|
fout = open(os.path.join(self.w.build_dir, "src", "sketch.ino"), "w")
|
|
for l in lines:
|
|
if re.match(r"^byte server\[\] = {", l):
|
|
fout.write("byte server[] = { %s };\n" % (settings.server_ip.replace(".", ", "),))
|
|
elif re.match(r"^byte ip\[\] = {", l):
|
|
fout.write("byte ip[] = { %s };\n" % (settings.arduino_ip.replace(".", ", "),))
|
|
else:
|
|
fout.write(l)
|
|
fout.flush()
|
|
fout.close()
|
|
|
|
# Run build
|
|
fout = open(self.build_log, "w")
|
|
ferr = open(self.build_err_log, "w")
|
|
rc = call(["ino", "build"], stdout=fout, stderr=ferr)
|
|
fout.close()
|
|
ferr.close()
|
|
if rc == 0:
|
|
sys.stdout.write("pass")
|
|
sys.stdout.write("\n")
|
|
return True
|
|
else:
|
|
sys.stdout.write("fail")
|
|
sys.stdout.write("\n")
|
|
with open(self.build_err_log) as f:
|
|
for line in f:
|
|
print(" " + line)
|
|
return False
|
|
|
|
def upload(self):
|
|
sys.stdout.write(" Upload: ")
|
|
sys.stdout.flush()
|
|
fout = open(self.build_upload_log, "w")
|
|
rc = call(["ino", "upload"], stdout=fout, stderr=fout)
|
|
fout.close()
|
|
if rc == 0:
|
|
sys.stdout.write("pass")
|
|
sys.stdout.write("\n")
|
|
return True
|
|
else:
|
|
sys.stdout.write("fail")
|
|
sys.stdout.write("\n")
|
|
with open(self.build_upload_log) as f:
|
|
for line in f:
|
|
print(" " + line)
|
|
return False
|
|
|
|
def test(self):
|
|
# import the matching test case, if it exists
|
|
try:
|
|
basename = os.path.basename(self.filename)[:-4]
|
|
i = importlib.import_module("testcases." + basename)
|
|
except:
|
|
sys.stdout.write(" Test: no tests found")
|
|
sys.stdout.write("\n")
|
|
return
|
|
c = getattr(i, basename)
|
|
|
|
testmethods = [m for m in dir(c) if m.startswith("test_")]
|
|
testmethods.sort()
|
|
tests = []
|
|
for m in testmethods:
|
|
tests.append(c(m))
|
|
|
|
result = unittest.TestResult()
|
|
c.setUpClass()
|
|
if self.upload():
|
|
sys.stdout.write(" Test: ")
|
|
sys.stdout.flush()
|
|
for t in tests:
|
|
t.run(result)
|
|
print(str(result.testsRun - len(result.failures) - len(result.errors)) + "/" + str(result.testsRun))
|
|
if not result.wasSuccessful():
|
|
if len(result.failures) > 0:
|
|
for f in result.failures:
|
|
print("-- " + str(f[0]))
|
|
print(f[1])
|
|
if len(result.errors) > 0:
|
|
print(" Errors:")
|
|
for f in result.errors:
|
|
print("-- " + str(f[0]))
|
|
print(f[1])
|
|
c.tearDownClass()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
run_tests = True
|
|
|
|
w = Workspace()
|
|
w.init()
|
|
|
|
for e in w.examples:
|
|
print("--------------------------------------")
|
|
print("[" + e.basename + "]")
|
|
if e.build() and run_tests:
|
|
e.test()
|
|
for e in w.tests:
|
|
print("--------------------------------------")
|
|
print("[" + e.basename + "]")
|
|
if e.build() and run_tests:
|
|
e.test()
|
|
|
|
w.clean()
|