Changes to db files

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db

@@ -112,7 +112,6 @@ record(bi , "$(P)$(R)TMPump1-Acceleration") {
 
 record(bi , "$(P)$(R)TMPump1-NormalOperation" ) {
    field(DESC," TMP1 – Operação Normal ")
-#record(bi , "$(P)$(R)Turbo_NormalOperation" ) {
 	field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B7 NPP NMS")
 	field( ZNAM, "ON" )
 	field(ONAM, "OFF" )
@@ -132,13 +131,13 @@ record(fanout, "$(P)$(R)PCF8574:57:REGISTER:READ:FNOUT"){
 	field(LNK1, "$(P)$(R)TMPump2-Emergency")
 	field(LNK2, "$(P)$(R)TMPump2-Acceleration")
 	field(LNK3, "$(P)$(R)TTSystem-tzero")
+	field(LNK4, "$(P)$(R)Emergency-PhysButton")
 }
 record(bi , "$(P)$(R)TMPump2-Emergency") {
    	field(DESC," TMP2 – Falha ")
 	field( INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B0 NPP NMS")
 	field( ZNAM, "ON" )
 	field( ONAM, "OFF" )
-#	field(FLNK, "$(P)$(R)Turbo2_Acceleration")
 }
 
 record(bi , "$(P)$(R)TMPump2-Acceleration") {
@@ -191,11 +190,25 @@ record(calcout, "$(P)$(R)BuzzerInv" ) {
 ##############################
 #       EMERGENCY MODE       #
 ##############################
-record(bo, "$(P)$(R)EmergencyButton" ) {
+record(bi, "$(P)$(R)Emergency-PhysButton" ) {
-   field(DESC,"Soft Emergency Button")
+   field(DESC,"External Physical Emergency Button")
-	field(OUT, "$(P)$(R)PCF8574:57:REGISTER.B4 PP" )
+   	field( INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B4 NPP NMS")
-	field(ZNAM, "On" )
+#	field(OUT, "$(P)$(R)PCF8574:57:REGISTER.B4 PP" )
-	field(ONAM, "Off")
+	field(ZNAM, "ON")
+	field(ONAM, "OFF" )
+	field(FLNK, "$(P)$(R)Emergency" )
+}
+record(bo, "$(P)$(R)Emergency-UserButton" ) {
+   field(DESC,"Soft User Emergency Button")
+	field(ZNAM, "OFF" )
+	field(ONAM, "ON")
+	field(FLNK, "$(P)$(R)Emergency" )
+}
+record(calc, "$(P)$(R)Emergency" ) {
+   	field(DESC,"Emergency State")
+	field(INPA,"$(P)$(R)Emergency-PhysButton.RVAL NPP" ) 
+	field(INPB,"$(P)$(R)Emergency-UserButton.RVAL NPP" ) 
+	field(CALC, "A || B" ) # ! Not
 }
 
 ############
@@ -408,20 +421,6 @@ record(bo, "$(P)$(R)CapBank-Discharge" ) {
 	field(VAL,"1")
 }
 
-#########################
-###Pressure Conditions###
-#########################
-#record(ao,"$(P)$(R)Pressure_PrimaryCondition"){
-#	field(VAL,"5.0e-3")
-#	field(PREC,"3")
-#	field(EGU,"mBar")
-#}
-#record(ao,"$(P)$(R)Pressure_Primary2Condition"){
-#	field(VAL,"5.0e-3")
-#	field(PREC,"3")
-#	field(EGU,"mBar")
-#}
-
 record(bo,"$(P)$(R)Primary-PressureCondition"){
 	field(ZNAM, "OFF" )
 	field(ONAM, "ON" )

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db

@@ -40,8 +40,8 @@ record (calc, "$(P)$(R)RPump1-Pressure")
 	field(CALC, "(A*0.001)*10.0**(B-20)")
 	field(PREC, "3") 
 	field(EGU, "mBar")
-   field(HIHI,"1.0e-1")
+#   field(HIHI,"1.0e-1")
-   field(HIGH,"5.0e-3")
+#   field(HIGH,"5.0e-3")
 #   field(LOW, "20.0")
 #   field(LOLO,"0.0")
    field(HHSV,"MAJOR")
@@ -96,8 +96,8 @@ record (calc, "$(P)$(R)RPump2-Pressure")
 	field(CALC, "(A*0.001)* 10.0**(B-20)")
 	field(PREC, "3") 
 	field(EGU, "mBar")
-   field(HIHI,"1.0e-1")
+#   field(HIHI,"1.0e-1")
-   field(HIGH,"5.0e-3")
+#   field(HIGH,"5.0e-3")
 #   field(LOW, "20.0")
 #   field(LOLO,"0.0")
    field(HHSV,"MAJOR")

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db

@@ -31,6 +31,7 @@ record(mbbi, "$(P)$(R)OPSTATE") {
 	field(VAL, "0")
 }
 record(mbbo, "$(P)$(R)LASTOPSTATE") {
+	info(autosaveFields, "VAL")
 	field(DESC, "Pulse Sequence Last Saved State")
 	field(ZRVL, "0")
 	field(ONVL, "1")
@@ -98,15 +99,18 @@ record(ai, "$(P)$(R)Temperature_0") {
 }
 
 record(bo, "$(P)$(R)OPREQ") {
+	info(autosaveFields, "VAL")
 	field(DESC, "Pulse Sequence Start/Stop")
-	field(VAL, "0")
+#	field(VAL, "0")
 	field(ZNAM, "STOP")
 	field(ONAM, "START")
 }
 
 record(bo, "$(P)$(R)CLEANINGMANMODE") {
+	info(autosaveFields, "VAL")
 	field(DESC, "Cleaning Manual/Auto")
-	field(VAL, "1")
+	info(autosaveFields, "VAL")
+#	field(VAL, "1")
 	field(ZNAM, "M")
 	field(ONAM, "A")
 }

epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/Makefile

@@ -5,7 +5,7 @@ include $(TOP)/configure/CONFIG
 
 # Install databases, templates & substitutions like this
 DB += ISTTOKstates.db
-DB += ISTTOKvacuumPumps.db
+DB += ISTTOKmachineControl.db
 DB += ISTTOKpcf8574.db
 DB += ISTTOKpcf8591.db
 DB += ISTTOKpfeiffer.db

epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req

@@ -6,16 +6,14 @@ ISTTOK:central:TMPump1-ManualValve.VAL
 ISTTOK:central:LASTOPSTATE.VAL
 ISTTOK:central:OPREQ
 ISTTOK:central:PROCESS-MODE.VAL
-ISTTOK:central:PROCESS-REQ.VAL
+#ISTTOK:central:PROCESS-REQ.VAL
 #ISTTOK:central:STARTINGSTATE.VAL
 #ISTTOK:central:STOPPINGSTATE.VAL
 #ISTTOK:central:CLEANINGSTATE.VAL
 ISTTOK:central:CLEANINGMANMODE.VAL
 #ISTTOK:central:WSHOTINGSTATE.VAL
 
-#ISTTOK:central:Pressure_PrimaryCondition.VAL
+ISTTOK:central:Emergency-UserButton.VAL
-#ISTTOK:central:Pressure_Primary2Condition.VAL
-ISTTOK:central:EmergencyButton.VAL
 ISTTOK:central:RPump1-Pressure.HIGH
 ISTTOK:central:RPump1-Pressure.HIHI
 ISTTOK:central:RPump2-Pressure.HIGH

epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd

@@ -21,7 +21,7 @@ drvAsynI2CConfigure( "I2C", "/dev/i2c-1", 1 )
 dbLoadRecords("db/ISTTOKstates.db","P=ISTTOK:,R=central:")
 dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:")
 dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:")
-dbLoadRecords("db/ISTTOKvacuumPumps.db","P=ISTTOK:,R=central:")
+dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:")
 
 ## Load Serial drivers
 drvAsynSerialPortConfigure("RS0","/dev/ttyUSB0")
@@ -43,12 +43,15 @@ dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=central:,bus=RS0")
 ## Run this to trace the stages of iocInit
 #traceIocInit
 
-save_restoreSet_status_prefix("$(IOC):")
+#save_restoreSet_status_prefix("$(IOC):")
+save_restoreSet_status_prefix("xxx:")
 set_requestfile_path("$(SAVE_DIR)")
 set_savefile_path("$(SAVE_DIR)/save")
 save_restoreSet_NumSeqFiles(3)
 save_restoreSet_SeqPeriodInSeconds(600)
+set_pass2_restoreFile("$(IOC).sav")
 set_pass1_restoreFile("$(IOC).sav")
+dbLoadRecords("$(AUTOSAVE)/asApp/Db/save_restoreStatus.db", "P=xxx:")
 
 cd "${TOP}/iocBoot/${IOC}"