Merge pull request #3 from zumbruch/dev

Dev

configure/RELEASE

@@ -20,16 +20,17 @@
 # CONFIG_SITE file.
 
 TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+SUPPORT=/usr/local/epics/synApps_5_6/support
 
 # If using the sequencer, point SNCSEQ at its top directory:
-SNCSEQ=/home/epics/EPICS/EPICS-3.14.12.4/modules/soft/seq/seq-2.1.16
+SNCSEQ=$(SUPPORT)/seq-2-1-3
 
 # EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=/home/epics/EPICS/EPICS-3.14.12.4/base
+EPICS_BASE=/usr/local/epics/base-3.14.12.5
 
-ASYN=/home/epics/EPICS/EPICS-3.14.12.4/modules/soft/asyn/asyn4-23
+ASYN=$(SUPPORT)/asyn-4-18
 
-STREAM=/home/epics/EPICS/EPICS-3.14.12.4/modules/soft/StreamDevice/StreamDevice-2-6
+STREAM=$(SUPPORT)/stream-2-5-1
 
 # EPICS_BASE usually appears last so other apps can override stuff:
 #EPICS_BASE=$(EPICS_HOME)/base
@@ -37,3 +38,4 @@ STREAM=/home/epics/EPICS/EPICS-3.14.12.4/modules/soft/StreamDevice/StreamDevice-
 # Set RULES here if you want to take build rules from somewhere
 # other than EPICS_BASE:
 #RULES=/path/to/epics/support/module/rules/x-y
+

configure/RELEASE.linux-arm.Common

-# RELEASE - Location of external support modules
-#
-# IF YOU MAKE ANY CHANGES to this file you must subsequently
-# do a "gnumake rebuild" in this application's top level
-# directory.
-#
-# The build process does not check dependencies against files
-# that are outside this application, thus you should do a
-# "gnumake rebuild" in the top level directory after EPICS_BASE
-# or any other external module pointed to below is rebuilt.
-#
-# Host- or target-specific settings can be given in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-#
-# This file should ONLY define paths to other support modules,
-# or include statements that pull in similar RELEASE files.
-# Build settings that are NOT module paths should appear in a
-# CONFIG_SITE file.
-
-TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
-
-SNCSEQ=$(EPICS_HOME)/modules/soft/seq/seq-2.1.13
-ASYN=$(EPICS_HOME)/modules/soft/asyn/asyn4-18
-STREAM=$(EPICS_HOME)/modules/soft/StreamDevice/StreamDevice-2-6
-
-# EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=$(EPICS_HOME)/base
-EPICS_HOME=/home/epics/EPICS/EPICS-3.14.12.3

iocBoot/iocStreamHadcon_Registers_IO/envPaths

+epicsEnvSet("ARCH","linux-arm")
+epicsEnvSet("IOC","iocStreamHadcon_Registers_IO")
+epicsEnvSet("TOP","/home/pi/EPICS/Apps/HadCon2_AtmelRegisterIO_IOC")
+epicsEnvSet("SUPPORT","/usr/local/epics/synApps_5_6/support")
+epicsEnvSet("SNCSEQ","/usr/local/epics/synApps_5_6/support/seq-2-1-3")
+epicsEnvSet("EPICS_BASE","/usr/local/epics/base-3.14.12.5")
+epicsEnvSet("ASYN","/usr/local/epics/synApps_5_6/support/asyn-4-18")
+epicsEnvSet("STREAM","/usr/local/epics/synApps_5_6/support/stream-2-5-1")

iocBoot/iocStreamHadcon_Registers_IO/st.cmd

@@ -21,7 +21,7 @@ drvAsynSerialPortConfigure("hadcon2","/dev/ttyUSB0",0,0,0)
 
 ## Load record instances
 ##
-#dbLoadRecords ("../../db/hadcon_global.db",       "HADCON=${HOSTNAME}:1, PREFIX=, SUFFIX=, device=hadcon2")
+dbLoadRecords ("../../db/hadcon_global.db",       "HADCON=${HOSTNAME}:1, PREFIX=, SUFFIX=, device=hadcon2")
 #dbLoadRecords ("../../db/hadcon_debug_global.db", "HADCON=${HOSTNAME}:1, PREFIX=, SUFFIX=, device=hadcon2")
 #dbLoadRecords ("../../db/hadcon_stats.db", "IOC=${HOSTNAME}")
 

streamHadconApp/Db/hadcon_atmel_register.template

+#! Generated by VisualDCT v2.6
+#! DBDSTART
+#! DBDEND
+
+
+record(longout, "$(PREFIX)$(HADCON):$(NAME):addr_$(RegName)$(SUFFIX)") {
+  field(DESC, "Register Address")
+  field(PINI, "YES")
+  field(UDF, "0")
+  field(VAL, "0x$(RegAddress)")
+}
+
+record(stringout, "$(PREFIX)$(HADCON):$(NAME):name_$(RegName)$(SUFFIX)") {
+  field(PINI, "YES")
+  field(UDF, "0")
+  field(VAL, "$(RegName)")
+}
+
+#! Further lines contain data used by VisualDCT
+#! View(2000,2115,1.0)
+#! Record("$(PREFIX)$(HADCON):$(NAME):addr_$(RegName)$(SUFFIX)",2160,2228,0,1,"$(PREFIX)$(HADCON):$(NAME):addr_$(RegName)$(SUFFIX)")
+#! Record("$(PREFIX)$(HADCON):$(NAME):name_$(RegName)$(SUFFIX)",2360,2242,0,1,"$(PREFIX)$(HADCON):$(NAME):name_$(RegName)$(SUFFIX)")

