From 8b76430a9b3e7647115b9ebcfaf7d5bcc8a38676 Mon Sep 17 00:00:00 2001 From: Adrian Bowyer Date: Sat, 30 Nov 2013 15:48:03 +0000 Subject: [PATCH] RRP logo updated. --- Configuration.h | 4 ++-- Platform.cpp | 1 - Platform.h | 4 +++- Release/RepRapFirmware.bin | Bin 166116 -> 166116 bytes SD-image/sys/config.g | 8 +++++--- SD-image/www/logo.png | Bin 1912 -> 6698 bytes 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Configuration.h b/Configuration.h index f5f6d28..4c82d84 100644 --- a/Configuration.h +++ b/Configuration.h @@ -24,8 +24,8 @@ Licence: GPL #define CONFIGURATION_H #define NAME "RepRapFirmware" -#define VERSION "0.26" -#define DATE "2013-11-29" +#define VERSION "0.27" +#define DATE "2013-11-30" #define LAST_AUTHOR "reprappro.com" // Other firmware that we might switch to be compatible with. diff --git a/Platform.cpp b/Platform.cpp index a3ba48c..6d68129 100644 --- a/Platform.cpp +++ b/Platform.cpp @@ -332,7 +332,6 @@ void Platform::SetHeater(int8_t heater, const float& power) if(heatOnPins[heater] < 0) return; - byte p = (byte)(255.0*fmin(1.0, fmax(0.0, power))); if(HEAT_ON == 0) p = 255 - p; diff --git a/Platform.h b/Platform.h index 376b903..5877066 100644 --- a/Platform.h +++ b/Platform.h @@ -125,7 +125,7 @@ Licence: GPL #define STANDBY_TEMPERATURES {ABS_ZERO, ABS_ZERO} // We specify one for the bed, though it's not needed #define ACTIVE_TEMPERATURES {ABS_ZERO, ABS_ZERO} #define COOLING_FAN_PIN 34 -#define HEAT_ON 0 // 0 for inverted heater (eg Duet v0.6) +#define HEAT_ON 0 // 0 for inverted heater (eg Duet v0.6) 1 for not (e.g. Duet v0.4) #define AD_RANGE 1023.0//16383 // The A->D converter that measures temperatures gives an int this big as its max value @@ -595,6 +595,8 @@ class Platform byte gateWay[4]; }; +// Seconds + inline float Platform::Time() { unsigned long now = micros(); diff --git a/Release/RepRapFirmware.bin b/Release/RepRapFirmware.bin index daa6a78797c345629a6212f426c5bc1b56b73af6..3a9d887f76ad1ec2e5671d0f012a4e37ed2a8b2a 100755 GIT binary patch delta 41 xcmaDdk?YAsu7(!IElg~|qUH=b3Mq*tsVNE!Mh1q)x`u|j#s=G^gPBg60ss=J3)cVu delta 41 xcmaDdk?YAsu7(!IElg~|qGk*_3Mq*tsVNE!Mh1q)x`u|jMwZ*9gPBg60ss=l3*G<# diff --git a/SD-image/sys/config.g b/SD-image/sys/config.g index 5fd2ff1..60035b2 100644 --- a/SD-image/sys/config.g +++ b/SD-image/sys/config.g @@ -4,11 +4,13 @@ M111 S1; Debug on M550 POrmerod; Set the machine's name M551 Preprap; Set the password M552 P192.168.1.14; Set the IP address -M555 P2 -M92 E420 +M553 P255.255.255.0; Set netmask +M554 P192.168.1.1; Set the gateway +M555 P2; Emulate Marlin USB output +M92 E420; Set extruder steps/mm G21 ; Work in mm G90 ; Absolute positioning M83 ; Extrusions relative -G31 Z0.0 P500 ; Set Z probe height and threshold +G31 Z0.5 P500 ; Set Z probe height and threshold M906 X800 Y800 Z800 E800 ; Motor currents (mA) T0 ; Select extruder 0 diff --git a/SD-image/www/logo.png b/SD-image/www/logo.png index 50ce9fba162168da4708ecbd42eee16f7a8a912f..57aec530229230edcd1b3ea2f91ca6278e41083b 100644 GIT binary patch literal 6698 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 VvmE<-Ef8wpCNHflRRl8%{2zcc9kT!c literal 1912 zcmV-;2Z#8HP)Px%%1}&HMF)Ta09672kN^Xc005N$0G0p%mjMfu005W+0GR*)ng9Wu00o@@0H6Q~ zo&W%$005!@0HXl_qyqq@00O1}2B!c3ssI4101K!90IUE2tpE?H006H60I&l9u?7RN z00^=G0JQ)Bwg3&Y006fD2eb|VwhsWf006Zg0JjkUxc~sQDFC<=47CsdxfKAr0|2@g z0J$Oww;=$#7y!B?0KFOjyd?m>900v00KG5(za0R+C;+}O0KX{!zcK*8DgeMV0KqE& z!8HKFEdatc0K+!`!#@DTH~_^!0LD20#z6tcIsnH*7{fmk#Yr2)Kpn+F8OKW?#zG>; zL?y^YFU3kH$wnc{PBF$yDauDP$4oTHO*Y9+MZ{Sx%}F=QPdUs`JIzr;%UC?lQaI0A zM$KAB&Ra;&TuRVgP|jmZ(OyT=WJuFxOw(Ue(PdQ9W>wQ?ThVM>(rs7NXjs*0Uej)7 z(QR4QYGTxBTGwk})o@|fac0zaV%KtK)p%prb8OafYS(&g*K}^!b!*vsaM*!t+I(%> zeRbJs{lH{F}<(``4o|NXFo8_OC z=b)hErJ3fYo#vpS<))hFr=I7bqUNWZ=%}OTsHEtrtLLhv>8q*ev8?E;s_C+)>#eKm zv#jg1v+A_1?X|S)wYciLvh2LI?6$Y% z!1BY(@XN*W%E|H4%<;^|^UKQe)6MeD$Mnt1^wiSw)X((J)AQBM_0`n$*3S0V)%Dlf z_21U_+1>To+xFnz_S)R{;obP+-z0(vwTGW z0004WQchCMy6*)cd6951N8c9S!R9M69n7?ZjK@`Ug7!da6<}uaoNwDy`Kv2{mq*F1C z<#8Zb`U7n*g$VIi6HH^LHdh!8SVRl)&sf_o-bN0n$9AA~HNO;fR?fPQWD zgoX&jLC5Ca3J7$764*xp6)Z6aKiT#V#63CmR#MDy00t4y^LVJ2u*~3q!xJjYYgg~&};80kLNBG??SBUd2?=Yu=GMaG-aT~Sp_}Cm{AAhIZrj_JFN(nSJ(@B#1VOMWDFjcqrS;UzGWlMgKIMJ`prZ?hzC4ZG=-$^}2h||r-Y)4hus56@*aF9%XN ze*aJF)b(i4Msjj0CNUA?fEe=pEbjYqTpjlyD`y12J{uO5ANrM*m7u{DO-)`2z0`G? zJHEF)-`Wc2Vd^@SkywT7Ic$L=Q#iM6mBtATC@bfEIe8y_=Pgk?ZL7+`d3M|~GvINS ztWkeKx|@!Z#MzyZv&Uj92h$wVwXd(m^zqoa_JfdxI6*+5aC|y)hN7TWf<&PQ90e~t zH;0Qx3arzPoFGE_Z>&sM3OyN5DE3R-;Kg(m6y!i;PlA_GOkMSivxcDq2;^)8lY0I@ zUQQ?`?zUhrcRniJ<#O~IH+S4_HQRzBGGnbJ_5zIO(CazC2%_Xh@& yFGzcQ-K*jk%VL}El@l(?dryi@THpHim+TKN<^NHswWw$S00006!)r