1
0
mirror of https://github.com/Klagarge/Cursor.git synced 2024-11-26 11:13:27 +00:00
Commit Graph

51 Commits

Author SHA1 Message Date
Rémi Heredero
1bcb63bd92
Delete Rapport.md 2022-01-24 15:08:19 +01:00
Rémi Heredero
444b1e8755
Update Rapport.md 2022-01-23 14:10:44 +01:00
2406f14545 update rapport 2022-01-23 14:07:26 +01:00
ec48b25f25 add rapport 2022-01-23 13:59:35 +01:00
9af9fbe3fe Merge branch 'master' of https://github.com/Klagarge/Cursor 2022-01-22 14:03:48 +01:00
27b3966aee Update cursor_V2_2_1.ipf 2022-01-22 14:02:49 +01:00
Rémi Heredero
f2cb17fa0b add integration pictures 2022-01-22 14:01:27 +01:00
dc832c99df V2.2.1
Final version
2022-01-21 16:03:10 +01:00
56e6634fb6 add FPGA files 2022-01-20 22:07:28 +01:00
042f09e0f1 work with 2 small bugs
sometimes won't go back to pos2, and problem if many push in same button
2022-01-20 22:02:29 +01:00
e8427259ac try to debug 6 2021-12-21 16:00:29 +01:00
388ac1f144 try to debug simu 5 2021-12-21 15:35:18 +01:00
e6cad3cdbf try to debug 4 (it is ok) 2021-12-21 15:18:24 +01:00
f64ca436f5 try to debug 3 2021-12-21 15:04:35 +01:00
431a1a01ed try to debug 2 2021-12-21 14:42:09 +01:00
39617b48f4 try to correct 1 2021-12-21 14:29:44 +01:00
f8fe936949 Merge branch 'simu_simon' into Simu 2021-12-21 14:14:49 +01:00
SimoDonn
8547b652b8 correction 2021-12-21 14:10:01 +01:00
fd26384822 prbl réglé sur boutons et positions 2021-12-21 13:55:47 +01:00
Rémi Heredero
19441c321c
Merge pull request #10 from Klagarge:simuHER
SimuHER
2021-12-20 21:18:44 +01:00
296c526f0f first try simu 2021-12-20 21:18:06 +01:00
8bce3964c3 add gitignore 2021-12-20 21:04:51 +01:00
20f653ac43 i hope all is fine 2021-12-20 10:33:20 +01:00
609d833972 Merge branch 'recupHER' into Main 2021-12-20 10:31:07 +01:00
8fba932bcf Update .gitignore 2021-12-20 10:27:54 +01:00
a57a2ee1f6 Update .gitignore 2021-12-20 10:20:10 +01:00
SimoDonn
e9ed18d222 driver normalement fini 2021-12-17 09:44:01 +01:00
SimoDonn
b8bb3a346d début driver 2021-12-14 16:08:21 +01:00
8a3564470a finish position (i hope) 2021-12-14 16:01:52 +01:00
SimoDonn
f876bf49f4 test 2021-12-14 15:22:16 +01:00
Rémi Heredero
67f2fe7508
Merge pull request #2 from Klagarge/main_block
Main block
2021-12-14 15:13:42 +01:00
Rémi Heredero
140de6f101
Merge branch 'master' into main_block 2021-12-14 15:13:02 +01:00
SimoDonn
c7c03c3b76 la meme 2021-12-14 15:10:38 +01:00
SimoDonn
939a38d5e0 normalement le main est bon (c'est non) 2021-12-14 15:10:21 +01:00
SimoDonn
a5cd2f03a6 bientot fini accel 2021-12-14 09:44:05 +01:00
SimoDonn
0e83e694b1 encore 2021-12-10 09:47:27 +01:00
SimoDonn
e981567d8a la meme 2021-12-10 09:47:05 +01:00
SimoDonn
18ae102c38 accel + move dans le main 2021-12-07 16:01:27 +01:00
2c7bc2ff27 ajout d'un compteur pour l'encodeur 2021-12-07 16:00:41 +01:00
SimoDonn
cdc50c7e53 ouai 2021-12-07 09:49:22 +01:00
Rémi Heredero
72bb6f1af5
Merge pull request #1 from Klagarge:button_block
ajout block bouton
2021-12-07 09:37:06 +01:00
17cf35d8d1 ajout block bouton 2021-12-07 09:35:50 +01:00
7afa4f84dc first design 2021-12-07 08:21:56 +01:00
b47f87b6ba toto 2021-12-03 13:52:59 +01:00
a3a3a39e5c test merge 2021-11-30 10:15:27 +01:00
ff74b8e288 master 2021-11-30 08:50:06 +01:00
892abec7d2 test 2021-11-29 12:53:59 +01:00
c8a73a378f master 2021-11-25 13:31:50 +01:00
fdac19442c test 2021-11-24 14:49:36 +01:00
fc4183d2b8 master 2021-11-24 11:07:30 +01:00