Merge remote-tracking branch 'origin/master' into develop
commit
0b68c7441a
|
@ -21,11 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
/* USB Device descriptor parameter */
|
/* USB Device descriptor parameter */
|
||||||
#define VENDOR_ID 0x4E58 //"NX"
|
#define VENDOR_ID 0x4E58 //"NX"
|
||||||
#define PRODUCT_ID 0x00DC //220
|
#define PRODUCT_ID 0x0899 //2201
|
||||||
#define DEVICE_VER 0x0001
|
#define DEVICE_VER 0x0001
|
||||||
#define MANUFACTURER Noxary
|
#define MANUFACTURER Noxary
|
||||||
#define PRODUCT 220
|
#define PRODUCT 220
|
||||||
|
|
||||||
|
|
||||||
/* key matrix size */
|
/* key matrix size */
|
||||||
#define MATRIX_ROWS 6
|
#define MATRIX_ROWS 6
|
||||||
#define MATRIX_COLS 4
|
#define MATRIX_COLS 4
|
||||||
|
|
|
@ -20,12 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#include "config_common.h"
|
#include "config_common.h"
|
||||||
|
|
||||||
/* USB Device descriptor parameter */
|
/* USB Device descriptor parameter */
|
||||||
#define VENDOR_ID 0x4E58
|
#define VENDOR_ID 0x4E58 //"NX"
|
||||||
#define PRODUCT_ID 0x003C
|
#define PRODUCT_ID 0x0A29 //2601
|
||||||
#define DEVICE_VER 0x0001
|
#define DEVICE_VER 0x0001
|
||||||
#define MANUFACTURER Noxary
|
#define MANUFACTURER Noxary
|
||||||
#define PRODUCT 260
|
#define PRODUCT 260
|
||||||
|
|
||||||
|
|
||||||
/* key matrix size */
|
/* key matrix size */
|
||||||
#define MATRIX_ROWS 5
|
#define MATRIX_ROWS 5
|
||||||
#define MATRIX_COLS 15
|
#define MATRIX_COLS 15
|
||||||
|
|
|
@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
/* USB Device descriptor parameter */
|
/* USB Device descriptor parameter */
|
||||||
#define VENDOR_ID 0x4E58 //"NX"
|
#define VENDOR_ID 0x4E58 //"NX"
|
||||||
#define PRODUCT_ID 0x010C //268
|
#define PRODUCT_ID 0x0A79 //2681
|
||||||
#define DEVICE_VER 0x0001
|
#define DEVICE_VER 0x0001
|
||||||
#define MANUFACTURER Noxary
|
#define MANUFACTURER Noxary
|
||||||
#define PRODUCT 268
|
#define PRODUCT 268
|
||||||
|
|
|
@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
/* USB Device descriptor parameter */
|
/* USB Device descriptor parameter */
|
||||||
#define VENDOR_ID 0x4E58 //"NX"
|
#define VENDOR_ID 0x4E58 //"NX"
|
||||||
#define PRODUCT_ID 0x010C //268
|
#define PRODUCT_ID 0x0A7A //2682
|
||||||
#define DEVICE_VER 0x0002
|
#define DEVICE_VER 0x0002
|
||||||
#define MANUFACTURER Noxary
|
#define MANUFACTURER Noxary
|
||||||
#define PRODUCT 268.2
|
#define PRODUCT 268.2
|
||||||
|
|
|
@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
/* USB Device descriptor parameter */
|
/* USB Device descriptor parameter */
|
||||||
#define VENDOR_ID 0x4E58 //"NX"
|
#define VENDOR_ID 0x4E58 //"NX"
|
||||||
#define PRODUCT_ID 0x0118 //280
|
#define PRODUCT_ID 0x0AF1 //2801
|
||||||
#define DEVICE_VER 0x0001
|
#define DEVICE_VER 0x0001
|
||||||
#define MANUFACTURER Noxary
|
#define MANUFACTURER Noxary
|
||||||
#define PRODUCT 280
|
#define PRODUCT 280
|
||||||
|
|
|
@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
/* USB Device descriptor parameter */
|
/* USB Device descriptor parameter */
|
||||||
#define VENDOR_ID 0x4E58 //"NX"
|
#define VENDOR_ID 0x4E58 //"NX"
|
||||||
#define PRODUCT_ID 0x010C //268
|
#define PRODUCT_ID 0x0A7B //2683
|
||||||
#define DEVICE_VER 0x0078 //"x"
|
#define DEVICE_VER 0x0078 //"x"
|
||||||
#define MANUFACTURER Noxary
|
#define MANUFACTURER Noxary
|
||||||
#define PRODUCT x268
|
#define PRODUCT x268
|
||||||
|
|
Loading…
Reference in New Issue