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.

Sign up for GitHub

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

Jump to bottom

OutputInterface.java adjustment #68

Merged
merged 4 commits into from
Sep 23, 2023
Merged

OutputInterface.java adjustment #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
230a93c
Add French FR layout
papagon Sep 23, 2023
b17becd
Update strings.xml
papagon Sep 23, 2023
83fc362
Update UsbHidKbd_fr_FR.java
papagon Sep 23, 2023
bd6c2d9
Update OutputInterface.java
papagon Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion authorizer/src/main/java/net/tjado/authorizer/OutputInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package net.tjado.authorizer;

public interface OutputInterface {
public enum Language { en_US, en_GB, de_DE, AppleMac_de_DE, de_CH, fr_CH, neo }
public enum Language { en_US, en_GB, de_DE, AppleMac_de_DE, de_CH, fr_CH, fr_FR, neo }
public boolean setLanguage(OutputInterface.Language lang);
public int sendText(String text) throws Exception;
public int sendReturn() throws Exception;
Expand Down
146 changes: 146 additions & 0 deletions authorizer/src/main/java/net/tjado/authorizer/UsbHidKbd_fr_FR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
/**
* Authorizer
*
* Copyright 2016 by Tjado Mäcke <[email protected]>
* Licensed under GNU General Public License 3.0.
*
* @license GPL-3.0 <https://opensource.org/licenses/GPL-3.0>
*/

package net.tjado.authorizer;


public class UsbHidKbd_fr_FR extends UsbHidKbd {

public UsbHidKbd_fr_FR() {

kbdVal.put(null, new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("a", new byte[] {0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("b", new byte[] {0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("c", new byte[] {0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("d", new byte[] {0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("e", new byte[] {0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("f", new byte[] {0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("g", new byte[] {0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("h", new byte[] {0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("i", new byte[] {0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("j", new byte[] {0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("k", new byte[] {0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("l", new byte[] {0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("m", new byte[] {0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("n", new byte[] {0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("o", new byte[] {0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("p", new byte[] {0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("q", new byte[] {0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("r", new byte[] {0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("s", new byte[] {0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("t", new byte[] {0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("u", new byte[] {0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("v", new byte[] {0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("w", new byte[] {0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("x", new byte[] {0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("y", new byte[] {0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("z", new byte[] {0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("A", new byte[] {0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("B", new byte[] {0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("C", new byte[] {0x02, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("D", new byte[] {0x02, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("E", new byte[] {0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("F", new byte[] {0x02, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("G", new byte[] {0x02, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("H", new byte[] {0x02, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("I", new byte[] {0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("J", new byte[] {0x02, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("K", new byte[] {0x02, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("L", new byte[] {0x02, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("M", new byte[] {0x02, 0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("N", new byte[] {0x02, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("O", new byte[] {0x02, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("P", new byte[] {0x02, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("Q", new byte[] {0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("R", new byte[] {0x02, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("S", new byte[] {0x02, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("T", new byte[] {0x02, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("U", new byte[] {0x02, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("V", new byte[] {0x02, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("W", new byte[] {0x02, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("X", new byte[] {0x02, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("Y", new byte[] {0x02, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("Z", new byte[] {0x02, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("1", new byte[] {0x02, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("2", new byte[] {0x02, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("3", new byte[] {0x02, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("4", new byte[] {0x02, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("5", new byte[] {0x02, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("6", new byte[] {0x02, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("7", new byte[] {0x02, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("8", new byte[] {0x02, 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("9", new byte[] {0x02, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("0", new byte[] {0x02, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("!", new byte[] {0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("@", new byte[] {0x40, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("#", new byte[] {0x40, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("$", new byte[] {0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("%", new byte[] {0x02, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("^", new byte[] {0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("&", new byte[] {0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("*", new byte[] {0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("(", new byte[] {0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(")", new byte[] {0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("return", new byte[] {0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("enter", new byte[] {0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("tab", new byte[] {0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("tabulator", new byte[] {0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("esc", new byte[] {0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("escape", new byte[] {0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("bckspc", new byte[] {0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("backspace", new byte[] {0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("\t", new byte[] {0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(" ", new byte[] {0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("-", new byte[] {0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("=", new byte[] {0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("[", new byte[] {0x40, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("]", new byte[] {0x40, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("\\", new byte[] {0x40, 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(";", new byte[] {0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("'", new byte[] {0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("`", new byte[] {0x40, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(",", new byte[] {0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(".", new byte[] {0x02, 0x00, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("/", new byte[] {0x02, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("_", new byte[] {0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("+", new byte[] {0x02, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("{", new byte[] {0x40, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("}", new byte[] {0x40, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("|", new byte[] {0x40, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(":", new byte[] {0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("\"", new byte[] {0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("~", new byte[] {0x40, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("<", new byte[] {0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put(">", new byte[] {0x02, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00} );
kbdVal.put("?", new byte[] {0x02, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00} );

kbdVal.put("é", new byte[] {0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("è", new byte[] {0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("ç", new byte[] {0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("à", new byte[] {0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("ù", new byte[] {0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("²", new byte[] {0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("°", new byte[] {0x02, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("£", new byte[] {0x02, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("µ", new byte[] {0x02, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("§", new byte[] {0x02, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific

kbdVal.put("^", new byte[] {0x40, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("€", new byte[] {0x40, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
kbdVal.put("¤", new byte[] {0x40, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00} ); // French specific
}

}
3 changes: 3 additions & 0 deletions authorizer/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@
<string name="autotype_lang_german_apple">Deutsch (Apple)</string>
<string name="autotype_lang_swiss_german">Deutsch (CH)</string>
<string name="autotype_lang_swiss_french">Französisch (CH)</string>
<string name="autotype_lang_french_FR">Französisch (FR)</string>
<string name="autotype_lang_neo">Neo 2.0</string>

<string-array name="autotype_lang_titles">
Expand All @@ -717,6 +718,7 @@
<item>@string/autotype_lang_german_apple</item>
<item>@string/autotype_lang_swiss_german</item>
<item>@string/autotype_lang_swiss_french</item>
<item>@string/autotype_lang_french_FR</item>
<item>@string/autotype_lang_neo</item>
</string-array>

Expand All @@ -728,6 +730,7 @@
<item>AppleMac_de_DE</item>
<item>de_CH</item>
<item>fr_CH</item>
<item>fr_FR</item>
<item>neo</item>
</string-array>

Expand Down
3 changes: 3 additions & 0 deletions authorizer/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,7 @@
<string name="autotype_lang_german_apple">German (Apple)</string>
<string name="autotype_lang_swiss_german">German (CH)</string>
<string name="autotype_lang_swiss_french">French (CH)</string>
<string name="autotype_lang_french_FR">French (FR)</string>
<string name="autotype_lang_neo">Neo 2.0</string>

<string-array name="autotype_lang_titles">
Expand All @@ -710,6 +711,7 @@
<item>@string/autotype_lang_german_apple</item>
<item>@string/autotype_lang_swiss_german</item>
<item>@string/autotype_lang_swiss_french</item>
<item>@string/autotype_lang_french_FR</item>
<item>@string/autotype_lang_neo</item>
</string-array>

Expand All @@ -721,6 +723,7 @@
<item>AppleMac_de_DE</item>
<item>de_CH</item>
<item>fr_CH</item>
<item>fr_FR</item>
<item>neo</item>
</string-array>

Expand Down
Loading