From d2a9808b57d5eaca4c1015cd89fecae63421108d Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sat, 4 Jul 2020 20:23:15 +0200 Subject: [PATCH] Enable BMP driver in standard image Signed-off-by: Knut Ahlers --- Makefile | 2 +- ...config_override.h => uco_tasmota-minimal.h | 0 uco_tasmota.h | 74 +++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) rename user_config_override.h => uco_tasmota-minimal.h (100%) create mode 100644 uco_tasmota.h diff --git a/Makefile b/Makefile index 50e960d..bb777c6 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ chown: ci: full-clean default build_%: download korvike venv - ./korvike -i user_config_override.h -o tasmota/tasmota/user_config_override.h + ./korvike -i uco_$*.h -o tasmota/tasmota/user_config_override.h cd tasmota && ../venv/bin/platformio run -e $* mkdir -p build cp tasmota/.pioenvs/$*/firmware.bin build/$*.bin diff --git a/user_config_override.h b/uco_tasmota-minimal.h similarity index 100% rename from user_config_override.h rename to uco_tasmota-minimal.h diff --git a/uco_tasmota.h b/uco_tasmota.h new file mode 100644 index 0000000..c28112d --- /dev/null +++ b/uco_tasmota.h @@ -0,0 +1,74 @@ +/* + user_config_override.h - user configuration overrides my_user_config.h 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 + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _USER_CONFIG_OVERRIDE_H_ +#define _USER_CONFIG_OVERRIDE_H_ + +// force the compiler to show a warning to confirm that this file is included +#warning **** user_config_override.h: Using Settings from this File **** + +/*****************************************************************************************************\ + * USAGE: + * To modify the stock configuration without changing the my_user_config.h file: + * (1) copy this file to "user_config_override.h" (It will be ignored by Git) + * (2) define your own settings below + * (3) for platformio: + * define USE_CONFIG_OVERRIDE as a build flags. + * ie1 : export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE' + * for Arduino IDE: + * enable define USE_CONFIG_OVERRIDE in my_user_config.h + ****************************************************************************************************** + * ATTENTION: + * - Changes to SECTION1 PARAMETER defines will only override flash settings if you change define CFG_HOLDER. + * - Expect compiler warnings when no ifdef/undef/endif sequence is used. + * - You still need to update my_user_config.h for major define USE_MQTT_TLS. + * - All parameters can be persistent changed online using commands via MQTT, WebConsole or Serial. +\*****************************************************************************************************/ + + +// -- Master parameter control -------------------- +#undef CFG_HOLDER +#define CFG_HOLDER 4617 // [Reset 1] Change this value to load SECTION1 configuration parameters to flash + +// -- Setup your own Wifi settings --------------- +#undef STA_SSID1 +#define STA_SSID1 "{{ env "WIFI_SSID" }}" // [Ssid1] Wifi SSID + +#undef STA_PASS1 +#define STA_PASS1 "{{ env "WIFI_PASS" }}" // [Password1] Wifi password + +// -- Setup your own MQTT settings --------------- +#undef MQTT_HOST +#define MQTT_HOST "{{ env "MQTT_HOST" }}" // [MqttHost] + +#undef MQTT_PORT +#define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) + +#undef MQTT_USER +#define MQTT_USER "{{ env "MQTT_USER" }}" // [MqttUser] MQTT user + +#undef MQTT_PASS +#define MQTT_PASS "{{ env "MQTT_PASS" }}" // [MqttPassword] MQTT password + +// -- Add more modules ---------------------------- + +#define USE_BMP + + +#endif // _USER_CONFIG_OVERRIDE_H_