Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Keyboard Controls #1

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Updated Keyboard Controls #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f86983f
updated keyboard controls
Advay17 Jun 29, 2024
6f18837
added gitignore
Advay17 Jun 29, 2024
18dc470
improved buttons
Advay17 Jul 2, 2024
c7ef939
updated buttons and index.html
Advay17 Jul 2, 2024
ef06796
Merge remote-tracking branch 'upstream/main'
Advay17 Oct 13, 2024
7675169
configured pestolink to use 2 controllers
Advay17 Oct 13, 2024
0022380
Update index.js
Advay17 Oct 20, 2024
9080042
Update index.html
Advay17 Oct 16, 2024
dcfd1b9
this should work
Advay17 Dec 14, 2024
cabd145
Update index.js
Advay17 Dec 14, 2024
8c18083
Update index.js
Advay17 Dec 14, 2024
f1e561c
Update index.js
Advay17 Dec 14, 2024
4245390
Update index.js
Advay17 Dec 14, 2024
1304eb6
Merge remote-tracking branch 'origin/upsteam-merge-test' into upstrea…
Advay17 Dec 14, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.hintrc
15 changes: 15 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "msedge",
"request": "launch",
"name": "Launch Edge against localhost",
"url": "http://localhost:8000",
"webRoot": "${workspaceFolder}"
}
]
}
133 changes: 92 additions & 41 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">

<title>PestoLink-Online</title>
<title>PestoLink-Basil</title>
<link rel="stylesheet" href="styles.css">
</head>

Expand All @@ -20,25 +20,42 @@
<div id="joystick-container"></div>
</div>
</div>

<div class="container desktop-only" id="desktop-axis">
<div class="slider-non">Axis 0</div>
<div class="slider-non" id="axisValue0">127</div>
<div class="slider-bar" id="bar0"></div>

<div class="slider-non">Axis 1</div>
<div class="slider-non" id="axisValue1">127</div>
<div class="slider-bar" id="bar1"></div>

<div class="slider-non">Axis 2</div>
<div class="slider-non" id="axisValue2">127</div>
<div class="slider-bar" id="bar2"></div>

<div class="slider-non">Axis 3</div>
<div class="slider-non" id="axisValue3">127</div>
<div class="slider-bar" id="bar3"></div>
<div>
<div class="container desktop-only" id="desktop-axis">
<div class="slider-non">Axis 0</div>
<div class="slider-non" id="0axisValue0">127</div>
<div class="slider-bar" id="0bar0"></div>

<div class="slider-non">Axis 1</div>
<div class="slider-non" id="0axisValue1">127</div>
<div class="slider-bar" id="0bar1"></div>

<div class="slider-non">Axis 2</div>
<div class="slider-non" id="0axisValue2">127</div>
<div class="slider-bar" id="0bar2"></div>

<div class="slider-non">Axis 3</div>
<div class="slider-non" id="0axisValue3">127</div>
<div class="slider-bar" id="0bar3"></div>
</div>
<div class="container desktop-only" id="desktop-axis1">
<div class="slider-non">Axis 0</div>
<div class="slider-non" id="1axisValue0">127</div>
<div class="slider-bar" id="1bar0"></div>

<div class="slider-non">Axis 1</div>
<div class="slider-non" id="1axisValue1">127</div>
<div class="slider-bar" id="1bar1"></div>

<div class="slider-non">Axis 2</div>
<div class="slider-non" id="1axisValue2">127</div>
<div class="slider-bar" id="1bar2"></div>

<div class="slider-non">Axis 3</div>
<div class="slider-non" id="1axisValue3">127</div>
<div class="slider-bar" id="1bar3"></div>
</div>
</div>

<div class="container" id="interface">
<button id="ble-button">🔗</button>
<button id="telemetry">no data</button>
Expand All @@ -63,6 +80,12 @@
<div id="toggle-info" class="toggle-round"><div class="toggle-nub"></div></div>
</div>

<div class="settings-label help-row">Dual Input</div>

<div class="settings-toggle help-row">
<div id="toggle-dual-controllers" class="toggle-round"><div class="toggle-nub"></div></div>
</div>

</div>
</div>

Expand All @@ -77,29 +100,57 @@
<button id="button-0">0</button>
<div></div>
</div>

