On Tue, Sep 17, 2013 at 09:52:14AM -0700, Ping Cheng wrote: > On Mon, Sep 16, 2013 at 8:42 PM, Peter Hutterer > <peter.hutte...@who-t.net>wrote: > > > On Wed, Sep 11, 2013 at 06:01:49PM -0700, Ping Cheng wrote: > > > New Cintiq/Intuos Pro Pen looks very close to the existing Classic > > > Pen. Use the Classic image so we do not have to create a new one > > > for Pro Pen since the person who planned to add an image for Pro > > > Pen does not have time to work on this project any more. > > > > > > Signed-off-by: Ping Cheng <pi...@wacom.com> > > > --- > > > data/libwacom.stylus | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/data/libwacom.stylus b/data/libwacom.stylus > > > index a4fa8ba..290fe5e 100644 > > > --- a/data/libwacom.stylus > > > +++ b/data/libwacom.stylus > > > @@ -134,7 +134,7 @@ Type=Classic > > > Name=Pro Pen > > > HasEraser=true > > > Buttons=2 > > > -Type=Pro > > > +Type=Classic > > > > this is unrelated to the patch (which I've merged already) but the Pro is a > > new type that wouldn't work correctly anyway because libwacom doesn't parse > > "Pro" as stylus type. This should've triggered an error in make check and > > if > > > > "make check" reported a warning and indicated a fallback suggestion. That's > how I spotted the need of this patch. > > Do you still need someone to do something there?
yeah, that'd be great. make check is actually quite noisy atm so I missed the warning, which is how this got pushed (i do run make check before pushing [1]). the current behaviour is good since it falls back and won't crash the application. but for the test it'd be good to make sure that fallback behaviour isn't even needed if there is a pen assigned in the database. it's a bit more involved, but may pay off in the long run. Cheers, Peter [1] echo "make check" > .git/hooks/pre-push; chmod +x .git/hooks/pre-push > > > anyone has the time to add this to the tests, I'd be grateful. > > > > Cheers, > > Peter > > > > > > > > [0x180802] > > > # DTH2242 Pen > > > @@ -247,7 +247,7 @@ Type=General > > > # Cintiq 13HD > > > Name=Pro Pen Eraser > > > IsEraser=true > > > -Type=Pro > > > +Type=Classic > > > > > > [0x18080a] > > > # DTH2242 Eraser > > > -- > > > 1.8.1.2 > > > > > ------------------------------------------------------------------------------ LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
