From c66e382cbdd14a4107d7a74b98f30c71196ec100 Mon Sep 17 00:00:00 2001 From: Rafal Magda Date: Wed, 17 Apr 2019 00:06:19 +0200 Subject: [PATCH 1/3] platformio conversion --- .gitignore | 6 ++++++ platformio.ini | 21 +++++++++++++++++++ {Esp32_radio => src}/Dummytft.h | 0 .../Esp32_radio.ino.cpp | 0 {Esp32_radio => src}/ILI9341.h | 0 {Esp32_radio => src}/LCD1602.h | 0 {Esp32_radio => src}/NEXTION.h | 0 {Esp32_radio => src}/SSD1306.h | 0 {Esp32_radio => src}/about_html.h | 0 {Esp32_radio => src}/bluetft.h | 0 {Esp32_radio => src}/config_html.h | 0 {Esp32_radio => src}/defaultprefs.h | 0 {Esp32_radio => src}/favicon_ico.h | 0 {Esp32_radio => src}/index_html.h | 0 {Esp32_radio => src}/mp3play_html.h | 0 {Esp32_radio => src}/radio_css.h | 0 16 files changed, 27 insertions(+) create mode 100644 .gitignore create mode 100644 platformio.ini rename {Esp32_radio => src}/Dummytft.h (100%) rename Esp32_radio/Esp32_radio.ino => src/Esp32_radio.ino.cpp (100%) rename {Esp32_radio => src}/ILI9341.h (100%) rename {Esp32_radio => src}/LCD1602.h (100%) rename {Esp32_radio => src}/NEXTION.h (100%) rename {Esp32_radio => src}/SSD1306.h (100%) rename {Esp32_radio => src}/about_html.h (100%) rename {Esp32_radio => src}/bluetft.h (100%) rename {Esp32_radio => src}/config_html.h (100%) rename {Esp32_radio => src}/defaultprefs.h (100%) rename {Esp32_radio => src}/favicon_ico.h (100%) rename {Esp32_radio => src}/index_html.h (100%) rename {Esp32_radio => src}/mp3play_html.h (100%) rename {Esp32_radio => src}/radio_css.h (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e426dbd --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.pio +.pioenvs +.piolibdeps +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json diff --git a/platformio.ini b/platformio.ini new file mode 100644 index 0000000..49d1f98 --- /dev/null +++ b/platformio.ini @@ -0,0 +1,21 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:esp32doit-devkit-v1] +platform = espressif32 +board = esp32doit-devkit-v1 +framework = arduino + +lib_deps = + PubSubClient + Adafruit ILI9341 + Adafruit GFX Library + +monitor_speed = 115200 diff --git a/Esp32_radio/Dummytft.h b/src/Dummytft.h similarity index 100% rename from Esp32_radio/Dummytft.h rename to src/Dummytft.h diff --git a/Esp32_radio/Esp32_radio.ino b/src/Esp32_radio.ino.cpp similarity index 100% rename from Esp32_radio/Esp32_radio.ino rename to src/Esp32_radio.ino.cpp diff --git a/Esp32_radio/ILI9341.h b/src/ILI9341.h similarity index 100% rename from Esp32_radio/ILI9341.h rename to src/ILI9341.h diff --git a/Esp32_radio/LCD1602.h b/src/LCD1602.h similarity index 100% rename from Esp32_radio/LCD1602.h rename to src/LCD1602.h diff --git a/Esp32_radio/NEXTION.h b/src/NEXTION.h similarity index 100% rename from Esp32_radio/NEXTION.h rename to src/NEXTION.h diff --git a/Esp32_radio/SSD1306.h b/src/SSD1306.h similarity index 100% rename from Esp32_radio/SSD1306.h rename to src/SSD1306.h diff --git a/Esp32_radio/about_html.h b/src/about_html.h similarity index 100% rename from Esp32_radio/about_html.h rename to src/about_html.h diff --git a/Esp32_radio/bluetft.h b/src/bluetft.h similarity index 100% rename from Esp32_radio/bluetft.h rename to src/bluetft.h diff --git a/Esp32_radio/config_html.h b/src/config_html.h similarity index 100% rename from Esp32_radio/config_html.h rename to src/config_html.h diff --git a/Esp32_radio/defaultprefs.h b/src/defaultprefs.h similarity index 100% rename from Esp32_radio/defaultprefs.h rename to src/defaultprefs.h diff --git a/Esp32_radio/favicon_ico.h b/src/favicon_ico.h similarity index 100% rename from Esp32_radio/favicon_ico.h rename to src/favicon_ico.h diff --git a/Esp32_radio/index_html.h b/src/index_html.h similarity index 100% rename from Esp32_radio/index_html.h rename to src/index_html.h diff --git a/Esp32_radio/mp3play_html.h b/src/mp3play_html.h similarity index 100% rename from Esp32_radio/mp3play_html.h rename to src/mp3play_html.h diff --git a/Esp32_radio/radio_css.h b/src/radio_css.h similarity index 100% rename from Esp32_radio/radio_css.h rename to src/radio_css.h From 46fa33c30efd7425ee0cf8ccc54aa720a804fd20 Mon Sep 17 00:00:00 2001 From: Rafal Magda Date: Wed, 17 Apr 2019 00:12:25 +0200 Subject: [PATCH 2/3] platformio conversion --- .vscode/extensions.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..272828b --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} \ No newline at end of file From df5b44042e138afcb19f757ddfad38066aedb095 Mon Sep 17 00:00:00 2001 From: Rafal Magda Date: Wed, 17 Apr 2019 00:15:48 +0200 Subject: [PATCH 3/3] platformio 2 --- .gitignore | 5 +++++ platformio.ini | 5 ++++- src/Esp32_radio.ino.cpp | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e426dbd..172090d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,8 @@ .vscode/.browse.c_cpp.db* .vscode/c_cpp_properties.json .vscode/launch.json +.vscode/settings.json +.vscode/ipch/ +*.code-workspace +src/myWifi.h + diff --git a/platformio.ini b/platformio.ini index 49d1f98..bbed4dc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,7 +15,10 @@ framework = arduino lib_deps = PubSubClient - Adafruit ILI9341 Adafruit GFX Library + ; needed by ili9341.h + Adafruit ILI9341 + ; needed by bluetft.h + Adafruit ST7735 and ST7789 Library monitor_speed = 115200 diff --git a/src/Esp32_radio.ino.cpp b/src/Esp32_radio.ino.cpp index 6a1c537..9164f5e 100644 --- a/src/Esp32_radio.ino.cpp +++ b/src/Esp32_radio.ino.cpp @@ -2499,6 +2499,8 @@ bool do_software_update ( uint32_t clength ) return res ; } +// forward reference +void scan_content_length ( const char* metalinebf ); //************************************************************************************************** // U P D A T E _ S O F T W A R E * @@ -5713,4 +5715,4 @@ void spftask ( void * parameter ) } //vTaskDelete ( NULL ) ; // Will never arrive here } - +