From 84e06a1df9e0935de17049b9b24fae1c40e0d69e Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 31 Aug 2018 16:38:34 +0200 Subject: [PATCH] Prep release --- sonoff/sonoff_version.h | 2 +- sonoff/user_config.h | 23 ++--------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h index 72634caa1..1bf322288 100644 --- a/sonoff/sonoff_version.h +++ b/sonoff/sonoff_version.h @@ -20,7 +20,7 @@ #ifndef _SONOFF_VERSION_H_ #define _SONOFF_VERSION_H_ -#define VERSION 0x0601010E +#define VERSION 0x06020000 #define D_PROGRAMNAME "Sonoff-Tasmota" #define D_AUTHOR "Theo Arends" diff --git a/sonoff/user_config.h b/sonoff/user_config.h index 0471ff768..9c926e410 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -300,32 +300,13 @@ // #define USE_MPR121 // Enable MPR121 controller (I2C addresses 0x5A, 0x5B, 0x5C and 0x5D) in input mode for touch buttons (+1k3 code) // #define USE_CCS811 // Enable CCS811 sensor (I2C address 0x5A) (+2k2 code) // #define USE_MPU6050 // Enable MPU6050 sensor (I2C address 0x68 AD0 low or 0x69 AD0 high) (+2k6 code) - -// #define USE_DISPLAY // Add I2C Display Support (+2k code) - #define USE_DISPLAY_MODES1TO5 // Enable display mode 1 to 5 in addition to mode 0 - #define USE_DISPLAY_LCD // [DisplayModel 1] Enable Lcd display (I2C addresses 0x27 and 0x3F) (+6k code) - #define USE_DISPLAY_SSD1306 // [DisplayModel 2] Enable SSD1306 Oled 128x64 display (I2C addresses 0x3C and 0x3D) (+16k code) - #define USE_DISPLAY_MATRIX // [DisplayModel 3] Enable 8x8 Matrix display (I2C adresseses see below) (+11k code) - #define MTX_ADDRESS1 0x71 // [DisplayAddress1] I2C address of first 8x8 matrix module - #define MTX_ADDRESS2 0x74 // [DisplayAddress2] I2C address of second 8x8 matrix module - #define MTX_ADDRESS3 0x75 // [DisplayAddress3] I2C address of third 8x8 matrix module - #define MTX_ADDRESS4 0x72 // [DisplayAddress4] I2C address of fourth 8x8 matrix module - #define MTX_ADDRESS5 0x73 // [DisplayAddress5] I2C address of fifth 8x8 matrix module - #define MTX_ADDRESS6 0x76 // [DisplayAddress6] I2C address of sixth 8x8 matrix module - #define MTX_ADDRESS7 0x00 // [DisplayAddress7] I2C address of seventh 8x8 matrix module - #define MTX_ADDRESS8 0x00 // [DisplayAddress8] I2C address of eigth 8x8 matrix module - #endif // USE_I2C // -- SPI sensors --------------------------------- -#define USE_SPI // SPI using library TasmotaTFT +//#define USE_SPI // SPI using library TasmotaTFT #ifdef USE_SPI - #ifndef USE_DISPLAY - #define USE_DISPLAY // Add SPI Display support for 320x240 and 480x320 TFT - #endif - #define USE_DISPLAY_ILI9341 // [DisplayModel 4] Enable ILI9341 Tft 480x320 display (+19k code) -// #define USE_DISPLAY_EPAPER // [DisplayModel 5] Enable e-paper display (+19k code) + #endif // USE_SPI // -- Serial sensors ------------------------------