Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Ambient Mode for 17 inch keyboards #1636

Merged
merged 1 commit into from
Nov 23, 2023
Merged

fix: Ambient Mode for 17 inch keyboards #1636

merged 1 commit into from
Nov 23, 2023

Conversation

Constrat
Copy link
Contributor

No description provided.

@seerge seerge merged commit 8bcac73 into seerge:main Nov 23, 2023
3 checks passed
@seerge
Copy link
Owner

seerge commented Nov 23, 2023

@Constrat great, thanks !

@Kowken can you check on your device w/o numpad if this build still looks ok ?

GHelper.zip

@Constrat
Copy link
Contributor Author

I tried making it the most scalable possible, implementing both the "older" values you had and the "new" values from the .csv of my 17'' model that we used in the ORGB project 17 inch adaptation.

@Kowken
Copy link

Kowken commented Nov 23, 2023

@Constrat great, thanks !

@Kowken can you check on your device w/o numpad if this build still looks ok ?

GHelper.zip

Not gonna lie, it looks worse than before.
image

EDIT: Hold on actually, I'll send more examples because I may be mistaken

@Constrat
Copy link
Contributor Author

Constrat commented Nov 23, 2023

It's a "zone" issue. We should find a way to differentiate between layout sizes (like inORGB)
Instead of the numpad you have the media row.

@seerge
Copy link
Owner

seerge commented Nov 23, 2023

@Constrat or you have accidentally mixed some numbers in the change? :)

@Constrat
Copy link
Contributor Author

Constrat commented Nov 23, 2023

@Constrat or you have accidentally mixed some numbers in the change? :)

I'll check (maybe I left them when I was testing the zone 6 and 7 xD).

@seerge can confirm, I'm dumb and forgot to remove the debugging zones. My bad.
Instead of this:

                    /* VDN   VUP   MICM  HPFN  ARMC  */
                         0,    0,    0,    1,    1,
        /* ESC          F0    F0    F3    F4    F5    F6    F7    F8    F9   F10   F11   F12               NULL  DEL   PAUS  PRT   HOM   */
             0,          0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,                3,   3,    3,    3,    3,
        /* BKTK    1     2     3     4     5     6     7     8     9     0     -     =   BSPC  BSPC  BSPC  PLY   NMLK  NMDV  NMTM  NMMI  */
             0,    0,    0,    0,    5,    4,    6,    7,    1,    1,    2,    2,    2,    2,    2,    2,    3,    3,    3,    3,    3,
        /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \               STP   NM7   NM8   NM9   NMPL  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,                3,    3,    3,    3,    3,
        /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR  ENTR  ENTR  PRV   NM4   NM5   NM6   NMPL  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,    2,    3,    3,    3,    3,    3,
        /* LSFT  ISO\    Z     X     C     V     B     N     M     ,     .     /   RSFT  RSFT  RSFT  ARWU        NM1   NM2   NM3   NMER  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,     2,         3,    3,    3,    3,
        /* LCTL  LFNC  LWIN  LALT              SPC               RALT  RFNC  RCTL        ARWL  ARWD  ARWR              NM0   NMPD  NMER  */
             0,    0,    0,    0,              1,                  1,    2,    2,          2,    2,    2,                3,    3,    3,
        /* LB1   LB1   LB3                                                                                             LB4   LB5   LB6   */
             5,    5,    4,                                                                                              6,    7,    7,
        /* PRT   KSTN  LOGO  LIDL  LIDR  */
             3,    3,    0,    0,    3,

It should be this:

                    /* VDN   VUP   MICM  HPFN  ARMC  */
                         0,    0,    0,    1,    1,
        /* ESC          F0    F0    F3    F4    F5    F6    F7    F8    F9   F10   F11   F12               NULL  DEL   PAUS  PRT   HOM   */
             0,          0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,                3,   3,    3,    3,    3,
        /* BKTK    1     2     3     4     5     6     7     8     9     0     -     =   BSPC  BSPC  BSPC  PLY   NMLK  NMDV  NMTM  NMMI  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,    2,    3,    3,    3,    3,    3,
        /* TAB     Q     W     E     R     T     Y     U     I     O     P     [     ]     \               STP   NM7   NM8   NM9   NMPL  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,                3,    3,    3,    3,    3,
        /* CPLK    A     S     D     F     G     H     J     K     L     ;     "     #   ENTR  ENTR  ENTR  PRV   NM4   NM5   NM6   NMPL  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,    2,    3,    3,    3,    3,    3,
        /* LSFT  ISO\    Z     X     C     V     B     N     M     ,     .     /   RSFT  RSFT  RSFT  ARWU        NM1   NM2   NM3   NMER  */
             0,    0,    0,    0,    0,    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,     2,         3,    3,    3,    3,
        /* LCTL  LFNC  LWIN  LALT              SPC               RALT  RFNC  RCTL        ARWL  ARWD  ARWR              NM0   NMPD  NMER  */
             0,    0,    0,    0,              1,                  1,    2,    2,          2,    2,    2,                3,    3,    3,
        /* LB1   LB1   LB3                                                                                             LB4   LB5   LB6   */
             5,    5,    4,                                                                                              6,    7,    7,
        /* PRT   KSTN  LOGO  LIDL  LIDR  */
             3,    3,    0,    0,    3,

