Skip to content
This repository was archived by the owner on Nov 29, 2021. It is now read-only.

Commit c31659a

Browse files
author
Will Smith
committed
added support for led select, sample frequency and counts
1 parent 7678141 commit c31659a

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

‎detint.cmd

+20-18
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=35, R
4848
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=36, REG=I2C-M2S, DESC=I2C M2S Data, PRO=ics-dg.proto")
4949
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=37, REG=I2C-S2M, DESC=I2C S2M Data, PRO=ics-dg.proto")
5050
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=38, REG=I2C-ENA, DESC=I2C Ena, PRO=ics-dg.proto")
51-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=39, REG=LEDSEL, DESC=LED select, PRO=ics-dg.proto")
51+
dbLoadRecords("led_sel_reg.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=39, PRO=ics-dg.proto")
5252
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=40, REG=PKCNT, DESC=Packet Count, PRO=ics-dg.proto")
5353
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=41, REG=CH1-BFOV, DESC=Ch 1 Buff Overflow Cnt, PRO=ics-dg.proto")
5454
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=42, REG=CH2-BFOV, DESC=Ch 2 Buff Overflow Cnt, PRO=ics-dg.proto")
@@ -71,14 +71,15 @@ dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=60, R
7171
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=61, REG=CH2-TST-GP, DESC=Ch2 tst pulse gap, PRO=ics-dg.proto")
7272
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=62, REG=CH3-TST-GP, DESC=Ch3 tst pulse gap, PRO=ics-dg.proto")
7373
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=63, REG=CH4-TST-GP, DESC=Ch4 tst pulse gap, PRO=ics-dg.proto")
74-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=64, REG=CH1-TST-CNT, DESC=Ch1 tst pulse gen cnt, PRO=ics-dg.proto")
75-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=65, REG=CH2-TST-CNT, DESC=Ch2 tst pulse gen cnt, PRO=ics-dg.proto")
76-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=66, REG=CH3-TST-CNT, DESC=Ch3 tst pulse gen cnt, PRO=ics-dg.proto")
77-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=67, REG=CH4-TST-CNT, DESC=Ch4 tst pulse gen cnt, PRO=ics-dg.proto")
78-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=68, REG=CH1-TST-BUF, DESC=Ch1 tst pulse gen buf, PRO=ics-dg.proto")
79-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=69, REG=CH2-TST-BUF, DESC=Ch2 tst pulse gen buf, PRO=ics-dg.proto")
80-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=70, REG=CH3-TST-BUF, DESC=Ch3 tst pulse gen buf, PRO=ics-dg.proto")
81-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=71, REG=CH4-TST-BUF, DESC=Ch4 tst pulse gen buf, PRO=ics-dg.proto")
74+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=64, SCAN=1 second, REG=CH1-PUL-CNT, DESC=Ch1 tst pulse gen cnt, PRO=ics-dg.proto")
75+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=65, SCAN=1 second, REG=CH2-PUL-CNT, DESC=Ch2 tst pulse gen cnt, PRO=ics-dg.proto")
76+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=66, SCAN=1 second, REG=CH3-PUL-CNT, DESC=Ch3 tst pulse gen cnt, PRO=ics-dg.proto")
77+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=67, SCAN=1 second, REG=CH4-PUL-CNT, DESC=Ch4 tst pulse gen cnt, PRO=ics-dg.proto")
78+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=68, SCAN=1 second, REG=CH1-FRM-CNT, DESC=Ch1 tst pulse gen buf, PRO=ics-dg.proto")
79+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=69, SCAN=1 second, REG=CH2-FRM-CNT, DESC=Ch2 tst pulse gen buf, PRO=ics-dg.proto")
80+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=70, SCAN=1 second, REG=CH3-FRM-CNT, DESC=Ch3 tst pulse gen buf, PRO=ics-dg.proto")
81+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=71, SCAN=1 second, REG=CH4-FRM-CNT, DESC=Ch4 tst pulse gen buf, PRO=ics-dg.proto")
82+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV1), COM=$(COM1), OFF=72, SCAN=5 second, EGU=Hz, REG=SMP-RATE, DESC=ADC Sample Rate, PRO=ics-dg.proto")
8283

8384

