mike/stir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

minor changes, bug fixes

Browse Source
This commit is contained in:
Michael Wesemann 2019-03-12 09:36:26 +01:00
parent 589de4957a
commit 2ef9de522c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stir.ino
View File

@ -7,7 +7,7 @@
#define SX Serial.print #define SX Serial.print
#define SXN Serial.println #define SXN Serial.println
String VERSION = "1.5.2"; String VERSION = "1.5.3";
int SPEEDINC = 50; // speed increment (rpm) int SPEEDINC = 50; // speed increment (rpm)
@ -209,7 +209,7 @@ void loop() { //////////////////////////////////////////////////////////////////
if (S==3) cat[M]++; // cat 0 on/off if (S==3) cat[M]++; // cat 0 on/off
if (S==4) ctime[M]+=10; // cat time 0 up if (S==4) ctime[M]+=10; // cat time 0 up
if (S==5) rtime[M]+=10; // rise time 0 up if (S==5) rtime[M]+=10; // rise time 0 up
if (S==6) otime[M]++; // off time 0 up if (S==6) otime[M]+=3; // off time 0 up
} }
} else { // turn encoder counterclockwise } else { // turn encoder counterclockwise
if (M==2) S--; // scroll menu if (M==2) S--; // scroll menu
@ -220,7 +220,7 @@ void loop() { //////////////////////////////////////////////////////////////////
if (S==3) cat[M]--; // cat 0 on/off if (S==3) cat[M]--; // cat 0 on/off
if (S==4) ctime[M]-=10; // cat time 0 down if (S==4) ctime[M]-=10; // cat time 0 down
if (S==5) rtime[M]-=10; // rise time 0 down if (S==5) rtime[M]-=10; // rise time 0 down
if (S==6) otime[M]--; // off time 0 down if (S==6) otime[M]-=3; // off time 0 down
} }
} }
@ -248,6 +248,7 @@ void loop() { //////////////////////////////////////////////////////////////////
void oset(int n,int t) { ///////////////////////////////////////////////////////////////// set switch off timer void oset(int n,int t) { ///////////////////////////////////////////////////////////////// set switch off timer
otime[n]=cut(t,0,99);ots[n]=MS;ostate[n]=otime[n]?1:0; otime[n]=cut(t,0,99);ots[n]=MS;ostate[n]=otime[n]?1:0;
SAVE++;
} }
void fset(int n,int s) { /////////////////////////////////////////////////////////////// set fan state (on/off) void fset(int n,int s) { /////////////////////////////////////////////////////////////// set fan state (on/off)
@ -256,6 +257,7 @@ void fset(int n,int s) { ///////////////////////////////////////////////////////
} else { } else {
F[n]=0;bstate[n]=0; F[n]=0;bstate[n]=0;
} }
SAVE++;
} }
void bset(int n,int s) { ///////////////////////////////////////////////////////////// set boost state (on/off) void bset(int n,int s) { ///////////////////////////////////////////////////////////// set boost state (on/off)
@ -264,6 +266,7 @@ void bset(int n,int s) { ///////////////////////////////////////////////////////
} else { } else {
bstate[n]=0;rts=MS+RDELAY;updatePWM(); bstate[n]=0;rts=MS+RDELAY;updatePWM();
} }
SAVE++;
} }
void updatelcd() { ///////////////////////////////////////////////////////////////////////////////// update LCD void updatelcd() { ///////////////////////////////////////////////////////////////////////////////// update LCD
@ -295,7 +298,6 @@ void updatespeed() { ///////////////////////////////////////////////////////////
if (F[i]) { if (F[i]) {
if (bstate[i]) ilcd(1+i*3,0,-2, (((long)btime[i]*60000)-(MS-(long)bts[i]))/1000/60+1); if (bstate[i]) ilcd(1+i*3,0,-2, (((long)btime[i]*60000)-(MS-(long)bts[i]))/1000/60+1);
else if (ostate[i]) ilcd(1+i*3,0,-2, (((long)otime[i]*3600000)-(MS-(long)ots[i]))/1000/60/60+1); else if (ostate[i]) ilcd(1+i*3,0,-2, (((long)otime[i]*3600000)-(MS-(long)ots[i]))/1000/60/60+1);
else slcd(0,0,1," ");
ilcd(7+i*5,0,-4,round(xpm[i])); ilcd(7+i*5,0,-4,round(xpm[i]));
if ((!bstate[i] && xv[i]<v[i]) || (bstate[i] && xb[i]<b[i])) clcd(6+i*5,0,1); if ((!bstate[i] && xv[i]<v[i]) || (bstate[i] && xb[i]<b[i])) clcd(6+i*5,0,1);
} else slcd(7+i*5,0,-4,"OFF"); } else slcd(7+i*5,0,-4,"OFF");

3
stirctl
View File

@ -18,7 +18,7 @@ $cmd=join(':',@ARGV);$cmd='info' if ($cmd=~/^\s*$/);
@r=split(':',&scmd($cmd)); @r=split(':',&scmd($cmd));
print " Left Right\n"; print " Left Right\n";
printf("Stirrer On: %6d %6d\n", $r[0],$r[14]); printf("Stirrer On: %6d %6d\n", $r[0],$r[14]);
printf("Speed: %6d %6d\n", $r[1],$r[15]); printf("Speed: %6d %6d\n", $r[1],$r[15]);
printf("Boost Speed: %6d %6d\n", $r[2],$r[16]); printf("Boost Speed: %6d %6d\n", $r[2],$r[16]);
@ -54,7 +54,6 @@ sub scmd() { ###################################################################
} }
$msg=~s/[\r\n]+//g; $msg=~s/[\r\n]+//g;
print "$msg\n";
return $msg; return $msg;
} }