[tuxdroid-svn] r1058 - software_suite_v2/middleware/tuxdriver/trunk/src

[eFfeM <c2m...@c2...>]

Author: eFfeM
Date: 2008-05-01 09:55:29 +0200 (Thu, 01 May 2008)
New Revision: 1058

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.h
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
Log:
made battery value an integer value (in mV)


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c	2008-04-30 17:56:55 UTC (rev 1057)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c	2008-05-01 07:55:29 UTC (rev 1058)
@@ -43,17 +43,20 @@
 LIBLOCAL void
 tux_battery_update_level(void)
 {
-    float new_level = 0.0;
-    float old_level = 0.0;
+    int new_level = 0;
+    int old_level = 0;
     int adc_value;
     char *new_state_str = "";
     char *old_state_str = "";
     
     adc_value = (hw_status_table.battery.high_level << 8);
     adc_value += hw_status_table.battery.low_level;
-    new_level = adc_value * 0.00322 * 2.319;
+    new_level = adc_value * 7.467;
+    /* 7.467 = 0.00322 * 2.319 * 1000 no idea where the first two are from 
+       1000 is to go to mV
+    */
     
-    old_level = *(float *)tux_sw_status_get_value(SW_ID_BATTERY_LEVEL);
+    old_level = *(int *)tux_sw_status_get_value(SW_ID_BATTERY_LEVEL);
     
     if (fabs(new_level - last_level_for_event) > 0.1)
     {

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.h	2008-04-30 17:56:55 UTC (rev 1057)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.h	2008-05-01 07:55:29 UTC (rev 1058)
@@ -21,10 +21,11 @@
 #ifndef _TUX_BATTERY_H_
 #define _TUX_BATTERY_H_
 
-#define TUX_BATTERY_FULL_VALUE                  6.0
-#define TUX_BATTERY_HIGH_VALUE                  5.4
-#define TUX_BATTERY_LOW_VALUE                   4.5
-#define TUX_BATTERY_EMPTY_VALUE                 0.0
+/* values are in mV */
+#define TUX_BATTERY_FULL_VALUE                  6000
+#define TUX_BATTERY_HIGH_VALUE                  5400
+#define TUX_BATTERY_LOW_VALUE                   4500
+#define TUX_BATTERY_EMPTY_VALUE                 0000
 
 extern void tux_battery_update_level(void);
 

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-04-30 17:56:55 UTC (rev 1057)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-05-01 07:55:29 UTC (rev 1058)
@@ -190,8 +190,8 @@
     tux_sw_status_set_value(SW_ID_CHARGER_STATE, STRING_VALUE_UNPLUGGED, 
         false);
         
-    init_status_struct(SW_ID_BATTERY_LEVEL, ID_FMT_FLOAT,
-        "battery_level", "range[4.0..6.5]");
+    init_status_struct(SW_ID_BATTERY_LEVEL, ID_FMT_INT,
+        "battery_level", "range[4000..6500] (mV)");
     
     init_status_struct(SW_ID_BATTERY_STATE, ID_FMT_STRING,
         "battery_state", "EMPTY|LOW|HIGH|FULL");