SAMV71-Xult: Add missing NxWM configuration settings; Fix cloning error in C++ support
This commit is contained in:
parent
3bbacad12b
commit
b30ff7ed58
@ -20,7 +20,7 @@ CONFIG_WINDOWS_CYGWIN=y
|
|||||||
#
|
#
|
||||||
# Build Configuration
|
# Build Configuration
|
||||||
#
|
#
|
||||||
CONFIG_APPS_DIR="../apps"
|
# CONFIG_APPS_DIR="../apps"
|
||||||
CONFIG_BUILD_FLAT=y
|
CONFIG_BUILD_FLAT=y
|
||||||
# CONFIG_BUILD_2PASS is not set
|
# CONFIG_BUILD_2PASS is not set
|
||||||
|
|
||||||
@ -373,7 +373,7 @@ CONFIG_PREALLOC_TIMERS=4
|
|||||||
# CONFIG_INIT_NONE is not set
|
# CONFIG_INIT_NONE is not set
|
||||||
CONFIG_INIT_ENTRYPOINT=y
|
CONFIG_INIT_ENTRYPOINT=y
|
||||||
# CONFIG_INIT_FILEPATH is not set
|
# CONFIG_INIT_FILEPATH is not set
|
||||||
CONFIG_USER_ENTRYPOINT="nxwm_maon"
|
CONFIG_USER_ENTRYPOINT="nxwm_main"
|
||||||
CONFIG_RR_INTERVAL=200
|
CONFIG_RR_INTERVAL=200
|
||||||
CONFIG_TASK_NAME_SIZE=0
|
CONFIG_TASK_NAME_SIZE=0
|
||||||
CONFIG_MAX_TASKS=16
|
CONFIG_MAX_TASKS=16
|
||||||
@ -1120,7 +1120,143 @@ CONFIG_NXWIDGETS_DOUBLECLICK_TIME=350
|
|||||||
CONFIG_NXWIDGETS_KBDBUFFER_SIZE=16
|
CONFIG_NXWIDGETS_KBDBUFFER_SIZE=16
|
||||||
CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
|
CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
|
||||||
# CONFIG_NXWIDGET_MEMMONITOR is not set
|
# CONFIG_NXWIDGET_MEMMONITOR is not set
|
||||||
# CONFIG_NXWM is not set
|
CONFIG_NXWM=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM General Settings
|
||||||
|
#
|
||||||
|
# CONFIG_NXWM_LARGE_ICONS is not set
|
||||||
|
CONFIG_NXWM_CUSTOM_FONTID=y
|
||||||
|
CONFIG_NXWM_DEFAULT_FONTID=5
|
||||||
|
CONFIG_NXWM_UNITTEST=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Color configuration
|
||||||
|
#
|
||||||
|
# CONFIG_NXWM_CUSTOM_FILLCOLORS is not set
|
||||||
|
# CONFIG_NXWM_CUSTOM_EDGECOLORS is not set
|
||||||
|
# CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# Background Image
|
||||||
|
#
|
||||||
|
# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
|
||||||
|
CONFIG_NXWM_BACKGROUND_IMAGE="NXWidgets::g_nuttxBitmap160x160"
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Taskbar Configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Horizontal and vertical spacing of icons in the task bar
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_TASKBAR_VSPACING=4
|
||||||
|
CONFIG_NXWM_TASKBAR_HSPACING=4
|
||||||
|
# CONFIG_NXWM_TASKBAR_TOP is not set
|
||||||
|
# CONFIG_NXWM_TASKBAR_BOTTOM is not set
|
||||||
|
CONFIG_NXWM_TASKBAR_LEFT=y
|
||||||
|
# CONFIG_NXWM_TASKBAR_RIGHT is not set
|
||||||
|
# CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
|
||||||
|
# CONFIG_NXWM_TASKBAR_ICONSCALE is not set
|
||||||
|
# CONFIG_NXWM_DISABLE_MINIMIZE is not set
|
||||||
|
# CONFIG_NXWM_TASKBAR_NO_BORDER is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Toolbar Configuration
|
||||||
|
#
|
||||||
|
# CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
|
||||||
|
CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y
|
||||||
|
CONFIG_NXWM_TOOLBAR_FONTID=5
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Application Window Configuration
|
||||||
|
#
|
||||||
|
# CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Start Window Configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Horizontal and vertical spacing of icons in the task bar
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_STARTWINDOW_VSPACING=4
|
||||||
|
CONFIG_NXWM_STARTWINDOW_HSPACING=4
|
||||||
|
# CONFIG_NXWM_CUSTOM_STARTWINDOW_ICON is not set
|
||||||
|
CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm"
|
||||||
|
CONFIG_NXWM_STARTWINDOW_MXMSGS=32
|
||||||
|
CONFIG_NXWM_STARTWINDOW_MXMPRIO=42
|
||||||
|
CONFIG_NXWM_STARTWINDOW_PRIO=100
|
||||||
|
CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxTerm Window Settings
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_NXTERM=y
|
||||||
|
CONFIG_NXWM_NXTERM_PRIO=100
|
||||||
|
CONFIG_NXWM_NXTERM_STACKSIZE=2048
|
||||||
|
# CONFIG_NXWM_NXTERM_CUSTOM_COLORS is not set
|
||||||
|
# CONFIG_NXWM_NXTERM_CUSTOM_FONTID is not set
|
||||||
|
# CONFIG_NXWM_CUSTOM_NXTERM_ICON is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Touchscreen Configuration
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Touchscreen Device Settings
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN_DEVINIT=y
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN_DEVNO=0
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=120
|
||||||
|
CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1536
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Keyboard Configuration
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_KEYBOARD=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Keyboard Device Settings
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/console"
|
||||||
|
# CONFIG_NXWM_KEYBOARD_USBHOST is not set
|
||||||
|
CONFIG_NXWM_KEYBOARD_SIGNO=6
|
||||||
|
CONFIG_NXWM_KEYBOARD_BUFSIZE=16
|
||||||
|
CONFIG_NXWM_KEYBOARD_LISTENERPRIO=120
|
||||||
|
CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Calibration Display Settings
|
||||||
|
#
|
||||||
|
CONFIG_NXWM_CALIBRATION_MARGIN=40
|
||||||
|
# CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
|
||||||
|
CONFIG_NXWM_CALIBRATION_MESSAGES=y
|
||||||
|
CONFIG_NXWM_CALIBRATION_CUSTOM_FONTID=y
|
||||||
|
CONFIG_NXWM_CALIBRATION_FONTID=5
|
||||||
|
CONFIG_NXWM_CALIBRATION_AVERAGE=y
|
||||||
|
CONFIG_NXWM_CALIBRATION_NSAMPLES=2
|
||||||
|
# CONFIG_NXWM_CALIBRATION_DISCARD_MINMAX is not set
|
||||||
|
# CONFIG_NXWM_CALIBRATION_ANISOTROPIC is not set
|
||||||
|
# CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
|
||||||
|
CONFIG_NXWM_CALIBRATION_SIGNO=5
|
||||||
|
CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
|
||||||
|
CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Hex Calculator Display Settings
|
||||||
|
#
|
||||||
|
# CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
|
||||||
|
# CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
|
||||||
|
CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y
|
||||||
|
CONFIG_NXWM_HEXCALCULATOR_FONTID=5
|
||||||
|
|
||||||
|
#
|
||||||
|
# NxWM Media Player Display Settings
|
||||||
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Platform-specific Support
|
# Platform-specific Support
|
||||||
|
@ -43,9 +43,6 @@
|
|||||||
|
|
||||||
#include <nuttx/arch.h>
|
#include <nuttx/arch.h>
|
||||||
|
|
||||||
#include <arch/sama5/chip.h>
|
|
||||||
#include "chip.h"
|
|
||||||
|
|
||||||
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
|
#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
|
||||||
|
|
||||||
/************************************************************************************
|
/************************************************************************************
|
||||||
|
Loading…
Reference in New Issue
Block a user