mirror of
https://github.com/cathery/sys-con.git
synced 2025-02-04 12:39:49 +00:00
Re-organize the project
This commit is contained in:
cathery
parent
7a6eb0e97d
commit
60c861c0a2
10
.gitignore
vendored
10
.gitignore
vendored
@ -1,5 +1,9 @@
|
||||
buildApplet/*
|
||||
buildSysmodule/*
|
||||
*.d
|
||||
*.o
|
||||
*.lst
|
||||
*.map
|
||||
main
|
||||
out/*
|
||||
*.nro
|
||||
*.nacp
|
||||
*.elf
|
||||
@ -9,5 +13,3 @@ buildSysmodule/*
|
||||
*.code-workspace
|
||||
*.flag
|
||||
*.zip
|
||||
*.xml
|
||||
*.png
|
||||
|
||||
7
.vscode/c_cpp_properties.json
vendored
7
.vscode/c_cpp_properties.json
vendored
@ -3,14 +3,13 @@
|
||||
{
|
||||
"name": "AArch64 libnx",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/build",
|
||||
"${DEVKITPRO}/devkitA64/lib/gcc/aarch64-none-elf/*/include/",
|
||||
"${DEVKITPRO}/devkitA64/aarch64-none-elf/include/",
|
||||
"${DEVKITPRO}/portlibs/switch/include/",
|
||||
"${DEVKITPRO}/libnx/include/",
|
||||
"ControllerUSB/include",
|
||||
"SwitchUSB/include",
|
||||
"inih/"
|
||||
"source/ControllerLib",
|
||||
"source/ControllerSwitch",
|
||||
"source/inih"
|
||||
],
|
||||
"defines": [
|
||||
"SWITCH",
|
||||
|
||||
54
.vscode/tasks.json
vendored
54
.vscode/tasks.json
vendored
@ -2,10 +2,10 @@
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "Build Sysmodule",
|
||||
"label": "Build Release",
|
||||
"type": "shell",
|
||||
"promptOnClose": true,
|
||||
"command": "make sysmodule -j8",
|
||||
"command": "make",
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "shared"
|
||||
@ -27,60 +27,14 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Build Applet",
|
||||
"label": "Clean",
|
||||
"type": "shell",
|
||||
"promptOnClose": true,
|
||||
"command": "make applet -j8",
|
||||
"command": "make clean",
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "shared"
|
||||
},
|
||||
"problemMatcher": {
|
||||
"owner": "cpp",
|
||||
"pattern": {
|
||||
"regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"severity": 4,
|
||||
"message": 5
|
||||
}
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Clean Applet",
|
||||
"type": "shell",
|
||||
"promptOnClose": true,
|
||||
"command": "make cleanApplet -j8",
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "new"
|
||||
},
|
||||
"problemMatcher": {
|
||||
"owner": "cpp",
|
||||
"pattern": {
|
||||
"regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"severity": 4,
|
||||
"message": 5
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Clean Sysmodule",
|
||||
"type": "shell",
|
||||
"promptOnClose": true,
|
||||
"command": "make cleanSysmodule -j8",
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "new"
|
||||
},
|
||||
"problemMatcher": {
|
||||
"owner": "cpp",
|
||||
"pattern": {
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
# ControllerUSB
|
||||
|
||||
Small controller driver library. Since it is up to the user to provide the USB implementation, this library becomes platform independent.
|
||||
248
Makefile
248
Makefile
@ -1,235 +1,19 @@
|
||||
#---------------------------------------------------------------------------------
|
||||
.SUFFIXES:
|
||||
#---------------------------------------------------------------------------------
|
||||
.PHONY: all build clean
|
||||
|
||||
ifeq ($(strip $(DEVKITPRO)),)
|
||||
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
|
||||
endif
|
||||
all: build
|
||||
rm -rf out
|
||||
mkdir -p out/atmosphere/contents/690000000000000D/flags
|
||||
mkdir -p out/config/sys-con
|
||||
mkdir -p out/switch/
|
||||
touch out/atmosphere/contents/690000000000000D/flags/boot2.flag
|
||||
cp source/Sysmodule/sys-con.nsp out/atmosphere/contents/690000000000000D/exefs.nsp
|
||||
cp source/AppletCompanion/sys-con.nro out/switch/sys-con.nro
|
||||
cp -r common/. out/
|
||||
@echo [DONE] sys-con compiled successfully. All files have been placed in out/
|
||||
|
||||
TOPDIR ?= $(CURDIR)
|
||||
include $(DEVKITPRO)/libnx/switch_rules
|
||||
build:
|
||||
$(MAKE) -C source/
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# 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
|
||||
# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
|
||||
#
|
||||
# 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):
|
||||
# - <Project name>.jpg
|
||||
# - icon.jpg
|
||||
# - <libnx folder>/default_icon.jpg
|
||||
#
|
||||
# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
|
||||
# If not set, it attempts to use one of the following (in this order):
|
||||
# - <Project name>.json
|
||||
# - config.json
|
||||
# If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
|
||||
# of a homebrew executable (.nro). This is intended to be used for sysmodules.
|
||||
# NACP building is skipped as well.
|
||||
#---------------------------------------------------------------------------------
|
||||
TARGET := sys-con
|
||||
SOURCES := source SwitchUSB/source ControllerUSB/source ControllerUSB/source/Controllers ControllerUSB/source/Controllers/XboxOneAdapter inih
|
||||
DATA := data
|
||||
INCLUDES := include SwitchUSB/include ControllerUSB/include inih
|
||||
#ROMFS := romfs
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# options for code generation
|
||||
#---------------------------------------------------------------------------------
|
||||
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
|
||||
|
||||
CFLAGS := -g -Wall -O2 -ffunction-sections \
|
||||
$(ARCH) $(DEFINES) $(BUILD_CFLAGS)
|
||||
|
||||
CFLAGS += $(INCLUDE) -D__SWITCH__
|
||||
|
||||
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=c++17
|
||||
|
||||
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_BIN := $(addsuffix .o,$(BINFILES))
|
||||
export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
|
||||
export OFILES := $(OFILES_BIN) $(OFILES_SRC)
|
||||
export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES)))
|
||||
|
||||
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 $(CONFIG_JSON)),)
|
||||
jsons := $(wildcard *.json)
|
||||
ifneq (,$(findstring $(TARGET).json,$(jsons)))
|
||||
export APP_JSON := $(TOPDIR)/$(TARGET).json
|
||||
else
|
||||
ifneq (,$(findstring config.json,$(jsons)))
|
||||
export APP_JSON := $(TOPDIR)/config.json
|
||||
endif
|
||||
endif
|
||||
else
|
||||
export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
|
||||
endif
|
||||
|
||||
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
|
||||
|
||||
ifneq ($(ROMFS),)
|
||||
export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
|
||||
endif
|
||||
|
||||
.PHONY: all buildApplet buildSysmodule applet sysmodule cleanApplet cleanSysmodule
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
all: sysmodule
|
||||
|
||||
buildApplet:
|
||||
@echo building applet ...
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@$(MAKE) --no-print-directory \
|
||||
BUILD=$@ -C $@ -f $(CURDIR)/Makefile \
|
||||
DEPSDIR=$(CURDIR)/$@ \
|
||||
BUILD_CFLAGS="-D__APPLET__" \
|
||||
makeNRO
|
||||
|
||||
buildSysmodule:
|
||||
@echo building sysmodule ...
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@$(MAKE) --no-print-directory \
|
||||
BUILD=$@ -C $@ -f $(CURDIR)/Makefile \
|
||||
DEPSDIR=$(CURDIR)/$@ \
|
||||
makeNSP
|
||||
|
||||
applet: buildApplet
|
||||
|
||||
sysmodule: buildSysmodule
|
||||
|
||||
cleanApplet:
|
||||
@echo clean applet ...
|
||||
@rm -fr buildApplet $(TARGET).nro $(TARGET).nacp $(TARGET).elf
|
||||
|
||||
cleanSysmodule:
|
||||
@echo clean sysmodule ...
|
||||
@rm -fr buildSysmodule exefs.nsp $(TARGET).nsp $(TARGET).nso $(TARGET).npdm $(TARGET).elf
|
||||
|
||||
# Makefile commands
|
||||
#---------------------------------------------------------------------------------
|
||||
else
|
||||
.PHONY: makeNRO makeNSP
|
||||
|
||||
DEPENDS := $(OFILES:.o=.d)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# main targets
|
||||
#---------------------------------------------------------------------------------
|
||||
makeNRO: $(OUTPUT).nro
|
||||
|
||||
makeNSP: $(OUTPUT).nsp
|
||||
|
||||
#TODO: add an option to make exefs.nsp instead of $(OUTPUT).nsp
|
||||
|
||||
ifeq ($(strip $(NO_NACP)),)
|
||||
$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
|
||||
else
|
||||
$(OUTPUT).nro : $(OUTPUT).elf
|
||||
endif
|
||||
|
||||
|
||||
|
||||
$(OUTPUT).nsp : $(OUTPUT).nso $(OUTPUT).npdm
|
||||
|
||||
$(OUTPUT).nso : $(OUTPUT).elf
|
||||
|
||||
$(OUTPUT).elf : $(OFILES)
|
||||
|
||||
$(OFILES_SRC) : $(HFILES_BIN)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# you need a rule like this for each extension you use as binary data
|
||||
#---------------------------------------------------------------------------------
|
||||
%.bin.o %_bin.h : %.bin
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $<)
|
||||
@$(bin2o)
|
||||
|
||||
-include $(DEPENDS)
|
||||
|
||||
#---------------------------------------------------------------------------------------
|
||||
endif
|
||||
#---------------------------------------------------------------------------------------
|
||||
clean:
|
||||
$(MAKE) -C source/ clean
|
||||
rm -rf out
|
||||
@ -1,3 +0,0 @@
|
||||
# SwitchUSB
|
||||
|
||||
Switch implementation for ControllerUSB library.
|
||||
5
common/atmosphere/contents/690000000000000D/toolbox.json
Normal file
5
common/atmosphere/contents/690000000000000D/toolbox.json
Normal file
@ -0,0 +1,5 @@
|
||||
{
|
||||
"name" : "sys-con",
|
||||
"tid" : "690000000000000D",
|
||||
"requires_reboot": false
|
||||
}
|
||||
218
source/AppletCompanion/Makefile
Normal file
218
source/AppletCompanion/Makefile
Normal file
@ -0,0 +1,218 @@
|
||||
#---------------------------------------------------------------------------------
|
||||
.SUFFIXES:
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
ifeq ($(strip $(DEVKITPRO)),)
|
||||
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/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
|
||||
# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
|
||||
#
|
||||
# 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):
|
||||
# - <Project name>.jpg
|
||||
# - icon.jpg
|
||||
# - <libnx folder>/default_icon.jpg
|
||||
#
|
||||
# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
|
||||
# If not set, it attempts to use one of the following (in this order):
|
||||
# - <Project name>.json
|
||||
# - config.json
|
||||
# If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
|
||||
# of a homebrew executable (.nro). This is intended to be used for sysmodules.
|
||||
# NACP building is skipped as well.
|
||||
#---------------------------------------------------------------------------------
|
||||
TARGET := sys-con
|
||||
BUILD := build
|
||||
SOURCES := source
|
||||
DATA := data
|
||||
INCLUDES := include
|
||||
#ROMFS := romfs
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# options for code generation
|
||||
#---------------------------------------------------------------------------------
|
||||
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
|
||||
|
||||
CFLAGS := -g -Wall -O2 -ffunction-sections \
|
||||
$(ARCH) $(DEFINES) $(BUILD_CFLAGS)
|
||||
|
||||
CFLAGS += $(INCLUDE) -D__SWITCH__
|
||||
|
||||
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=c++17
|
||||
|
||||
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_BIN := $(addsuffix .o,$(BINFILES))
|
||||
export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
|
||||
export OFILES := $(OFILES_BIN) $(OFILES_SRC)
|
||||
export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES)))
|
||||
|
||||
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 $(CONFIG_JSON)),)
|
||||
jsons := $(wildcard *.json)
|
||||
ifneq (,$(findstring $(TARGET).json,$(jsons)))
|
||||
export APP_JSON := $(TOPDIR)/$(TARGET).json
|
||||
else
|
||||
ifneq (,$(findstring config.json,$(jsons)))
|
||||
export APP_JSON := $(TOPDIR)/config.json
|
||||
endif
|
||||
endif
|
||||
else
|
||||
export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
|
||||
endif
|
||||
|
||||
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
|
||||
|
||||
ifneq ($(ROMFS),)
|
||||
export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
|
||||
endif
|
||||
|
||||
.PHONY: $(BUILD) clean all
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
all: $(BUILD)
|
||||
|
||||
$(BUILD):
|
||||
@echo building applet companion ...
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@$(MAKE) --no-print-directory \
|
||||
-C $@ -f $(CURDIR)/Makefile \
|
||||
makeNRO
|
||||
|
||||
clean:
|
||||
@echo cleaning applet companion ...
|
||||
@rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf
|
||||
|
||||
# Makefile commands
|
||||
#---------------------------------------------------------------------------------
|
||||
else
|
||||
.PHONY: makeNRO makeNSP
|
||||
|
||||
DEPENDS := $(OFILES:.o=.d)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# main targets
|
||||
#---------------------------------------------------------------------------------
|
||||
makeNRO: $(OUTPUT).nro
|
||||
|
||||
makeNSP: $(OUTPUT).nsp
|
||||
|
||||
#TODO: add an option to make exefs.nsp instead of $(OUTPUT).nsp
|
||||
|
||||
ifeq ($(strip $(NO_NACP)),)
|
||||
$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
|
||||
else
|
||||
$(OUTPUT).nro : $(OUTPUT).elf
|
||||
endif
|
||||
|
||||
|
||||
|
||||
$(OUTPUT).nsp : $(OUTPUT).nso $(OUTPUT).npdm
|
||||
|
||||
$(OUTPUT).nso : $(OUTPUT).elf
|
||||
|
||||
$(OUTPUT).elf : $(OFILES)
|
||||
|
||||
$(OFILES_SRC) : $(HFILES_BIN)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# you need a rule like this for each extension you use as binary data
|
||||
#---------------------------------------------------------------------------------
|
||||
%.bin.o %_bin.h : %.bin
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $<)
|
||||
@$(bin2o)
|
||||
|
||||
-include $(DEPENDS)
|
||||
|
||||
#---------------------------------------------------------------------------------------
|
||||
endif
|
||||
#---------------------------------------------------------------------------------------
|
||||
24
source/AppletCompanion/source/main.cpp
Normal file
24
source/AppletCompanion/source/main.cpp
Normal file
@ -0,0 +1,24 @@
|
||||
#include "switch.h"
|
||||
#include <stdio.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
consoleInit(NULL);
|
||||
|
||||
printf("Hello\n");
|
||||
|
||||
while(appletMainLoop())
|
||||
{
|
||||
hidScanInput();
|
||||
u64 kDown = 0;
|
||||
for (u8 controller = 0; controller < 10; controller++)
|
||||
kDown |= hidKeysDown(static_cast<HidControllerID>(controller));
|
||||
|
||||
if (kDown & KEY_PLUS || kDown & KEY_B)
|
||||
break;
|
||||
consoleUpdate(NULL);
|
||||
}
|
||||
|
||||
consoleExit(NULL);
|
||||
return 0;
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
#include "Controllers/XboxOneAdapter.h"
|
||||
#include "Controllers/XboxOneAdapter/Firmware.h"
|
||||
#include <cmath>
|
||||
#include "../../source/log.h"
|
||||
#include "../../Sysmodule/source/log.h"
|
||||
#include <fstream>
|
||||
#include "cstring"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#include "Controllers/XboxOneController.h"
|
||||
#include <cmath>
|
||||
#include "../../source/log.h"
|
||||
#include "../../Sysmodule/source/log.h"
|
||||
|
||||
static ControllerConfig _xboxoneControllerConfig{};
|
||||
|
||||
16
source/Makefile
Normal file
16
source/Makefile
Normal file
@ -0,0 +1,16 @@
|
||||
COMPONENTS := AppletCompanion Sysmodule
|
||||
TOPTARGETS := all clean
|
||||
|
||||
.PHONY: $(TOPTARGETS) $(COMPONENTS)
|
||||
|
||||
all: $(COMPONENTS)
|
||||
|
||||
AppletCompanion:
|
||||
$(MAKE) -C $@ -j$(nproc)
|
||||
|
||||
Sysmodule:
|
||||
$(MAKE) -C $@ buildSysmodule -j$(nproc)
|
||||
|
||||
clean:
|
||||
$(MAKE) -C AppletCompanion clean
|
||||
$(MAKE) -C Sysmodule cleanSysmodule
|
||||
@ -1,2 +1,2 @@
|
||||
### File structure
|
||||
|
||||
|
||||
|
||||
235
source/Sysmodule/Makefile
Normal file
235
source/Sysmodule/Makefile
Normal file
@ -0,0 +1,235 @@
|
||||
#---------------------------------------------------------------------------------
|
||||
.SUFFIXES:
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
ifeq ($(strip $(DEVKITPRO)),)
|
||||
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/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
|
||||
# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
|
||||
#
|
||||
# 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):
|
||||
# - <Project name>.jpg
|
||||
# - icon.jpg
|
||||
# - <libnx folder>/default_icon.jpg
|
||||
#
|
||||
# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
|
||||
# If not set, it attempts to use one of the following (in this order):
|
||||
# - <Project name>.json
|
||||
# - config.json
|
||||
# If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
|
||||
# of a homebrew executable (.nro). This is intended to be used for sysmodules.
|
||||
# NACP building is skipped as well.
|
||||
#---------------------------------------------------------------------------------
|
||||
TARGET := sys-con
|
||||
SOURCES := source ../ControllerSwitch ../ControllerLib ../ControllerLib/Controllers ../ControllerLib/Controllers/XboxOneAdapter ../inih
|
||||
DATA := data
|
||||
INCLUDES := include ../ControllerSwitch ../ControllerLib ../inih
|
||||
#ROMFS := romfs
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# options for code generation
|
||||
#---------------------------------------------------------------------------------
|
||||
ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
|
||||
|
||||
CFLAGS := -g -Wall -O2 -ffunction-sections \
|
||||
$(ARCH) $(DEFINES) $(BUILD_CFLAGS)
|
||||
|
||||
CFLAGS += $(INCLUDE) -D__SWITCH__
|
||||
|
||||
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=c++17
|
||||
|
||||
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_BIN := $(addsuffix .o,$(BINFILES))
|
||||
export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
|
||||
export OFILES := $(OFILES_BIN) $(OFILES_SRC)
|
||||
export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES)))
|
||||
|
||||
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 $(CONFIG_JSON)),)
|
||||
jsons := $(wildcard *.json)
|
||||
ifneq (,$(findstring $(TARGET).json,$(jsons)))
|
||||
export APP_JSON := $(TOPDIR)/$(TARGET).json
|
||||
else
|
||||
ifneq (,$(findstring config.json,$(jsons)))
|
||||
export APP_JSON := $(TOPDIR)/config.json
|
||||
endif
|
||||
endif
|
||||
else
|
||||
export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
|
||||
endif
|
||||
|
||||
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
|
||||
|
||||
ifneq ($(ROMFS),)
|
||||
export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
|
||||
endif
|
||||
|
||||
.PHONY: all buildApplet buildSysmodule applet sysmodule cleanApplet cleanSysmodule
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
all: sysmodule
|
||||
|
||||
buildApplet:
|
||||
@echo building applet ...
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@$(MAKE) --no-print-directory \
|
||||
BUILD=$@ -C $@ -f $(CURDIR)/Makefile \
|
||||
DEPSDIR=$(CURDIR)/$@ \
|
||||
BUILD_CFLAGS="-D__APPLET__" \
|
||||
makeNRO
|
||||
|
||||
buildSysmodule:
|
||||
@echo building sysmodule ...
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@$(MAKE) --no-print-directory \
|
||||
BUILD=$@ -C $@ -f $(CURDIR)/Makefile \
|
||||
DEPSDIR=$(CURDIR)/$@ \
|
||||
makeNSP
|
||||
|
||||
applet: buildApplet
|
||||
|
||||
sysmodule: buildSysmodule
|
||||
|
||||
cleanApplet:
|
||||
@echo clean applet ...
|
||||
@rm -fr buildApplet $(TARGET).nro $(TARGET).nacp $(TARGET).elf
|
||||
|
||||
cleanSysmodule:
|
||||
@echo clean sysmodule ...
|
||||
@rm -fr buildSysmodule exefs.nsp $(TARGET).nsp $(TARGET).nso $(TARGET).npdm $(TARGET).elf
|
||||
|
||||
# Makefile commands
|
||||
#---------------------------------------------------------------------------------
|
||||
else
|
||||
.PHONY: makeNRO makeNSP
|
||||
|
||||
DEPENDS := $(OFILES:.o=.d)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# main targets
|
||||
#---------------------------------------------------------------------------------
|
||||
makeNRO: $(OUTPUT).nro
|
||||
|
||||
makeNSP: $(OUTPUT).nsp
|
||||
|
||||
#TODO: add an option to make exefs.nsp instead of $(OUTPUT).nsp
|
||||
|
||||
ifeq ($(strip $(NO_NACP)),)
|
||||
$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
|
||||
else
|
||||
$(OUTPUT).nro : $(OUTPUT).elf
|
||||
endif
|
||||
|
||||
|
||||
|
||||
$(OUTPUT).nsp : $(OUTPUT).nso $(OUTPUT).npdm
|
||||
|
||||
$(OUTPUT).nso : $(OUTPUT).elf
|
||||
|
||||
$(OUTPUT).elf : $(OFILES)
|
||||
|
||||
$(OFILES_SRC) : $(HFILES_BIN)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# you need a rule like this for each extension you use as binary data
|
||||
#---------------------------------------------------------------------------------
|
||||
%.bin.o %_bin.h : %.bin
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $<)
|
||||
@$(bin2o)
|
||||
|
||||
-include $(DEPENDS)
|
||||
|
||||
#---------------------------------------------------------------------------------------
|
||||
endif
|
||||
#---------------------------------------------------------------------------------------
|
||||
BIN
source/map.png
Normal file
BIN
source/map.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
1
source/map.xml
Normal file
1
source/map.xml
Normal file
@ -0,0 +1 @@
|
||||
<mxfile host="www.draw.io" modified="2020-01-12T02:01:06.541Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36" etag="Ezp8DI057ywkIkw8MD0n" version="12.5.1" type="device"><diagram name="Page-1" id="9f46799a-70d6-7492-0946-bef42562c5a5">7V3bcto6FP0aHpPx/fJYSNJ0JmeaadrT9tFgAT41FjUigX79kbGEsRBgYkuyKe1Ma8vyTXuvtS/aFj1zMFt9TIP59B8YgrhnaOGqZ971DEPXHQ//l7WsSYvtuHnLJI1C0lY0vER/AGnUSOsyCsGi1BFBGKNoXm4cwSQBI1RqC9IUvpW7jWFcvus8mIC9hpdREO+3fo9CNKUvpmnFgUcQTabk1p5NDgyD0a9JCpcJuV/PMMebP/nhWUCvRfovpkEI33aazPueOUghRPnWbDUAcTa4dNjy8x4OHN0+dwoSVOUEd/b47edYf/kygfHo95/x3NO/3JCrvAbxEtDXcGJ8vf4UH3Im2dYAJiiFcQzSp2hID+P7FD3IC6I1HdTNsIDsxho+/DaNEHiZB6Ps6BvWo+zyaBbjPR1vjqM4HsAYpng/gQnu1F/gG/7aysPGLUEcTRK8PcJvC3DPfhwMQfwMFxGKYOnAK0hRhOX7xHSYRWGYPd+2wwdyySFECM6yB8EvSh8ESzP78/CwfZqdI/4g+7t98eyCYHVQLPpW2BhFAM4ASte4CznB1N1bOz+JQOiGatjbrj46Bu023dFGk8IoIDCYbG9QqALeINpwhmZYZ2nGy1uERtOrcjSsHFvyIKphuPaeavhUBXb1AvNwfb2Y3Iy12ef7KIH96QA9PyZjNLpxD+pFNkIZA+eixK2/lxm39f8FaRgkQdFQaEZ+4pA2zIIouR3N59sDKdsVP/KQ05bfugl9OyAhjhwPCs3yy0JzXQ6eDY7QzAawzJWZ7+4NCgixFSS7MEVTOIFJEN8Xrf3ysBV9niCck8H6DyC0JiY9WCJYHko8gun6R3b+rU13f5LLbXbuVqW9Ndk7KIIFXKZEtw68J/EfgnQC0GkdzsbgqEBTEAcoei17CjzpbE79kKbBeqfDHEYJWuxc+TlrKPTEtst64viMAT+vP97In6DQk+2r1FAdwXDfaNNFwd3RVcPdddTCvQT2AvuNw50O9Em8Z72aBXw9+Sim49bJR/dbJR/63EJIL/eU/41StAzij8EMzIPwMUiw95l2mwdtvcyDpr2NWHaY0JDKhLqm742LDKitIvRjZ3sHaHivwFm2s94FXe4tuZLcJb2qv9Q4PN/lLxU5GaJhlnbcYdo7wT7lYXlH+4vxsHSRLlbONh+GOEoNRgiEz02RDUkFbE+2b7Vb7cbN/lXORJ7JMBEnaubykC0sAPPVWnxplEI9ra5SimnaF0ApVAoCKeXx7kkMkRAKUe/P7LEIJ66TyyKuUmemcGB+7hw56czIIh6nIvFQKbYk1qDPLRCqRZb+MuIMg50wMTVepKF7vPkSUdi01WBTekxvVo3pLa9VOLONq3zK8hGTBN9zgDwmPboHwfxJyVmMlBvwhWzzKviy4J1WAdO5OjX1ZWo0LtN3hVMOO13tHQ+OTvSvHRxxCxs6lXw/VHXAFbdo4vAl8QRXbEanJrUUyY0/crYKLnCZ8Fn3j2dW2P52r0kmODqCQmKvT0XY1fF4y2EE6e3nQeTObztqfHnqMuw4DJUndfTz6KMGK9Aa2pNsbsjx/w0mAarbTGXaAf//XL6xmMSsbh3nG7a/pUtIzNJq6auzW0NzzXZl8Ohzi7Ei3176d+A1whe4LCNiKjciJkdsCh1MeRbCqGohLCEWoi6xn/Aj2e6mI4PX1QSV3eD1qvpGibQtvG4I5vVP2TcJm2tcFLWrDw/sv4TIzapEbreSyM900E0pDrqaLFM3iLyqvlHmbAuR8zy9Jon8Pgnnue5eEo/L9NC5eUslUJSQuKWZl2o1crJZ2mTKuE8WuBlH+4uhaTqEAqtmLiTwxma0jGqfUyljyXTP6NeQVxN7OORWkL2tJVP63GLxeCEB0x4kLdWQdNSUp3cDknZVSDaeLqsHSVsGJC/D9WURacg0kvw5+06Vk8pwmqvWd7ueUtSJLOe+WwbxYgpHv8xLqS1w2clhhxN0ulKBp8Y7bTHw3G4AT+S6NFvgWRcLPJ1j8aQCT1fjg7YYeF43gOcJBN6PIVyZjnapqOMtDCUXdNdiaF6Nc/tBJ3LNgAx0nxNwqaDjzWvIdTENpaA7c35aAujcqpZOyYSIbul8X+ngGgHsCY6MYnZXpB0uuGBxO+02HegGK06NQwiaVCtsqbXC56VSJRCCJ80Kv48RDIfrxx0khOP9xfCBJ9JFKPjg63oOLo8TeCswm4IogW/p1Hy1/I51y96Pct84x+zvUUtd1O9XPjCVDC4r3fyN6n+pwroHpwrhVLgTVDhC6COGk65ThsEuxqv8gwZfbdnrmbF8DdqoWiPRsu+EfJE1El/AYhmjroPKYhhY6qemXNf8L05Kc8ej1ZG6xUzjO6c+FWL7N2xYj42gEBYYwWQcTR6iGLSACer98AVrXpUzgaF2HSGlWTt+1qLq97otydrZirN2RwdRcJQ+2BBD10lhP3VnSYzT+aygNnXXQlY4K6hXzwonXARFrCAy+N5ZDhTE83Zk9BumBZ6zILd88y+eVz+yBlV7M/oau0z3cVZguzNTgmJYwRBZ0U0qbb5HeKDBYtGiyf9a3LD97TUiqBvejzP5UqlBcUpB5WQff0DanVNglq+1zROfQ9pH+4thBqqsV3Nzrk7ldCBdqZi1Dpm1x072N8k6YmLNjchMVf4B0ddpCoKw2xaGTSJyP7BtKFOFd4vfi87lXPwqt3n/Pw==</diagram></mxfile>
|
||||
Loading…
x
Reference in New Issue
Block a user