Rolling - 202-12-03

.gitignore

@@ -4,6 +4,7 @@
 .code-workspace
 .helper/
 /sd-card/htm./.vscode/
+/code/build
 
 CMakeLists.txt.user
 CMakeCache.txt

README.md

@@ -25,6 +25,14 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
+##### Rolling - (2020-12-03)
+
+* Move source code to `/main` to full compatibility between pure ESP-IDF and Platformio w/ espressif
+
+* based on Main v4.1.1 (2020-12-02)
+
+  
+
 ##### 4.1.1 Configuration editor - (2020-12-02)
 
 * Bug fixing: internal improvement of file handling (reduce not responding)

code/main/CMakeLists.txt

@@ -53,7 +53,7 @@ endif()
 #######################################################################
 
 
-FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
+FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/main/*.*)
 
 # idf_component_register(SRCS ${app_sources})
 

code/main/version.cpp

@@ -0,0 +1,4 @@
+const char* GIT_REV="c5059b4";
+const char* GIT_TAG="";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2020-12-03 20:31";

code/platformio.ini

@@ -9,6 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 
+[platformio]
+src_dir = main
 
 
 [env:esp32cam]
@@ -17,12 +19,14 @@ board = esp32cam
 framework = espidf
 
 board_build.embed_files  =
-  src/favicon.ico
+  main/favicon.ico
 
 
 ;board_build.partitions = partitions_singleapp.csv
 board_build.partitions = partitions.csv
 
+
+
 lib_deps = 
   jomjol_helper 
   connect_wlan  

code/src/version.cpp

@@ -1,4 +0,0 @@
-const char* GIT_REV="ffc15aa";
-const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2020-12-02 21:56";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="ffc15aa";
+const char* GIT_REV="c5059b4";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2020-12-02 21:55";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2020-12-03 20:27";