diff --git a/.gitignore b/.gitignore index 08254ac..168c520 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ -/3DSsource/build -/3DSsource/*.elf -/3DSsource/*stripped.elf -/3DSsource/.vscode -/3DSsource/.cache -/3DSsource/.gdb_history +build +*.elf +*stripped.elf +.cache +.gdb_history C/build/ *.pnproj *.pnps @@ -11,4 +10,3 @@ C/build/ *.smdh *.elf .vscode/settings.json -/3DSsource/compile_commands.json diff --git a/3DSsource/3DSController.ini b/3DSController.ini similarity index 100% rename from 3DSsource/3DSController.ini rename to 3DSController.ini diff --git a/3DSsource/3DSController-NG.3ds b/3DSsource/3DSController-NG.3ds deleted file mode 100644 index 25361aa..0000000 Binary files a/3DSsource/3DSController-NG.3ds and /dev/null differ diff --git a/3DSsource/3DSController-NG.3dsx b/3DSsource/3DSController-NG.3dsx deleted file mode 100644 index c905d69..0000000 Binary files a/3DSsource/3DSController-NG.3dsx and /dev/null differ diff --git a/3DSsource/3DSController-NG.cia b/3DSsource/3DSController-NG.cia deleted file mode 100644 index 07d4e61..0000000 Binary files a/3DSsource/3DSController-NG.cia and /dev/null differ diff --git a/3DSsource/compile_commands.json b/3DSsource/compile_commands.json deleted file mode 100644 index 9618c84..0000000 --- a/3DSsource/compile_commands.json +++ /dev/null @@ -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" - } -] diff --git a/3DSsource/Makefile b/Makefile similarity index 99% rename from 3DSsource/Makefile rename to Makefile index 2a970ef..11acb4b 100644 --- a/3DSsource/Makefile +++ b/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) diff --git a/3DSsource/cxi/banner.bnr b/cxi/banner.bnr similarity index 100% rename from 3DSsource/cxi/banner.bnr rename to cxi/banner.bnr diff --git a/3DSsource/cxi/banner.png b/cxi/banner.png similarity index 100% rename from 3DSsource/cxi/banner.png rename to cxi/banner.png diff --git a/3DSsource/cxi/build_cia.rsf b/cxi/build_cia.rsf similarity index 100% rename from 3DSsource/cxi/build_cia.rsf rename to cxi/build_cia.rsf diff --git a/3DSsource/cxi/icon.icn b/cxi/icon.icn similarity index 100% rename from 3DSsource/cxi/icon.icn rename to cxi/icon.icn diff --git a/3DSsource/cxi/icon24x24.png b/cxi/icon24x24.png similarity index 100% rename from 3DSsource/cxi/icon24x24.png rename to cxi/icon24x24.png diff --git a/3DSsource/cxi/icon48x48.png b/cxi/icon48x48.png similarity index 100% rename from 3DSsource/cxi/icon48x48.png rename to cxi/icon48x48.png diff --git a/3DSsource/include/drawing.h b/include/drawing.h similarity index 100% rename from 3DSsource/include/drawing.h rename to include/drawing.h diff --git a/3DSsource/include/inet_pton.h b/include/inet_pton.h similarity index 100% rename from 3DSsource/include/inet_pton.h rename to include/inet_pton.h diff --git a/3DSsource/include/input.h b/include/input.h similarity index 100% rename from 3DSsource/include/input.h rename to include/input.h diff --git a/3DSsource/include/keyboard.h b/include/keyboard.h similarity index 100% rename from 3DSsource/include/keyboard.h rename to include/keyboard.h diff --git a/3DSsource/include/settings.h b/include/settings.h similarity index 100% rename from 3DSsource/include/settings.h rename to include/settings.h diff --git a/3DSsource/include/wireless.h b/include/wireless.h similarity index 100% rename from 3DSsource/include/wireless.h rename to include/wireless.h diff --git a/3DSsource/source/drawing.c b/source/drawing.c similarity index 100% rename from 3DSsource/source/drawing.c rename to source/drawing.c diff --git a/3DSsource/source/inet_pton.c b/source/inet_pton.c similarity index 100% rename from 3DSsource/source/inet_pton.c rename to source/inet_pton.c diff --git a/3DSsource/source/input.c b/source/input.c similarity index 100% rename from 3DSsource/source/input.c rename to source/input.c diff --git a/3DSsource/source/keyboard.c b/source/keyboard.c similarity index 100% rename from 3DSsource/source/keyboard.c rename to source/keyboard.c diff --git a/3DSsource/source/main.c b/source/main.c similarity index 68% rename from 3DSsource/source/main.c rename to source/main.c index 5da61e6..f84be24 100644 --- a/3DSsource/source/main.c +++ b/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; } diff --git a/3DSsource/source/settings.c b/source/settings.c similarity index 100% rename from 3DSsource/source/settings.c rename to source/settings.c diff --git a/3DSsource/source/wireless.c b/source/wireless.c similarity index 100% rename from 3DSsource/source/wireless.c rename to source/wireless.c