From 9466cdb3fa419e4a124402d0fd3156c218751c36 Mon Sep 17 00:00:00 2001 From: Romain Bazile Date: Tue, 24 Nov 2020 17:26:10 +0100 Subject: [PATCH] config: update default and flow update bug --- config.json | 8 +++----- flows/main.json | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/config.json b/config.json index ef7f70d..706be6f 100644 --- a/config.json +++ b/config.json @@ -10,7 +10,7 @@ "sample_operator": "Operator's name", "sample_sampling_gear": "pass_hull", "acq_id": 1, - "acq_instrument": "PlanktonScope", + "acq_instrument": "PlanktonScope v2.2", "acq_celltype": 200, "acq_minimum_mesh": 10, "acq_maximum_mesh": 200, @@ -19,11 +19,9 @@ "acq_volume": 1, "acq_magnification": 0.94, "acq_fnumber_objective": 16, - "acq_camera_name": "Pi Camera V2.1 - 8MP", - "object_date": "20200131", - "object_time": "081100", + "acq_camera": "Pi Camera HQ", "object_depth_min": 0, "object_depth_max": 1, "process_pixel": 1.19, "process_id": 1 -} +} \ No newline at end of file diff --git a/flows/main.json b/flows/main.json index f4a9d71..395da46 100644 --- a/flows/main.json +++ b/flows/main.json @@ -4411,9 +4411,9 @@ "id": "386ce65d.a15d52", "type": "exec", "z": "1371dec5.76e671", - "command": "git", + "command": "git --git-dir /home/pi/PlanktonScope/.git/ stash", "addpay": false, - "append": "stash", + "append": "", "useSpawn": "false", "timer": "2", "oldrc": false, @@ -4432,9 +4432,9 @@ "id": "c3f72169.9d2b8", "type": "exec", "z": "1371dec5.76e671", - "command": "git", + "command": "git --git-dir /home/pi/PlanktonScope/.git/ pull", "addpay": false, - "append": "pull", + "append": "", "useSpawn": "false", "timer": "2", "oldrc": false, @@ -5741,4 +5741,4 @@ [] ] } -] \ No newline at end of file +]