New file layout to be testable etc

docker-compose.yml.example

@@ -95,10 +95,13 @@ services:
     networks:
       - doorcode
   esp32:
-    image: espressif/idf:latest
+    build:
+      context: src/embedded
+      dockerfile: Dockerfile
     tty: true
     container_name: esp32
     volumes:
       - ./src/embedded:/project
+#    uncomment if you are going to be flashing a board from the container
     devices:
       - /dev/ttyUSB0:/dev/ttyUSB0

src/embedded/CMakeLists.txt

@@ -2,5 +2,30 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(door-controller)
+if(COMPILE_UNIVERSAL_TESTS)
+    set(PROJECT_NAME door-controller-universal-tests)
+    set(CMAKE_C_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 17)
+    project(${PROJECT_NAME} C CXX)
+
+    find_package(Catch2 REQUIRED)
+
+
+    set(INCLUDE_DIR main/include)
+    set(APP_SRC main/src/app)
+    set(CONNECTOR_TEST main/src/connectors/tests)
+
+    target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIR})
+
+    file(GLOB_RECURSE FILES
+            ${INCLUDE_DIR}/*.h
+            ${APP_SRC}/*.c
+            ${CONNECTOR_TEST_SRC}/*.c
+    )
+
+    add_executable(${PROJECT_NAME} ${FILES} "main/test_main.c")
+    target_link_libraries(${PROJECT_NAME} Catch2::Catch2)
+else()
+    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+    project(door-controller)
+endif()

src/embedded/Dockerfile

+FROM espressif/idf:latest
+
+RUN apt-get update && apt-get install -y \
+	build-essential \
+	gcc \
+	g++ \
+	gdb \
+	cmake \
+   && apt-get clean \
+   && apt-get autoremove -y \
+   && rm -rf /var/lib/apt/lists/*
+
+# Install catch2
+RUN git clone https://github.com/catchorg/Catch2.git /catch2 \
+		&& cd /catch2 && cmake -Bbuild -H. -DBUILD_TESTING=OFF \
+		&& cmake --build build/ --target install \
+		&& cd / \
+		&& rm -rf /catch2
+
+ENTRYPOINT [ "/opt/esp/entrypoint.sh" ]
+CMD [ "/bin/bash" ]

src/embedded/main/.gitignore

 config.h
-doorcode_root_cert.pem
\ No newline at end of file
+*.pem
\ No newline at end of file

src/embedded/main/CMakeLists.txt

-idf_component_register(SRCS "wifi.c" "main.c" "http.c" "api.c"
-        INCLUDE_DIRS "."
+set(INCLUDE_DIR include)
+
+set(APP_SRC src/app)
+set(CONNECTOR_SRC src/connectors/esp32)
+
+file(GLOB_RECURSE FILES ${APP_SRC}/*.c ${CONNECTOR_SRC}/*.c)
+
+idf_component_register(SRCS ${FILES} "main.c"
+        INCLUDE_DIRS ${INCLUDE_DIR}
         EMBED_TXTFILES "doorcode_root_cert.pem")

src/embedded/main/wifi.h → src/embedded/main/include/connectors/wifi.h

 #ifndef DOOR__WIFI_H_
 #define DOOR__WIFI_H_
 
+#include <stdbool.h>
+
 void door_wifi_initialize(void);
 
 void door_wifi_destroy(void);

src/embedded/main/main.c

@@ -11,9 +11,9 @@
 #include <freertos/task.h>
 #include <esp_log.h>
 #include <nvs_flash.h>
-#include "wifi.h"
-#include "http.h"
-#include "api.h"
+#include "connectors/wifi.h"
+#include "connectors/http.h"
+#include "app/api.h"
 
 static const char* TAG = "MAIN_MODULE";
 
@@ -25,6 +25,8 @@ static void check_code_task(void* pvParameters)
 	ESP_LOGI(TAG, "Connected to AP, begin connecting to DoorCode API");
 
 	bool allowed = door_api_verify_code("123866");
+
+
 	if (allowed)
 	{
 		ESP_LOGI(TAG, "We are allowed in the door!");
@@ -33,6 +35,9 @@ static void check_code_task(void* pvParameters)
 	{
 		ESP_LOGI(TAG, "REJECTED");
 	}
+	ESP_LOGI(TAG, "Making second request");
+	door_api_verify_code("123867");
+	ESP_LOGI(TAG, "Done with second request");
 
 	door_http_destroy();
 	door_wifi_destroy();

src/embedded/main/api.c → src/embedded/main/src/app/api.c

 #include <string.h>
-#include "api.h"
-#include "http.h"
-#include "config.h"
+#include "app/api.h"
+#include "connectors/http.h"
+#include "app/config.h"
 
 #define ACCESS_PREFIX "/access/"
 #define MAX_CODE_COUNT 500

src/embedded/main/http.c → src/embedded/main/src/connectors/esp32/esp_http.c

 #include <esp_http_client.h>
 #include <esp_log.h>
 #include <esp_tls.h>
-#include "http.h"
-#include "config.h"
-#include "wifi.h"
+#include <esp_partition.h>
+#include "app/config.h"
+#include "connectors/http.h"
+#include "connectors/wifi.h"
 
 /**
  * @brief Input buffer

src/embedded/main/wifi.c → src/embedded/main/src/connectors/esp32/esp_wifi.c

 #include <string.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/event_groups.h"
-#include "esp_system.h"
-#include "esp_wifi.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "nvs_flash.h"
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/event_groups.h>
+#include <esp_system.h>
+#include <esp_wifi.h>
+#include <esp_event.h>
+#include <esp_log.h>
+#include <nvs_flash.h>
 
-#include "config.h"
-#include "wifi.h"
+#include "app/config.h"
+#include "connectors/wifi.h"
 
 /* FreeRTOS event group to signal when we are connected*/
 static EventGroupHandle_t s_wifi_event_group;

src/embedded/main/test_main.c

+

src/embedded/version.txt

+0.0.0.1
\ No newline at end of file