Merge branch 'wifi'

2023-01-13 14:55:22 +01:00
parent aa946ff39f d4328e8c68
commit a59459cd18
8 changed files with 1900 additions and 0 deletions
@@ -2,9 +2,16 @@
 # for more information about component CMakeLists.txt files.

 idf_component_register(
+<<<<<<< HEAD
    SRCS 				# list the source files of this component
    "main.cpp"         
    "src/gpio.cpp"
+=======
+    SRCS                # list the source files of this component
+    "main.cpp" 
+    "gpio.cpp"
+    "wifi.cpp"
+>>>>>>> wifi
    INCLUDE_DIRS        # optional, add here public include directories
    "inc"
    PRIV_INCLUDE_DIRS   # optional, add here private include directories