|
[-]
[+]
|
Changed |
_service:tar_git:mce-plugin-libhybris.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:mce-plugin-libhybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/nemomobile/mce-plugin-libhybris.git</param>
<param name="branch">master</param>
- <param name="revision">a8dd6d9bdc9cb63417369e926b322fd3201bfed3</param>
+ <param name="revision">fd542a8ae0d944c77d9446003f110372d52d2e78</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:mce-plugin-libhybris-1.10.0.tar.bz2/.depend
^
|
| @@ -132,8 +132,10 @@
sysfs-led-hammerhead.h\
sysfs-led-htcvision.h\
sysfs-led-main.h\
+ sysfs-led-redgreen.h\
sysfs-led-util.h\
sysfs-led-vanilla.h\
+ sysfs-led-white.h\
sysfs-led-main.pic.o:\
sysfs-led-main.c\
@@ -143,8 +145,22 @@
sysfs-led-hammerhead.h\
sysfs-led-htcvision.h\
sysfs-led-main.h\
+ sysfs-led-redgreen.h\
sysfs-led-util.h\
sysfs-led-vanilla.h\
+ sysfs-led-white.h\
+
+sysfs-led-redgreen.o:\
+ sysfs-led-redgreen.c\
+ sysfs-led-main.h\
+ sysfs-led-redgreen.h\
+ sysfs-led-util.h\
+
+sysfs-led-redgreen.pic.o:\
+ sysfs-led-redgreen.c\
+ sysfs-led-main.h\
+ sysfs-led-redgreen.h\
+ sysfs-led-util.h\
sysfs-led-util.o:\
sysfs-led-util.c\
@@ -168,3 +184,15 @@
sysfs-led-util.h\
sysfs-led-vanilla.h\
+sysfs-led-white.o:\
+ sysfs-led-white.c\
+ sysfs-led-main.h\
+ sysfs-led-util.h\
+ sysfs-led-white.h\
+
+sysfs-led-white.pic.o:\
+ sysfs-led-white.c\
+ sysfs-led-main.h\
+ sysfs-led-util.h\
+ sysfs-led-white.h\
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:mce-plugin-libhybris-1.10.0.tar.bz2/Makefile
^
|
| @@ -128,6 +128,7 @@
hybris_OBJS += sysfs-led-redgreen.pic.o
hybris_OBJS += sysfs-led-util.pic.o
hybris_OBJS += sysfs-led-vanilla.pic.o
+hybris_OBJS += sysfs-led-white.pic.o
hybris.so : LDLIBS += -lhardware -lm
hybris.so : $(hybris_OBJS)
|
|
[-]
[+]
|
Changed |
_service:tar_git:mce-plugin-libhybris-1.10.0.tar.bz2/sysfs-led-main.c
^
|
| @@ -30,6 +30,7 @@
#include "sysfs-led-htcvision.h"
#include "sysfs-led-binary.h"
#include "sysfs-led-redgreen.h"
+#include "sysfs-led-white.h"
#include "plugin-logging.h"
@@ -277,6 +278,10 @@
* it must be probed after rgb led controls. */
led_control_redgreen_probe,
+ /* Single control channel with actually working
+ * brightness control and max_brightness. */
+ led_control_white_probe,
+
/* The binary backend needs just one directory
* that has 'brightness' control file. */
led_control_binary_probe,
|
|
[-]
[+]
|
Added |
_service:tar_git:mce-plugin-libhybris-1.10.0.tar.bz2/sysfs-led-white.c
^
|
| @@ -0,0 +1,204 @@
+/** @file sysfs-led-white.c
+ *
+ * mce-plugin-libhybris - Libhybris plugin for Mode Control Entity
+ * <p>
+ * Copyright (C) 2017 Jolla Ltd.
+ * <p>
+ * @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
+ *
+ * mce-plugin-libhybris is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License.
+ *
+ * mce-plugin-libhybris is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with mce-plugin-libhybris; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* ========================================================================= *
+ * White / single color led control
+ *
+ * One channel, which:
+ * - must have 'brightness' control file
+ * - must have 'max_brightness' control file
+ * ========================================================================= */
+
+#include "sysfs-led-white.h"
+
+#include "sysfs-led-util.h"
+
+#include <stdio.h>
+
+#include <glib.h>
+
+/* ========================================================================= *
+ * PROTOTYPES
+ * ========================================================================= */
+
+typedef struct
+{
+ const char *max; // R
+ const char *val; // W
+} led_paths_white_t;
+
+typedef struct
+{
+ int maxval;
+ int fd_val;
+} led_channel_white_t;
+
+/* ------------------------------------------------------------------------- *
+ * ONE_CHANNEL
+ * ------------------------------------------------------------------------- */
+
+static void led_channel_white_init (led_channel_white_t *self);
+static void led_channel_white_close (led_channel_white_t *self);
+static bool led_channel_white_probe (led_channel_white_t *self, const led_paths_white_t *path);
+static void led_channel_white_set_value (const led_channel_white_t *self, int value);
+
+/* ------------------------------------------------------------------------- *
+ * ALL_CHANNELS
+ * ------------------------------------------------------------------------- */
+
+static void led_control_white_map_color (int r, int g, int b, int *white);
+static void led_control_white_value_cb (void *data, int r, int g, int b);
+static void led_control_white_close_cb (void *data);
+
+bool led_control_white_probe (led_control_t *self);
+
+/* ========================================================================= *
+ * ONE_CHANNEL
+ * ========================================================================= */
+
+static void
+led_channel_white_init(led_channel_white_t *self)
+{
+ self->maxval = -1;
+ self->fd_val = -1;
+}
+
+static void
+led_channel_white_close(led_channel_white_t *self)
+{
+ led_util_close_file(&self->fd_val);
+}
+
+static bool
+led_channel_white_probe(led_channel_white_t *self,
+ const led_paths_white_t *path)
+{
+ bool res = false;
+
+ led_channel_white_close(self);
+
+ if( (self->maxval = led_util_read_number(path->max)) <= 0 )
+ {
+ goto cleanup;
+ }
+
+ if( !led_util_open_file(&self->fd_val, path->val) )
+ {
+ goto cleanup;
+ }
+
+ res = true;
+
+cleanup:
+
+ if( !res ) led_channel_white_close(self);
+
+ return res;
+}
+
+static void
+led_channel_white_set_value(const led_channel_white_t *self, int value)
+{
+ if( self->fd_val != -1 )
+ {
+ dprintf(self->fd_val, "%d", led_util_scale_value(value, self->maxval));
+ }
+}
+
+/* ========================================================================= *
+ * ALL_CHANNELS
+ * ========================================================================= */
+
+static void
+led_control_white_map_color(int r, int g, int b, int *white)
+{
+ /* Use maximum value from requested RGB value */
+ if( r < g ) r = g;
+ if( r < b ) r = b;
+ *white = r;
+}
+
+static void
+led_control_white_value_cb(void *data, int r, int g, int b)
+{
+ const led_channel_white_t *channel = data;
+
+ int white = 0;
+ led_control_white_map_color(r, g, b, &white);
+
+ led_channel_white_set_value(channel + 0, white);
+}
+
+static void
+led_control_white_close_cb(void *data)
+{
+ led_channel_white_t *channel = data;
+ led_channel_white_close(channel + 0);
+}
+
+bool
+led_control_white_probe(led_control_t *self)
+{
+ /** Sysfs control paths for White leds */
+ static const led_paths_white_t paths[][1] =
+ {
+ // "Motorola Moto G (2nd gen)"
+ {
+ {
+ .max = "/sys/class/leds/white/max_brightness",
+ .val = "/sys/class/leds/white/brightness",
+ },
+ },
+ };
+
+ static led_channel_white_t channel[1];
+
+ bool res = false;
+
+ led_channel_white_init(channel + 0);
+
+ self->name = "white";
+ self->data = channel;
+ self->enable = 0;
+ self->value = led_control_white_value_cb;
+ self->close = led_control_white_close_cb;
+
+ /* We can use sw breathing logic */
+ self->can_breathe = true;
+
+ for( size_t i = 0; i < G_N_ELEMENTS(paths) ; ++i )
+ {
+ if( led_channel_white_probe(&channel[0], &paths[i][0]) )
+ {
+ res = true;
+ break;
+ }
+ }
+
+ if( !res )
+ {
|
|
[-]
[+]
|
Added |
_service:tar_git:mce-plugin-libhybris-1.10.0.tar.bz2/sysfs-led-white.h
^
|
| @@ -0,0 +1,31 @@
+/** @file sysfs-led-white.h
+ *
+ * mce-plugin-libhybris - Libhybris plugin for Mode Control Entity
+ * <p>
+ * Copyright (C) 2017 Jolla Ltd.
+ * <p>
+ * @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
+ *
+ * mce-plugin-libhybris is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License.
+ *
+ * mce-plugin-libhybris is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with mce-plugin-libhybris; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SYSFS_LED_WHITE_H_
+# define SYSFS_LED_WHITE_H_
+
+# include "sysfs-led-main.h"
+
+bool led_control_white_probe(led_control_t *self);
+
+#endif /* SYSFS_LED_WHITE_H_ */
|
