Slyvtt
/
PythonExtra
forked from Lephenixnoir/PythonExtra
2
0
Fork 0
Code Pull Requests Activity

made fully compatible Ion::keydown() function with key number support + update of documentation accordingly

This commit is contained in:
Sylvain PILLOT 2024-02-10 10:33:44 +01:00
parent 7fdf3aeb2e
commit 0f386bd779
10 changed files with 192 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
docs/sh/NWcompat_modules_en.md
View File

@ -57,56 +57,58 @@ The `ion` module gives access to the `keydown(k)` function which returns True if
The “conversion” of the keys between the Numworks machine and Casio fxCG50 is done according to the following mapping:
| Numworks | Casio fxCG50 |
|----------|--------------|
| KEY_LEFT | KEY_LEFT |
| KEY_UP | KEY_UP |
| KEY_DOWN | KEY_DOWN |
| KEY_RIGHT | KEY_RIGHT |
| KEY_OK | KEY_F1 |
| KEY_BACK | KEY_EXIT |
| KEY_HOME | KEY_MENU |
| KEY_ONOFF | KEY_ACON |
| KEY_SHIFT | KEY_SHIFT |
| KEY_ALPHA | KEY_ALPHA |
| KEY_XNT | KEY_XOT |
| KEY_VAR | KEY_VARS |
| KEY_TOOLBOX | KEY_OPTN |
| KEY_BACKSPACE | KEY_DEL |
| KEY_EXP | KEY_EXP |
| KEY_LN | KEY_LN |
| KEY_LOG | KEY_LOG |
| KEY_IMAGINARY | KEY_F2 |
| KEY_COMMA | KEY_COMMA |
| KEY_POWER | KEY_POWER |
| KEY_SINE | KEY_SIN |
| KEY_COSINE | KEY_COS |
| KEY_TANGENT | KEY_TAN |
| KEY_PI | KEY_F3 |
| KEY_SQRT | KEY_F4 |
| KEY_SQUARE | KEY_SQUARE |
| KEY_SEVEN | KEY_7 |
| KEY_EIGHT | KEY_8 |
| KEY_NINE | KEY_9 |
| KEY_LEFTPARENTHESIS | KEY_LEFTP |
| KEY_RIGHTPARENTHESIS | KEY_RIGHTP |
| KEY_FOUR | KEY_4 |
| KEY_FIVE | KEY_5 |
| KEY_SIX | KEY_6 |
| KEY_MULTIPLICATION | KEY_MUL |
| KEY_DIVISION | KEY_DIV |
| KEY_ONE | KEY_1 |
| KEY_TWO | KEY_2 |
| KEY_THREE | KEY_3 |
| KEY_PLUS | KEY_ADD |
| KEY_MINUS | KEY_SUB |
| KEY_ZERO | KEY_0 |
| KEY_DOT | KEY_DOT |
| KEY_EE | KEY_F5 |
| KEY_ANS | KEY_NEG |
| KEY_EXE | KEY_EXE |
Note: the `keydown(k)` function can theoretically be called on `Numworks` with the corresponding key number (for example 12 for the `KEY_ONOFF` key), but this is not supported by PythonExtra. It is therefore appropriate to explicitly name the keys via their code `KEY_xxx`.
| Numworks | Casio fxCG50 | Numworks Key # |
|----------|--------------|---------------------|
| KEY_LEFT | KEY_LEFT | 0 |
| KEY_UP | KEY_UP | 1 |
| KEY_DOWN | KEY_DOWN | 2 |
| KEY_RIGHT | KEY_RIGHT | 2 |
| KEY_OK | KEY_F1 | 4 |
| KEY_BACK | KEY_EXIT | 5 |
| KEY_HOME | KEY_MENU | 6 |
| KEY_ONOFF | KEY_ACON | 7 |
| ... | ... | ... |
| KEY_SHIFT | KEY_SHIFT | 12 |
| KEY_ALPHA | KEY_ALPHA | 13 |
| KEY_XNT | KEY_XOT | 14 |
| KEY_VAR | KEY_VARS | 15 |
| KEY_TOOLBOX | KEY_OPTN | 16 |
| KEY_BACKSPACE | KEY_DEL | 17 |
| KEY_EXP | KEY_EXP | 17 |
| KEY_LN | KEY_LN | 19 |
| KEY_LOG | KEY_LOG | 20 |
| KEY_IMAGINARY | KEY_F2 | 21 |
| KEY_COMMA | KEY_COMMA | 22 |
| KEY_POWER | KEY_POWER | 23 |
| KEY_SINE | KEY_SIN | 24 |
| KEY_COSINE | KEY_COS | 25 |
| KEY_TANGENT | KEY_TAN | 26 |
| KEY_PI | KEY_F3 | 27 |
| KEY_SQRT | KEY_F4 | 28 |
| KEY_SQUARE | KEY_SQUARE | 29 |
| KEY_SEVEN | KEY_7 | 30 |
| KEY_EIGHT | KEY_8 | 31 |
| KEY_NINE | KEY_9 | 32 |
| KEY_LEFTPARENTHESIS | KEY_LEFTP | 33 |
| KEY_RIGHTPARENTHESIS | KEY_RIGHTP | 34 |
| ... | ... | ... |
| KEY_FOUR | KEY_4 | 36 |
| KEY_FIVE | KEY_5 | 37 |
| KEY_SIX | KEY_6 | 38 |
| KEY_MULTIPLICATION | KEY_MUL | 39 |
| KEY_DIVISION | KEY_DIV | 40 |
| ... | ... | ... |
| KEY_ONE | KEY_1 | 42 |
| KEY_TWO | KEY_2 | 43 |
| KEY_THREE | KEY_3 | 44 |
| KEY_PLUS | KEY_ADD | 45 |
| KEY_MINUS | KEY_SUB | 46 |
| ... | ... | ... |
| KEY_ZERO | KEY_0 | 48 |
| KEY_DOT | KEY_DOT | 49 |
| KEY_EE | KEY_F5 | 50 |
| KEY_ANS | KEY_NEG | 51 |
| KEY_EXE | KEY_EXE | 52 |
## `time`

