Rearrange code to accommodate custom layouts.

univeristyofmemphisrobotteam2019 · Jun 5, 2019 · c6089f1 · c6089f1
1 parent b546c81
commit c6089f1
Show file tree

Hide file tree

Showing 3 changed files with 207 additions and 148 deletions.
diff --git a/project.clj b/project.clj
@@ -6,6 +6,7 @@
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [quil "3.0.0"]
                  [udp-wrapper "0.1.1"]
-                 [cheshire "5.8.1"]]
+                 [cheshire "5.8.1"]
+                 [medley "1.2.0"]]
   :plugins [[lein-exec "0.3.7"]]
   :profiles {:dev {:dependencies [[midje "1.6.3"]]}})
diff --git a/src/arduino_comms/communication.clj b/src/arduino_comms/communication.clj
@@ -29,15 +29,12 @@
                 (assoc-in acc [:custom-values header] value))
               acc)) message-packet (:msgs message-packet)))
 
-(defn push-test-msg [msg]
-  (swap! current-accumulated-message #(let [[k v] (parse-var-set msg)]
-                                        (assoc-in % [:custom-values k] v))))
-
 (defn push-message [msg]
   (let [current @current-accumulated-message
         processed (pre-process-messages msg)
         log-view (concat @print-log (:msgs msg))
-        acc-msg (assoc processed :msgs log-view
+        acc-msg (assoc processed :time-posted (System/currentTimeMillis)
+                                 :msgs log-view
                                  :custom-values (merge
                                                   (:custom-values current)
                                                   (:custom-values processed)))]
@@ -47,6 +44,9 @@
     (swap! cached-messages #(conj % processed))
     (reset! print-log log-view)))
 
+(defn push-test-msg [msg]
+  (push-message {:msgs [msg]}))
+
 (defonce receive-loop
   (u/receive-loop
     socket