Update info.yaml and quick refactor

This commit is contained in:
Cal Wing
2024-10-22 14:04:36 +10:00
parent c5f24cb0bf
commit 8e04b9a759
8 changed files with 250 additions and 94 deletions

View File

@ -12,31 +12,58 @@ shot-info:
config: "x2s5823.config"
info: "x2s5823.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
post_pres: 0.03
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
- "st3"
probe-info:
type: "Fat"
locations: # In order of pulse
- "st2"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 3.05 # mm
gauge-c2c: 4 #mm
data-record:
type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
trigger:
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
data-records:
- type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us

View File

@ -12,23 +12,51 @@ shot-info:
config: "x2s5824.config"
info: "x2s5824.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
post_pres: 0.03
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
- "st3"
probe-info:
type: "Thin"
locations: # In order of pulse
- "st2"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
data-record:
type: "scope"
config: "eProbe-Scope.txt"

View File

@ -12,6 +12,10 @@ shot-info:
config: "x2s5827.config"
info: "x2s5827.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
@ -20,18 +24,41 @@ canny-args:
- sigma: 0.75
post_pres: 0.1
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
probe-info:
type: "Thin"
locations: # In order of pulse
- "st2"
- "st3"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
data-record:
type: "scope"
config: "eProbe-Scope.txt"

View File

@ -22,31 +22,52 @@ canny-args:
- sigma: 1
post_pres: 0.2
pcb-refs:
- "st1"
pcb-canny:
- sigma: 4
post_pres: 0.05
no-graph:
- "None"
# - "at1"
# - "at2"
# - "at3"
# - "at4"
# - "at5"
# - "at6"
pcb-refs:
#- "at1"
#- "at2"
#- "at3"
#
#- "at4"
#- "at5"
#- "at6"
- "st1"
probe-info:
type: "Thin"
locations: # In order of pulse
- "st2"
- "st3"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
data-records:
- type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
data-record:
type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us

View File

@ -20,7 +20,12 @@ canny-args:
- sigma: 1
post_pres: 0.2
pcb-canny:
- sigma: 4
post_pres: 0.05
no-graph:
- "None"
- "at1"
- "at2"
- "at3"
@ -30,38 +35,37 @@ no-graph:
- "at6"
pcb-refs:
- "st1"
- "at1"
- "at2"
- "at3"
- "at4"
- "at5"
- "at6"
- "st1"
probe-info:
type: "Thin"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
gauges:
- 1
- 2
locations: # In order of pulse
- "st2"
- "st3"
overhang: 1 # mm
c2c: 5.6 # mm
gauge-diam: 0.8 # mm
gauge-c2c: 1.8 #mm
data-records:
- type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
data-record:
type: "scope"
config: "eProbe-Scope.txt"
data: "eProbe-Scope.csv"
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
trigger: # Redundant?
type: "channel"
channel: 4
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us

View File

@ -2,6 +2,7 @@
# Cal Wing - Oct 24
long_name: "Shot 6 (x2s5829) - Thin Probe (ST1, ST2 & ST3) - 2024-10-18 - Flush ST2"
comments: "G2 Pointless, Wasn't attached"
name: "Shot 6"
date: "2024-10-18"
time: "14:00"
@ -62,4 +63,17 @@ probe-info:
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
- type: "x2"
channels: # Gauge Channel Name
- "st2"
- "st3"
trigger:
type: "x2"
# Info isn't really needed
channel: "trigbox"
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 0 # us

View File

@ -12,6 +12,10 @@ shot-info:
config: "{0}.config"
info: "{0}.txt"
pcb-canny:
- sigma: 4
post_pres: 0.05
# Canny Args
canny-args:
- sigma: 2
@ -66,4 +70,17 @@ probe-info:
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 100 # us
- type: "x2"
channels: # Gauge Channel Name
- "st2"
- "st3"
trigger:
type: "x2"
# Info isn't really needed
channel: "trigbox"
alignment-offset: 0 # 601 # us [TODO] Make this auto-magic
delay: 0 # us