Compare commits

...

192 Commits

Author SHA1 Message Date
Theo Arends
e71235ea3a Prep v12.1.1 2022-08-24 17:35:11 +02:00
Theo Arends
930e659915 Prep v12.1.1 2022-08-24 17:30:50 +02:00
Theo Arends
8d52722941 Prep v12.1.1 2022-08-24 17:24:31 +02:00
Theo Arends
ca10e7b909 Revert camera changes 2022-08-19 10:29:05 +02:00
Theo Arends
806c5762bc Merge branch 'development' into pre-release-12.1 2022-08-18 12:20:03 +02:00
Theo Arends
f5b2216361 Merge branch 'development' into pre-release-12.1 2022-08-17 09:55:50 +02:00
Theo Arends
dfa2c25c03 Release 12.1 2022-08-15 09:41:23 +02:00
Theo Arends
eed11319ac Release 12.1 2022-08-15 09:38:51 +02:00
Theo Arends
e5310ad6e5 Merge branch 'development' into pre-release-12.1 2022-08-15 09:36:50 +02:00
Theo Arends
9eb42b41d0 Merge branch 'development' into pre-release-12.1 2022-08-11 15:05:51 +02:00
Theo Arends
4074d82ac7 Update CHANGELOG.md 2022-06-20 14:40:00 +02:00
Theo Arends
dc1605f96a Merge branch 'pre-release-12.0' 2022-06-20 14:39:51 +02:00
Theo Arends
4ff60deafc Update RELEASENOTES.md 2022-06-20 14:32:25 +02:00
Theo Arends
24757be59e Merge branch 'development' into pre-release-12.0 2022-06-20 14:29:00 +02:00
Theo Arends
b44a87a3d8 Fix resolving MQTT and NTP servers
- Fix resolving MQTT and NTP servers (#15816)
- Bump version to v12.0.1
2022-06-17 16:37:32 +02:00
Theo Arends
7bc7be56ee Merge branch 'development' into pre-release-12.0 2022-06-16 09:53:43 +02:00
Theo Arends
fa03edbeb4 Merge branch 'development' into pre-release-12.0 2022-06-15 17:29:04 +02:00
Theo Arends
c9cd367e53 Prep release 12.0 2022-06-13 16:35:21 +02:00
Theo Arends
1cdd2be008 Merge branch 'development' into pre-release-12.0 2022-06-13 16:28:00 +02:00
Theo Arends
d157b1c5e0 Merge branch 'development' into pre-release-11.1 2022-04-12 17:45:25 +02:00
Theo Arends
ffc2352cd6 Merge branch 'development' into pre-release-11.1 2022-04-12 16:29:25 +02:00
Theo Arends
41f7580210 Merge branch 'development' into pre-release-11.1 2022-04-12 13:33:14 +02:00
Theo Arends
6e2592fe02 Merge branch 'development' into pre-release-11.1 2022-04-12 12:14:38 +02:00
Theo Arends
0b25206f90 Prep release 11.1 2022-04-10 12:21:37 +02:00
Theo Arends
4f2a59d27d Merge branch 'development' into pre-release-11.1 2022-04-10 12:17:46 +02:00
Theo Arends
0cbc1681d2 Merge branch 'development' into pre-release-11.1 2022-04-10 12:06:50 +02:00
Theo Arends
00227a45c6 Merge branch 'development' into pre-release-11.1 2022-04-07 17:34:42 +02:00
Theo Arends
e8988e4b31 Merge branch 'development' into pre-release-11.1 2022-04-07 17:10:14 +02:00
Theo Arends
64ea803ef1 Prep release 2022-02-12 15:12:14 +01:00
Theo Arends
078fb0ea3a Merge branch 'development' into pre-release-11.0 2022-02-12 15:05:39 +01:00
Theo Arends
efc2f54610 Merge branch 'development' into pre-release-11.0 2022-02-12 15:01:41 +01:00
Theo Arends
942ebe1cf4 Merge branch 'development' into pre-release-11.0 2022-02-12 14:55:11 +01:00
Theo Arends
c22d936f8c Merge branch 'development' into pre-release-11.0 2022-02-12 14:50:30 +01:00
Theo Arends
a955827db9 Merge branch 'development' into pre-release-11.0 2022-02-07 18:09:45 +01:00
Theo Arends
f09d6b5452 Merge branch 'development' into pre-release-11.0 2022-02-07 17:40:03 +01:00
Theo Arends
9dd05501a8 Merge branch 'development' into pre-release-11.0 2022-02-07 15:13:36 +01:00
Theo Arends
5254a26145 Prep release 2022-02-07 15:07:24 +01:00
Theo Arends
02659ff1a5 Merge branch 'development' into pre-release-11.0 2022-02-07 14:54:44 +01:00
Theo Arends
50f0101e59 Merge branch 'development' into pre-release-11.0 2022-02-07 13:41:39 +01:00
Theo Arends
1ee598cefd
Merge pull request #14346 from arendst/revert-14336-patch-3
Revert "Update xsns_69_opentherm.ino"
2022-01-09 15:38:31 +01:00
Theo Arends
0c22b69bd0
Revert "Update xsns_69_opentherm.ino" 2022-01-09 15:38:01 +01:00
Theo Arends
5057314977
Merge pull request #14336 from Xjeater/patch-3
Update xsns_69_opentherm.ino
2022-01-09 15:34:30 +01:00
Serge
71c146ab35
Update xsns_69_opentherm.ino
Add variable overrides
2022-01-08 22:38:53 +03:00
Theo Arends
e5d576b507 Prep v10.1.0 2021-12-08 11:14:35 +01:00
Theo Arends
329d76346f Merge branch 'development' into pre-release-10.1.0 2021-12-08 11:11:02 +01:00
Theo Arends
6d5227ba75 Merge branch 'development' into pre-release-10.0.0 2021-10-19 09:48:58 +02:00
Theo Arends
0ccf7de945 Merge branch 'development' into pre-release-10.0.0 2021-10-19 09:45:10 +02:00
Theo Arends
8c4ab12e9a Merge branch 'development' into pre-release-10.0.0 2021-10-19 09:24:00 +02:00
Theo Arends
6decedbb31 Update README.md 2021-10-18 17:09:10 +02:00
Theo Arends
8d61740a9f Merge branch 'development' into pre-release-10.0.0 2021-10-18 17:01:46 +02:00
Theo Arends
388db0e795 Merge branch 'development' into pre-release-10.0.0 2021-10-17 17:54:24 +02:00
Theo Arends
d696c00d3f Merge branch 'development' into pre-release-10.0.0 2021-10-16 15:13:49 +02:00
Theo Arends
1e3bc9f8be Merge branch 'development' into pre-release-10.0.0 2021-10-16 10:57:17 +02:00
Theo Arends
b3a1fa99f2 Merge branch 'development' into pre-release-10.0.0 2021-10-15 13:15:21 +02:00
Theo Arends
d7847061b9 Merge branch 'development' into pre-release-10.0.0 2021-10-13 14:06:01 +02:00
Theo Arends
e2a8e39646 Update CHANGELOG.md 2021-10-13 11:36:02 +02:00
Theo Arends
9482079573 Update tasmota_version.h 2021-10-13 11:31:39 +02:00
Theo Arends
f100430125 Merge branch 'development' into pre-release-9.6.0 2021-10-13 11:30:46 +02:00
Theo Arends
c1d61c9eb0 Merge branch 'development' into pre-release-9.6.0 2021-10-12 11:34:11 +02:00
Theo Arends
e96ce2f637 Merge branch 'development' into pre-release-9.6.0 2021-10-10 16:41:47 +02:00
Theo Arends
838ab4f553 Merge branch 'development' into pre-release-9.6.0 2021-10-08 14:42:12 +02:00
Theo Arends
cbc74ab873 Merge branch 'development' into pre-release-9.5.0 2021-06-17 09:44:42 +02:00
Theo Arends
92994455c4 Merge branch 'development' into pre-release-9.5.0 2021-06-15 10:20:06 +02:00
Theo Arends
1fe0160ef6 Merge branch 'development' into pre-release-9.5.0 2021-06-15 09:24:32 +02:00
Theo Arends
15b75422b5 Merge branch 'development' into pre-release-9.5.0 2021-06-14 19:36:38 +02:00
Theo Arends
1b40bfb336 Merge branch 'development' into pre-release-9.5.0 2021-06-14 16:48:05 +02:00
Theo Arends
aacb37ecfc Update changelog 2021-06-14 15:47:20 +02:00
Theo Arends
9ac9e0460a Merge branch 'development' into pre-release-9.5.0 2021-06-14 15:44:31 +02:00
Theo Arends
6f03368c85 Merge branch 'development' into pre-release-9.5.0 2021-06-14 14:32:38 +02:00
Theo Arends
330a12efe4 Merge branch 'development' into pre-release-9.5.0 2021-06-14 11:59:07 +02:00
Theo Arends
fab0cd88c2 Merge branch 'development' into pre-release-9.5.0 2021-06-14 10:08:42 +02:00
Theo Arends
ed23cd8d95 Merge branch 'development' into pre-release-9.5.0 2021-06-13 17:38:15 +02:00
Theo Arends
7defc325f1 Merge branch 'development' into pre-release-9.5.0 2021-06-13 15:33:07 +02:00
Theo Arends
30cbc1b1e5 Merge branch 'development' into pre-release-9.5.0 2021-06-13 12:32:31 +02:00
Theo Arends
61adb53da6 Push rebuild 2021-04-23 12:05:20 +02:00
Theo Arends
9e008008c3 Merge branch 'development' into pre-release-9.4.0 2021-04-23 11:31:05 +02:00
Theo Arends
f5d1594a6b Update languages 2021-04-21 18:03:01 +02:00
Theo Arends
80d72ecbf5 Update Spanish and Italian 2021-04-21 17:38:17 +02:00
Theo Arends
0150c9e809 Merge branch 'development' into pre-release-9.4.0 2021-04-21 15:37:37 +02:00
Theo Arends
7e532a87f9 Merge branch 'development' into pre-release-9.4.0 2021-04-21 14:37:44 +02:00
Theo Arends
4052903810 Merge branch 'development' into pre-release-9.4.0 2021-04-21 13:51:53 +02:00
Theo Arends
04c1262bc2 Merge branch 'development' into pre-release-9.4.0 2021-04-21 12:47:09 +02:00
Theo Arends
851c839c53 Merge branch 'development' into pre-release-9.4.0 2021-04-21 11:33:15 +02:00
Theo Arends
c88152c14e Merge branch 'development' into pre-release-9.4.0 2021-04-16 17:31:25 +02:00
Theo Arends
08fa219a88 Merge branch 'development' into pre-release-9.4.0 2021-04-14 17:48:00 +02:00
Theo Arends
adbb5f8d53 Merge branch 'development' into pre-release-9.4.0 2021-04-14 17:02:57 +02:00
Theo Arends
71268e5aae Prep 9.4.0 2021-04-14 16:53:04 +02:00
Theo Arends
9f21938c2c Merge branch 'development' into pre-release-9.4.0 2021-04-14 16:49:36 +02:00
Theo Arends
ebb998ea06 Merge branch 'development' into pre-release-9.4.0 2021-04-14 16:24:42 +02:00
Theo Arends
e6e00c80cc Merge branch 'development' into pre-release-9.4.0 2021-04-14 14:34:20 +02:00
Theo Arends
7e3b7ddc69 Prep release 9.4.0 2021-04-14 12:50:33 +02:00
Theo Arends
31c6075a84 Merge branch 'development' into pre-release-9.4.0 2021-04-14 12:47:02 +02:00
Theo Arends
92c0eb000f Update xsns_05_ds18x20.ino
Fix DS18x20 driver timing issue (#11270)
2021-03-09 16:53:59 +01:00
Theo Arends
3f7071c6b9 Merge branch 'development' into pre-release-9.3.0 2021-02-23 12:00:31 +01:00
Theo Arends
cabe894933 Merge branch 'development' into pre-release-9.3.0 2021-02-22 14:18:00 +01:00
Theo Arends
b6f283d8d8 Update README.md 2021-02-21 12:35:28 +01:00
Theo Arends
5e3c1b6415 Merge branch 'development' into pre-release-9.3.0 2021-02-21 12:35:19 +01:00
Theo Arends
96d4e60680 pre-release 9.3.0 2021-02-19 11:06:32 +01:00
Theo Arends
488edab49c Merge branch 'development' into pre-release-9.3.0 2021-02-19 10:58:43 +01:00
Theo Arends
45cd73940d Merge branch 'development' into pre-release-9.3.0 2021-02-18 14:36:10 +01:00
Theo Arends
25033908cd Merge branch 'development' into pre-release-9.3.0 2021-02-18 13:07:17 +01:00
Theo Arends
b75520cde9 Merge branch 'development' into pre-release-9.3.0 2021-02-16 15:57:24 +01:00
Theo Arends
3374990115 Merge branch 'development' into pre-release-9.3.0 2021-02-15 11:52:15 +01:00
Theo Arends
2b34c6843a Merge branch 'development' into pre-release-9.3.0 2021-02-12 15:19:21 +01:00
Theo Arends
e7a27893b3 Merge branch 'development' into pre-release-9.3.0 2021-02-12 11:01:37 +01:00
Theo Arends
d37b9db08d Merge branch 'development' into pre-release-9.3.0 2021-02-11 15:15:51 +01:00
Theo Arends
c74c0d9d10
Merge pull request #10639 from arendst/revert-10598-master
Revert "Added ENS160 (Air quality) and ENS210 (Temperature & Humidity) sensor"
2021-01-20 17:07:11 +01:00
Theo Arends
4cc0f05cb1
Revert "Added ENS160 (Air quality) and ENS210 (Temperature & Humidity) sensor" 2021-01-20 17:06:50 +01:00
Theo Arends
ec14623169
Merge pull request #10598 from chrfriese123/master
Added ENS160 (Air quality) and ENS210 (Temperature & Humidity) sensor
2021-01-20 17:04:24 +01:00
chrfriese123
dc73b67a61 Added ENS160 (Air quality) and ENS210 (Temperature & Humidity) sensor 2021-01-17 15:26:10 +00:00
Theo Arends
fa0e8867af Merge branch 'pre-release-9.2.0' 2020-12-23 18:31:24 +01:00
Theo Arends
6afb2767f7 Updated workflows 2020-12-23 18:30:21 +01:00
Theo Arends
6cb9b3ce80
Merge pull request #10241 from Jason2866/revert-10238-patch-3
Revert "Build firmware from Master branch"
2020-12-23 16:13:00 +01:00
Jason2866
39f31d8cdf
Revert "Build firmware from Master branch" 2020-12-23 15:57:37 +01:00
Theo Arends
e1d44b9dfa
Merge pull request #10238 from Jason2866/patch-3
Build firmware from Master branch
2020-12-23 15:28:25 +01:00
Jason2866
0c36bcb25c
Build firmware from Master branch 2020-12-23 15:23:57 +01:00
Theo Arends
0489d3fc9a Add backported fixes 2020-12-21 15:01:04 +01:00
Theo Arends
3ba19e1552 Add backported fixes 2020-12-21 14:27:21 +01:00
Theo Arends
08ec5cecda Release 9.2.0 2020-12-17 12:29:31 +01:00
Theo Arends
0d505baa0e
Merge pull request #10158 from arendst/changelog-plus-1
changelog but better
2020-12-17 12:19:17 +01:00
blakadder
fd6a9fdc90
changelog but better
added hyperlinks to pulls/issues for convenience
2020-12-17 11:56:23 +01:00
Theo Arends
386dbbd878 Merge branch 'development' into pre-release-9.2.0 2020-12-17 10:03:33 +01:00
Theo Arends
797f82dc27 Merge branch 'development' into pre-release-9.2.0 2020-12-16 15:31:19 +01:00
Theo Arends
c09f966f41 Merge branch 'development' into pre-release-9.2.0 2020-12-15 16:45:59 +01:00
Theo Arends
829397f4ed Merge branch 'development' into pre-release-9.2.0 2020-12-13 17:41:26 +01:00
Theo Arends
198ec55473 Merge branch 'development' into pre-release-9.2.0 2020-12-13 12:17:35 +01:00
Theo Arends
1c24df6df8 Merge branch 'development' into pre-release-9.2.0 2020-12-10 15:50:42 +01:00
Theo Arends
83f76e2432 Merge branch 'development' into pre-release-9.2.0 2020-12-08 16:21:08 +01:00
Theo Arends
fa8a6bc0e5 Merge branch 'development' into pre-release-9.2.0 2020-12-08 11:08:52 +01:00
Theo Arends
603f08291a Update CHANGELOG.md 2020-12-07 12:08:44 +01:00
Theo Arends
ae793c8f2d Merge branch 'development' into pre-release-9.2.0 2020-12-07 11:59:34 +01:00
Theo Arends
556156f73f Merge branch 'development' into pre-release-9.2.0 2020-12-06 16:36:18 +01:00
Theo Arends
e035bdb71f Fix default dimmer step 2020-11-07 11:10:41 +01:00
Theo Arends
16ffdb6f49 Merge branch 'development' into pre-release-9.1.0 2020-11-05 11:38:35 +01:00
Theo Arends
76decfaa43 Merge branch 'development' into pre-release-9.1.0 2020-11-05 10:22:32 +01:00
Theo Arends
b369e87385 Merge branch 'development' into pre-release-9.1.0 2020-11-05 10:01:38 +01:00
Theo Arends
4f92d4984f Merge branch 'development' into pre-release-9.1.0 2020-11-04 16:59:29 +01:00
Theo Arends
68f8ea6f39 Merge branch 'development' into pre-release-9.1.0 2020-11-03 16:45:17 +01:00
Theo Arends
1838c582b3 Merge branch 'development' into pre-release-9.1.0 2020-11-02 14:48:47 +01:00
Theo Arends
8255468f9c Merge branch 'development' into pre-release-9.1.0 2020-11-01 17:43:13 +01:00
Theo Arends
e217ab49d9 Merge branch 'development' into pre-release-9.1.0 2020-11-01 15:22:33 +01:00
Theo Arends
a73b2d1e09 Merge branch 'development' into pre-release-9.1.0 2020-10-26 16:48:54 +01:00
Theo Arends
584ae41cb7 Merge branch 'development' into pre-release-9.1.0 2020-10-25 15:22:30 +01:00
Theo Arends
e076b50dfc Prep release 8.5.1 2020-10-02 11:47:47 +02:00
Theo Arends
e1df24be17 Merge branch 'development' into pre-release-8.5.1 2020-10-02 10:05:54 +02:00
Theo Arends
b1782f32ca Merge branch 'development' into pre-release-8.5.1 2020-10-01 15:41:22 +02:00
Theo Arends
61d6a1240b Prep release 8.5.1 2020-10-01 15:38:29 +02:00
Theo Arends
c987f4357e Merge branch 'development' into pre-release-8.5.1 2020-10-01 15:23:09 +02:00
Theo Arends
ed50401812 Update RELEASENOTES.md 2020-09-14 10:54:55 +02:00
Theo Arends
ec4bc1fb98
Merge pull request #9299 from Jason2866/8.5.0
fix pio setup
2020-09-13 18:26:02 +02:00
Jason2866
4c906a794a Merge branch '8.5.0' of https://github.com/Jason2866/Tasmota into 8.5.0 2020-09-13 18:23:11 +02:00
Jason2866
20d545e873 del cpp 2020-09-13 18:23:07 +02:00
Jason2866
e84bbe9e64
Delete tasmota.ino.cpp 2020-09-13 18:21:02 +02:00
Jason2866
43b0831cb2 fix pio setup 2020-09-13 18:16:57 +02:00
Theo Arends
92766df1a5 Remove binaries from release page 2020-09-09 12:31:20 +02:00
Theo Arends
8bac4981ea Fix energy total counters
Fix energy total counters (#9263, #9266)
2020-09-09 11:38:18 +02:00
Theo Arends
a89f208da0 Update CHANGELOG.md 2020-09-07 14:06:54 +02:00
Theo Arends
3041f9dccb Merge branch 'development' into pre-release-850 2020-09-07 10:31:54 +02:00
Theo Arends
fe3f705448 Merge branch 'development' into pre-release-850 2020-09-06 18:44:27 +02:00
Theo Arends
33a44f7a39 Merge branch 'development' into pre-release-850 2020-09-05 14:18:55 +02:00
Theo Arends
efd4a6b542 Merge branch 'development' into pre-release-850 2020-09-02 15:00:36 +02:00
Theo Arends
69765f5706 Prep release 8.5.0 2020-09-02 10:58:50 +02:00
Theo Arends
3195ce7b14 Merge branch 'development' into pre-release-850 2020-09-02 10:49:12 +02:00
Theo Arends
b59a8a7966 Merge branch 'pre-release-840' 2020-07-29 16:16:19 +02:00
Theo Arends
da704f4ecb Revert "Prep release 8.4.0"
This reverts commit f14f1d7798b8272caaa932ad5d8d34ac89b5d504.
2020-07-29 16:13:53 +02:00
Theo Arends
f14f1d7798 Prep release 8.4.0 2020-07-29 16:06:10 +02:00
Theo Arends
99feefba84 Merge branch 'development' into pre-release-840 2020-07-29 14:49:20 +02:00
Theo Arends
9a3307a73f Prep release 8.4.0 2020-07-29 11:18:56 +02:00
Theo Arends
5b3d673dea Merge branch 'pre-release' 2020-05-18 15:32:45 +02:00
Theo Arends
fddc15db70 Merge branch 'pre-release' 2020-05-18 14:24:10 +02:00
Theo Arends
04263f3969 Merge branch 'pre-release' 2020-05-18 14:22:05 +02:00
Theo Arends
e66f17c6bb Merge branch 'pre-release' 2020-05-18 10:08:59 +02:00
Theo Arends
f10257fd29 Merge branch 'pre-release' 2020-05-18 10:06:47 +02:00
Theo Arends
ae2c50cbe4 Merge branch 'pre-release' 2020-05-14 16:15:58 +02:00
Theo Arends
c6b02fb1e1 Merge branch 'pre-release' 2020-05-14 15:43:22 +02:00
Theo Arends
b5fb079228 Merge branch 'pre-release' 2020-05-14 15:36:06 +02:00
Theo Arends
7e5f3aa006 Merge branch 'pre-release' 2020-05-14 09:55:50 +02:00
Theo Arends
0fa559d143 Merge branch 'release' 2020-03-21 11:01:17 +01:00
Theo Arends
f2f8b5efa9
Merge pull request #7811 from Jason2866/patch-1
Fix compile fail with latest PlatformIO
2020-02-28 14:20:51 +01:00
Jason2866
11d37cc15b
Update platformio_tasmota_env.ini 2020-02-28 14:14:26 +01:00
Jason2866
99b15fe056
Update .gitpod.yml 2020-02-28 14:06:48 +01:00
Jason2866
19836d1136
Update platformio_override_sample.ini 2020-02-28 14:01:48 +01:00
Jason2866
3e4975831a
Update platformio.ini 2020-02-28 13:57:45 +01:00
Jason2866
cc8ae7c7a7
Update platformio_tasmota_env.ini 2020-02-28 13:55:40 +01:00
Jason2866
10f2d17a5a
Fix compile fail with latest PlatformIO 2020-02-28 13:48:56 +01:00
Jason2866
1198246572
Delete platformio.ini 2020-02-28 13:47:06 +01:00
Theo Arends
7138ddd80a Merge branch 'release' 2019-12-25 13:13:19 +01:00
Theo Arends
27bcc29421 Change basic version string to lite (#7291)
Change basic version string to lite (#7291)
2019-12-22 14:23:01 +01:00
Theo Arends
4c7283c292 Fix failing downgrade (#7285)
Fix failing downgrade (#7285)
2019-12-22 11:44:40 +01:00
Theo Arends
257f3d2808 Fix restore parameters
Fix restore ShutterAccuracy, MqttLog, WifiConfig, WifiPower and SerialConfig (#7281)
2019-12-21 18:55:58 +01:00
Theo Arends
5e4c5f67e6 Fix no AP on initial install
Fix no AP on initial install (#7282)
2019-12-21 18:01:09 +01:00
Theo Arends
4dab991d09 Fix Arduino IDE compile error
Fix Arduino IDE compile error (#7277)
2019-12-21 17:10:14 +01:00
14 changed files with 232 additions and 252 deletions

View File

@ -1,183 +1,183 @@
name: Build_firmware_master
on:
push:
branches: master
paths-ignore:
- '.github/**' # Ignore changes towards the .github directory
- '**.md' # Do no build if *.md files changes
# Ensures that only one deploy task per branch/environment will run at a time.
concurrency:
group: environment-${{ github.ref }}
cancel-in-progress: true
jobs:
base-images:
runs-on: ubuntu-latest
if: github.repository == 'arendst/Tasmota'
continue-on-error: true
strategy:
matrix:
variant:
- tasmota
- tasmota4M
- tasmota-minimal
- tasmota-display
- tasmota-ir
- tasmota-knx
- tasmota-lite
- tasmota-sensors
- tasmota-zbbridge
- tasmota-zigbee
- tasmota32
- tasmota32-zbbrdgpro
- tasmota32-webcam
- tasmota32-bluetooth
- tasmota32-nspanel
- tasmota32-display
- tasmota32-ir
- tasmota32-lvgl
- tasmota32c3
- tasmota32c3cdc
- tasmota32s2
- tasmota32s2cdc
- tasmota32s3
- tasmota32s3cdc
- tasmota32solo1
- tasmota32solo1-safeboot
- tasmota32-safeboot
- tasmota32c3-safeboot
- tasmota32c3cdc-safeboot
- tasmota32s2-safeboot
- tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
steps:
- uses: actions/checkout@v3
with:
ref: master
- name: Set up Python
uses: actions/setup-python@v2
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
language-images:
runs-on: ubuntu-latest
if: github.repository == 'arendst/Tasmota'
continue-on-error: true
strategy:
matrix:
variant: [ tasmota, tasmota32 ]
language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ]
steps:
- uses: actions/checkout@v3
with:
ref: master
- name: Set up Python
uses: actions/setup-python@v2
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
Upload:
needs: [base-images, language-images]
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v2
with:
name: firmware
path: ./mv_firmware
- name: Display structure of downloaded files
run: ls -R ./mv_firmware/
- name: Release
uses: softprops/action-gh-release@v1
#if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.run_number }}
files: ./mv_firmware/firmware/*
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Move firmware files in sub-folders
run: |
mkdir -p ./release-firmware/tasmota/languages
mkdir -p ./release-firmware/tasmota32/languages
mkdir -p ./release-firmware/map
[ ! -f ./mv_firmware/map/* ] || mv ./mv_firmware/map/* ./release-firmware/map/
[ ! -f ./mv_firmware/firmware/tasmota.* ] || mv ./mv_firmware/firmware/tasmota.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota4M.* ] || mv ./mv_firmware/firmware/tasmota4M.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-sensors.* ] || mv ./mv_firmware/firmware/tasmota-sensors.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-minimal.bin.gz ] || mv ./mv_firmware/firmware/tasmota-minimal.bin.gz ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-lite.* ] || mv ./mv_firmware/firmware/tasmota-lite.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-ir*.* ] || mv ./mv_firmware/firmware/tasmota-ir*.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-display.* ] || mv ./mv_firmware/firmware/tasmota-display.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-knx.* ] || mv ./mv_firmware/firmware/tasmota-knx.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-zigbee.* ] || mv ./mv_firmware/firmware/tasmota-zigbee.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32solo1*.* ] || mv ./mv_firmware/firmware/tasmota32solo1*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-lvgl.* ] || mv ./mv_firmware/firmware/tasmota32-lvgl.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-zbbrdgpro.* ] || mv ./mv_firmware/firmware/tasmota32-zbbrdgpro.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-nspanel.* ] || mv ./mv_firmware/firmware/tasmota32-nspanel.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/firmware/tasmota32-odroidgo.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32s2*.* ] || mv ./mv_firmware/firmware/tasmota32s2*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32s3*.* ] || mv ./mv_firmware/firmware/tasmota32s3*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-safeboot* ] || mv ./mv_firmware/firmware/tasmota32-safeboot* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-* ] || mv ./mv_firmware/firmware/tasmota32-* ./release-firmware/tasmota32/languages/
[ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./release-firmware/tasmota32/languages/
[ ! -f ./mv_firmware/firmware/tasmota-minimal.bin ] || rm -rf ./mv_firmware/firmware/tasmota-minimal.bin
[ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./release-firmware/tasmota/languages/
- name: Display files to transfer
run: ls -R ./*
- name: Push Firmware files to tmp_copy repo
uses: Jason2866/copy_file_to_another_repo_action@main
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
with:
source_file: 'release-firmware'
destination_repo: 'arendst/tmp_copy'
destination_branch: 'firmware'
user_email: 'github-actions@github.com'
user_name: 'github-actions'
Start_final_copy:
needs: Upload
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Creat trigger.txt
run: |
echo ${GITHUB_SHA} &> trigger.txt
echo "$(<trigger.txt)"
- name: Push trigger.txt to start workflow copy in tmp repo
uses: Jason2866/copy_file_to_another_repo_action@main
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
with:
source_file: 'trigger.txt'
destination_repo: 'arendst/tmp_copy'
destination_branch: 'action-master'
user_email: 'github-actions@github.com'
user_name: 'github-actions'
name: Build_firmware_master
on:
push:
branches: master
paths-ignore:
- '.github/**' # Ignore changes towards the .github directory
- '**.md' # Do no build if *.md files changes
# Ensures that only one deploy task per branch/environment will run at a time.
concurrency:
group: environment-${{ github.ref }}
cancel-in-progress: true
jobs:
base-images:
runs-on: ubuntu-latest
if: github.repository == 'arendst/Tasmota'
continue-on-error: true
strategy:
matrix:
variant:
- tasmota
- tasmota4M
- tasmota-minimal
- tasmota-display
- tasmota-ir
- tasmota-knx
- tasmota-lite
- tasmota-sensors
- tasmota-zbbridge
- tasmota-zigbee
- tasmota32
- tasmota32-zbbrdgpro
- tasmota32-webcam
- tasmota32-bluetooth
- tasmota32-nspanel
- tasmota32-display
- tasmota32-ir
- tasmota32-lvgl
- tasmota32c3
- tasmota32c3cdc
- tasmota32s2
- tasmota32s2cdc
- tasmota32s3
- tasmota32s3cdc
- tasmota32solo1
- tasmota32solo1-safeboot
- tasmota32-safeboot
- tasmota32c3-safeboot
- tasmota32c3cdc-safeboot
- tasmota32s2-safeboot
- tasmota32s2cdc-safeboot
- tasmota32s3-safeboot
- tasmota32s3cdc-safeboot
steps:
- uses: actions/checkout@v3
with:
ref: master
- name: Set up Python
uses: actions/setup-python@v2
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
language-images:
runs-on: ubuntu-latest
if: github.repository == 'arendst/Tasmota'
continue-on-error: true
strategy:
matrix:
variant: [ tasmota, tasmota32 ]
language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ]
steps:
- uses: actions/checkout@v3
with:
ref: master
- name: Set up Python
uses: actions/setup-python@v2
- name: Install dependencies
run: |
pip install -U platformio
- name: Run PlatformIO
run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
- uses: actions/upload-artifact@v2
with:
name: firmware
path: ./build_output
Upload:
needs: [base-images, language-images]
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v2
with:
name: firmware
path: ./mv_firmware
- name: Display structure of downloaded files
run: ls -R ./mv_firmware/
- name: Release
uses: softprops/action-gh-release@v1
#if: startsWith(github.ref, 'refs/tags/')
with:
tag_name: ${{ github.run_number }}
files: ./mv_firmware/firmware/*
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Move firmware files in sub-folders
run: |
mkdir -p ./release-firmware/tasmota/languages
mkdir -p ./release-firmware/tasmota32/languages
mkdir -p ./release-firmware/map
[ ! -f ./mv_firmware/map/* ] || mv ./mv_firmware/map/* ./release-firmware/map/
[ ! -f ./mv_firmware/firmware/tasmota.* ] || mv ./mv_firmware/firmware/tasmota.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota4M.* ] || mv ./mv_firmware/firmware/tasmota4M.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-sensors.* ] || mv ./mv_firmware/firmware/tasmota-sensors.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-minimal.bin.gz ] || mv ./mv_firmware/firmware/tasmota-minimal.bin.gz ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-lite.* ] || mv ./mv_firmware/firmware/tasmota-lite.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-ir*.* ] || mv ./mv_firmware/firmware/tasmota-ir*.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-display.* ] || mv ./mv_firmware/firmware/tasmota-display.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-knx.* ] || mv ./mv_firmware/firmware/tasmota-knx.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota-zigbee.* ] || mv ./mv_firmware/firmware/tasmota-zigbee.* ./release-firmware/tasmota/
[ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32solo1*.* ] || mv ./mv_firmware/firmware/tasmota32solo1*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-lvgl.* ] || mv ./mv_firmware/firmware/tasmota32-lvgl.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-zbbrdgpro.* ] || mv ./mv_firmware/firmware/tasmota32-zbbrdgpro.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-nspanel.* ] || mv ./mv_firmware/firmware/tasmota32-nspanel.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/firmware/tasmota32-odroidgo.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32s2*.* ] || mv ./mv_firmware/firmware/tasmota32s2*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32s3*.* ] || mv ./mv_firmware/firmware/tasmota32s3*.* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-safeboot* ] || mv ./mv_firmware/firmware/tasmota32-safeboot* ./release-firmware/tasmota32/
[ ! -f ./mv_firmware/firmware/tasmota32-* ] || mv ./mv_firmware/firmware/tasmota32-* ./release-firmware/tasmota32/languages/
[ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./release-firmware/tasmota32/languages/
[ ! -f ./mv_firmware/firmware/tasmota-minimal.bin ] || rm -rf ./mv_firmware/firmware/tasmota-minimal.bin
[ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./release-firmware/tasmota/languages/
- name: Display files to transfer
run: ls -R ./*
- name: Push Firmware files to tmp_copy repo
uses: Jason2866/copy_file_to_another_repo_action@main
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
with:
source_file: 'release-firmware'
destination_repo: 'arendst/tmp_copy'
destination_branch: 'firmware'
user_email: 'github-actions@github.com'
user_name: 'github-actions'
Start_final_copy:
needs: Upload
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Creat trigger.txt
run: |
echo ${GITHUB_SHA} &> trigger.txt
echo "$(<trigger.txt)"
- name: Push trigger.txt to start workflow copy in tmp repo
uses: Jason2866/copy_file_to_another_repo_action@main
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
with:
source_file: 'trigger.txt'
destination_repo: 'arendst/tmp_copy'
destination_branch: 'action-master'
user_email: 'github-actions@github.com'
user_name: 'github-actions'

View File

@ -1,7 +1,20 @@
# Changelog
All notable changes to this project will be documented in this file.
## [Unreleased] - Development
## [Released]
## [12.1.1] 20220825
- Release Patricia
## [12.1.0.1] 20220825
### Fixed
- RTC not detected when lights are present (#16242)
- DNS lookup for .local domains (#16273)
- Button response delay regression from v12.0.2.4 (#16319)
- Lost module name in GUI regression from v12.0.2.4 - 20220803 (#16324)
## [12.1.0] 20220818
- Release Patricia
## [12.0.2.4] 20220818
### Added
@ -25,8 +38,6 @@ All notable changes to this project will be documented in this file.
- Fixed IR crash on ESP32 (#16173)
- Zigbee fix Tuya for writing attributes
### Removed
## [12.0.2.3] 20220716
### Added
- Support for Sonoff POWR3xxD and THR3xxD (#15856)
@ -38,7 +49,7 @@ All notable changes to this project will be documented in this file.
- Driver DHT v6 consolidation for both ESP8266 and ESP32 to support SI7021, THS01 and MS01 on ESP32 (#15856)
- Tasmota ESP32 Arduino core from v2.0.3 to v2.0.4 (#15940)
## [12.0.2.2]
## [12.0.2.2] 20220701
### Added
- Command ``GlobalTemp2 1..250`` to select Global Temperature source indexed from teleperiod occurance data (#15834)
- Command ``GlobalHum2 1..250`` to select Global Humidity source indexed from teleperiod occurance data (#15834)
@ -51,8 +62,6 @@ All notable changes to this project will be documented in this file.
### Fixed
- ESP32 SendMail not working over ethernet (#15794)
## [Released]
## [12.0.2] 20220620
- Release Paul

View File

@ -18,7 +18,7 @@ See [CHANGELOG.md](https://github.com/arendst/Tasmota/blob/development/tasmota/C
## Development
[![Dev Version](https://img.shields.io/badge/development%20version-v11.0.x.x-blue.svg)](https://github.com/arendst/Tasmota)
[![Dev Version](https://img.shields.io/badge/development%20version-v12.1.x.x-blue.svg)](https://github.com/arendst/Tasmota)
[![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://ota.tasmota.com/tasmota/)
[![Tasmota CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22)
[![Tasmota ESP32 CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20ESP32%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22)

View File

@ -31,7 +31,7 @@ Firmware binaries can be downloaded from http://ota.tasmota.com/tasmota/release/
## Development
[![Dev Version](https://img.shields.io/badge/development%20version-v12.0.x.x-blue.svg)](https://github.com/arendst/Tasmota)
[![Dev Version](https://img.shields.io/badge/development%20version-v12.1.x.x-blue.svg)](https://github.com/arendst/Tasmota)
[![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://ota.tasmota.com/tasmota/)
[![Tasmota CI](https://github.com/arendst/Tasmota/actions/workflows/build_all_the_things.yml/badge.svg)](https://github.com/arendst/Tasmota/actions/workflows/build_all_the_things.yml)
[![Build_development](https://github.com/arendst/Tasmota/actions/workflows/Tasmota_build_devel.yml/badge.svg)](https://github.com/arendst/Tasmota/actions/workflows/Tasmota_build_devel.yml)

View File

@ -72,7 +72,7 @@ Latest released binaries can be downloaded from
- http://ota.tasmota.com/tasmota/release
Historical binaries can be downloaded from
- http://ota.tasmota.com/tasmota/release-12.0.2
- http://ota.tasmota.com/tasmota/release-12.1.1
The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz``
@ -97,7 +97,7 @@ Latest released binaries can be downloaded from
- http://ota.tasmota.com/tasmota32/release
Historical binaries can be downloaded from
- http://ota.tasmota.com/tasmota32/release-12.0.2
- http://ota.tasmota.com/tasmota32/release-12.1.1
The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota32/release/tasmota32.bin``
@ -107,7 +107,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
[Complete list](BUILDS.md) of available feature and sensors.
## Changelog v12.0.2.4
## Changelog v12.1.1 Patricia
### Added
- Command ``SetOption45 1..250`` to change default bistable latching relay pulse length of 40 milliseconds
- Command ``SetOption144 1`` includes a timestamp in zigbee `ZbReceived` messages
@ -137,5 +137,10 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
### Fixed
- Restore EnergyToday after using command ``restart 2`` and power cycle [#16118](https://github.com/arendst/Tasmota/issues/16118)
- ESP32 SendMail not working over ethernet [#15794](https://github.com/arendst/Tasmota/issues/15794)
- RTC not detected when lights are present [#16242](https://github.com/arendst/Tasmota/issues/16242)
- DNS lookup for .local domains [#16273](https://github.com/arendst/Tasmota/issues/16273)
- Button response delay regression from v12.0.2.4 [#16319](https://github.com/arendst/Tasmota/issues/16319)
- Lost module name in GUI regression from v12.0.2.4 - 20220803 [#16324](https://github.com/arendst/Tasmota/issues/16324)
### Removed
- Arduino IDE support

View File

@ -70,7 +70,6 @@
#include "driver/ledc.h"
#include "sensor.h"
#include "sys/time.h"
#include "sdkconfig.h"
#ifdef __cplusplus
extern "C" {
@ -92,19 +91,6 @@ typedef enum {
CAMERA_FB_IN_DRAM /*!< Frame buffer is placed in internal DRAM */
} camera_fb_location_t;
#if CONFIG_CAMERA_CONVERTER_ENABLED
/**
* @brief Camera RGB\YUV conversion mode
*/
typedef enum {
CONV_DISABLE,
RGB565_TO_YUV422,
YUV422_TO_RGB565,
YUV422_TO_YUV420
} camera_conv_mode_t;
#endif
/**
* @brief Configuration structure for camera initialization
*/
@ -138,9 +124,6 @@ typedef struct {
size_t fb_count; /*!< Number of frame buffers to be allocated. If more than one, then each frame will be acquired (double speed) */
camera_fb_location_t fb_location; /*!< The location where the frame buffer will be allocated */
camera_grab_mode_t grab_mode; /*!< When buffers should be filled */
#if CONFIG_CAMERA_CONVERTER_ENABLED
camera_conv_mode_t conv_mode; /*!< RGB<->YUV Conversion mode */
#endif
} camera_config_t;
/**

View File

@ -26,10 +26,6 @@ typedef enum {
GC2145_PID = 0x2145,
GC032A_PID = 0x232a,
GC0308_PID = 0x9b,
BF3005_PID = 0x30,
BF20A6_PID = 0x20a6,
SC101IOT_PID = 0xda4a,
SC030IOT_PID = 0x9a46,
} camera_pid_t;
typedef enum {
@ -42,10 +38,6 @@ typedef enum {
CAMERA_GC2145,
CAMERA_GC032A,
CAMERA_GC0308,
CAMERA_BF3005,
CAMERA_BF20A6,
CAMERA_SC101IOT,
CAMERA_SC030IOT,
CAMERA_MODEL_MAX,
CAMERA_NONE,
} camera_model_t;
@ -60,16 +52,11 @@ typedef enum {
GC2145_SCCB_ADDR = 0x3C,// 0x78 >> 1
GC032A_SCCB_ADDR = 0x21,// 0x42 >> 1
GC0308_SCCB_ADDR = 0x21,// 0x42 >> 1
BF3005_SCCB_ADDR = 0x6E,
BF20A6_SCCB_ADDR = 0x6E,
SC101IOT_SCCB_ADDR = 0x68,// 0xd0 >> 1
SC030IOT_SCCB_ADDR = 0x68,// 0xd0 >> 1
} camera_sccb_addr_t;
typedef enum {
PIXFORMAT_RGB565, // 2BPP/RGB565
PIXFORMAT_YUV422, // 2BPP/YUV422
PIXFORMAT_YUV420, // 1.5BPP/YUV420
PIXFORMAT_GRAYSCALE, // 1BPP/GRAYSCALE
PIXFORMAT_JPEG, // JPEG/COMPRESSED
PIXFORMAT_RGB888, // 3BPP/RGB888

View File

@ -371,7 +371,7 @@ enum LightSubtypes { LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB, LST_RGBW, LS
enum LightTypes { LT_BASIC, LT_PWM1, LT_PWM2, LT_PWM3, LT_PWM4, LT_PWM5, LT_PWM6, LT_PWM7,
LT_NU8, LT_SERIAL1, LT_SERIAL2, LT_RGB, LT_RGBW, LT_RGBWC, LT_NU14, LT_NU15 }; // Do not insert new fields
enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FUNC_PRE_INIT, FUNC_INIT,
enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_I2C_INIT, FUNC_MODULE_INIT, FUNC_PRE_INIT, FUNC_INIT,
FUNC_LOOP, FUNC_EVERY_50_MSECOND, FUNC_EVERY_100_MSECOND, FUNC_EVERY_200_MSECOND, FUNC_EVERY_250_MSECOND, FUNC_EVERY_SECOND,
FUNC_SAVE_SETTINGS, FUNC_SAVE_AT_MIDNIGHT, FUNC_SAVE_BEFORE_RESTART,
FUNC_AFTER_TELEPERIOD, FUNC_JSON_APPEND, FUNC_WEB_SENSOR, FUNC_WEB_COL_SENSOR, FUNC_COMMAND, FUNC_COMMAND_SENSOR, FUNC_COMMAND_DRIVER,

View File

@ -20,6 +20,6 @@
#ifndef _TASMOTA_VERSION_H_
#define _TASMOTA_VERSION_H_
const uint32_t VERSION = 0x0C000204; // 12.0.2.4
const uint32_t VERSION = 0x0C010100; // 12.1.1.0
#endif // _TASMOTA_VERSION_H_

View File

@ -43,9 +43,7 @@ struct BUTTON {
uint16_t hold_timer[MAX_KEYS] = { 0 }; // Timer for button hold
uint16_t dual_code = 0; // Sonoff dual received code
uint8_t debounce_phase = 0; // 0 = regular iteration; 1 = read data for debouncing only
uint8_t last_state[MAX_KEYS]; // Last button states
uint8_t last_state_between[MAX_KEYS]; // Last button states at the half time read
uint8_t window_timer[MAX_KEYS] = { 0 }; // Max time between button presses to record press count
uint8_t press_counter[MAX_KEYS] = { 0 }; // Number of button presses within Button.window_timer
@ -93,7 +91,6 @@ void ButtonInit(void) {
#endif // ESP8266
for (uint32_t i = 0; i < MAX_KEYS; i++) {
Button.last_state[i] = NOT_PRESSED;
Button.last_state_between[i] = NOT_PRESSED;
if (PinUsed(GPIO_KEY1, i)) {
Button.present++;
#ifdef ESP8266
@ -207,18 +204,6 @@ void ButtonHandler(void) {
button = AdcGetButton(Pin(GPIO_ADC_BUTTON_INV, button_index));
}
#endif // USE_ADC
if (Button.debounce_phase == 1) {
// adjust values
Button.last_state_between[button_index] = button;
continue;
}
if (button != Button.last_state_between[button_index]) {
// no clean signal, just keep the previous one
button = Button.last_state[button_index];
}
if (button_present) {
XdrvMailbox.index = button_index;
XdrvMailbox.payload = button;
@ -389,8 +374,6 @@ void ButtonHandler(void) {
}
Button.last_state[button_index] = button;
}
Button.debounce_phase = (Button.debounce_phase + 1) & 1;
}
/*
@ -426,7 +409,7 @@ void MqttButtonTopic(uint32_t button_id, uint32_t action, uint32_t hold) {
void ButtonLoop(void) {
if (Button.present) {
if (TimeReached(Button.debounce)) {
SetNextTimeInterval(Button.debounce, Settings->button_debounce / 2);
SetNextTimeInterval(Button.debounce, Settings->button_debounce); // ButtonDebounce (50)
ButtonHandler();
}
}

View File

@ -2173,6 +2173,8 @@ void GpioInit(void)
#endif
#endif // USE_I2C
XdrvCall(FUNC_I2C_INIT); // Init RTC
TasmotaGlobal.devices_present = 0;
TasmotaGlobal.light_type = LT_BASIC; // Use basic PWM control if SetOption15 = 0

View File

@ -807,14 +807,25 @@ void wifiKeepAlive(void) {
#endif // ESP8266
bool WifiHostByName(const char* aHostname, IPAddress& aResult) {
// DnsClient can't do one-shot mDNS queries so use WiFi.hostByName() for *.local
size_t hostname_len = strlen(aHostname);
if (strstr_P(aHostname, PSTR(".local")) == &aHostname[hostname_len] - 6) {
if (WiFi.hostByName(aHostname, aResult)) {
// Host name resolved
if (0xFFFFFFFF != (uint32_t)aResult) {
return true;
}
}
} else {
// Use this instead of WiFi.hostByName or connect(host_name,.. to block less if DNS server is not found
uint32_t dns_address = (!TasmotaGlobal.global_state.eth_down) ? Settings->eth_ipv4_address[3] : Settings->ipv4_address[3];
DnsClient.begin((IPAddress)dns_address);
if (DnsClient.getHostByName(aHostname, aResult) != 1) {
AddLog(LOG_LEVEL_DEBUG, PSTR("DNS: Unable to resolve '%s'"), aHostname);
return false;
uint32_t dns_address = (!TasmotaGlobal.global_state.eth_down) ? Settings->eth_ipv4_address[3] : Settings->ipv4_address[3];
DnsClient.begin((IPAddress)dns_address);
if (1 == DnsClient.getHostByName(aHostname, aResult)) {
return true;
}
}
return true;
AddLog(LOG_LEVEL_DEBUG, PSTR("DNS: Unable to resolve '%s'"), aHostname);
return false;
}
bool WifiDnsPresent(const char* aHostname) {

View File

@ -602,7 +602,7 @@ void StartWebserver(int type, IPAddress ipweb)
#endif // Not FIRMWARE_MINIMAL
if (!Web.initial_config) {
Web.initial_config = !strlen(SettingsText(SET_STASSID1)) || !strlen(SettingsText(SET_STASSID2));
Web.initial_config = (!strlen(SettingsText(SET_STASSID1)) && !strlen(SettingsText(SET_STASSID2)));
if (Web.initial_config) { AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP "Blank Device - Initial Configuration")); }
}
}

View File

@ -446,7 +446,7 @@ bool Xdrv56(uint8_t function) {
}
#endif // RTC_NTP_SERVER
if (FUNC_MODULE_INIT == function) {
if (FUNC_I2C_INIT == function) {
RtcChipDetect();
}
else if (RtcChip.detected) {