Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,4 @@ cython_debug/

Data/
**/.DS_Store
workspace/
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
"python.formatting.provider": "none"
}
10 changes: 5 additions & 5 deletions Arduino Sketch/ADC_Serial_sender_1ch/ADC_Serial_sender_1ch.ino
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

void setup() {

Serial.begin(2000000);
Serial.begin(9600);

}

Expand All @@ -12,13 +12,13 @@ void loop() {
int sensorValue0 = analogRead(A0);
// if you read more data
// int sensorValue1 = analogRead(A1);

// print out the value you read:
Serial.println(sensorValue0);
// if you read more data
// Serial.print(",");
// Serial.print(",");
// Serial.println(sensorValue1);
// sampling rate 1 / 10 milli sconds = 100Hz

// sampling rate 1 / 10 milli seconds = 100Hz
delay(10);
}
5 changes: 2 additions & 3 deletions Python/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
import numpy as np
import pyqtgraph as pg
import serial
import tools
from PyQt5 import QtCore, QtWidgets, uic
from PyQt5.QtCore import pyqtSignal

import tools

"""
Set Logger
"""
Expand Down Expand Up @@ -176,7 +175,7 @@ def set_serial_port(self, serial_port):

def measure_start(self):
try:
self.arduino = serial.Serial(self.serial_port, 2000000)
self.arduino = serial.Serial(self.serial_port, 9600)

self.store_data = StoreData(self.arduino, self.settings)
self.store_data.singal.connect(lambda errorCode: self.on_error(errorCode))
Expand Down