Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
3fe7554
Testing bleak as a replacement for bluepy
Kevinlzh9802 Mar 13, 2024
65e6c10
test bleak
Sep 19, 2024
0436540
modify according to new hardware codes
Sep 23, 2024
8506c88
modify according to new hardware codes
Sep 23, 2024
857e35f
modify according to new hardware codes
Sep 26, 2024
1736ff8
modify according to new hardware codes
Oct 4, 2024
5f7f58a
modify according to new hardware codes
Oct 28, 2024
f4bfc68
modify according to new hardware codes
Oct 31, 2024
786b884
develop GUI with bleak
Nov 29, 2024
12e8a83
Merge remote-tracking branch 'origin/midge_zh' into midge_zh
Nov 29, 2024
803562d
develop GUI with bleak
Dec 5, 2024
1c1e136
test modification at home
Kevinlzh9802 Dec 5, 2024
582bef7
read data in imu and audio for tech pilot 11/01
Dec 6, 2024
780f15f
Try to parse imu files and check timestamp
Dec 9, 2024
bf577bb
Add some matlab scripts for better visualization
Dec 9, 2024
8218d59
Add some matlab scripts for better visualization
Dec 9, 2024
266cdab
make plots better; check for block size 24 or 32; code optimization
Dec 18, 2024
c367e63
remove redundant files
Kevinlzh9802 Dec 19, 2024
cad6e29
adjust windows path
Kevinlzh9802 Dec 19, 2024
24d1053
save data matlab
Dec 19, 2024
15c56a4
plot cross midge
Kevinlzh9802 Dec 20, 2024
a554b3d
multiple plots by sensor and midge
Kevinlzh9802 Dec 20, 2024
582f133
Merge branch 'master' into midge_zh
Jan 27, 2025
2b31868
Remove matlab, bluepy, imu_parser_v0
Jan 27, 2025
87250c7
Delete bluepy_test
Jan 27, 2025
6504d61
Delete badge_interface.py and bleak_test.py
Jan 27, 2025
ce60a9d
Modify bleak gui according to comments
Mar 5, 2025
8794622
Modify bleak gui according to comments
Mar 5, 2025
d05f4a5
Modify bleak gui according to comments
Mar 5, 2025
769d367
test connection time
Mar 6, 2025
fd504a2
modify test codes
Mar 6, 2025
d45196e
modify protocol
Mar 6, 2025
f75ebf5
modify protocol
Mar 7, 2025
f77e539
modify test
Mar 7, 2025
8ac99dd
modify test and protocol
Mar 7, 2025
469309e
modify badge protocol and test
Kevinlzh9802 Mar 7, 2025
c1635d4
Pass most of test
Kevinlzh9802 Mar 11, 2025
58fac3c
Modify audio parser and check decode parameters
Kevinlzh9802 Mar 14, 2025
ab1de26
Modify audio parser and check decode parameters, modify badge_protocol
Kevinlzh9802 Apr 10, 2025
02f1562
modify badge protocol in vscode
Kevinlzh9802 Apr 10, 2025
4bc88e7
roll back audio_parser_V0.py, imu_parser_V0.py, hub_V1.py, modify bad…
Kevinlzh9802 Apr 10, 2025
47048f0
modify test
Kevinlzh9802 Apr 10, 2025
c056d9c
modify test
Kevinlzh9802 Apr 10, 2025
e5b2a24
minimal modification of badge.py
Kevinlzh9802 Apr 28, 2025
d732e7b
minimal changes in test.py
Kevinlzh9802 Apr 28, 2025
1c4d1cd
python 2to3 badge_gui
Kevinlzh9802 Apr 28, 2025
48e133d
restore badge_interface
Kevinlzh9802 Apr 29, 2025
885f6d0
partially fix old GUI
Kevinlzh9802 Apr 30, 2025
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
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ _build/*
__pycache/
.vscode/c_cpp_properties.json
.vscode/settings.json
.vscode/launch.json
.vscode/
**/.DS_Store
BadgeFramework/rotation/rpi_sync.sh
.idea/
*.log
notes.txt
**/matlab/local
36 changes: 32 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Python: test.py",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/BadgeFramework/test.py",
"console": "integratedTerminal",
"args": "de:94:80:39:25:be"
},
{
"name": "Python: badge_gui.py",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/BadgeFramework/badge_gui.py",
"console": "integratedTerminal",
// "args": "de:94:80:39:25:be"
},
{
"name": "Python: badge_gui_bleak.py",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/BadgeFramework/badge_gui_bleak.py",
"console": "integratedTerminal",
// "args": "de:94:80:39:25:be"
},
{
"name": "Cortex Debug",
"cwd": "${workspaceFolder}",
Expand All @@ -13,16 +37,20 @@
"configFiles": [
"interface/cmsis-dap.cfg",
"target/nrf52.cfg"
],
"openOCDLaunchCommands": ["adapter speed 2000"],
],
"openOCDLaunchCommands": [
"adapter speed 2000"
],
"interface": "swd",
"armToolchainPath": "",
"svdFile": "${workspaceRoot}/nrf52832.svd",
"preLaunchCommands":["set remotetimeout 60"],
"preLaunchCommands": [
"set remotetimeout 60"
],
"rttConfig": {
"enabled": true,
"address": "auto",
"clearSearch": false, // OpenOCD users may have to un-comment this
"clearSearch": false, // OpenOCD users may have to un-comment this
"decoders": [
{
"port": 0,
Expand Down
3 changes: 1 addition & 2 deletions BadgeFramework/audio_parser_V0.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,4 @@ def main(fn):
parser = argparse.ArgumentParser(description='Parser for the audio data obtained from Mingle Midges')
parser.add_argument('--fn', required=True,help='Please enter the path to the file')
args = parser.parse_args()
main(fn=args.fn)

main(fn=args.fn)
Loading