Skip to content

Commit

Permalink
nyx-modules: add touchpanel_mtdev
Browse files Browse the repository at this point in the history 
Signed-off-by: Christophe Chapuis <[email protected]>
  • Loading branch information
@Tofee
Tofee committed Nov 2, 2018
1 parent 7e292fc commit aee670a
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 22 deletions.
37 changes: 30 additions & 7 deletions include/internal/msgid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,33 @@
#define MSGID_NYX_MOD_STORAGE_ERR "NYXDEV_STORAGE_ERR"
#define MSGID_NYX_MOD_DEV_INFO_OPEN_ERR "NYXDEV_INFO_OPEN_ERR"

/** Display lib open*/
/*Display lib open*/
#define MSGID_NYX_MOD_DISP_OPEN_ALREADY_ERR "NYXDIS_OPEN_ALREADY_ERR"
#define MSGID_NYX_MOD_DISP_OPEN_ERR "NYXDIS_OPEN_ERR"
#define MSGID_NYX_MOD_DISP_OUT_OF_MEMORY "NYXDIS_OUT_OF_MEM"

/** Security lib open*/
/*Security lib open*/
#define MSGID_NYX_MOD_SECU_OPEN_ERR "NYXSEC_OPEN_ERR"
#define MSGID_NYX_MOD_SECU_OUT_OF_MEMORY "NYXSEC_OUT_OF_MEM"

/** System */
/*System */
#define MSGID_NYX_MOD_SYSTEM_OUT_OF_MEMORY "NYXSYS_OUT_OF_MEM"
#define MSGID_NYX_MOD_SYSTEM_OPEN_ERR "NYXSYS_OPEN_ERR"

/** Mass Storage Mode - MTP */
/*Mass Storage Mode - MTP */
#define MSGID_NYX_MOD_MSMMTP_OPEN_ERR "NYXMSM_OPEN_ERR"

/** Ambient Light Sensor */
/*Ambient Light Sensor */
#define MSGID_NYX_MOD_ALS_ENABLE_ERR "NYXALS_ENABLE_ERR"
#define MSGID_NYX_MOD_ALS_DISABLE_ERR "NYXALS_DISABLE_ERR"
#define MSGID_NYX_MOD_ALS_READ_EVENT_ERR "NYXALS_READ_EVENT_ERR"

/** LED Controller */
/*LED Controller */
#define MSGID_NYX_MOD_LED_NODEVICE_ERR "NYXLED_NODEVICE_ERR"
#define MSGID_NYX_MOD_LED_OPENFILE_ERR "NYXLED_OPENFILE_ERR"
#define MSGID_NYX_MOD_LED_FILE_CONTENT_ERR "NYXLED_FILECONTENT_ERR"

/** Haptics Controller */
/*Haptics Controller */
#define MSGID_NYX_MOD_HAPTICS_ODEVICE_FOUND "NYXHAPTICS_DEVICE_FOUND"
#define MSGID_NYX_MOD_HAPTICS_NODEVICE_ERR "NYXHAPTICS_NODEVICE_ERR"
#define MSGID_NYX_MOD_HAPTICS_NOSPECIAL_EFF "NYXHAPTICS_NOSPECIAL_EFF"
Expand Down Expand Up @@ -126,5 +126,28 @@
#define MSGID_NYX_MOD_TP_TOOMANY_ITEMS_ERR "NYXTP_TOOMANY_ITEMS_ERR"
#define MSGID_NYX_MOD_TP_OUT_OF_MEMORY "NYXTP_OUT_OF_MEM_ERR"
#define MSGID_NYX_MOD_TP_IGNORING_COORD "NYXTP_IGNORING_COORD"
/**Touchpanel mtdev*/
#define MSGID_NYX_QMUX_TP_COORDBUF_ERR "NYXTP_COORDBUF_ERR"
#define MSGID_NYX_QMUX_TP_COORDS_ERR "NYXTP_COORDS_ERR"
#define MSGID_NYX_QMUX_TP_FINGER_WT "NYXTP_FINGER_WT"
#define MSGID_NYX_QMUX_TP_FING_LOW_WT "NYXTP_FING_LOW_WT"
#define MSGID_NYX_QMUX_TP_NOTOUCH_ERR "NYXTP_NOTOUCH_ERR"
#define MSGID_NYX_QMUX_TP_VBOX_OPEN_ERR "NYXTP_VBOX_OPEN_ERR"
#define MSGID_NYX_QMUX_TP_IOCTL_ERR "NYXTP_IOCTL_ERR"
#define MSGID_NYX_QMUX_TP_IOCTL_READ_ERR "NYXTP_IOCTL_READ_ERR"
#define MSGID_NYX_QMUX_TP_IOCTL_REQUEST_ERR "NYXTP_IOCTL_REQUEST_ERR"
#define MSGID_NYX_QMUX_TP_SETPTR_ERR "NYXTP_SETPTR_ERR"
#define MSGID_NYX_QMUX_TP_OPEN_FB_ERR "NYXTP_OPEN_FB_ERR"
#define MSGID_NYX_QMUX_TP_VSCREEN_INFO_ERR "NYXTP_FB_VSCREEN_INFO_ERR"
#define MSGID_NYX_QMUX_TP_OPEN_ERR "NYXTP_OPEN_ERR"
#define MSGID_NYX_QMUX_TP_EVENT_HLIMIT_ERR "NYXTP_EVENT_HLIMIT_ERR"
#define MSGID_NYX_QMUX_TP_EVENT_VLIMIT_ERR "NYXTP_EVENT_VLIMIT_ERR"
#define MSGID_NYX_QMUX_TP_RES_ERR "NYXTP_DP_RES_ERR"
#define MSGID_NYX_QMUX_TP_EVT_READ_ERR "NYXTP_INPUT_EVENT_READ_ERR"
#define MSGID_NYX_QMUX_TP_ABS_ERR "NYXTP_ABS_ERR"
#define MSGID_NYX_QMUX_TP_EVENT_NULL_ERR "NYXTP_EVENT_NULL_ERR"
#define MSGID_NYX_QMUX_TP_INVALID_EVENT "NYXTP_INVALID_EVENT"
#define MSGID_NYX_QMUX_TP_TOOMANY_ITEMS_ERR "NYXTP_TOOMANY_ITEMS_ERR"
#define MSGID_NYX_QMUX_TP_OUT_OF_MEMORY "NYXTP_OUT_OF_MEM_ERR"

