From 9dce0dfa4cd90e7ce2131e1e5821f54eb3754b26 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Mon, 24 Aug 2015 14:18:19 +0200 Subject: input-device: add new daemon The input-device daemon can be used instead of the serial-device daemon for barcode scanners, that are connected as HID device. --- src/serial-device/Makefile | 2 +- src/serial-device/main.vala | 4 ++-- src/serial-device/serial-device-interface.vala | 20 -------------------- src/serial-device/serial-device.vala | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 src/serial-device/serial-device-interface.vala (limited to 'src/serial-device') diff --git a/src/serial-device/Makefile b/src/serial-device/Makefile index b9ebaf4..d80279d 100644 --- a/src/serial-device/Makefile +++ b/src/serial-device/Makefile @@ -1,7 +1,7 @@ all: serial-device @echo > /dev/null -serial-device: main.vala serial-device.vala serial-device-interface.vala ../config/config-interface.vala +serial-device: main.vala serial-device.vala ../input-device/input-device-interface.vala ../config/config-interface.vala valac -X -w -o $@ --pkg linux --pkg posix --pkg gio-2.0 $^ clean: diff --git a/src/serial-device/main.vala b/src/serial-device/main.vala index e338842..ae1aa75 100644 --- a/src/serial-device/main.vala +++ b/src/serial-device/main.vala @@ -18,7 +18,7 @@ Device dev; public static int main(string[] args) { try { Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config"); - dev = new Device(cfg.get_string("SERIAL", "device"), 9600, 8, 1); + dev = new Device(cfg.get_string("INPUT", "device"), 9600, 8, 1); } catch(IOError e) { error("IOError: %s\n", e.message); } catch(KeyFileError e) { @@ -27,7 +27,7 @@ public static int main(string[] args) { Bus.own_name( BusType.SESSION, - "io.mainframe.shopsystem.SerialDevice", + "io.mainframe.shopsystem.InputDevice", BusNameOwnerFlags.NONE, on_bus_aquired, () => {}, diff --git a/src/serial-device/serial-device-interface.vala b/src/serial-device/serial-device-interface.vala deleted file mode 100644 index 572e810..0000000 --- a/src/serial-device/serial-device-interface.vala +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2013, Sebastian Reichel - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -[DBus (name = "io.mainframe.shopsystem.SerialDevice")] -public interface SerialDevice : Object { - public abstract signal void received_barcode(string barcode); - public abstract void blink(uint duration) throws IOError; -} diff --git a/src/serial-device/serial-device.vala b/src/serial-device/serial-device.vala index c697a59..549cd74 100644 --- a/src/serial-device/serial-device.vala +++ b/src/serial-device/serial-device.vala @@ -13,7 +13,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -[DBus (name = "io.mainframe.shopsystem.SerialDevice")] +[DBus (name = "io.mainframe.shopsystem.InputDevice")] public class Device { private Posix.termios newtio; private Posix.termios restoretio; -- cgit v1.2.3