Commits · devel · Berkeley Lab / labRemote

Apr 09, 2024
- Merge branch 'lxicom_schema' into 'devel' · d1320d00
  Elisabetta Pianori authored 1 year ago
  
  add LXICom schema See merge request !320
  d1320d00
Apr 08, 2024
- add lxicom schema · 689f0904
  Lingxin Meng authored 1 year ago
  
  689f0904
Mar 22, 2024
- Merge branch 'ep_update_Fluke8842' into 'devel' · ba404e3e
  Elisabetta Pianori authored 1 year ago
  
  fix Fluke8842 operation See merge request !318
  ba404e3e
Mar 19, 2024
- replce PS with meter · 413e94d0
  Elisabetta Pianori authored 1 year ago
  
  413e94d0
- fix formatting · c43b21bf
  Elisabetta Pianori authored 1 year ago
  
  c43b21bf
- fix Fluke8842 operation · 0d1c2614
  Elisabetta Pianori authored 1 year ago
  
  0d1c2614
Mar 12, 2024
- Merge branch 'add_fluke45' into 'devel' · 85dcdabb
  Elisabetta Pianori authored 1 year ago
  
  Add fluke45 See merge request !299
  85dcdabb
- Add fluke45 · 5005900a
  Emily Anne Thompson authored 1 year ago and Elisabetta Pianori committed 1 year ago
  
  5005900a
- Merge branch 'add-RigolDM3000-scope' into 'devel' · 0ba1034f
  Elisabetta Pianori authored 1 year ago
  
  Add rigol dm3000 scope See merge request !315
  0ba1034f
- Add rigol dm3000 scope · 7d539d53
  Simon Florian Koch authored 1 year ago and Elisabetta Pianori committed 1 year ago
  
  7d539d53
Feb 29, 2024
- Merge branch 'devel' into 'devel' · e2f1ff8a
  Elisabetta Pianori authored 1 year ago
  
  Add CPX400SP and TTI MX100TP powersupplies See merge request !314
  e2f1ff8a
Feb 21, 2024
- Add CPX400SP powersupply · 0814faf9
  Ben Bruers authored 1 year ago
  
  0814faf9
- Add support for TTI MX100TP · 8e786130
  Ben Bruers authored 1 year ago
  
  8e786130
Jan 27, 2024
- Merge branch 'TfromNTC' into 'devel' · ff5da74f
  Elisabetta Pianori authored 1 year ago
  
  update NTC coefficients for ITkPix quads See merge request berkeleylab/labRemote!313
  ff5da74f
Jan 26, 2024
- Merge branch 'devel' into TfromNTC · 17cc4c30
  Lingxin Meng authored 1 year ago
  
  17cc4c30
Dec 06, 2023
- format · 8c2dd58b
  Lingxin Meng authored 1 year ago
  
  8c2dd58b
- update NTC coefficients for ITkPix quads · 3d5e7d71
  Lingxin Meng authored 1 year ago
  
  3d5e7d71
Nov 09, 2023
- Merge branch 'add_julabo_chiller' into 'devel' · 7c8eef6b
  Elisabetta Pianori authored 1 year ago
  
  Add developments for cold box See merge request !302
  7c8eef6b
- Add DT8033NPs to python.cpp · 126409c0
  Emily Anne Thompson authored 1 year ago
  
  126409c0
Nov 08, 2023
- Try changing tag · ef31ff6e
  Emily Anne Thompson authored 1 year ago
  
  ef31ff6e
- Add description for DT8033N · 6150608e
  Emily Anne Thompson authored 1 year ago
  
  6150608e
- Fix functions not tested with cold box · bc5ea8dd
  Emily Anne Thompson authored 1 year ago
  
  bc5ea8dd
- Add DT8033NPs · 41a2daa1
  Emily Anne Thompson authored 1 year ago
  
  41a2daa1
- Fix format · c9801dcb
  Emily Anne Thompson authored 1 year ago
  
  c9801dcb
- Implement comments · 93afa926
  Emily Anne Thompson authored 1 year ago
  
  93afa926
Sep 25, 2023
- Merge branch 'main_revert_problematic_commit' into 'main' · cfa7fa30
  Elisabetta Pianori authored 1 year ago
  
  Bring main and devel back in sync See merge request !308
  cfa7fa30
- fix formatting error · bcc722d2
  Elisabetta Pianori authored 1 year ago
  
  bcc722d2
- Merge branch 'devel' into main_revert_problematic_commit · 59cffdd4
  Elisabetta Pianori authored 1 year ago
  
  Conflicts: src/libPS/AgilentE3648APs.cpp src/libPS/AgilentE3648APs.h src/libPS/python.cpp
  59cffdd4
- Revert commit 0d9f6070 .gitlab-ci.yml · f68f8237
  Elisabetta Pianori authored 1 year ago
  
  f68f8237
- Merge branch 'revert-c5e5a0d3 ' into 'main' · e0f512b7
  Elisabetta Pianori authored 1 year ago
  
  Revert "Update CONTRIBUTING.md" See merge request berkeleylab/labRemote!306
  e0f512b7
- Revert "Update CONTRIBUTING.md" · 3f9ad33f
  Elisabetta Pianori authored 1 year ago
  
  This reverts commit c5e5a0d3
  3f9ad33f
Jul 24, 2023
- Merge branch 'add_NGP804' of https://gitlab.cern.ch/berkeleylab/labRemote into add_julabo_chiller · 1224851b
  Emily Anne Thompson authored 1 year ago
  
  1224851b
- Merge branch 'devel' of https://gitlab.cern.ch/berkeleylab/labRemote into add_julabo_chiller · dcb8475e
  Emily Anne Thompson authored 1 year ago
  
  dcb8475e
- Fix format · c9da3cfc
  Emily Anne Thompson authored 1 year ago
  
  c9da3cfc
- Add NGP800 · bf167765
  Emily Anne Thompson authored 1 year ago
  
  bf167765
Jul 22, 2023
- Merge branch 'juerg-arduino' into 'devel' · bfa677bb
  Elisabetta Pianori authored 1 year ago
  
  Extend Arduino devcomuino to support digital IO pins and Arduino Nano See merge request !258
  bfa677bb
- Extend Arduino devcomuino to support digital IO pins and Arduino Nano · 93892a29
  Juerg Beringer authored 1 year ago and Elisabetta Pianori committed 1 year ago
  
  93892a29
- Merge branch 'juerg-polyscilm' into 'devel' · 9fedd424
  Elisabetta Pianori authored 1 year ago
  
  Add pressure and flow measurement for PolyScience chiller See merge request !261
  9fedd424
Jul 19, 2023
- Add measurePressure and measureFlow to IChiller · 2a8c340f
  Emily Anne Thompson authored 1 year ago
  
  2a8c340f
Jul 17, 2023
- Fix for other char sizes too · 25fca63a
  Emily Anne Thompson authored 1 year ago
  
  25fca63a