From 3192f8a0084f8a6f82ac18e187d9db30e524ff9b Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@mobatime.cz> Date: 周二, 15 8月 2017 00:33:56 +0800 Subject: [PATCH] Merge branch 'jfichtner-OperationStatusRegAdditions' --- libscpi/src/units.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libscpi/src/units.c b/libscpi/src/units.c index 3a7b8c2..3274205 100644 --- a/libscpi/src/units.c +++ b/libscpi/src/units.c @@ -248,7 +248,7 @@ /* Temperature */ {/* name */ "CEL", /* unit */ SCPI_UNIT_CELSIUS, /* mult */ 1}, #if USE_UNITS_IMPERIAL - {/* name */ "FAR", /* unit */ SCPI_UNIT_FAGRENHEIT, /* mult */ 1}, + {/* name */ "FAR", /* unit */ SCPI_UNIT_FAHRENHEIT, /* mult */ 1}, #endif /* USE_UNITS_IMPERIAL */ {/* name */ "K", /* unit */ SCPI_UNIT_KELVIN, /* mult */ 1}, #endif /* USE_UNITS_TEMPERATURE */ -- Gitblit v1.9.1