From 56032eee8d46631fe2af5c0e58175cd79c37f1ff Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Mon, 17 Jun 2013 11:15:32 -0400
Subject: [PATCH] change weatherApp PV names

---
 weather.cmd           |  8 +++++---
 weatherApp/weather.db | 16 ++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/weather.cmd b/weather.cmd
index d624617..3da2eb8 100755
--- a/weather.cmd
+++ b/weather.cmd
@@ -1,13 +1,15 @@
 #!./bin/linux-x86/softIocPy
 
+epicsEnvSet("http_proxy", "http://proxy:8888/")
+
 epicsEnvSet("PYTHONPATH", "${PWD}/python")
 
 dbLoadDatabase("dbd/softIocPy.dbd")
 softIocPy_registerRecordDeviceDriver(pdbbase)
 
-dbLoadRecords("db/weather.db","P=kisp:,LOC=KISP")
-#dbLoadRecords("db/weather.db","P=khwv:,LOC=KHWV")
-#dbLoadRecords("db/weather.db","P=unnt:,LOC=UNNT")
+dbLoadRecords("db/weather.db","P=CF:Ext{KISP},LOC=KISP")
+dbLoadRecords("db/weather.db","P=CF:Ext{KHWV},LOC=KHWV")
+dbLoadRecords("db/weather.db","P=CF:Ext{UNNT},LOC=UNNT")
 
 iocInit()
 
diff --git a/weatherApp/weather.db b/weatherApp/weather.db
index 8e4f549..2429e3b 100644
--- a/weatherApp/weather.db
+++ b/weatherApp/weather.db
@@ -1,11 +1,11 @@
-record(stringin, "$(P)Wthr-I") {
+record(stringin, "$(P)ID-I") {
   field(DTYP, "Python Device")
   field(DESC, "Station ID")
   field(INP , "@weather $(LOC) showID")
   field(PINI, "YES")
 }
 
-record(ai, "$(P)K:Update-I") {
+record(ai, "$(P)Time:Update-I") {
   field(DTYP, "Python Device")
   field(DESC, "Update period")
   field(INP , "@weather $(LOC) updatePeriod")
@@ -16,7 +16,7 @@ record(ai, "$(P)K:Update-I") {
 }
 
 
-record(stringin, "$(P)K-I") {
+record(stringin, "$(P)Time-I") {
   field(DTYP, "Python Device")
   field(DESC, "Measurement time")
   field(INP , "@weather $(LOC) getISOTime")
@@ -48,7 +48,7 @@ record(ai, "$(P)T:Chill-I") {
 }
 
 
-record(ai, "$(P)Humid-I") {
+record(ai, "$(P)RH-I") {
   field(DTYP, "Python Device")
   field(DESC, "Relative humidity")
   field(INP , "@weather $(LOC) getHumidity")
@@ -69,16 +69,16 @@ record(ai, "$(P)P-I") {
   field(LOPR, "900")
 }
 
-record(stringin, "$(P)Cond-I") {
+record(stringin, "$(P)Val:Sky-I") {
   field(DTYP, "Python Device")
   field(DESC, "Sky condition")
   field(INP , "@weather $(LOC) getSkyConditions")
   field(SCAN, "I/O Intr")
   field(TSE , "-2")
 }
-record(stringin, "$(P)Wthr-I") {
+record(stringin, "$(P)Val:Rmrk-I") {
   field(DTYP, "Python Device")
-  field(DESC, "Current Weather")
+  field(DESC, "Observe remarks")
   field(INP , "@weather $(LOC) getWeather")
   field(SCAN, "I/O Intr")
   field(TSE , "-2")
@@ -94,7 +94,7 @@ record(ai, "$(P)Dir:Wind-I") {
   field(HOPR, "360")
   field(LOPR, "0")
 }
-record(ai, "$(P)V:Wind-I") {
+record(ai, "$(P)S:Wind-I") {
   field(DTYP, "Python Device")
   field(DESC, "Wind speed")
   field(INP , "@weather $(LOC) getWindSpeed")