move code to root directory

.gitignore

@@ -1,9 +1,8 @@
-/3DSsource/build
+build
-/3DSsource/*.elf
+*.elf
-/3DSsource/*stripped.elf
+*stripped.elf
-/3DSsource/.vscode
+.cache
-/3DSsource/.cache
+.gdb_history
-/3DSsource/.gdb_history
 C/build/
 *.pnproj
 *.pnps
@@ -11,4 +10,3 @@ C/build/
 *.smdh
 *.elf
 .vscode/settings.json
-/3DSsource/compile_commands.json

3DSsource/compile_commands.json

@@ -1,184 +0,0 @@
-[
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "drawing.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/drawing.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/drawing.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/drawing.o"
-  },
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "inet_pton.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/inet_pton.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/inet_pton.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/inet_pton.o"
-  },
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "input.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/input.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/input.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/input.o"
-  },
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "keyboard.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/keyboard.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/keyboard.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/keyboard.o"
-  },
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "main.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/main.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/main.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/main.o"
-  },
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "settings.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/settings.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/settings.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/settings.o"
-  },
-  {
-    "arguments": [
-      "/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc",
-      "-g",
-      "-Wall",
-      "-O2",
-      "-mword-relocations",
-      "-fomit-frame-pointer",
-      "-ffast-math",
-      "-fms-extensions",
-      "-march=armv6k",
-      "-mtune=mpcore",
-      "-mfloat-abi=hard",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/include",
-      "-I/opt/devkitpro/libctru/include",
-      "-I/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-      "-D__3DS__",
-      "-c",
-      "-o",
-      "wireless.o",
-      "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/wireless.c"
-    ],
-    "directory": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build",
-    "file": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/source/wireless.c",
-    "output": "/home/fijxu/Documents/gitperomio/3DSController/3DSsource/build/wireless.o"
-  }
-]

Makefile

@@ -42,7 +42,7 @@ ICON			:=	cxi/icon48x48.png
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard
 
-CFLAGS	:=	-g -Wall -O2 -mword-relocations \
+CFLAGS	:=	-g -Wall -O2 \
 			-fomit-frame-pointer -ffast-math \
 			-fms-extensions \
 			$(ARCH)

source/main.c

@@ -10,7 +10,7 @@
 
 #include "drawing.h"
 #include "input.h"
-#include "keyboard.h"
+// #include "keyboard.h"
 #include "settings.h"
 #include "wireless.h"
 
@@ -120,54 +120,6 @@ int main(void) {
 
     clearScreen();
 
-    if ((kHeld & KEY_L) && (kHeld & KEY_R) && (kHeld & KEY_X)) {
-      if (keyboardToggle) {
-        keyboardActive = !keyboardActive;
-        keyboardToggle = false;
-
-        if (keyboardActive) {
-          GSPLCD_PowerOnAllBacklights();
-        } else {
-          GSPLCD_PowerOffAllBacklights();
-        }
-      }
-    } else
-      keyboardToggle = true;
-
-    if (keyboardActive) {
-      drawKeyboard();
-
-      if (touch.px >= 1 && touch.px <= 312 && touch.py >= 78 &&
-          touch.py <= 208) {
-        int x = (int)((float)touch.px * 12.0f / 320.0f);
-        int y = (int)((float)(touch.py - 78) * 12.0f / 320.0f);
-        int width = 24;
-        int height = 24;
-
-        if (keyboardChars[x + y * 12] == ' ') {
-          while (keyboardChars[(x - 1) + y * 12] == ' ')
-            x--;
-
-          width = (int)(5.0f * 320.0f / 12.0f) - 1;
-        }
-
-        else if (keyboardChars[x + y * 12] == '\13') {
-          while (keyboardChars[(x - 1) + y * 12] == '\13')
-            x--;
-          while (keyboardChars[x + (y - 1) * 12] == '\13')
-            y--;
-
-          width = (int)(2.0f * 320.0f / 12.0f) - 1;
-          height = (int)(3.0f * 320.0f / 12.0f) - 1;
-        }
-
-        if (keyboardChars[x + y * 12])
-          drawBox((int)((float)x * 320.0f / 12.0f) + 1,
-                  (int)(78.0f + (float)y * 320.0f / 12.0f) + 1, width, height,
-                  31, 31, 0);
-      }
-    }
-
     sendKeys(kHeld, circlePad, touch, cStick, volume, gyro, accel);
     // drawString(10, 10, "Volume: %x", volume);
     // receiveBuffer(sizeof(struct packet));
@@ -183,16 +135,11 @@ int main(void) {
   }
 
 exit:
-
   GSPLCD_PowerOnAllBacklights();
-
   socExit();
-
   svcCloseHandle(fileHandle);
   fsExit();
-
   gfxExit();
   acExit();
-
   return 0;
 }