change bitaxe i2c include to be i2c_bitaxe so as not to conflict wi…

…th esp-idf filenames
skot · Oct 7, 2024 · c469581 · c469581
1 parent cc8b238
commit c469581
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -4,7 +4,7 @@ SRCS
     "DS4432U.c"
     "EMC2101.c"
     "fonts.c"
-    "i2c_master.c"
+    "i2c_bitaxe.c"
     "INA260.c"
     "led_controller.c"
     "main.c"

diff --git a/main/DS4432U.c b/main/DS4432U.c
@@ -2,7 +2,7 @@
 #include <math.h>
 #include "esp_log.h"
 
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 
 #include "DS4432U.h"
 

diff --git a/main/EMC2101.h b/main/EMC2101.h
@@ -1,7 +1,7 @@
 #ifndef EMC2101_H_
 #define EMC2101_H_
 
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 
 #define EMC2101_I2CADDR_DEFAULT 0x4C ///< EMC2101 default i2c address
 #define EMC2101_CHIP_ID 0x16         ///< EMC2101 default device id from part id

diff --git a/main/INA260.h b/main/INA260.h
@@ -1,7 +1,7 @@
 #ifndef INA260_H_
 #define INA260_H_
 
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 
 #define INA260_I2CADDR_DEFAULT 0x40 ///< INA260 default i2c address
 #define INA260_REG_CONFIG 0x00      ///< Configuration register

diff --git a/main/TMP1075.c b/main/TMP1075.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "esp_log.h"
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 
 #include "TMP1075.h"
 

diff --git a/main/i2c_master.c → main/i2c_bitaxe.c b/main/i2c_master.c → main/i2c_bitaxe.c
@@ -1,4 +1,4 @@
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 
 #define I2C_MASTER_SCL_IO 48        /*!< GPIO number used for I2C master clock */
 #define I2C_MASTER_SDA_IO 47        /*!< GPIO number used for I2C master data  */

diff --git a/main/i2c_master.h → main/i2c_bitaxe.h b/main/i2c_master.h → main/i2c_bitaxe.h
@@ -1,6 +1,7 @@
 #ifndef I2C_MASTER_H_
 #define I2C_MASTER_H_
 
+//#include "driver/i2c_master.h"
 #include "driver/i2c.h"
 
 #define I2C_MASTER_NUM 0            /*!< I2C master i2c port number, the number of i2c peripheral interfaces available will depend on the chip */

diff --git a/main/oled.c b/main/oled.c
@@ -15,7 +15,7 @@
 // A copy of the display memory is maintained by this code so that single pixel
 // writes can occur without having to read from the display controller.
 
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 #include "esp_err.h"
 #include "esp_log.h"
 #include "nvs_config.h"

diff --git a/main/self_test/self_test.c b/main/self_test/self_test.c
@@ -1,4 +1,4 @@
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 #include "DS4432U.h"
 #include "EMC2101.h"
 #include "INA260.h"

diff --git a/main/system.c b/main/system.c
@@ -2,7 +2,7 @@
 
 #include "esp_log.h"
 
-#include "i2c_master.h"
+#include "i2c_bitaxe.h"
 #include "EMC2101.h"
 #include "INA260.h"
 #include "TMP1075.h"