From 6f63a62a8d648d780ffaefc58f18a118099ded62 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 22:31:32 +0200
Subject: [PATCH] Add lint check for integer constants (#775)

---
 esphome/components/sim800l/sim800l.h |  4 ++--
 esphome/core/preferences.cpp         | 10 +++++-----
 script/ci-custom.py                  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index 17cd0111fe..0a3f4b463b 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -4,11 +4,11 @@
 #include "esphome/components/uart/uart.h"
 #include "esphome/core/automation.h"
 
-#define SIM800L_READ_BUFFER_LENGTH 255
-
 namespace esphome {
 namespace sim800l {
 
+const uint8_t SIM800L_READ_BUFFER_LENGTH = 255;
+
 enum State {
   STATE_IDLE = 0,
   STATE_INIT,
diff --git a/esphome/core/preferences.cpp b/esphome/core/preferences.cpp
index f62a764b7e..2329ed34f5 100644
--- a/esphome/core/preferences.cpp
+++ b/esphome/core/preferences.cpp
@@ -54,15 +54,15 @@ bool ESPPreferenceObject::save_() {
 
 #ifdef ARDUINO_ARCH_ESP8266
 
-#define ESP_RTC_USER_MEM_START 0x60001200
+static const uint32_t ESP_RTC_USER_MEM_START = 0x60001200;
 #define ESP_RTC_USER_MEM ((uint32_t *) ESP_RTC_USER_MEM_START)
-#define ESP_RTC_USER_MEM_SIZE_WORDS 128
-#define ESP_RTC_USER_MEM_SIZE_BYTES ESP_RTC_USER_MEM_SIZE_WORDS * 4
+static const uint32_t ESP_RTC_USER_MEM_SIZE_WORDS = 128;
+static const uint32_t ESP_RTC_USER_MEM_SIZE_BYTES = ESP_RTC_USER_MEM_SIZE_WORDS * 4;
 
 #ifdef USE_ESP8266_PREFERENCES_FLASH
-#define ESP8266_FLASH_STORAGE_SIZE 128
+static const uint32_t ESP8266_FLASH_STORAGE_SIZE = 128;
 #else
-#define ESP8266_FLASH_STORAGE_SIZE 64
+static const uint32_t ESP8266_FLASH_STORAGE_SIZE = 64;
 #endif
 
 static inline bool esp_rtc_user_mem_read(uint32_t index, uint32_t *dest) {
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 5a98bdd20d..f7789f5c79 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -5,6 +5,7 @@ import codecs
 import collections
 import fnmatch
 import os.path
+import re
 import subprocess
 import sys
 import re
@@ -262,7 +263,6 @@ def lint_constants_usage():
         errors.append("Constant {} is defined in {} files. Please move all definitions of the "
                       "constant to const.py (Uses: {})"
                       "".format(highlight(constant), len(uses), ', '.join(uses)))
-    return errors
 
 
 def relative_cpp_search_text(fname, content):