It's still not game over for nintendo in console market.

[Miyamotoo]

Of course, they already announced NX and when they talked about architecture of NX they mentioned futures consoles too.
And yes, I think they learn from they Wii U mistakes, let face it, Wii U after Virtual Boy is biggest miss for Nintendo and they will surely take some lessons from it.