diff --git a/src/lcd/i2clcd.h b/src/lcd/i2clcd.h
index dcd72d7e..42a4d21a 100644
--- a/src/lcd/i2clcd.h
+++ b/src/lcd/i2clcd.h
@@ -29,51 +29,51 @@
 namespace upm
 {
 // commands
-#define LCD_CLEARDISPLAY 0x01
-#define LCD_RETURNHOME 0x02
-#define LCD_ENTRYMODESET 0x04
-#define LCD_DISPLAYCONTROL 0x08
-#define LCD_CURSORSHIFT 0x10
-#define LCD_FUNCTIONSET 0x20
-#define LCD_DATA 0x40
-#define LCD_CMD 0x80
+const uint8_t LCD_CLEARDISPLAY = 0x01;
+const uint8_t LCD_RETURNHOME = 0x02;
+const uint8_t LCD_ENTRYMODESET = 0x04;
+const uint8_t LCD_DISPLAYCONTROL = 0x08;
+const uint8_t LCD_CURSORSHIFT = 0x10;
+const uint8_t LCD_FUNCTIONSET = 0x20;
+const uint8_t LCD_DATA = 0x40;
+const uint8_t LCD_CMD = 0x80;
 
-#define LCD_BACKLIGHT 0x08
-#define LCD_NOBACKLIGHT 0x00
+const uint8_t LCD_BACKLIGHT = 0x08;
+const uint8_t LCD_NOBACKLIGHT = 0x00;
 
 // flags for display entry mode
-#define LCD_ENTRYRIGHT 0x00
-#define LCD_ENTRYLEFT 0x02
-#define LCD_ENTRYSHIFTINCREMENT 0x01
-#define LCD_ENTRYSHIFTDECREMENT 0x00
+const uint8_t LCD_ENTRYRIGHT = 0x00;
+const uint8_t LCD_ENTRYLEFT = 0x02;
+const uint8_t LCD_ENTRYSHIFTINCREMENT = 0x01;
+const uint8_t LCD_ENTRYSHIFTDECREMENT = 0x00;
 
 // flags for display on/off control
-#define LCD_DISPLAYON 0x04
-#define LCD_DISPLAYOFF 0x00
-#define LCD_CURSORON 0x02
-#define LCD_CURSOROFF 0x00
-#define LCD_BLINKON 0x01
-#define LCD_BLINKOFF 0x00
+const uint8_t LCD_DISPLAYON = 0x04;
+const uint8_t LCD_DISPLAYOFF = 0x00;
+const uint8_t LCD_CURSORON = 0x02;
+const uint8_t LCD_CURSOROFF = 0x00;
+const uint8_t LCD_BLINKON = 0x01;
+const uint8_t LCD_BLINKOFF = 0x00;
 
 // flags for display/cursor shift
-#define LCD_DISPLAYMOVE 0x08
-#define LCD_MOVERIGHT 0x04
-#define LCD_MOVELEFT 0x00
+const uint8_t LCD_DISPLAYMOVE = 0x08;
+const uint8_t LCD_MOVERIGHT = 0x04;
+const uint8_t LCD_MOVELEFT = 0x00;
 
 // flags for function set
-#define LCD_8BITMODE 0x10
-#define LCD_4BITMODE 0x00
-#define LCD_2LINE 0x08
-#define LCD_1LINE 0x00
-#define LCD_5x10DOTS 0x04
-#define LCD_5x8DOTS 0x00
+const uint8_t LCD_8BITMODE = 0x10;
+const uint8_t LCD_4BITMODE = 0x00;
+const uint8_t LCD_2LINE = 0x08;
+const uint8_t LCD_1LINE = 0x00;
+const uint8_t LCD_5x10DOTS = 0x04;
+const uint8_t LCD_5x8DOTS = 0x00;
 
 // flags for CGRAM
-#define LCD_SETCGRAMADDR 0x40
+const uint8_t LCD_SETCGRAMADDR = 0x40;
 
-#define LCD_EN 0x04 // Enable bit
-#define LCD_RW 0x02 // Read/Write bit
-#define LCD_RS 0x01 // Register select bit
+const uint8_t LCD_EN = 0x04; // Enable bit
+const uint8_t LCD_RW = 0x02; // Read/Write bit
+const uint8_t LCD_RS = 0x01; // Register select bit
 
 /**
  * @brief i2c LCD display library
diff --git a/src/lcd/ssd.h b/src/lcd/ssd.h
index 71a9f160..860bb153 100644
--- a/src/lcd/ssd.h
+++ b/src/lcd/ssd.h
@@ -26,13 +26,13 @@
 
 namespace upm
 {
-#define DISPLAY_CMD_OFF 0xAE
-#define DISPLAY_CMD_ON 0xAF
+const uint8_t DISPLAY_CMD_OFF = 0xAE;
+const uint8_t DISPLAY_CMD_ON = 0xAF;
 
-#define BASE_LOW_COLUMN_ADDR 0x00
-#define BASE_HIGH_COLUMN_ADDR 0x10
-#define BASE_PAGE_START_ADDR 0xB0
-#define DISPLAY_CMD_MEM_ADDR_MODE 0x20
+const uint8_t BASE_LOW_COLUMN_ADDR = 0x00;
+const uint8_t BASE_HIGH_COLUMN_ADDR = 0x10;
+const uint8_t BASE_PAGE_START_ADDR = 0xB0;
+const uint8_t DISPLAY_CMD_MEM_ADDR_MODE = 0x20;
 
 const uint8_t BasicFont[][8] = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
                                  { 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00 },
diff --git a/src/lcd/ssd1308.h b/src/lcd/ssd1308.h
index cec46867..b8c2569a 100644
--- a/src/lcd/ssd1308.h
+++ b/src/lcd/ssd1308.h
@@ -30,7 +30,7 @@
 
 namespace upm
 {
-#define DISPLAY_CMD_SET_NORMAL_1308 0xA6
+const uint8_t DISPLAY_CMD_SET_NORMAL_1308 = 0xA6;
 
 /**
  * @library i2clcd
diff --git a/src/lcd/ssd1327.h b/src/lcd/ssd1327.h
index 6c4c47ca..17216fc0 100644
--- a/src/lcd/ssd1327.h
+++ b/src/lcd/ssd1327.h
@@ -30,7 +30,7 @@
 
 namespace upm
 {
-#define DISPLAY_CMD_SET_NORMAL 0xA4
+const uint8_t DISPLAY_CMD_SET_NORMAL = 0xA4;
 
 /**
  * @library i2clcd