Skip to content

Commit 9764c30

Browse files
32teeth32teeth
committed
Mon Jun 14 17:32:13 EDT 2021
1 parent fa1b6cd commit 9764c30

File tree

11 files changed

+598
-28
lines changed

11 files changed

+598
-28
lines changed

‎Assets/retro-esp32/fonts/5x7font_SELECTED.gif

1.3 KB
Loading

‎Assets/retro-esp32/fonts/5x7font_small.gif

1.21 KB
Loading

‎Launchers/retro-esp32-next/sdkconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
3838
#
3939
# Serial flasher config
4040
#
41-
CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AB0JECDI"
41+
CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AC00UQ47"
4242
CONFIG_ESPTOOLPY_BAUD_115200B=
4343
CONFIG_ESPTOOLPY_BAUD_230400B=
4444
CONFIG_ESPTOOLPY_BAUD_921600B=

‎Launchers/retro-esp32/sdkconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=
176176
CONFIG_SPIRAM_USE_MEMMAP=
177177
CONFIG_SPIRAM_USE_CAPS_ALLOC=y
178178
CONFIG_SPIRAM_USE_MALLOC=
179-
CONFIG_SPIRAM_TYPE_AUTO=y
179+
CONFIG_SPIRAM_TYPE_AUTO=
180180
CONFIG_SPIRAM_TYPE_ESPPSRAM32=
181-
CONFIG_SPIRAM_TYPE_ESPPSRAM64=
182-
CONFIG_SPIRAM_SIZE=-1
181+
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
182+
CONFIG_SPIRAM_SIZE=8388608
183183
CONFIG_SPIRAM_SPEED_40M=
184184
CONFIG_SPIRAM_SPEED_80M=y
185-
CONFIG_SPIRAM_MEMTEST=
185+
CONFIG_SPIRAM_MEMTEST=y
186186
CONFIG_SPIRAM_CACHE_WORKAROUND=
187187
CONFIG_SPIRAM_BANKSWITCH_ENABLE=
188188
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=

‎Launchers/retro-esp32/sdkconfig.old

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
3838
#
3939
# Serial flasher config
4040
#
41-
CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AB0JECDI"
41+
CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AC00UQ47"
4242
CONFIG_ESPTOOLPY_BAUD_115200B=
4343
CONFIG_ESPTOOLPY_BAUD_230400B=
4444
CONFIG_ESPTOOLPY_BAUD_921600B=
@@ -166,27 +166,7 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
166166
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
167167
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
168168
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
169-
CONFIG_SPIRAM_SUPPORT=y
170-
171-
#
172-
# SPI RAM config
173-
#
174-
CONFIG_SPIRAM_BOOT_INIT=y
175-
CONFIG_SPIRAM_IGNORE_NOTFOUND=
176-
CONFIG_SPIRAM_USE_MEMMAP=
177-
CONFIG_SPIRAM_USE_CAPS_ALLOC=y
178-
CONFIG_SPIRAM_USE_MALLOC=
179-
CONFIG_SPIRAM_TYPE_AUTO=y
180-
CONFIG_SPIRAM_TYPE_ESPPSRAM32=
181-
CONFIG_SPIRAM_TYPE_ESPPSRAM64=
182-
CONFIG_SPIRAM_SIZE=-1
183-
CONFIG_SPIRAM_SPEED_40M=
184-
CONFIG_SPIRAM_SPEED_80M=y
185-
CONFIG_SPIRAM_MEMTEST=
186-
CONFIG_SPIRAM_CACHE_WORKAROUND=
187-
CONFIG_SPIRAM_BANKSWITCH_ENABLE=
188-
CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
189-
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
169+
CONFIG_SPIRAM_SUPPORT=
190170
CONFIG_MEMMAP_TRACEMEM=
191171
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
192172
CONFIG_ESP32_TRAX=
@@ -504,7 +484,6 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
504484
# mbedTLS
505485
#
506486
CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
507-
CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=
508487
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=
509488
CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
510489
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384

