From f1050e5b271e74a544a7c2884b4c27a25d8ff574 Mon Sep 17 00:00:00 2001 From: Martin Ger Date: Thu, 7 Jun 2018 08:40:48 +0200 Subject: [PATCH] Fix in init_data --- firmware/0x00000.bin | Bin 43392 -> 43376 bytes firmware/0x10000.bin | Bin 309404 -> 309372 bytes firmware/sha1sums | 2 ++ user/config_flash.c | 22 +++++++++++++--------- user/user_config.h | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 firmware/sha1sums diff --git a/firmware/0x00000.bin b/firmware/0x00000.bin index 0dc7bcc9bb0003fffc0c176f96df52823df0db5d..e121372650099e1fce02b8714b64e60a3187de64 100644 GIT binary patch delta 2442 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 Xt9es|VXCXM+A4?1t{L0eF);PNf=aF8 diff --git a/firmware/0x10000.bin b/firmware/0x10000.bin index 213e632939d2e39f219f70ec024e2535190860ad..3b7a6d41038b9671db9ca7f5eed876f1dacb92b2 100644 GIT binary patch delta 2419 zcmWlae^gY*702J5d5>igWI+_ER+i9hP%y4dJj7!19;f1ufN@)~g+z}a*!bJE4c4E{ z+SG`(*7Yp-r~KHI5q^b&0vTQ{u=bHcg$) z$tfDGQ`lqVy<~kIgFr~ zd+2qth7l_5_{*ZhzsizYfzS);Y{PmG4!4U*txIEF_Ov~#QiP5i~0%F>E3)eyj6;T-6 zODxhUKEBvY;!hiZa5f=feX0@4gm$R3-*J682a)cO>Kw`pG65&#Ed)y zB0xbNgzc~aTp%Fce=IZ#h)qwcw3Hw!io^`y0Y>)&8c{%gIaEN8EEJG;zel66^B7Wk z97ep>2FXKc2G90r1?Y@=7UxA5xM30)$}_; z+f8d}oh{b(=d{H_A-U`w(p44-$m74F3vr~#W&7x(v6}rf_CiiSN!hX9i#zB?EW?Fb zUFS1K4PJMuC#t)Vhw+hk<<(9)5nF4Gq*L)&TULqYjZUCk{xL0? zOKGxq9LtO?@vjqDA4_SUWHVZGZAM9s&8R~>AltIo{3Ns+dX9aPNHgTM0w&8SNA9X) z`LSoXSkE3!V0ZS*GhOT#M20!-EX%j{>~|QApiI`BW%snHrOghb1Sp`t$ze2rnP9LH z-!|}r)u0rppvT;Ij_pnHA9NT4NAXm!dMv7Y%&F(uxY4VTMtZZ2Qj{vdawgp>Zk?b5J*FuhrR1ZtRQa4%r?S^BL^JDR(rOgv|v8y zN50aI&k7zuKPPG>pdEQFa2|;2FM`sR=u*AGjOuTqxEvG8;EixC@HRzte{*c2!)S$b z-~j4ra1d7E58;8|;>3dMh=cH_a1Y!H8bPgDeu3qtY((fe9@QH%hxJByxmkaKWxr)d zdBzDW1@t#KjB0ozIEUB^H^S|(2R;X{hChT$;p^}WcmU3U2Vooh#Kci=#Y({)#7;N_ zcL4)&8So>nZjGAxeJo>PEt2~vDs53c5x9}t;R-kpcEK;gGeIdZkXOKYup1r^$AgWC ze+eQJZ8%6ReQbf9g67aIRuC7$ISMzM-wm@%EYfU7!|Xo^$|3w3c!K=z>|M%}z5if+ zxS-a_%>(RjL_xXmU#yB!T$ofF#Cl*i@W?;hW><*3vi>f!FbbGW_n1y0^X5I)X^mh; zPPU>Lvi?5Hr6k3V+e$=rJ8a0S57@K#vgPB4tPi)l?EZp@c=DJlo}xpoY*>25_(2zHW+3RuWG(C>rU{-f*82HU^TKNLnYOc5PDcaZ~ zo3Y4jvGT99AO=J7a00(YSn&2lzC~-tXsx6qE*U9iZ!*7<6ppp{KDKY3&G?qwXN%2F zG}ou{DhkU#r*ezNB8TN?>HJ~r8oQdo7ceac^9Q73Jiozdz$80gM_c83JFkk%m^t5O zl)e+yufJ+D{5zuhAaEjoQ$F}MpU*Vo2#$wYIFaAh<{)&*$&!fZ7+gA(PM8R{Vm{yWN%Gu6#p z%L_P+=jEQ+YI!QXEN_>qj$|s9Nh?&WB1aajQeWaUDBoVIrZD=Gtaq!Uh%U*t_39Xv zJTh3LJ|?P^XMd)Chf%qCcawUBip}oLY8@5ISGK615iK$&Zd3DdiYvFNVyv07U(J)% O`_--S^3!HDnDKu-BejPB delta 2454 zcmWlae^eCL7036!H^Z_BG9U_6D?@P`6n|i=2Mwk(p7^6wh%{oWF&-CzM*M;64=ny_ zFwv+r*7YnnRzX$;1(oCK1D~X*Yc!3m^<>R4OduXjS>L$@dqFwskKR$f!z3=Va znY%NO=i%grFO&T)qHJ#|81SAZJVr<%+dq zr*kS67suU?lGrnf}e`aU*#+4JAd(Dg9oXI!C{~ycEbS>6un>Xr?F?F%V$smwNWDv z0}ZhbLWoV+1>7JgK6oNj3W~MQ%G9I~D!RlD-~+DC2h=a00-da#5(B9A<`l>R_y zyS9p!Ytgp9q4jnO%Zhi%P?&Z~9{DYuk0D)F?52;>RPz*OAtxTAtZ47~?et5Q?nbTd zdEN z0cFds!7PJQx%}Huc7Y`YMrdYtj%F5SYi29rr?M@R%}k)nvUfE5G@gp(^?WAh&?LFN zj^z<`$cy#t(NGp|$u;2@ZQcqC@`8RB7x_hw|7A;c+&H|SZWtp$C+ z^LVFO$PZv&pjh~YaBFS<@_(@R@H%$= zlU*RDxaGPY_IIKia`wMj86~-~X_TSa|rhiW2p$=iKwUJN=-jNvz#!xLQw0qgq?K8rlo3I`vf zj-0BQZmY$?zg0t649kOY{0`xQH^uYyY5=PZk`lONlwx%y@~a89Lr$~f=NMm+W=@d1 zwdii$T9M4l=&}4HncG#S9g?4?@`ur5>{>dX#negI|5Q4M@SB{TTBP&kxUUsDFN;Z^ zGgC85-ia9hc||jQTksfwT;$v2gCFvlOm*Swiml1R`CWApLbn_>f*YL0R>-PRd|@2! z?s^{2?~mI_n8vr_7pkAekN5BII*g|Z6a(8~`O0kmD#!77a1QUM;;3n#&p%AW@mRf# z?_%^^s%}0e6(`#GtvrX(I9a-#=O^K4YTUqMJPYmvV=#7Emz zUkk=5x3}?2L?KypoaZqdv0K{tfI%$YFZW&I{~b&lp>-X@j3E%M<16hh+zLu!O zsdU<^NKw3WMfRpBXNY!6{~%?KLer&Vu=1^fTOnOBI1Q1Lvy_~4G+s7IX|m(LqwGIL zS;y5vztfy0cTQL4CS&v6xr#H9iey5if~y!Ir!G-m;`EJtyGlu7^ogu@D+36pZrciF zkV0?CK(+FOs7#*uwellI^Q?Pom8(=_b*@wD=wU$0!HFJBU8CGSy2C&tZQRk2ccudJx7s$Bh|E{#3P##k9RpmeAIAC|Gh AHvj+t diff --git a/firmware/sha1sums b/firmware/sha1sums new file mode 100644 index 0000000..e22535a --- /dev/null +++ b/firmware/sha1sums @@ -0,0 +1,2 @@ +6d0d78a5dcacc730d09bdaec896fd17ff46c71a5 0x00000.bin +22155ab48cdc32157e0750b275cc0ffaf8d54a81 0x10000.bin diff --git a/user/config_flash.c b/user/config_flash.c index 4977ab2..7c05a7f 100644 --- a/user/config_flash.c +++ b/user/config_flash.c @@ -133,9 +133,11 @@ const uint8_t esp_init_data_default[] = { "\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"}; void user_rf_pre_init() { + uint8_t esp_init_data_current[sizeof(esp_init_data_default)]; + enum flash_size_map size_map = system_get_flash_size_map(); - uint32 rf_cal_sec = 0, addr, rfCalData, i; - os_printf("\nUser preinit: "); + uint32 rf_cal_sec = 0, addr, i; + //os_printf("\nUser preinit: "); switch (size_map) { case FLASH_SIZE_4M_MAP_256_256: rf_cal_sec = 128 - 5; @@ -159,12 +161,13 @@ void user_rf_pre_init() { rf_cal_sec = 0; break; } + addr = ((rf_cal_sec) * SPI_FLASH_SEC_SIZE)+SPI_FLASH_SEC_SIZE; - - for (i=0; i