Merge branch 'master' of gitlab1.ptb.de:vaclab/devhub

README.md

@@ -12,13 +12,12 @@ to read out measurement devices. It
 
 * [executes](#execute)
 
-shell commands.  Requests are *POST*ed via *http*
-in `json` format. Measurement data is returned in `json`
-format. **devhub** acts as a [stub](#stub-post-stub) and returns
-predefined responses. The repository contains instructions to build a
-standalone version that runs on BSD, Linux, MacOS and
-Windows. **devhub** can be configured to use [elasticsearch
-(els)](#elasticsearch-els) as a log database.
+shell commands.  Requests are *POST*ed via *http* in `json`
+format. Measurement data is returned in `json` format. **devhub** acts
+as a [stub](#stub-post-stub) and returns predefined responses. The
+repository contains instructions to build a standalone version that
+runs on BSD, Linux, MacOS and Windows. **devhub** can be configured to
+use [elasticsearch (els)](#elasticsearch-els) as a log database.
 
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 **Table of Contents**

deps.edn

@@ -10,8 +10,7 @@
                   
                   :extra-deps {io.github.clojure/tools.build {:git/tag "v0.5.1" :git/sha "21da7d4"}
                                jvxi11/jvxi11 {:local/root "resources/jvxi11/dist/jvxi11.jar"}
-                               org.acplt/oncrpc {:mvn/version "1.0.7"}
-                               ;oncrpc/server {:local/root "resources/jvxi11/external/oncrpc.jar"}
+                               oncrpc/server {:local/root "resources/jvxi11/external/oncrpc.jar"}
                                clojure.java-time/clojure.java-time {:mvn/version "1.1.0"}
                                compojure/compojure {:mvn/version "1.6.1"}
                                http-kit/http-kit {:mvn/version "2.5.0"}

src/devhub/pp_scripts/keithley.clj

@@ -19,5 +19,5 @@
   "Read the collector current of the lab gauge. With slow filter at
   least the first 10 readings should be droped."
   [{{t :Token u :Unit n :Skip} :PostScriptInput x :_x :as task}]
-  (merge task {:Result [(ppu/vl-result t (drop n (mapv (comp u/number extract) v)) u)]}))
+  (merge task {:Result [(ppu/vl-result t (drop n (mapv (comp u/number extract) x)) u)]}))