From 9c5b1d24d0b61a4cfff04968197f80a68b0980e2 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Thu, 12 Feb 2015 00:08:48 +0000 Subject: [PATCH] Corrections to 1.00h Corrected web interface status responses --- Release/RepRapFirmware-1.00h.bin | Bin 214464 -> 214456 bytes RepRapFirmware.cpp | 14 +++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Release/RepRapFirmware-1.00h.bin b/Release/RepRapFirmware-1.00h.bin index 8eaebfbca736998c9cc323056e320ae95f7f773c..387573c29591a6f4b4ec7b4792f0a69e79300dd1 100644 GIT binary patch delta 2753 zcmZvee^AuN8OHa0zjt!Sd2%R+oMO2HEjS?+VhozX2r3AQBUY%*h!sbjz|@XVaf+kH zbF`I4ZS07%wu2F)R;+ZyqO%Y|uwW$>6{}ch)QFK(Y^Yu;4re6LXRoxKcKXNXp67k{ z-5&E|r!HsMvCM4D@i_@Xyy z={#zYO=UEfS`=-f4I$H6b=prheE=4|vJWk+@3NgVA9a4rGHu;01d?F8XAH zgYW{H03Aeqr|u6D_6NBep>6We@98L&%CuIR<~ci3?K?L*<5F#8mN~;hf$-MK!oHg0qGO zLWfKz-5Ex-h#4Bl8`gt(U((6Jfvm4YTvzA4$1RvJ-eD8%AvX1@l~%CXg44*AEB-*2 zU1wqYKs)FMHJ}PuWXffnU%A?TnW7A;l1KhX%k!!x+XO8%3X128=KuAMbH+kbhEZVn zJ|1>wIGS|(e{!||C->`r=H!wqG!8SYy+TRWxbZj>P%MvMq0Qz}*h)F2gZ9%|+0a4D z=#~t8*o3)U87jE-@itW?G6{N2*?I^jup>%oXs3($z&tW<6E6%v8lvKD5<9dqE$ViFGG~4)`!=8OR3h;25|Ee83NSWLGzx zvTkwXbih3Mvxjt^s#W@D6h*FDr0PKn(BG~XI{99(XqQ_b(GKz{>Y)?7D$;{A&?U)Q zK_rwy5Q&;fcuC2-*SOvVCg z;BToFf2CLx6{?>+rNu^QZVa{vWC8)=<>y~gtMeG_S)dnE3f%*0WYgbiH-3?`p3{1= z`;ZcNd@UeCUh1do)&$r%kg5*7paGtg178TrKslIgH^ld#`CyGY8k$^FdU|YaGFgzULzN1z#kK?H=7^4a~ z|Ha@`-ChayfEwfz(C-#B5?ZAWnfNl9a^PiS5Pwttd=y{6>uOODztZoTEGw^PXoHOh z*x7<*_KP65NVTR`qsw-$*Xxs)#&DE*W+DziJ{iM5z)LJIgcn1Ohj1+9Y6wpcEqnu; zgKx7odT1c3Sv2pIp$@)6z4E?;*FzSC@;2&JS3|j#?cHzU2Xi`}xEVGvRvrrDrFI?0 zAdH4Cl3$1Me5+3NVc4m1k&{;j!mH>wL!NVTl64k}_kv9M!pSj#@K=G*6VChX&tSiJ z%O-}QCV4TOrw8lQT`)XD4ux~HRmY#9Bt=dg&nsOztOY4ZEdU4R28#mdR(WJRPkdcB zA027dO^$PM4MygG$5>!mXv(gdpSIf3q-!qd8u?^AzZ)2_W2DP}k60AJ(*sNF(({8| z^5nl#NB^CA62Vb{Ri4o)8S28<)KfI;P^GvS|3)k_Z2~LyzoovKz<(Jh}zV~boQ7iT*@q- zWbgbo9&g~&sxD^n`7ml%Tffie89Hkf-(=S-bQi)u{0#a$;C*j$} zHDxp7#T%#6-{aFv#p;EZmyI%)qb*Y{*@ZrVaStLcSBdX4-Y@|#H}2&P=Hfv5Z+rQ* zQTF;-ftAnJE38pdD)_uPu-bj<^I!6=5id&)bF1}!lV~2qCJ2>M#oL0YQ8k_5Is;mA zierMPULE)y-?d@?N-psArMCF!wPmG0`p&8!N58EWk2T(7TCT2z8Ba;Igd3StC|6pO wjnl3U`~$fIxBh=`09OX|6#xJL delta 2780 zcmZvee^8Xi8OQh8_s;X>I62~-a){v$P-8VC2nI}X1cegqgEYp0#iFe)#*8E z#D0XWS#TC21S}e9M7>loc7jnWshC=OsW^8kfqwT&+i9nNeD3@F z+GqEDci(&8mOYlvJr=Kx$hzN7@wzqL%$jwR)7q3tlQinyzsj(bx|_}zMwD}A>=FDf z(N*ZUt`X!^SjTm$Y%2Y7g@YQKE(UfwsZwS~kv5)+W$p~RZZsCZWM-Apl|&1*QM)vS zmS$16X!p=U>Xx*XHboc|J7RDDicX`y)a&RyPByvs811oAxO6nph>>i< z(Ms#6QS4}?F8;^oa=}ORnBXV1(X{CWm~aEA0`;H`+yH)H7;k2*;(Hl3s8j4}qkYDZ zDedi)%3V1K_m49(TO`t;7=8h?4B8lBX4~ZtJLnEyQZ?$=LkED>hI&u{Hh@Y{0}3%F zAJoET&=jTM2F7?n;(n8}6WT2f|Bil59+BBavs^8s)&8^L?u*`-T$9`Bw!4P|tB2D{ zh5{cxn=XFQMfRcK11Yswa}j{mi-XSF~ zKN@kmt?erRpP2Xm#6I|EOf0!f<1xef%ap1oPQ=oHM;yOQ+l<>`){7}Uw4d5UYY#1> zJ`s6^8fZ|oU!k4G;wUqV5t&zM6M4nit27Py+gIsoS*=V1u5dIZ>Y=O2(t~Sg=~i&0L`NP@3aU1$hl8w zBUyq7ja82?aEgnAbWKl#nFw;^;inYflb6FT0~MeK%(rN44YU|+kY|E)LUR<)GBfVc z+$~axLfM`Sfn| zs6#AxJ}g7!Ye6+=Mm!DU`k)EWlk%{EUn0YD*rLtEr;4AC;U80#Tx{Ym)Vn5E=Nmb+ z)yxCj-i>7rGLw^K=owxN*;P?d5fm54@mOO<5>_J~j^jVTOROk@zX>@W!KXp4MDXOu zvf0>3T+RBp;XrH$>!=oyR(_fM;#Xgn<`Y#T9!})%ggV|B9rE8DOQU#lXo}mdU&tGXdgPXD?lMrc z5V?G^<<@ucc!Qu)c|Mn)vyo5k_&z_!p>x;r>)fHGVcS`7B!D(A0Av20zEI04#W+z$ z-|Kj0r0X5N3}eLBQa*|L<-t-eOnNbfCV~n%r=0&qvlPHqu`G}wU){n#=aeXo9zIdi zRb4*FkyEyDym%93_PhKvCy#tu!IzCO)*x3Pm+Z!vP~STEH8SaE9B-JAEw=3Cn~a`N z_^*5Uj4_tZxuKQMS1W9mQx5QR#?WdH$*+FNcaPel{0Q&T@3pfIL%O<{}t-0Qd_GVdkrT~17XYSSK* zY@VRyPoaE4>DuXNAHG8RKtJ$ 0.0) ? (platform->Time() - lastLayerTime) : 0.0); // Raw Extruder Positions - response.catf("],\"extrRaw\":"); // announce the extruder positions + response.cat(",\"extrRaw\":"); // announce the extruder positions ch = '['; for (size_t drive = 0; drive < reprap.GetExtrudersInUse(); drive++) // loop through extruders { @@ -1204,15 +1204,19 @@ void RepRap::GetNameResponse(StringRef& response) const // Get the list of files in the specified directory in JSON format void RepRap::GetFilesResponse(StringRef& response, const char* dir) const { - response.copy("{\"files\":"); - char c = '['; + response.copy("{\"files\":["); FileInfo file_info; + bool firstFile = true; bool gotFile = platform->GetMassStorage()->FindFirst(dir, file_info); while (gotFile && response.strlen() + strlen(file_info.fileName) + 6 < response.Length()) { - response.catf("%c", c); + if (!firstFile) + { + response.catf(","); + } EncodeString(response, file_info.fileName, 3, false); - c = ','; + + firstFile = false; gotFile = platform->GetMassStorage()->FindNext(file_info); } response.cat("]}");