diff --git a/ChangeLog b/ChangeLog
index e7858713..b75fdff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
* Fixed ugly gradient bug. closes bug 1255608
* Added $voffset
* Removed metar code. It sucked.
+ * Added $acpitempf for amooricans
2005-08-12
* Multiple unit additions and modifications
diff --git a/conky.c b/conky.c
index 8d661029..34122fee 100644
--- a/conky.c
+++ b/conky.c
@@ -663,6 +663,7 @@ enum text_object_type {
OBJ_addr,
OBJ_linkstatus,
OBJ_acpitemp,
+ OBJ_acpitempf,
OBJ_battery,
OBJ_buffers,
OBJ_cached,
@@ -860,7 +861,9 @@ static void free_text_objects()
case OBJ_acpitemp:
close(text_objects[i].data.i);
break;
-
+ case OBJ_acpitempf:
+ close(text_objects[i].data.i);
+ break;
case OBJ_i2c:
close(text_objects[i].data.i2c.fd);
break;
@@ -928,6 +931,7 @@ if (s[0] == '#') {
} else
#endif /* X11 */
OBJ(acpitemp, 0) obj->data.i = open_acpi_temperature(arg);
+ END OBJ(acpitempf, 0) obj->data.i = open_acpi_temperature(arg);
END OBJ(acpiacadapter, 0)
END OBJ(freq, 0);
END OBJ(freq_g, 0);
@@ -1531,14 +1535,27 @@ static void generate_text()
/* does anyone have decimals in acpi temperature? */
if (!use_spacer)
snprintf(p, n, "%d", (int)
- get_acpi_temperature(obj->
- data.
- i));
+ get_acpi_temperature(obj->
+ data.
+ i));
else
snprintf(p, 5, "%d ", (int)
- get_acpi_temperature(obj->
- data.
- i));
+ get_acpi_temperature(obj->
+ data.
+ i));
+ }
+ OBJ(acpitempf) {
+ /* does anyone have decimals in acpi temperature? */
+ if (!use_spacer)
+ snprintf(p, n, "%d", (int)
+ ((get_acpi_temperature(obj->
+ data.
+ i)+ 40) * 9.0 / 5 - 40));
+ else
+ snprintf(p, 5, "%d ", (int)
+ ((get_acpi_temperature(obj->
+ data.
+ i)+ 40) * 9.0 / 5 - 40));
}
OBJ(freq) {
snprintf(p, n, "%sMhz", get_freq());
diff --git a/doc/config_settings.xml b/doc/config_settings.xml
index aed6fce1..275ded7e 100644
--- a/doc/config_settings.xml
+++ b/doc/config_settings.xml
@@ -125,27 +125,6 @@
-
-
-
- METAR station code for weather, see http://www.wrh.noaa.gov/ if you need to find your code.
-
-
-
-
-
-
- Define a custom METAR ftp server
-
-
-
-
-
-
- Path on server to use
-
-
-
diff --git a/doc/variables.xml b/doc/variables.xml
index 54f639d0..f5bf5d1a 100644
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -32,8 +32,17 @@
- ACPI temperature.
-
+ ACPI temperature in C.
+
+
+
+
+
+
+
+
+ ACPI temperature in F.
+
@@ -431,121 +440,6 @@
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- temp in F
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- Windspeed in knots
-
-
-
-
-
-
-
- Windspeed in kph
-
-
-
-
-
-
-
- Windspeed in mph
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-
-
-
-
-
-
- self-explanatory
-
-
-