From 97aeaa0033735aeb10263179ca9de8adec72b3a7 Mon Sep 17 00:00:00 2001 From: yellows8 Date: Thu, 22 Feb 2018 02:03:52 -0500 Subject: [PATCH] Imported an updated version of read-controls from 3ds-examples. --- hid/read-controls/Makefile | 183 ++++++++++++++++++++++++++++++++ hid/read-controls/source/main.c | 92 ++++++++++++++++ 2 files changed, 275 insertions(+) create mode 100644 hid/read-controls/Makefile create mode 100644 hid/read-controls/source/main.c diff --git a/hid/read-controls/Makefile b/hid/read-controls/Makefile new file mode 100644 index 0000000..81584e9 --- /dev/null +++ b/hid/read-controls/Makefile @@ -0,0 +1,183 @@ +#--------------------------------------------------------------------------------- +.SUFFIXES: +#--------------------------------------------------------------------------------- + +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") +endif + +TOPDIR ?= $(CURDIR) +include $(DEVKITPRO)/libnx/switch_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 +# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# +# NO_ICON: if set to anything, do not use icon. +# NO_NACP: if set to anything, no .nacp file is generated. +# APP_TITLE is the name of the app stored in the .nacp file (Optional) +# APP_AUTHOR is the author of the app stored in the .nacp file (Optional) +# APP_VERSION is the version of the app stored in the .nacp file (Optional) +# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional) +# ICON is the filename of the icon (.jpg), relative to the project folder. +# If not set, it attempts to use one of the following (in this order): +# - .jpg +# - icon.jpg +# - /default_icon.jpg +#--------------------------------------------------------------------------------- +TARGET := $(notdir $(CURDIR)) +BUILD := build +SOURCES := source +DATA := data +INCLUDES := include +EXEFS_SRC := exefs_src + +#--------------------------------------------------------------------------------- +# options for code generation +#--------------------------------------------------------------------------------- +ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE + +CFLAGS := -g -Wall -O2 -ffunction-sections \ + $(ARCH) $(DEFINES) + +CFLAGS += $(INCLUDE) -DSWITCH + +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 + +ASFLAGS := -g $(ARCH) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) + +LIBS := -lnx + +#--------------------------------------------------------------------------------- +# list of directories containing libraries, this must be the top level containing +# include and lib +#--------------------------------------------------------------------------------- +LIBDIRS := $(PORTLIBS) $(LIBNX) + + +#--------------------------------------------------------------------------------- +# 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) + +export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) + +ifeq ($(strip $(ICON)),) + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif + endif +else + export APP_ICON := $(TOPDIR)/$(ICON) +endif + +ifeq ($(strip $(NO_ICON)),) + export NROFLAGS += --icon=$(APP_ICON) +endif + +ifeq ($(strip $(NO_NACP)),) + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp +endif + +ifneq ($(APP_TITLEID),) + export NACPFLAGS += --titleid=$(APP_TITLEID) +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).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf + + +#--------------------------------------------------------------------------------- +else +.PHONY: all + +DEPENDS := $(OFILES:.o=.d) + +#--------------------------------------------------------------------------------- +# main targets +#--------------------------------------------------------------------------------- +all : $(OUTPUT).pfs0 $(OUTPUT).nro + +$(OUTPUT).pfs0 : $(OUTPUT).nso + +$(OUTPUT).nso : $(OUTPUT).elf + +ifeq ($(strip $(NO_NACP)),) +$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp +else +$(OUTPUT).nro : $(OUTPUT).elf +endif + +$(OUTPUT).elf : $(OFILES) + +#--------------------------------------------------------------------------------- +# you need a rule like this for each extension you use as binary data +#--------------------------------------------------------------------------------- +%.bin.o : %.bin +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +-include $(DEPENDS) + +#--------------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------------- diff --git a/hid/read-controls/source/main.c b/hid/read-controls/source/main.c new file mode 100644 index 0000000..bb452d7 --- /dev/null +++ b/hid/read-controls/source/main.c @@ -0,0 +1,92 @@ +#include +#include + +#include + +//See also libnx hid.h. + +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_X", "KEY_Y", + "KEY_LSTICK", "KEY_RSTICK", "KEY_L", "KEY_R", + "KEY_ZL", "KEY_ZR", "KEY_PLUS", "KEY_MINUS", + "KEY_DLEFT", "KEY_DUP", "KEY_DRIGHT", "KEY_DDOWN", + "KEY_LSTICK_LEFT", "KEY_LSTICK_UP", "KEY_LSTICK_RIGHT", "KEY_LSTICK_DOWN", + "KEY_RSTICK_LEFT", "KEY_RSTICK_UP", "KEY_RSTICK_RIGHT", "KEY_RSTICK_DOWN", + "KEY_SL", "KEY_SR", "KEY_TOUCH", "", + "", "", "", "" + }; + + gfxInitDefault(); + consoleInit(NULL); + + u32 kDownOld = 0, kHeldOld = 0, kUpOld = 0; //In these variables there will be information about keys detected in the previous frame + + printf("\x1b[1;1HPress PLUS to exit."); + printf("\x1b[2;1HLeft joystick position:"); + printf("\x1b[4;1HRight joystick position:"); + + // Main loop + while(appletMainLoop()) + { + //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(CONTROLLER_P1_AUTO); + //hidKeysHeld returns information about which buttons have are held down in this frame + u32 kHeld = hidKeysHeld(CONTROLLER_P1_AUTO); + //hidKeysUp returns information about which buttons have been just released + u32 kUp = hidKeysUp(CONTROLLER_P1_AUTO); + + if (kDown & KEY_PLUS) 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[1;1HPress PLUS to exit."); + printf("\x1b[2;1HLeft joystick position:"); + printf("\x1b[4;1HRight joystick position:"); + + printf("\x1b[6;1H"); //Move the cursor to the sixth row because on the previous ones we'll write the joysticks' 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; + + JoystickPosition pos_left, pos_right; + + //Read the joysticks' position + hidJoystickRead(&pos_left, CONTROLLER_P1_AUTO, JOYSTICK_LEFT); + hidJoystickRead(&pos_right, CONTROLLER_P1_AUTO, JOYSTICK_RIGHT); + + //Print the joysticks' position + printf("\x1b[3;1H%04d; %04d", pos_left.dx, pos_left.dy); + printf("\x1b[5;1H%04d; %04d", pos_right.dx, pos_right.dy); + + gfxFlushBuffers(); + gfxSwapBuffers(); + gfxWaitForVsync(); + } + + gfxExit(); + return 0; +} +