From e82e9ce97535bd27cda82f6086653e1297df59b3 Mon Sep 17 00:00:00 2001 From: Aurelio Mannara Date: Sun, 14 Dec 2014 18:09:02 +0100 Subject: [PATCH 1/5] Added CirclePad example This example shows how to get Circle Pad position and prints them on the top screen --- examples/Input/CirclePad/Makefile | 170 +++++++++++++++++++++++ examples/Input/CirclePad/source/main.cpp | 67 +++++++++ 2 files changed, 237 insertions(+) create mode 100755 examples/Input/CirclePad/Makefile create mode 100644 examples/Input/CirclePad/source/main.cpp diff --git a/examples/Input/CirclePad/Makefile b/examples/Input/CirclePad/Makefile new file mode 100755 index 0000000..c4c758e --- /dev/null +++ b/examples/Input/CirclePad/Makefile @@ -0,0 +1,170 @@ +#--------------------------------------------------------------------------------- +.SUFFIXES: +#--------------------------------------------------------------------------------- + +ifeq ($(strip $(DEVKITARM)),) +$(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitARM") +endif + +TOPDIR ?= $(CURDIR) +include $(DEVKITARM)/3ds_rules + +#--------------------------------------------------------------------------------- +# TARGET is the name of the output +# BUILD is the directory where object files & intermediate files will be placed +# SOURCES is a list of directories containing source code +# DATA is a list of directories containing data files +# INCLUDES is a list of directories containing header files +# +# NO_SMDH: if set to anything, no SMDH file is generated. +# APP_TITLE is the name of the app stored in the SMDH file (Optional) +# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional) +# APP_AUTHOR is the author of the app stored in the SMDH file (Optional) +# ICON is the filename of the icon (.png), relative to the project folder. +# If not set, it attempts to use one of the following (in this order): +# - .png +# - icon.png +# - /default_icon.png +#--------------------------------------------------------------------------------- +TARGET := $(notdir $(CURDIR)) +BUILD := build +SOURCES := source +DATA := data +INCLUDES := include + +#--------------------------------------------------------------------------------- +# options for code generation +#--------------------------------------------------------------------------------- +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp + +CFLAGS := -g -Wall -O2 -mword-relocations \ + -fomit-frame-pointer -ffast-math \ + $(ARCH) + +CFLAGS += $(INCLUDE) -DARM11 -D_3DS + +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 + +ASFLAGS := -g $(ARCH) +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) + +LIBS := -lctru -lm + +#--------------------------------------------------------------------------------- +# list of directories containing libraries, this must be the top level containing +# include and lib +#--------------------------------------------------------------------------------- +LIBDIRS := $(CTRULIB) + + +#--------------------------------------------------------------------------------- +# no real need to edit anything past this point unless you need to add additional +# rules for different file extensions +#--------------------------------------------------------------------------------- +ifneq ($(BUILD),$(notdir $(CURDIR))) +#--------------------------------------------------------------------------------- + +export OUTPUT := $(CURDIR)/$(TARGET) +export TOPDIR := $(CURDIR) + +export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ + $(foreach dir,$(DATA),$(CURDIR)/$(dir)) + +export DEPSDIR := $(CURDIR)/$(BUILD) + +CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) +CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) +SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) +BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) + +#--------------------------------------------------------------------------------- +# use CXX for linking C++ projects, CC for standard C +#--------------------------------------------------------------------------------- +ifeq ($(strip $(CPPFILES)),) +#--------------------------------------------------------------------------------- + export LD := $(CC) +#--------------------------------------------------------------------------------- +else +#--------------------------------------------------------------------------------- + export LD := $(CXX) +#--------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------- + +export OFILES := $(addsuffix .o,$(BINFILES)) \ + $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) + +export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ + $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ + -I$(CURDIR)/$(BUILD) + +export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) + +ifeq ($(strip $(ICON)),) + icons := $(wildcard *.png) + ifneq (,$(findstring $(TARGET).png,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).png + else + ifneq (,$(findstring icon.png,$(icons))) + export APP_ICON := $(TOPDIR)/icon.png + endif + endif +else + export APP_ICON := $(TOPDIR)/$(ICON) +endif + +.PHONY: $(BUILD) clean all + +#--------------------------------------------------------------------------------- +all: $(BUILD) + +$(BUILD): + @[ -d $@ ] || mkdir -p $@ + @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile + +#--------------------------------------------------------------------------------- +clean: + @echo clean ... + @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf + + +#--------------------------------------------------------------------------------- +else + +DEPENDS := $(OFILES:.o=.d) + +#--------------------------------------------------------------------------------- +# main targets +#--------------------------------------------------------------------------------- +ifeq ($(strip $(NO_SMDH)),) +.PHONY: all +all : $(OUTPUT).3dsx $(OUTPUT).smdh +endif +$(OUTPUT).3dsx : $(OUTPUT).elf +$(OUTPUT).elf : $(OFILES) + +#--------------------------------------------------------------------------------- +# you need a rule like this for each extension you use as binary data +#--------------------------------------------------------------------------------- +%.bin.o : %.bin +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +# WARNING: This is not the right way to do this! TODO: Do it right! +#--------------------------------------------------------------------------------- +%.vsh.o : %.vsh +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @python $(AEMSTRO)/aemstro_as.py $< ../$(notdir $<).shbin + @bin2s ../$(notdir $<).shbin | $(PREFIX)as -o $@ + @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h + @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h + @echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h + @rm ../$(notdir $<).shbin + +-include $(DEPENDS) + +#--------------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------------- diff --git a/examples/Input/CirclePad/source/main.cpp b/examples/Input/CirclePad/source/main.cpp new file mode 100644 index 0000000..33be170 --- /dev/null +++ b/examples/Input/CirclePad/source/main.cpp @@ -0,0 +1,67 @@ +/* + Circle Pad example made by Aurelio Mannara for ctrulib + Please refer to https://github.com/smealum/ctrulib/blob/master/libctru/include/3ds/services/hid.h for more information + This code was modified for the last time on: 12/13/2014 2:20 UTC+1 + + This wouldn't be possible without the amazing work done by: + -Smealum + -fincs + -WinterMute + -yellows8 + -plutoo + -mtheall + -Many others who worked on 3DS and I'm surely forgetting about +*/ + +#include <3ds.h> +#include + +int main(int argc, char **argv) +{ + // Initialize services + srvInit(); + aptInit(); + gfxInit(); + hidInit(NULL); + + //Initialize console on top screen. Using NULL as the second argument tells the console library to use the internal console structure as current one + consoleInit(GFX_TOP, NULL); + + printf("\x1b[0;0HPress Start to exit."); + printf("\x1b[1;0HCirclePad position:"); + + // Main loop + while (aptMainLoop()) + { + //Scan all the inputs. This should be done once for each frame + hidScanInput(); + + //hidKeysDown returns information about which buttons have been just pressed (and they weren't in the previous frame) + u32 kDown = hidKeysDown(); + + if (kDown & KEY_START) break; // break in order to return to hbmenu + + circlePosition pos; + + //Read the CirclePad position + hidCircleRead(&pos); + + //Print the CirclePad position + printf("\x1b[2;0H%04d; %04d", pos.dx, pos.dy); + + + // Flush and swap framebuffers + gfxFlushBuffers(); + gfxSwapBuffers(); + + //Wait for VBlank + gspWaitForVBlank(); + } + + // Exit services + gfxExit(); + hidExit(); + aptExit(); + srvExit(); + return 0; +} From b4cbe825e76a55dafa166d62941aa1c332bccd0d Mon Sep 17 00:00:00 2001 From: Aurelio Mannara Date: Mon, 15 Dec 2014 09:15:32 +0100 Subject: [PATCH 2/5] Used *.c extension and lower case dir name --- .../CirclePad/source/main.cpp => input/circlepad/source/main.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/{Input/CirclePad/source/main.cpp => input/circlepad/source/main.c} (100%) diff --git a/examples/Input/CirclePad/source/main.cpp b/examples/input/circlepad/source/main.c similarity index 100% rename from examples/Input/CirclePad/source/main.cpp rename to examples/input/circlepad/source/main.c From 5cf80d169088ab592a1642f4ad4eb457a2f272e4 Mon Sep 17 00:00:00 2001 From: Aurelio Mannara Date: Mon, 15 Dec 2014 09:30:23 +0100 Subject: [PATCH 3/5] Used *.c extension and lower case dir name --- examples/{Input/CirclePad => input/circle-pad}/Makefile | 0 examples/input/circle-pad/build.sh | 7 +++++++ examples/input/{circlepad => circle-pad}/source/main.c | 0 3 files changed, 7 insertions(+) rename examples/{Input/CirclePad => input/circle-pad}/Makefile (100%) create mode 100644 examples/input/circle-pad/build.sh rename examples/input/{circlepad => circle-pad}/source/main.c (100%) diff --git a/examples/Input/CirclePad/Makefile b/examples/input/circle-pad/Makefile similarity index 100% rename from examples/Input/CirclePad/Makefile rename to examples/input/circle-pad/Makefile diff --git a/examples/input/circle-pad/build.sh b/examples/input/circle-pad/build.sh new file mode 100644 index 0000000..82d2816 --- /dev/null +++ b/examples/input/circle-pad/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash +export DEVKITARM=/Users/aurelio/Programmazione/NintendoDS/devkitARM +export DEVKITPRO=/Users/aurelio/Programmazione/NintendoDS +export CTRULIB=/Users/aurelio/Programmazione/NintendoDS/ctrulib/libctru +make clean +make +sh copy.sh \ No newline at end of file diff --git a/examples/input/circlepad/source/main.c b/examples/input/circle-pad/source/main.c similarity index 100% rename from examples/input/circlepad/source/main.c rename to examples/input/circle-pad/source/main.c From adeffd27ea8af07d06c3e9f58839e4ae4faad16b Mon Sep 17 00:00:00 2001 From: Aurelio Mannara Date: Mon, 15 Dec 2014 09:59:44 +0100 Subject: [PATCH 4/5] Fixed a little mess I made with dir-names :D --- examples/input/circle-pad/build.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 examples/input/circle-pad/build.sh diff --git a/examples/input/circle-pad/build.sh b/examples/input/circle-pad/build.sh deleted file mode 100644 index 82d2816..0000000 --- a/examples/input/circle-pad/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -export DEVKITARM=/Users/aurelio/Programmazione/NintendoDS/devkitARM -export DEVKITPRO=/Users/aurelio/Programmazione/NintendoDS -export CTRULIB=/Users/aurelio/Programmazione/NintendoDS/ctrulib/libctru -make clean -make -sh copy.sh \ No newline at end of file From 24bceda5096694744dbd831786ced2d8c264ee5e Mon Sep 17 00:00:00 2001 From: Aurelio Mannara Date: Wed, 18 Feb 2015 18:34:58 +0100 Subject: [PATCH 5/5] Merged with Pad example Also updated to make it work with latest ctrulib and devkitARM --- examples/input/circle-pad/Makefile | 2 +- examples/input/circle-pad/source/main.c | 54 +++++++++++++++++++++---- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/examples/input/circle-pad/Makefile b/examples/input/circle-pad/Makefile index c4c758e..c21562a 100755 --- a/examples/input/circle-pad/Makefile +++ b/examples/input/circle-pad/Makefile @@ -35,7 +35,7 @@ INCLUDES := include #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard CFLAGS := -g -Wall -O2 -mword-relocations \ -fomit-frame-pointer -ffast-math \ diff --git a/examples/input/circle-pad/source/main.c b/examples/input/circle-pad/source/main.c index 33be170..bb9c2b3 100644 --- a/examples/input/circle-pad/source/main.c +++ b/examples/input/circle-pad/source/main.c @@ -18,15 +18,26 @@ int main(int argc, char **argv) { + //Matrix containing the name of each key. Useful for printing when a key is pressed + char keysNames[32][32] = { + "KEY_A", "KEY_B", "KEY_SELECT", "KEY_START", + "KEY_DRIGHT", "KEY_DLEFT", "KEY_DUP", "KEY_DDOWN", + "KEY_R", "KEY_L", "KEY_X", "KEY_Y", + "", "", "KEY_ZL", "KEY_ZR", + "", "", "", "", + "KEY_TOUCH", "", "", "", + "KEY_CSTICK_RIGHT", "KEY_CSTICK_LEFT", "KEY_CSTICK_UP", "KEY_CSTICK_DOWN", + "KEY_CPAD_RIGHT", "KEY_CPAD_LEFT", "KEY_CPAD_UP", "KEY_CPAD_DOWN" + }; + // Initialize services - srvInit(); - aptInit(); - gfxInit(); - hidInit(NULL); + gfxInitDefault(); //Initialize console on top screen. Using NULL as the second argument tells the console library to use the internal console structure as current one consoleInit(GFX_TOP, NULL); + u32 kDownOld = 0, kHeldOld = 0, kUpOld = 0; //In these variables there will be information about keys detected in the previous frame + printf("\x1b[0;0HPress Start to exit."); printf("\x1b[1;0HCirclePad position:"); @@ -38,9 +49,40 @@ int main(int argc, char **argv) //hidKeysDown returns information about which buttons have been just pressed (and they weren't in the previous frame) u32 kDown = hidKeysDown(); + //hidKeysHeld returns information about which buttons have are held down in this frame + u32 kHeld = hidKeysHeld(); + //hidKeysUp returns information about which buttons have been just released + u32 kUp = hidKeysUp(); if (kDown & KEY_START) break; // break in order to return to hbmenu + //Do the keys printing only if keys have changed + if (kDown != kDownOld || kHeld != kHeldOld || kUp != kUpOld) + { + //Clear console + consoleClear(); + + //These two lines must be rewritten because we cleared the whole console + printf("\x1b[0;0HPress Start to exit."); + printf("\x1b[1;0HCirclePad position:"); + + printf("\x1b[3;0H"); //Move the cursor to the fourth row because on the third one we'll write the circle pad position + + //Check if some of the keys are down, held or up + int i; + for (i = 0; i < 32; i++) + { + if (kDown & BIT(i)) printf("%s down\n", keysNames[i]); + if (kHeld & BIT(i)) printf("%s held\n", keysNames[i]); + if (kUp & BIT(i)) printf("%s up\n", keysNames[i]); + } + } + + //Set keys old values for the next frame + kDownOld = kDown; + kHeldOld = kHeld; + kUpOld = kUp; + circlePosition pos; //Read the CirclePad position @@ -48,7 +90,6 @@ int main(int argc, char **argv) //Print the CirclePad position printf("\x1b[2;0H%04d; %04d", pos.dx, pos.dy); - // Flush and swap framebuffers gfxFlushBuffers(); @@ -60,8 +101,5 @@ int main(int argc, char **argv) // Exit services gfxExit(); - hidExit(); - aptExit(); - srvExit(); return 0; }