On Thu, Dec 11, 2014 at 02:49:04PM -0800, Ping Cheng wrote: > New tools have been added when we added new tablets. Kernel driver > has been updated with new tool IDs. But, we didn't update corresponding > data/*.tablet and libwacom.stylus > > Signed-off-by: Ping Cheng <pi...@wacom.com> > --- > v2: updated Intuos4 series. > Fixed "make check and dbverfiy" issues as pointed by Peter
merged, pushed, thanks. Cheers, Peter > --- > data/cintiq-13hd.tablet | 2 +- > data/cintiq-21ux2.tablet | 2 +- > data/cintiq-22hd.tablet | 2 +- > data/cintiq-22hdt.tablet | 2 +- > data/cintiq-24hd-touch.tablet | 2 +- > data/cintiq-24hd.tablet | 2 +- > data/cintiq-companion-hybrid.tablet | 2 +- > data/cintiq-companion.tablet | 2 +- > data/intuos-pro-l.tablet | 2 +- > data/intuos-pro-m.tablet | 2 +- > data/intuos-pro-s.tablet | 2 +- > data/intuos4-12x19.tablet | 2 +- > data/intuos4-4x6.tablet | 2 +- > data/intuos4-6x9-wl.tablet | 2 +- > data/intuos4-6x9.tablet | 2 +- > data/intuos4-8x13.tablet | 2 +- > data/intuos5-m.tablet | 2 +- > data/intuos5-s.tablet | 2 +- > data/intuos5-touch-l.tablet | 2 +- > data/intuos5-touch-m.tablet | 2 +- > data/intuos5-touch-s.tablet | 2 +- > 21 files changed, 21 insertions(+), 21 deletions(-) > > diff --git a/data/cintiq-13hd.tablet b/data/cintiq-13hd.tablet > index d9fadae..9986cf7 100644 > --- a/data/cintiq-13hd.tablet > +++ b/data/cintiq-13hd.tablet > @@ -28,7 +28,7 @@ DeviceMatch=usb:056a:0304 > Width=12 > Height=7 > Layout=cintiq-13hd.svg > -Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet > index d09461e..ca3a0d2 100644 > --- a/data/cintiq-21ux2.tablet > +++ b/data/cintiq-21ux2.tablet > @@ -49,7 +49,7 @@ Class=Cintiq > Width=17 > Height=13 > Layout=cintiq-21ux2.svg > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet > index 9068985..54f3219 100644 > --- a/data/cintiq-22hd.tablet > +++ b/data/cintiq-22hd.tablet > @@ -37,7 +37,7 @@ Class=Cintiq > Width=19 > Height=11 > Layout=cintiq-22hd.svg > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-22hdt.tablet b/data/cintiq-22hdt.tablet > index 5dbb03c..c79f274 100644 > --- a/data/cintiq-22hdt.tablet > +++ b/data/cintiq-22hdt.tablet > @@ -38,7 +38,7 @@ Class=Cintiq > Width=19 > Height=11 > Layout=cintiq-22hd.svg > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet > index 97a7b6b..ca6a9ae 100644 > --- a/data/cintiq-24hd-touch.tablet > +++ b/data/cintiq-24hd-touch.tablet > @@ -46,7 +46,7 @@ Class=Cintiq > Width=21 > Height=13 > Layout=cintiq-24hd.svg > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet > index 0ba8fd4..7c464a7 100644 > --- a/data/cintiq-24hd.tablet > +++ b/data/cintiq-24hd.tablet > @@ -45,7 +45,7 @@ Class=Cintiq > Width=21 > Height=13 > Layout=cintiq-24hd.svg > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-companion-hybrid.tablet > b/data/cintiq-companion-hybrid.tablet > index 817be0f..ea36d87 100644 > --- a/data/cintiq-companion-hybrid.tablet > +++ b/data/cintiq-companion-hybrid.tablet > @@ -31,7 +31,7 @@ DeviceMatch=usb:056a:0307 > Width=12 > Height=7 > Layout=cintiq-companion-hybrid.svg > -Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display > > [Features] > diff --git a/data/cintiq-companion.tablet b/data/cintiq-companion.tablet > index 27da862..734910a 100644 > --- a/data/cintiq-companion.tablet > +++ b/data/cintiq-companion.tablet > @@ -31,7 +31,7 @@ DeviceMatch=usb:056a:030a > Width=12 > Height=7 > Layout=cintiq-companion.svg > -Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; > +Styli=0x802;0x804;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > IntegratedIn=Display;System > > [Features] > diff --git a/data/intuos-pro-l.tablet b/data/intuos-pro-l.tablet > index 3e98b70..42b82ac 100644 > --- a/data/intuos-pro-l.tablet > +++ b/data/intuos-pro-l.tablet > @@ -50,7 +50,7 @@ Width=13 > Height=8 > Layout=intuos-pro-l.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x006;0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos-pro-m.tablet b/data/intuos-pro-m.tablet > index 02c8389..12f636f 100644 > --- a/data/intuos-pro-m.tablet > +++ b/data/intuos-pro-m.tablet > @@ -50,7 +50,7 @@ Width=9 > Height=6 > Layout=intuos-pro-m.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos-pro-s.tablet b/data/intuos-pro-s.tablet > index 162dc67..fa43d31 100644 > --- a/data/intuos-pro-s.tablet > +++ b/data/intuos-pro-s.tablet > @@ -48,7 +48,7 @@ Width=6 > Height=4 > Layout=intuos-pro-s.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet > index c131dae..c265595 100644 > --- a/data/intuos4-12x19.tablet > +++ b/data/intuos4-12x19.tablet > @@ -40,7 +40,7 @@ Width=19 > Height=12 > Layout=intuos4-12x19.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x006;0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Reversible=true > diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet > index 9af5cb9..b3fca25 100644 > --- a/data/intuos4-4x6.tablet > +++ b/data/intuos4-4x6.tablet > @@ -41,7 +41,7 @@ Width=6 > Height=4 > Layout=intuos4-4x6.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Reversible=true > diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet > index 3cf6d31..fba94d5 100644 > --- a/data/intuos4-6x9-wl.tablet > +++ b/data/intuos4-6x9-wl.tablet > @@ -40,7 +40,7 @@ Width=8 > Height=5 > IntegratedIn= > Layout=intuos4-6x9-wl.svg > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Reversible=true > diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet > index 9a4ebbe..b1eea7d 100644 > --- a/data/intuos4-6x9.tablet > +++ b/data/intuos4-6x9.tablet > @@ -40,7 +40,7 @@ Width=9 > Height=6 > Layout=intuos4-6x9.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Reversible=true > diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet > index 12077d2..36c2885 100644 > --- a/data/intuos4-8x13.tablet > +++ b/data/intuos4-8x13.tablet > @@ -40,7 +40,7 @@ Width=13 > Height=8 > Layout=intuos4-8x13.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Reversible=true > diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet > index 5169c2d..81605fe 100644 > --- a/data/intuos5-m.tablet > +++ b/data/intuos5-m.tablet > @@ -50,7 +50,7 @@ Width=9 > Height=6 > Layout=intuos5-m.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet > index d17a1e7..4f51c0d 100644 > --- a/data/intuos5-s.tablet > +++ b/data/intuos5-s.tablet > @@ -48,7 +48,7 @@ Width=6 > Height=4 > Layout=intuos5-s.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet > index d951590..163a19b 100644 > --- a/data/intuos5-touch-l.tablet > +++ b/data/intuos5-touch-l.tablet > @@ -50,7 +50,7 @@ Width=13 > Height=8 > Layout=intuos5-l.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x006;0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet > index bba6ea8..fca8e3f 100644 > --- a/data/intuos5-touch-m.tablet > +++ b/data/intuos5-touch-m.tablet > @@ -50,7 +50,7 @@ Width=9 > Height=6 > Layout=intuos5-m.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet > index b0b9d5c..dfdefd0 100644 > --- a/data/intuos5-touch-s.tablet > +++ b/data/intuos5-touch-s.tablet > @@ -48,7 +48,7 @@ Width=6 > Height=4 > Layout=intuos5-s.svg > IntegratedIn= > -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; > +Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a; > > [Features] > Stylus=true > -- > 1.9.1 > ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