102
docs/sh/NWcompat_modules_fr.md
View File

@ -57,56 +57,58 @@ Le module `ion` donne accès à la fonction `keydown(k)` qui renvoie True si la
La "conversion" des touches entre la machine Numworks et Casio fxCG50 se fait selon le mapping suivant :
| Numworks | Casio fxCG50 |
|----------|--------------|
| KEY_LEFT | KEY_LEFT |
| KEY_UP | KEY_UP |
| KEY_DOWN | KEY_DOWN |
| KEY_RIGHT | KEY_RIGHT |
| KEY_OK | KEY_F1 |
| KEY_BACK | KEY_EXIT |
| KEY_HOME | KEY_MENU |
| KEY_ONOFF | KEY_ACON |
| KEY_SHIFT | KEY_SHIFT |
| KEY_ALPHA | KEY_ALPHA |
| KEY_XNT | KEY_XOT |
| KEY_VAR | KEY_VARS |
| KEY_TOOLBOX | KEY_OPTN |
| KEY_BACKSPACE | KEY_DEL |
| KEY_EXP | KEY_EXP |
| KEY_LN | KEY_LN |
| KEY_LOG | KEY_LOG |
| KEY_IMAGINARY | KEY_F2 |
| KEY_COMMA | KEY_COMMA |
| KEY_POWER | KEY_POWER |
| KEY_SINE | KEY_SIN |
| KEY_COSINE | KEY_COS |
| KEY_TANGENT | KEY_TAN |
| KEY_PI | KEY_F3 |
| KEY_SQRT | KEY_F4 |
| KEY_SQUARE | KEY_SQUARE |
| KEY_SEVEN | KEY_7 |
| KEY_EIGHT | KEY_8 |
| KEY_NINE | KEY_9 |
| KEY_LEFTPARENTHESIS | KEY_LEFTP |
| KEY_RIGHTPARENTHESIS | KEY_RIGHTP |
| KEY_FOUR | KEY_4 |
| KEY_FIVE | KEY_5 |
| KEY_SIX | KEY_6 |
| KEY_MULTIPLICATION | KEY_MUL |
| KEY_DIVISION | KEY_DIV |
| KEY_ONE | KEY_1 |
| KEY_TWO | KEY_2 |
| KEY_THREE | KEY_3 |
| KEY_PLUS | KEY_ADD |
| KEY_MINUS | KEY_SUB |
| KEY_ZERO | KEY_0 |
| KEY_DOT | KEY_DOT |
| KEY_EE | KEY_F5 |
| KEY_ANS | KEY_NEG |
| KEY_EXE | KEY_EXE |
Note : la fonction `keydown(k)` peut théoriquement être appelée sur `Numworks` avec le numéro de la touche correspondante (par exemple 12 pour la touche `KEY_ONOFF`), mais ceci n'est pas supporté par PythonExtra. Il convient donc de nommer explicitement les touches via leur code `KEY_xxx`.
| Numworks | Casio fxCG50 | Numworks Key # |
|----------|--------------|---------------------|
| KEY_LEFT | KEY_LEFT | 0 |
| KEY_UP | KEY_UP | 1 |
| KEY_DOWN | KEY_DOWN | 2 |
| KEY_RIGHT | KEY_RIGHT | 2 |
| KEY_OK | KEY_F1 | 4 |
| KEY_BACK | KEY_EXIT | 5 |
| KEY_HOME | KEY_MENU | 6 |
| KEY_ONOFF | KEY_ACON | 7 |
| ... | ... | ... |
| KEY_SHIFT | KEY_SHIFT | 12 |
| KEY_ALPHA | KEY_ALPHA | 13 |
| KEY_XNT | KEY_XOT | 14 |
| KEY_VAR | KEY_VARS | 15 |
| KEY_TOOLBOX | KEY_OPTN | 16 |
| KEY_BACKSPACE | KEY_DEL | 17 |
| KEY_EXP | KEY_EXP | 17 |
| KEY_LN | KEY_LN | 19 |
| KEY_LOG | KEY_LOG | 20 |
| KEY_IMAGINARY | KEY_F2 | 21 |
| KEY_COMMA | KEY_COMMA | 22 |
| KEY_POWER | KEY_POWER | 23 |
| KEY_SINE | KEY_SIN | 24 |
| KEY_COSINE | KEY_COS | 25 |
| KEY_TANGENT | KEY_TAN | 26 |
| KEY_PI | KEY_F3 | 27 |
| KEY_SQRT | KEY_F4 | 28 |
| KEY_SQUARE | KEY_SQUARE | 29 |
| KEY_SEVEN | KEY_7 | 30 |
| KEY_EIGHT | KEY_8 | 31 |
| KEY_NINE | KEY_9 | 32 |
| KEY_LEFTPARENTHESIS | KEY_LEFTP | 33 |
| KEY_RIGHTPARENTHESIS | KEY_RIGHTP | 34 |
| ... | ... | ... |
| KEY_FOUR | KEY_4 | 36 |
| KEY_FIVE | KEY_5 | 37 |
| KEY_SIX | KEY_6 | 38 |
| KEY_MULTIPLICATION | KEY_MUL | 39 |
| KEY_DIVISION | KEY_DIV | 40 |
| ... | ... | ... |
| KEY_ONE | KEY_1 | 42 |
| KEY_TWO | KEY_2 | 43 |
| KEY_THREE | KEY_3 | 44 |
| KEY_PLUS | KEY_ADD | 45 |
| KEY_MINUS | KEY_SUB | 46 |
| ... | ... | ... |
| KEY_ZERO | KEY_0 | 48 |
| KEY_DOT | KEY_DOT | 49 |
| KEY_EE | KEY_F5 | 50 |
| KEY_ANS | KEY_NEG | 51 |
| KEY_EXE | KEY_EXE | 52 |
## `time`

