UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Put the keys on the simulator.

Browse Source 
NOTE: I messed up a merge so this si a bad commit.
Change-Id: I80c9bc3f9dd8b1d24069eb0cc87ce7fe15368071
This commit is contained in:
Felix Raimundo
2016-03-21 12:10:19 +01:00
parent 5c82826a34
commit 4e9c33de2d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ion/src/shared/keyboard.c
View File

@@ -1,7 +1,7 @@
#include <ion.h>
#include <string.h>
static const char charForKey[ION_NUMBER_OF_KEYS] = {
static const char kCharForKey[ION_NUMBER_OF_KEYS] = {
'A', 'B', 'C', 'D', 'E',
'F', 'G', 'H', 'I', 'J',
'K', 'L', 'M', 'N', 'O',
@@ -32,7 +32,7 @@ char ion_getchar() {
for (ion_key_t k=0; k<ION_NUMBER_OF_KEYS; k++) {
if (ion_key_down(k)) {
if (key_seen_up[k]) {
return charForKey[k];
return kCharForKey[k];
}
} else {
key_seen_up[k] = 1;

6
ion/src/simulator/keyboard/fltkkbd.cpp
View File

@@ -4,9 +4,7 @@
#define KEYBOARD_ROWS 7
#define KEYBOARD_COLUMNS 5
// TODO(raimundo): do this in a clean way with no duplication.
// A bit ugly but we need a null terminated string from a single char.
static const char* charForKey[KEYBOARD_ROWS * KEYBOARD_COLUMNS] = {
static const char* kCharForKey[KEYBOARD_ROWS * KEYBOARD_COLUMNS] = {
"A", "B", "C", "D", "E",
"F", "G", "H", "I", "J",
"K", "L", "M", "N", "O",
@@ -25,7 +23,7 @@ FltkKbd::FltkKbd(int x, int y, int w, int h) : Fl_Group(x, y, w, h) {
y + (k/KEYBOARD_COLUMNS)*key_height,
key_width,
key_height,
charForKey[k]);
kCharForKey[k]);
}
end();
}