Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2026-01-31 06:40:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
CaCO3
2023-04-23 16:45:20 +02:00
parent e40ceb54ce
commit 929796c87f
7 changed files with 0 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/components/jomjol_helper/psram.h
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
#pragma once
#ifndef PSRAM_h
#define PSRAM_h
@@ -33,12 +32,3 @@ 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);
#endif // PSRAM_h
=======
#include "esp_heap_caps.h"
void *malloc_psram_heap(std::string name, size_t size, uint32_t caps);
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);
>>>>>>> master