148 Commits

Author SHA1 Message Date
7251e229b6 pre-release bin & small fixes 2023-10-31 15:20:54 +03:00
Климов Андрей Николаевич
e9355ef142 modbus v2 fix 2023-10-31 00:13:09 +03:00
Климов Андрей Николаевич
7836876fcd crosscompilation fix 2023-10-30 20:36:30 +03:00
Климов Андрей Николаевич
8e7bbee96a Merge branch 'master' of https://github.com/anklimov/lighthub 2023-10-30 20:12:26 +03:00
Климов Андрей Николаевич
456f6b8ad4 modbus v1 retry optimisation 2023-10-30 20:12:16 +03:00
c4af5e92f9 Update README.md 2023-10-30 14:33:44 +03:00
Климов Андрей Николаевич
896a22862f 1-wire errors/reset improved, cleaned up 2023-10-30 00:00:11 +03:00
Климов Андрей Николаевич
83e8639034 Merge branch 'master' of https://github.com/anklimov/lighthub 2023-10-29 15:36:51 +03:00
Климов Андрей Николаевич
256ab175ce 1-w refactoring 2023-10-29 15:36:04 +03:00
199a80cbb9 pre-release binaries, all archs 2023-10-25 01:28:58 +03:00
Климов Андрей Николаевич
9204bd0898 +counter to Mega slim 2023-10-25 00:52:49 +03:00
Климов Андрей Николаевич
df4bf02e8d Merge branch 'master' of https://github.com/anklimov/lighthub 2023-10-25 00:29:14 +03:00
Климов Андрей Николаевич
45d925ba88 pins protection,core fixes for grp ch stat& sched 2023-10-25 00:28:26 +03:00
0a3bbcd7f9 binaries 2023-10-23 21:57:41 +03:00
Климов Андрей Николаевич
1e58ad90eb config reload issues fixed 2023-10-23 21:34:17 +03:00
a0ad782257 Update README.md 2023-10-21 22:55:33 +03:00
65556ed39d Update README.md 2023-10-21 22:19:57 +03:00
7bf685a0d4 cross-compiled & binaries 2023-10-21 21:52:57 +03:00
Климов Андрей Николаевич
f6a57348eb text chan types, comp options, counter fixed 2023-10-21 21:06:00 +03:00
Климов Андрей Николаевич
e93e52702e XNova CRYPT,SHAREDSECRET,PROTECTED_PINS,PULSEPIN12 2023-10-08 17:43:30 +03:00
Климов Андрей Николаевич
6cd4f1d82a mbus coils, discr inputs, new logic. AC - feedback 2023-08-13 23:49:35 +03:00
Климов Андрей Николаевич
3907158437 mac save&AC swmode fixes, sha256 sign for cmd tst 2023-07-16 20:29:59 +03:00
Климов Андрей Николаевич
eb68556012 STM32 persistent MVP, cross-compiled & binaries 2023-05-06 02:53:01 +03:00
Климов Андрей Николаевич
30f7b36a9c Multi-AC 2023-04-10 19:19:45 +03:00
Климов Андрей Николаевич
927272824c counter fix 2023-04-10 00:01:20 +03:00
Климов Андрей Николаевич
bab472d2d1 JSON RAM optimization (update libs needed), HTTP 2023-04-09 21:37:37 +03:00
Климов Андрей Николаевич
ec306c4934 Cumulative changes/pre-release 2023-04-02 17:27:02 +03:00
Климов Андрей Николаевич
3e0566cf07 ENABLE & DISABLE to separate topic and XON timer 2023-01-30 01:10:34 +03:00
Климов Андрей Николаевич
86d0d784a0 Mercury electricity counter driver, refactoring 2023-01-29 12:33:22 +03:00
Климов Андрей Николаевич
b06dad9395 noSerial option, DHT fix, 8266 slim to fit Sonoff 2022-12-16 17:14:59 +03:00
a974290389 Complex MBUS mapping, PID fix 2022-12-04 03:19:07 +03:00
2da04b45bf PID fixes/improvements and MBUS improvements 2022-11-28 14:57:43 +03:00
724eabc22f API CORS = * 2022-11-24 02:00:20 +03:00
c70a4eaac9 bin flash update fix (after revorking) & bins 2022-11-22 01:01:47 +03:00
a956b6f8e2 RAM optim to save huge configs to flash, PID min/max 2022-11-19 23:30:02 +03:00
07688f53ae core fixes (int & tens val<1), mbus optimization 2022-11-05 16:40:31 +03:00
6d28cb9f34 null mapping fix 2022-11-01 01:48:01 +03:00
d7e93177d6 possibility to turn val mapping off ("val":null) 2022-11-01 00:49:54 +03:00
c23543b213 PID & Modbus fine tuning 2022-10-31 23:56:51 +03:00
b94ab723ee modbus negative register fix 2022-10-13 08:22:06 +03:00
39cfb42307 Cross compilation fixes (esp) & binaries 2022-10-04 01:37:47 +03:00
891701cee1 Modbus mapping, AC swing, vent, pwm relay fix 2022-10-02 19:31:18 +03:00
a17ea0bad7 core fixes, modbus, ac, pre-mapping, bins 2022-06-04 22:04:54 +03:00
64eea07d78 ModbusTCP&UDP option (-D IPMODBUS) 2022-05-10 13:23:17 +03:00
12487b871e dimming fix, RAM overflow on config save 2022-05-07 00:22:18 +03:00
Климов Андрей Николаевич
23cd2a2139 compilation fix 2022-04-23 21:24:10 +03:00
81edb7f86e core fixes 2022-04-22 14:51:43 +03:00
Климов Андрей Николаевич
4c80f435e5 Poll() refactoring, PWM fix, Hum preparation 2022-04-15 00:05:44 +03:00
b3af9865c7 Сounter mod, core & modbus tuned for 1/100th prec 2022-04-06 10:21:39 +03:00
9bf3d561bd MBus channel module - write register implemented 2022-02-25 02:46:27 +03:00
782d353478 Fixed interferention with homie $ contained topics 2022-02-17 02:04:16 +03:00
d207ef23d3 update 2022-02-16 21:42:07 +03:00
3b66ecb2cb MQTT message loop fixed 2022-02-16 14:46:50 +03:00
20bdbac8c5 Ctrl retcodes - move some to positive values 2022-02-14 02:14:39 +03:00
b79d873629 binaries 2022-02-14 01:45:15 +03:00
32e7dbd730 remove topics on complete, homie fixed, deflt name 2022-02-14 01:32:46 +03:00
d30591d9f7 cleanUp persistance of command topics (update libs 2022-02-13 18:47:40 +03:00
fc8b04ac9b AirCon, OpenHab, Relay status fixed& interop 2022-01-29 03:33:29 +03:00
d76867063e extra space MQTT starus payload removed 2022-01-27 03:52:56 +03:00
c7d1bc65c0 PID alarm redisign & airset termostat cmd compat 2022-01-27 02:37:00 +03:00
b7c6eaaff1 Remove wrong space- MQTT payload, more memory ctrl 2022-01-21 01:01:46 +03:00
2b3c77bf03 PID regulator alarm fix 2022-01-09 11:22:32 +03:00
a7f5c67ab2 PID regulatior init fix 2022-01-07 12:56:01 +03:00
07046680e0 doxigen docs 2022-01-06 02:01:16 +03:00
6fe28695f2 bins recompiled 2022-01-06 01:22:16 +03:00
70ccf9f1c9 Print compilation option 2022-01-06 01:12:35 +03:00
fbdf400a2b re-compilation after merge 2022-01-05 12:52:10 +03:00
5227182dd8 Merging from develop 2022-01-05 12:28:19 +03:00
4a75a60dc4 Merge branch 'develop'
CORE changes:

CORE refactored.
Config persistence (saving parameters & config) - now working for Mega, DUE, ESP8266, ESP32.
Config auto-saving to flash on portal changes (http ETAG supported to version control).
HTTP API & tiny web interface (external by CORS)
MDNS controller announcing
Local config changing by web
Delayed commands (/del suffix)
NO_MQTT option
input polling on timer interrupts (DUE)
Device driver changes

PID regulator (13 type)
Relay PWM thermostat (16 type)
RGBWW channel type (17 type) & color temperature set
Legacy modbus (4 type) improvement (retry speedup, mask = 3 & 4 for swap hi & lo bytes)
Multivent driver (18 type)
UART bridge (15 type) (serial protocol interceptor) - wireshark udpdump compatible
Artnet - to DMX configuration (channel range to pass throw)
PWM driver (3 type) - RBGW compatible
Misc

flashing scripts for DUE
Platformio target for OTA (invoke OTA scripts from custom_builds)
Clean-up & optimisation
2022-01-05 12:09:40 +03:00
4a5f219fec Merging with master 2022-01-05 12:08:59 +03:00
410c79a78e Merge branch 'develop' of https://github.com/anklimov/lighthub into develop 2022-01-04 20:37:52 +03:00
d5aa9f5ac6 PRE-RELEASE artnet fix & binaries 2022-01-04 20:37:45 +03:00
Климов Андрей Николаевич
302a03e274 FW upload scripts 2022-01-04 00:13:54 +03:00
1ce769de92 mdns leak fix 2022-01-03 21:59:14 +03:00
ac9ed03fe5 bin 2022-01-03 21:58:27 +03:00
f60b8188dc bin 2022-01-03 21:37:52 +03:00
0c3108c620 Socket (syslog,artnet) optim. Relay pwm thermo fix 2022-01-03 20:42:46 +03:00
1316835cad PID&Relays field tests & debug 2021-12-29 20:25:49 +03:00
bc867d0de0 optiboot ota fix & ac driver ram optimization 2021-12-29 02:51:03 +03:00
c03821e94a PID+PWM relay thermostat, init from flash fixed 2021-12-29 02:06:52 +03:00
c67bab2173 MDNS ESP8266 fix 2021-12-26 15:49:34 +03:00
2779c9f7d5 platformio.ini OTA cleaned OTA(moved to ota target 2021-12-26 14:34:33 +03:00
12fe7ea71e PreRelease+bin. Persistant&Config mgmt done+fixes 2021-12-26 01:41:56 +03:00
184abef5a4 OW_DEVICES_LIMIT option 2021-12-25 13:24:53 +03:00
44d0568267 Mega2560slim RAM optimization 2021-12-22 01:50:40 +03:00
6cd4e5dbea API PORT 80, AVR HTTP ETAG, Compiled for all, bins 2021-12-20 02:17:02 +03:00
c185de3f26 binaries (part) 2021-12-19 19:11:45 +03:00
2e5c7d8045 STABILITY when re-load, Artnet, RGBWW, ETAG, Logs 2021-12-19 18:33:54 +03:00
201f492e29 ETAG control for http client 2021-11-05 02:26:50 +03:00
2ee8ad5ab6 stm fix & bin 2021-11-01 02:19:34 +03:00
ce3571fc75 Multiplatform compilation fix & binaries 2021-11-01 02:08:24 +03:00
3b92723ee3 ESP persist fix, closing files, RGBWW 2021-11-01 01:52:40 +03:00
8dd0b57f72 ESPx evolution (interim) - MDNS 2021-10-20 01:27:42 +03:00
99e9c1a27a fix dependance CmdArduino to old compatible ver 2021-10-14 22:22:24 +03:00
4e22a8f22d ESP8266 persistance/compilation fixes 2021-10-14 22:17:07 +03:00
ff35636a18 fix linux compilation issue 2021-10-13 13:01:01 +03:00
root
a7dac3310f linux compilation fix 2021-10-13 12:52:32 +03:00
bf76a5c23c core - group channel toggle, set_with_on fix, mdns 2021-10-13 12:27:56 +03:00
9bfaca7898 - 2021-10-11 01:35:37 +03:00
1e682ea8f3 PWA redirection & local 2021-10-11 00:52:05 +03:00
7e14e7143c web control/CORS (interim) 2021-10-09 02:12:38 +03:00
f96f125fe6 binaries 2021-10-08 01:58:30 +03:00
034319ed67 conf save fixed, group chann polling. tested 2021-10-08 01:44:12 +03:00
196e34266a violation while stop chans 2021-10-08 00:00:27 +03:00
0da8708327 Merge pull request #60 from anklimov/persitense-refactoring
Persitense refactoring merge
2021-10-07 23:58:35 +03:00
a28def023e Merge branch 'develop' 2021-10-07 23:41:48 +03:00
43bddffcea get, load and mdns fix 2021-10-07 23:23:33 +03:00
80fe47bd33 flash read fix 2021-10-06 18:21:59 +03:00
35e51c6a94 Merge pull request #59 from anklimov/develop
sync to Develop branch
2021-10-06 01:09:11 +03:00
88217b524c Merge branch 'persitense-refactoring' into develop 2021-10-06 01:08:30 +03:00
74cea9c6e3 Refactoring complete 2021-10-05 22:46:57 +03:00
2946409896 interim (compiled) commit 2021-10-05 03:44:31 +03:00
3df1eb1cc5 NoMQTT mode, float config val, small fixes 2021-10-04 18:53:32 +03:00
a9bcba3d7c restart on MQTT err fix, Float storage & RAW fix 2021-09-22 01:03:57 +03:00
f22e84a6db begin refactoring persist, no_MQTT, nullCfg 2021-09-19 23:32:34 +03:00
7fce2b34b2 more persitance all MPU, RESTORE bug fixed 2021-09-10 23:40:42 +03:00
6485833f7d pre-release, save2flash, mdns bugs, dmx, ..... 2021-08-29 02:46:21 +03:00
56a8c5c80b group channel status after halt & xoff fix 2021-08-24 00:32:12 +03:00
09fa78b0c8 input handle improved, +stm env -2due envs 2021-08-22 23:02:15 +03:00
bbf8f4d46e Refactored core fix 2021-08-21 03:06:41 +03:00
674a438bde core refactored (Alpha) 2021-08-17 19:40:03 +03:00
8e96b4623f doubleclick fix & TIMER_INT compiler option 2021-08-02 12:36:26 +03:00
64a2bb7eea Timer re-interability fix 2021-07-31 22:01:35 +03:00
c2815a2d00 config reload fix (caused by timer) 2021-07-30 03:30:07 +03:00
8f88df5739 input pulling on HW Timer (DUE) 2021-07-30 02:21:54 +03:00
256ca471fc Cross-compilation cleanup for all platforms + bins 2021-07-28 13:44:05 +03:00
aa827b8119 - 2021-07-24 13:28:31 +03:00
5888931870 http API with CORS (interim) 2021-07-24 12:18:58 +03:00
7967897318 Compiled BINs 2021-07-06 00:24:47 +03:00
36a7242a60 EEPROM refactoring& http API. Mega&due tested 2021-07-06 00:21:26 +03:00
32eacaeb07 esp32 fix 2021-06-19 01:50:42 +03:00
c2fead7ac5 uartBridge refactored & cross-compiled. new Mega dev 2021-06-17 02:46:18 +03:00
3ac5480735 OTA utils upd for data & ESP, compilation fix ESP 2021-06-13 14:01:43 +03:00
50cec6abf7 locks leak (Critical), config OTA (interim) 2021-06-12 22:29:56 +03:00
7862dfea81 critical fix! 2021-06-12 03:19:41 +03:00
2f398df8aa UART interceptor now is compatible with Whireshark 2021-06-07 15:44:39 +03:00
5eae1b1838 MB feedback fix, +uartbridge, modbus pins/ESP32 2021-05-24 02:39:30 +03:00
473256d591 delayed command & some mbus optimization 2021-05-16 03:19:23 +03:00
48a5e8fd31 Modbus speedup update2 2021-05-15 16:28:48 +03:00
bb65782ad0 modbus speedup update 2021-05-15 15:47:28 +03:00
264b61e7e6 SpeedUp legacy modbus writes if busy 2021-05-15 15:17:53 +03:00
9ae6d9991e Minimum ON volume for modbus dim, mask type=3 fix 2021-05-08 11:36:18 +03:00
d219a594c5 modbus mask==3 : incremented value + swap, 4: no increment and swap 2021-05-07 23:16:07 +03:00
f241bc0c77 modbus mask type == 3 - swap high and low bytes 2021-05-07 21:39:11 +03:00
a911f43f0c bit more Modbus debug info and serial param N81 by default 2021-05-07 21:26:55 +03:00
64d9d13137 Multi-ventilation - alpha 2021-05-02 02:39:31 +03:00
ecff141f6a multivent interim 2 2021-04-30 11:51:29 +03:00
a0f99d96bc interim - multivent 2021-04-28 21:51:44 +03:00
825 changed files with 116521 additions and 42796 deletions

7
.gitignore vendored
View File

@@ -19,3 +19,10 @@ custom-build-flags/build_flags_nrf52840
.vscode/.browse.c_cpp.db
.vscode/c_cpp_properties.json
.vscode/launch.json
lighthub/modules/out_elevator.cpp
lighthub/modules/out_elevator.h
lighthub/modules/out_humidifier.cpp
lighthub/modules/out_humidifier.h
spare_files/*
spare_files/ArduinoOTA/*
lib/*

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MarkdownExportedFiles">
<htmlFiles />
<imageFiles />
<otherFiles />
</component>
</project>

View File

@@ -1,67 +0,0 @@
# Continuous Integration (CI) is the practice, in software
# engineering, of merging all developer working copies with a shared mainline
# several times a day < http://docs.platformio.org/page/ci/index.html >
#
# Documentation:
#
# * Travis CI Embedded Builds with PlatformIO
# < https://docs.travis-ci.com/user/integration/platformio/ >
#
# * PlatformIO integration with Travis CI
# < http://docs.platformio.org/page/ci/travis.html >
#
# * User Guide for `platformio ci` command
# < http://docs.platformio.org/page/userguide/cmd_ci.html >
#
#
# Please choice one of the following templates (proposed below) and uncomment
# it (remove "# " before each line) or use own configuration according to the
# Travis CI documentation (see above).
#
#
# Template #1: General project. Test it using existing `platformio.ini`.
#
# language: python
# python:
# - "2.7"
#
# sudo: false
# cache:
# directories:
# - "~/.platformio"
#
# install:
# - pip install -U platformio
# - platformio update
#
# script:
# - platformio run
#
# Template #2: The project is intended to by used as a library with examples
#
# language: python
# python:
# - "2.7"
#
# sudo: false
# cache:
# directories:
# - "~/.platformio"
#
# env:
# - PLATFORMIO_CI_SRC=path/to/test/file.c
# - PLATFORMIO_CI_SRC=examples/file.ino
# - PLATFORMIO_CI_SRC=path/to/test/directory
#
# install:
# - pip install -U platformio
# - platformio update
#
# script:
# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N

View File

@@ -1,5 +1,15 @@
# LightHub
is Flexible, Arduino-Mega/Arduino DUE/ESP8266/ESP32 open-software and open-hardware SmartHome controller. [RU](https://geektimes.ru/post/295109/) [HOME-site RU](http://lazyhome.ru)
is Flexible, Arduino-Mega/Arduino DUE/ESP8266/ESP32 open-software and open-hardware SmartHome controller.
Useful links:
* [Article/RU](https://geektimes.ru/post/295109/)
* [HOME-site/RU](http://lazyhome.ru)
* [WIKI/RU](https://www.lazyhome.ru/dokuwiki/doku.php?id=start)
* [Doxigen autodocumentation for developers](https://anklimov.github.io/lighthub/docs/html/index.html) (litle bit outdated)
It may operate both:
* On [especially designed hardware board](http://www.lazyhome.ru/index.php/featurerequest) with 16 optocoupled digital inputs, 16 ESD protected digital/analog Inputs/outputs, 8 open-collector outputs (up to 0.5A/50V), DMX IN/OUT, MODBUS RTU and hardware 1-wire support circuit.
* On plain Arduino MEGA 2560, Arduino DUE, ESP8266, ESP32 and even on [Controllino](http://controllino.biz/)
@@ -12,7 +22,7 @@ Lighthub allows connecting together:
* Temperature/Humidity/CO2 sensors: DHT22, CS811, HDC1080 and any type of Modbus connected devices
* Standard nonexpensive Relay board with TTL inputs, [like this](http://ali.pub/2zlosh) to control AC powered lamps, floor heaters, boilers etc
* [Standard nonexpensive LED dimmers](http://ali.pub/2zlokp) and [AC DMX-512 dimmers](http://ali.pub/2zlont)
* Modbus RTU devices (Currently, possible to control two types of Modbus devices: AC Dimmer and Ventilation set (Based on [Vacon 10 controller](http://files.danfoss.com/download/Drives/Vacon-10-Quick-Guide-DPD00714F1-UK.pdf)) and configure polling of virtually any Modbus device.
* Modbus RTU devices (Currently, possible to control any type of Modbus devices - e.c dimmers, sensors, wall climate panels, HVAC e.t.c
* Simple DMX wall sensor panel [like this](http://ali.pub/2zlohe)
[List of non-expensive compatible components from AliExpress here](http://ppv.alipromo.com/custom/promo.php?hash=pjagwaovaero6vkeabjpkpvy4gznbgkc&landing_id=39661)
@@ -43,14 +53,16 @@ Scalability of Lighthub is virtually unlimited: Setup so many controllers you ne
# Platforms specific details:
**AVR** version (Arduino Mega) is basic, long time in production and have all functions
**AVR** version (Arduino Mega) is basic, long time in production and have most functions
* DMX-out is software (DMXSimple) on pin3, can be re-defined to PIN 18 (USART1 TX)
* DMX-in - hardware
* WIZNET 5100 and 5500 Ethernets are supported
* Modbus on USART2
* Very limited in terms of RAM available
* OptiBoot bootloader recommended
**SAM3X8E** (Arduino DUE): (Tested. In production. Recomended hardware at current moment)
* default PWM out frequency
* Reachest funcionality from all possible options
* both, DMX-in and DMX-out are hardware USART based. Use USART1 (pins 18 and 19) for DMX-out and DMX-in
* WIZNET 5100 and 5500 Ethernets are supported
* Modbus on USART2
@@ -58,7 +70,7 @@ Scalability of Lighthub is virtually unlimited: Setup so many controllers you ne
**ESP8266, ESP32**: (Tested)
* DMX-OUT on USART1 TX
* DMX-IN - disabled - not possible to deploy in ESP8266
* Modbus - disabled on ESP8266, Might be configured in future on USART0 instead CLI/DEBUG, on ESP32 binded with UART2
* Modbus - disabled on ESP8266, Might be configured on USART0 instead CLI/DEBUG, on ESP32 binded with UART2
* Uses Wifi interface instead wired connection
**NRF52840** : Still early development stage

View File

@@ -2,3 +2,6 @@
-DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:07
-DWiz5100
#-DPID_DISABLE
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"

View File

@@ -1,9 +1,19 @@
#-DW5500_CS_PIN=53
-DDMX_SMOOTH
-DSYSLOG_ENABLE
-DMODBUS_DIMMER_PARAM=SERIAL_8E1
#-DMODBUS_SERIAL_PARAM=SERIAL_8E1
-DARTNET_ENABLE
-DOTA
-DSTATUSLED
#-DPID_DISABLE
#-DUARTBRIDGE_ENABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DMCP23017
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-DTIMER_INT
-DRESTART_LAN_ON_MQTT_ERRORS
-DOTA_PORT=80
-DMERCURY_ENABLE

View File

@@ -1,6 +0,0 @@
-DARTNET_ENABLE
-DDMX_SMOOTH
-DSTATUSLED
-DSYSLOG_ENABLE
-DWiz5100
#-DPID_DISABLE

View File

@@ -1,6 +0,0 @@
-DWiz5500
-DARTNET_ENABLE
-DDMX_SMOOTH
-DSTATUSLED
-DSYSLOG_ENABLE
#-DPID_DISABLE

View File

@@ -5,12 +5,56 @@
#-DAC_DISABLE
-DMODBUS_DISABLE
#-DMBUS_DISABLE
-DCOUNTER_DISABLE
#-DSYSLOG_ENABLE - udp errors
#-DCOUNTER_DISABLE
-DSYSLOG_ENABLE
# - udp errors
-DOTA
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
#- ArduinoMDNS didnt working
-DMCP23017
-DMODBUS_TX_PIN=13
#-DARTNET_ENABLE - udp rx errors ((
#-DUSE_1W_PIN=16
#-DW5500_CS_PIN=15
#-DPID_DISABLE
#Define pins for modbus UART Serial1. Default - 9/10 is utilized by ESP flash
#-DMODBUS_UART_RX_PIN=15
#-DMODBUS_UART_TX_PIN=2
#-DmodbusSerial=Serial1
#-DMODBUS_DEBUG
#-DMODBUS_UART_RX_PIN=16
#-DMODBUS_UART_TX_PIN=17
#-DmodbusSerial=Serial2
# Use default pins for modbus UART
#-DMODBUS_UART_RX_PIN=-1
#-DMODBUS_UART_TX_PIN=-1
# Example of UARTBRIDGE configuration
#-DUARTBRIDGE_ENABLE
#-DMODULE_UATRBRIDGE_UARTA=Serial1
#-DMODULE_UATRBRIDGE_UARTA_RX_PIN=15
#-DMODULE_UATRBRIDGE_UARTA_TX_PIN=2
#-DMODULE_UATRBRIDGE_UARTB=Serial2
#-DMODULE_UATRBRIDGE_UARTB_RX_PIN=-1
#-DMODULE_UATRBRIDGE_UARTB_TX_PIN=-1
#-DAUTOCONNECT_RECONNECT_WAITTIME=60
-DFS_STORAGE
-DFS_PREPARE
-DRESTART_LAN_ON_MQTT_ERRORS
#-D CORS=\"http://lazyhome.ru\"
-DOTA_PORT=80
-DMQTT_KEEPALIVE=10
-DMQTT_SOCKET_TIMEOUT=20
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
#-DMERCURY_ENABLE

View File

@@ -7,4 +7,40 @@
-DARTNET_ENABLE
-DUSE_1W_PIN=16
-DW5500_CS_PIN=15
#-DPID_DISABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DWM_MDNS
-DMCP23017
-DFS_STORAGE
-DFS_PREPARE
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-DOTA_PORT=80
#oct22 - violation in Publish/OnMQTTConnect while publish homie info
-DNO_HOMIE
#options to fit firmware to Sonoff-S26 (uncomment it)
##Disabling debug log and move I2C to 1-3 pins
#-DnoSerial
#-D TWI_SCL=1
#-D TWI_SDA=3
##Slimming firmware to fit 50% of 1m flash
-DDMX_DISABLE
-UDARTNET_ENABLE
-DMODBUS_DISABLE
-DMBUS_DISABLE
-DOWIRE_DISABLE
-DCOUNTER_DISABLE
-DAC_DISABLE
-DMOTOR_DISABLE
-DMULTIVENT_DISABLE
-DHSV_DISABLE
-UMCP23017
-D BEARSSL_SSL_BASIC
-D SPILED_DISABLE
-D PWM_DISABLE

View File

@@ -1,11 +1,42 @@
-DW5500_CS_PIN=53
-DARTNET_ENABLE
-DDMX_SMOOTH
-DMODBUS_DIMMER_PARAM=SERIAL_8E1
-DMODBUS_SERIAL_BAUD=9600
-DOTA
-DSYSLOG_ENABLE
#-DWiz5500
-DSTATUSLED
-DMCP23017
#-DPID_DISABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DTIMER_INT
#-DFLASH_OFFSET=-256
# default MODBUS Serial parameters for LEGACY Modbus and MODBUS over IP
#-DMODBUS_SERIAL_PARAM=SERIAL_8E1
#Set Logariphmic law for DMX channels bright
-DBRIGHT_LOG
#disable HOMIE topics publishing
-DNO_HOMIE
#Put modbus exchange in debug hex dump
#-DMODBUS_DEBUG
#Uncomment next 3 lines (or add it to custom build flags) to use Native USB port for debug/CLI instead Serial
#-DdebugSerialPort=SerialUSB
#-DSerialPortType=Serial_
#-DSERIAL_BAUD=0
#Default SerialDebug settings
#-DSERIAL_BAUD=115200
#-DdebugSerialPort=Serial
-DRESTART_LAN_ON_MQTT_ERRORS
#-D CORS=\"http://lazyhome.ru\"
-DOTA_PORT=80
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-D MERCURY_ENABLE
#-D IPMODBUS

View File

@@ -10,3 +10,15 @@
#-DSYSLOG_ENABLE
-DUSE_1W_PIN=16
#-DPID_DISABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DMCP23017
-DFS_STORAGE
-DFS_PREPARE
-DOTA
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-DOTA_PORT=80

View File

@@ -1,5 +1,12 @@
-DMODBUS_DIMMER_PARAM=SERIAL_8E1
#-DMODBUS_SERIAL_PARAM=SERIAL_8E1
-DAVR_DMXOUT_PIN=18
-DSYSLOG_ENABLE
-DWiz5100
#-DPID_DISABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-DOTA_PORT=80

View File

@@ -1,5 +1,18 @@
-DWiz5500
-DMODBUS_DIMMER_PARAM=SERIAL_8E1
#-DMODBUS_SERIAL_PARAM=SERIAL_8E1
-DAVR_DMXOUT_PIN=18
-DSYSLOG_ENABLE
#-DPID_DISABLE
#-DPID_DISABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DNO_HOMIE
-DCSSHDC_DISABLE
-DSPILED_DISABLE
-DAC_DISABLE
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-DOTA_PORT=80

View File

@@ -0,0 +1,30 @@
#-DMODBUS_SERIAL_PARAM=SERIAL_8E1
#-DAVR_DMXOUT_PIN=18
-DDMX_DISABLE
-DMODBUS_DISABLE
-DMBUS_DISABLE
-DOWIRE_DISABLE
-DDHT_DISABLE
-DCOUNTER_DISABLE
-DNO_HOMIE
-DCSSHDC_DISABLE
-DSPILED_DISABLE
#-DAC_DISABLE
-DSYSLOG_ENABLE
-DPID_DISABLE
-DOTA
-DMOTOR_DISABLE
-DMULTIVENT_DISABLE
#-DWiz5100
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
# Example of UARTBRIDGE configuration
#-DUARTBRIDGE_ENABLE
-DOTA_PORT=80
#-DMERCURY_ENABLE

View File

@@ -1,15 +1,30 @@
#-DMODBUS_DIMMER_PARAM=SERIAL_8E1
#-DMODBUS_SERIAL_PARAM=SERIAL_8E1
#-DAVR_DMXOUT_PIN=18
-DDMX_DISABLE
-DMODBUS_DISABLE
#-DMBUS_DISABLE
-DMBUS_DISABLE
#-DOWIRE_DISABLE
-DDHT_DISABLE
-DCOUNTER_DISABLE
#-DCOUNTER_DISABLE
-DNO_HOMIE
-DCSSHDC_DISABLE
-DSPILED_DISABLE
-DAC_DISABLE
-DSYSLOG_ENABLE
-DPID_DISABLE
-DWiz5100
-DMOTOR_DISABLE
-DOTA
-DARDUINO_OTA_MDNS_DISABLE
#-DMDNS_ENABLE
-DRESTART_LAN_ON_MQTT_ERRORS
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
-DOTA_PORT=80
-DHSV_DISABLE
-DMULTIVENT_DISABLE
-DPID_DISABLE
-DPWM_DISABLE
-DSPILED_DISABLE
-DOW_DEVICES_LIMIT=17

View File

@@ -1,4 +1,4 @@
-DWiz5500
#-DWiz5500
#-DW5500_CS_PIN=10
-DDMX_DISABLE
-DMODBUS_DISABLE
@@ -12,3 +12,8 @@
-DSYSLOG_ENABLE
-DMBUS_DISABLE
-DPID_DISABLE
#-DMCP23017
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
#-DMERCURY_ENABLE

View File

@@ -0,0 +1,40 @@
-DDMX_DISABLE
-DMODBUS_DISABLE
-DMBUS_DISABLE
-DOWIRE_DISABLE
-DDHT_DISABLE
-DCOUNTER_DISABLE
-DNO_HOMIE
-DCSSHDC_DISABLE
-DSPILED_DISABLE
-DAC_DISABLE
-DPID_DISABLE
-DENABLE_HWSERIAL1
-DdebugSerialPort=Serial1
#-DFLASH_BASE_ADDRESS
#-DFLASH_DATA_SECTOR
#-DFLASH_PAGE_NUMBER
-D PIO_FRAMEWORK_ARDUINO_ENABLE_MASS_STORAGE
-D PIO_FRAMEWORK_ARDUINO_ENABLE_CDC_AND_MSC
#-DdebugSerialPort=SerialUSB
#-DSerialPortType=USBSerial
#-DSERIAL_BAUD=0
#-DPIO_FRAMEWORK_ARDUINO_ENABLE_CDC
#-DUSBCON
#-DUSBD_VID=0x0483
#-DUSBD_PID=0x5740
#-DUSB_MANUFACTURER="Unknown"
#-DUSB_PRODUCT="\"BLUEPILL_F103C8\""
#-DHAL_PCD_MODULE_ENABLED
#-D USBD_USE_CDC
-D HAL_CAN_MODULE_ENABLED
#HAL_ETH_MODULE_DISABLED
#HAL_SD_MODULE_DISABLED
#HAL_DAC_MODULE_DISABLED
#-DMERCURY_ENABLE

View File

@@ -9,3 +9,4 @@
-DSPILED_DISABLE
-DAC_DISABLE
-DPID_DISABLE
-DUIPETHERNET

View File

@@ -0,0 +1,16 @@
REM fetch DeviceID of Arduino Port from WMI Service
FOR /f "tokens=* skip=1" %%a IN ('wmic PATH Win32_SerialPort Where "Caption LIKE '%%Arduino Uno%%'" get DeviceID') DO (
SET COMX=%%a
GOTO exit1
)
REM Arduino Due Programming Port not exist
GOTO error_comport
:exit1
REM remove blank
SET COMPORT=%COMX: =%
..\tools\win\tool-avrdude\avrdude -C ..\tools\win\tool-avrdude\avrdude.conf -c arduino -P %COMPORT% -b 19200 -p m16u2 -vvv -U flash:w:16u2.hex:i

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,46 @@
{
"syslog":["192.168.88.2"],
"mqtt":["elev","192.168.88.22"],
"dmx":[30],
"items": {
"relay1":[6,32],
"relay2":[6,33],
"relays":[7,["relay1","relay2"]],
"sensair1":[44,[254,
"sensair",
{"co2":{"emit":"co2"}},
{"mode":"auto"}
]
],
"elevator":[15,{"baud":9600,"serial":"8N1"]
},
"modbus":
{
"sensair":{"baud":9600,
"poll":{"irs":[[0,3],21,[25,30]],"regs":[0,1,31],"delay":1000},
"par":{
"co2":{"ir":3},
"meterStat":{"ir":0},
"alarmStat":{"ir":1},
"outStat":{"ir":0},
"pwm":{"ir":21},
"typeid":{"ir":25,"type":"u32"},
"mapver":{"ir":27},
"fwver":{"ir":28},
"sensorid":{"ir":29,"type":"u32"},
"ack":{"reg":0},
"command":{"reg":1},
"abc":{"reg":31}
}
}
},
"in":{ "23":{"item":"relays","emit":"in1"},
"25":{"item":"relays","emit":"in2"},
"27":{"item":"relays","emit":"in3"},
"29":{"item":"relays","emit":"in4"}
}
}

View File

@@ -0,0 +1 @@
../tools/mac/arduinoOTA -d -address 192.168.88.70 -port 65280 -username arduino -password password -b /config

View File

@@ -0,0 +1 @@
../tools/mac/arduinoOTA -address elev.local -port 65280 -username arduino -password password -sketch config.json -b -upload /config.json

View File

@@ -1 +1 @@
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch

View File

@@ -0,0 +1 @@
../tools/mac/arduinoOTA -address 192.168.11.213 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch

View File

@@ -0,0 +1,61 @@
:020000023000CC
:10FC000002C0EFC037C1112484B7882369F0982F50
:10FC10009A70923049F081FF02C097EF94BF282E6E
:10FC200080E002D10C94000085E08093810082E0A6
:10FC30008093C00088E18093C1008CE08093C40071
:10FC400086E08093C2008EE0EFD0279A84E023EC18
:10FC50003FEF91E0309385002093840096BBB09BEA
:10FC6000FECF1F9AA8954091C00047FD02C0815069
:10FC700089F7CED0813479F4CBD0C82FDBD0C2380D
:10FC800011F480E004C088E0C13809F083E0B9D005
:10FC900080E1B7D0EECF823419F484E1D3D0F8CF2D
:10FCA000853411F485E0FACF853581F4B1D0E82EA2
:10FCB000AFD0F82E87FF07C08BB781608BBFEE0CEB
:10FCC000FF1CB8D0E5CF8BB78E7FF8CF863579F49F
:10FCD0009FD08D3451F49CD0CBB79AD0C170880F8F
:10FCE0008C2B8BBF81E0AED0CCCF83E0FCCF8436B1
:10FCF00009F046C08DD0C82FD0E0DC2FCC2788D0AB
:10FD0000C82B86D0D82E5E018EEFB81A00E012E024
:10FD10004801EFEF8E1A9E0A7BD0F80180838401A0
:10FD20008A149B04A9F786D0F5E410E000E0DF1602
:10FD300009F150E040E063E0C70153D08701C12CD6
:10FD400092E0D92EF601419151916F0161E0C80115
:10FD500048D00E5F1F4F2297A9F750E040E065E0C2
:10FD6000C7013FD095CF6081C8018E0D9F1D01D185
:10FD70000F5F1F4FF801FE5FC017D107A1F788CFB3
:10FD8000843701F545D0C82FD0E0DC2FCC2740D0F8
:10FD9000C82B3ED0D82E4ED08701F5E4DF120BC021
:10FDA000CE0DDF1DC801DDD02CD00F5F1F4FC01757
:10FDB000D107C1F76DCFF80187918F0122D021972C
:10FDC000D1F766CF853739F435D08EE11AD088E97E
:10FDD00018D081E05CCF813509F073CF88E024D062
:10FDE00070CFFC010A0167BFE895112407B600FC3B
:10FDF000FDCF667029F0452B19F481E187BFE895A6
:10FE000008959091C00095FFFCCF8093C60008959F
:10FE10008091C00087FFFCCF8091C00084FD01C0AD
:10FE2000A8958091C6000895E0E6F0E098E19083FF
:10FE300080830895EDDF803219F088E0F5DFFFCF91
:10FE400084E1DFCFCF93C82FE3DFC150E9F7CF9133
:10FE5000F1CFCF92DF92EF92FF92DC01CB01642FC2
:10FE60006D01EE24FF24CBBEA901FF90EF90DF903F
:10FE7000CF90B7CF2F923F924F925F926F927F9227
:10FE80008F929F92AF92BF92CF92DF92EF92FF92AA
:10FE90000F931F93CF93DF9300D0CDB7DEB7180138
:10FEA000E9826B017C0110E000E029013A014C1865
:10FEB0005D086E087F0846015701840C951CA61C3E
:10FEC000B71C0215130531F489818823A1F188E05C
:10FED000ABDFFFCF30E020E043E0C701B601B9DF80
:10FEE00080E890E09B838A83ABBEF4012791369132
:10FEF000C501B401641975098609970941E0A9DFB4
:10FF00008A819B8101979B838A8392E0890E911C51
:10FF1000A11CB11C8A819B81892B31F730E020E044
:10FF200045E0C701B60195DF9FEFD91AE90AF90A42
:10FF30000F5F1F4FC0CF0F900F900F90DF91CF91A9
:10FF40001F910F91FF90EF90DF90CF90BF90AF90F7
:10FF50009F908F907F906F905F904F903F902F90E9
:10FF60000895F999FECF92BD81BDF89A992780B581
:10FF70000895262FF999FECF1FBA92BD81BD20BDED
:0EFF80000FB6F894FA9AF99A0FBE01960895FA
:02FFFE000008F9
:040000033000FC00CD
:00000001FF

View File

@@ -0,0 +1 @@
..\tools\win\tool-avrdude\avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -v -V -P com8 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

View File

@@ -0,0 +1 @@
..\tools\arduinoOTA.exe -address 192.168.11.213 -port 80 -username arduino -password password -sketch firmware.bin -b -upload /sketch

15
compiled/check_bin.sh Executable file
View File

@@ -0,0 +1,15 @@
diff ../.pio/build/due/firmware.bin due
diff ../.pio/build/controllino/firmware.hex controllino
diff ../.pio/build/m5stack/firmware.bin m5stack
diff ../.pio/build/mega2560slim-5100/firmware.hex mega2560slim-5100
diff ../.pio/build/mega2560slim-5100/firmware.bin mega2560slim-5100
diff ../.pio/build/mega2560-optiboot/firmware.hex mega2560-optiboot
diff ../.pio/build/mega2560-optiboot/firmware.bin mega2560-optiboot
diff ../.pio/build/mega2560-5100/firmware.hex mega2560-5100
diff ../.pio/build/nrf52840/firmware.hex nrf52840-5500
diff ../.pio/build/esp32-wifi/firmware.bin esp32-wifi
diff ../.pio/build/stm32-enc2860/firmware.bin stm32-enc2860
diff ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi
diff ../.pio/build/lighthub21/firmware.bin lighthub21
diff ../.pio/build/mega2560-5500/firmware.hex mega2560-5500
diff ../.pio/build/stm32/firmware.* stm32

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -1,3 +0,0 @@
export PORT=cu.usbmodem1451
echo . | stty -f /dev/$PORT speed 1200
../tools/mac/tool-bossac/bossac -U false -p $PORT -i -e -w -v -b firmware.bin -R

Binary file not shown.

View File

@@ -1,3 +0,0 @@
mode com3:1200,n,8,1
pause
..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R

View File

@@ -1 +0,0 @@
../tools/mac/arduinoOTA -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch

Binary file not shown.

2
compiled/due/sendcommand.sh Executable file
View File

@@ -0,0 +1,2 @@
#../tools/mac/arduinoOTA -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
curl --basic --user arduino:password --data-ascii "$2" --url http://192.168.88.21:65280/command/$1

View File

@@ -1,3 +1,90 @@
mode com3:1200,n,8,1
pause
C:\Users\Akmal\.platformio\packages\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b C:\Users\Akmal\ownCloud\compiled\due\Wiz5500\firmware.bin -R
@ECHO off
REM Wait X second for memory on Arduino Due is erased.
SET WAIT_ERASED=4
ECHO ------ External tool BossacArduinoDue started ------
REM number of command line arguments ok?
REM IF [%1]==[] GOTO error_args
REM IF [%2]==[] GOTO error_args
REM set command line arguments
SET BOSSACPATH=..\tools\win\tool-bossac\bossac.exe
SET BINFILE=firmware.bin
REM parse command line arguments
SET BOSSACPATH=%BOSSACPATH:"=%
SET BINFILE=%BINFILE:"=%
REM workeround for bug in Atmel Studio 6.0.1996 Service Pack 2
SET BINFILE=%BINFILE:\\=\%
SET BINFILE=%BINFILE:.cproj=%
REM bossac path exist?
IF NOT EXIST "%BOSSACPATH%" GOTO error_arg1
REM bin file exist?
IF NOT EXIST "%BINFILE%" GOTO error_binfile
REM fetch DeviceID of Arduino Due Programming Port from WMI Service
FOR /f "tokens=* skip=1" %%a IN ('wmic PATH Win32_SerialPort Where "Caption LIKE '%%USB%%'" get DeviceID') DO (
SET COMX=%%a
GOTO exit1
)
REM Arduino Due Programming Port not exist
GOTO error_comport
:exit1
REM remove blank
SET COMPORT=%COMX: =%
REM report in Atmel Studio 6.0 IDE output window
ECHO BossacPath=%BOSSACPATH%
ECHO BinFile=%BINFILE%
ECHO Arduino Due Programming Port is detected as %COMPORT%.
REM The bossac bootloader only runs if the memory on Arduino Due is erased.
REM The Arduino IDE does this by opening and closing the COM port at 1200 baud.
REM This causes the Due to execute a soft erase command.
ECHO Forcing reset using 1200bps open/close on port
ECHO MODE %COMPORT%:1200,N,8,1
MODE %COMPORT%:1200,N,8,1
REM Wait X second for memory on Arduino Due is erased.
ECHO Wait for memory on Arduino Due is erased...
PING -n %WAIT_ERASED% 127.0.0.1>NUL
REM Execute bossac.exe
ECHO Execute bossac with command line:
ECHO "%BOSSACPATH%" -i -d --port=%COMPORT% -U false -e -w -v -b "%BINFILE%" -R
START /WAIT "" "%BOSSACPATH%" -i --port=%COMPORT% -U false -e -w -v -b "%BINFILE%" -R
GOTO end
:error_args
ECHO Error: wrong number of command line arguments passed!
GOTO end
:error_arg1
ECHO Error: command line argument 1 - path to bossac.exe not exist! - "C:\Program Files (x86)\arduino-1.5.2\hardware\tools\bossac.exe"
ECHO Error: command line argument 1 - argument passed = %1
GOTO end
:error_arg2
ECHO Error: command line argument 2 - path to bin file not exist! - use $(OutputDirectory)\$(OutputFileName).bin
ECHO Error: command line argument 2 - argument passed = %1
GOTO end
:error_binfile
ECHO Error: bin file "%BINFILE%" not exist!
GOTO end
:error_comport
ECHO Error: Arduino Due Programming Port not found!
:end
ECHO ======================== Done ========================

View File

@@ -1,3 +0,0 @@
mode com3:1200,n,8,1
pause
C:\Users\Akmal\.platformio\packages\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b C:\Users\Akmal\ownCloud\compiled\due\Wiz5500\firmware999.bin -R

View File

@@ -1,5 +1 @@
<<<<<<< HEAD
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
=======
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76

View File

@@ -1 +1 @@
../tools/mac/arduinoOTA -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
../tools/mac/arduinoOTA -address 192.168.88.21 -port 80 -username arduino -password password -sketch firmware.bin -b -upload /sketch

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

View File

@@ -0,0 +1,62 @@
{
"syslog":["192.168.88.2"],
"mqtt1":["esp32","m2m.eclipse.org"],
"mqtt":["elevator","192.168.88.2"],
"mqtt4":["esp32","test.mosquitto.org"],
"dmx":[30],
"items": {
"relay1":[6,32],
"relay2":[6,33],
"relays":[7,["relay1","relay2"]],
"sensair1":[44,[254,
"sensair",
{"co2":{"emit":"co2"}},
{"mode":"auto"}
]
],
"elevator":[15,{"baud":9600,"serial":"8N1","ip":"192.168.88.255","port":502}],
"aaa1":[44,[254,
"aaa",
{"aaa1":{"emit":"aaa2"}},
{"mode":"auto"}
]
]
},
"modbus":
{
"aaa":
{"baud":19200,
"poll":{"irs":[1]},
"par":{
"aaa1":{"ir":1}
}
},
"sensair":{"baud":9600,
"poll":{"irs":[[0,3],21,[25,30]],"regs":[0,1,31],"delay":1000},
"par":{
"co2":{"ir":3},
"meterStat":{"ir":0},
"alarmStat":{"ir":1},
"outStat":{"ir":0},
"pwm":{"ir":21},
"typeid":{"ir":25,"type":"u32"},
"mapver":{"ir":27},
"fwver":{"ir":28},
"sensorid":{"ir":29,"type":"u32"},
"ack":{"reg":0},
"command":{"reg":1},
"abc":{"reg":31}
}
}
},
"in":{ "34":{"item":"relays","emit":"myhome/in/bedr","scmd":"TOGGLE","rcmd":""},
"17":{"T":64,"emit":"analog","map":[0,1024,0,100,15]}
}
}

Binary file not shown.

View File

@@ -0,0 +1,2 @@
~/.platformio/packages/tool-mkspiffs/mkspiffs_espressif32_arduino -s 20480 -c data data.bin
../tools/mac/arduinoOTA -v -address 192.168.88.50 -port 80 -username arduino -password password -sketch data.bin -upload /data -b

View File

@@ -1 +0,0 @@
../tools/mac/arduinoOTA -address 192.168.8.58 -port 65280 -username arduino -password password -sketch StartCounter.ino.bin -b -upload /sketch

View File

@@ -1 +1 @@
../tools/mac/arduinoOTA -address 192.168.88.45 -port 65280 -username arduino -password password -sketch firmware.bin -upload /sketch -b
../tools/mac/arduinoOTA -v -address 192.168.11.207 -port 80 -username arduino -password password -sketch firmware.bin -upload /sketch -b

Binary file not shown.

View File

@@ -0,0 +1,31 @@
Компактная сборка с набором опций, умещающаяся в 50 процентов flash ESP12
CLI и отладочная информация на serial0 отключена для возможности использования PIN0-1
(-)MULTIVENT
(+)PWM_RELAY
(+)MDNS
(-)UARTBRIDGE
(+)SYSLOG
(+)PID
(-)MCP23017
(-)ARTNET
(+)OTA
(-)SPI LED
(-)MOTOR CTR
(+)AC HAIER
(+)CCS811 & HDC1080
(+)RESTART_LAN_ON_MQTT_ERRORS
(-)HARDRESET, using soft
(-)COUNTER
(+)DHT
(-)OWIRE
(-)IPMODBUS
(-)MODBUS
(-)DMX
(+)WiFi
(+)FreeRam printing
(+)WATCHDOG
Config server:lazyhome.ru
201703L C++
version:e9355ef_2023-10-31

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,32 @@
Полная версия прошивки
(+)MULTIVENT
(+)PWM_RELAY
(+)MDNS
(-)UARTBRIDGE
(+)SYSLOG
(+)PID
(+)MCP23017
(+)ARTNET
(+)OTA
(+)SPI LED
(+)MOTOR CTR
(+)AC HAIER
(+)CCS811 & HDC1080
(+)RESTART_LAN_ON_MQTT_ERRORS
(-)HARDRESET, using soft
(+)COUNTER
(+)DHT
(-)DS2482-100 USE_1W_PIN
(+)OWIRE
(-)IPMODBUS
(+)MODBUS SERIAL_8N1 at Serial1 speed:9600
(+)ADAFRUIT LED
(+)DMX
(+)WiFi
(+)FreeRam printing
(+)WATCHDOG
lazyhome.ru
Config server:
201703L C++ version:e9355ef_2023-10-31

View File

@@ -0,0 +1 @@
../../tools/mac/arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin

View File

@@ -0,0 +1 @@
arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin

1
compiled/esp8266-wifi/ota.sh Executable file
View File

@@ -0,0 +1 @@
../tools/mac/arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin

View File

@@ -0,0 +1 @@
wmic PATH Win32_SerialPort get DeviceID

View File

@@ -0,0 +1,215 @@
{
"dmx":[3,60],
"syslog":["192.168.88.2"],
"dmxin":["led5","led6","led7","led8"],
"topics":{"root":"lazyhome.ru"},
"mqtt":["lazyhome.ru-939a","192.168.88.3"],
"modbus":
{
"airset":{
"baud":9600,
"serial":"8E1",
"poll":{"regs":[[0,38],[1000,1008]],"delay":100000},
"par":{
"uheat":{"reg":0,"type":"u16"},
"umot":{"reg":2,"type":"u16"},
"amode":{"reg":3,"type":"u8","map":{}},
"onoff":{"reg":1000},
"fsauto":{"reg":1001},
"pmode":{"reg":1002},
"set":{"reg":1003},
"frcautoff":{"reg":1007},
"fault":{"reg":1008},
"t_heat":{"reg":8,"map":[0,1024,0,1024],"type":"i16"},
"mode":{"reg":24}
}
},
"dim4":{"serial":"8N1",
"poll":{"regs":[[0,4]],"delay":100000},
"par":{
"ch1":{"reg":0,"map":[]},
"ch2":{"reg":1,"map":[]},
"ch3":{"reg":2,"map":[]},
"ch4":{"reg":3,"map":[]}
}
},
"panel":{
"serial":"8E1",
"poll":{"regs":[[40000,40014],[30000,30002]],"delay":10000},
"par":{
"fan" :{"reg":40000,"map":[1,[0,7,0,100]],"id":1},
"mode" :{"reg":40001,"mapcmd":[2,[[1,"FAN_ONLY"],[2,"HEAT"],[4,"COOL"],[8,"AUTO"]]]},
"set" :{"reg":40002,"id":2},
"pwr" :{"reg":40003,"mapcmd":[2,[[0,2],[1,1]]]},
"alm01":{"reg":40004},
"alm17":{"reg":40005},
"alm33":{"reg":40006},
"sethum" :{"reg":40007,"id":3},
"setvoc" :{"reg":40008,"id":4},
"temp" :{"reg":30000,"map":[1,[-1000,1000,-100.0,100.0]],"type":"x10"},
"hum" :{"reg":30001},
"voc" :{"reg":30002},
"ch_temp" :{"reg":40009,"type":"x10","id":5},
"ext_temp" :{"reg":40010,"type":"x10","id":6},
"out_temp" :{"reg":40011,"type":"x10","id":7},
"water_temp" :{"reg":40012,"type":"x10","id":8},
"ch_hum" :{"reg":40013},
"heat_pwr":{"reg":40014}
}
}
},
"ow":{
"2861641227C1EFED":[{"emit":"t_1","item":"pid0/val"},{"emit":"pid_t"}]
},
"items": {
"dimer1":[44,[1,
"dim4",
{"ch1":{"emit":"aaa1"},"ch2":{"emit":"aaa2"},"ch3":{"emit":"aaa3"}},
{"mode":"auto"}
]
],
"p_bedr":[44,[2,"panel",
{
"fan" :{"sa":10, "act":
[
{"emit":"edem/ac/bedr/fan"},
{"emit":"edem/vent/bedr/fan"}
]
},
"mode":{"sa":11,"emit":"edem/ac/bedr/mode"},
"pwr" :{"sa":12,"emit":"edem/ac/bedr/pwr"},
"sethum":{"emit":"edem/vent/hum_bedr/set","item":"thermostat/set"},
"hum" :{"emit":"edem/vent/hum_bedr/val"},
"setvoc":{"emit":"edem/vent/bedr/set","item":"lled/sat"},
"voc" :{"emit":"edem/vent/bedr/val"},
"set" :{"sa":13, "act":
[
{"emit":"edem/fl2/term_bedr/set"},
{"emit":"edem/ac/bedr/set","item":"pid0/set"}
]
},
"temp" :{"emit":"edem/fl2/term_bedr/1/val"},
"ch_temp":{"sa":14},
"ch_hum":{"sa":15},
"ext_temp":{"sa":16},
"out_temp":{"sa":17},
"water_temp":{"sa":18},
"heat_pwr":{"sa":19},
"cmd":{"sa":2,"reg":"mode","on":1,"off":0}
}
]],
"airset1":[44,[247,"airset"]],
"mbusdim1":[44,[1,0,3,100]],
"mbusdim2":[44,[1,1,3,100]],
"mbusdim3":[44,[1,2,3,100]],
"mbusdim4":[44,[1,3,3,100]],
"relay":[6,22],
"pout1":[6,23],
"pout2":[6,24],
"pout3":[6,25],
"pout4":[33,9],
"pout5":[33,8],
"pout6":[33,11],
"pout7":[33,12],
"lled":[3,[9,8,11,12]],
"pwm0" :[33,4],
"pwm1" :[33,5],
"pwm2" :[3,6],
"pwm3" :[3,7],
"pwm10":[3,3],
"thermostat":[5,2,33],
"airgate1":[12,[-4,-27,59,617,284,5000]],
"airgate2":[12,[-5,-26,60,750,160,5000]],
"airgates":[7,["airgate1","airgate2"]],
"pid0":[413,
[
[20,0.2,7,0,100],
[{"item":"airgates/set","emit":"pid_out","pin":29},{"item":"pwm10/set"}]],
32.1],
"relaytermostat":[16,[[2,3.5,10000],{"pin":28},33]],
"virtualAC0":[17,[]],
"vent5":[18,
{
"":{"item":"dimmer3/set"},
"airgate1":{"V":100,"set":255,"item":"airgate1/set"},
"airgate2":{"V":200,"set":128,"cmd":2,"item":"airgate2/set"},
"airgate4":{"V":150,"set":0,"emit":"edem/in/airgate4/set"}
}
],
"unprot0":[6,33],
"unprot1":[6,32],
"unprot2":[6,31],
"unprot3":[6,30],
"unprot4":[6,29],
"unprot5":[6,28],
"unprot6":[66,27],
"unprot7":[66,26],
"led": [1,1],
"led2":[1,5],
"led3":[1,9],
"led4":[1,13],
"led5":[1,17],
"led6":[1,21],
"led7":[1,25],
"led8":[1,29],
"dimmer" :[0,33],
"dimmer2":[0,34],
"dimmer3":[0,35],
"dimmer4":[0,36],
"dimmer5":[0,37],
"dimmer6":[0,38],
"dimmers":[7,["dimmer","dimmer2","dimmer3","dimmer4","dimmer5","dimmer6"]],
"leds":[7,["led","led2","led3","led4","led5","led6"]],
"mbuses":[7,["mbusdim1","mbusdim2","mbusdim3","mbusdim4"]],
"all":[7,["dimmers","uouts","relays","leds","mbuses"]],
"relays":[7,["relay","pout1","pout2","pout3","pout4","pout5","pout6","pout7"]],
"uouts":[7,["unprot0","unprot1","unprot2","unprot3","unprot4","unprot5","unprot6","unprot7"]]
},
"in":{
"42":{"emit":"in0"},
"44":{"emit":"in1"},
"46":{"emit":"in2"},
"49":{"emit":"in3"},
"43":{"emit":"in4"},
"45":{"emit":"in5"},
"47":{"emit":"in6"},
"48":{"emit":"in7"},
"34":{"emit":"in8"},
"36":{"emit":"in9","item":"unprot0","scmd":"TOGGLE","rcmd":""},
"38":{"emit":"in10","item":"dimmers","scmd":"TOGGLE","rcmd":""},
"40":{"emit":"in11","item":"leds","scmd":"TOGGLE","rcmd":""},
"35":{"emit":"in12","item":"mbuses","scmd":"TOGGLE","rcmd":""},
"37":{"emit":"in13","item":"relays","scmd":"TOGGLE","rcmd":""},
"39":{"emit":"in14","item":"uouts","scmd":"TOGGLE","rcmd":""},
"41":{"emit":"in15","item":"all","scmd":"TOGGLE","rcmd":""},
"54":{"T":66,"emit":"myhome/in/a00","map":[0,1024,0,1024,10]},
"55":{"T":66,"emit":"myhome/in/a01","map":[0,1024,0,1024,10]},
"56":{"T":66,"emit":"myhome/in/a02","map":[0,1024,0,1024,10]},
"57":{"T":66,"emit":"myhome/in/a03","map":[0,1024,0,1024,10]},
"58":{"T":66,"emit":"myhome/in/a04","map":[0,1024,0,1024,10]},
"61":{"T":66,"emit":"myhome/in/a07","map":[0,1024,0,1024,10]},
"62":{"T":66,"emit":"myhome/in/a08","map":[0,1024,0,1024,10]},
"63":{"T":66,"emit":"myhome/in/a09","map":[0,1024,0,1024,10]},
"64":{"T":66,"emit":"myhome/in/a10","map":[0,1024,0,1024,10]},
"65":{"T":66,"emit":"myhome/in/a11","map":[0,1024,0,1024,10]},
"66":{"T":0,"emit":"myhome/in/d12"},
"67":{"T":0,"emit":"myhome/in/d13"},
"68":{"T":0,"emit":"myhome/in/d14"},
"69":{"T":0,"emit":"myhome/in/d15"}
}
}

Binary file not shown.

View File

@@ -0,0 +1,91 @@
@ECHO off
REM Wait X second for memory on Arduino Due is erased.
SET WAIT_ERASED=4
ECHO ------ External tool BossacArduinoDue started ------
REM number of command line arguments ok?
REM IF [%1]==[] GOTO error_args
REM IF [%2]==[] GOTO error_args
REM set command line arguments
SET BOSSACPATH=..\tools\win\tool-bossac\bossac.exe
SET BINFILE=firmware.bin
REM parse command line arguments
SET BOSSACPATH=%BOSSACPATH:"=%
SET BINFILE=%BINFILE:"=%
REM workeround for bug in Atmel Studio 6.0.1996 Service Pack 2
SET BINFILE=%BINFILE:\\=\%
SET BINFILE=%BINFILE:.cproj=%
REM bossac path exist?
IF NOT EXIST "%BOSSACPATH%" GOTO error_arg1
REM bin file exist?
IF NOT EXIST "%BINFILE%" GOTO error_binfile
REM fetch DeviceID of Arduino Due Programming Port from WMI Service
FOR /f "tokens=* skip=1" %%a IN ('wmic PATH Win32_SerialPort Where "Caption LIKE '%%BOSSA%%'" get DeviceID') DO (
SET COMX=%%a
GOTO exit1
)
REM Arduino Due Programming Port not exist
GOTO error_comport
:exit1
REM remove blank
SET COMPORT=%COMX: =%
REM report in Atmel Studio 6.0 IDE output window
ECHO BossacPath=%BOSSACPATH%
ECHO BinFile=%BINFILE%
ECHO Arduino Due Programming Port is detected as %COMPORT%.
REM The bossac bootloader only runs if the memory on Arduino Due is erased.
REM The Arduino IDE does this by opening and closing the COM port at 1200 baud.
REM This causes the Due to execute a soft erase command.
ECHO Forcing reset using 1200bps open/close on port
ECHO MODE %COMPORT%:1200,N,8,1
MODE %COMPORT%:1200,N,8,1
REM Wait X second for memory on Arduino Due is erased.
ECHO Wait for memory on Arduino Due is erased...
PING -n %WAIT_ERASED% 127.0.0.1>NUL
REM Execute bossac.exe
ECHO Execute bossac with command line:
"%BOSSACPATH%" -i --port=%COMPORT% --unlock -R
REM START /WAIT "" "%BOSSACPATH%" -i --port=%COMPORT% -u -e -w -v -b "%BINFILE%" -R
GOTO end
:error_args
ECHO Error: wrong number of command line arguments passed!
GOTO end
:error_arg1
ECHO Error: command line argument 1 - path to bossac.exe not exist! - "C:\Program Files (x86)\arduino-1.5.2\hardware\tools\bossac.exe"
ECHO Error: command line argument 1 - argument passed = %1
GOTO end
:error_arg2
ECHO Error: command line argument 2 - path to bin file not exist! - use $(OutputDirectory)\$(OutputFileName).bin
ECHO Error: command line argument 2 - argument passed = %1
GOTO end
:error_binfile
ECHO Error: bin file "%BINFILE%" not exist!
GOTO end
:error_comport
ECHO Error: Arduino Due Programming Port not found!
:end
ECHO ======================== Done ========================

View File

@@ -1,3 +1,90 @@
mode com3:1200,n,8,1
pause
..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R
@ECHO off
REM Wait X second for memory on Arduino Due is erased.
SET WAIT_ERASED=4
ECHO ------ External tool BossacArduinoDue started ------
REM number of command line arguments ok?
REM IF [%1]==[] GOTO error_args
REM IF [%2]==[] GOTO error_args
REM set command line arguments
SET BOSSACPATH=..\tools\win\tool-bossac\bossac.exe
SET BINFILE=firmware.bin
REM parse command line arguments
SET BOSSACPATH=%BOSSACPATH:"=%
SET BINFILE=%BINFILE:"=%
REM workeround for bug in Atmel Studio 6.0.1996 Service Pack 2
SET BINFILE=%BINFILE:\\=\%
SET BINFILE=%BINFILE:.cproj=%
REM bossac path exist?
IF NOT EXIST "%BOSSACPATH%" GOTO error_arg1
REM bin file exist?
IF NOT EXIST "%BINFILE%" GOTO error_binfile
REM fetch DeviceID of Arduino Due Programming Port from WMI Service
FOR /f "tokens=* skip=1" %%a IN ('wmic PATH Win32_SerialPort Where "Caption LIKE '%%Due%%'" get DeviceID') DO (
SET COMX=%%a
GOTO exit1
)
REM Arduino Due Programming Port not exist
GOTO error_comport
:exit1
REM remove blank
SET COMPORT=%COMX: =%
REM report in Atmel Studio 6.0 IDE output window
ECHO BossacPath=%BOSSACPATH%
ECHO BinFile=%BINFILE%
ECHO Arduino Due Programming Port is detected as %COMPORT%.
REM The bossac bootloader only runs if the memory on Arduino Due is erased.
REM The Arduino IDE does this by opening and closing the COM port at 1200 baud.
REM This causes the Due to execute a soft erase command.
ECHO Forcing reset using 1200bps open/close on port
ECHO MODE %COMPORT%:1200,N,8,1
MODE %COMPORT%:1200,N,8,1
REM Wait X second for memory on Arduino Due is erased.
ECHO Wait for memory on Arduino Due is erased...
PING -n %WAIT_ERASED% 127.0.0.1>NUL
REM Execute bossac.exe
ECHO Execute bossac with command line:
"%BOSSACPATH%" -i --port=%COMPORT% -U false -w -v -b "%BINFILE%" -R
REM START /WAIT "" "%BOSSACPATH%" -i --port=%COMPORT% -U false -e -w -v -b "%BINFILE%" -R
GOTO end
:error_args
ECHO Error: wrong number of command line arguments passed!
GOTO end
:error_arg1
ECHO Error: command line argument 1 - path to bossac.exe not exist! - "C:\Program Files (x86)\arduino-1.5.2\hardware\tools\bossac.exe"
ECHO Error: command line argument 1 - argument passed = %1
GOTO end
:error_arg2
ECHO Error: command line argument 2 - path to bin file not exist! - use $(OutputDirectory)\$(OutputFileName).bin
ECHO Error: command line argument 2 - argument passed = %1
GOTO end
:error_binfile
ECHO Error: bin file "%BINFILE%" not exist!
GOTO end
:error_comport
ECHO Error: Arduino Due Programming Port not found!
:end
ECHO ======================== Done ========================

View File

@@ -0,0 +1 @@
../tools/mac/arduinoOTA -address 192.168.88.45 -port 65280 -username arduino -password password -sketch data/config.json -b -upload /data

View File

@@ -0,0 +1,91 @@
@ECHO off
REM Wait X second for memory on Arduino Due is erased.
SET WAIT_ERASED=4
ECHO ------ External tool BossacArduinoDue started ------
REM number of command line arguments ok?
REM IF [%1]==[] GOTO error_args
REM IF [%2]==[] GOTO error_args
REM set command line arguments
SET BOSSACPATH=..\tools\win\tool-bossac\bossac.exe
SET BINFILE=firmware.bin
REM parse command line arguments
SET BOSSACPATH=%BOSSACPATH:"=%
SET BINFILE=%BINFILE:"=%
REM workeround for bug in Atmel Studio 6.0.1996 Service Pack 2
SET BINFILE=%BINFILE:\\=\%
SET BINFILE=%BINFILE:.cproj=%
REM bossac path exist?
IF NOT EXIST "%BOSSACPATH%" GOTO error_arg1
REM bin file exist?
IF NOT EXIST "%BINFILE%" GOTO error_binfile
REM fetch DeviceID of Arduino Due Programming Port from WMI Service
FOR /f "tokens=* skip=1" %%a IN ('wmic PATH Win32_SerialPort Where "Caption LIKE '%%BOSSA%%'" get DeviceID') DO (
SET COMX=%%a
GOTO exit1
)
REM Arduino Due Programming Port not exist
GOTO error_comport
:exit1
REM remove blank
SET COMPORT=%COMX: =%
REM report in Atmel Studio 6.0 IDE output window
ECHO BossacPath=%BOSSACPATH%
ECHO BinFile=%BINFILE%
ECHO Arduino Due Programming Port is detected as %COMPORT%.
REM The bossac bootloader only runs if the memory on Arduino Due is erased.
REM The Arduino IDE does this by opening and closing the COM port at 1200 baud.
REM This causes the Due to execute a soft erase command.
ECHO Forcing reset using 1200bps open/close on port
ECHO MODE %COMPORT%:1200,N,8,1
MODE %COMPORT%:1200,N,8,1
REM Wait X second for memory on Arduino Due is erased.
ECHO Wait for memory on Arduino Due is erased...
PING -n %WAIT_ERASED% 127.0.0.1>NUL
REM Execute bossac.exe
ECHO Execute bossac with command line:
"%BOSSACPATH%" -i --port=%COMPORT% -w -v -b "%BINFILE%" -R
REM START /WAIT "" "%BOSSACPATH%" -i --port=%COMPORT% -u -e -w -v -b "%BINFILE%" -R
GOTO end
:error_args
ECHO Error: wrong number of command line arguments passed!
GOTO end
:error_arg1
ECHO Error: command line argument 1 - path to bossac.exe not exist! - "C:\Program Files (x86)\arduino-1.5.2\hardware\tools\bossac.exe"
ECHO Error: command line argument 1 - argument passed = %1
GOTO end
:error_arg2
ECHO Error: command line argument 2 - path to bin file not exist! - use $(OutputDirectory)\$(OutputFileName).bin
ECHO Error: command line argument 2 - argument passed = %1
GOTO end
:error_binfile
ECHO Error: bin file "%BINFILE%" not exist!
GOTO end
:error_comport
ECHO Error: Arduino Due Programming Port not found!
:end
ECHO ======================== Done ========================

View File

@@ -0,0 +1 @@
..\tools\arduinoOTA -address 192.168.11.204 -port 80 -username arduino -password password -sketch firmware.bin -b -upload /sketch

View File

@@ -1,5 +0,0 @@
<<<<<<< HEAD
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
=======
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76

View File

@@ -1 +1 @@
../tools/mac/arduinoOTA -address 192.168.11.172 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
../tools/mac/arduinoOTA -address 192.168.11.172 -port 80 -username arduino -password password -sketch firmware.bin -b -upload /sketch

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1 @@
cp ../../.pio/build/lighthub21/firmware.bin .

View File

@@ -0,0 +1 @@
../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -P net:192.168.88.2:23000 -v -V -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

6597
compiled/nrf52840-5500 Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

BIN
compiled/stm32/firmware.bin Executable file

Binary file not shown.

BIN
compiled/stm32/firmware.elf Executable file

Binary file not shown.

9862
compiled/stm32/firmware.map Normal file

File diff suppressed because it is too large Load Diff

1
compiled/stm32/upload.sh Executable file
View File

@@ -0,0 +1 @@
dfu-util -D firmware.bin -a 1

BIN
compiled/tools/arduinoOTA Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,3 +0,0 @@
mode com3:1200,n,8,1
pause
..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R

16
compiled/update_bin.bat Normal file
View File

@@ -0,0 +1,16 @@
copy ..\.pio\build\due\firmware.bin due
copy ..\.pio\build\controllino\firmware.hex controllino
copy ..\.pio\build\m5stack\firmware.bin m5stack
copy ..\.pio\build\mega2560slim-5100\firmware.hex mega2560slim-5100
copy ..\.pio\build\mega2560slim-5100\firmware.bin mega2560slim-5100
copy ..\.pio\build\mega2560slim2\firmware.hex mega2560slim2
copy ..\.pio\build\mega2560slim2\firmware.bin mega2560slim2
copy ..\.pio\build\due-5100\firmware.bin due-5100
copy ..\.pio\build\mega2560-5100\firmware.hex mega2560-5100
copy ..\.pio\build\due-5500\firmware.bin due-5500
copy ..\.pio\build\nrf52840\firmware.hex nrf52840-5500
copy ..\.pio\build\esp32-wifi\firmware.bin esp32-wifi
copy ..\.pio\build\stm32-enc2860\firmware.bin stm32-enc2860
copy ..\.pio\build\esp8266-wifi\firmware.bin esp8266-wifi
copy ..\.pio\build\lighthub21\firmware.bin lighthub21
copy ..\.pio\build\mega2560-5500\firmware.hex mega2560-5500

View File

@@ -2,12 +2,14 @@ cp ../.pio/build/due/firmware.bin due
cp ../.pio/build/controllino/firmware.hex controllino
cp ../.pio/build/m5stack/firmware.bin m5stack
cp ../.pio/build/mega2560slim-5100/firmware.hex mega2560slim-5100
cp ../.pio/build/due-5100/firmware.bin due-5100
cp ../.pio/build/mega2560slim-5100/firmware.bin mega2560slim-5100
cp ../.pio/build/mega2560-optiboot/firmware.hex mega2560-optiboot
cp ../.pio/build/mega2560-optiboot/firmware.bin mega2560-optiboot
cp ../.pio/build/mega2560-5100/firmware.hex mega2560-5100
cp ../.pio/build/due-5500/firmware.bin due-5500
cp ../.pio/build/nrf52840-5500/firmware.hex nrf52840-5500
cp ../.pio/build/nrf52840/firmware.hex nrf52840
cp ../.pio/build/esp32-wifi/firmware.bin esp32-wifi
cp ../.pio/build/stm32-enc2860/firmware.bin stm32-enc2860
cp ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi
cp ../.pio/build/lighthub21/firmware.bin lighthub21
cp ../.pio/build/mega2560-5500/firmware.hex mega2560-5500
cp ../.pio/build/mega2560-5500/firmware.hex mega2560-5500
cp ../.pio/build/stm32/firmware.* stm32

View File

@@ -0,0 +1,25 @@
{
"syslog":["95.31.43.9"],
"items": {
"ledhum":[6,-13],
"reghum": [13, [
[50, 10, 0, 60, 250, 200], [{"item": "relayhum"}, {"item":"ledhum"}]
], 30, 12],
"relayhum": [16, [12, 1200], 255, 2]
},
"in":{
"0":{"T":0,
"click":{ "item":"reghum","icmd":"TOGGLE"},
"dclick":{ "emit":"myhome/light-d2/light","ecmd":"TOGGLE"}
},
"3":{"T":4,
"temp":{"emit":"plugtemp"},
"hum":{"item":"reghum/val","emit":"plughum"}
}
},
"mqtt":["plug00","192.168.88.2"]
}

62
data/config.json Normal file
View File

@@ -0,0 +1,62 @@
{
"syslog":["192.168.88.2"],
"mqtt1":["esp32","m2m.eclipse.org"],
"mqtt":["elevator","192.168.88.2"],
"mqtt4":["esp32","test.mosquitto.org"],
"dmx":[30],
"items": {
"relay1":[6,32],
"relay2":[6,33],
"relays":[7,["relay1","relay2"]],
"sensair1":[44,[254,
"sensair",
{"co2":{"emit":"co2"}},
{"mode":"auto"}
]
],
"elevator":[15,{"baud":9600,"serial":"8N1","ip":"192.168.88.255","port":502}],
"aaa1":[44,[254,
"aaa",
{"aaa1":{"emit":"aaa2"}},
{"mode":"auto"}
]
]
},
"modbus":
{
"aaa":
{"baud":19200,
"poll":{"irs":[1]},
"par":{
"aaa1":{"ir":1}
}
},
"sensair":{"baud":9600,
"poll":{"irs":[[0,3],21,[25,30]],"regs":[0,1,31],"delay":1000},
"par":{
"co2":{"ir":3},
"meterStat":{"ir":0},
"alarmStat":{"ir":1},
"outStat":{"ir":0},
"pwm":{"ir":21},
"typeid":{"ir":25,"type":"u32"},
"mapver":{"ir":27},
"fwver":{"ir":28},
"sensorid":{"ir":29,"type":"u32"},
"ack":{"reg":0},
"command":{"reg":1},
"abc":{"reg":31}
}
}
},
"in":{ "34":{"item":"relays","emit":"myhome/in/bedr","scmd":"TOGGLE","rcmd":""},
"17":{"T":64,"emit":"analog","map":[0,1024,0,100,15]}
}
}

View File

@@ -9,6 +9,10 @@
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="navtree.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="resize.js"></script>
<script type="text/javascript" src="navtreedata.js"></script>
<script type="text/javascript" src="navtree.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
@@ -23,7 +27,9 @@
<td id="projectlogo"><img alt="Logo" src="lh.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">LightHub
&#160;<span id="projectnumber">v4.0.0</span>
</div>
<div id="projectbrief">Smarthome controller firmware</div>
</td>
</tr>
</tbody>
@@ -46,6 +52,23 @@ $(function() {
});
/* @license-end */</script>
<div id="main-nav"></div>
</div><!-- top -->
<div id="side-nav" class="ui-resizable side-nav-resizable">
<div id="nav-tree">
<div id="nav-tree-contents">
<div id="nav-sync" class="sync"></div>
</div>
</div>
<div id="splitbar" style="-moz-user-select:none;"
class="ui-resizable-handle">
</div>
</div>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
$(document).ready(function(){initNavTree('abstractch_8cpp.html',''); initResizable(); });
/* @license-end */
</script>
<div id="doc-content">
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
@@ -60,11 +83,6 @@ $(function() {
</iframe>
</div>
<div id="nav-path" class="navpath">
<ul>
<li class="navelem"><a class="el" href="dir_82d7c1f210290ade9e0671f857ad27e3.html">lighthub</a></li> </ul>
</div>
</div><!-- top -->
<div class="header">
<div class="summary">
<a href="#var-members">Variables</a> </div>
@@ -77,47 +95,6 @@ $(function() {
<code>#include &quot;<a class="el" href="utils_8h_source.html">utils.h</a>&quot;</code><br />
<code>#include &lt;aJSON.h&gt;</code><br />
<code>#include &quot;<a class="el" href="main_8h_source.html">main.h</a>&quot;</code><br />
</div><div class="textblock"><div class="dynheader">
Include dependency graph for abstractch.cpp:</div>
<div class="dyncontent">
<div class="center"><img src="abstractch_8cpp__incl.png" border="0" usemap="#aabstractch_8cpp" alt=""/></div>
<map name="abstractch_8cpp" id="aabstractch_8cpp">
<area shape="rect" title=" " alt="" coords="854,5,962,32"/>
<area shape="rect" href="abstractch_8h.html" title=" " alt="" coords="1015,379,1110,405"/>
<area shape="rect" title=" " alt="" coords="111,155,224,181"/>
<area shape="rect" href="utils_8h.html" title=" " alt="" coords="248,155,306,181"/>
<area shape="rect" title=" " alt="" coords="740,304,816,331"/>
<area shape="rect" href="main_8h.html" title=" " alt="" coords="877,80,938,107"/>
<area shape="rect" title=" " alt="" coords="880,453,957,480"/>
<area shape="rect" title=" " alt="" coords="31,229,123,256"/>
<area shape="rect" href="options_8h.html" title=" " alt="" coords="324,304,398,331"/>
<area shape="rect" href="item_8h.html" title=" " alt="" coords="365,229,424,256"/>
<area shape="rect" title=" " alt="" coords="147,229,239,256"/>
<area shape="rect" href="abstractout_8h.html" title=" " alt="" coords="617,304,716,331"/>
<area shape="rect" href="item_cmd_8h.html" title=" " alt="" coords="623,379,710,405"/>
<area shape="rect" href="streamlog_8h.html" title=" " alt="" coords="984,155,1074,181"/>
<area shape="rect" title=" " alt="" coords="582,229,724,256"/>
<area shape="rect" title=" " alt="" coords="1099,155,1218,181"/>
<area shape="rect" href="ow_term_8h.html" title=" " alt="" coords="830,155,908,181"/>
<area shape="rect" href="dmx_8h.html" title=" " alt="" coords="448,229,506,256"/>
<area shape="rect" title=" " alt="" coords="1242,155,1325,181"/>
<area shape="rect" href="textconst_8h.html" title=" " alt="" coords="1442,155,1528,181"/>
<area shape="rect" title=" " alt="" coords="1552,155,1607,181"/>
<area shape="rect" title=" " alt="" coords="1631,155,1696,181"/>
<area shape="rect" title=" " alt="" coords="498,155,560,181"/>
<area shape="rect" title=" " alt="" coords="584,155,653,181"/>
<area shape="rect" href="inputs_8h.html" title=" " alt="" coords="1350,155,1418,181"/>
<area shape="rect" title=" " alt="" coords="1314,229,1374,256"/>
<area shape="rect" title=" " alt="" coords="1064,229,1186,256"/>
<area shape="rect" title=" " alt="" coords="1211,229,1290,256"/>
<area shape="rect" title=" " alt="" coords="996,304,1056,331"/>
<area shape="rect" title=" " alt="" coords="800,229,938,256"/>
<area shape="rect" href="in__ccs811__hdc1080_8h.html" title=" " alt="" coords="1500,229,1702,256"/>
<area shape="rect" href="abstractin_8h.html" title=" " alt="" coords="1081,304,1172,331"/>
<area shape="rect" title=" " alt="" coords="1353,304,1524,331"/>
<area shape="rect" title=" " alt="" coords="1548,304,1686,331"/>
</map>
</div>
</div><table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
Variables</h2></td></tr>
@@ -196,9 +173,13 @@ Variables</h2></td></tr>
</div>
</div>
</div><!-- contents -->
</div><!-- doc-content -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
</small></address>
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
<li class="navelem"><a class="el" href="abstractch_8cpp.html">abstractch.cpp</a></li>
<li class="footer">Generated by <a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20 </li>
</ul>
</div>
</body>
</html>

View File

@@ -0,0 +1,6 @@
var abstractch_8cpp =
[
[ "ethernetIdleCount", "abstractch_8cpp.html#a525d99b2753ef2f4055ea4475dbc10d7", null ],
[ "lanStatus", "abstractch_8cpp.html#a7bbda7cf303a1bc3222e7a270f9040bd", null ],
[ "mqttClient", "abstractch_8cpp.html#a86d63f481644da70f063c2593fcafe19", null ]
];

View File

@@ -9,6 +9,10 @@
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="navtree.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="resize.js"></script>
<script type="text/javascript" src="navtreedata.js"></script>
<script type="text/javascript" src="navtree.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
@@ -23,7 +27,9 @@
<td id="projectlogo"><img alt="Logo" src="lh.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">LightHub
&#160;<span id="projectnumber">v4.0.0</span>
</div>
<div id="projectbrief">Smarthome controller firmware</div>
</td>
</tr>
</tbody>
@@ -46,6 +52,23 @@ $(function() {
});
/* @license-end */</script>
<div id="main-nav"></div>
</div><!-- top -->
<div id="side-nav" class="ui-resizable side-nav-resizable">
<div id="nav-tree">
<div id="nav-tree-contents">
<div id="nav-sync" class="sync"></div>
</div>
</div>
<div id="splitbar" style="-moz-user-select:none;"
class="ui-resizable-handle">
</div>
</div>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
$(document).ready(function(){initNavTree('abstractch_8h.html',''); initResizable(); });
/* @license-end */
</script>
<div id="doc-content">
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
@@ -60,11 +83,6 @@ $(function() {
</iframe>
</div>
<div id="nav-path" class="navpath">
<ul>
<li class="navelem"><a class="el" href="dir_82d7c1f210290ade9e0671f857ad27e3.html">lighthub</a></li> </ul>
</div>
</div><!-- top -->
<div class="header">
<div class="summary">
<a href="#nested-classes">Classes</a> &#124;
@@ -74,54 +92,6 @@ $(function() {
</div><!--header-->
<div class="contents">
<div class="textblock"><code>#include &quot;Arduino.h&quot;</code><br />
</div><div class="textblock"><div class="dynheader">
Include dependency graph for abstractch.h:</div>
<div class="dyncontent">
<div class="center"><img src="abstractch_8h__incl.png" border="0" usemap="#aabstractch_8h" alt=""/></div>
<map name="abstractch_8h" id="aabstractch_8h">
<area shape="rect" title=" " alt="" coords="5,5,100,32"/>
<area shape="rect" title=" " alt="" coords="14,80,91,107"/>
</map>
</div>
</div><div class="textblock"><div class="dynheader">
This graph shows which files directly or indirectly include this file:</div>
<div class="dyncontent">
<div class="center"><img src="abstractch_8h__dep__incl.png" border="0" usemap="#aabstractch_8hdep" alt=""/></div>
<map name="abstractch_8hdep" id="aabstractch_8hdep">
<area shape="rect" title=" " alt="" coords="334,5,429,32"/>
<area shape="rect" href="abstractch_8cpp.html" title=" " alt="" coords="427,379,535,405"/>
<area shape="rect" href="abstractin_8cpp.html" title=" " alt="" coords="5,379,109,405"/>
<area shape="rect" href="abstractin_8h.html" title=" " alt="" coords="236,80,327,107"/>
<area shape="rect" href="abstractout_8h.html" title=" " alt="" coords="1519,80,1617,107"/>
<area shape="rect" href="in__ccs811__hdc1080_8h.html" title=" " alt="" coords="207,155,355,181"/>
<area shape="rect" href="inputs_8h.html" title=" " alt="" coords="247,229,315,256"/>
<area shape="rect" href="in__ccs811__hdc1080_8cpp.html" title=" " alt="" coords="133,379,296,405"/>
<area shape="rect" href="inputs_8cpp.html" title=" " alt="" coords="320,379,403,405"/>
<area shape="rect" href="main_8h.html" title=" " alt="" coords="776,304,837,331"/>
<area shape="rect" href="colorchannel_8cpp.html" title=" " alt="" coords="1125,379,1245,405"/>
<area shape="rect" href="item_8cpp.html" title=" " alt="" coords="1791,379,1863,405"/>
<area shape="rect" href="item_cmd_8cpp.html" title=" " alt="" coords="873,379,973,405"/>
<area shape="rect" href="main_8cpp.html" title=" " alt="" coords="773,379,848,405"/>
<area shape="rect" href="out__ac_8cpp.html" title=" " alt="" coords="1997,379,2083,405"/>
<area shape="rect" href="out__dmx_8cpp.html" title=" " alt="" coords="1270,379,1367,405"/>
<area shape="rect" href="out__modbus_8cpp.html" title=" " alt="" coords="1647,379,1766,405"/>
<area shape="rect" href="out__motor_8cpp.html" title=" " alt="" coords="997,379,1101,405"/>
<area shape="rect" href="out__pwm_8cpp.html" title=" " alt="" coords="1391,379,1491,405"/>
<area shape="rect" href="out__spiled_8cpp.html" title=" " alt="" coords="1516,379,1623,405"/>
<area shape="rect" href="ow_term_8cpp.html" title=" " alt="" coords="560,379,653,405"/>
<area shape="rect" href="utils_8cpp.html" title=" " alt="" coords="678,379,749,405"/>
<area shape="rect" href="colorchannel_8h.html" title=" " alt="" coords="1515,229,1621,256"/>
<area shape="rect" href="out__dmx_8h.html" title=" " alt="" coords="1376,304,1459,331"/>
<area shape="rect" href="out__pwm_8h.html" title=" " alt="" coords="1635,304,1722,331"/>
<area shape="rect" href="out__spiled_8h.html" title=" " alt="" coords="1746,304,1838,331"/>
<area shape="rect" href="item_8h.html" title=" " alt="" coords="1169,155,1228,181"/>
<area shape="rect" href="out__modbus_8h.html" title=" " alt="" coords="1899,229,2003,256"/>
<area shape="rect" href="out__motor_8h.html" title=" " alt="" coords="1261,304,1352,331"/>
<area shape="rect" href="out__ac_8h.html" title=" " alt="" coords="2077,304,2149,331"/>
<area shape="rect" href="dmx_8cpp.html" title=" " alt="" coords="1013,229,1085,256"/>
<area shape="rect" href="utils_8h.html" title=" " alt="" coords="643,229,701,256"/>
</map>
</div>
</div>
<p><a href="abstractch_8h_source.html">Go to the source code of this file.</a></p>
<table class="memberdecls">
@@ -183,9 +153,13 @@ Macros</h2></td></tr>
</div>
</div>
</div><!-- contents -->
</div><!-- doc-content -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
</small></address>
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
<li class="navelem"><a class="el" href="abstractch_8h.html">abstractch.h</a></li>
<li class="footer">Generated by <a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20 </li>
</ul>
</div>
</body>
</html>

View File

@@ -0,0 +1,7 @@
var abstractch_8h =
[
[ "abstractCh", "classabstract_ch.html", "classabstract_ch" ],
[ "CST_FAILED", "abstractch_8h.html#adcf23ecf1f6e4dbc5a6780645425399e", null ],
[ "CST_INITIALIZED", "abstractch_8h.html#ab7dea1d4d49f436619dd52ce3da0d6c3", null ],
[ "CST_UNKNOWN", "abstractch_8h.html#ad5c9fbfc15fa16113c539de3867f54fc", null ]
];

Some files were not shown because too many files have changed in this diff Show More