streamHadconApp/Db/hadcon_atmel_registers_IO_ports.template

 #RegAddress must be lower case!
 
 substitute "RegName=PORT$(port),RegAddress=$(PORT), DRVL=0x0, DRVH=0xff"
+include "hadcon_atmel_register.template"
 include "hadcon_atmel_write_register.template"
-
-substitute "RegName=PIN$(port), RegAddress=$(PIN),  DRVL=0x0, DRVH=0xff"
 include "hadcon_atmel_read_register.template"
 
-substitute "RegName=PORT$(port),RegAddress=$(PORT), DRVL=0x0, DRVH=0xff, ZNAM_B0=IDLE, ONAM_B0=PULLUP, ZNAM_B1=IDLE, ONAM_B1=PULLUP, ZNAM_B2=IDLE, ONAM_B2=PULLUP, ZNAM_B3=IDLE, ONAM_B3=PULLUP, ZNAM_B4=IDLE, ONAM_B4=PULLUP, ZNAM_B5=IDLE, ONAM_B5=PULLUP, ZNAM_B6=IDLE, ONAM_B6=PULLUP, ZNAM_B7=IDLE, ONAM_B7=PULLUP"
-include "hadcon_atmel_read_register.template"
-
-substitute "RegName=DDR$(port), RegAddress=$(DDR), DRVL=0x0, DRVH=0xff, ZNAM_B0=INPUT, ONAM_B0=OUTPUT, ZNAM_B1=INPUT, ONAM_B1=OUTPUT, ZNAM_B2=INPUT, ONAM_B2=OUTPUT, ZNAM_B3=INPUT, ONAM_B3=OUTPUT, ZNAM_B4=INPUT, ONAM_B4=OUTPUT, ZNAM_B5=INPUT, ONAM_B5=OUTPUT, ZNAM_B6=INPUT, ONAM_B6=OUTPUT, ZNAM_B7=INPUT, ONAM_B7=OUTPUT" 
+substitute "RegName=PIN$(port), RegAddress=$(PIN), DRVL=0x0, DRVH=0xff"
+include "hadcon_atmel_register.template"
 include "hadcon_atmel_read_register.template"
 
 substitute "RegName=PIN$(port), RegAddress=$(PIN), DRVL=0x0, DRVH=0xff, ZNAM_B0=IDLE, ONAM_B0=TOGGLE, ZNAM_B1=IDLE, ONAM_B1=TOGGLE, ZNAM_B2=IDLE, ONAM_B2=TOGGLE, ZNAM_B3=IDLE, ONAM_B3=TOGGLE, ZNAM_B4=IDLE, ONAM_B4=TOGGLE, ZNAM_B5=IDLE, ONAM_B5=TOGGLE, ZNAM_B6=IDLE, ONAM_B6=TOGGLE, ZNAM_B7=IDLE, ONAM_B7=TOGGLE"
 include "hadcon_atmel_write_register.template"
 
 substitute "RegName=DDR$(port), RegAddress=$(DDR), DRVL=0x0, DRVH=0xff, ZNAM_B0=INPUT, ONAM_B0=OUTPUT, ZNAM_B1=INPUT, ONAM_B1=OUTPUT, ZNAM_B2=INPUT, ONAM_B2=OUTPUT, ZNAM_B3=INPUT, ONAM_B3=OUTPUT, ZNAM_B4=INPUT, ONAM_B4=OUTPUT, ZNAM_B5=INPUT, ONAM_B5=OUTPUT, ZNAM_B6=INPUT, ONAM_B6=OUTPUT, ZNAM_B7=INPUT, ONAM_B7=OUTPUT" 
+include "hadcon_atmel_register.template"
+include "hadcon_atmel_read_register.template"
 include "hadcon_atmel_write_register.template"
 
+#substitute "RegName=PORT$(port),RegAddress=$(PORT), DRVL=0x0, DRVH=0xff, ZNAM_B0=IDLE, ONAM_B0=PULLUP, ZNAM_B1=IDLE, ONAM_B1=PULLUP, ZNAM_B2=IDLE, ONAM_B2=PULLUP, ZNAM_B3=IDLE, ONAM_B3=PULLUP, ZNAM_B4=IDLE, ONAM_B4=PULLUP, ZNAM_B5=IDLE, ONAM_B5=PULLUP, ZNAM_B6=IDLE, ONAM_B6=PULLUP, ZNAM_B7=IDLE, ONAM_B7=PULLUP"
+#include "hadcon_atmel_read_register.template"
+
+
+
 include "hadcon_atmel_read_IO_port_register.template"