Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6d400df

Browse filesBrowse files
me-no-devme-no-dev
authored
IDF release/v4.4 f23dcd3555 (espressif#5996)
esp-dsp: master 6b25cbb esp-face: master d141502 esp-rainmaker: f1b82c7 esp32-camera: master 61400bc esp_littlefs: master 3c29afc
1 parent 7bb30b3 commit 6d400df
Copy full SHA for 6d400df

File tree

Expand file treeCollapse file tree

348 files changed

+2902
-900
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

348 files changed

+2902
-900
lines changed

‎platform.txt

Copy file name to clipboardExpand all lines: platform.txt
+5-5Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

‎tools/platformio-build-esp32.py

Copy file name to clipboardExpand all lines: tools/platformio-build-esp32.py
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"-Wl,--gc-sections",
8282
"-fno-rtti",
8383
"-fno-lto",
84-
"-Wl,--wrap=mbedtls_mpi_exp_mod",
8584
"-Wl,--wrap=longjmp",
8685
"-Wl,--undefined=uxTopUsedPriority",
8786
"-T", "esp32.rom.redefined.ld",
@@ -304,7 +303,7 @@
304303
"UNITY_INCLUDE_CONFIG_H",
305304
"WITH_POSIX",
306305
"_GNU_SOURCE",
307-
("IDF_VER", '\\"v4.4-dev-3703-gddc44956bf\\"'),
306+
("IDF_VER", '\\"v4.4-beta1-183-gf23dcd3555\\"'),
308307
"ESP_PLATFORM",
309308
"_POSIX_READER_WRITER_LOCKS",
310309
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py

Copy file name to clipboardExpand all lines: tools/platformio-build-esp32c3.py
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"-Wl,--gc-sections",
8282
"-fno-rtti",
8383
"-fno-lto",
84-
"-Wl,--wrap=mbedtls_mpi_exp_mod",
8584
"-Wl,--undefined=uxTopUsedPriority",
8685
"-Wl,--wrap=_Unwind_SetEnableExceptionFdeSorting",
8786
"-Wl,--wrap=__register_frame_info_bases",
@@ -294,7 +293,7 @@
294293
"UNITY_INCLUDE_CONFIG_H",
295294
"WITH_POSIX",
296295
"_GNU_SOURCE",
297-
("IDF_VER", '\\"v4.4-dev-3703-gddc44956bf\\"'),
296+
("IDF_VER", '\\"v4.4-beta1-183-gf23dcd3555\\"'),
298297
"ESP_PLATFORM",
299298
"_POSIX_READER_WRITER_LOCKS",
300299
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py

Copy file name to clipboardExpand all lines: tools/platformio-build-esp32s2.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
"UNITY_INCLUDE_CONFIG_H",
291291
"WITH_POSIX",
292292
"_GNU_SOURCE",
293-
("IDF_VER", '\\"v4.4-dev-3703-gddc44956bf\\"'),
293+
("IDF_VER", '\\"v4.4-beta1-183-gf23dcd3555\\"'),
294294
"ESP_PLATFORM",
295295
"_POSIX_READER_WRITER_LOCKS",
296296
"ARDUINO_ARCH_ESP32",

‎tools/sdk/esp32/bin/bootloader_dio_40m.bin

Copy file name to clipboard
-128 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dio_80m.bin

Copy file name to clipboard
-144 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dout_40m.bin

Copy file name to clipboard
-128 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_dout_80m.bin

Copy file name to clipboard
-144 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qio_40m.bin

Copy file name to clipboard
-128 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qio_80m.bin

Copy file name to clipboard
-128 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qout_40m.bin

Copy file name to clipboard
-128 Bytes
Binary file not shown.

‎tools/sdk/esp32/bin/bootloader_qout_80m.bin

Copy file name to clipboard
-128 Bytes
Binary file not shown.

‎tools/sdk/esp32/include/app_trace/include/esp_app_trace_util.h

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/app_trace/include/esp_app_trace_util.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ typedef struct {
6868
*/
6969
static inline void esp_apptrace_lock_init(esp_apptrace_lock_t *lock)
7070
{
71-
vPortCPUInitializeMutex(&lock->mux);
71+
portMUX_INITIALIZE(&lock->mux);
7272
lock->int_state = 0;
7373
}
7474

‎tools/sdk/esp32/include/config/sdkconfig.h

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/config/sdkconfig.h
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@
291291
#define CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 1
292292
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
293293
#define CONFIG_ESP32_WIFI_MGMT_SBUF_NUM 32
294+
#define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
294295
#define CONFIG_ESP_COREDUMP_ENABLE_TO_NONE 1
295296
#define CONFIG_FATFS_CODEPAGE_850 1
296297
#define CONFIG_FATFS_CODEPAGE 850
@@ -676,5 +677,5 @@
676677
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
677678
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
678679
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
679-
#define CONFIG_ARDUINO_IDF_COMMIT "ddc44956bf"
680+
#define CONFIG_ARDUINO_IDF_COMMIT "f23dcd3555"
680681
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/include/esp-face/include/image/dl_image.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/image/dl_image.hpp
+52Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ namespace dl
4848
output[2] = input & 0xF8; // red
4949
}
5050

51+
/**
52+
* @brief Convert RGB565 image to RGB888 image.
53+
*
54+
* @param image ptr of RGB565 image
55+
* @param image_shape shape of the input image
56+
* @return Tensor<uint8_t>* output RGB88 image
57+
*/
58+
Tensor<uint8_t> *convert_image_rgb565_to_rgb888(uint16_t *image, std::vector<int> &image_shape);
59+
5160
/**
5261
* @brief Convert RGB565 pixel to Gray.
5362
*
@@ -435,5 +444,48 @@ namespace dl
435444
*/
436445
Tensor<uint8_t> *rgb2hsv(Tensor<uint8_t> &image, bool bgr = false, bool fast = true);
437446

447+
/**
448+
* @brief resize an image to the target shape.
449+
*
450+
* @param image the input image Tensor
451+
* @param target_shape the target shape of the resized image.
452+
* @param resize_type one of IMAGE_RESIZE_BILINEAR or IMAGE_RESIZE_MEAN or IMAGE_RESIZE_NEAREST
453+
* @return Tensor<uint8_t>* the pointer of the resized image Tensor
454+
*/
455+
Tensor<uint8_t> *resize_image(Tensor<uint8_t> &image, std::vector<int> target_shape, resize_type_t resize_type);
456+
457+
/**
458+
* @brief resize an image to the target shape.
459+
*
460+
* @param image the input image Tensor
461+
* @param resized_image the resized image Tensor
462+
* @param resize_type one of IMAGE_RESIZE_BILINEAR or IMAGE_RESIZE_MEAN or IMAGE_RESIZE_NEAREST
463+
*/
464+
void resize_image(Tensor<uint8_t> &image, Tensor<uint8_t> &resized_image, resize_type_t resize_type);
465+
466+
/**
467+
* @brief resize an image to the target shape with nearest method.
468+
*
469+
* @tparam T
470+
* @param image the pointer of the input image
471+
* @param input_shape the input shape of the image
472+
* @param target_shape the target shape of the resized image
473+
* @return T* the pointer of the resized image
474+
*/
475+
template <typename T>
476+
T *resize_image_nearest(T *image, std::vector<int> input_shape, std::vector<int> target_shape);
477+
478+
/**
479+
* @brief resize an image to the target shape with nearest method.
480+
*
481+
* @tparam T
482+
* @param image the pointer of the input image
483+
* @param input_shape the input shape of the image
484+
* @param resized_image the pointer of the resized image
485+
* @param target_shape the target shape of the resized image
486+
*/
487+
template <typename T>
488+
void resize_image_nearest(T *image, std::vector<int> input_shape, T *resized_image, std::vector<int> target_shape);
489+
438490
} // namespace image
439491
} // namespace dl

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_avg_pool2d.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_avg_pool2d.hpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ namespace dl
5757
const char *name = "AvgPool2D") : Layer(name),
5858
output_exponent(output_exponent),
5959
filter_shape(filter_shape),
60-
padding_type(padding_type),
61-
padding(padding),
6260
stride_y(stride_y),
6361
stride_x(stride_x),
62+
padding_type(padding_type),
63+
padding(padding),
6464
output_shape({})
6565
{
6666
this->output = new Tensor<feature_t>;

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_expand_dims.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_expand_dims.hpp
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ namespace dl
3636
* false: the output will store to a separate memory
3737
*/
3838
ExpandDims(std::vector<int> axis, const char *name = "ExpandDims", bool inplace = false) : Layer(name),
39-
axis(axis), inplace(inplace), output_shape({})
39+
output_shape({}),
40+
axis(axis),
41+
output(NULL),
42+
inplace(inplace)
4043
{
4144
}
4245

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_flatten.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_flatten.hpp
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace dl
3232
* @param inplace true: the output will store to input0
3333
* false: the output will store to a separate memory
3434
*/
35-
Flatten(const char *name = "Flatten", bool inplace = false) : Layer(name), inplace(inplace), output_shape({})
35+
Flatten(const char *name = "Flatten", bool inplace = false) : Layer(name), output(NULL), inplace(inplace), output_shape({})
3636
{}
3737

3838
/**

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_max_pool2d.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_max_pool2d.hpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ namespace dl
5353
const int stride_x = 1,
5454
const char *name = "MaxPool2D") : Layer(name),
5555
filter_shape(filter_shape),
56-
padding_type(padding_type),
57-
padding(padding),
5856
stride_y(stride_y),
5957
stride_x(stride_x),
58+
padding_type(padding_type),
59+
padding(padding),
6060
output_shape({})
6161
{
6262
this->output = new Tensor<feature_t>;

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_relu.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_relu.hpp
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace dl
1818
* - int8_t: stands for operation in int8_t quantize
1919
*/
2020
template <typename feature_t>
21-
class ReLU : public Layer
21+
class Relu : public Layer
2222
{
2323
private:
2424
Tensor<feature_t> *output; /*<! output ptr of relu >*/
@@ -33,7 +33,7 @@ namespace dl
3333
* @param inplace true: the output will store to input0
3434
* false: the output will store to a separate memory
3535
*/
36-
ReLU(const char *name = "ReLU", bool inplace = false) : Layer(name),
36+
Relu(const char *name = "Relu", bool inplace = false) : Layer(name),
3737
output(NULL), inplace(inplace), output_shape({})
3838
{
3939
}
@@ -42,7 +42,7 @@ namespace dl
4242
* @brief Destroy the ReLU object
4343
*
4444
*/
45-
~ReLU()
45+
~Relu()
4646
{
4747
if ((!this->inplace) && (this->output != NULL))
4848
{

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_reshape.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_reshape.hpp
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ namespace dl
3535
* false: the output will store to a separate memory
3636
*/
3737
Reshape(std::vector<int> shape, const char *name = "Reshape", bool inplace = false) : Layer(name),
38-
output_shape(shape), inplace(inplace)
38+
output(NULL),
39+
inplace(inplace),
40+
output_shape(shape)
3941
{
4042
}
4143

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_squeeze.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_squeeze.hpp
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ namespace dl
3535
* @param inplace true: the output will store to input0
3636
* false: the output will store to a separate memory
3737
*/
38-
Squeeze(int axis = INT32_MAX, const char *name = "Squeeze", bool inplace = false) : Layer(name), axis(axis), inplace(inplace), output_shape({})
38+
Squeeze(int axis = INT32_MAX, const char *name = "Squeeze", bool inplace = false) : Layer(name),
39+
output(NULL),
40+
inplace(inplace),
41+
axis(axis),
42+
output_shape({})
3943
{
4044
}
4145

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_sub2d.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_sub2d.hpp
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ namespace dl
3838
* false: the output will store to a separate memory
3939
*/
4040
Sub2D(const int output_exponent, const Activation<feature_t> *activation = NULL, const char *name = "Sub2D", bool inplace = false) : Layer(name),
41-
output_exponent(output_exponent), activation(activation), output(NULL), inplace(inplace), output_shape({})
41+
output_exponent(output_exponent),
42+
activation(activation),
43+
output(NULL),
44+
inplace(inplace),
45+
output_shape({})
4246
{
4347
}
4448

‎tools/sdk/esp32/include/esp-face/include/layer/dl_layer_transpose.hpp

Copy file name to clipboardExpand all lines: tools/sdk/esp32/include/esp-face/include/layer/dl_layer_transpose.hpp
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ namespace dl
3333
* @param inplace true: the output will store to input
3434
* false: the output will store to a separate memory
3535
*/
36-
Transpose(std::vector<int> perm = {}, const char *name = "Transpose", bool inplace = false) : Layer(name), perm(perm), inplace(inplace), output_shape({})
36+
Transpose(std::vector<int> perm = {}, const char *name = "Transpose", bool inplace = false) : Layer(name),
37+
output(NULL),
38+
inplace(inplace),
39+
perm(perm),
40+
output_shape({})
3741
{
3842
}
3943

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.