Skip to content

Tidying up based on feedback and networks failing more often than anticipated #1453

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

Merged
cowsed merged 3 commits into from
Aug 19, 2026
Merged

Tidying up based on feedback and networks failing more often than anticipated #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae8afb
Remove spam logs
cowsed Aug 18, 2026
49acaf5
Button color change after new user feedback
cowsed Aug 18, 2026
78d08c8
Don't report hobbs time fiasco if state is unknown to us
cowsed Aug 19, 2026
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
3 changes: 2 additions & 1 deletion client/src/pages/both/homepage/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ export function Dashboard() {
navigate(`/maker/training/${import.meta.env.VITE_STARTING_MODULE_ID}`)
}
}
const buttonColor = loggedIn ? "primary" : "secondary"
const buttonText = !loggedIn ? "New Maker? Click to create an account." : "Click here to learn how to access equipment"
return <Stack justifyContent={"center"} alignItems={"center"} spacing={"10px"} paddingY={"1em"} margin={"10px"}>
<Typography variant="h2" fontWeight={"bold"} display={"inline"} textAlign={"center"}>
Welcome to the SHED Makerspace
</Typography>
<Button variant="contained" sx={{borderRadius: "2.5em", paddingX: "2em", textTransform: 'none'}} onClick={buttonAction}>
<Button variant="contained" sx={{borderRadius: "2.5em", paddingX: "2em", textTransform: 'none'}} onClick={buttonAction} color={buttonColor}>
<Typography fontSize={"2.5em"} fontWeight={"bold"} display={"inline"}>
{buttonText}
</Typography>
Expand Down
4 changes: 2 additions & 2 deletions server/src/database/models/api/ACSOrchestrator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export class ACSOrchestrator {
}


if (inst.hobbsTime > channel.hobbsTime) {
console.warn("hobbs tme fiasco", inst, channel)
if (inst.hobbsTime > channel.hobbsTime && channel.state != undefined) {
console.warn("hobbs time fiasco", inst, channel)
// warning: the device is wrong about how long
DeviceLogRepo.createDeviceLog(deviceID, DeviceLogSeverity.MEDIUM, { msg: "hobbs-time-mismatch", reported: channel.hobbsTime, stored: inst.hobbsTime })
shouldUpdateTimes = true
Expand Down
2 changes: 0 additions & 2 deletions server/src/database/models/api/MQTTACSController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ export default class MQTTACSController extends ACSController {

const infoRequest: CoreInfoRequest = JSON.parse(payload.toString());
// TODO: INPUT VALIDATION
console.log("info request")
ACSOrchestrator.handleCoreInfoRequest(device.id, infoRequest);
} catch (e) {
console.error(`[MQTTACSController] handleCoreInfoRequest error: ${e}`);
Expand Down Expand Up @@ -225,7 +224,6 @@ export default class MQTTACSController extends ACSController {
}

sendCoreInfoResponse(core: Core, response: ServerInfoResponse): boolean {
console.log("sending info", response)
try {
MQTTACSController.client.publish(`makerspace/device/${core.SN}/info/response`, JSON.stringify(response), { qos: 2 });
} catch (_e) {
Expand Down
Loading