diff --git a/webclient/src/Charts.js b/webclient/src/Charts.js
index 91aa5e8..d709cf1 100644
--- a/webclient/src/Charts.js
+++ b/webclient/src/Charts.js
@@ -9,14 +9,16 @@ import moment from 'moment-timezone';
let memberCountCache = false;
let signupCountCache = false;
let spaceActivityCache = false;
-let dustLevelCache = false;
+let classroomDustLevelCache = false;
+let woodshopDustLevelCache = false;
export function Charts(props) {
const [memberCount, setMemberCount] = useState(memberCountCache);
const [signupCount, setSignupCount] = useState(signupCountCache);
const [spaceActivity, setSpaceActivity] = useState(spaceActivityCache);
const [fullActivity, setFullActivity] = useState(false);
- const [dustLevel, setDustLevel] = useState(dustLevelCache);
+ const [classroomDustLevel, setClassroomDustLevel] = useState(classroomDustLevelCache);
+ const [woodshopDustLevel, setWoodshopDustLevel] = useState(woodshopDustLevelCache);
useEffect(() => {
requester('/charts/membercount/', 'GET')
@@ -48,8 +50,17 @@ export function Charts(props) {
requester('https://ps-iot.dns.t0.vc/sensors/air/0/pm25/week', 'GET')
.then(res => {
- setDustLevel(res.result);
- dustLevelCache = res.result;
+ setClassroomDustLevel(res.result);
+ classroomDustLevelCache = res.result;
+ })
+ .catch(err => {
+ console.log(err);
+ });
+
+ requester('https://ps-iot.dns.t0.vc/sensors/air/1/pm25/week', 'GET')
+ .then(res => {
+ setWoodshopDustLevel(res.result);
+ woodshopDustLevelCache = res.result;
})
.catch(err => {
console.log(err);
@@ -296,12 +307,13 @@ export function Charts(props) {
Averaged every 15 minutes for the past week.
+Averaged every 15 minutes for the past week. They are cheap sensors so don't trust the absolute value of the readings.
- {dustLevel &&
+ {classroomDustLevel && woodshopDustLevel &&
+ <>
Classroom PM2.5: Amount of PM2.5 particles measured from the classroom ceiling. Units are μg/m³.
+Woodshop PM2.5: Amount of PM2.5 particles measured from the woodshop ceiling. Units are μg/m³.
+ ); };