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

Master xbee #55

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Master xbee #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7430d97
Convert message from string to dict once read, and covert from dict t…
srikarg89 Apr 13, 2021
46e61fa
Fix double equal to triple
surajvaddi Apr 15, 2021
5f8834b
Fix valve names
srikarg89 Apr 15, 2021
6a008d5
Merge pull request #50 from ProjectCaelus/pio-testing
srikarg89 Apr 15, 2021
e22fe59
Add xbee usage to config and combine with socket code
srikarg89 Apr 16, 2021
d3f48b8
Fix handler
srikarg89 Apr 17, 2021
c5abc39
Recieve and send (partly) to GS
Mitali10 Apr 18, 2021
46177e4
XBee communication works
Mitali10 Apr 25, 2021
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
524 changes: 211 additions & 313 deletions client/src/config.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/lib/getColor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import caelusLogger from "./caelusLogger";

const getColor = (status: any) => {
if(status == undefined){
if(status === undefined){
return "black";
}
switch (status) {
Expand Down
13 changes: 10 additions & 3 deletions client/src/lib/locationNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,16 @@ export const valveTypeNames = {
};

export const valveLocationNames = {
main_propellant_valve: "Main Propellant Valve",
pressure_relief: "Pressure Relief Valve",
pressurization: "Pressurization Valve",
ethanol_drain: "Ethanol Drain",
ethanol_pressurization: "Ethanol Pressurization",
ethanol_vent: "Ethanol Vent",
ethanol_mpv: "Ethanol MPV",
ethanol_fill: "Ethanol Fill",
nitrous_drain: "Nitrous Drain",
nitrous_pressurization: "Nitrous Pressurization",
nitrous_vent: "Nitrous Vent",
nitrous_mpv: "Nitrous MPV",
nitrous_fill: "Nitrous Fill",
};

export const actuationTypeNames = {
Expand Down
30 changes: 15 additions & 15 deletions client/src/lib/pid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ export const PADDING = {
},
},
VALVE: {
pressurization_valve: {
nitrous_pressurization: {
x: 404 / 784,
y: 210 / 850,
},
vent_valve: {
nitrous_vent: {
x: 33 / 784,
y: 95 / 850,
},
remote_drain_valve: {
nitrous_fill: {
x: 19 / 784,
y: 598 / 850,
},
main_propellant_valve: {
nitrous_mpv: {
x: 317 / 784,
y: 736 / 850,
},
Expand Down Expand Up @@ -75,15 +75,15 @@ export const PADDING = {
},
},
VALVE: {
"NCSV-1": {
ethanol_vent: {
x: 274 / 1971,
y: 91 / 1522,
},
"NOSV-2": {
ethanol_mpv: {
x: 347 / 1971,
y: 517 / 1522,
},
pressurization_valve: {
ethanol_pressurization: {
x: 52 / 1971,
y: 1375 / 1522,
},
Expand Down Expand Up @@ -137,35 +137,35 @@ export const PADDING = {
},
},
VALVE: {
vent_valve: {
nitrous_vent: {
x: 136 / 3200,
y: 104 / 1595,
},
pressurization_valve: {
nitrous_pressurization: {
x: 619 / 3200,
y: 716 / 1595,
},
remote_drain_valve: {
nitrous_fill: {
x: 669 / 3200,
y: 1163 / 1595,
},
main_propellant_valve: {
nitrous_mpv: {
x: 447 / 3200,
y: 1385 / 1595,
},
"NCSV-1": {
ethanol_vent: {
x: 2187 / 3200,
y: 133 / 1595,
},
"NOSV-1": {
ethanol_pressurization: {
x: 2756 / 3200,
y: 571 / 1595,
},
"NCSV-2": {
ethanol_fill: {
x: 2269 / 3200,
y: 1478 / 1595,
},
"NOSV-2": {
ethanol_mpv: {
x: 1969 / 3200,
y: 1152 / 1595,
},
Expand Down
Loading