Cosmetics
This commit is contained in:
Wastl Kraus
parent
fbf4559da3
commit
6cd84f9685
|
|
@ -10,6 +10,7 @@
|
|||
#include <WiFi.h>
|
||||
|
||||
#include <DShotRMT.h>
|
||||
#include <web_content.h>
|
||||
|
||||
#include <ArduinoJson.h>
|
||||
#include <AsyncTCP.h>
|
||||
|
|
@ -62,358 +63,6 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
|
|||
bool connectToWiFi();
|
||||
void printWiFiStatus();
|
||||
|
||||
// Web Site Content
|
||||
const char index_html[] PROGMEM = R"rawliteral(
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||
<title>DShotRMT Web Client</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
background-color: #2c3e50;
|
||||
color: #ecf0f1;
|
||||
margin: 0;
|
||||
height: 100dvh;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 1.5em;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.control-container {
|
||||
background-color: #34495e;
|
||||
padding: 30px;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||
text-align: center;
|
||||
width: 85%;
|
||||
max-width: 500px;
|
||||
}
|
||||
|
||||
/* Arming Switch Styles */
|
||||
.arming-section {
|
||||
margin-bottom: 25px;
|
||||
padding: 15px;
|
||||
background-color: #2c3e50;
|
||||
border-radius: 8px;
|
||||
border: 2px solid #e74c3c;
|
||||
}
|
||||
|
||||
.arming-switch {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 15px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 60px;
|
||||
height: 34px;
|
||||
}
|
||||
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.slider-switch {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: #e74c3c;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
border-radius: 34px;
|
||||
}
|
||||
|
||||
.slider-switch:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
left: 4px;
|
||||
bottom: 4px;
|
||||
background-color: white;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
input:checked+.slider-switch {
|
||||
background-color: #27ae60;
|
||||
}
|
||||
|
||||
input:checked+.slider-switch:before {
|
||||
-webkit-transform: translateX(26px);
|
||||
-ms-transform: translateX(26px);
|
||||
transform: translateX(26px);
|
||||
}
|
||||
|
||||
.arming-label {
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.arming-status {
|
||||
font-size: 0.9em;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.status-disarmed {
|
||||
color: #e74c3c;
|
||||
}
|
||||
|
||||
.status-armed {
|
||||
color: #27ae60;
|
||||
}
|
||||
|
||||
/* Throttle Section */
|
||||
.throttle-section {
|
||||
opacity: 0.3;
|
||||
transition: opacity 0.3s ease;
|
||||
}
|
||||
|
||||
.throttle-section.armed {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#throttleValue {
|
||||
font-size: 2.5em;
|
||||
font-weight: bold;
|
||||
color: #3498db;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#throttleSlider {
|
||||
appearance: none;
|
||||
width: 100%;
|
||||
height: 25px;
|
||||
background: #2c3e50;
|
||||
outline: none;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
#throttleSlider::-webkit-slider-thumb {
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background: #3498db;
|
||||
cursor: pointer;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
#throttleSlider::-moz-range-thumb {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background: #3498db;
|
||||
cursor: pointer;
|
||||
border-radius: 50%;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.stats {
|
||||
margin-top: 20px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.stats span {
|
||||
font-weight: bold;
|
||||
color: #e67e22;
|
||||
}
|
||||
|
||||
.warning-text {
|
||||
color: #e74c3c;
|
||||
font-size: 0.9em;
|
||||
margin-top: 10px;
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>DShotRMT Web Client</h1>
|
||||
<div class="control-container">
|
||||
<!-- Arming Section -->
|
||||
<div class="arming-section">
|
||||
<div class="arming-switch">
|
||||
<span class="arming-label">ARMING SWITCH</span>
|
||||
<label class="switch">
|
||||
<input type="checkbox" id="armingSwitch">
|
||||
<span class="slider-switch"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="arming-status">
|
||||
<span id="armingStatus" class="status-disarmed">DISARMED</span>
|
||||
</div>
|
||||
<div class="warning-text">
|
||||
⚠️ Disabled when disarmed!
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Throttle Section -->
|
||||
<div class="throttle-section" id="throttleSection">
|
||||
<div id="throttleValue">0</div>
|
||||
<input type="range" min="48" max="2047" value="0" id="throttleSlider" disabled>
|
||||
</div>
|
||||
|
||||
<div class="stats">
|
||||
RPM: <span id="rpmValue">--</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const gateway = `ws://${window.location.hostname}/ws`;
|
||||
let websocket;
|
||||
let isArmed = false;
|
||||
|
||||
// Init WebSocket
|
||||
window.addEventListener('load', () => {
|
||||
initWebSocket();
|
||||
});
|
||||
|
||||
function initWebSocket() {
|
||||
console.log('Trying to open a WebSocket connection...');
|
||||
|
||||
websocket = new WebSocket(gateway);
|
||||
websocket.onopen = onOpen;
|
||||
websocket.onclose = onClose;
|
||||
websocket.onmessage = onMessage;
|
||||
}
|
||||
|
||||
function onOpen(event) {
|
||||
console.log('Connection opened');
|
||||
}
|
||||
|
||||
function onClose(event) {
|
||||
console.log('Connection closed');
|
||||
setTimeout(initWebSocket, 2000);
|
||||
}
|
||||
|
||||
// Getting data from sketch
|
||||
function onMessage(event) {
|
||||
try {
|
||||
const data = JSON.parse(event.data);
|
||||
|
||||
if (data.rpm !== undefined) {
|
||||
document.getElementById('rpmValue').innerText = data.rpm;
|
||||
}
|
||||
|
||||
// Sync web and serial throttle inputs
|
||||
if (data.throttle !== undefined) {
|
||||
if (isArmed) {
|
||||
document.getElementById('throttleSlider').value = data.throttle;
|
||||
document.getElementById('throttleValue').innerText = data.throttle;
|
||||
}
|
||||
}
|
||||
|
||||
// Sync arming status if received from ESP32
|
||||
if (data.armed !== undefined) {
|
||||
isArmed = data.armed;
|
||||
updateArmingUI();
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
console.error("Error parsing JSON: ", e);
|
||||
}
|
||||
}
|
||||
|
||||
// Elements
|
||||
const slider = document.getElementById('throttleSlider');
|
||||
const sliderValue = document.getElementById('throttleValue');
|
||||
const armingSwitch = document.getElementById('armingSwitch');
|
||||
const armingStatus = document.getElementById('armingStatus');
|
||||
const throttleSection = document.getElementById('throttleSection');
|
||||
|
||||
// Arming switch event
|
||||
armingSwitch.addEventListener('change', () => {
|
||||
isArmed = armingSwitch.checked;
|
||||
updateArmingUI();
|
||||
|
||||
// Send arming status to ESP32
|
||||
const message = JSON.stringify({
|
||||
"armed": isArmed,
|
||||
"throttle": isArmed ? parseInt(slider.value) : 0
|
||||
});
|
||||
|
||||
console.log("Sending arming status: ", message);
|
||||
websocket.send(message);
|
||||
|
||||
// If disarmed, set throttle to 0
|
||||
if (!isArmed) {
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
}
|
||||
});
|
||||
|
||||
// Update UI based on arming status
|
||||
function updateArmingUI() {
|
||||
|
||||
// Synch checkbox, as well
|
||||
armingSwitch.checked = isArmed;
|
||||
|
||||
if (isArmed) {
|
||||
armingStatus.innerText = 'ARMED';
|
||||
armingStatus.className = 'status-armed';
|
||||
throttleSection.classList.add('armed');
|
||||
slider.disabled = false;
|
||||
} else {
|
||||
armingStatus.innerText = 'DISARMED';
|
||||
armingStatus.className = 'status-disarmed';
|
||||
throttleSection.classList.remove('armed');
|
||||
slider.disabled = true;
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Throttle slider event
|
||||
slider.addEventListener('input', () => {
|
||||
if (!isArmed) {
|
||||
slider.disabled = true;
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
const throttle = slider.value;
|
||||
sliderValue.innerText = throttle;
|
||||
|
||||
const message = JSON.stringify({
|
||||
"throttle": parseInt(throttle),
|
||||
"armed": isArmed
|
||||
});
|
||||
|
||||
console.log("Sending throttle: ", message);
|
||||
websocket.send(message);
|
||||
});
|
||||
|
||||
// Initialize UI
|
||||
updateArmingUI();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
)rawliteral";
|
||||
|
||||
//
|
||||
void setup()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include <WiFi.h>
|
||||
|
||||
#include <DShotRMT.h>
|
||||
#include <web_content.h>
|
||||
|
||||
#include <ArduinoJson.h>
|
||||
#include <AsyncTCP.h>
|
||||
|
|
@ -58,358 +59,6 @@ void handleWebSocketMessage(void *arg, uint8_t *data, size_t len);
|
|||
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
|
||||
void setArmingStatus(bool armed);
|
||||
|
||||
// Web Site Content
|
||||
const char index_html[] PROGMEM = R"rawliteral(
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||
<title>DShotRMT Web Client</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
background-color: #2c3e50;
|
||||
color: #ecf0f1;
|
||||
margin: 0;
|
||||
height: 100dvh;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 1.5em;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.control-container {
|
||||
background-color: #34495e;
|
||||
padding: 30px;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||
text-align: center;
|
||||
width: 85%;
|
||||
max-width: 500px;
|
||||
}
|
||||
|
||||
/* Arming Switch Styles */
|
||||
.arming-section {
|
||||
margin-bottom: 25px;
|
||||
padding: 15px;
|
||||
background-color: #2c3e50;
|
||||
border-radius: 8px;
|
||||
border: 2px solid #e74c3c;
|
||||
}
|
||||
|
||||
.arming-switch {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 15px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 60px;
|
||||
height: 34px;
|
||||
}
|
||||
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.slider-switch {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: #e74c3c;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
border-radius: 34px;
|
||||
}
|
||||
|
||||
.slider-switch:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
left: 4px;
|
||||
bottom: 4px;
|
||||
background-color: white;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
input:checked+.slider-switch {
|
||||
background-color: #27ae60;
|
||||
}
|
||||
|
||||
input:checked+.slider-switch:before {
|
||||
-webkit-transform: translateX(26px);
|
||||
-ms-transform: translateX(26px);
|
||||
transform: translateX(26px);
|
||||
}
|
||||
|
||||
.arming-label {
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.arming-status {
|
||||
font-size: 0.9em;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.status-disarmed {
|
||||
color: #e74c3c;
|
||||
}
|
||||
|
||||
.status-armed {
|
||||
color: #27ae60;
|
||||
}
|
||||
|
||||
/* Throttle Section */
|
||||
.throttle-section {
|
||||
opacity: 0.3;
|
||||
transition: opacity 0.3s ease;
|
||||
}
|
||||
|
||||
.throttle-section.armed {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#throttleValue {
|
||||
font-size: 2.5em;
|
||||
font-weight: bold;
|
||||
color: #3498db;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#throttleSlider {
|
||||
appearance: none;
|
||||
width: 100%;
|
||||
height: 25px;
|
||||
background: #2c3e50;
|
||||
outline: none;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
#throttleSlider::-webkit-slider-thumb {
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background: #3498db;
|
||||
cursor: pointer;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
#throttleSlider::-moz-range-thumb {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background: #3498db;
|
||||
cursor: pointer;
|
||||
border-radius: 50%;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.stats {
|
||||
margin-top: 20px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.stats span {
|
||||
font-weight: bold;
|
||||
color: #e67e22;
|
||||
}
|
||||
|
||||
.warning-text {
|
||||
color: #e74c3c;
|
||||
font-size: 0.9em;
|
||||
margin-top: 10px;
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>DShotRMT Web Client</h1>
|
||||
<div class="control-container">
|
||||
<!-- Arming Section -->
|
||||
<div class="arming-section">
|
||||
<div class="arming-switch">
|
||||
<span class="arming-label">ARMING SWITCH</span>
|
||||
<label class="switch">
|
||||
<input type="checkbox" id="armingSwitch">
|
||||
<span class="slider-switch"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="arming-status">
|
||||
<span id="armingStatus" class="status-disarmed">DISARMED</span>
|
||||
</div>
|
||||
<div class="warning-text">
|
||||
⚠️ Disabled when disarmed!
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Throttle Section -->
|
||||
<div class="throttle-section" id="throttleSection">
|
||||
<div id="throttleValue">0</div>
|
||||
<input type="range" min="48" max="2047" value="0" id="throttleSlider" disabled>
|
||||
</div>
|
||||
|
||||
<div class="stats">
|
||||
RPM: <span id="rpmValue">--</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const gateway = `ws://${window.location.hostname}/ws`;
|
||||
let websocket;
|
||||
let isArmed = false;
|
||||
|
||||
// Init WebSocket
|
||||
window.addEventListener('load', () => {
|
||||
initWebSocket();
|
||||
});
|
||||
|
||||
function initWebSocket() {
|
||||
console.log('Trying to open a WebSocket connection...');
|
||||
|
||||
websocket = new WebSocket(gateway);
|
||||
websocket.onopen = onOpen;
|
||||
websocket.onclose = onClose;
|
||||
websocket.onmessage = onMessage;
|
||||
}
|
||||
|
||||
function onOpen(event) {
|
||||
console.log('Connection opened');
|
||||
}
|
||||
|
||||
function onClose(event) {
|
||||
console.log('Connection closed');
|
||||
setTimeout(initWebSocket, 2000);
|
||||
}
|
||||
|
||||
// Getting data from sketch
|
||||
function onMessage(event) {
|
||||
try {
|
||||
const data = JSON.parse(event.data);
|
||||
|
||||
if (data.rpm !== undefined) {
|
||||
document.getElementById('rpmValue').innerText = data.rpm;
|
||||
}
|
||||
|
||||
// Sync web and serial throttle inputs
|
||||
if (data.throttle !== undefined) {
|
||||
if (isArmed) {
|
||||
document.getElementById('throttleSlider').value = data.throttle;
|
||||
document.getElementById('throttleValue').innerText = data.throttle;
|
||||
}
|
||||
}
|
||||
|
||||
// Sync arming status if received from ESP32
|
||||
if (data.armed !== undefined) {
|
||||
isArmed = data.armed;
|
||||
updateArmingUI();
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
console.error("Error parsing JSON: ", e);
|
||||
}
|
||||
}
|
||||
|
||||
// Elements
|
||||
const slider = document.getElementById('throttleSlider');
|
||||
const sliderValue = document.getElementById('throttleValue');
|
||||
const armingSwitch = document.getElementById('armingSwitch');
|
||||
const armingStatus = document.getElementById('armingStatus');
|
||||
const throttleSection = document.getElementById('throttleSection');
|
||||
|
||||
// Arming switch event
|
||||
armingSwitch.addEventListener('change', () => {
|
||||
isArmed = armingSwitch.checked;
|
||||
updateArmingUI();
|
||||
|
||||
// Send arming status to ESP32
|
||||
const message = JSON.stringify({
|
||||
"armed": isArmed,
|
||||
"throttle": isArmed ? parseInt(slider.value) : 0
|
||||
});
|
||||
|
||||
console.log("Sending arming status: ", message);
|
||||
websocket.send(message);
|
||||
|
||||
// If disarmed, set throttle to 0
|
||||
if (!isArmed) {
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
}
|
||||
});
|
||||
|
||||
// Update UI based on arming status
|
||||
function updateArmingUI() {
|
||||
|
||||
// Synch checkbox, as well
|
||||
armingSwitch.checked = isArmed;
|
||||
|
||||
if (isArmed) {
|
||||
armingStatus.innerText = 'ARMED';
|
||||
armingStatus.className = 'status-armed';
|
||||
throttleSection.classList.add('armed');
|
||||
slider.disabled = false;
|
||||
} else {
|
||||
armingStatus.innerText = 'DISARMED';
|
||||
armingStatus.className = 'status-disarmed';
|
||||
throttleSection.classList.remove('armed');
|
||||
slider.disabled = true;
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Throttle slider event
|
||||
slider.addEventListener('input', () => {
|
||||
if (!isArmed) {
|
||||
slider.disabled = true;
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
const throttle = slider.value;
|
||||
sliderValue.innerText = throttle;
|
||||
|
||||
const message = JSON.stringify({
|
||||
"throttle": parseInt(throttle),
|
||||
"armed": isArmed
|
||||
});
|
||||
|
||||
console.log("Sending throttle: ", message);
|
||||
websocket.send(message);
|
||||
});
|
||||
|
||||
// Initialize UI
|
||||
updateArmingUI();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
)rawliteral";
|
||||
|
||||
//
|
||||
void setup()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ dshot_result_t DShotRMT::_initTXChannel()
|
|||
dshot_result_t DShotRMT::_initRXChannel()
|
||||
{
|
||||
// Direct RMT symbol processing - Performance optimized
|
||||
_rx_event_callbacks.on_recv_done = _rmt_rx_done_callback;
|
||||
_rx_event_callbacks.on_recv_done = _on_rx_done;
|
||||
|
||||
// Config RMT RX
|
||||
_rx_channel_config.gpio_num = _gpio;
|
||||
|
|
@ -325,7 +325,7 @@ dshot_result_t DShotRMT::_initDShotEncoder()
|
|||
return {false, ENCODER_INIT_FAILED};
|
||||
}
|
||||
|
||||
return {true, TX_INIT_SUCCESS};
|
||||
return {true, ENCODER_INIT_SUCCESS};
|
||||
}
|
||||
|
||||
// Private Packet Management Functions
|
||||
|
|
@ -474,7 +474,7 @@ dshot_result_t DShotRMT::_sendDShotFrame(const dshot_packet_t &packet)
|
|||
}
|
||||
|
||||
// Encode DShot packet into RMT symbol format (placed in IRAM for performance)
|
||||
bool DShotRMT::_encodeDShotFrame(const dshot_packet_t &packet, rmt_symbol_word_t *symbols)
|
||||
bool IRAM_ATTR DShotRMT::_encodeDShotFrame(const dshot_packet_t &packet, rmt_symbol_word_t *symbols)
|
||||
{
|
||||
_parsed_packet = _parseDShotPacket(packet);
|
||||
|
||||
|
|
@ -541,7 +541,7 @@ uint16_t DShotRMT::_decodeDShotFrame(const rmt_symbol_word_t *symbols)
|
|||
|
||||
// Private Timing Control Functions
|
||||
// Check if enough time has passed for next transmission
|
||||
bool DShotRMT::_timer_signal()
|
||||
bool IRAM_ATTR DShotRMT::_timer_signal()
|
||||
{
|
||||
uint64_t current_time = esp_timer_get_time();
|
||||
|
||||
|
|
@ -561,7 +561,7 @@ bool DShotRMT::_timer_reset()
|
|||
|
||||
// Static Callback Functions
|
||||
// Callback for RMT RX
|
||||
bool DShotRMT::_rmt_rx_done_callback(rmt_channel_handle_t rmt_rx_channel, const rmt_rx_done_event_data_t *edata, void *user_data)
|
||||
bool IRAM_ATTR DShotRMT::_on_rx_done(rmt_channel_handle_t rmt_rx_channel, const rmt_rx_done_event_data_t *edata, void *user_data)
|
||||
{
|
||||
DShotRMT *instance = static_cast<DShotRMT *>(user_data);
|
||||
|
||||
|
|
|
|||
|
|
@ -221,13 +221,13 @@ private:
|
|||
|
||||
// Private Frame Processing Functions
|
||||
dshot_result_t _sendDShotFrame(const dshot_packet_t &packet);
|
||||
bool IRAM_ATTR _encodeDShotFrame(const dshot_packet_t &packet, rmt_symbol_word_t *symbols);
|
||||
bool _encodeDShotFrame(const dshot_packet_t &packet, rmt_symbol_word_t *symbols);
|
||||
uint16_t _decodeDShotFrame(const rmt_symbol_word_t *symbols);
|
||||
|
||||
// Private Timing Control Functions
|
||||
bool IRAM_ATTR _timer_signal();
|
||||
bool _timer_signal();
|
||||
bool _timer_reset();
|
||||
|
||||
// Static Callback Functions
|
||||
static bool IRAM_ATTR _rmt_rx_done_callback(rmt_channel_handle_t rmt_rx_channel, const rmt_rx_done_event_data_t *edata, void *user_data);
|
||||
static bool _on_rx_done(rmt_channel_handle_t rmt_rx_channel, const rmt_rx_done_event_data_t *edata, void *user_data);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,360 @@
|
|||
/**
|
||||
* @file web_content.h
|
||||
* @brief DShot signal generation using ESP32 RMT with bidirectional support
|
||||
* @author Wastl Kraus
|
||||
* @date 2025-09-13
|
||||
* @license MIT
|
||||
*/
|
||||
|
||||
#pragma onve
|
||||
|
||||
// Web Site Content
|
||||
static constexpr char index_html[] = R"rawliteral(
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
|
||||
<title>DShotRMT Web Client</title>
|
||||
<style>
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
background-color: #2c3e50;
|
||||
color: #ecf0f1;
|
||||
margin: 0;
|
||||
height: 100dvh;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 1.5em;
|
||||
font-weight: bold;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.control-container {
|
||||
background-color: #34495e;
|
||||
padding: 30px;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||
text-align: center;
|
||||
width: 85%;
|
||||
max-width: 500px;
|
||||
}
|
||||
|
||||
/* Arming Switch Styles */
|
||||
.arming-section {
|
||||
margin-bottom: 25px;
|
||||
padding: 15px;
|
||||
background-color: #2c3e50;
|
||||
border-radius: 8px;
|
||||
border: 2px solid #e74c3c;
|
||||
}
|
||||
|
||||
.arming-switch {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 15px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 60px;
|
||||
height: 34px;
|
||||
}
|
||||
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.slider-switch {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: #e74c3c;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
border-radius: 34px;
|
||||
}
|
||||
|
||||
.slider-switch:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
left: 4px;
|
||||
bottom: 4px;
|
||||
background-color: white;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
input:checked+.slider-switch {
|
||||
background-color: #27ae60;
|
||||
}
|
||||
|
||||
input:checked+.slider-switch:before {
|
||||
-webkit-transform: translateX(26px);
|
||||
-ms-transform: translateX(26px);
|
||||
transform: translateX(26px);
|
||||
}
|
||||
|
||||
.arming-label {
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.arming-status {
|
||||
font-size: 0.9em;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.status-disarmed {
|
||||
color: #e74c3c;
|
||||
}
|
||||
|
||||
.status-armed {
|
||||
color: #27ae60;
|
||||
}
|
||||
|
||||
/* Throttle Section */
|
||||
.throttle-section {
|
||||
opacity: 0.3;
|
||||
transition: opacity 0.3s ease;
|
||||
}
|
||||
|
||||
.throttle-section.armed {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#throttleValue {
|
||||
font-size: 2.5em;
|
||||
font-weight: bold;
|
||||
color: #3498db;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#throttleSlider {
|
||||
appearance: none;
|
||||
width: 100%;
|
||||
height: 25px;
|
||||
background: #2c3e50;
|
||||
outline: none;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
#throttleSlider::-webkit-slider-thumb {
|
||||
-webkit-appearance: none;
|
||||
appearance: none;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background: #3498db;
|
||||
cursor: pointer;
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
#throttleSlider::-moz-range-thumb {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
background: #3498db;
|
||||
cursor: pointer;
|
||||
border-radius: 50%;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.stats {
|
||||
margin-top: 20px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.stats span {
|
||||
font-weight: bold;
|
||||
color: #e67e22;
|
||||
}
|
||||
|
||||
.warning-text {
|
||||
color: #e74c3c;
|
||||
font-size: 0.9em;
|
||||
margin-top: 10px;
|
||||
font-style: italic;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1>DShotRMT Web Client</h1>
|
||||
<div class="control-container">
|
||||
<!-- Arming Section -->
|
||||
<div class="arming-section">
|
||||
<div class="arming-switch">
|
||||
<span class="arming-label">ARMING SWITCH</span>
|
||||
<label class="switch">
|
||||
<input type="checkbox" id="armingSwitch">
|
||||
<span class="slider-switch"></span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="arming-status">
|
||||
<span id="armingStatus" class="status-disarmed">DISARMED</span>
|
||||
</div>
|
||||
<div class="warning-text">
|
||||
⚠️ Disabled when disarmed!
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Throttle Section -->
|
||||
<div class="throttle-section" id="throttleSection">
|
||||
<div id="throttleValue">0</div>
|
||||
<input type="range" min="48" max="2047" value="0" id="throttleSlider" disabled>
|
||||
</div>
|
||||
|
||||
<div class="stats">
|
||||
RPM: <span id="rpmValue">--</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const gateway = `ws://${window.location.hostname}/ws`;
|
||||
let websocket;
|
||||
let isArmed = false;
|
||||
|
||||
// Init WebSocket
|
||||
window.addEventListener('load', () => {
|
||||
initWebSocket();
|
||||
});
|
||||
|
||||
function initWebSocket() {
|
||||
console.log('Trying to open a WebSocket connection...');
|
||||
|
||||
websocket = new WebSocket(gateway);
|
||||
websocket.onopen = onOpen;
|
||||
websocket.onclose = onClose;
|
||||
websocket.onmessage = onMessage;
|
||||
}
|
||||
|
||||
function onOpen(event) {
|
||||
console.log('Connection opened');
|
||||
}
|
||||
|
||||
function onClose(event) {
|
||||
console.log('Connection closed');
|
||||
setTimeout(initWebSocket, 2000);
|
||||
}
|
||||
|
||||
// Getting data from sketch
|
||||
function onMessage(event) {
|
||||
try {
|
||||
const data = JSON.parse(event.data);
|
||||
|
||||
if (data.rpm !== undefined) {
|
||||
document.getElementById('rpmValue').innerText = data.rpm;
|
||||
}
|
||||
|
||||
// Sync web and serial throttle inputs
|
||||
if (data.throttle !== undefined) {
|
||||
if (isArmed) {
|
||||
document.getElementById('throttleSlider').value = data.throttle;
|
||||
document.getElementById('throttleValue').innerText = data.throttle;
|
||||
}
|
||||
}
|
||||
|
||||
// Sync arming status if received from ESP32
|
||||
if (data.armed !== undefined) {
|
||||
isArmed = data.armed;
|
||||
updateArmingUI();
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
console.error("Error parsing JSON: ", e);
|
||||
}
|
||||
}
|
||||
|
||||
// Elements
|
||||
const slider = document.getElementById('throttleSlider');
|
||||
const sliderValue = document.getElementById('throttleValue');
|
||||
const armingSwitch = document.getElementById('armingSwitch');
|
||||
const armingStatus = document.getElementById('armingStatus');
|
||||
const throttleSection = document.getElementById('throttleSection');
|
||||
|
||||
// Arming switch event
|
||||
armingSwitch.addEventListener('change', () => {
|
||||
isArmed = armingSwitch.checked;
|
||||
updateArmingUI();
|
||||
|
||||
// Send arming status to ESP32
|
||||
const message = JSON.stringify({
|
||||
"armed": isArmed,
|
||||
"throttle": isArmed ? parseInt(slider.value) : 0
|
||||
});
|
||||
|
||||
console.log("Sending arming status: ", message);
|
||||
websocket.send(message);
|
||||
|
||||
// If disarmed, set throttle to 0
|
||||
if (!isArmed) {
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
}
|
||||
});
|
||||
|
||||
// Update UI based on arming status
|
||||
function updateArmingUI() {
|
||||
|
||||
// Synch checkbox, as well
|
||||
armingSwitch.checked = isArmed;
|
||||
|
||||
if (isArmed) {
|
||||
armingStatus.innerText = 'ARMED';
|
||||
armingStatus.className = 'status-armed';
|
||||
throttleSection.classList.add('armed');
|
||||
slider.disabled = false;
|
||||
} else {
|
||||
armingStatus.innerText = 'DISARMED';
|
||||
armingStatus.className = 'status-disarmed';
|
||||
throttleSection.classList.remove('armed');
|
||||
slider.disabled = true;
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Throttle slider event
|
||||
slider.addEventListener('input', () => {
|
||||
if (!isArmed) {
|
||||
slider.disabled = true;
|
||||
slider.value = 0;
|
||||
sliderValue.innerText = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
const throttle = slider.value;
|
||||
sliderValue.innerText = throttle;
|
||||
|
||||
const message = JSON.stringify({
|
||||
"throttle": parseInt(throttle),
|
||||
"armed": isArmed
|
||||
});
|
||||
|
||||
console.log("Sending throttle: ", message);
|
||||
websocket.send(message);
|
||||
});
|
||||
|
||||
// Initialize UI
|
||||
updateArmingUI();
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
)rawliteral";
|
||||
Loading…
Reference in New Issue