1. 31 Oct, 2016 1 commit
  2. 27 Oct, 2016 8 commits
  3. 26 Oct, 2016 2 commits
  4. 24 Oct, 2016 2 commits
    • Matias Guijarro's avatar
      Merge branch 'transmission' into 'master' · 6e07925a
      Matias Guijarro authored
      Transmission
      
      Monochromatic (matt) attenuators controller and change of the transmission controller.
      
      See merge request !245
      6e07925a
    • Matias Guijarro's avatar
      Merge branch 'bigbugfix' into 'master' · 6475d5dd
      Matias Guijarro authored
      [important] Bug fix with pseudo motors state, if channels are involved (e.g. with 2 applications)
      
      It was quite hard to solve.
      
      See commits for more details.
      
      I am sorry ! Hopefully we won't change anything in motors for some time... Our tests are not powerful enough, so it starts to be difficult to make sure we don't do mistakes when we change code... :-(
      
      See merge request !244
      6475d5dd
  5. 21 Oct, 2016 2 commits
  6. 18 Oct, 2016 8 commits
  7. 14 Oct, 2016 3 commits
  8. 13 Oct, 2016 2 commits
  9. 12 Oct, 2016 3 commits
  10. 11 Oct, 2016 3 commits
  11. 10 Oct, 2016 3 commits
  12. 07 Oct, 2016 2 commits
  13. 02 Oct, 2016 1 commit
    • Alejandro Homs Puron's avatar
      Merge branch 'sync_hard_at_init' into 'master' · cf7269f3
      Alejandro Homs Puron authored
      controllers/motor.py: removed sync_hard() call in _initialize_axis method
      
      This is causing troubles with pseudo motors because it triggers a
      _hw_position() call, that triggers in turn a read on the motor controller 
      in case of a pseudo motor, the read just returns the last dial value and at this
      moment in this initialization phase it returns None, which breaks because
      it tries to divide this with the steps per unit (1 in case of pseudo motors).
      
      I see no obvious reason to have a `sync_hard` here. So I remove it ; it
      fixes my problem on ID29.
      
      See merge request !232
      cf7269f3