From 16249914c2cc87d7802278d32f75ef3566b17d40 Mon Sep 17 00:00:00 2001 From: BlackMark Date: Sat, 16 May 2020 17:43:55 +0200 Subject: [PATCH] Adapt to moved type submodule --- ds3231.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ds3231.hpp b/ds3231.hpp index 32d5101..3d6c5d8 100644 --- a/ds3231.hpp +++ b/ds3231.hpp @@ -5,7 +5,7 @@ #include #include "../i2c/i2c.hpp" -#include "../type/type.hpp" +#include "../util/type.hpp" #include "registers.hpp" @@ -165,7 +165,7 @@ class DS3231 { } else if constexpr (Address == TEMP_REG_ADDR) { return readRegisterHelper(); } else { - static_assert(type::always_false_v, "Invalid register address"); + static_assert(util::always_false_v, "Invalid register address"); } } @@ -180,21 +180,21 @@ class DS3231 { static_assert(StartOffset + WRITE_SIZE <= sizeof(Register), "Writing out of bounds"); if constexpr (Address == TIME_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else if constexpr (Address == ALARM1_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else if constexpr (Address == ALARM2_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else if constexpr (Address == CONTROL_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else if constexpr (Address == CONTROL_STATUS_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else if constexpr (Address == AGING_OFFSET_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else if constexpr (Address == TEMP_REG_ADDR) { - static_assert(type::is_same_v, "Invalid register type"); + static_assert(util::is_same_v, "Invalid register type"); } else { - static_assert(type::always_false_v, "Invalid register address"); + static_assert(util::always_false_v, "Invalid register address"); } I2cDriver::template start(false);