fix indent in comment

[chiark-utils.git] / cprogs / xacpi-simple.c

diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c
index 48c2ff4c37ad2423d19c792dab86d4cc8b69cf17..bf0cf7863f82f343c514beb0673e0b09d95e6217 100644 (file)
--- a/cprogs/xacpi-simple.c
+++ b/cprogs/xacpi-simple.c
@@ -1,16 +1,16 @@
 /*
  * display outputs, per line:
  *
- *   Remaining:        | Empty:        | Degraded:
- *     blue    |  black        |  dimgrey      discharging
- *     green   |  black        |  dimgrey      charging
- *     cyan    |  black        |  dimgrey      charged
- *     grey    |  black        |  dimgrey      charging&discharching!
- *     darkcyan        |  black        |  dimgrey      none of the above
- *     blue    |  red          |  dimgrey      discharging - low!
- *     green   |  red          |  dimgrey      charging - low
- *     cyan    |  red          |  dimgrey      charged - low [1]
- *     grey    |  red          |  dimgrey      charging&discharching, low [1]
+ *   Remaining:         | Empty:       | Degraded:
+ *     blue     |  black       |  dimgrey      discharging
+ *     green    |  black       |  dimgrey      charging
+ *     cyan     |  black       |  dimgrey      charged
+ *     grey     |  black       |  dimgrey      charging&discharching!
+ *     lightgrey |  black      |  dimgrey      none of the above
+ *     blue     |  red         |  dimgrey      discharging - low!
+ *     green    |  red         |  dimgrey      charging - low
+ *     cyan     |  red         |  dimgrey      charged - low [1]
+ *     grey     |  red         |  dimgrey      charging&discharching, low [1]
  *       ...  darkgreen  ...                   no batteries present
  *       ...  yellow  ...                      error
  *
@@ -364,6 +364,8 @@ static void acquiredata(void) {
   charging_mask= 0;
   alarmed = 0;
 
+  if (debug) printf("\n");
+
 #define Q_ZERO(f,t,...) \
   total_##f= 0;
 ALL_ACCUMULATE_FIELDS(Q_ZERO)
@@ -427,7 +429,9 @@ ALL_PLAIN_ACCUMULATE_FIELDS(Q_ACCUMULATE_PLAIN)
   }
   closedir(di);
 
-  printf("TOTAL:\n");
+  if (debug) {
+    printf("TOTAL:\n");
+    printf(" %-30s = %#20x\n", "mask", charging_mask);
 #define T_PRINT(f,...)                                 \
     printf(" %-30s = %20.6f\n", #f, total_##f);
 BAT_QTYS(T_PRINT,,,)
@@ -466,7 +470,7 @@ static void initacquire(void) {
   C(blue,      discharging)                    \
   C(green,     charging)                       \
   C(cyan,      charged)                                \
-  C(darkcyan,  notcharging)                    \
+  C(lightgrey,  notcharging)                   \
   C(grey,      confusing)                      \
   C(black,     normal)                         \
   C(red,       low)                            \
@@ -629,7 +633,7 @@ static void show(void) {
   setforeground(&gc_remain,
                !(charging_mask & CHGMASK_CHG_DIS) ?
                (~charging_mask & (1u << CHGST_CHARGED) ?
-                pix_darkcyan : pix_cyan) :
+                pix_lightgrey : pix_cyan) :
                !(~charging_mask & CHGMASK_CHG_DIS) ? pix_grey :
                charging_mask & (1u<<CHGST_CHARGING)
                ? pix_green : pix_blue);