jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-30 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Tasmota/development' into development

Browse Source
This commit is contained in:
Jason2866 2020-08-17 20:03:41 +02:00
commit b19a3d694a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformio_tasmota_env.ini
View File

@ -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 build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_IR_CUSTOM
[env:tasmota-zbbridge] [env:tasmota-zbbridge]
board_build.f_cpu = 160000000L
build_flags = ${common.build_flags} -DFIRMWARE_ZBBRIDGE build_flags = ${common.build_flags} -DFIRMWARE_ZBBRIDGE
[env:tasmota-BG] [env:tasmota-BG]

4
tasmota/tasmota_configurations.h
View File

@ -1,6 +1,8 @@
/* /*
tasmota_configurations.h - Configurations for Tasmota tasmota_configurations.h - Configurations for Tasmota
Copyright (C) 2020 Theo Arends Copyright (C) 2020 Theo Arends
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
@ -666,7 +668,6 @@
#undef USE_DEBUG_DRIVER // Disable debug code #undef USE_DEBUG_DRIVER // Disable debug code
#endif // FIRMWARE_LITE #endif // FIRMWARE_LITE
/*********************************************************************************************\ /*********************************************************************************************\
* [tasmota-minimal.bin] * [tasmota-minimal.bin]
* Provide the smallest image possible while still enabling a webserver for intermediate image load * Provide the smallest image possible while still enabling a webserver for intermediate image load
@ -831,5 +832,4 @@
#include "tasmota_configurations_ESP32.h" #include "tasmota_configurations_ESP32.h"
#endif // ESP32 #endif // ESP32
#endif // _TASMOTA_CONFIGURATIONS_H_ #endif // _TASMOTA_CONFIGURATIONS_H_