#endif // __NYX__MODULES__MESSAGE__LOG_H__
14 changes: 1 addition & 13 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if(NYXMOD_OW_BATTERY OR NYXMOD_OW_CHARGER OR NYXMOD_OW_MSMMTP OR NYXMOD_OW_LED O
endif()

if(NYXMOD_OW_TOUCHPANEL_MTDEV)
pkg_check_modules(MTDEV REQUIRED mtdev)
pkg_check_modules(MTDEV REQUIRED libmtdev)
include_directories(${MTDEV_INCLUDE_DIRS})
webos_add_compiler_flags(ALL ${MTDEV_CFLAGS_OTHER})
endif()
Expand Down Expand Up @@ -104,15 +104,3 @@ endif()
if(NYXMOD_OW_HAPTICS)
add_subdirectory(haptics_timedoutput)
endif()

if(NYXMOD_OW_KEYS)
add_subdirectory(keys)
endif()

if(NYXMOD_OW_TOUCHPANEL)
add_subdirectory(touchpanel)
endif()

if(NYXMOD_OW_TOUCHPANEL_MTDEV)
add_subdirectory(touchpanel_mtdev)
endif()
2 changes: 1 addition & 1 deletion src/touchpanel_mtdev/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@

webos_build_nyx_module(TouchpanelMain
SOURCES touchpanel.c touchpanel_common.c touchpanel_gestures.c
LIBRARIES ${GLIB2_LDFLAGS} ${PMLOG_LDFLAGS} ${NYXLIB_LDFLAGS} ${NYXLIB_LDFLAGS} ${MTDEV_LDFLAGS} -lrt -lpthread)
LIBRARIES ${GLIB2_LDFLAGS} ${PMLOG_LDFLAGS} ${NYXLIB_LDFLAGS} -lrt -lpthread)
1 change: 1 addition & 0 deletions src/touchpanel_mtdev/touchpanel_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ void set_event_params(input_event_t *pEvent, time_stamp_t *pTime, uint16_t type,
uint16_t code, int32_t value);

#endif /* __TOUCHPANEL_COMMON_PRV_H */

2 changes: 1 addition & 1 deletion src/touchpanel_mtdev/touchpanel_gestures.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ int gesture_state_machine_finger(finger_t *finger, input_event_t *events,
if (finger->minDist > 0)
{
//send finger release event
nyx_debug(MSGID_NYX_MOD_TP_FINGER_UP, 0, "Finger up at %d,%d", x, y);
nyx_debug("Finger up at %d,%d", x, y);
set_event_params(&finger->events[finger->numEvents++], &timestamp, EV_KEY,
BTN_TOUCH, 0);
*numEvents = finger->numEvents;
Expand Down

0 comments on commit aee670a

Please sign in to comment.