Merge branch 'update_pv_names' into 'master'

Update the pv names

Closes #5

See merge request e3/e3-require!109

CHANGELOG.md

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Drop file extension from `build_number.sh`
 * Rename `setE3Env.bash` to `activate`
 * Add alias from `setE3Env.bash` to `activate`
+* Updated PV-names to be ESS compliant, and remove VERSIONS PV
 
 ## [4.0.0]
 

require-ess/Db/moduleversion.template

-record (waveform, "$(REQUIRE_IOC):MODULES")
+record(waveform, "$(REQUIRE_IOC):Modules")
 {
-    field (DESC, "List of loaded modules")
-    field (FTVL, "STRING")
-    field (NELM, "$(MODULE_COUNT)")
-    field (PINI, "YES")
+    field(DESC, "Names of loaded modules")
+    field(FTVL, "STRING")
+    field(NELM, "$(MODULE_COUNT)")
+    field(PINI, "YES")
+    field(DISP, "1")
 }
 
-record (waveform, "$(REQUIRE_IOC):VERSIONS")
+record (waveform, "$(REQUIRE_IOC):Versions")
 {
     field (DESC, "Versions of loaded modules")
     field (FTVL, "STRING")
@@ -14,26 +15,28 @@ record (waveform, "$(REQUIRE_IOC):VERSIONS")
     field (PINI, "YES")
 }
 
-record (waveform, "$(REQUIRE_IOC):MOD_VER")
+record(waveform, "$(REQUIRE_IOC):ModuleVersions")
 {
-    field (DESC, "List of loaded modules")
-    field (FTVL, "CHAR")
-    field (NELM, "$(BUFFER_SIZE)")
-    field (PINI, "YES")
+    field(DESC, "Name and version of the loaded modules")
+    field(FTVL, "CHAR")
+    field(NELM, "$(BUFFER_SIZE)")
+    field(PINI, "YES")
+    field(DISP, "1")
 }
 
-record (stringin, "$(REQUIRE_IOC):$(MODULE)_VER")
+record(stringin, "$(REQUIRE_IOC):$(MODULE)Version")
 {
-    field (DESC, "Module $(MODULE) version")
-    field (VAL,  "$(VERSION)")
-    field (PINI, "YES")
+    field(DESC, "Module $(MODULE) version")
+    field(VAL,  "$(VERSION)")
+    field(PINI, "YES")
+    field(DISP, "1")
 }
 
 record(stringin,"$(REQUIRE_IOC):BaseVersion")
 {
-    field (DESC,"EPICS Base Version")
-    field (DTYP,"getenv")
-    field (INP,"@EPICS_VERSION_FULL")
-    field (PINI,"YES")
-    field (DISP,1)
+    field(DESC, "EPICS Base version")
+    field(DTYP, "getenv")
+    field(INP,  "@EPICS_VERSION_FULL")
+    field(PINI, "YES")
+    field(DISP, "1")
 }

require-ess/src/require.c

@@ -328,12 +328,12 @@ static void fillModuleListRecord(initHookState state) {
     if (requireDebug) printf("require: fillModuleListRecord\n");
 
     have_modules =
-        (getRecordHandle(":MODULES", DBF_STRING, moduleCount, &modules) == 0);
+        (getRecordHandle(":Modules", DBF_STRING, moduleCount, &modules) == 0);
     have_versions =
-        (getRecordHandle(":VERSIONS", DBF_STRING, moduleCount, &versions) == 0);
+        (getRecordHandle(":Versions", DBF_STRING, moduleCount, &versions) == 0);
 
     moduleListBufferSize += moduleCount * maxModuleNameLength;
-    have_modver = (getRecordHandle(":MOD_VER", DBF_CHAR, moduleListBufferSize,
+    have_modver = (getRecordHandle(":ModuleVersions", DBF_CHAR, moduleListBufferSize,
                                    &modver) == 0);
 
     for (m = loadedModules, i = 0; m; m = m->next, i++) {
@@ -1339,4 +1339,4 @@ static void requireRegister(void) {
 }
 
 epicsExportRegistrar(requireRegister);
-epicsExportAddress(int, requireDebug);
+epicsExportAddress(int, requireDebug);
\ No newline at end of file