Skip to content

Commit 492ed54

Browse files
ten-point-nineten-point-nine
committed
Merge branch 'A'
2 parents 6098874 + 663a0d3 commit 492ed54

File tree

24 files changed

+28168
-27088
lines changed

24 files changed

+28168
-27088
lines changed

‎Software/ESP32/.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@
5151
"cstdint": "c"
5252
},
5353
"idf.flashType": "UART",
54-
"idf.portWin": "COM10",
54+
"idf.portWin": "COM4",
5555
"C_Cpp.default.compilerPath": "c:\\Users\\allan\\esp\\esp-idf\\tools\\tools\\xtensa-esp32s3-elf\\esp-2022r1-11.2.0\\xtensa-esp32s3-elf\\bin\\xtensa-esp32s3-elf-gcc.exe"
5656
}

‎Software/ESP32/build/.bin_timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bbee5925bddabfd547152c70d755841b C:/Users/allan/Documents/freETarget/Software/ESP32/build/freeETarget.bin
1+
768ea42abe84ef7630872ea9859a81ff C:/Users/allan/Documents/freETarget/Software/ESP32/build/freeETarget.bin

‎Software/ESP32/build/.ninja_deps‎

-389 KB
Binary file not shown.

‎Software/ESP32/build/.ninja_log‎

Lines changed: 1109 additions & 2116 deletions
Large diffs are not rendered by default.

‎Software/ESP32/build/CMakeCache.txt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
# EXTERNAL cache entries
1515
########################
1616

17-
//No help, variable specified on the command line.
18-
CCACHE_ENABLE:UNINITIALIZED=1
19-
20-
//Path to a program.
21-
CCACHE_FOUND:FILEPATH=C:/Users/allan/.espressif/tools/ccache/4.8/ccache-4.8-windows-x86_64/ccache.exe
22-
2317
//Path to a program.
2418
CMAKE_ADDR2LINE:FILEPATH=C:/Users/allan/.espressif/tools/xtensa-esp-elf/esp-13.2.0_20240530/xtensa-esp-elf/bin/xtensa-esp32s3-elf-addr2line.exe
2519

@@ -349,9 +343,6 @@ Mbed TLS_IS_TOP_LEVEL:STATIC=OFF
349343
//Value Computed by CMake
350344
Mbed TLS_SOURCE_DIR:STATIC=C:/Users/allan/esp/v5.3.1/esp-idf/components/mbedtls/mbedtls
351345

352-
//No help, variable specified on the command line.
353-
PYTHON:UNINITIALIZED=C:\Users\allan\.espressif\python_env\idf5.3_py3.11_env\Scripts\python.exe
354-
355346
//No help, variable specified on the command line.
356347
PYTHON_DEPS_CHECKED:UNINITIALIZED=1
357348

‎Software/ESP32/build/CMakeFiles/git-data/HEAD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ref: refs/heads/master
1+
ref: refs/heads/A

‎Software/ESP32/build/CMakeFiles/git-data/head-ref‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4327ce86df6990ff1dd82afeb7889a8e7da39e86
1+
fa7ccee81ac41fbf3a2eec45bd61dc1b86798745

‎Software/ESP32/build/CMakeFiles/rules.ninja‎

Lines changed: 100 additions & 100 deletions
Large diffs are not rendered by default.

‎Software/ESP32/build/bootloader/.ninja_log‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,41 @@
214214
5239 5577 7803594178773392 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/.bin_timestamp 7ca6264d1b6bac8
215215
5577 5683 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
216216
5577 5683 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
217+
89 275 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
218+
89 275 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
219+
16 144 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
220+
16 144 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
221+
27 119 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
222+
27 119 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
223+
14 132 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
224+
14 132 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
225+
25 110 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
226+
25 110 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
227+
30 122 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
228+
30 122 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
229+
28 114 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
230+
28 114 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
231+
90 423 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
232+
90 423 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
233+
30 151 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
234+
30 151 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
235+
31 149 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
236+
31 149 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
237+
38 168 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
238+
38 168 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
239+
36 159 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
240+
36 159 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
241+
35 178 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
242+
35 178 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
243+
41 257 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
244+
41 257 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
245+
31 157 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
246+
31 157 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
247+
34 158 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
248+
34 158 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
249+
13 125 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
250+
13 125 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
251+
25 349 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
252+
25 349 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
253+
165 343 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a
254+
165 343 0 C:/Users/allan/Documents/freETarget/Software/ESP32/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 13b5e2c0ed62ad6a

0 commit comments

Comments
 (0)