From 06b8e466fd5db6f6df344764ac5832587d03c126 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 07 7月 2017 21:03:33 +0800
Subject: [PATCH] Merge pull request #86 from RedPitaya/master
---
libscpi/inc/scpi/types.h | 2 +-
libscpi/src/units.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 334843a..ac826d2 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -281,7 +281,7 @@
SCPI_UNIT_BAR,
SCPI_UNIT_DECIBEL,
SCPI_UNIT_UNITLESS,
- SCPI_UNIT_FAGRENHEIT,
+ SCPI_UNIT_FAHRENHEIT,
SCPI_UNIT_KELVIN,
SCPI_UNIT_DAY,
SCPI_UNIT_YEAR,
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