Commits · master · Mauro Rovezzi / bliss · GitLab

07 Jan, 2020 8 commits
- Merge remote-tracking branch 'upstream/master' · ea0c3de2
  Mauro Rovezzi authored Jan 07, 2020
  
  ea0c3de2
- Merge branch 'regul-powersupply-cyberstar' into 'master' · bc4f1c40
  Matias Guijarro authored Jan 07, 2020
```
Regul powersupply cyberstar

See merge request bliss/bliss!1878
```
  bc4f1c40
- Merge branch 'wago_bugfix' into 'master' · 6b45c841
  Matias Guijarro authored Jan 07, 2020
```
Wago bugfix

Closes #1263

See merge request bliss/bliss!1881
```
  6b45c841
- Merge branch 'counter_conv_func' into 'master' · 5005fb54
  Matias Guijarro authored Jan 07, 2020
```
add setter to counter.conversion_funtion

See merge request bliss/bliss!1880
```
  5005fb54
- * add setter to counter.conversion_funtion · 56089bb8
  Emmanuel Papillon authored Jan 07, 2020
```
* add setter to counter.unit (usually we change also unit when a conv func is added)
```
  56089bb8
- wago: fixed exception type with MissingFirmware and added more tests for wago methods · 385daeb5
  Piergiorgio Pancino authored Jan 07, 2020
  
  385daeb5
- wago_group: fixed test with aproximation problem · 828c03b9
  Piergiorgio Pancino authored Jan 07, 2020
  
  828c03b9
- ShellStr: moved to avoid circular import · af884f79
  Piergiorgio Pancino authored Dec 18, 2019
  
  af884f79
06 Jan, 2020 1 commit
- fix doc string · 6f249ebe
  Perceval Guillou authored Jan 06, 2020
  
  6f249ebe
20 Dec, 2019 6 commits
- add the cyberstar powersupply (regulation) · 373f3f9b
  Perceval Guillou authored Dec 20, 2019
  
  373f3f9b
- Merge branch 'wago_cpu_750-891' into 'master' · ee7027e1
  Matias Guijarro authored Dec 20, 2019
```
Wago cpu 750 891

See merge request bliss/bliss!1845
```
  ee7027e1
- Merge branch 'fix_release_1_0_0' into 'master' · fc270875
  Matias Guijarro authored Dec 20, 2019
```
Fix release 1 0 0

See merge request bliss/bliss!1872
```
  fc270875
- fix info() for obj that are a Class/Type (not instance obj) · acfe3aae
  Perceval Guillou authored Dec 19, 2019
  
  acfe3aae
- fix typeguard version to 2.6.1 (2.7 makes the default scan crashing with type_check of protocols) · cfdecd0c
  Perceval Guillou authored Dec 19, 2019
  
  cfdecd0c
- Merge branch 'fix_default_chain_master_with_slave' into 'master' · fe08d513
  Matias Guijarro authored Dec 20, 2019
```
Handle child nodes of extra master

See merge request !1873
```
  fe08d513
19 Dec, 2019 5 commits
- Handle child nodes of extra master · 6a57f538
  bliss administrator authored Dec 19, 2019
  
  6a57f538
- wago interlocks: improved interlock error/checking and test on new module 750-891 · 6b1d0052
  Piergiorgio Pancino authored Dec 09, 2019
  
  6b1d0052
- wago interlocks: resolved bug on printing interlock differences · bc9d9921
  Piergiorgio Pancino authored Dec 09, 2019
  
  bc9d9921
- wago: support for CPU model 750-891 · 4b1e424d
  Piergiorgio Pancino authored Dec 06, 2019
  
  4b1e424d
- wago: fixed a bug that on 0-10V was causing overflow and negative voltage · 2aef01ae
  Piergiorgio Pancino authored Dec 06, 2019
  
  2aef01ae
18 Dec, 2019 20 commits
- Merge branch 'patch-4' into 'master' · 93650eb9
  Matias Guijarro authored Dec 18, 2019
```
Update CHANGELOG.md

See merge request !1862
```
  93650eb9
- Update CHANGELOG.md · b5c2c862
  Matias Guijarro authored Dec 17, 2019
  
  b5c2c862
- Merge branch '1187-keithley-properties-of-sensor-objects-are-not-working' into 'master' · 06da9355
  Matias Guijarro authored Dec 18, 2019
```
Resolve "keithley: properties of Sensor objects are not working"

Closes #1187

See merge request !1792
```
  06da9355
- Merge branch '1250-counters-registration-to-the-map' into 'master' · 9be6df01
  Perceval Guillou authored Dec 18, 2019
```
Resolve "counters registration to the map"

Closes #1250 and #1199

See merge request !1870
```
  9be6df01
- rename add_counter to create_counter · df6eed31
  Matias Guijarro authored Dec 18, 2019
  
  df6eed31
- Merge branch '1220_nexus_writer_blissapichanges' into 'master' · 94f912d2
  Matias Guijarro authored Dec 18, 2019
```
1220 nexus writer blissapichanges

Closes #1220

See merge request !1833
```
  94f912d2
- fix mapping test · 56405f7d
  Matias Guijarro authored Dec 18, 2019
  
  56405f7d
- tests: clean_globals reset simulation_diode module globals · f6da28bd
  Matias Guijarro authored Dec 18, 2019
  
  f6da28bd
- test_mg: added try...except where needed, since 'enable' or 'disable' can now raise an exception · 097dedac
  Matias Guijarro authored Dec 18, 2019
  
  097dedac
- test_conductor.py: use 'beacon' fixture to ensure connections are closed at the end of the test · cd697ccc
  Matias Guijarro authored Dec 18, 2019
```
Prevent error message with the greenlets check
```
  cd697ccc
- tests: fix invalid controller for simulation diodes · 81e6f281
  Matias Guijarro authored Dec 18, 2019
  
  81e6f281
- fix regulation '.add_counter' call · dce7190d
  Matias Guijarro authored Dec 18, 2019
  
  dce7190d
- simulation counters: remove manual adding to '_counters' · b3f69f86
  Matias Guijarro authored Dec 18, 2019
  
  b3f69f86
- emh: use '.add_counter' to add counter · a2ea52d7
  Matias Guijarro authored Dec 18, 2019
  
  a2ea52d7
- fix speedgoat .counters -> should return a counter_namespace · 02a3fa6d
  Matias Guijarro authored Dec 18, 2019
  
  02a3fa6d
- clean mythen counter creation code · 42c3e0eb
  Matias Guijarro authored Dec 18, 2019
  
  42c3e0eb
- pepu tests: replaced hard-to-understand mock patching with a much simpler derived class · 90cc6af3
  Matias Guijarro authored Dec 18, 2019
  
  90cc6af3
- pepu acquisition object: publish channel data without special methods on counter objects · 1ca69449
  Matias Guijarro authored Dec 18, 2019
  
  1ca69449
- clean pepu counters creation · b9d97cb0
  Matias Guijarro authored Dec 18, 2019
  
  b9d97cb0
- musst: sampling counter controller and integrating counter controller to not register counters · 23534fd3
  Matias Guijarro authored Dec 18, 2019
  
  23534fd3