8485
drvAsynSerialPortConfigure ("$(COM2)", "/dev/ttyUSB1")
@@ -131,7 +132,7 @@ dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=35, R
131132
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=36, REG=I2C-M2S, DESC=I2C M2S Data, PRO=ics-dg.proto")
132133
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=37, REG=I2C-S2M, DESC=I2C S2M Data, PRO=ics-dg.proto")
133134
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=38, REG=I2C-ENA, DESC=I2C Ena, PRO=ics-dg.proto")
134-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=39, REG=LEDSEL, DESC=LED select, PRO=ics-dg.proto")
135+
dbLoadRecords("led_sel_reg.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=39, PRO=ics-dg.proto")
135136
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=40, REG=PKCNT, DESC=Packet Count, PRO=ics-dg.proto")
136137
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=41, REG=CH1-BFOV, DESC=Ch 1 Buff Overflow Cnt, PRO=ics-dg.proto")
137138
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=42, REG=CH2-BFOV, DESC=Ch 2 Buff Overflow Cnt, PRO=ics-dg.proto")
@@ -154,14 +155,15 @@ dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=60, R
154155
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=61, REG=CH2-TST-GP, DESC=Ch2 tst pulse gap, PRO=ics-dg.proto")
155156
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=62, REG=CH3-TST-GP, DESC=Ch3 tst pulse gap, PRO=ics-dg.proto")
156157
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=63, REG=CH4-TST-GP, DESC=Ch4 tst pulse gap, PRO=ics-dg.proto")
157-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=64, REG=CH1-TST-CNT, DESC=Ch1 tst pulse gen cnt, PRO=ics-dg.proto")
158-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=65, REG=CH2-TST-CNT, DESC=Ch2 tst pulse gen cnt, PRO=ics-dg.proto")
159-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=66, REG=CH3-TST-CNT, DESC=Ch3 tst pulse gen cnt, PRO=ics-dg.proto")
160-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=67, REG=CH4-TST-CNT, DESC=Ch4 tst pulse gen cnt, PRO=ics-dg.proto")
161-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=68, REG=CH1-TST-BUF, DESC=Ch1 tst pulse gen buf, PRO=ics-dg.proto")
162-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=69, REG=CH2-TST-BUF, DESC=Ch2 tst pulse gen buf, PRO=ics-dg.proto")
163-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=70, REG=CH3-TST-BUF, DESC=Ch3 tst pulse gen buf, PRO=ics-dg.proto")
164-
dbLoadRecords("rw_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=71, REG=CH4-TST-BUF, DESC=Ch4 tst pulse gen buf, PRO=ics-dg.proto")
158+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=64, SCAN=1 second, REG=CH1-PUL-CNT, DESC=Ch1 tst pulse gen cnt, PRO=ics-dg.proto")
159+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=65, SCAN=1 second, REG=CH2-PUL-CNT, DESC=Ch2 tst pulse gen cnt, PRO=ics-dg.proto")
160+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=66, SCAN=1 second, REG=CH3-PUL-CNT, DESC=Ch3 tst pulse gen cnt, PRO=ics-dg.proto")
161+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=67, SCAN=1 second, REG=CH4-PUL-CNT, DESC=Ch4 tst pulse gen cnt, PRO=ics-dg.proto")
162+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=68, SCAN=1 second, REG=CH1-FRM-CNT, DESC=Ch1 tst pulse gen buf, PRO=ics-dg.proto")
163+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=69, SCAN=1 second, REG=CH2-FRM-CNT, DESC=Ch2 tst pulse gen buf, PRO=ics-dg.proto")
164+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=70, SCAN=1 second, REG=CH3-FRM-CNT, DESC=Ch3 tst pulse gen buf, PRO=ics-dg.proto")
165+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=71, SCAN=1 second, REG=CH4-FRM-CNT, DESC=Ch4 tst pulse gen buf, PRO=ics-dg.proto")
166+
dbLoadRecords("ro_register.db", "SYS=$(SYS), DEV=$(DEV2), COM=$(COM2), OFF=72, SCAN=5 second, EGU=Hz, REG=SMP-RATE, DESC=ADC Sample Rate, PRO=ics-dg.proto")
165167

166168

167169
dbLoadRecords("evr_detector_controls.db", "SYS=$(SYS), EVR=$(EVR), TSEVT=$(SYNC_EVNT_LETTER),SYNC_EVNT=$(SYNC_TRIG_EVT)")

