add bq/fnac device support #745

pazos · 2018-10-19T15:24:51Z

Since those devices are almost copies of kobos (w/softfloat eabi, without simd) most code is almost there.

~~I refactored common kobo/bq code to input-ntx.h~~ Nah. bq devices don't wake up when power is applied via usb.

It builds ok w/ koxtoolchain cervantes target or with a ubuntu/linaro toolchain (given that gcc > 4.8 and glibc <= 2.13)

TODO:

FBInk needs a bump. (current binary works, but breaks stock application on some circumstances)
~~build a Docker image, need help on that.~~ thanks @Frenzie

NiLuJe · 2018-10-19T15:53:45Z

(next FBInk release probably sometime next week, because I'm expecting doom & misery with the Forma and its magic rotation handling...).

Frenzie · 2018-10-19T19:07:55Z

@pazos On Ubuntu you can just install Docker and for the rest you can find the relevant commands in the Makefiles and scripts.

https://github.com/koreader/virdevenv/blob/13c37dcc21d6e8acffe53e0d88e2a6e3562bd169/docker/ubuntu/kokobo/Makefile

You can probably just copy the Kobo almost wholesale.

Uploading it to Docker cloud is a touch trickier in the sense that you need an account, but otherwise also covered by the Makefile. :-)

pazos · 2018-10-25T00:17:25Z

Pinging @Frenzie @NiLuJe for review.

NiLuJe · 2018-10-25T00:45:46Z

What happens, exactly, with FBInk and the stock app?

NiLuJe · 2018-10-25T00:48:10Z

input/input-cervantes.h

+
+    re = ue_init_listener(&listener);
+    if (re < 0) {
+        fprintf(stderr, "[ko-input]: Failed to initilize libue listener, err: %d\n", re);


initialize ;)

NOTE: It's not actually your typo, so if you can fix the same one in input-kobo while you're there, that'd be great ;).

do you mean re > 0 ?

No, I meant initilize -> initialize in the fprintf ;).

ah, that makes sense 👍

NiLuJe · 2018-10-25T00:49:21Z

Generally LGTM otherwise, besides the small inherited typo ;).

pazos · 2018-10-25T01:25:42Z

What happens, exactly, with FBInk and the stock app?

FBInk v1.7.0 for Kobo [Minimalistic build], fbink works nice, clearing the screen with fbink -c "" breaks QBookApp - no more e-ink refreshes, the program keeps polling until 100% cpu and breaks my telnet connection

Didn't strace it, stock reader is completely broken in developers firmware and sometimes crashes by itself.

NiLuJe · 2018-10-25T02:24:32Z

With that version output, you know I'm going to ask if that happens with a proper Cervantes build ;).

NiLuJe · 2018-10-25T02:26:30Z

But that sounds like a 0x0 region manages to get sent to the ioctl, which shouldn't happen, especially with clear, which enforces a full-screen region...

NiLuJe · 2018-10-25T02:34:52Z

After a quick check, nope, the 0x0 region check looks solid, and Cervantes builds don't appear to bypass it (nothing does, really).

The only other thing I can think of is that something doesn't like clear's memset on smem_len, so you can try to replace https://github.com/NiLuJe/FBInk/blob/8d6c857eccf2dec0aa974a8837d355c6e14fa9f5/fbink.c#L458 by memset(fbPtr, v, fInfo.line_length * vInfo.yres_virtual);, and see if that helps?

We've established that that smem_len is weird on 16bpp Kobos already, but it doesn't appear to cause any problems on my end...

NiLuJe · 2018-10-25T13:34:49Z

Did that anyway in NiLuJe/FBInk@0ae5dbc, because it can't hurt ;).

Frenzie

lgtm (besides what's already been pointed out)

pazos · 2018-10-25T19:07:04Z

@NiLuJe: it seems that fbink fails on travis because we need to specify C99. That happens when using linaro toolchains but not using koxtoolchain. Pinging @Frenzie too because it seems that the docker image is relying on a toolchain other than arm-cervantes-linux-gnueabi.

pazos · 2018-10-25T19:09:53Z

Did that anyway in NiLuJe/FBInk@0ae5dbc, because it can't hurt ;).

Will test that later. I debootstrapped a new rootfs just for the fun and have no access to stock reader app now 🙈

Frenzie · 2018-10-25T19:29:12Z

Pinging @Frenzie too because it seems that the docker image is relying on a toolchain other than arm-cervantes-linux-gnueabi.

I merely built and uploaded the Docker image you provided. ;-)

I can sh into the Docker image this weekend, but for the moment I'm more suspicious of your Makefile here.

pazos · 2018-10-25T23:09:59Z

I can sh into the Docker image this weekend, but for the moment I'm more suspicious of your Makefile here.

Not sure if it works but I opened a PR in virdevenv.

pazos · 2018-10-26T19:34:08Z