<div class="container desktop-only" id="desktop-button">
<button id="buttonDesktop0">0</button>
<button id="buttonDesktop1">1</button>
<button id="buttonDesktop2">2</button>
<button id="buttonDesktop3">3</button>
<button id="buttonDesktop4">4</button>
<button id="buttonDesktop5">5</button>
<button id="buttonDesktop6">6</button>
<button id="buttonDesktop7">7</button>
<button id="buttonDesktop8">8</button>
<button id="buttonDesktop9">9</button>
<button id="buttonDesktop10">10</button>
<button id="buttonDesktop11">11</button>
<button id="buttonDesktop12">12</button>
<button id="buttonDesktop13">13</button>
<button id="buttonDesktop14">14</button>
<button id="buttonDesktop15">15</button>
<div>
<div class="container desktop-only" id="desktop-button">
<button id="0buttonDesktop0">0</button>
<button id="0buttonDesktop1">1</button>
<button id="0buttonDesktop2">2</button>
<button id="0buttonDesktop3">3</button>
<button id="0buttonDesktop4">4</button>
<button id="0buttonDesktop5">5</button>
<button id="0buttonDesktop6">6</button>
<button id="0buttonDesktop7">7</button>
<button id="0buttonDesktop8">8</button>
<button id="0buttonDesktop9">9</button>
<button id="0buttonDesktop10">10</button>
<button id="0buttonDesktop11">11</button>
<button id="0buttonDesktop12">12</button>
<button id="0buttonDesktop13">13</button>
<button id="0buttonDesktop14">14</button>
<button id="0buttonDesktop15">15</button>
</div>
<div class="container desktop-only" id="desktop-button1" >
<button id="1buttonDesktop0">0</button>
<button id="1buttonDesktop1">1</button>
<button id="1buttonDesktop2">2</button>
<button id="1buttonDesktop3">3</button>
<button id="1buttonDesktop4">4</button>
<button id="1buttonDesktop5">5</button>
<button id="1buttonDesktop6">6</button>
<button id="1buttonDesktop7">7</button>
<button id="1buttonDesktop8">8</button>
<button id="1buttonDesktop9">9</button>
<button id="1buttonDesktop10">10</button>
<button id="1buttonDesktop11">11</button>
<button id="1buttonDesktop12">12</button>
<button id="1buttonDesktop13">13</button>
<button id="1buttonDesktop14">14</button>
<button id="1buttonDesktop15">15</button>
</div>
</div>
</div>

<div id="info-container">
<p>
<u>PestoLink Basil</u>
<br>
An all new version of PestoLink made by Kavin from team 5338 Roboloco!
Featuring:
<br>
-Better keyboard controls that allow for use of all buttons(not just the first few)
<br>
-Dual Controller Support to emulate FRC better
<br><br>
<u>Embedded Platform Support</u>
<br> <a href="https://github.com/AlfredoSystems/PestoLink-MicroPython">PestoLink</a> currently supports two embedded platforms, MicroPython and Arduino
(designed for <a href="https://www.sparkfun.com/products/22230">RP2040 on XRP Kits</a> and <a href="https://www.alfredosys.com/products/alfredo-nou2/">ESP32</a> respectively).
Expand All @@ -112,15 +163,15 @@

<br><br> <u>What does "Override axes with WASD" do?</u>
<br> By default, keyboard data is sent seperatly from axis/button data. If you would like to drive your robot using your keyboard,
you can enable this switch to override the axis/button data with keyboard input. 'WASD' wil override Axis 0 and 1, 'IJKL' will override Axis 2 and 3.
'ZXCVBNM,' will overide buttons 0 through 7.
you can enable this switch to override the axis/button data with keyboard input. 'WASD' will override Axis 0 and Axis 1. 'IJKL' will override Axis 2 and Axis 3.
'QERTYUOPZXCVBNM,' will override the number buttons. Currently, a way to change button maps is in progress.

<br><br> If you have any questions, feel free to reach out! ([email protected])
<br><br> If you have any questions, feel free to reach out to me at [email protected]!
</p>
</div>

<div id="hack-spacer"></div>
<script src="index.js"></script>
</body>

</html>
</html>
Loading