diff --git a/.vscode/arduino.json b/.vscode/arduino.json index 5095d0a..6490a26 100644 --- a/.vscode/arduino.json +++ b/.vscode/arduino.json @@ -2,5 +2,5 @@ "sketch": "project\\project.ino", "output": "build", "board": "arduino:avr:uno", - "port": "COM4" + "port": "COM6" } \ No newline at end of file diff --git a/build/core/CDC.cpp.d b/build/core/CDC.cpp.d index d7609c4..b984687 100644 --- a/build/core/CDC.cpp.d +++ b/build/core/CDC.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\CDC.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\CDC.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\CDC.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\USBAPI.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/CDC.cpp.o b/build/core/CDC.cpp.o index 1f489d5..664610e 100644 Binary files a/build/core/CDC.cpp.o and b/build/core/CDC.cpp.o differ diff --git a/build/core/HardwareSerial.cpp.d b/build/core/HardwareSerial.cpp.d index ef096d4..7d9c8fa 100644 --- a/build/core/HardwareSerial.cpp.d +++ b/build/core/HardwareSerial.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\HardwareSerial.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/HardwareSerial.cpp.o b/build/core/HardwareSerial.cpp.o index e57f12f..b4a9820 100644 Binary files a/build/core/HardwareSerial.cpp.o and b/build/core/HardwareSerial.cpp.o differ diff --git a/build/core/HardwareSerial0.cpp.d b/build/core/HardwareSerial0.cpp.d index c44fb0c..2158467 100644 --- a/build/core/HardwareSerial0.cpp.d +++ b/build/core/HardwareSerial0.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial0.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial0.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\HardwareSerial0.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/HardwareSerial0.cpp.o b/build/core/HardwareSerial0.cpp.o index 3d6841a..9c3f4a7 100644 Binary files a/build/core/HardwareSerial0.cpp.o and b/build/core/HardwareSerial0.cpp.o differ diff --git a/build/core/HardwareSerial1.cpp.d b/build/core/HardwareSerial1.cpp.d index ee1e31b..d5dd7fd 100644 --- a/build/core/HardwareSerial1.cpp.d +++ b/build/core/HardwareSerial1.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial1.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial1.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\HardwareSerial1.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/HardwareSerial1.cpp.o b/build/core/HardwareSerial1.cpp.o index 23b6487..4166dd6 100644 Binary files a/build/core/HardwareSerial1.cpp.o and b/build/core/HardwareSerial1.cpp.o differ diff --git a/build/core/HardwareSerial2.cpp.d b/build/core/HardwareSerial2.cpp.d index 46f143b..d08e421 100644 --- a/build/core/HardwareSerial2.cpp.d +++ b/build/core/HardwareSerial2.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial2.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial2.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\HardwareSerial2.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/HardwareSerial2.cpp.o b/build/core/HardwareSerial2.cpp.o index b862112..781af67 100644 Binary files a/build/core/HardwareSerial2.cpp.o and b/build/core/HardwareSerial2.cpp.o differ diff --git a/build/core/HardwareSerial3.cpp.d b/build/core/HardwareSerial3.cpp.d index 725b2ba..946aee3 100644 --- a/build/core/HardwareSerial3.cpp.d +++ b/build/core/HardwareSerial3.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial3.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\HardwareSerial3.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\HardwareSerial3.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/HardwareSerial3.cpp.o b/build/core/HardwareSerial3.cpp.o index 4153776..97c0c15 100644 Binary files a/build/core/HardwareSerial3.cpp.o and b/build/core/HardwareSerial3.cpp.o differ diff --git a/build/core/IPAddress.cpp.d b/build/core/IPAddress.cpp.d index 8e4ca69..0980850 100644 --- a/build/core/IPAddress.cpp.d +++ b/build/core/IPAddress.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\IPAddress.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\IPAddress.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\IPAddress.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino/Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino/binary.h \ diff --git a/build/core/IPAddress.cpp.o b/build/core/IPAddress.cpp.o index a977a0c..92db6d1 100644 Binary files a/build/core/IPAddress.cpp.o and b/build/core/IPAddress.cpp.o differ diff --git a/build/core/PluggableUSB.cpp.d b/build/core/PluggableUSB.cpp.d index 73e41a0..f0f9c6f 100644 --- a/build/core/PluggableUSB.cpp.d +++ b/build/core/PluggableUSB.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\PluggableUSB.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\PluggableUSB.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\PluggableUSB.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\USBAPI.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/PluggableUSB.cpp.o b/build/core/PluggableUSB.cpp.o index 3cbd2ec..1d94447 100644 Binary files a/build/core/PluggableUSB.cpp.o and b/build/core/PluggableUSB.cpp.o differ diff --git a/build/core/Print.cpp.d b/build/core/Print.cpp.d index aad2c05..d918958 100644 --- a/build/core/Print.cpp.d +++ b/build/core/Print.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\Print.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\Print.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Print.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/Print.cpp.o b/build/core/Print.cpp.o index baf37b3..c420b26 100644 Binary files a/build/core/Print.cpp.o and b/build/core/Print.cpp.o differ diff --git a/build/core/Stream.cpp.d b/build/core/Stream.cpp.d index 92cb451..8078ecf 100644 --- a/build/core/Stream.cpp.d +++ b/build/core/Stream.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\Stream.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\Stream.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Stream.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/Stream.cpp.o b/build/core/Stream.cpp.o index b31941a..83f8472 100644 Binary files a/build/core/Stream.cpp.o and b/build/core/Stream.cpp.o differ diff --git a/build/core/Tone.cpp.d b/build/core/Tone.cpp.d index ec9aef9..e84adba 100644 --- a/build/core/Tone.cpp.d +++ b/build/core/Tone.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\Tone.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\Tone.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Tone.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\binary.h \ diff --git a/build/core/Tone.cpp.o b/build/core/Tone.cpp.o index 849256e..4703711 100644 Binary files a/build/core/Tone.cpp.o and b/build/core/Tone.cpp.o differ diff --git a/build/core/USBCore.cpp.d b/build/core/USBCore.cpp.d index 82c666c..5eeab6d 100644 --- a/build/core/USBCore.cpp.d +++ b/build/core/USBCore.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\USBCore.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\USBCore.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\USBCore.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\USBAPI.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/USBCore.cpp.o b/build/core/USBCore.cpp.o index a1a7eb4..944ad98 100644 Binary files a/build/core/USBCore.cpp.o and b/build/core/USBCore.cpp.o differ diff --git a/build/core/WInterrupts.c.d b/build/core/WInterrupts.c.d index 8691bef..cc62427 100644 --- a/build/core/WInterrupts.c.d +++ b/build/core/WInterrupts.c.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\WInterrupts.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\WInterrupts.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\WInterrupts.c \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_private.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/WInterrupts.c.o b/build/core/WInterrupts.c.o index b277ad4..a306d59 100644 Binary files a/build/core/WInterrupts.c.o and b/build/core/WInterrupts.c.o differ diff --git a/build/core/WMath.cpp.d b/build/core/WMath.cpp.d index d4583bb..03a0266 100644 --- a/build/core/WMath.cpp.d +++ b/build/core/WMath.cpp.d @@ -1,2 +1,2 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\WMath.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\WMath.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\WMath.cpp diff --git a/build/core/WMath.cpp.o b/build/core/WMath.cpp.o index 6f7c3fb..170fe84 100644 Binary files a/build/core/WMath.cpp.o and b/build/core/WMath.cpp.o differ diff --git a/build/core/WString.cpp.d b/build/core/WString.cpp.d index 8434e11..0ba7209 100644 --- a/build/core/WString.cpp.d +++ b/build/core/WString.cpp.d @@ -1,3 +1,3 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\WString.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\WString.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\WString.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\WString.h diff --git a/build/core/WString.cpp.o b/build/core/WString.cpp.o index e5c6ef9..c950f05 100644 Binary files a/build/core/WString.cpp.o and b/build/core/WString.cpp.o differ diff --git a/build/core/abi.cpp.d b/build/core/abi.cpp.d index 814e565..ead4ce5 100644 --- a/build/core/abi.cpp.d +++ b/build/core/abi.cpp.d @@ -1,2 +1,2 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\abi.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\abi.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\abi.cpp diff --git a/build/core/abi.cpp.o b/build/core/abi.cpp.o index b3cc388..9942552 100644 Binary files a/build/core/abi.cpp.o and b/build/core/abi.cpp.o differ diff --git a/build/core/core.a b/build/core/core.a index f93f37b..77f1e20 100644 Binary files a/build/core/core.a and b/build/core/core.a differ diff --git a/build/core/hooks.c.d b/build/core/hooks.c.d index 01af615..e7a6c5b 100644 --- a/build/core/hooks.c.d +++ b/build/core/hooks.c.d @@ -1,2 +1,2 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\hooks.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\hooks.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\hooks.c diff --git a/build/core/hooks.c.o b/build/core/hooks.c.o index 53ef781..a0d484b 100644 Binary files a/build/core/hooks.c.o and b/build/core/hooks.c.o differ diff --git a/build/core/main.cpp.d b/build/core/main.cpp.d index ff65eac..2909dae 100644 --- a/build/core/main.cpp.d +++ b/build/core/main.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\main.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\main.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\main.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino/Arduino.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino/binary.h \ diff --git a/build/core/main.cpp.o b/build/core/main.cpp.o index 7aebefa..966d893 100644 Binary files a/build/core/main.cpp.o and b/build/core/main.cpp.o differ diff --git a/build/core/new.cpp.d b/build/core/new.cpp.d index d14a5ad..892acbc 100644 --- a/build/core/new.cpp.d +++ b/build/core/new.cpp.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\new.cpp.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\new.cpp.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\new.cpp \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\new.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\new diff --git a/build/core/new.cpp.o b/build/core/new.cpp.o index b201847..6fafe43 100644 Binary files a/build/core/new.cpp.o and b/build/core/new.cpp.o differ diff --git a/build/core/wiring.c.d b/build/core/wiring.c.d index a50e545..aa7f71b 100644 --- a/build/core/wiring.c.d +++ b/build/core/wiring.c.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring.c \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_private.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/wiring.c.o b/build/core/wiring.c.o index b03989d..5b65db1 100644 Binary files a/build/core/wiring.c.o and b/build/core/wiring.c.o differ diff --git a/build/core/wiring_analog.c.d b/build/core/wiring_analog.c.d index 57b6873..d2be7ed 100644 --- a/build/core/wiring_analog.c.d +++ b/build/core/wiring_analog.c.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_analog.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_analog.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_analog.c \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_private.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/wiring_analog.c.o b/build/core/wiring_analog.c.o index c4e6253..a87a0d8 100644 Binary files a/build/core/wiring_analog.c.o and b/build/core/wiring_analog.c.o differ diff --git a/build/core/wiring_digital.c.d b/build/core/wiring_digital.c.d index a031e43..afb98e8 100644 --- a/build/core/wiring_digital.c.d +++ b/build/core/wiring_digital.c.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_digital.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_digital.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_digital.c \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_private.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/wiring_digital.c.o b/build/core/wiring_digital.c.o index 84517c6..757e462 100644 Binary files a/build/core/wiring_digital.c.o and b/build/core/wiring_digital.c.o differ diff --git a/build/core/wiring_pulse.S.d b/build/core/wiring_pulse.S.d index 1958ca1..7810120 100644 --- a/build/core/wiring_pulse.S.d +++ b/build/core/wiring_pulse.S.d @@ -1,2 +1,2 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_pulse.S.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_pulse.S.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_pulse.S diff --git a/build/core/wiring_pulse.c.d b/build/core/wiring_pulse.c.d index 502deb4..edb364f 100644 --- a/build/core/wiring_pulse.c.d +++ b/build/core/wiring_pulse.c.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_pulse.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_pulse.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_pulse.c \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_private.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/wiring_pulse.c.o b/build/core/wiring_pulse.c.o index 8231ce2..b7c07d8 100644 Binary files a/build/core/wiring_pulse.c.o and b/build/core/wiring_pulse.c.o differ diff --git a/build/core/wiring_shift.c.d b/build/core/wiring_shift.c.d index 88e19aa..dda34bd 100644 --- a/build/core/wiring_shift.c.d +++ b/build/core/wiring_shift.c.d @@ -1,4 +1,4 @@ -c:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_shift.c.o: \ +C:\Users\dimae\OneDrive\Рабочий\ стол\lab_html\build\core\wiring_shift.c.o: \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_shift.c \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\wiring_private.h \ C:\Users\dimae\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.8.6\cores\arduino\Arduino.h \ diff --git a/build/core/wiring_shift.c.o b/build/core/wiring_shift.c.o index 7cecad2..ef42e8c 100644 Binary files a/build/core/wiring_shift.c.o and b/build/core/wiring_shift.c.o differ diff --git a/build/sketch/project.ino.cpp.o b/build/sketch/project.ino.cpp.o index 6c384e2..19be8cf 100644 Binary files a/build/sketch/project.ino.cpp.o and b/build/sketch/project.ino.cpp.o differ diff --git a/main.py b/main.py index 4c2a02f..e4a1769 100644 --- a/main.py +++ b/main.py @@ -1,27 +1,27 @@ from fastapi import FastAPI import serial +import uvicorn +import threading app = FastAPI() -# Открываем последовательный РїРѕСЂС‚ -ser = serial.Serial('COM4', 9600) -count = 0 +ser = serial.Serial('COM6', 9600) +line = '0' -@app.get("/count") -async def get_count(): - global count - count += 1 - return {"count": count} +def read_value(): + global line + while True: + if ser.in_waiting > 0: + line = ser.read().decode() + +threading.Thread(target=read_value, daemon=True).start() + +@app.get("/stat") +async def get_stat(): + return {'state': line} @app.get("/") async def root(): - if ser.is_open: - # Читаем данные СЃ порта, если РїРѕСЂС‚ открыт - sensor_val = ser.readline().strip().decode() - return {"sensor_value": sensor_val} - else: - return {"error": "Serial port is not open"} + return {'message': 'hello world'} -if __name__ == "__main__": - import uvicorn - uvicorn.run(app, host="0.0.0.0", port=12345) +uvicorn.run(app, host="0.0.0.0", port=12346)