Ticket #43: led_with_battery.patch

configure

@@ -4784 +4784 @@
 
 
 
-ac_config_files="$ac_config_files Makefile defs.mak common/include/lib.mak doc/Makefile man/Makefile libcwiid/Makefile libcwiid/cwiid.pc wmdemo/Makefile wmgui/Makefile wminput/Makefile wminput/plugins/Makefile wminput/plugins/ir_ptr/Makefile wminput/plugins/acc/Makefile wminput/plugins/nunchuk_acc/Makefile lswm/Makefile python/Makefile"
+ac_config_files="$ac_config_files Makefile defs.mak common/include/lib.mak doc/Makefile man/Makefile libcwiid/Makefile libcwiid/cwiid.pc wmdemo/Makefile wmgui/Makefile wminput/Makefile wminput/plugins/Makefile wminput/plugins/ir_ptr/Makefile wminput/plugins/acc/Makefile wminput/plugins/nunchuk_acc/Makefile wminput/plugins/led/Makefile lswm/Makefile python/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5353 +5353 @@
     "wminput/plugins/ir_ptr/Makefile") CONFIG_FILES="$CONFIG_FILES wminput/plugins/ir_ptr/Makefile" ;;
     "wminput/plugins/acc/Makefile") CONFIG_FILES="$CONFIG_FILES wminput/plugins/acc/Makefile" ;;
     "wminput/plugins/nunchuk_acc/Makefile") CONFIG_FILES="$CONFIG_FILES wminput/plugins/nunchuk_acc/Makefile" ;;
+    "wminput/plugins/led/Makefile") CONFIG_FILES="$CONFIG_FILES wminput/plugins/led/Makefile" ;;
     "lswm/Makefile") CONFIG_FILES="$CONFIG_FILES lswm/Makefile" ;;
     "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;;
 

wminput/configs/acc_led

@@ +1 @@
+#acc_led
+
+include buttons
+
+Plugin.acc.X    = REL_X
+Plugin.acc.Y    = REL_Y
+
+# You can set Plugin.led.Led[1->4) to 1
+# to have that led be active all the time
+Plugin.led.Led4 = 1
+
+# Setting battery to 1 enables the battery check function
+# By default the keypress is A + B
+# You can change this by setting Plugin.led.Button to any
+# wiimote or attachment button
+Plugin.led.Battery = 1

wminput/Makefile.in

@@ -43 +43 @@
 install_configs:
         install -d $(WMINPUT_CONFIG_DIR)
         install configs/* $(WMINPUT_CONFIG_DIR)
-        ln -sf acc_ptr $(WMINPUT_CONFIG_DIR)/default
+        ln -sf acc_led $(WMINPUT_CONFIG_DIR)/default
 
 #uninstall_configs:
 #       rm -f $(WMINPUT_CONFIG_DIR)/default

wminput/plugins/ir_ptr/ir_ptr.c

@@ -147 +147 @@
         }
 
         /* LEDs */
