2 Commits

Author SHA1 Message Date
f1117bf925 Configuration name now updated 2025-10-28 13:43:10 -04:00
22e48b34d5 Module states are now live updated 2025-10-28 13:25:15 -04:00
2 changed files with 105 additions and 4 deletions

View File

@ -48,8 +48,13 @@ class SwerveModule {
// Swerve drive class to represent the robot as a whole // Swerve drive class to represent the robot as a whole
class SwerveDrive { class SwerveDrive {
constructor(modulePositionsAndNames) { constructor(modulePositionsAndNames, robotName) {
this.setModules(modulePositionsAndNames); this.setModules(modulePositionsAndNames);
this.setName(robotName);
}
setName(robotName) {
this.name = robotName;
} }
setModules(modulePositionsAndNames) { setModules(modulePositionsAndNames) {
@ -216,35 +221,102 @@ resetBtn.addEventListener('click', (e) => {
preset2WheelBtn.addEventListener('click', () => { preset2WheelBtn.addEventListener('click', () => {
const positions = PresetConfigs.twoWheel(robotSize); const positions = PresetConfigs.twoWheel(robotSize);
robot.setModules(positions); robot.setModules(positions);
robot.setName("2-Wheel Differential");
createModuleDisplays(robot);
updateModuleDisplays(robot);
}); });
preset3WheelBtn.addEventListener('click', () => { preset3WheelBtn.addEventListener('click', () => {
const positions = PresetConfigs.threeWheel(robotSize); const positions = PresetConfigs.threeWheel(robotSize);
robot.setModules(positions); robot.setModules(positions);
robot.setName("3-Wheel Triangle");
createModuleDisplays(robot);
updateModuleDisplays(robot);
}); });
preset4WheelBtn.addEventListener('click', () => { preset4WheelBtn.addEventListener('click', () => {
const positions = PresetConfigs.fourWheelSquare(robotSize); const positions = PresetConfigs.fourWheelSquare(robotSize);
robot.setModules(positions); robot.setModules(positions);
robot.setName("4-Wheel Square");
createModuleDisplays(robot);
updateModuleDisplays(robot);
}); });
preset4RectBtn.addEventListener('click', () => { preset4RectBtn.addEventListener('click', () => {
const positions = PresetConfigs.fourWheelRectangle(robotSize); const positions = PresetConfigs.fourWheelRectangle(robotSize);
robot.setModules(positions); robot.setModules(positions);
robot.setName("4-Wheel Rectangle");
createModuleDisplays(robot);
updateModuleDisplays(robot);
}); });
preset6WheelBtn.addEventListener('click', () => { preset6WheelBtn.addEventListener('click', () => {
const positions = PresetConfigs.sixWheel(robotSize); const positions = PresetConfigs.sixWheel(robotSize);
robot.setModules(positions); robot.setModules(positions);
robot.setName("6-Wheel Hexagon");
createModuleDisplays(robot);
updateModuleDisplays(robot);
}); });
preset8WheelBtn.addEventListener('click', () => { preset8WheelBtn.addEventListener('click', () => {
const positions = PresetConfigs.eightWheel(robotSize); const positions = PresetConfigs.eightWheel(robotSize);
robot.setModules(positions); robot.setModules(positions);
robot.setName("8-Wheel Octogon");
createModuleDisplays(robot);
updateModuleDisplays(robot);
}); });
/* /*
* END LISTENER CODE * END LISTENER CODE
* BEGIN DYNAMIC DOM FUNCTIONS
*/
function createModuleDisplays(robot) {
const grid = document.getElementById('module-grid');
grid.innerHTML = ''; // Delete any pre-existing elements before creating new ones
const modules = robot.modules;
modules.forEach((module, i) => {
const article = document.createElement('article');
article.className = 'module-display';
const name = module.name;
article.innerHTML = `
<h3>${name}</h3>
<div class="readout">
<span class="label">Angle:</span>
<span id="module-${i}-angle" class="value">0.0°</span>
</div>
<div class="readout">
<span class="label">Speed:</span>
<span id="module-${i}-speed" class="value">0.00 pixels/s</span>
</div>
`;
grid.appendChild(article);
});
}
function updateModuleDisplays(robot) {
const configName = document.getElementById('config-name');
configName.textContent = robot.name;
const moduleCount = document.getElementById('module-count-display');
moduleCount.textContent = robot.modules.length;
const modules = robot.modules;
modules.forEach((module, i) => {
const angleElement = document.getElementById(`module-${i}-angle`);
const speedElement = document.getElementById(`module-${i}-speed`);
if (angleElement && speedElement) {
const angleDeg = (module.angle * 180 / Math.PI).toFixed(1);
angleElement.textContent = `${angleDeg}°`;
speedElement.textContent = `${module.speed.toFixed(2)} pixels/s`;
}
});
}
/*
* END DYNAMIC DOM FUNCTIONS
* BEGIN ANIMATION CODE * BEGIN ANIMATION CODE
*/ */
@ -346,7 +418,9 @@ function drawRobot(ctx, robot) {
// Initialize Variables // Initialize Variables
const robotSize = 200; const robotSize = 200;
const robot = new SwerveDrive(PresetConfigs.fourWheelSquare(robotSize)); const defaultModulePositions = PresetConfigs.fourWheelSquare(robotSize);
const robot = new SwerveDrive(defaultModulePositions, "4-Wheel Square");
createModuleDisplays(robot);
let xSpeed = 0; let xSpeed = 0;
let ySpeed = 0; let ySpeed = 0;
let turnSpeed = -1; let turnSpeed = -1;
@ -382,13 +456,15 @@ function animate() {
xGridOffset = (xGridOffset + (worldVx / offsetSpeedDivisor)) % gridSquareSize; xGridOffset = (xGridOffset + (worldVx / offsetSpeedDivisor)) % gridSquareSize;
yGridOffset = (yGridOffset + (worldVy / offsetSpeedDivisor)) % gridSquareSize; yGridOffset = (yGridOffset + (worldVy / offsetSpeedDivisor)) % gridSquareSize;
// Update module states before drawing the robot
robot.drive(xSpeed, ySpeed, turnSpeed, parseFloat(maxSpeedSlider.value));
updateModuleDisplays(robot);
// Draw the robot and it's movement. Grid should be oversized so movement // Draw the robot and it's movement. Grid should be oversized so movement
// doesn't find the edge of the grid // doesn't find the edge of the grid
drawGrid(ctx, canvas.width * 2, gridSquareSize, xGridOffset, yGridOffset, robotRotation); drawGrid(ctx, canvas.width * 2, gridSquareSize, xGridOffset, yGridOffset, robotRotation);
drawRobot(ctx, robot); drawRobot(ctx, robot);
robot.drive(xSpeed, ySpeed, turnSpeed, parseFloat(maxSpeedSlider.value));
// Do it all over again // Do it all over again
ctx.restore(); ctx.restore();
requestAnimationFrame(animate); requestAnimationFrame(animate);

View File

@ -296,4 +296,29 @@ button:hover {
border-color: var(--accent-blue); border-color: var(--accent-blue);
transform: translateY(-2px); transform: translateY(-2px);
box-shadow: var(--shadow); box-shadow: var(--shadow);
}
/* Module States Grid */
.module-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
gap: var(--spacing-small);
margin-top: var(--spacing-small);
}
.module-card {
background-color: var(--background-dark);
border: 2px solid var(--border-color);
border-radius: var(--border-radius-sm);
padding: var(--spacing-small);
transition: all 0.3s ease;
}
.config-info {
background-color: var(--background-dark);
border: 1px solid var(--border-color);
border-radius: var(--border-radius-sm);
padding: var(--spacing-small);
margin-bottom: var(--spacing-small);
color: var(--text-secondary);
} }