This will fix the wrong number row, but for the keyboard zones I don't have a lot of ideas. In a 17 inch with 4 zones and 20 columns it's a 5-width column. In a 15 inch I have no idea, seems like they have 3 less keys, so I'm guessing a 4-width would look better.

@Kowken
Copy link

Kowken commented Nov 23, 2023

@Constrat great, thanks !

@Kowken can you check on your device w/o numpad if this build still looks ok ?

GHelper.zip

Not gonna lie, it looks worse than before.
image

EDIT: Hold on actually, I'll send more examples because I may be mistaken

imageimage

EDIT: Numkeys 4, 5, 6 and 7 are acting weirdly.
Also this was maybe on the previous version as well but the upper part of heatmap (fkeys and mkey, sometimes arrows) are taking a second before lighting up on this build
imageimage

@Constrat
Copy link
Contributor Author

Constrat commented Nov 23, 2023

Issue identified, dw. I can create a new PR. Mistake on my end.
Actually I can tweak something more.

@Constrat
Copy link
Contributor Author

Constrat commented Nov 23, 2023

@Kowken what's the not lit up key? Next to the Right Shift? Is it next?
Seems like it correct?
The numkeys are already identified, I need your help for other things now.
I haven't worked on the timings for the ambient mode to take effect so this is the wrong place.
Can you remember what was the LED ID for the "NEXT" in the media keys?
Trying to guess it should either be 120 or 121.
Nvm I found your devicecontent from the ORGB discord.

@Kowken
Copy link

Kowken commented Nov 23, 2023

@Kowken what's the not lit up key? Next to the Right Shift? Is it next?

Seems like it correct?

Regarding ambient, all keys light up but it more a matter of how they light up, the 0.134 release made 4 zones but now there are the numkeys 4,5, 6 and 7 that lights up differently from the rest and from each other, also the skip button never lights up.imageimage

@Constrat
Copy link
Contributor Author

Constrat commented Nov 23, 2023

@Kowken It's the fourth time I said this. This was identified, it was a mistake on my end. What I need now is something else xD
NEXT is 121.

@Kowken
Copy link

Kowken commented Nov 23, 2023

@Kowken It's the fourth time I said this. This was identified, it was a mistake on my end. What I need now is something else xD

If you are referring to both issues I mentioned (numkeys and skip) then all my apologies. The shift button look correct though, I'm sure what you are looking for.

@Kowken
Copy link

Kowken commented Nov 23, 2023

@Kowken what's the not lit up key? Next to the Right Shift? Is it next?

Seems like it correct?

The numkeys are already identified, I need your help for other things now.

I haven't worked on the timings for the ambient mode to take effect so this is the wrong place.

Can you remember what was the LED ID for the "NEXT" in the media keys?

Trying to guess it should either be 120 or 121.

Nvm I found your devicecontent from the ORGB discord.

Oh okay I get it now. Yeah I posted that on ORGB, do you still need something else ?

@Constrat
Copy link
Contributor Author

I think I have everything.

  • I've removed the debug from 4, 5, 6, 7
  • Added the NEXT / SKIP key
  • Renamed a NULL (LEDID 37) which is the Delete key for 15 inches

I think this is everything.

@Kowken
Copy link

Kowken commented Nov 23, 2023

I think I have everything.

  • I've removed the debug from 4, 5, 6, 7
  • Added the NEXT / SKIP key
  • Renamed a NULL (LEDID 37) which is the Delete key for 15 inches

I think this is everything.

Okay let me know if you need something else. Have a good day.

seerge added a commit that referenced this pull request Nov 23, 2023
* fix: Ambient Mode for 17 inch keyboards

* fix: removed debugging keys, added "skip" for 15inch, refactor

---------

Co-authored-by: Serge <5920850+seerge@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants