summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@avtech.domain.avtechpulse.com>1970-01-01 09:17:25 +0900
committerroot <root@avtech.domain.avtechpulse.com>1970-01-01 09:17:25 +0900
commitbdc200108bb3817e359837cf2c9bcc4ef77c27f7 (patch)
tree09a1d6624e93e7c6168db7c2b69ba2ffca790f30
parent4f59191240bbc4d50a57863c3bb8dadfd9c76b90 (diff)
revert last, bump versionINSTRUMENT_6_0_21
-rw-r--r--instr-daemon.c4
-rw-r--r--version.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/instr-daemon.c b/instr-daemon.c
index 88d7ae2..91eac0d 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -364,8 +364,8 @@ static gboolean periodic_poll (void)
power_fail = (globals.HWDetect.beaglebone && bus_getpin (POWER_FAIL));
if (power_fail) {
- // verify after a short delay (200 ms), to ignore short power glitches
- g_usleep (200e3);
+ // verify after a short delay (25 ms), to ignore short power glitches
+ g_usleep (25e3);
power_fail = (globals.HWDetect.beaglebone && bus_getpin (POWER_FAIL));
}
diff --git a/version.h b/version.h
index f2f96aa..c45abfc 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define FW_VERSION "6.0.20"
+#define FW_VERSION "6.0.21"
#define SCPI_version "1996.0"