Commits · master · Boi Okken / JDMS

Feb 14, 2025
- Edit LoadcellConfig.h · d93e0c5f
  Boi Okken authored 1 month ago
  
  d93e0c5f
May 16, 2023
- Merge branch 'dev' into 'master' · 345ec9f7
  Boi Okken authored 1 year ago
  
  Dev See merge request !13
  345ec9f7
Mar 08, 2023
- Overarching data processing function · 5998052d
  Boi Okken authored 2 years ago
  
  5998052d
- Merge branch 'dev' of https://git.ram.eemcs.utwente.nl/okkenb/JDMS into dev · 1b702b8e
  Boi Okken authored 2 years ago
  
  1b702b8e
- Change title plot · 882057d0
  Boi Okken authored 2 years ago
  
  882057d0
- Automated measurements now only save the csv and log, no more plot · a286b9c6
  Boi Okken authored 2 years ago
  
  a286b9c6
- Removed dead code · 502d53c6
  Boi Okken authored 2 years ago
  
  502d53c6
- Changed diameters and quick bug fix, should be checked again (TODO) · be320ab1
  Boi Okken authored 2 years ago
  
  be320ab1
- Changed order of colors (red, orange and blue for plot) · 0dff54ca
  Boi Okken authored 2 years ago
  
  0dff54ca
- Dip doesnt go over initial setpoint on return · 8ff5c432
  Boi Okken authored 2 years ago
  
  8ff5c432
Mar 07, 2023
- Merge branch 'dev' into 'master' · d03ed140
  Boi Okken authored 2 years ago
  
  Dev See merge request !12
  d03ed140
- Plots are now saved in SVG format instead of EPS · 0b1bcc6c
  Boi Okken authored 2 years ago
  
  0b1bcc6c
- Implemented dip going under zero to -initialsetpoint · cc261a2f
  Boi Okken authored 2 years ago
  
  cc261a2f
- Fixed some logic in dip wf gen, should be more accurate and faster · 8818d6b6
  Boi Okken authored 2 years ago
  
  8818d6b6
Mar 06, 2023
- Dip waveform no more return to orig SP, just slightly above lowest val · 504c11f3
  Boi Okken authored 2 years ago
  
  504c11f3
- Changed Y-label of plot · 4ea82a97
  Boi Okken authored 2 years ago
  
  4ea82a97
- After dip measurement force is held instead of released · 23337720
  Boi Okken authored 2 years ago
  
  23337720
- Changed weight list and idameters tested · fb4ec194
  Boi Okken authored 2 years ago
  
  fb4ec194
- Fixed some regular expressions, and added safety for no folder · 2749d9d2
  Boi Okken authored 2 years ago
  
  2749d9d2
- check to implement · 170c82fc
  Boi Okken authored 2 years ago
  
  170c82fc
- Merge branch 'dev' of https://git.ram.eemcs.utwente.nl/okkenb/JDMS into dev · 9428057f
  Boi Okken authored 2 years ago
  
  9428057f
- added compensation for frictional force, and writing 0 to file for 0 frc · 6781bb7d
  Boi Okken authored 2 years ago
  
  6781bb7d
Mar 05, 2023
- Some tabs · dc15847e
  Boi Okken authored 2 years ago
  
  dc15847e
- Added proper weights used. Change filename of interm file (weight in mN) · c38109f2
  Boi Okken authored 2 years ago
  
  c38109f2
Mar 02, 2023
- See prev · 45fe0c7d
  Boi Okken authored 2 years ago
  
  45fe0c7d
- Merge branch 'dev' into 'master' · 269b4953
  Boi Okken authored 2 years ago
  
  Dev See merge request !11
  269b4953
- Added filtering of first second of data, as this can contain glitches · 8ce51b45
  Boi Okken authored 2 years ago
  
  8ce51b45
- Return sum of left and right sensor as force applied · c97eb03b
  Boi Okken authored 2 years ago
  
  c97eb03b
- Added friction forces · 2f58f41e
  Boi Okken authored 2 years ago
  
  2f58f41e
Mar 01, 2023
- Fixed bug where constant current would generate files · b419199e
  Boi Okken authored 2 years ago
  
  b419199e
- See last · 4be46211
  Boi Okken authored 2 years ago
  
  4be46211
- Added callibration of palm, left and right LC · f1a3195b
  Boi Okken authored 2 years ago
  
  f1a3195b
- Decreased margin for stopping a dip waveform · 7b394c36
  Boi Okken authored 2 years ago
  
  7b394c36
- Fixed serial automation code · 8541a844
  Boi Okken authored 2 years ago
  
  8541a844
- added way to disable after setting static current · c54aa3f5
  Boi Okken authored 2 years ago
  
  c54aa3f5
- Fixed lockup of set current command · 4d42812a
  Boi Okken authored 2 years ago
  
  4d42812a
- Fixed bug tried to plot data after setting static current · 0f132102
  Boi Okken authored 2 years ago
  
  0f132102
- Fixed merge · aa7b3fba
  Boi Okken authored 2 years ago
  
  aa7b3fba
- a · 0d421ca7
  Boi Okken authored 2 years ago
  
  Signed-off-by: okkenb <b.okken@utwente.nl>
  0d421ca7
- a · c6e3b3cb
  Boi Okken authored 2 years ago
  
  c6e3b3cb