+        /* Commented out so it doesn't overide led plugin.
+         * It shouldn't matter, since only one IR source
+         * is used now anyways. If the pointer is moving,
+         * it sees a source.
         switch (src_index) {
         case 0:
                 flag = CWIID_LED1_ON;
@@ -164 +168 @@
                 flag = 0;
                 break;
         }
+
         if (flag != old_flag) {
                 cwiid_set_led(wiimote, flag);
                 old_flag = flag;
         }
+        */
 
         if ((src_index == -1) || !ir_mesg->src[src_index].valid) {
                 data.axes[0].valid = data.axes[1].valid = 0;

wminput/plugins/led/led.c

@@ -1 +1 @@
 #include "wmplugin.h"
+#include <math.h>
+
 
 cwiid_wiimote_t *wiimote;
 
@@ -10 +12 @@
 wmplugin_init_t wmplugin_init;
 wmplugin_exec_t wmplugin_exec;
 
-static int led1 = 0;
-static int led2 = 0;
-static int led3 = 0;
-static int led4 = 0;
+static int Led1 = 0;
+static int Led2 = 0;
+static int Led3 = 0;
+static int Led4 = 0;
+static int Battery = 0;
+static uint8_t Button = CWIID_BTN_A + CWIID_BTN_B;
+
+static void show_battery();
 
 struct wmplugin_info *wmplugin_info()
 {
         if (!info_init) {
                 info.button_count = 0;
                 info.axis_count = 0;
-                info.param_count = 4;
-                info.param_info[0].name = "led1";
+                info.param_count = 6;
+                info.param_info[0].name = "Led1";
                 info.param_info[0].type = WMPLUGIN_PARAM_INT;
-                info.param_info[0].ptr = &led1;
-                info.param_info[1].name = "led2";
+                info.param_info[0].ptr = &Led1;
+                info.param_info[1].name = "Led2";
                 info.param_info[1].type = WMPLUGIN_PARAM_INT;
-                info.param_info[1].ptr = &led2;
-                info.param_info[2].name = "led3";
+                info.param_info[1].ptr = &Led2;
+                info.param_info[2].name = "Led3";
                 info.param_info[2].type = WMPLUGIN_PARAM_INT;
-                info.param_info[2].ptr = &led3;
-                info.param_info[3].name = "led4";
+                info.param_info[2].ptr = &Led3;
+                info.param_info[3].name = "Led4";
                 info.param_info[3].type = WMPLUGIN_PARAM_INT;
-                info.param_info[3].ptr = &led4;
+                info.param_info[3].ptr = &Led4;
+                info.param_info[4].name = "Battery";
+                info.param_info[4].type = WMPLUGIN_PARAM_INT;
+                info.param_info[4].ptr = &Battery;
+                info.param_info[5].name = "Button";
+                info.param_info[5].type = WMPLUGIN_PARAM_INT;
+                info.param_info[5].ptr = &Button;               
                 info_init = 1;
         }
         return &info;
@@ -42 +54 @@
 {
         wiimote = arg_wiimote;
 
-        uint8_t led_state = (led1 ? CWIID_LED1_ON : 0)
-                          | (led2 ? CWIID_LED2_ON : 0)
-                          | (led3 ? CWIID_LED3_ON : 0)
-                          | (led4 ? CWIID_LED4_ON : 0);
+        uint8_t led_state = (Led1 ? CWIID_LED1_ON : 0)
+                          | (Led2 ? CWIID_LED2_ON : 0)
+                          | (Led3 ? CWIID_LED3_ON : 0)
+                          | (Led4 ? CWIID_LED4_ON : 0);
 
         cwiid_command(wiimote, CWIID_CMD_LED, led_state);
+        
+        if (wmplugin_set_rpt_mode(id, CWIID_RPT_BTN)) {
+                return -1;
+        }       
 
         return 0;
 }
 
 struct wmplugin_data *wmplugin_exec(int mesg_count, union cwiid_mesg mesg[])
 {
+        int i;
+        uint8_t button;
+        struct cwiid_btn_message *btn_mesg;
+
+        uint8_t led_state = (Led1 ? CWIID_LED1_ON : 0)
+                          | (Led2 ? CWIID_LED2_ON : 0)
+                          | (Led3 ? CWIID_LED3_ON : 0)
+                          | (Led4 ? CWIID_LED4_ON : 0);
+
+        if(Battery != 0) {              
+                btn_mesg = NULL;
+                for (i=0; i < mesg_count; i++) {
+                        if (mesg[i].type == CWIID_MESG_BTN) {
+                                btn_mesg = &mesg[i].btn_mesg;
+                                button = mesg[i].btn_mesg.buttons;
+                        }
+                }
+
+                if (!btn_mesg) {
+                        return NULL;
+                }
+
+                if(button == Button) {
+                        show_battery();
+                } 
+                else {
+                        cwiid_command(wiimote, CWIID_CMD_LED, led_state);
+                }
+        }
+        
         return &data;
 }
+
+static void show_battery()
+{
+        struct cwiid_state state;
+        float battery_percent;
+        int battery_led;
+
+        cwiid_get_state(wiimote, &state);
+        
+        // calculate battery as a percent, then decide how many leds to light up        
+        battery_percent = (100*state.battery / CWIID_BATTERY_MAX);
+        battery_led = ceil(battery_percent / 25);
+
+        switch(battery_led) {
+        case 1:
+                cwiid_set_led(wiimote, CWIID_LED1_ON);
+                break;
+        case 2:
+                cwiid_set_led(wiimote, CWIID_LED1_ON | CWIID_LED2_ON );
+                break;
+        case 3:
+                cwiid_set_led(wiimote, CWIID_LED1_ON | CWIID_LED2_ON | CWIID_LED3_ON );
+                break;
+        case 4:
+                cwiid_set_led(wiimote, CWIID_LED1_ON | CWIID_LED2_ON | CWIID_LED3_ON | CWIID_LED4_ON );
+                break;
+        default:
+                break;
+        }
+}