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

Change version representation

Browse Source 
Change version representation from 1.1.1a to 1.1.1.1 for better change reference
This commit is contained in:
Theo Arends 2018-08-12 14:05:15 +02:00
parent afa2e57e3e
commit 3efb84fb93
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sonoff/_changelog.ino
View File

@ -1,4 +1,7 @@
/* 6.1.1c /* 6.1.1.4
* Change version representation from 1.1.1a to 1.1.1.1 for better change reference
*
* 6.1.1c
* Add iFan02 Fanspeed + and Fanspeed - command options (#3415) * Add iFan02 Fanspeed + and Fanspeed - command options (#3415)
* Fix some Pow R2 and S31 checksum errors (#3425) * Fix some Pow R2 and S31 checksum errors (#3425)
* Change CounterType 1 from milliseconds to microseconds (#3437) * Change CounterType 1 from milliseconds to microseconds (#3437)

10
sonoff/sonoff.ino
View File

@ -25,10 +25,9 @@
- Select IDE Tools - Flash Size: "1M (no SPIFFS)" - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
====================================================*/ ====================================================*/
#define VERSION 0x06010103 // 6.1.1c
// Location specific includes // Location specific includes
#include <core_version.h> // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) #include <core_version.h> // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)
#include "sonoff_version.h" // Sonoff-Tasmota version information
#include "sonoff.h" // Enumeration used in user_config.h #include "sonoff.h" // Enumeration used in user_config.h
#include "user_config.h" // Fixed user configurable options #include "user_config.h" // Fixed user configurable options
#ifdef USE_CONFIG_OVERRIDE #ifdef USE_CONFIG_OVERRIDE
@ -2455,12 +2454,7 @@ void setup()
Serial.println(); Serial.println();
seriallog_level = LOG_LEVEL_INFO; // Allow specific serial messages until config loaded seriallog_level = LOG_LEVEL_INFO; // Allow specific serial messages until config loaded
snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff); snprintf_P(my_version, sizeof(my_version), PSTR("%d.%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff, VERSION & 0xff);
if (VERSION & 0x1f) {
idx = strlen(my_version);
my_version[idx] = 96 + (VERSION & 0x1f);
my_version[idx +1] = 0;
}
#ifdef BE_MINIMAL #ifdef BE_MINIMAL
snprintf_P(my_version, sizeof(my_version), PSTR("%s-" D_JSON_MINIMAL), my_version); snprintf_P(my_version, sizeof(my_version), PSTR("%s-" D_JSON_MINIMAL), my_version);
#endif // BE_MINIMAL #endif // BE_MINIMAL

25
sonoff/sonoff_version.h Normal file
View File

@ -0,0 +1,25 @@
/*
sonoff_version.h - Version header file for Sonoff-Tasmota
Copyright (C) 2018 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 <http://www.gnu.org/licenses/>.
*/
#ifndef _SONOFF_VERSION_H_
#define _SONOFF_VERSION_H_
#define VERSION 0x06010104
#endif // _SONOFF_VERSION_H_