diff --git a/.gitignore b/.gitignore index 2f52081..2edc8ee 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ __pycache__/ *.py[cod] -*$py.class \ No newline at end of file +*$py.class +.pio diff --git a/esp32/factory_settings.ini b/esp32/factory_settings.ini index 420e2a5..558b986 100644 --- a/esp32/factory_settings.ini +++ b/esp32/factory_settings.ini @@ -7,7 +7,7 @@ [factory_settings] build_flags = -D APP_NAME=\"Spot-Micro\" ; [a-zA-Z0-9-_] - -D APP_VERSION=\"0.0.1\" + -D APP_VERSION=\"0.1.0\" ; WiFi settings -D FACTORY_WIFI_SSID=\"\" diff --git a/esp32/scripts/build_app.py b/esp32/scripts/build_app.py index 6bb6feb..1f5f620 100644 --- a/esp32/scripts/build_app.py +++ b/esp32/scripts/build_app.py @@ -26,8 +26,8 @@ Import("env") project_dir = env["PROJECT_DIR"] buildFlags = env.ParseFlags(env["BUILD_FLAGS"]) -interface_dir = project_dir + "/../app" -output_file = project_dir + "/lib/ESP32-sveltekit/WWWData.h" +interface_dir = project_dir + "/app" +output_file = project_dir + "/esp32/lib/ESP32-sveltekit/WWWData.h" source_www_dir = interface_dir + "/src" build_dir = interface_dir + "/build" filesystem_dir = project_dir + "/data/www" diff --git a/esp32/scripts/generate_cert_bundle.py b/esp32/scripts/generate_cert_bundle.py index ffc2e19..5bd8cfb 100644 --- a/esp32/scripts/generate_cert_bundle.py +++ b/esp32/scripts/generate_cert_bundle.py @@ -36,8 +36,8 @@ except ImportError: ca_bundle_bin_file = 'x509_crt_bundle.bin' mozilla_cacert_url = 'https://curl.se/ca/cacert.pem' adafruit_cacert_url = 'https://raw.githubusercontent.com/adafruit/certificates/main/data/roots.pem' -certs_dir = Path("./ssl_certs") -binary_dir = Path("./src/certs") +certs_dir = Path("./esp32/ssl_certs") +binary_dir = Path("./esp32/src/certs") quiet = False diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp index 65740c7..c4e71ad 100644 --- a/esp32/src/main.cpp +++ b/esp32/src/main.cpp @@ -3,6 +3,7 @@ DRAM_ATTR Spot spot; void IRAM_ATTR SpotControlLoopEntry(void*) { + ESP_LOGI("main", "Setup complete now runing tsk"); TickType_t xLastWakeTime = xTaskGetTickCount(); const TickType_t xFrequency = 10 / portTICK_PERIOD_MS; for (;;) { diff --git a/esp32/platformio.ini b/platformio.ini similarity index 87% rename from esp32/platformio.ini rename to platformio.ini index 9d9825d..92747e0 100644 --- a/esp32/platformio.ini +++ b/platformio.ini @@ -10,13 +10,16 @@ [platformio] description = Spot Micro Robot -data_dir = data +data_dir = esp32/data +src_dir = esp32/src +include_dir = esp32/include +lib_dir = esp32/lib extra_configs = - factory_settings.ini - features.ini - build_settings.ini + esp32/factory_settings.ini + esp32/features.ini + esp32/build_settings.ini build_cache_dir = .pio/build_cache -default_envs = esp32-camera ; Change this to your default environment example: [env:{esp32-camera}] +default_envs = esp32-camera ; ================================================================ ; Project environments @@ -112,6 +115,7 @@ lib_deps = adafruit/Adafruit BMP085 Unified@^1.1.3 adafruit/Adafruit ADS1X15@^2.5.0 adafruit/Adafruit Unified Sensor@^1.1.14 + adafruit/Adafruit BNO055@^1.6.4 fastled/FastLED@^3.7.0 SPI FS @@ -124,10 +128,10 @@ lib_deps = WiFiClientSecure HTTPUpdate extra_scripts = - pre:scripts/pre_build.py - pre:scripts/build_app.py - pre:scripts/generate_cert_bundle.py - scripts/rename_fw.py -board_build.embed_files = src/certs/x509_crt_bundle.bin + pre:esp32/scripts/pre_build.py + pre:esp32/scripts/build_app.py + pre:esp32/scripts/generate_cert_bundle.py + esp32/scripts/rename_fw.py +board_build.embed_files = esp32/src/certs/x509_crt_bundle.bin board_ssl_cert_source = adafruit lib_compat_mode = strict \ No newline at end of file