nvi-inc · kurisutsukato · Jun 27, 2023 · Jun 27, 2023 · Jun 26, 2023 · Jun 27, 2023
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Copied from github/gitignore/C.gitignore
 # Prerequisites
+*.gitignore
 *.d
 
 # Object files
@@ -73,3 +74,5 @@ third_party/lib/
 
 .fs_version
 .DS_Store
+.vs
+
diff --git a/Makefile b/Makefile
@@ -4,35 +4,68 @@ FS_DIRECTORY := $(shell echo $(pwd) | rev | cut -d/ -f1 | rev )
 #look for git first
 FS_COMMIT := $(shell git describe --always --tags 2>/dev/null)
 ifneq ($(FS_COMMIT),)
-#for old git, 1.5.6.5 in FSL8 anyway, --dirty isn't supported by
-# git describe, so we do a git diff HEAD instead (for all versions)
-# further, in 1.5.6.5, git diff HEAD --quiet thinks there is a change
-# after root does a make install, redirecting output has the opposite
-# problem, no changes are detected, but doing a git status first
-# seems to clean it up and seems benign for other versions
-FS_VERSION := $(shell git status 2>&1 >/dev/null)
-FS_VERSION := $(FS_COMMIT)$(shell git diff HEAD --quiet || echo "-dirty")
+  #for old git, 1.5.6.5 in FSL8 anyway, --dirty isn't supported by
+  # git describe, so we do a git diff HEAD instead (for all versions)
+  # further, in 1.5.6.5, git diff HEAD --quiet thinks there is a change
+  # after root does a make install, redirecting output has the opposite
+  # problem, no changes are detected, but doing a git status first
+  # seems to clean it up and seems benign for other versions
+  FS_VERSION := $(shell git status 2>&1 >/dev/null)
+  FS_VERSION := $(FS_COMMIT)$(shell git diff HEAD --quiet || echo "-dirty")
 else
-#alternatively, an archive version
-# there should be no other dashes except in the basename:
-#  fs-VERSION.SUBLEVEL.PATCHLEVEL-RELEASE
-#  -RELEASE is optional
-FS_VERSION := $(shell echo $(pwd) | cut -d- -f2-)
+  #alternatively, an archive version
+  # there should be no other dashes except in the basename:
+  #  fs-VERSION.SUBLEVEL.PATCHLEVEL-RELEASE
+  #  -RELEASE is optional
+  FS_VERSION := $(shell echo $(pwd) | cut -d- -f2-)
 endif
 #
 VERSION    := $(shell echo $(FS_VERSION) | cut -d. -f1 -s )
 SUBLEVEL   := $(shell echo $(FS_VERSION) | cut -d. -f2 -s )
 PATCHLEVEL := $(shell echo $(FS_VERSION) | cut -d. -f3 -s | cut -d- -f1)
 RELEASE    := $(shell echo $(FS_VERSION) | cut -d- -f2- -s)
 
-ifeq ($(VERSION),)
-$(error no VERSION value)
-endif
-ifeq ($(SUBLEVEL),)
-$(error no SUBLEVEL value)
-endif
-ifeq ($(PATCHLEVEL),)
-$(error no PATCHLEVEL value)
+ifeq (root,$(shell whoami))
+  ifneq (install,$(MAKECMDGOALS))
+    $(error root can only use 'make install')
+  endif
+  ifeq ($(wildcard $(pwd)/.git),)
+    ifeq ($(VERSION),)
+      $(info Directory '$(pwd)' from archive has no VERSION value in name.)
+      $(error Please fix)
+    endif
+    ifeq ($(SUBLEVEL),)
+      $(info Directory '$(pwd)' from archive has no SUBLEVEL value in name.)
+      $(error Please fix)
+    endif
+    ifeq ($(PATCHLEVEL),)
+      $(info Directory '$(pwd)' from archive has no PATCHLEVEL value in name.)
+      $(error Please fix)
+    endif
+  endif
+#
+else
+  ifeq (install,$(findstring install,$(MAKECMDGOALS)))
+    $(error only root can use 'make install')
+  endif
+  ifeq ($(VERSION),)
+    ifeq ($(wildcard $(pwd)/.git),)
+      $(info Improperly installed archive, the directory name is ill-formed.)
+    endif
+    $(error no VERSION value)
+  endif
+  ifeq ($(SUBLEVEL),)
+    ifeq ($(wildcard $(pwd)/.git),)
+      $(info Improperly installed archive, the directory name is ill-formed.)
+    endif
+    $(error no SUBLEVEL value)
+  endif
+  ifeq ($(PATCHLEVEL),)
+    ifeq ($(wildcard $(pwd)/.git),)
+      $(info Improperly installed archive, the directory name is ill-formed.)
+    endif
+    $(error no PATCHLEVEL value)
+  endif
 endif
 export VERSION SUBLEVEL PATCHLEVEL FS_VERSION RELEASE FS_DIRECTORY
 # print variable,  use 'make print-VERSION' to print VERSION

