lalala

Author: TomSaw

src/modm/driver/display/ili9341.lb

@@ -26,8 +26,8 @@ def prepare(module, options):
 
 def build(env):
     env.outbasepath = "modm/src/modm/driver/display"
+    env.copy("ili9341_defines.hpp")
     env.copy("ili9341.hpp")
-    env.copy("ili9341_register.hpp")
     env.copy("ili9341_impl.hpp")
     env.copy("ili9341_interface_spi.hpp")
     env.copy("ili9341_interface_parallel.hpp")

src/modm/driver/display/ili9341_register.hpp renamed to src/modm/driver/display/ili9341_defines.hpp

@@ -10,6 +10,9 @@
  */
 
 #pragma once
+#ifndef MODM_ILI9341_HPP
+#error "Don't include this file directly, use 'ili9341.hpp' instead!"
+#endif
 
 #include <modm/math/utils/bit_constants.hpp>
 

src/modm/driver/display/ili9341_impl.hpp

@@ -9,6 +9,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#pragma once
 #ifndef MODM_ILI9341_HPP
 #error "Don't include this file directly, use 'ili9341.hpp' instead!"
 #endif

src/modm/driver/display/ili9341_interface_parallel.hpp

@@ -16,7 +16,7 @@
 
 #include <modm/math/utils/endianness.hpp>
 
-#include "ili9341_register.hpp"
+#include "ili9341_defines.hpp"
 
 namespace modm
 {

src/modm/driver/display/ili9341_interface_spi.hpp

@@ -18,7 +18,7 @@
 #include <modm/platform/spi/spi_base.hpp>
 #include <modm/processing/resumable.hpp>
 
-#include "ili9341_register.hpp"
+#include "ili9341_defines.hpp"
 
 namespace modm
 {

src/modm/driver/display/sh1106.hpp

@@ -9,6 +9,7 @@
  */
 // ----------------------------------------------------------------------------
 
+#pragma once
 #ifndef MODM_SH1106_HPP
 #define MODM_SH1106_HPP
 

src/modm/driver/display/sh1106_impl.hpp

@@ -9,6 +9,7 @@
  */
 // ----------------------------------------------------------------------------
 
+#pragma once
 #ifndef MODM_SH1106_HPP
 #error "Don't include this file directly, use 'sh1106.hpp' instead!"
 #endif

src/modm/driver/display/ssd1306.hpp

@@ -11,6 +11,7 @@
  */
 // ----------------------------------------------------------------------------
 
+#pragma once
 #ifndef MODM_SSD1306_HPP
 #define MODM_SSD1306_HPP
 
@@ -21,7 +22,7 @@
 #include <modm/ui/graphic/display.hpp>
 #include <modm/ui/graphic/buffer.hpp>
 
-#include "ssd1306_register.hpp"
+#include "ssd1306_defines.hpp"
 
 using namespace modm::graphic;
 

src/modm/driver/display/ssd1306.lb

@@ -24,7 +24,7 @@ def prepare(module, options):
 
 def build(env):
     env.outbasepath = "modm/src/modm/driver/display"
+    env.copy("ssd1306_defines.hpp")
     env.copy("ssd1306.hpp")
     env.copy("ssd1306_impl.hpp")
-    env.copy("ssd1306_register.hpp")
     env.copy("ssd1306_i2c_transaction_impl.cpp")