From 61f24ea47e89956c47f5220207e99ad9ee26092e Mon Sep 17 00:00:00 2001
From: gevaerts <gevaerts@a1c6a512-1295-4272-9138-f99709370657>
Date: Wed, 13 Oct 2010 21:52:45 +0000
Subject: [PATCH] Resistor calculator: Support Gigaohms in resistor to colour
 conversion, and guard against values that can not be represented

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28275 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/resistor.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/apps/plugins/resistor.c b/apps/plugins/resistor.c
index d0f4fc0d4..635e3cdb3 100644
--- a/apps/plugins/resistor.c
+++ b/apps/plugins/resistor.c
@@ -167,7 +167,7 @@ static int powi(int num, int exp)
 
 static enum color get_band_rtoc(int in_val)
 {
-    int return_color = 0;
+    int return_color = RES_INVALID;
     switch(in_val) {
         case 0:
             return_color = RES_BLACK;
@@ -808,7 +808,8 @@ static void resistance_to_color(void)
     rb->lcd_clear_display();
     rb->splash(HZ/2, "Resistance to Colour");
     MENUITEM_STRINGLIST(r_to_c_menu, "Select unit to use:", NULL, 
-                        "Ohms", "Kiloohms (KOhms)", "Megaohms (MOhms)");
+                        "Ohms", "Kiloohms (KOhms)", "Megaohms (MOhms)",
+                        "Gigaohms (GOhms)");
     MENUITEM_STRINGLIST(r_to_c_menu_tol, "Tolerance to display:", NULL,
                         "5%", "10%", "1%", "2%", "20%");
       
@@ -848,19 +849,23 @@ static void resistance_to_color(void)
         
         switch(menu_selection) {
             case 0:
+                power_ten=0;
                 units_used = RES_BLACK;
                 break;
             case 1: /* KOhms */
+                power_ten=3;
                 units_used = RES_ORANGE;
-                kbd_input_int *= 1000;
                 break;
             case 2: /* MOhms */
+                power_ten=6;
                 units_used = RES_BLUE;
-                kbd_input_int *= 1000000;
+                break;
+            case 3: /* GOhms */
+                power_ten=9;
+                units_used = RES_WHITE;
                 break;
             }
 
-        power_ten=0;
         temp=kbd_input_int;
         while(temp>=100)
         {
@@ -869,10 +874,19 @@ static void resistance_to_color(void)
         }
         first_band_int=temp/10;
         second_band_int=temp%10;
-        
+
         first_band = get_band_rtoc(first_band_int);
         second_band = get_band_rtoc(second_band_int);
         multiplier = get_band_rtoc(power_ten);
+
+        if( first_band == RES_INVALID
+         || second_band == RES_INVALID
+         || multiplier == RES_INVALID)
+        {
+            rb->splashf(HZ, "%d %s can not be represented",
+                        in_resistance_int,band_data[units_used].unit);
+            return;
+        }
         
         rb->lcd_clear_display();
         lineno = INITIAL_TEXT_Y;
-- 
2.11.4.GIT