Merge pull request #34 from tgascoigne/master

Radio FM libs
intermediaterepresentation · Jun 3, 2012 · cbb2954 · cbb2954
2 parents 571ec3e + 381b5d2
commit cbb2954
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/extract_files.sh b/extract_files.sh
diff --git a/liblights/lights.c b/liblights/lights.c
@@ -132,23 +132,25 @@ static void set_speaker_light_locked(struct light_device_t *dev,
         case LED_AMBER:
           write_int(AMBER_BLINK_FILE, 1);
           write_int(GREEN_LED_FILE, 0);
-          write_int(AMBER_BLINK_FILE, blinkMode);
           break;
         case LED_GREEN:
           write_int(GREEN_BLINK_FILE, 1);
           write_int(AMBER_LED_FILE, 0);
-          write_int(GREEN_BLINK_FILE, blinkMode);
           break;
         case LED_BLANK:
           write_int(AMBER_BLINK_FILE, 0);
           write_int(GREEN_BLINK_FILE, 0);
+          write_int(AMBER_LED_FILE, 0);
+          write_int(GREEN_LED_FILE, 0);
           break;
         default:
           LOGE("set_led_state colorRGB=%08X, unknown color\n", colorRGB);
           break;
       }
       break;
     case LIGHT_FLASH_NONE:
+      write_int(AMBER_BLINK_FILE, 0);
+      write_int(GREEN_BLINK_FILE, 0);
       switch (color) {
         case LED_AMBER:
           write_int(AMBER_LED_FILE, 1);
@@ -177,6 +179,9 @@ static void set_speaker_light_locked_dual(struct light_device_t *dev,
   unsigned int bcolor = LED_BLANK;
   unsigned int blinkMode = BLINK_MODE_LONG;
 
+  // NOTE: (tgascoigne) I couldn't get dual leds to work, does the hox support this? :/
+  // Currently just blinks the color that's already on
+
   if ((bcolorRGB >> 8) & 0xFF) bcolor = LED_GREEN;
   if ((bcolorRGB >> 16) & 0xFF) bcolor = LED_AMBER;
 

diff --git a/proprietary-files.txt b/proprietary-files.txt
@@ -72,6 +72,11 @@ bin/mknod
 etc/Flash_Loader.conf
 etc/QUO_6260.fls.clean
 
+# FM Radio
+lib/libfmchr.so
+lib/libfmradio.so
+lib/libfmstack.so
+
 # graphics
 lib/libcgdrv.so
 lib/libnvos.so

diff --git a/setup-makefiles.sh b/setup-makefiles.sh