Commits · tab2 · Benoit Rousselle / bliss

22 Feb, 2018 1 commit
- tab2 calc controller + schema · b2dee87d
  Cyril Guilloud authored Feb 22, 2018
```
tab2 is derived from tabsup
```
  b2dee87d
16 Feb, 2018 16 commits
- Merge branch 'doc_settings' into 'master' · 9da5a158
  Vincent Michel authored Feb 16, 2018
```
howto about settings + improve tests on settings types.

See merge request !609
```
  9da5a158
- Merge branch 'load_script_fix' into 'master' · 0d7fa8e6
  Vincent Michel authored Feb 16, 2018
```
session, load_script: fixed bug reported by Antonia, local script import didn't work anymore

Closes #243

See merge request !608
```
  0d7fa8e6
- session, load_script: fixed bug reported by Antonia, local script import didn't work anymore · 476a3624
  Matias Guijarro authored Feb 16, 2018 and Vincent Michel committed Feb 16, 2018
```
Added test case.
```
  476a3624
- howto about settings + improve tests on settings types. · 931ecdda
  Cyril Guilloud authored Feb 16, 2018
  
  931ecdda
- Merge branch 'issue-241' into 'master' · cf4de589
  Matias Guijarro authored Feb 16, 2018
```
Fix continuous soft scan tests

Closes #241

See merge request !607
```
  cf4de589
- Improve move_done tests · 5600d79a
  Vincent Michel authored Feb 16, 2018
  
  5600d79a
- Fix docs requirements · 39492d8c
  Vincent Michel authored Feb 16, 2018
  
  39492d8c
- Update tests · b41c9a2a
  Vincent Michel authored Feb 16, 2018
  
  b41c9a2a
- Fix position discrepancy after the move is done · edcb190f
  Vincent Michel authored Feb 16, 2018
  
  edcb190f
- Fix scan base exception · 49b2ae94
  Vincent Michel authored Feb 16, 2018
  
  49b2ae94
- Increase tests thresholds · 46708224
  Vincent Michel authored Feb 16, 2018
  
  46708224
- Update test for continuous soft scan · c8e06c2d
  Vincent Michel authored Feb 16, 2018
  
  c8e06c2d
- Fix typo · 50dc5749
  Vincent Michel authored Feb 16, 2018
  
  50dc5749
- Add a test for software position trigger master · 32ffeafa
  Vincent Michel authored Feb 16, 2018
  
  32ffeafa
- Remove trailing spaces · adf3ade7
  Vincent Michel authored Feb 16, 2018
  
  adf3ade7
- Fix master/motor synchronization for continuous soft scans · 7347e0bb
  Vincent Michel authored Feb 16, 2018
  
  7347e0bb
15 Feb, 2018 2 commits
- Use a timer approach for SoftwarePositionTriggerMaster · 3bfe1901
  Vincent Michel authored Feb 15, 2018
  
  3bfe1901
- Make sure SoftwareTriggerPositionMaster triggers for all the points · 3d826279
  Vincent Michel authored Feb 15, 2018
  
  3d826279
14 Feb, 2018 2 commits
- Merge branch 'missing_mock' into 'master' · 9da4bcfe
  Matias Guijarro authored Feb 14, 2018
```
setup: add missing mock required by icepap linked axis

See merge request !606
```
  9da4bcfe
- setup: add missing mock required by icepap linked axis · ed91db54
  Jose Tiago Macara Coutinho authored Feb 14, 2018
  
  ed91db54
13 Feb, 2018 1 commit
- Merge branch 'mockup_axis_motion' into 'master' · aac185fc
  Jose Tiago Macara Coutinho authored Feb 13, 2018
```
axis mockup: better emulate motion

See merge request !603
```
  aac185fc
12 Feb, 2018 3 commits
- controllers/motors/mockup: fixed set_hw_limits, handle sign problems · d4062000
  Matias Guijarro authored Feb 12, 2018
```
tests: added hardware limit for test_axis_limit in test_motion_hook
```
  d4062000
- Merge branch '236-caclulation-acquisition-device-doesn-t-work-anymore' into 'master' · c3f496ab
  Matias Guijarro authored Feb 12, 2018
```
Resolve "Caclulation acquisition device doesn't work anymore"

Closes #236

See merge request !602
```
  c3f496ab
- Merge branch 'testSettings' into 'master' · 8a7c8967
  Sebastien Petitdemange authored Feb 09, 2018
```
basic tests for SimpleSetting  HashSetting QueueSetting

See merge request !604
```
  8a7c8967
09 Feb, 2018 15 commits
- test: added test for calculation counter · f4dcf306
  Sebastien Petitdemange authored Feb 09, 2018
  
  f4dcf306
- Merge branch 'testSettings' into 'master' · 9e10b413
  Sebastien Petitdemange authored Feb 09, 2018
```
basic tests for SimpleSetting  HashSetting QueueSetting

See merge request !604
```
  9e10b413
- Merge branch 'axis_patch' into 'master' · a3577efc
  Sebastien Petitdemange authored Feb 09, 2018
```
Axis patch

See merge request !597
```
  a3577efc
- calculation counter: fixed with the new channel structure. · d6d6f6c4
  Sebastien Petitdemange authored Feb 09, 2018
  
  d6d6f6c4
- common/axis.py: execute pre_move_hook for jog, home and hw_limit · c4ec3a3d
  Matias Guijarro authored Feb 09, 2018
```
Added new methods: __execute_pre_move_hook and __execute_post_move_hook
```
  c4ec3a3d
- common/axis.py: _do_handle_move renamed _do_move · 40db9468
  Matias Guijarro authored Feb 07, 2018
  
  40db9468
- common/axis.py: removed .being_waited flag for move tasks · 9566c8cb
  Matias Guijarro authored Feb 07, 2018
```
What was it for???
```
  9566c8cb
- common/axis.py: wait_move made more clean · a986a071
  Matias Guijarro authored Feb 07, 2018
  
  a986a071
- common/axis.py: reset move task in .set_move_done() · 73da18d5
  Matias Guijarro authored Feb 07, 2018
  
  73da18d5
- common/axis.py: removed __emit_move_done method · 112d0b75
  Matias Guijarro authored Jan 30, 2018
  
  112d0b75
- common/axis.py: remove is_busy() from controller, not needed · 7cf66d99
  Matias Guijarro authored Jan 29, 2018
  
  7cf66d99
- common/axis.py: use same pattern as with .move() for home, limit search and jog · 5c2e7f02
  Matias Guijarro authored Feb 06, 2018
  
  5c2e7f02
- common/axis.py: use _check_ready() instead of self.is_moving · 3b38d0e7
  Matias Guijarro authored Feb 06, 2018
  
  3b38d0e7
- common/axis.py: removed unnecessary complicated code in .start_move_task() · 4fa59278
  Matias Guijarro authored Feb 06, 2018
  
  4fa59278
- applied same fix as with first jog test · f9ee3339
  Matias Guijarro authored Feb 06, 2018
  
  f9ee3339