Merge pull request #3 from blizniukp/dev

v 2.2.2

Author: blizniukp

README.md

@@ -96,17 +96,21 @@ Below is a list with cars with which this device works (has been tested) or can
 
 The project was to be as uncomplicated as possible, so I was looking for a board with an ESP32 module with the display already built in.
 
-I found two solutions for my project:
+The code is prepared for the following ready-made modules:
+
 * WIFI_kit_32 
-* WeMos Lolin32 OLED
+* WeMos Lolin32 OLED.
+* Diymore esp32 OLED
 
-The program is prepared for both versions.
 
 The board selection is made in the `platformio.ini` file by leaving one of the options uncommented:
 
+There are 3 ready-made configurations defined in the `platformio.ini` file. Each of them sets the corresponding compilation flag:
+
 ```
--DWIFI_KIT_32_BOARD
+;-DWIFI_KIT_32_BOARD
 ;-DWEMOS_BOARD
+;-DDIYMORE_BOARD
 ```
 
 Optionally, you can add a buzzer (with a generator) that informs you when:

README.pl.md

@@ -96,17 +96,18 @@ Poniżej znajduje się lista z autami z którymi działa (zostało przetestowane
 
 Projekt miał być jak najmniej skomplikowany, dlatego szukałem płytki z modułem ESP32 z już wbudowanym wyświetlaczem.
 
-Znalazłem dwa rozwiązania do swojego projektu:
+Kod jest przygotowany pod następujące gotowe moduły:
+
 * WIFI_kit_32 
 * WeMos Lolin32 OLED
+* Diymore esp32 OLED
 
-Program jest przygotowany pod obie wersje.
-
-Wyboru płytki dokonujemy w pliku `platformio.ini` pozostawiając odkomentowaną jedną z opcji:
+W pliku `platformio.ini` zdefiniowne są 3 gotowe konfiguracje. Każda z nich ustawia odpowiednią flagę kompilacji:
 
 ```
--DWIFI_KIT_32_BOARD
+;-DWIFI_KIT_32_BOARD
 ;-DWEMOS_BOARD
+;-DDIYMORE_BOARD
 ```
 
 Opcjonalnie można dodać buzzer (z generatorem) który informuje o:

include/main.hpp

@@ -7,7 +7,6 @@
 #include "oled/SSD1306Wire.h"
 #include <vector>
 #include <sstream>
-#ifdef ENABLE_WIFI
 #include <WiFi.h>
 #include <WiFiAP.h>
 #include <WiFiServer.h>
@@ -16,7 +15,7 @@
 #include "esp_bt_device.h"
 #include "esp_gap_bt_api.h"
 #include "esp_err.h"
-#endif
+
 #include "config.hpp"
 #include "measurement.hpp"
 #include "buzzer.hpp"
@@ -31,5 +30,10 @@
 #define SCL_OLED 15
 #define RST_OLED 16
 #endif
+#ifdef DIYMORE_BOARD
+#define SDA_OLED 21
+#define SCL_OLED 22
+#define RST_OLED -1
+#endif
 
 #endif

platformio.ini

@@ -8,24 +8,56 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:nodemcu-32s]
-platform = https://github.com/platformio/platform-espressif32.git @ 5.1.0
+[env:test]
+platform = native
+
+[env:wifi_kit_32]
+platform = [email protected]
 board = nodemcu-32s
 framework = arduino
 platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32 @ 2.0.4
 monitor_speed = 115200
 board_build.partitions = huge_app.csv
 test_ignore = test_measurement
 build_flags = 
-    -DCORE_DEBUG_LEVEL=3
-    -DENABLE_WIFI
-    -DWIFI_KIT_32_BOARD
-    ;-DWEMOS_BOARD
+	-DCORE_DEBUG_LEVEL=3
+	-DDEBUG
+	-DWIFI_KIT_32_BOARD
     ;-DRANDOM_DATA
-    -DDEBUG
-lib_deps =
-    BluetoothSerial @ 2.0.0
-    https://github.com/me-no-dev/ESPAsyncWebServer
+lib_deps = 
+	BluetoothSerial @ 2.0.0
+	https://github.com/me-no-dev/ESPAsyncWebServer
 
-[env:test]
-platform = native
+[env:wemos]
+platform = [email protected]
+board = nodemcu-32s
+framework = arduino
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32 @ 2.0.4
+monitor_speed = 115200
+board_build.partitions = huge_app.csv
+test_ignore = test_measurement
+build_flags = 
+	-DCORE_DEBUG_LEVEL=3
+	-DWEMOS_BOARD
+	-DDEBUG
+    ;-DRANDOM_DATA
+lib_deps = 
+	BluetoothSerial @ 2.0.0
+	https://github.com/me-no-dev/ESPAsyncWebServer
+
+[env:upesy_wrover]
+platform = [email protected]
+board = upesy_wrover
+framework = arduino
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32 @ 2.0.4
+monitor_speed = 115200
+board_build.partitions = huge_app.csv
+test_ignore = test_measurement
+build_flags = 
+	-DCORE_DEBUG_LEVEL=3
+	-DDIYMORE_BOARD
+	-DDEBUG
+	;-DRANDOM_DATA
+lib_deps = 
+	BluetoothSerial @ 2.0.0
+	https://github.com/me-no-dev/ESPAsyncWebServer