From 01c3f16fe8ef729ccea150de33b3a96988142f19 Mon Sep 17 00:00:00 2001 From: kiyu-git <47422498+kiyu-git@users.noreply.github.com> Date: Sun, 8 Jan 2023 22:28:35 +0900 Subject: [PATCH 1/2] Update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c6162f9..8f41fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,4 @@ cython_debug/ Data/ **/.DS_Store +workspace/ From 92b09d18c77bd0207027baff0f03db31af583b92 Mon Sep 17 00:00:00 2001 From: kiyu-git <47422498+kiyu-git@users.noreply.github.com> Date: 2023年4月29日 14:02:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Update:=20=E3=83=9C=E3=83=BC=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=929600=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 6 ++++++ .../ADC_Serial_sender_1ch/ADC_Serial_sender_1ch.ino | 10 +++++----- Python/main.py | 5 ++--- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cc9f045 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter" + }, + "python.formatting.provider": "none" +} diff --git a/Arduino Sketch/ADC_Serial_sender_1ch/ADC_Serial_sender_1ch.ino b/Arduino Sketch/ADC_Serial_sender_1ch/ADC_Serial_sender_1ch.ino index 1f93a4d..2b53b1e 100644 --- a/Arduino Sketch/ADC_Serial_sender_1ch/ADC_Serial_sender_1ch.ino +++ b/Arduino Sketch/ADC_Serial_sender_1ch/ADC_Serial_sender_1ch.ino @@ -2,7 +2,7 @@ void setup() { - Serial.begin(2000000); + Serial.begin(9600); } @@ -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); } diff --git a/Python/main.py b/Python/main.py index 3654a17..1280ba1 100644 --- a/Python/main.py +++ b/Python/main.py @@ -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 """ @@ -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))

AltStyle によって変換されたページ (->オリジナル) /