Skip to content
Open

PR #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
225b752
Added a README
FelixTheoret Nov 26, 2021
fd298f9
Test du github #1
FelixTheoret Nov 26, 2021
ef71423
Test du github #2
FelixTheoret Nov 26, 2021
8a46b1f
Test du github #3
FelixTheoret Nov 26, 2021
d569876
Test du github #4
FelixTheoret Nov 26, 2021
105fc7f
Test du github #5
abra443 Dec 2, 2021
7d58ceb
Test du github #6
abra443 Dec 2, 2021
ad63cc2
jai fait un test pour Hocine
HocNah Dec 3, 2021
6ea4b2a
lease enter the commit message for your changes. Lines starting
HocNah Jan 28, 2022
dbc9009
Created a first structure for the project
abra443 Jan 30, 2022
3edcdbd
Added the data repository
FelixTheoret Jan 30, 2022
e7d8f06
Test du github Francis #1
francisib3 Feb 8, 2022
492f6a6
Test du github Francis IB #2
francisib3 Feb 8, 2022
8b9d9ba
Initialisation StimulationSignal
VictorineJoncas Feb 10, 2022
a91e83b
Add files via upload
frederiqueleclerc Feb 11, 2022
55d44d7
fonctions ajoutees, à implémenter
genevievebeaudoinpolymtl Feb 16, 2022
c9fcc45
Modification _init_ simulator
VictorineJoncas Feb 16, 2022
ed7aab7
Compréhension checksum
VictorineJoncas Feb 18, 2022
174e837
Ajout checksum et data_length + début init
VictorineJoncas Feb 18, 2022
ef4c244
Dictionnaire et suggestions
genevievebeaudoinpolymtl Feb 20, 2022
e787556
Fonction watchdog et get_mode
VictorineJoncas Feb 21, 2022
6a7947c
Ajout port avec Serial et Init_ACK
VictorineJoncas Feb 21, 2022
30b3c1f
added dictionary
genevievebeaudoinpolymtl Feb 22, 2022
47b9fa5
added dictionary
genevievebeaudoinpolymtl Feb 22, 2022
f97a3ab
added command association
genevievebeaudoinpolymtl Feb 22, 2022
87a456c
Documentation sur les branchres ajoutée
FelixTheoret Feb 25, 2022
1f4ff42
Fonction lecture paquet
VictorineJoncas Feb 25, 2022
a2c7b3c
no changes
genevievebeaudoinpolymtl Feb 25, 2022
f5d79b1
add InstructionWindow, MainWindowStim, Parameters, Stimulation Window…
frederiqueleclerc Feb 25, 2022
092f033
Changed path to soure for the 6 documents just pushed
frederiqueleclerc Feb 25, 2022
755d66d
image du logo dans le bon path
frederiqueleclerc Feb 25, 2022
a5b698f
Ajout des boutons - et + du Stimulation window et mis en commentaire …
frederiqueleclerc Feb 26, 2022
ad9a475
Prendre matrice param start et continuer fenetre de stim
frederiqueleclerc Feb 28, 2022
f2480f0
Ajout tout ACK et fonction qui les appelle
VictorineJoncas Feb 28, 2022
a1ca30f
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Feb 28, 2022
3e2f456
Finir bouton de la fenêtre de stimulation
frederiqueleclerc Mar 2, 2022
9d20122
Timer
frederiqueleclerc Mar 3, 2022
9fe856c
Timer changes
frederiqueleclerc Mar 3, 2022
58dad7d
timer changes and timer testing location changed to test folfer
frederiqueleclerc Mar 3, 2022
e3422c5
push parce que bug
genevievebeaudoinpolymtl Mar 3, 2022
4e4f83d
update_param
frederiqueleclerc Mar 4, 2022
cb01fb7
Ajout des exceptions
frederiqueleclerc Mar 5, 2022
84dfcd7
Fonction écriture paquet
VictorineJoncas Mar 8, 2022
a56ad61
Started the communication between classes and the RehaStim simulator
FelixTheoret Mar 8, 2022
8ebae27
Completed a first version of the class communication mechanism and st…
FelixTheoret Mar 8, 2022
b41d361
Danger_check
frederiqueleclerc Mar 9, 2022
fb35232
Made the file 'app.py' executable
FelixTheoret Mar 10, 2022
adcd015
Modification packet_construction
VictorineJoncas Mar 10, 2022
03c60b9
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Mar 10, 2022
0d423e1
DangerUp added
frederiqueleclerc Mar 11, 2022
774e039
added tester file for creating txt files
frederiqueleclerc Mar 11, 2022
e1a9ff0
Ajout fonction send_packet
VictorineJoncas Mar 11, 2022
863b4d1
enregistrement des paramètres des electrodes
genevievebeaudoinpolymtl Mar 13, 2022
4b4a6da
Danger Pop Up done.
frederiqueleclerc Mar 16, 2022
1ff7b50
Merge branch 'main' of github.com:FelixTheoret/Ergocycle
frederiqueleclerc Mar 16, 2022
eaebe80
Complétion du timer
frederiqueleclerc Mar 17, 2022
a1562d7
Modes concentrique/excentrique
dibala21 Mar 17, 2022
42293fd
Merge pull request #1 from dibala21/main
dibala21 Mar 18, 2022
406b287
Ajout fonction pour commander stim
VictorineJoncas Mar 18, 2022
1e78132
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Mar 18, 2022
4762cb2
Modification init et init_ACK
VictorineJoncas Mar 19, 2022
b7a9c2a
fonction set attribut
VictorineJoncas Mar 19, 2022
170c290
ajout de la partie des txt files dans classe Instructionwindow
frederiqueleclerc Mar 20, 2022
f0ecf69
Advanced the inter-class communication
FelixTheoret Mar 20, 2022
93fbb2c
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle into…
FelixTheoret Mar 20, 2022
39ab039
Advanced the screen part
FelixTheoret Mar 20, 2022
0079223
Communication Stimulator et Ergocycle V1
VictorineJoncas Mar 20, 2022
06c1a6c
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Mar 20, 2022
d03703d
Completed the inter-class communication part and added new features (…
FelixTheoret Mar 20, 2022
ee90e84
Resolved Ergocycle and Stimulator conflicts
FelixTheoret Mar 20, 2022
b9abaec
Test du github Nicolas Pelletier-Cote #1
nicolaspelletier-cote Mar 20, 2022
f823a34
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
nicolaspelletier-cote Mar 20, 2022
fe3a9b5
Ajout du nom dans le fichier de test
nicolaspelletier-cote Mar 20, 2022
b423e70
Ajout des fichiers de l'interface du controle du moteur
nicolaspelletier-cote Mar 20, 2022
0a91d0f
Update Crankset.py
HocNah Mar 21, 2022
c9be048
Create CranksetSend.py
HocNah Mar 21, 2022
56db78d
enregistrement des fichiers
genevievebeaudoinpolymtl Mar 23, 2022
2a9555d
Addition of testing window and modification for easier exit when dang…
frederiqueleclerc Mar 23, 2022
10ebc50
tests pour la odrive
dibala21 Mar 24, 2022
c35953d
Fonctions de tests pour la odrive au labo
dibala21 Mar 25, 2022
e4a33d0
Added StartWindow and TestingWindow
frederiqueleclerc Mar 25, 2022
1f6be30
Packet constructor working
francisib3 Mar 25, 2022
0f02379
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
francisib3 Mar 25, 2022
1ddf9e5
Reorganized the Crankset parent class and child classes. Added the co…
FelixTheoret Mar 25, 2022
99b30ed
Modification test rehastim
VictorineJoncas Mar 28, 2022
e36aad1
Lundi 17:06, communication fonctionne partiellement
francisib3 Mar 28, 2022
dce8017
Checksum ne fonctionne pas
francisib3 Mar 28, 2022
6687278
Addition de commandes boutons
frederiqueleclerc Mar 30, 2022
91a8164
init_ack fonctionne
VictorineJoncas Mar 31, 2022
44010bd
command addition
frederiqueleclerc Apr 1, 2022
0d1c45b
Merge branch 'main' of github.com:FelixTheoret/Ergocycle
frederiqueleclerc Apr 1, 2022
c301bb5
update des tests
dibala21 Apr 1, 2022
d063e83
Stimulation Fonctionne
francisib3 Apr 1, 2022
1f4aec7
Work on bytes too big
francisib3 Apr 1, 2022
0e7fbef
Test odrive capteur
dibala21 Apr 1, 2022
2561cf5
tests odrives pour capteurs
dibala21 Apr 1, 2022
580ebbf
Link StimulationScreen class with Ergocyle class
frederiqueleclerc Apr 1, 2022
911ef95
Merge branch 'main' of github.com:FelixTheoret/Ergocycle
frederiqueleclerc Apr 1, 2022
9b2c4aa
modification test du torque
dibala21 Apr 2, 2022
574e60b
Updated the ODrive tests
dibala21 Apr 2, 2022
e50c500
MSB_LSB works for init
francisib3 Apr 4, 2022
9b1fd77
Works with matrix from UI
francisib3 Apr 4, 2022
a19c604
test du torque quand la vitesse est nulle
dibala21 Apr 4, 2022
6338daa
Command added with problems
frederiqueleclerc Apr 5, 2022
cf50485
Modified the motor UI to be able to control it from Ergocycle
nicolaspelletier-cote Apr 6, 2022
d051a7a
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
nicolaspelletier-cote Apr 6, 2022
6022dd9
TODO comment added to Ergocycle
nicolaspelletier-cote Apr 6, 2022
cd0ea2b
Agrandissement des layout + travail sur les command
frederiqueleclerc Apr 6, 2022
b8a97c9
Merge branch 'main' of github.com:FelixTheoret/Ergocycle
frederiqueleclerc Apr 6, 2022
5fdf8df
changes in stimulation screen so that it works like motor_screen but …
frederiqueleclerc Apr 6, 2022
1e841de
Allowed Ergocycle to switch UI windows
nicolaspelletier-cote Apr 6, 2022
20d0e15
Allow Ergocycle to fully control motor UI windows
nicolaspelletier-cote Apr 7, 2022
5d44a48
Rescaling Motor UI to cover entire screen
nicolaspelletier-cote Apr 7, 2022
31619ea
testOdrive pour mode concentrique
dibala21 Apr 7, 2022
31cff07
Changed labels in motor UI
nicolaspelletier-cote Apr 7, 2022
a608b00
Updated the test file for the ODrive
FelixTheoret Apr 7, 2022
316775f
Removing unused imports from motor UI classes
nicolaspelletier-cote Apr 7, 2022
7e2c221
Timer + seprate matrix for angle purpose
VictorineJoncas Apr 8, 2022
8e92b97
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Apr 8, 2022
7f74be7
Allow Ergocycle to control some SEF UI windows
nicolaspelletier-cote Apr 8, 2022
ba4f43b
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
nicolaspelletier-cote Apr 8, 2022
1179efa
Allow Ergocycle to fully control SEF UI windows
nicolaspelletier-cote Apr 8, 2022
d75a762
test mode concentrique sur l'ergocycle
dibala21 Apr 8, 2022
ad8909b
Matrix for different angle ok
VictorineJoncas Apr 8, 2022
b4039fc
command for stimulation test parameters completed. Matrix to send to …
frederiqueleclerc Apr 9, 2022
d1b8118
commands added to test windows in ui sef
frederiqueleclerc Apr 9, 2022
b2f3c82
Added command in ergocycle class.
frederiqueleclerc Apr 9, 2022
fd90aff
modified command for start of training ui sef
frederiqueleclerc Apr 9, 2022
e08fb34
Renaming get_initial_test_parameters to get_test_parameters in Ergocy…
frederiqueleclerc Apr 9, 2022
a774f65
remove HEAD line error in Ergocycle imports
frederiqueleclerc Apr 9, 2022
648ea70
Added all commands with regards to stimulation parameters matrices (t…
frederiqueleclerc Apr 9, 2022
cb16406
Added labels to SummaryMenu
nicolaspelletier-cote Apr 9, 2022
8c778fd
Added commands to read data from sensors
nicolaspelletier-cote Apr 10, 2022
c1fcb7c
Fixed the issue related UI error when danger pop up appeared
frederiqueleclerc Apr 10, 2022
1d6dcb8
Added units to data shown in summary menu
nicolaspelletier-cote Apr 10, 2022
3687b5e
Started dividing commands in threads
nicolaspelletier-cote Apr 11, 2022
01c6c68
Added TODO and comments to thread functions
nicolaspelletier-cote Apr 11, 2022
f0b2da5
Changed the threads type de Daemon
nicolaspelletier-cote Apr 11, 2022
065ef0a
Added timer to ActivityMenu
nicolaspelletier-cote Apr 11, 2022
4ea72c0
Add basic fonctions to stim threshold
VictorineJoncas Apr 12, 2022
972f026
Update Crankset.py
HocNah Apr 12, 2022
79ad511
Update CranksetCommunicator.py
HocNah Apr 12, 2022
11188e9
Update CranksetRecorder.py
HocNah Apr 12, 2022
80517fa
Create ErgocycleCommunicatorClient
HocNah Apr 12, 2022
a0eedfe
Update Crankset.py
HocNah Apr 13, 2022
62ee246
Synchronized stimulations start and end with motor
nicolaspelletier-cote Apr 13, 2022
98a0f3d
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
nicolaspelletier-cote Apr 13, 2022
9a9c892
Added label to inform user that the target training time has been rea…
nicolaspelletier-cote Apr 13, 2022
d2ccd6f
Command for stimulation training time and command for end of stimulat…
frederiqueleclerc Apr 13, 2022
05cc73b
Buttons made slightly bigger
frederiqueleclerc Apr 13, 2022
8a4822a
Worked on saving stimulation data.
frederiqueleclerc Apr 13, 2022
2d61f96
saving stimulation data
frederiqueleclerc Apr 14, 2022
e1ee3fb
Improvements in stimulation data saving. Files are create from Stimul…
frederiqueleclerc Apr 14, 2022
0759f89
modified test parameters matrix to be 4x8
frederiqueleclerc Apr 14, 2022
35bb6b0
connection between UI and stim
VictorineJoncas Apr 14, 2022
419a9f0
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Apr 14, 2022
d84ffb4
Create ClientTest
HocNah Apr 14, 2022
004f177
Create ServerTest
HocNah Apr 14, 2022
28e2238
modif gitignore
VictorineJoncas Apr 14, 2022
bd8037d
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Apr 14, 2022
ea3dd5d
path changed for data saving stimulations
frederiqueleclerc Apr 14, 2022
873c96c
tests+ stim fonctionne
VictorineJoncas Apr 15, 2022
f8e22e7
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
VictorineJoncas Apr 15, 2022
ad73b75
Cleaned up the source folder
dibala21 Apr 15, 2022
99f6f3e
Merge branch 'main' of https://github.com/FelixTheoret/Ergocycle
dibala21 Apr 15, 2022
0585674
Commented code for GUI stimulations
frederiqueleclerc Apr 15, 2022
f8536e9
mise a jour avant fork()
dibala21 Apr 18, 2022
3052b61
ajout des modifications de nicolas
dibala21 Apr 18, 2022
af31314
Merge branch 'main' into DielBranch
dibala21 Apr 18, 2022
ad56dc3
mode passif
dibala21 Apr 18, 2022
f2bf8a3
correction
dibala21 Apr 18, 2022
3f1d577
controle moteur par interface
dibala21 Apr 18, 2022
8502546
Merge branch 'DielBranch' of https://github.com/FelixTheoret/Ergocycl…
dibala21 Apr 18, 2022
6d243f3
Test and training stim ok ish
VictorineJoncas Apr 18, 2022
96d4358
Advanced the final product
dibala21 Apr 18, 2022
256602e
Further step to merge the two branches
FelixTheoret Apr 19, 2022
770f0ec
Merge branch 'DielBranch'
dibala21 Apr 19, 2022
6209d04
nouveau ergocycle
dibala21 Apr 19, 2022
92e97ca
commit pour la presentation
Apr 19, 2022
5e01be0
Update Crankset.py
HocNah Apr 20, 2022
c0d08b8
Update CranksetRecorder.py
HocNah Apr 20, 2022
0656e6c
fichiers de modelisation 3D mecaniques
dibala21 Apr 25, 2022
d085d10
Rename CranksetCommunicator.py to CranksetCommunicatorServer.py
FelixTheoret Aug 19, 2022
92ad449
Rename ErgocycleCommunicatorClient to CranksetCommunicatorClient.py
FelixTheoret Aug 19, 2022
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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,14 @@ dmypy.json

# Pyre type checker
.pyre/

# Interfaces graphiques
source/test_gitignore.txt

# Documentation personnelle
documentation/guide_oop.md

#Fichiers d'enregistrement
source/0*
source/1*

Empty file added README.md
Empty file.
9 changes: 9 additions & 0 deletions data/rehastim_commands.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"connection_commands" : {
"Init" : 1,
"InitAck" : 2,
"UnknownCommand" : 3,
"Watchdog" : 4
},
"rehastim2 modes" : {}
}
Binary file added documentation/ERGOCYCLE_BRANCHES.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
261 changes: 261 additions & 0 deletions documentation/ERGOCYCLE_BRANCHES.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documentation/ERGOCYCLE_UML.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading