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

Jump to bottom

Power consumption + integral + misc qol changes #79

Merged
merged 19 commits into from
Dec 2, 2024
Merged

Power consumption + integral + misc qol changes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
45ad64c
added median field
Hqllow Oct 3, 2024
0fb7a5e
added median value calculation
Hqllow Oct 7, 2024
91bfb0b
Learning Changes
Hqllow Oct 21, 2024
ad4cb1d
ADDED FUNNY BUTTON
Hqllow Oct 28, 2024
71bf249
FIXED FUNNY BUTTON
Hqllow Oct 28, 2024
3dcc90c
button disabled when pressed
Hqllow Nov 4, 2024
22427c6
funny button go bye bye
Hqllow Nov 4, 2024
8d4be0d
NO MORE MEDIAN
Hqllow Nov 4, 2024
8ae6ae7
NO MORE KPH
Hqllow Nov 5, 2024
6157d1f
no mo' comment
Hqllow Nov 5, 2024
4df33e5
generalized settings + tooltip + fixed undefined error
jackschedel Nov 8, 2024
50719a4
const autoupdate
jackschedel Nov 8, 2024
a157b51
warning cleanup
jackschedel Nov 8, 2024
1fda124
username/password logic cleanup
jackschedel Nov 8, 2024
e5f5d6f
calculated backend def fix
jackschedel Nov 15, 2024
1cccf47
added integral
Hqllow Nov 14, 2024
4eaff78
SPINNER
Hqllow Nov 14, 2024
8966ee8
raymond fixes
jackschedel Nov 19, 2024
5e14994
server controller calculated remove
jackschedel Dec 2, 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
92 changes: 45 additions & 47 deletions backend/controllers/live.server.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Mitsuba_RX0 from "../shared/models/Mitsuba/RX0"
import Mitsuba_RX1 from "../shared/models/Mitsuba/RX1"
import Mitsuba_RX2 from "../shared/models/Mitsuba/RX2"
import { getMostRecent } from "../helper/helper.route"
import Mitsuba_RX0 from "../shared/models/Mitsuba/RX0";
import Mitsuba_RX1 from "../shared/models/Mitsuba/RX1";
import Mitsuba_RX2 from "../shared/models/Mitsuba/RX2";
import { getMostRecent } from "../helper/helper.route";
import { Response } from "express";
import { DataResponse } from "../shared/sdk/telemetry";
import BMS_RX0 from "../shared/models/Custom_BMS/RX0";
Expand All @@ -15,57 +15,55 @@ import MPPT_RX3 from "../shared/models/MPPT/RX3";
import MPPT_RX4 from "../shared/models/MPPT/RX4";
import MPPT_RX5 from "../shared/models/MPPT/RX5";
import GPS from "../shared/models/GPS/GPS";
import Alive from "../shared/models/PI/Alive"
import Alive from "../shared/models/PI/Alive";
import DistanceTraveled from "../shared/models/Stats/DistanceTraveled";
import LapCount from "../shared/models/Stats/LapCount";
import PowerBoard_RX0 from "../shared/models/PowerBoard/RX0";
import PowerBoard_RX1 from "../shared/models/PowerBoard/RX1";


/**
Return data for the sensor read outs on the live tab
*/
exports.data = async (req, res: Response<DataResponse>) => {
async function getMppt(mpptNumber: number) {
return {
rx0: await getMostRecent(MPPT_RX0, { mpptNumber }),
rx1: await getMostRecent(MPPT_RX1, { mpptNumber }),
rx2: await getMostRecent(MPPT_RX2, { mpptNumber }),
rx3: await getMostRecent(MPPT_RX3, { mpptNumber }),
rx4: await getMostRecent(MPPT_RX4, { mpptNumber }),
rx5: await getMostRecent(MPPT_RX5, { mpptNumber }),
};
}

async function getMppt(mpptNumber: number) {
return {
rx0: await getMostRecent(MPPT_RX0, { mpptNumber }),
rx1: await getMostRecent(MPPT_RX1, { mpptNumber }),
rx2: await getMostRecent(MPPT_RX2, { mpptNumber }),
rx3: await getMostRecent(MPPT_RX3, { mpptNumber }),
rx4: await getMostRecent(MPPT_RX4, { mpptNumber }),
rx5: await getMostRecent(MPPT_RX5, { mpptNumber }),
}
}

return res.json({
gps: await getMostRecent(GPS),
bms: {
rx0: await getMostRecent(BMS_RX0),
rx1: await getMostRecent(BMS_RX1),
rx2: await getMostRecent(BMS_RX2),
rx3: await getMostRecent(BMS_RX3),
},
mitsuba: {
rx0: await getMostRecent(Mitsuba_RX0),
rx1: await getMostRecent(Mitsuba_RX1),
rx2: await getMostRecent(Mitsuba_RX2),
distance_traveled: await getMostRecent(DistanceTraveled)
},
mppt: {
"1": await getMppt(1),
"2": await getMppt(2),
"3": await getMppt(3),
},
laps: {
rx0: await getMostRecent(LapCount)
},
powerBoard: {
rx0: await getMostRecent(PowerBoard_RX0),
rx1: await getMostRecent(PowerBoard_RX1),
},
pi: {
alive: await getMostRecent(Alive),
}
})
return res.json({
gps: await getMostRecent(GPS),
bms: {
rx0: await getMostRecent(BMS_RX0),
rx1: await getMostRecent(BMS_RX1),
rx2: await getMostRecent(BMS_RX2),
rx3: await getMostRecent(BMS_RX3),
},
mitsuba: {
rx0: await getMostRecent(Mitsuba_RX0),
rx1: await getMostRecent(Mitsuba_RX1),
rx2: await getMostRecent(Mitsuba_RX2),
distance_traveled: await getMostRecent(DistanceTraveled),
},
mppt: {
"1": await getMppt(1),
"2": await getMppt(2),
"3": await getMppt(3),
},
laps: {
rx0: await getMostRecent(LapCount),
},
powerBoard: {
rx0: await getMostRecent(PowerBoard_RX0),
rx1: await getMostRecent(PowerBoard_RX1),
},
pi: {
alive: await getMostRecent(Alive),
},
});
};
16 changes: 16 additions & 0 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"react-bootstrap": "^2.8.0",
"react-d3-speedometer": "^2.1.0-rc.0",
"react-dom": "^18.2.0",
"react-icons": "^5.3.0",
"react-materialize": "^3.4.1",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
Expand Down Expand Up @@ -56,7 +57,10 @@
"prettier": "3.0.3"
},
"options": {
"allowedHosts": ["localhost", ".localhost"],
"allowedHosts": [
"localhost",
".localhost"
],
"proxy": "http://localhost:9000/"
}
}
Loading
Loading