diff --git a/.gitignore b/.gitignore index c6127b3..67f2a46 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.ko *.obj *.elf +*.src # Linker output *.ilk @@ -21,6 +22,8 @@ *.a *.la *.lo +*.8xv +*.8xg # Shared objects (inc. Windows DLLs) *.dll @@ -35,6 +38,7 @@ *.i*86 *.x86_64 *.hex +*.8xp # Debug files *.dSYM/ diff --git a/src/gfx/20231008_172900.jpg b/src/gfx/20231008_172900.jpg deleted file mode 100644 index 31bca4a..0000000 Binary files a/src/gfx/20231008_172900.jpg and /dev/null differ diff --git a/src/gfx/TermFont.png b/src/gfx/TermFont.png index 77cf377..d8102a2 100644 Binary files a/src/gfx/TermFont.png and b/src/gfx/TermFont.png differ diff --git a/src/gfx/convert-fonttiles.py b/src/gfx/convert-fonttiles.py old mode 100644 new mode 100755 diff --git a/src/gfx/normalTermFont.png b/src/gfx/normalTermFont.png deleted file mode 100644 index d8102a2..0000000 Binary files a/src/gfx/normalTermFont.png and /dev/null differ diff --git a/src/main.c b/src/main.c index 3aa176c..2cb0d38 100644 --- a/src/main.c +++ b/src/main.c @@ -96,7 +96,7 @@ uint8_t keyboardState = 0x00; bool newTiles = true; -char keyactions[256] = { +const char* keyactions[1024] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFE, @@ -193,7 +193,7 @@ bool step() { } else if(bytes_read > 0) { idx = 0; char symbol; - char escape_code[16] + char escape_code[16]; while (idx < bytes_read) { symbol = in_buf[idx]; int increment_X = 1; @@ -212,7 +212,7 @@ bool step() { if (symbol == 0x05) { srl_Write(&srl, "TerminalCE", 10); increment_X = 0; - symbol = 0x20 + symbol = 0x20; } if (cursorX >= 40) { cursorX = 0; @@ -231,7 +231,7 @@ bool step() { kb_Scan(); idx8 = 0; idx = 0; - char send[1]; + char send[1] = { 0 }; uint8_t keys = 0; while (idx < 8) { keys = kb_Data[idx]; @@ -239,16 +239,17 @@ bool step() { while (idx8 < 8) { if (keys & 0x01) { if (keyboardState > 3) { keyboardState = 0 ; } - send[1] = keyactions[(64*keyboardState)+(8*idx)+idx8]; + send[0] = keyactions[(256*keyboardState)+(8*idx)+idx8]; } - keys = (keys >> 1) + keys = (keys >> 1); idx8 += 1; } } idx += 1; } - - srl_Write(&srl, send, 1); + if (send[0] != 0) { + srl_Write(&srl, send, 1); + } } return !kb_On; }