Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-30 06:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Over_The_Air_Update' of

Browse Source 
https://github.com/sle118/squeezelite-esp32.git into Over_The_Air_Update

Conflicts:
	components/wifi-manager/wifi_manager.c
This commit is contained in:
Sebastien
2019-09-23 14:13:29 -04:00
parent 47d06a8dc2 f84ce1e947
commit c34cf06be1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.cdt.core.prefs
View File

@@ -1,3 +1,6 @@
=\=\=\=\=\=\=
<<<<<<<=HEAD
>>>>>>>=refs/remotes/origin/Over_The_Air_Update
eclipse.preferences.version=1 eclipse.preferences.version=1
environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/delimiter=\: environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/delimiter=\:
environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/operation=append environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/operation=append

4
partitions.csv
View File

@@ -3,5 +3,5 @@
nvs, data, nvs, 0x9000, 0x4000, nvs, data, nvs, 0x9000, 0x4000,
otadata, data, ota, 0xD000, 0x2000, otadata, data, ota, 0xD000, 0x2000,
phy_init, data, phy, 0xF000, 0x1000, phy_init, data, phy, 0xF000, 0x1000,
recovery, app, factory, 0x10000, 0x100000, recovery, app, factory, 0x10000, 0x140000,
ota_0, app, ota_0, 0x110000, 0x2F0000, ota_0, app, ota_0, 0x150000, 0x2B0000,
1 # Name, Type, SubType, Offset, Size, Flags
3 nvs, data, nvs, 0x9000, 0x4000,
4 otadata, data, ota, 0xD000, 0x2000,
5 phy_init, data, phy, 0xF000, 0x1000,
6 recovery, app, factory, 0x10000, 0x100000, recovery, app, factory, 0x10000, 0x140000,
7 ota_0, app, ota_0, 0x110000, 0x2F0000, ota_0, app, ota_0, 0x150000, 0x2B0000,