‎register_map.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
{"db_file":"rw_register.db", "REG":"I2C-M2S", "DESC":"I2C M2S Data", "OFF":36},
4242
{"db_file":"rw_register.db", "REG":"I2C-S2M", "DESC":"I2C S2M Data", "OFF":37},
4343
{"db_file":"rw_register.db", "REG":"I2C-ENA", "DESC":"I2C Ena", "OFF":38},
44-
{"db_file":"rw_register.db", "REG":"LEDSEL", "DESC":"LED select", "OFF":39},
44+
{"db_file":"led_sel_reg.db", "OFF":39},
4545
{"db_file":"ro_register.db", "REG":"PKCNT", "DESC":"Packet Count", "OFF":40},
4646
{"db_file":"ro_register.db", "REG":"CH1-BFOV", "DESC":"Ch 1 Buff Overflow Cnt", "OFF":41},
4747
{"db_file":"ro_register.db", "REG":"CH2-BFOV", "DESC":"Ch 2 Buff Overflow Cnt", "OFF":42},
@@ -64,13 +64,14 @@
6464
{"db_file":"rw_register.db", "REG":"CH2-TST-GP", "DESC":"Ch2 tst pulse gap", "OFF":61},
6565
{"db_file":"rw_register.db", "REG":"CH3-TST-GP", "DESC":"Ch3 tst pulse gap", "OFF":62},
6666
{"db_file":"rw_register.db", "REG":"CH4-TST-GP", "DESC":"Ch4 tst pulse gap", "OFF":63},
67-
{"db_file":"rw_register.db", "REG":"CH1-TST-CNT", "DESC":"Ch1 tst pulse gen cnt", "OFF":64},
68-
{"db_file":"rw_register.db", "REG":"CH2-TST-CNT", "DESC":"Ch2 tst pulse gen cnt", "OFF":65},
69-
{"db_file":"rw_register.db", "REG":"CH3-TST-CNT", "DESC":"Ch3 tst pulse gen cnt", "OFF":66},
70-
{"db_file":"rw_register.db", "REG":"CH4-TST-CNT", "DESC":"Ch4 tst pulse gen cnt", "OFF":67},
71-
{"db_file":"rw_register.db", "REG":"CH1-TST-BUF", "DESC":"Ch1 tst pulse gen buf", "OFF":68},
72-
{"db_file":"rw_register.db", "REG":"CH2-TST-BUF", "DESC":"Ch2 tst pulse gen buf", "OFF":69},
73-
{"db_file":"rw_register.db", "REG":"CH3-TST-BUF", "DESC":"Ch3 tst pulse gen buf", "OFF":70},
74-
{"db_file":"rw_register.db", "REG":"CH4-TST-BUF", "DESC":"Ch4 tst pulse gen buf", "OFF":71}
67+
{"db_file":"ro_register.db", "REG":"CH1-PUL-CNT", "DESC":"Ch1 tst pulse gen cnt", "SCAN":"1 second", "OFF":64},
68+
{"db_file":"ro_register.db", "REG":"CH2-PUL-CNT", "DESC":"Ch2 tst pulse gen cnt", "SCAN":"1 second", "OFF":65},
69+
{"db_file":"ro_register.db", "REG":"CH3-PUL-CNT", "DESC":"Ch3 tst pulse gen cnt", "SCAN":"1 second", "OFF":66},
70+
{"db_file":"ro_register.db", "REG":"CH4-PUL-CNT", "DESC":"Ch4 tst pulse gen cnt", "SCAN":"1 second", "OFF":67},
71+
{"db_file":"ro_register.db", "REG":"CH1-FRM-CNT", "DESC":"Ch1 tst pulse gen buf", "SCAN":"1 second", "OFF":68},
72+
{"db_file":"ro_register.db", "REG":"CH2-FRM-CNT", "DESC":"Ch2 tst pulse gen buf", "SCAN":"1 second", "OFF":69},
73+
{"db_file":"ro_register.db", "REG":"CH3-FRM-CNT", "DESC":"Ch3 tst pulse gen buf", "SCAN":"1 second", "OFF":70},
74+
{"db_file":"ro_register.db", "REG":"CH4-FRM-CNT", "DESC":"Ch4 tst pulse gen buf", "SCAN":"1 second", "OFF":71},
75+
{"db_file":"ro_register.db", "REG":"SMP-RATE", "DESC":"ADC Sample Rate", "EGU":"Hz", "SCAN":"5 second", "OFF":72}
7576

7677
]

0 commit comments

Comments
 (0)