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.

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

Frontend kevin #8

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
876b140
works on local
BANANAPEEL202 Apr 27, 2024
d5a096a
dropdowns work
BANANAPEEL202 Apr 28, 2024
5d101df
kevin's json
BANANAPEEL202 Apr 28, 2024
85535bf
yay
klou23 Apr 28, 2024
318c9bf
moved time formatting from webserver to frontend
BANANAPEEL202 Apr 28, 2024
f7726fd
changed dropdown values
BANANAPEEL202 Apr 29, 2024
36643d5
new stuff
klou23 Apr 29, 2024
5700644
adding in metadata derivation and add in to mcapserver
RCMast3r Apr 29, 2024
e56634e
adding in metadata
RCMast3r Apr 29, 2024
565357d
add checking for offloaded
BANANAPEEL202 Apr 24, 2024
0aef74b
offloading code
BANANAPEEL202 Apr 24, 2024
8267e41
add delete button
BANANAPEEL202 Apr 24, 2024
e58482b
update flake to include requests
BANANAPEEL202 Apr 24, 2024
d98f4d4
fixed indent
BANANAPEEL202 Apr 24, 2024
99dc4a6
else statement
BANANAPEEL202 Apr 29, 2024
4bbc0a8
changed ip to car
BANANAPEEL202 Apr 29, 2024
20f636f
changed from typescript to javascritp
BANANAPEEL202 Apr 29, 2024
f8d62fc
changed from tsx to jsx
BANANAPEEL202 Apr 29, 2024
676f08e
stuff
BANANAPEEL202 Apr 29, 2024
ebea7f1
update node2nix (scary)
BANANAPEEL202 Apr 29, 2024
b54dcf1
Revert "update node2nix (scary)"
BANANAPEEL202 Apr 29, 2024
39c7b16
added alert for writing to mcap
BANANAPEEL202 Apr 29, 2024
03448d5
added toast for stopped writing
BANANAPEEL202 Apr 29, 2024
460f3c9
updated metadata
klou23 Apr 29, 2024
e66b5cd
reorganized some sutff
klou23 Apr 30, 2024
934a3ab
fixed addr toggle
klou23 Apr 30, 2024
9163beb
changes to alert and filename
klou23 Apr 30, 2024
740401c
fixed metadata location
klou23 Apr 30, 2024
70c1b3d
some changes to fields
klou23 Apr 30, 2024
ea6b620
partially fixed kevin's code
BANANAPEEL202 Apr 30, 2024
3431ab6
fixed getURL and centered record button
BANANAPEEL202 Apr 30, 2024
7b8f165
writing metadata on stop?
BANANAPEEL202 Apr 29, 2024
3373f72
inputs are always enabled
BANANAPEEL202 Apr 29, 2024
3774518
tested locally and works. writes metadata (only) on stop recording
BANANAPEEL202 Apr 29, 2024
ad49638
fixed issue where time was based on stop time and not start time
BANANAPEEL202 Apr 29, 2024
dd09d32
fixing stuff with fields
BANANAPEEL202 Apr 30, 2024
ba4f406
fixing stuff with fields
BANANAPEEL202 Apr 30, 2024
5618f82
new parser
klou23 May 1, 2024
89cb746
Added ssot editor
klou23 May 1, 2024
28fd56b
Added file offloader
klou23 May 1, 2024
177348c
Added url router
klou23 May 1, 2024
f1bea37
update node2nix
BANANAPEEL202 May 1, 2024
4366e57
Merge branch 'frontend-kevin' of https://github.com/hytech-racing/dat…
BANANAPEEL202 May 1, 2024
4ed08c2
added timeout to fetch requests
klou23 May 1, 2024
1792271
Merge branch 'frontend-kevin' of https://github.com/hytech-racing/dat…
klou23 May 1, 2024
6f3bbbe
revert "update node2nix"
BANANAPEEL202 May 2, 2024
507e8a1
ben fixed node2nix
BANANAPEEL202 May 2, 2024
dfcf8c1
fix pid form
klou23 May 2, 2024
ccd9d84
Merge branch 'frontend-kevin' of https://github.com/hytech-racing/dat…
klou23 May 2, 2024
e6d0c89
fixed pid parse
klou23 May 2, 2024
2fadbb3
parser fix
klou23 May 2, 2024
b53c707
Merge branch 'frontend-kevin' into frontend-offload-new
BANANAPEEL202 May 2, 2024
8ced2bb
Merge pull request #6 from hytech-racing/frontend-offload-new
BANANAPEEL202 May 2, 2024
afa2788
Merge branch 'frontend-kevin' into frontend-writeonstop
BANANAPEEL202 May 2, 2024
1fa3c0c
Merge pull request #7 from hytech-racing/frontend-writeonstop
BANANAPEEL202 May 2, 2024
b775961
change time request on start
klou23 May 2, 2024
027f286
it works!
BANANAPEEL202 May 2, 2024
9f8c059
Change ssot route url
klou23 May 2, 2024
a528de5
slight changes to edit ssot
klou23 May 2, 2024
e7aab8e
jsonify save request
klou23 May 2, 2024
84e627e
added route to save fields when editing metadata
klou23 May 2, 2024
3b5034c
changed save to post
klou23 May 2, 2024
c3703ad
update json formatting
klou23 May 2, 2024
aaca21b
fixed kevin's code
BANANAPEEL202 May 2, 2024
ec4b211
Merge pull request #9 from hytech-racing/frontend-jason
BANANAPEEL202 May 2, 2024
bff2a77
doing some desktop testing
RCMast3r May 4, 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
1 change: 1 addition & 0 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ python311Packages.buildPythonApplication {
python311Packages.flask
python311Packages.flask-cors
python311Packages.hypercorn
python311Packages.requests
];

