From f998ea2a52076acd08a4be0a85d3b2e30ecf6408 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 4 Mar 2020 13:02:14 -0500 Subject: [PATCH] retrofit to gcc8/CMake --- .pydevproject | 8 ++++++++ components/esp-dsp | 1 + components/platform_config/CMakeLists.txt | 7 +++++++ components/platform_console/CMakeLists.txt | 7 +++++++ components/platform_console/component.mk | 12 ++++++++++++ components/squeezelite-ota/CMakeLists.txt | 6 ++++++ components/tools/CMakeLists.txt | 4 ++++ flash_cmd.txt | 18 ++++++++++++++++++ writeSequeezeEsp.bat | 5 +++++ writeSequeezeEsp.sh | 5 +++++ 10 files changed, 73 insertions(+) create mode 100644 .pydevproject create mode 160000 components/esp-dsp create mode 100644 components/platform_config/CMakeLists.txt create mode 100644 components/platform_console/CMakeLists.txt create mode 100644 components/platform_console/component.mk create mode 100644 components/squeezelite-ota/CMakeLists.txt create mode 100644 components/tools/CMakeLists.txt create mode 100644 flash_cmd.txt create mode 100644 writeSequeezeEsp.bat create mode 100644 writeSequeezeEsp.sh diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 00000000..af296c54 --- /dev/null +++ b/.pydevproject @@ -0,0 +1,8 @@ + + + + Default + + python interpreter + + diff --git a/components/esp-dsp b/components/esp-dsp new file mode 160000 index 00000000..8b082c10 --- /dev/null +++ b/components/esp-dsp @@ -0,0 +1 @@ +Subproject commit 8b082c1071497d49346ee6ed55351470c1cb4264 diff --git a/components/platform_config/CMakeLists.txt b/components/platform_config/CMakeLists.txt new file mode 100644 index 00000000..681021ec --- /dev/null +++ b/components/platform_config/CMakeLists.txt @@ -0,0 +1,7 @@ +idf_component_register(SRCS "nvs_utilities.c" "platform_config.c" + INCLUDE_DIRS . + INCLUDE_DIRS . ../tools/ + REQUIRES nvs_flash json platform_console services vfs +) + + diff --git a/components/platform_console/CMakeLists.txt b/components/platform_console/CMakeLists.txt new file mode 100644 index 00000000..ca644dcc --- /dev/null +++ b/components/platform_console/CMakeLists.txt @@ -0,0 +1,7 @@ +set(COMPONENT_ADD_INCLUDEDIRS .) + +set(COMPONENT_SRCS "platform_console.c" "cmd_ota.c" "cmd_nvs.c" "cmd_i2ctools.c" "cmd_squeezelite.c" "cmd_system.c" "cmd_wifi.c" ) + +set(COMPONENT_REQUIRES console nvs_flash spi_flash app_update platform_config vfs pthread wifi-manager) + +register_component() diff --git a/components/platform_console/component.mk b/components/platform_console/component.mk new file mode 100644 index 00000000..12afca4b --- /dev/null +++ b/components/platform_console/component.mk @@ -0,0 +1,12 @@ +# +# Component Makefile +# +# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default, +# this will take the sources in the src/ directory, compile them and link them into +# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable, +# please read the SDK documents if you need to do this. +# + +COMPONENT_ADD_INCLUDEDIRS := . +COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/ +COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main diff --git a/components/squeezelite-ota/CMakeLists.txt b/components/squeezelite-ota/CMakeLists.txt new file mode 100644 index 00000000..1b495278 --- /dev/null +++ b/components/squeezelite-ota/CMakeLists.txt @@ -0,0 +1,6 @@ +idf_component_register(SRCS "squeezelite-ota.c" + INCLUDE_DIRS . + REQUIRES console spi_flash console freertos platform_console esp_https_ota + ) + + diff --git a/components/tools/CMakeLists.txt b/components/tools/CMakeLists.txt new file mode 100644 index 00000000..47356349 --- /dev/null +++ b/components/tools/CMakeLists.txt @@ -0,0 +1,4 @@ +idf_component_register(SRCS "utf8.c" + REQUIRES esp_common pthread + INCLUDE_DIRS . + ) \ No newline at end of file diff --git a/flash_cmd.txt b/flash_cmd.txt new file mode 100644 index 00000000..0109fb27 --- /dev/null +++ b/flash_cmd.txt @@ -0,0 +1,18 @@ + +====LINUX==== +To flash sequeezelite run the following script: +./writeSequeezeEsp.sh [PORT_HERE] [BAUD_RATE] +e.g. ./writeSequeezeEsp.sh /dev/ttyUSB0 115200 + +====WINDOWS==== +To flash sequeezelite run the following script: +./writeSequeezeEsp.bat [PORT_HERE] [BAUD_RATE] +e.g. ./writeSequeezeEsp.bat COM11 115200 + +If you don't know how to run the BAT file with arguments then you can +edit the bat file in Notepad. Open the file up and edit the following: +Change 'set port=%1' to 'set port=[PORT_HERE]'. E.g. 'set port=COM11' +Change 'set baud=%2' to 'set baud=[BAUD_RATE]'. E.g. 'set baud=115200' + +====MANUAL==== +Python esptool.py --port [PORT_HERE] --baud [BAUD_RATE] write_flash --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 bootloader/bootloader.bin 0x8000 partitions.bin 0xd000 ota_data_initial.bin 0x10000 recovery.bin 0x150000 squeezelite.bin diff --git a/writeSequeezeEsp.bat b/writeSequeezeEsp.bat new file mode 100644 index 00000000..2e092d2c --- /dev/null +++ b/writeSequeezeEsp.bat @@ -0,0 +1,5 @@ +echo off + +set port=%1 +set baud=%2 +Python esptool.py --port %port% --baud %baud% write_flash --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 bootloader/bootloader.bin 0x8000 partitions.bin 0xd000 ota_data_initial.bin 0x10000 recovery.bin 0x150000 squeezelite.bin diff --git a/writeSequeezeEsp.sh b/writeSequeezeEsp.sh new file mode 100644 index 00000000..5f4b9806 --- /dev/null +++ b/writeSequeezeEsp.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +port=$1 +baud=$2 +Python esptool.py --port $port --baud $baud write_flash --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 bootloader/bootloader.bin 0x8000 partitions.bin 0xd000 ota_data_initial.bin 0x10000 recovery.bin 0x150000 squeezelite.bin