From 7eeacd15969c664370ae0729fbb453fc8f425701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xose=20P=C3=A9rez?= <xose.perez@gmail.com>
Date: Thu, 2 Feb 2017 11:38:23 +0100
Subject: [PATCH] Version bump. Changelog update.

---
 CHANGELOG.md                  | 19 +++++++++++++------
 README.md                     |  4 ++--
 code/espurna/config/version.h |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd9ab6b7..f6ac4e68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.5.3] 2017-02-02
+### Fixed
+- Issue #50 and #54. Fixed domoticz MQTT message format
+
+### Added
+- Energy calculation and aggregation. API entry points and MQTT messages.
+
 ## [1.5.2] 2017-01-29
 ### Fixed
 - Fix bug in emon topic payload
@@ -32,8 +39,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - MQTT will topic
 - Crash with HLW812 interrupts while trying to create a WIFI connection
 - Issue #20 Better inline documentation for Alexa and Domoticz default settings
-- #39 Fixed autoconnect issue with static IP (fixed in JustWifi library)
-- #41 Added password requirements to initial password change page
+- Issue #39 Fixed autoconnect issue with static IP (fixed in JustWifi library)
+- Issue #41 Added password requirements to initial password change page
 
 ### Changed
 - Changed LED pattern for WIFI notifications (shorter pulses)
@@ -43,7 +50,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Adding current, voltage, apparent and reactive power reports to Sonoff POW (Web & MQTT)
 
 ### Fixed
-- #35 Fixed frequent MQTT connection drops after WIFI reconnect
+- Issue #35 Fixed frequent MQTT connection drops after WIFI reconnect
 - Defer wifi disconnection from web interface to allow request to return
 
 ### Changed
@@ -52,14 +59,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.4.3] 2017-01-11
 ### Fixed
-- #6 Using forked Time library to prevent conflict with Arduino Core for ESP8266 time.h file in windows machines
+- Issue #6 Using forked Time library to prevent conflict with Arduino Core for ESP8266 time.h file in windows machines
 
 ## [1.4.2] 2017-01-09
 ### Added
 - Support for inverse logic relays
 
 ### Fixed
-- Fixed error in relay identification from MQTT messages (issue #31)
+- Issue #31. Fixed error in relay identification from MQTT messages
 
 ## [1.4.1] 2017-01-05
 ### Added
@@ -75,7 +82,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Support for static IP connections
 
 ### Fixed
-- Enforce minimum password strength in web interface (#16)
+- Issue #16. Enforce minimum password strength in web interface
 
 ### Changed
 - Using default client_id provided by AsyncMqttClient
diff --git a/README.md b/README.md
index 3a39c176..44293698 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8266 based smart switch
 It was originally developed with the **[IteadStudio Sonoff](https://www.itead.cc/sonoff-wifi-wireless-switch.html)** in mind but now it supports a growing number of ESP8266-based boards.
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
-**Current Release Version is 1.5.2**, read the [changelog](CHANGELOG.md).
+**Current Release Version is 1.5.3**, read the [changelog](CHANGELOG.md).
 
 ## Features
 
@@ -64,7 +64,7 @@ For more information please refer to the [ESPurna Wiki](https://bitbucket.org/xo
 
 ## License
 
-Copyright (C) 2016-2017 by Xose P�rez (@xoseperez)
+Copyright (C) 2016-2017 by Xose Pérez (@xoseperez)
 
 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
diff --git a/code/espurna/config/version.h b/code/espurna/config/version.h
index 160953cf..e7c0c185 100644
--- a/code/espurna/config/version.h
+++ b/code/espurna/config/version.h
@@ -1,4 +1,4 @@
 #define APP_NAME                "ESPurna"
-#define APP_VERSION             "1.5.2"
+#define APP_VERSION             "1.5.3"
 #define APP_AUTHOR              "xose.perez@gmail.com"
 #define APP_WEBSITE             "http://tinkerman.cat"