I reverted the mxcfb headers to match the behaviour of stock reader app (which is pretty conservative and does the same for all devices, see:https://github.com/bq/cervantes-qt/blob/eink-imx508/src/plugins/gfxdrivers/einkfb/linux/mxcfb.h) and squashed commits.

NiLuJe · 2018-10-26T22:44:03Z

Okay, after taking a look at https://github.com/bq/cervantes-qt/blob/eink-imx508/src/plugins/gfxdrivers/einkfb/einkfb.cpp, I can see how my memset could potentially break Qt's little mind ;).

The current approach probably still does, I'll see about that tomorrow...

NiLuJe · 2018-10-27T14:45:28Z

The clear screen issue should be taken care of in NiLuJe/FBInk@10beff8 ;).

Frenzie · 2018-10-27T21:04:53Z

@pazos @NiLuJe Is this PR done now?

pazos · 2018-10-27T21:17:26Z

@Frenzie: I would like to submit a couple more changes in the waveform_modes table since current behaviour with new devices is far from perfect. Give me a couple of hours/days 😄

Frenzie · 2018-10-27T21:20:54Z

No problem. This device can also do OTA updates, right? (See koreader/koreader-misc#19)

pazos · 2018-10-30T18:01:15Z

pinging @NiLuJe about the REAGL stuff. I tried a bunch of flags based on what we are doing on other devices but the result is not good. Also tried newer mxc_wait_for_update_complete ioctl calls without success (I mean it works but doesn't improve anything, making the UI feels slower).

@Frenzie from my end I'm done with this PR, so if you think it is ready to be merged then I will focus on submit a proper frontend stuff.

NiLuJe · 2018-10-30T18:16:28Z

Yeah, I doubt you could get anything great with explicit REAGL calls, only the Aura did on Kobo's side, and even then, it was fairly weird.

Frenzie · 2018-10-30T19:45:13Z

Makefile.defs

+else ifeq ($(TARGET), cervantes)
+	ARM_ARCH:=$(ARMV7_GENERIC_ARCH)
+	ARM_ARCH+=-mfloat-abi=softfp
+    ifeq ($(shell PATH='$(PATH)' $(CC) -dumpmachine 2>/dev/null), arm-linux-gnueabi)


inconsistent indentation

You generally shouldn't use spaces in Makefiles.

same identation as other devices, like kindlepw2, What I should do?

It's not. The other devices use tab as they should while these here are spaces.

@Frenzie Could you please point me to your text editor?. I opened in vim. First two lines are tabs, the ifeq/endif stuff just spaces. The prstux stuff contains spaces too.

Can't fix an error if I can't see it 😢

The kindle & kindlepw2 indents are actually also wrong, which might be the source of the confusion ;).

Note that the space/tab distinction is actually a bit of a mess in this file in general.
I wholeheartedly agree with @Frenzie, which is why I think the few bits with tabs are mostly mine, and the bits with spaces are whatever was there before ;^p.

See the android case for one done right ;).

@pazos

First two lines are tabs, the ifeq/endif stuff just spaces. The prstux stuff contains spaces too.

So prstux is wrong too. ;-) But please leave fixing the others for a separate PR.

@NiLuJe

See the android case for one done right ;).

By pure coincidence that's the one I looked at. (It also happens to be the one I'm responsible for.)

Oh, scratch that I suppose. I see you already fixed it. It'd be cleaner separately though.

No problem, reverted Makefile.defs and squashed again. 👍

Frenzie · 2018-10-30T19:47:41Z

thirdparty/glib/CMakeLists.txt

@@ -23,7 +23,7 @@ ep_get_binary_dir(BINARY_DIR)
 # but fails to actually honor the specified/detected Python version in every cases,
 # sometimes just hoping there's a python binary somewhere in $PATH (which, granted, there should be)...
 # Enforce that to python3 for containers where that's the only available Python version.
-if(($ENV{KINDLE}) OR ($ENV{KOBO}) OR ($ENV{APPIMAGE}))
+if(($ENV{KINDLE}) OR ($ENV{KOBO}) OR ($ENV{CERVANTES}) OR ($ENV{APPIMAGE}))


Ah, I'm too blame for putting AppImage at the end. Could you please fix it?

Frenzie · 2018-10-30T19:48:46Z

thirdparty/libjpeg-turbo/CMakeLists.txt

@@ -31,9 +31,9 @@ set(CFG_OPTS "${CFG_OPTS} -DCMAKE_C_COMPILER='${CMAKE_C_COMPILER}' -DCMAKE_C_COM
 set(CFG_OPTS "${CFG_OPTS} -DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'")

 # c.f., http://trac.ak-team.com/trac/browser/niluje/Configs/trunk/Kindle/Misc/CMakeCross.txt
-if((DEFINED ENV{KINDLE}) OR (DEFINED ENV{LEGACY}) OR (DEFINED ENV{KOBO}) OR (DEFINED ENV{POCKETBOOK}) OR (DEFINED ENV{UBUNTUTOUCH}) OR (DEFINED ENV{SONY_PRSTUX}))
+if((DEFINED ENV{KINDLE}) OR (DEFINED ENV{LEGACY}) OR (DEFINED ENV{KOBO}) OR (DEFINED ENV{POCKETBOOK}) OR (DEFINED ENV{UBUNTUTOUCH}) OR (DEFINED ENV{SONY_PRSTUX}) OR (DEFINED ENV{CERVANTES}))


Just adding things to the end works up to the point where it becomes illegible. ;-)

