Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-08 12:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
CaCO3
2023-04-23 16:44:19 +02:00
parent eebdd7c6eb 03c84a1ff3
commit e40ceb54ce
8 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/components/jomjol_helper/psram.cpp
View File

@@ -1,12 +1,17 @@
#include "ClassLogFile.h"
<<<<<<< HEAD
#include "../../include/defines.h"
#include "psram.h"
=======
#include "esp_heap_caps.h"
>>>>>>> master
static const char* TAG = "PSRAM";
using namespace std;
<<<<<<< HEAD
void *shared_region = NULL;
uint32_t allocatedBytesForSTBI = 0;
@@ -123,6 +128,8 @@ void psram_free_shared_tensor_arena_and_model_memory(void) {
/*******************************************************************
* General
*******************************************************************/
=======
>>>>>>> master
void *malloc_psram_heap(std::string name, size_t size, uint32_t caps) {
void *ptr;
@@ -138,6 +145,7 @@ void *malloc_psram_heap(std::string name, size_t size, uint32_t caps) {
}
<<<<<<< HEAD
void *realloc_psram_heap(std::string name, void *ptr, size_t size, uint32_t caps) {
ptr = heap_caps_realloc(ptr, size, caps);
if (ptr != NULL) {
@@ -151,12 +159,18 @@ void *realloc_psram_heap(std::string name, void *ptr, size_t size, uint32_t caps
}
=======
>>>>>>> master
void *calloc_psram_heap(std::string name, size_t n, size_t size, uint32_t caps) {
void *ptr;
ptr = heap_caps_calloc(n, size, caps);
if (ptr != NULL) {
<<<<<<< HEAD
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Allocated " + to_string(size) + " bytes in PSRAM for '" + name + "'");
=======
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocated " + to_string(size) + " bytes in PSRAM for '" + name + "'");
>>>>>>> master
}
else {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to allocate " + to_string(size) + " bytes in PSRAM for '" + name + "'!");
@@ -169,4 +183,8 @@ void *calloc_psram_heap(std::string name, size_t n, size_t size, uint32_t caps)
void free_psram_heap(std::string name, void *ptr) {
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Freeing memory in PSRAM used for '" + name + "'...");
heap_caps_free(ptr);
<<<<<<< HEAD
}
=======
}
>>>>>>> master