mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-29 13:46:37 +00:00
Merge remote-tracking branch 'Tasmota/development' into development
This commit is contained in:
commit
b19a3d694a
@ -39,7 +39,6 @@ build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_I
|
||||
build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR_CUSTOM
|
||||
|
||||
[env:tasmota-zbbridge]
|
||||
board_build.f_cpu = 160000000L
|
||||
build_flags = ${common.build_flags} -DFIRMWARE_ZBBRIDGE
|
||||
|
||||
[env:tasmota-BG]
|
||||
|
@ -1,6 +1,8 @@
|
||||
/*
|
||||
tasmota_configurations.h - Configurations for Tasmota
|
||||
|
||||
Copyright (C) 2020 Theo Arends
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
@ -666,7 +668,6 @@
|
||||
#undef USE_DEBUG_DRIVER // Disable debug code
|
||||
#endif // FIRMWARE_LITE
|
||||
|
||||
|
||||
/*********************************************************************************************\
|
||||
* [tasmota-minimal.bin]
|
||||
* Provide the smallest image possible while still enabling a webserver for intermediate image load
|
||||
@ -831,5 +832,4 @@
|
||||
#include "tasmota_configurations_ESP32.h"
|
||||
#endif // ESP32
|
||||
|
||||
|
||||
#endif // _TASMOTA_CONFIGURATIONS_H_
|
||||
|
Loading…
x
Reference in New Issue
Block a user