Skip to content

Commit 49b1849

Browse files
authored
Merge pull request #2 from TrackPlatformTeam/development
api-v4.1.2-cxx
2 parents f9c9e20 + 2a99620 commit 49b1849

File tree

290 files changed

+167
-9604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+167
-9604
lines changed

.gitignore

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ TestResult.xml
4545
[Rr]eleasePS/
4646
dlldata.c
4747

48+
# Benchmark Results
49+
BenchmarkDotNet.Artifacts/
50+
4851
# .NET Core
4952
project.lock.json
5053
project.fragment.lock.json
@@ -186,6 +189,7 @@ AppPackages/
186189
BundleArtifacts/
187190
Package.StoreAssociation.xml
188191
_pkginfo.txt
192+
*.appx
189193

190194
# Visual Studio cache files
191195
# files ending in .cache can be ignored
@@ -281,11 +285,18 @@ __pycache__/
281285
# tools/**
282286
# !tools/packages.config
283287

288+
# Tabs Studio
289+
*.tss
290+
284291
# Telerik's JustMock configuration file
285292
*.jmconfig
286293

287294
# BizTalk build output
288295
*.btp.cs
289296
*.btm.cs
290297
*.odx.cs
291-
*.xsd.cs
298+
*.xsd.cs
299+
300+
# AJIOB_Exclude
301+
Output
302+
Build*

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "cxx_serial_support"]
2-
path = code/c++/cxx-api/serial_support
2+
path = cxx-api/serial_support
33
url = https://github.com/wjwwood/serial.git
44
[submodule "cxx_gamepad_support"]
5-
path = code/c++/cxx-gamepad-app/gamepad_support
5+
path = cxx-gamepad-app/gamepad_support
66
url = https://github.com/AJIOB/libstem_gamepad.git
77
[submodule "cxx_libcrc"]
8-
path = code/c++/cxx-api/libcrc
8+
path = cxx-api/libcrc
99
url = https://github.com/lammertb/libcrc.git

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010

1111
Используемые модули:
1212
- Wi-Fi (ESP8266)
13-
- Bluetooth (HC-05)
13+
- Bluetooth (HC-06)
1414
- Драйвер двигателя (L298N)
1515
- Поворотная платформа
16-
17-
Для отладки требуется небольная модификация исходников Arduino IDE в соответствии с [этой](https://playground.arduino.cc/Main/Printf) статьей.
16+
- Одноцветный OLED дисплей 128x64 на основе контроллера SSD1306
1817

1918
Датчики расстояния объеденены в модуль, который несложно снимается, что позволяет заменить датчики. В модуле 5 датчиков расстояния, расположенных под различными углами для улучшения ориентирования на местности. Так же углы поворота датчиков можно настраивать в небольшом диапазоне. Расположены спереди платформы.
2019

code/Arduino/RCa03124

-2.83 KB
Binary file not shown.

code/Arduino/config/Constants.cpp

Lines changed: 0 additions & 73 deletions
This file was deleted.

code/Arduino/config/Constants.h

Lines changed: 0 additions & 65 deletions
This file was deleted.

code/Arduino/connection/Bluetooth.cpp

Lines changed: 0 additions & 16 deletions
This file was deleted.

code/Arduino/connection/Bluetooth.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)