src = ./py_data_acq;
Expand Down
20 changes: 10 additions & 10 deletions flake.lock

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

18 changes: 15 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
mcap.url = "github:RCMast3r/py_mcap_nix";
foxglove-websocket.url = "github:RCMast3r/py_foxglove_webserver_nix";
asyncudp.url = "github:RCMast3r/asyncudp_nix";
ht_can_pkg_flake.url = "github:hytech-racing/ht_can/41";
ht_can_pkg_flake.url = "github:hytech-racing/ht_can/80";
nix-proto = { url = "github:notalltim/nix-proto"; };
};

Expand Down Expand Up @@ -49,6 +49,9 @@
proto_gen_overlay = final: prev: {
proto_gen_pkg = final.callPackage ./dbc_proto_bin_gen.nix { };
};
frontend_config_overlay = final: prev: {
frontend_config_pkg = final.callPackage ./frontend_metadata.nix { };
};
py_foxglove_protobuf_schemas_overlay = final: prev: {
py_foxglove_protobuf_schemas = final.callPackage ./py_foxglove_protobuf_schemas.nix { };
};
Expand All @@ -57,7 +60,9 @@
frontend_pkg = final.callPackage ./frontend.nix { };
};


# mcap_cli_overlay = final: prev: {
# mcap_cli_pkg = final.callPackage ./mcap_cli.nix { };
# };

nix_protos_overlays = nix-proto.generateOverlays'
{
Expand Down Expand Up @@ -95,8 +100,9 @@
py_data_acq_overlay
proto_gen_overlay
py_foxglove_protobuf_schemas_overlay

frontend_config_overlay
frontend_overlay
# mcap_cli_overlay
ht_can_pkg_flake.overlays.default
mcap-protobuf.overlays.default
mcap.overlays.default
Expand All @@ -116,6 +122,7 @@
packages = with pkgs; [
jq
py_data_acq_pkg
# mcap_cli_pkg
py_dbc_proto_gen_pkg
proto_gen_pkg
ht_can_pkg
Expand All @@ -137,6 +144,7 @@
export BIN_PATH=$bin_path
export DBC_PATH=$dbc_path
export FRONT=$frontend_path
export METADATA_PATH=${pkgs.frontend_config_pkg}
echo -e "PYTHONPATH=$PYTHONPATH\nBIN_PATH=$bin_path\nDBC_PATH=$dbc_path\n" > .env
export PS1="$(echo -e '\u${icon}') {\[$(tput sgr0)\]\[\033[38;5;228m\]\w\[$(tput sgr0)\]\[\033[38;5;15m\]} (${name}) \\$ \[$(tput sgr0)\]"
'';
Expand All @@ -158,8 +166,10 @@
path=${pkgs.proto_gen_pkg}
bin_path=$path"/bin"
dbc_path=${pkgs.ht_can_pkg}
metadata_path=${pkgs.frontend_config_pkg}
export BIN_PATH=$bin_path
export DBC_PATH=$dbc_path
export METADATA_PATH=$metadata_path
'';

};
Expand All @@ -172,6 +182,8 @@
};

packages = rec {
mcap_cli_pkg = pkgs.mcap_cli_pkg;
frontend_config_pkg = pkgs.frontend_config_pkg;
frontend_pkg = pkgs.frontend_pkg.frontend;
default = pkgs.py_data_acq_pkg;
py_dbc_proto_gen_pkg = pkgs.py_data_acq_pkg;
Expand Down
Loading
Loading