hal: Expose only necessary headers in rofi::hal::esp32

examples/hal/servo/CMakeLists.txt

@@ -4,6 +4,6 @@ add_rofi_firmware(hal_example_servo.elf
     FLASH_SIZE 4MB
     SOURCES main.cpp)
 target_link_libraries(hal_example_servo.elf
-    idf::esp32 idf::freertos idf::spi_flash rofi::hal)
+    idf::esp32 idf::freertos idf::spi_flash esp32++ rofi::hal::esp32)
 set_partition_table(hal_example_servo.elf partitions.csv)
 

hardwareModules/universalModule/software/esp32/dynamixelConfigurator/CMakeLists.txt

@@ -2,6 +2,6 @@ add_rofi_firmware(dynamixelConfigurator.elf
     FLASH_SIZE 4MB
     SOURCES main.cpp)
 target_link_libraries(dynamixelConfigurator.elf
-    idf::esp32 idf::freertos idf::spi_flash idf::console rofi::hal
+    idf::esp32 idf::freertos idf::spi_flash idf::console esp32++ rofi::hal::esp32
     magic_enum libfort::fort)
 set_partition_table(dynamixelConfigurator.elf partitions.csv)

softwareComponents/esp32++/CMakeLists.txt

@@ -0,0 +1,7 @@
+file(GLOB_RECURSE SRC src/*.cpp)
+
+add_library(esp32++ ${SRC})
+set_property(TARGET esp32++ PROPERTY CXX_STANDARD 17)
+target_include_directories(esp32++ PUBLIC include)
+target_link_libraries(esp32++ PUBLIC idf::driver atoms)
+target_compile_options(esp32++ PUBLIC -mtext-section-literals -mlongcalls)

softwareComponents/rofiHalEsp32/src/espDriver/spi.hpp → softwareComponents/esp32++/include/espDriver/spi.hpp

@@ -118,4 +118,4 @@ void spiWrite( spi_device_handle_t dev, uint8_t ( &what )[ size ] ) {
     spi_device_transmit( dev, &t );
 }
 
-} // namespace rofi::esp32
+} // namespace rofi::esp32

softwareComponents/rofiHalEsp32/src/freeRTOS.hpp → softwareComponents/esp32++/include/freeRTOS.hpp

@@ -357,4 +357,4 @@ class Timer {
     TimerHandle_t _t;
 };
 
-} // namespace rtos
+} // namespace rtos

softwareComponents/rofiHalEsp32/src/logging.hpp → softwareComponents/esp32++/include/logging.hpp

@@ -52,4 +52,3 @@ void error(const std::string_view& message,
 }
 
 } // namespace rofi::log
-

softwareComponents/rofiHalEsp32/src/espDriver/gpio.cpp → softwareComponents/esp32++/src/gpio.cpp

@@ -1,4 +1,4 @@
-#include "gpio.hpp"
+#include "espDriver/gpio.hpp"
 
 std::ostream& operator<<( std::ostream& o, gpio_config_t s ) {
     o << "pin_bit_mask: " << s.pin_bit_mask << "\n";

softwareComponents/rofiHalEsp32/src/espDriver/spi.cpp → softwareComponents/esp32++/src/spi.cpp

@@ -1,4 +1,4 @@
-#include "spi.hpp"
+#include "espDriver/spi.hpp"
 
 std::ostream& rofi::esp32::operator<<( std::ostream& o, spi_bus_config_t s ) {
     o << "mosi_io_num: " << s.mosi_io_num << "\n";

softwareComponents/rofiHalEsp32/CMakeLists.txt

@@ -1,9 +1,9 @@
 file(GLOB_RECURSE SRC src/*.cpp src/*.c)
 
 add_library(rofi_hal_esp32 ${SRC})
-target_include_directories(rofi_hal_esp32 PUBLIC src)
 set_property(TARGET rofi_hal_esp32 PROPERTY CXX_STANDARD 17)
-target_link_libraries(rofi_hal_esp32 PUBLIC idf::driver atoms rofi::hal::inc)
+target_link_libraries(rofi_hal_esp32 PRIVATE esp32++ atoms)
+target_link_libraries(rofi_hal_esp32 PUBLIC rofi::hal::inc)
 target_compile_options(rofi_hal_esp32 PUBLIC -mtext-section-literals -mlongcalls)
 
 add_library(rofi::hal::esp32 ALIAS rofi_hal_esp32)

softwareComponents/rofiHalEsp32/src/bsp.hpp

@@ -9,4 +9,4 @@
     #include "bsp/v0.2.hpp"
 #else
     #error "Unsupported Universal Module board version"
-#endif
+#endif

softwareComponents/rofiHalEsp32/src/bsp/v0.2.hpp

@@ -32,4 +32,4 @@ inline std::string errorName( dynamixel::HardwareError e ) {
 }
 
 
-}; // rofi::hal::bsp
+} // rofi::hal::bsp

softwareComponents/rofiHalEsp32/src/cGlue.c

@@ -3,4 +3,4 @@
 wifi_init_config_t getDefaultWifiCfg() {
     wifi_init_config_t t = WIFI_INIT_CONFIG_DEFAULT();
     return t;
-}
+}

softwareComponents/rofiHalEsp32/src/rofi_hal.cpp

@@ -20,7 +20,7 @@
 #include <espDriver/gpio.hpp>
 #include <espDriver/spi.hpp>
 
-#include <bsp.hpp>
+#include "bsp.hpp"
 #include <atoms/util.hpp>
 #include <logging.hpp>
 

softwareComponents/rofiHalEsp32/test-logic/CMakeLists.txt

@@ -5,5 +5,4 @@ if("${TARGET}" STREQUAL "esp32")
 endif()
 
 add_executable(test-rofiHalEsp32 testPacket.cpp)
-target_link_libraries(test-rofiHalEsp32 Catch2WithMain)
-target_include_directories(test-rofiHalEsp32 PUBLIC ../src)
+target_link_libraries(test-rofiHalEsp32 Catch2WithMain esp32++)

softwareComponents/rofiHalEsp32/test-logic/testPacket.cpp

@@ -113,4 +113,4 @@ TEST_CASE( "Ping packet parsing" ) {
 
     std::vector< uint8_t > pData( p.raw(), p.raw() + p.rawSize() );
     REQUIRE( ref == pData );
-}
+}

suites/esp32/CMakeLists.txt

@@ -70,6 +70,7 @@ set_target_properties(build_hack PROPERTIES EXCLUDE_FROM_ALL "exclude-NOTFOUND")
 add_component(atoms)
 add_component(lwip++)
 add_component(lwipcore)
+add_component(esp32++)
 add_component(rofiHalInc)
 add_component(rofiHalEsp32)
 add_component(libfi)