Skip to content
Snippets Groups Projects
  1. Feb 19, 2025
  2. Jan 16, 2025
  3. Dec 23, 2024
  4. Dec 17, 2024
  5. Dec 16, 2024
  6. Dec 12, 2024
    • Fabian Reister's avatar
      adding missing include · e5e053c4
      Fabian Reister authored
      e5e053c4
    • Christian Dreher's avatar
      Merge branch 'feat/hand-controls' into 'main' · c8bbef1c
      Christian Dreher authored
      Allow taring and resetting firmware of supported hands
      
      See merge request !54
      c8bbef1c
    • Christian Dreher's avatar
      Merge branch 'main' of... · 1ab1a944
      Christian Dreher authored
      Merge branch 'main' of git.h2t.iar.kit.edu:sw/armarx-integration/devices/ethercat into feat/hand-controls
      
      # Conflicts:
      #	source/devices/ethercat/hand/armarde/njoint_controller/Shape.cpp
      1ab1a944
    • Christian Dreher's avatar
      refactor: Reflect hardware divergence by splutting shared code for ARMAR-DE and ARMAR-7 · 709fad8d
      Christian Dreher authored
      This change is to not make it look like the code of shape controllers is still shared between ARMAR-DE and ARMAR-7. The firmware diverged when it was decided to introduce magic numbers as PWM control targets to trigger certain control commands (instead of a dedicated boolean via PDO etc.) due to time constraints.
      
      If the PDO is updated in the near future to model these control commands as booleans or enums or similar via PDOs, then the code can be merged again. The shape controller is a very high-level piece of software, and there is no reason to split the code other than the above-mentioned hardware-hack.
      709fad8d
  7. Dec 11, 2024
  8. Dec 06, 2024
  9. Nov 18, 2024
  10. Nov 12, 2024
  11. Oct 09, 2024
  12. Sep 24, 2024
  13. Sep 19, 2024
  14. Sep 17, 2024
  15. Sep 13, 2024
  16. Sep 09, 2024
  17. Sep 06, 2024
  18. Sep 04, 2024
  19. Aug 28, 2024
  20. Aug 16, 2024
Loading