‎Scripts/switch

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
SRC_PATH=`pwd`
4+
REPO=$(dirname $PWD)
5+
6+
#---------------------------------
7+
# Styles
8+
#---------------------------------
9+
source helpers/styles
10+
11+
#---------------------------------
12+
# VERSIONS
13+
#---------------------------------
14+
source helpers/version
15+
16+
17+
#---------------------------------
18+
# Goodbye
19+
#---------------------------------
20+
source helpers/goodbye

‎Tools/esp-idf/components/heap/test_multi_heap_host/Makefile

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
TEST_PROGRAM=test_multi_heap
2+
all: $(TEST_PROGRAM)
3+
4+
ifneq ($(filter clean,$(MAKECMDGOALS)),)
5+
.NOTPARALLEL: # prevent make clean racing the other targets
6+
endif
7+
8+
SOURCE_FILES = $(abspath \
9+
../multi_heap.c \
10+
../multi_heap_poisoning.c \
11+
test_multi_heap.cpp \
12+
main.cpp \
13+
)
14+
15+
INCLUDE_FLAGS = -I../include -I../../../tools/catch
16+
17+
GCOV ?= gcov
18+
19+
CPPFLAGS += $(INCLUDE_FLAGS) -D CONFIG_LOG_DEFAULT_LEVEL -g -fstack-protector-all -m32
20+
CFLAGS += -Wall -Werror -fprofile-arcs -ftest-coverage
21+
CXXFLAGS += -std=c++11 -Wall -Werror -fprofile-arcs -ftest-coverage
22+
LDFLAGS += -lstdc++ -fprofile-arcs -ftest-coverage -m32
23+
24+
OBJ_FILES = $(filter %.o, $(SOURCE_FILES:.cpp=.o) $(SOURCE_FILES:.c=.o))
25+
26+
COVERAGE_FILES = $(OBJ_FILES:.o=.gc*)
27+
28+
$(TEST_PROGRAM): $(OBJ_FILES)
29+
g++ $(LDFLAGS) -o $(TEST_PROGRAM) $(OBJ_FILES)
30+
31+
$(OUTPUT_DIR):
32+
mkdir -p $(OUTPUT_DIR)
33+
34+
test: $(TEST_PROGRAM)
35+
./$(TEST_PROGRAM)
36+
37+
$(COVERAGE_FILES): $(TEST_PROGRAM) test
38+
39+
coverage.info: $(COVERAGE_FILES)
40+
find ../ -name "*.gcno" -exec $(GCOV) -r -pb {} +
41+
lcov --capture --directory $(abspath ../) --no-external --output-file coverage.info --gcov-tool $(GCOV)
42+
43+
coverage_report: coverage.info
44+
genhtml coverage.info --output-directory coverage_report
45+
@echo "Coverage report is in coverage_report/index.html"
46+
47+
clean:
48+
rm -f $(OBJ_FILES) $(TEST_PROGRAM)
49+
rm -f $(COVERAGE_FILES) *.gcov
50+
rm -rf coverage_report/
51+
rm -f coverage.info
52+
53+
.PHONY: clean all test

‎Tools/esp-idf/components/heap/test_multi_heap_host/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#define CATCH_CONFIG_MAIN
2+
#include "catch.hpp"

‎Tools/esp-idf/components/heap/test_multi_heap_host/test_all_configs.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
#
3+
# Run the test suite with all configurations enabled
4+
#
5+
6+
FAIL=0
7+
8+
for FLAGS in "CONFIG_HEAP_POISONING_NONE" "CONFIG_HEAP_POISONING_LIGHT" "CONFIG_HEAP_POISONING_COMPREHENSIVE"; do
9+
echo "==== Testing with config: ${FLAGS} ===="
10+
CPPFLAGS="-D${FLAGS}" make clean test || FAIL=1
11+
done
12+
13+
make clean
14+
15+
if [ $FAIL == 0 ]; then
16+
echo "All configurations passed"
17+
else
18+
echo "Some configurations failed, see log."
19+
exit 1
20+
fi

0 commit comments

Comments
 (0)