Diff: keyboard2.cpp

Revision:

20:150afde94910

Parent:

17:b3545e9d38f7

--- a/keyboard2.cpp	Thu Aug 28 14:39:32 2014 +0000
+++ b/keyboard2.cpp	Thu Sep 25 11:34:21 2014 +0000
@@ -18,7 +18,7 @@
  
 //CDU Keyboard communications KEYBOARD_INT
 InterruptIn CDU_KB_INT( KBD_INT );  //Set CDU keyboard interrupt line
-I2C CDU_I2C(I2C_SDA, I2C_SCL);         //I2C bus for keyboard/temp chip.
+I2C CDU_I2C(I2C_SDA, I2C_SCL);         //I2C bus for keyboard and temp chip.
  
 //CDU Keyboard LEDS
 DigitalOut EXEC( LED_EXEC );
@@ -143,6 +143,8 @@
 {
     //This routine must be called 5-10x per second. Manual test to see what is pleasant to see
     //AnalogIn BGL_POT( p15 ); //background light control potmeter. Returns a value between 0.0 and 1.0
+    //Will be multiplied by a factor (BGL_SCALE/100) to define max light intensity
+    //
     //PwmOut BGL_LED( p21 );   //PWM output
     //calculate required brightness in percentage from 0%-100%
     //nVal 255     --> calculate brightness from potmeter value (default value if no parameter is passed)
@@ -151,13 +153,13 @@
 
     static int LightOn    = 1;
     static int FullBright = 0;
-
+    
     switch (nVal) 
     {
         case 0:
         {
             //switch off backlighting
-            BGL_LED = 0.0 ;
+            BGL_LED = 0.0f ;
             LightOn = 0;
             FullBright = 0;
             break;
@@ -165,7 +167,7 @@
         case 100:
         {
             //switch on backlighting to normal
-            BGL_LED = BGL_POT;
+            BGL_LED = BGL_POT*(float(BGL_SCALE)/100.0f);
             LightOn = 1;
             FullBright = 0;
             break;
@@ -174,7 +176,7 @@
         case 128:
         {
             //switch backlighting to MAX
-            BGL_LED= 1;
+            BGL_LED= 1*(float(BGL_SCALE)/100.0f);
             FullBright = 1;   
         }
     
@@ -189,12 +191,12 @@
                     }
                 else
                     {
-                        BGL_LED = BGL_POT; 
+                        BGL_LED = BGL_POT*(float(BGL_SCALE)/100.0f); 
                     }
             }
             else  if ( ( LightOn == 1) && (FullBright== 1) ) 
             {
-                BGL_LED = 1;
+                BGL_LED = 1*(float(BGL_SCALE)/100.0f);
                 
             }
         }