config: update default and flow update bug

This commit is contained in:
Romain Bazile 2020-11-24 17:26:10 +01:00
parent 05dc317095
commit 9466cdb3fa
2 changed files with 8 additions and 10 deletions

View file

@ -10,7 +10,7 @@
"sample_operator": "Operator's name", "sample_operator": "Operator's name",
"sample_sampling_gear": "pass_hull", "sample_sampling_gear": "pass_hull",
"acq_id": 1, "acq_id": 1,
"acq_instrument": "PlanktonScope", "acq_instrument": "PlanktonScope v2.2",
"acq_celltype": 200, "acq_celltype": 200,
"acq_minimum_mesh": 10, "acq_minimum_mesh": 10,
"acq_maximum_mesh": 200, "acq_maximum_mesh": 200,
@ -19,11 +19,9 @@
"acq_volume": 1, "acq_volume": 1,
"acq_magnification": 0.94, "acq_magnification": 0.94,
"acq_fnumber_objective": 16, "acq_fnumber_objective": 16,
"acq_camera_name": "Pi Camera V2.1 - 8MP", "acq_camera": "Pi Camera HQ",
"object_date": "20200131",
"object_time": "081100",
"object_depth_min": 0, "object_depth_min": 0,
"object_depth_max": 1, "object_depth_max": 1,
"process_pixel": 1.19, "process_pixel": 1.19,
"process_id": 1 "process_id": 1
} }

View file

@ -4411,9 +4411,9 @@
"id": "386ce65d.a15d52", "id": "386ce65d.a15d52",
"type": "exec", "type": "exec",
"z": "1371dec5.76e671", "z": "1371dec5.76e671",
"command": "git", "command": "git --git-dir /home/pi/PlanktonScope/.git/ stash",
"addpay": false, "addpay": false,
"append": "stash", "append": "",
"useSpawn": "false", "useSpawn": "false",
"timer": "2", "timer": "2",
"oldrc": false, "oldrc": false,
@ -4432,9 +4432,9 @@
"id": "c3f72169.9d2b8", "id": "c3f72169.9d2b8",
"type": "exec", "type": "exec",
"z": "1371dec5.76e671", "z": "1371dec5.76e671",
"command": "git", "command": "git --git-dir /home/pi/PlanktonScope/.git/ pull",
"addpay": false, "addpay": false,
"append": "pull", "append": "",
"useSpawn": "false", "useSpawn": "false",
"timer": "2", "timer": "2",
"oldrc": false, "oldrc": false,
@ -5741,4 +5741,4 @@
[] []
] ]
} }
] ]