diff --git a/ESP32_PSRAM_Test/.gitignore b/ESP32_PSRAM_Test/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/ESP32_PSRAM_Test/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/ESP32_PSRAM_Test/.vscode/extensions.json b/ESP32_PSRAM_Test/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/ESP32_PSRAM_Test/.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" + ] +} diff --git a/ESP32_PSRAM_Test/.vscode/settings.json b/ESP32_PSRAM_Test/.vscode/settings.json new file mode 100644 index 0000000..03ba48b --- /dev/null +++ b/ESP32_PSRAM_Test/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "new": "cpp" + } +} \ No newline at end of file diff --git a/ESP32_PSRAM_Test/README b/ESP32_PSRAM_Test/README new file mode 100644 index 0000000..07ce3be --- /dev/null +++ b/ESP32_PSRAM_Test/README @@ -0,0 +1,3 @@ +Use this project to play around with the PSRAM on the ESP + +Just open this folder (ESP32_PSRAM_Test) as a separate project in vs code. Platformio should recognise the folder as a platformio project. Upload the project to the panto and monitor the output. You should see that the PSRAM is correctly initialised and can be used. \ No newline at end of file diff --git a/ESP32_PSRAM_Test/include/README b/ESP32_PSRAM_Test/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/ESP32_PSRAM_Test/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/ESP32_PSRAM_Test/lib/README b/ESP32_PSRAM_Test/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/ESP32_PSRAM_Test/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/ESP32_PSRAM_Test/platformio.ini b/ESP32_PSRAM_Test/platformio.ini new file mode 100644 index 0000000..36c1ee1 --- /dev/null +++ b/ESP32_PSRAM_Test/platformio.ini @@ -0,0 +1,25 @@ +; 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:esp32dev] +platform = espressif32 +board = esp32dev +framework = arduino +monitor_flags = --raw +build_flags = -DCORE_DEBUG_LEVEL=5 + -DBOARD_HAS_PSRAM + -mfix-esp32-psram-cache-issue + -nostdlib + -D_GLIBCXX_USE_C99 + -DENABLE_FPS + -g + -frtti +lib_deps = https://github.com/PaulStoffregen/Encoder.git +upload_port = /dev/cu.SLAB_USBtoUART \ No newline at end of file diff --git a/ESP32_PSRAM_Test/src/main.cpp b/ESP32_PSRAM_Test/src/main.cpp new file mode 100644 index 0000000..eb41140 --- /dev/null +++ b/ESP32_PSRAM_Test/src/main.cpp @@ -0,0 +1,53 @@ +#include +// #include "psramAllocator.hpp" + +//new.cpp +#include +#include + +void *operator new(size_t size) noexcept { return ps_malloc(size); } +void operator delete(void *p) noexcept { free(p); } +void *operator new[](size_t size) noexcept { return operator new(size); } +void operator delete[](void *p) noexcept { operator delete(p); } +void *operator new(size_t size, std::nothrow_t) noexcept { return operator new(size); } +void operator delete(void *p, std::nothrow_t) noexcept { operator delete(p); } +void *operator new[](size_t size, std::nothrow_t) noexcept { return operator new(size); } +void operator delete[](void *p, std::nothrow_t) noexcept { operator delete(p); } + + +void logMemory() { + log_d("Used PSRAM: %d", ESP.getPsramSize() - ESP.getFreePsram()); + log_d("Free PSRAM: %d", ESP.getFreePsram()); + log_d("Free heap: %i of %i (%.3f %%).", ESP.getFreeHeap(), ESP.getHeapSize(), 100*ESP.getFreeHeap()/(float)ESP.getHeapSize()); +} + +void setup() { + psramInit(); + Serial.begin(9600); + bool ramFound = psramInit(); + log_d("Ram found %d", ramFound); + logMemory(); + byte* psdRamBuffer = (byte*)ps_malloc(500000); + logMemory(); + free(psdRamBuffer); + logMemory(); + int arr[] = {2,5,8,11,14}; + // std::vector> m_cells(arr, arr+5); + std::vector m_cells(arr, arr+5); + logMemory(); + m_cells.push_back(10); + logMemory(); + std::vector m_cells1; + for (int i = 0;i<100000;i++){ + m_cells1.push_back(i); + } + logMemory(); + m_cells.reserve(100000); + m_cells.push_back(20); + logMemory(); + + logMemory(); +} + +void loop() { +} diff --git a/ESP32_PSRAM_Test/test/README b/ESP32_PSRAM_Test/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/ESP32_PSRAM_Test/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PlatformIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PlatformIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html