informatic/sejf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Management, update arduino, add initial webapp

Browse Source
This commit is contained in:
Piotr Dobrowolski
2017-09-09 23:44:49 +02:00
parent b6f4601972
commit fd6f26f202
7 changed files with 76 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arduino/src/main.ino
View File

@@ -188,23 +188,18 @@ if (win){
}
void logTasks(){
LogSerial.print("tasks: ");
CommandSerial.print("TASKS:");
for(int i=0; i<N_TASKS; i++){
LogSerial.print(i+1);
LogSerial.print(": ");
LogSerial.print(taskLifetimes[i]);
LogSerial.print("\t\t");
CommandSerial.print(i);
CommandSerial.print(":");
if(taskLifetimes[i]) CommandSerial.print(("y")); else CommandSerial.print(("n"));
CommandSerial.print("#");
CommandSerial.print(taskLifetimes[i]);
if (i < N_TASKS-1) CommandSerial.print(",");
}
LogSerial.println();
CommandSerial.println();
}
void setSlide(int n){
CommandSerial.print("SLIDE:");
CommandSerial.println(n);
switch(n){
case 1:
log("signalling slide 1.");
@@ -484,7 +479,7 @@ void setup() {
// set the digital pin as output:
pinMode(13, OUTPUT);
LogSerial.begin(115200);
CommandSerial.begin(9600);
CommandSerial.begin(115200);
setupPins();
keypad.addEventListener(keypadEvent);
prevKnobInput = map(analogRead(pin_knob), 0, 1024, 0, 10);