2
ports/fxcg50/.gitignore vendored
View File

@ -1,2 +1,2 @@
/icon.xcf
/PythonExtra.g3a
/*.g3a

2
ports/fxcg50/Makefile
View File

@ -6,7 +6,7 @@ SH_LDFLAGS := -T fxcg50.ld -ljustui-cg -lm -lgint-cg -lc -lgint-cg -lgcc
SH_ASSETS := img_modifier_states.png font_9.png font_13.png font_19.png PoliceNW.png
SH_METADATA := fxconv-metadata.txt
SH_CONVFLAGS := --cg
all: PythonExtra.g3a
PythonExtra.g3a: $(BUILD)/firmware.bin icon-uns.png icon-sel.png

BIN
ports/fxcg50/icon-selNW.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
ports/fxcg50/icon-selNWUSB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
ports/fxcg50/icon-unsNW.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
ports/fxcg50/icon-unsNWUSB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

1
ports/sh/.gitignore vendored
View File

@ -1,2 +1,3 @@
/exclude/
/PythonExtra*.zip
/numworks/ion_backup.c

140
ports/sh/numworks/ion.c
View File

@ -25,52 +25,68 @@
// line that are commented correspond to keys that are similar (with exact same
// name) between NW and Casio
//#define KEY_LEFT
//#define KEY_UP
//#define KEY_DOWN
//#define KEY_RIGHT
#define KEY_OK KEY_F1
#define KEY_BACK KEY_EXIT
#define KEY_HOME KEY_MENU
#define KEY_ONOFF KEY_ACON
//#define KEY_SHIFT
//#define KEY_ALPHA
#define KEY_XNT KEY_XOT
#define KEY_VAR KEY_VARS
#define KEY_TOOLBOX KEY_OPTN
#define KEY_BACKSPACE KEY_DEL
//#define KEY_EXP // Note this one may be challenging
//#define KEY_LN
//#define KEY_LOG
#define KEY_IMAGINARY KEY_F2
//#define KEY_COMMA
//#define KEY_POWER
#define KEY_SINE KEY_SIN
#define KEY_COSINE KEY_COS
#define KEY_TANGENT KEY_TAN
#define KEY_PI KEY_F3
#define KEY_SQRT KEY_F4
//#define KEY_SQUARE
#define KEY_SEVEN KEY_7
#define KEY_EIGHT KEY_8
#define KEY_NINE KEY_9
#define KEY_LEFTPARENTHESIS KEY_LEFTP
#define KEY_RIGHTPARENTHESIS KEY_RIGHTP
#define KEY_FOUR KEY_4
#define KEY_FIVE KEY_5
#define KEY_SIX KEY_6
#define KEY_MULTIPLICATION KEY_MUL
#define KEY_DIVISION KEY_DIV
#define KEY_ONE KEY_1
#define KEY_TWO KEY_2
#define KEY_THREE KEY_3
#define KEY_PLUS KEY_ADD
#define KEY_MINUS KEY_SUB
#define KEY_ZERO KEY_0
//#define KEY_DOT
#define KEY_EE KEY_F5
#define KEY_ANS KEY_NEG
//#define KEY_EXE
#define KEY_LEFT 0
#define KEY_UP 1
#define KEY_DOWN 2
#define KEY_RIGHT 3
#define KEY_OK 4
#define KEY_BACK 5
#define KEY_HOME 6
#define KEY_ONOFF 7
/* -- */
#define KEY_SHIFT 12
#define KEY_ALPHA 13
#define KEY_XNT 14
#define KEY_VAR 15
#define KEY_TOOLBOX 16
#define KEY_BACKSPACE 17
#define KEY_EXP 18
#define KEY_LN 19
#define KEY_LOG 20
#define KEY_IMAGINARY 21
#define KEY_COMMA 22
#define KEY_POWER 23
#define KEY_SINE 24
#define KEY_COSINE 25
#define KEY_TANGENT 26
#define KEY_PI 27
#define KEY_SQRT 28
#define KEY_SQUARE 29
#define KEY_SEVEN 30
#define KEY_EIGHT 31
#define KEY_NINE 32
#define KEY_LEFTPARENTHESIS 33
#define KEY_RIGHTPARENTHESIS 34
/* -- */
#define KEY_FOUR 36
#define KEY_FIVE 37
#define KEY_SIX 38
#define KEY_MULTIPLICATION 39
#define KEY_DIVISION 40
/* -- */
#define KEY_ONE 42
#define KEY_TWO 43
#define KEY_THREE 44
#define KEY_PLUS 45
#define KEY_MINUS 46
/* -- */
#define KEY_ZERO 48
#define KEY_DOT 49
#define KEY_EE 50
#define KEY_ANS 51
#define KEY_EXE 52
int KeyTranslationMap[ 53 ] = { 0x85, 0x86, 0x75, 0x76, 0x91, // gint LEFT, UP, DOWN, RIGHT, F1
0x74, 0x84, 0x07, -1, -1, // gint EXIT, MENU, ACON, __, __
-1, -1, 0x81, 0x71, 0x61, // gint __, __, SHIFT, ALPHA, XOT
0x83, 0x82, 0x44, 0x13, 0x63, // gint VARS, OPTN, DEL, EXP, LN
0x62, 0x92, 0x55, 0x73, 0x64, // gint LOG, F2, COMMA, POWER, SIN
0x65, 0x66, 0x93, 0x94, 0x72, // gint COS, TAN, F3, F4, SQUARE
0x41, 0x42, 0x43, 0x53, 0x54, // gint 7, 8, 9, LEFP, RIGHTP
-1, 0x31, 0x32, 0x33, 0x34, // gint __, 4, 5, 6, MUL
0x35, -1, 0x21, 0x22, 0x23, // gint DIV, __, 1, 2, 3
0x24, 0x25, -1, 0x11, 0x12, // gint ADD, SUB, __, 0, DOT
0x95, 0x14, 0x15 }; // gint F5, NEG, EXE
/* END OF KEY TRANSLATION */
@ -92,8 +108,18 @@ STATIC mp_obj_t ion___init__(void) { return mp_const_none; }
STATIC mp_obj_t ion_keydown(mp_obj_t arg1) {
mp_int_t key = mp_obj_get_int(arg1);
if (key < KEY_LEFT || key > KEY_EXE )
return mp_obj_new_bool(false);
int translatedKey = KeyTranslationMap[ key ];
if (translatedKey==-1)
return mp_obj_new_bool(false);
clearevents();
bool down = keydown(key) != 0;
bool down = keydown(translatedKey) != 0;
return mp_obj_new_bool(down);
}
@ -115,7 +141,8 @@ STATIC const mp_rom_map_elem_t ion_module_globals_table[] = {
OBJ(__init__),
/*Numworks keycodes */
/* BE CAREFUL THERE ARE MISSING SLOTS */
INT(KEY_LEFT), // value 0
INT(KEY_UP),
INT(KEY_DOWN),
@ -124,7 +151,7 @@ STATIC const mp_rom_map_elem_t ion_module_globals_table[] = {
INT(KEY_BACK),
INT(KEY_HOME),
INT(KEY_ONOFF), // value 7
INT(KEY_SHIFT), // value 12
INT(KEY_ALPHA),
INT(KEY_XNT),
@ -147,18 +174,21 @@ STATIC const mp_rom_map_elem_t ion_module_globals_table[] = {
INT(KEY_EIGHT),
INT(KEY_NINE),
INT(KEY_LEFTPARENTHESIS),
INT(KEY_RIGHTPARENTHESIS),
INT(KEY_FOUR),
INT(KEY_RIGHTPARENTHESIS), // value 34
INT(KEY_FOUR), // value 36
INT(KEY_FIVE),
INT(KEY_SIX),
INT(KEY_MULTIPLICATION),
INT(KEY_DIVISION),
INT(KEY_ONE),
INT(KEY_DIVISION), // value 40
INT(KEY_ONE), // value 42
INT(KEY_TWO),
INT(KEY_THREE),
INT(KEY_PLUS),
INT(KEY_MINUS),
INT(KEY_ZERO),
INT(KEY_MINUS), // value 46
INT(KEY_ZERO), // value 48
INT(KEY_DOT),
INT(KEY_EE),
INT(KEY_ANS),