diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6fd0f75..3f605b0 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.4.0 +current_version = 1.4.1 [bumpversion:file:CITATION.cff] search = software version diff --git a/CITATION.cff b/CITATION.cff index 83713a0..703ed78 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -10,7 +10,7 @@ type: software repository-code: "https://github.com/nlesc-recruit/PowerSensor3" license: Apache-2.0 #software version -version: 1.4.0 +version: 1.4.1 authors: - given-names: Leon family-names: Oostrum diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d40b3b..dbbeb5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20.1) -project(PowerSensor3 VERSION 1.4.0) +project(PowerSensor3 VERSION 1.4.1) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-Wall") diff --git a/device/PowerSensor/PowerSensor.ino b/device/PowerSensor/PowerSensor.ino index 583e969..6c0fd33 100644 --- a/device/PowerSensor/PowerSensor.ino +++ b/device/PowerSensor/PowerSensor.ino @@ -9,11 +9,11 @@ #define TIMEOUT 2000 // ms #ifdef STM32F401xC -#define VERSION "F401-1.4.0" +#define VERSION "F401-1.4.1" #elif defined STM32F411xE -#define VERSION "F411-1.4.0" +#define VERSION "F411-1.4.1" #elif defined STM32F407xx -#define VERSION "F407-1.4.0" +#define VERSION "F407-1.4.1" #else #error "Unsupported device" #endif diff --git a/docs/conf.py b/docs/conf.py index 26a27e3..ab1897a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -7,9 +7,9 @@ # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information project = 'PowerSensor 3' -copyright = '2023, Leon Oostrum, John Romein, Ben van Werkhoven, Quinten Twisk, Gijs Schoonderbeek, Steven van der Vlugt' +copyright = '2024, Leon Oostrum, John Romein, Ben van Werkhoven, Quinten Twisk, Gijs Schoonderbeek, Steven van der Vlugt' author = 'Leon Oostrum, John Romein, Ben van Werkhoven, Quinten Twisk, Gijs Schoonderbeek, Steven van der Vlugt' -release = '1.4.0' +release = '1.4.1' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/host/include/PowerSensor.hpp b/host/include/PowerSensor.hpp index d84a450..d70299f 100644 --- a/host/include/PowerSensor.hpp +++ b/host/include/PowerSensor.hpp @@ -17,7 +17,7 @@ static const unsigned MAX_SENSORS = 8; static const unsigned MAX_PAIRS = MAX_SENSORS / 2; static const float VOLTAGE = 3.3; static const unsigned MAX_LEVEL = 1023; -static const std::string POWERSENSOR_VERSION = "1.4.0"; +static const std::string POWERSENSOR_VERSION = "1.4.1"; /** * @brief Struct containing values of all active sensors at a single point in time diff --git a/python/PyPowerSensor.cc b/python/PyPowerSensor.cc index a59f7b1..e072fd8 100644 --- a/python/PyPowerSensor.cc +++ b/python/PyPowerSensor.cc @@ -6,7 +6,7 @@ namespace py = pybind11; PYBIND11_MODULE(powersensor, m) { - m.attr("__version__") = "1.4.0"; + m.attr("__version__") = "1.4.1"; m.attr("MAX_PAIRS") = py::int_(PowerSensor3::MAX_PAIRS);