switching to two lines then

I mean alphabetical; my text editor auto-wraps just fine. :-)

Frenzie · 2018-10-30T19:48:52Z

thirdparty/libjpeg-turbo/CMakeLists.txt

 	set(CFG_OPTS "${CFG_OPTS} -DCMAKE_SYSTEM_NAME='Linux'")
-endif((DEFINED ENV{KINDLE}) OR (DEFINED ENV{LEGACY}) OR (DEFINED ENV{KOBO}) OR (DEFINED ENV{POCKETBOOK}) OR (DEFINED ENV{UBUNTUTOUCH}) OR (DEFINED ENV{SONY_PRSTUX}))
+endif((DEFINED ENV{KINDLE}) OR (DEFINED ENV{LEGACY}) OR (DEFINED ENV{KOBO}) OR (DEFINED ENV{POCKETBOOK}) OR (DEFINED ENV{UBUNTUTOUCH}) OR (DEFINED ENV{SONY_PRSTUX}) OR (DEFINED ENV{CERVANTES}))


Frenzie · 2018-10-31T21:07:14Z

Thanks!

Adds support for devices found in https://blog.bq.com/es/bq-ereaders-developers-program/. Tested on BQ Cervantes 4 (last BQ device from 2017). It adds a new touch input event handler (discussed in #4275) which should work on other single touch devices (ie: Kobo Touch, Mini, Glo, Aura HD) but wasn't tested. Includes base bump with: [feat] Add BQ/Fnac device support (koreader/koreader-base#745)

pazos mentioned this pull request Oct 20, 2018

kobo enhancement: handle usb_storage from within koreader koreader/koreader#2597

Closed

pazos force-pushed the cervantes2 branch from 1634e2e to 4774e94 Compare October 24, 2018 23:58

NiLuJe reviewed Oct 25, 2018

View reviewed changes

Frenzie approved these changes Oct 25, 2018

View reviewed changes

pazos force-pushed the cervantes2 branch 2 times, most recently from 47c4299 to 9c723b0 Compare October 25, 2018 16:34

pazos force-pushed the cervantes2 branch from 54c9094 to 47b3066 Compare October 26, 2018 19:34

Frenzie mentioned this pull request Oct 28, 2018

[BQ Cervantes]: help w/ input. koreader/koreader#4275

Closed

pazos force-pushed the cervantes2 branch from e919f51 to b58f3e0 Compare October 30, 2018 17:55

pazos mentioned this pull request Oct 30, 2018

add support for BQ/Fnac devices koreader/koreader#4294

Merged

Frenzie reviewed Oct 30, 2018

View reviewed changes

add BQ/Fnac device support

d904027

pazos force-pushed the cervantes2 branch from 94ee06e to d904027 Compare October 31, 2018 20:02

Frenzie merged commit f13f1ce into koreader:master Oct 31, 2018

pazos deleted the cervantes2 branch October 31, 2018 23:42

pazos mentioned this pull request Nov 8, 2018

[chore]: Makefile.defs - use tabs everywhere and remove old unused code #752

Merged

frio mentioned this pull request Nov 10, 2018

Cervantes 3 model detection is incorrect #754

Closed

add bq/fnac device support #745

add bq/fnac device support #745

Conversation

pazos commented Oct 19, 2018 • edited Loading

NiLuJe commented Oct 19, 2018

Frenzie commented Oct 19, 2018

pazos commented Oct 25, 2018

NiLuJe commented Oct 25, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NiLuJe commented Oct 25, 2018

pazos commented Oct 25, 2018

NiLuJe commented Oct 25, 2018

NiLuJe commented Oct 25, 2018

NiLuJe commented Oct 25, 2018 • edited Loading

NiLuJe commented Oct 25, 2018

Frenzie left a comment

Choose a reason for hiding this comment

pazos commented Oct 25, 2018

pazos commented Oct 25, 2018

Frenzie commented Oct 25, 2018

pazos commented Oct 25, 2018

pazos commented Oct 26, 2018

NiLuJe commented Oct 26, 2018 • edited Loading

NiLuJe commented Oct 27, 2018

Frenzie commented Oct 27, 2018

pazos commented Oct 27, 2018

Frenzie commented Oct 27, 2018

pazos commented Oct 30, 2018

NiLuJe commented Oct 30, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NiLuJe Oct 31, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Frenzie commented Oct 31, 2018

pazos commented Oct 19, 2018 •

edited

Loading

NiLuJe commented Oct 25, 2018 •

edited

Loading

NiLuJe commented Oct 26, 2018 •

edited

Loading

NiLuJe Oct 31, 2018 •

edited

Loading