diff --git a/aquir/kgetc.f b/aquir/kgetc.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/binit.f b/boss/binit.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/getcm.f b/boss/getcm.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/ldrivem.f b/boss/ldrivem.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/ldrivev.f b/boss/ldrivev.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/lhead.f b/boss/lhead.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/newpf.f b/boss/newpf.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/newpr.f b/boss/newpr.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/newsk.f b/boss/newsk.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/opnpf.f b/boss/opnpf.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/boss/stat.f b/boss/stat.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/chekr/dbbcchk.c b/chekr/dbbcchk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 NVI, Inc.
+ * Copyright (c) 2020, 2023  NVI, Inc.
  *
  * This file is part of VLBI Field System
  * (see http://github.com/nvi-inc/fs).

diff --git a/chekr/mk3drive.f b/chekr/mk3drive.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/chekr/mk3rack.f b/chekr/mk3rack.f
@@ -1,5 +1,5 @@
 *
-* Copyright (c) 2020 NVI, Inc.
+* Copyright (c) 2020, 2023  NVI, Inc.
 *
 * This file is part of VLBI Field System
 * (see http://github.com/nvi-inc/fs).

diff --git a/chekr/rec_brk.c b/chekr/rec_brk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 NVI, Inc.
+ * Copyright (c) 2020, 2023  NVI, Inc.
  *
  * This file is part of VLBI Field System
  * (see http://github.com/nvi-inc/fs).

diff --git a/clib/dbbc3_cont_cal_util.c b/clib/dbbc3_cont_cal_util.c
@@ -157,7 +157,10 @@ struct dbbc3_cont_cal_cmd *lcl;
   if(lcl->mode >= 0 && lcl->mode < NMODE_KEY) 
     strcat(buff,mode_key[lcl->mode]);
 
- if(lcl->polarity >= 0)
+ if(lcl->polarity != 0 && lcl->mode == 0) {
+   strcat(buff,",0");
+   logit(NULL,202,"de");
+ } else if(lcl->polarity >= 0)
     sprintf(buff+strlen(buff),",%d",lcl->polarity);
  else
    strcat(buff,",");

diff --git a/clib/dbbc3n_v.c b/clib/dbbc3n_v.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 NVI, Inc.
+ * Copyright (c) 2020, 2023  NVI, Inc.
  *
  * This file is part of VLBI Field System
  * (see http://github.com/nvi-inc/fs).
@@ -97,7 +97,7 @@ int ip[5];
   cls_snd(&out_class, buf, strlen(buf) , 0, 0);
   out_recs++;
 
-  ip[0]=1;
+  ip[0]=8;
   ip[1]=out_class;
   ip[2]=out_recs;
   skd_run("dbbcn",'w',ip);
@@ -142,7 +142,7 @@ int ip[5];
       out_recs++;
     }
 
-    ip[0]=1;
+    ip[0]=8;
     ip[1]=out_class;
     ip[2]=out_recs;
     skd_run("dbbcn",'w',ip);
@@ -277,7 +277,7 @@ int ip[5];
       out_recs++;
     }
 
-    ip[0]=1;
+    ip[0]=8;
     ip[1]=out_class;
     ip[2]=out_recs;
     skd_run("dbbcn",'w',ip);

diff --git a/control/fserr.ctl b/control/fserr.ctl
@@ -2312,6 +2312,9 @@ Class buffer error from command response.
 DD -501
 Only DBBC DDC rack types supported in cont_cal command.
 ""
+DE  202
+WARNING: Overriding polarity to '0' for 'cont_cal=off,...'.
+""
 DE -201
 Mode must be one of: off, on, or undef.
 ""
@@ -2624,11 +2627,14 @@ Error decoding dbbcNN/ response, could be a DBBC version mis-match, see error DC
 DK -451
 Class buffer error from command response.
 ""
+DN   24
+DBBC3 multicast: Core3H board times now agree
+""
 DN   21
 DBBC3 multicast: error from select() cleared
 ""
 DN   20
-DBBC3 multicast: receiving messages again
+DBBC3 multicast: No time-outs in the last 60 attempts; counting stopped.
 ""
 DN   -1
 DBBC3 multicast: error unpacking, packet too small.
@@ -2655,7 +2661,7 @@ DN  -18
 DBBC3 multicast: retrieving interface address from socket (wrong interface?), UNIX?FFF
 ""
 DN  -20
-DBBC3 multicast: time-out, DBBC3 may not be running
+DBBC3 multicast: Time-out; will now count time-outs in background.
 ""
 DN  -21
 DBBC3 multicast: error from select(), UNIX?FFF
@@ -2664,7 +2670,13 @@ DN  -22
 DBBC3 multicast: error from recvfrom(), UNIX?FFF
 ""
 DN  -23
-DBBC3 multicast: time-out while data_valid is on, some multicast not recorded, probably due to a DBBC3 command
+DBBC3 multicast: Time-out while data_valid is on; will now count time-outs in background.
+""
+DN  -24
+DBBC3 multicast: Core3H boards have different times.
+""
+DN  -25
+DBBC3 multicast: In the last 60 attempts, there were?WW time-out(s); continuing to count.
 ""
 DN  -30 Place holder for version string
 
@@ -4690,6 +4702,9 @@ mk6?W: Mark6 return code 9: indeterminate state
 ""
 MN   -1 Place Holder
 
+""
+NF    8
+WARNING: rdbe?W is not active but has detectors selected, they will be skipped.
 ""
 NF    7 Placeholder for large structure correction warning
 
@@ -4712,6 +4727,9 @@ Error occurred while trying to return to AGC: check gain settings
 NF   -6
 Error occurred while trying to restore IF att. Check IF att settings.
 ""
+NF   -8
+No detectors remain after accounting for inactive RDBEs.
+""
 NF  -10
 MCBCN failed setting AGC
 ""
@@ -4835,6 +4853,9 @@ Error decoding dbe_tsys response from rdb?W
 NF -117
 Incorrect IF channel in dbe_tsys response from rdb?W
 ""
+NF -118
+Error processing RDBE data, see message above.
+""
 PC   -1
 program error: portopen8: devdb incorrect size.
 ""
@@ -5056,6 +5077,9 @@ Can't read which ports are in use.
 ""
 PP -402
 Porgram error: Impossible situation in pcalports_dis.
+""
+Q1  307 Placeholder for large structure correction warning
+
 ""
 Q1 -107
 No default for detectors.
@@ -5099,9 +5123,6 @@ ONOFF, FIVPT, or HOLOG already running.
 Q1 -306
 BBC patching not defined.
 ""
-Q1 -307
-WARNING: Source structure correction greater than 20% for detector ?W.
-""
 Q1 -308
 Unknown IF filter.
 ""
@@ -7670,6 +7691,9 @@ TPICD not set-up: no detectors selected.
 TC -303
 Continuous cal Tsys only available for DBBC DDC.
 ""
+TC -304
+'tpicd=reset' is only available for DBBC3.
+""
 TE   -9
 Video converter frequency has not been set
 ""

diff --git a/dbtcn/Makefile b/dbtcn/Makefile
@@ -1,7 +1,7 @@
 LIBS = ../clib/clib.a ../poclb/poclb.a ../rtelb/rtelb.a -lm
 OBJECTS = dbtcn.o open_mcast.o get_if_addr.o read_mcast.o log_mcast.o\
           packet_unpack.o calc_ts.o update_shm.o version_check.o\
-          perform_swaps.o smooth_ts.o
+          perform_swaps.o smooth_ts.o time_check.o
 
 ../bin/dbtcn: $(OBJECTS) $(LIBS) -lm