diff --git a/Computer_Interface/Computer_Interface.pde b/Computer_Interface/Computer_Interface.pde index 4ac3d41..4305077 100644 --- a/Computer_Interface/Computer_Interface.pde +++ b/Computer_Interface/Computer_Interface.pde @@ -4,11 +4,11 @@ //uncomment the line where your board is connected //String LA_port = "/dev/ttyACM0"; //linux DFU //String LA_port = "/dev/ttyUSB0"; //linux Serial -String LA_port = "COM3"; //windows +//String LA_port = "COM11"; //windows //Uncomment the board that you are using //String board = "MEGA"; -String board = "UNO"; +//String board = "UNO"; //String board = "STM32F1"; //String board = "ESP8266"; //String board = "CUSTOM" @@ -149,7 +149,7 @@ class Box int height; void clear() { - stroke(white); // no borders + stroke(white); fill(black); rect(from_left, from_top, width, height); } @@ -171,6 +171,7 @@ class Button String text; void draw() { + stroke(white); fill(grey); rect(from_left, from_top, width, height, corners); fill(white); @@ -247,7 +248,7 @@ void setup() board_port.bufferUntil('\n'); //todo - yBottom = box_graph.from_top; + yBottom = box_scroll_bar.from_top; int button_y_position = y_screen_size - 30; xShift = (width - scroll_bar.width) / 2; diff --git a/Computer_Interface/DrawFunctions.pde b/Computer_Interface/DrawFunctions.pde index 6179e97..d3126fb 100644 --- a/Computer_Interface/DrawFunctions.pde +++ b/Computer_Interface/DrawFunctions.pde @@ -145,6 +145,7 @@ void DrawChannelSignals() } // finally we draw the lines + stroke(green); line(xPos[n] + xShift, yPos, xTime[i] + xShift, yPos); // straight line line(xTime[i] + xShift, yPos, xTime[i] + xShift, yDiff); // vertical line @@ -170,8 +171,7 @@ void DrawChannelSignals() textSize(10); textCovered = !textCovered; dashline(xTime[i] + xShift, firstchange, xTime[i] + xShift, yBottom, spacing); - text(round(usTime[i]), xTime[i] + xShift + 2, (textCovered == true) ? yBottom : yBottom + 10); //write on different height - stroke(green); + text(round(usTime[i]), xTime[i] + xShift + 2, (textCovered == true) ? yBottom : yBottom - 10); //write on different height } } }