Mapping v1

ctlra/ctlra.c

@@ -487,7 +487,7 @@ void ctlra_idle_iter(struct ctlra_t *ctlra)
 
 		time_t secs = now.tv_sec  - dev_iter->screen_last_redraw.tv_sec;
 		long nanos  = now.tv_nsec - dev_iter->screen_last_redraw.tv_nsec;
-		uint64_t nanos_elapsed = secs * 10e9 + nanos;
+		uint64_t nanos_elapsed = secs * 1e9 + nanos;
 		uint64_t fps_in_nanos = 100000000;
 
 		if(dev_iter->screen_redraw_cb && fps_in_nanos < nanos_elapsed) {

ctlra/devices/avtka.c

@@ -147,8 +147,6 @@ event_cb(struct avtka_t *avtka, uint32_t item, float value, void *userdata)
 	uint32_t id   = dev->id_to_ctlra[item].id;
 	uint32_t col  = dev->id_to_ctlra[item].col;
 
-	printf("%s : event\n", __func__);
-
 	/* default type is button */
 	struct ctlra_event_t event = {
 		.type = type,

ctlra/devices/midi_generic.c

@@ -194,4 +194,4 @@ struct ctlra_dev_info_t ctlra_midi_generic_info = {
 	.get_name =  midi_generic_control_get_name,
 };
 
-//CTLRA_DEVICE_REGISTER(midi_generic)
+CTLRA_DEVICE_REGISTER(midi_generic)

ctlra/devices/ni_maschine_mk3.c

@@ -69,7 +69,6 @@ static const char *ni_maschine_mk3_control_names[] = {
 	"Enc. Left",
 	"Enc. Down",
 	"Shift",
-	"Top 8",
 	"A",
 	"B",
 	"C",
@@ -126,15 +125,16 @@ static const char *ni_maschine_mk3_control_names[] = {
 	"Top 5",
 	"Top 6",
 	"Top 7",
+	"Top 8",
 	"Enc. Touch",
-	"Enc. Touch 8",
-	"Enc. Touch 7",
-	"Enc. Touch 6",
-	"Enc. Touch 5",
-	"Enc. Touch 4",
-	"Enc. Touch 3",
-	"Enc. Touch 2",
 	"Enc. Touch 1",
+	"Enc. Touch 2",
+	"Enc. Touch 3",
+	"Enc. Touch 4",
+	"Enc. Touch 5",
+	"Enc. Touch 6",
+	"Enc. Touch 7",
+	"Enc. Touch 8",
 };
 #define CONTROL_NAMES_SIZE (sizeof(ni_maschine_mk3_control_names) /\
 			    sizeof(ni_maschine_mk3_control_names[0]))
@@ -146,9 +146,8 @@ static const struct ni_maschine_mk3_ctlra_t buttons[] = {
 	{1, 1, 0x04},
 	{1, 1, 0x20},
 	{1, 1, 0x10},
-	/* shift, top right above screen */
+	/* shift */
 	{1, 1, 0x40},
-	{1, 1, 0x80},
 	/* group buttons ABCDEFGH */
 	{1, 2, 0x01},
 	{1, 2, 0x02},
@@ -218,32 +217,35 @@ static const struct ni_maschine_mk3_ctlra_t buttons[] = {
 	{1, 9, 0x10},
 	{1, 9, 0x20},
 	{1, 9, 0x40},
+	// AG: note that "Top 8" is actually stored in the first byte, NI
+	// probably crammed it in there to save an extra byte
+	{1, 1, 0x80},
 	/* Encoder Touch */
 	{1, 9, 0x80},
-	/* Dial touch 8 - 1 */
-	{1, 10, 0x01},
-	{1, 10, 0x02},
-	{1, 10, 0x04},
-	{1, 10, 0x08},
-	{1, 10, 0x10},
-	{1, 10, 0x20},
-	{1, 10, 0x40},
+	/* Dial touch 1 - 8 (reverse order in data) */
 	{1, 10, 0x80},
+	{1, 10, 0x40},
+	{1, 10, 0x20},
+	{1, 10, 0x10},
+	{1, 10, 0x08},
+	{1, 10, 0x04},
+	{1, 10, 0x02},
+	{1, 10, 0x01},
 };
 #define BUTTONS_SIZE (sizeof(buttons) / sizeof(buttons[0]))
 
 #define MK3_BTN (CTLRA_ITEM_BUTTON | CTLRA_ITEM_LED_INTENSITY | CTLRA_ITEM_HAS_FB_ID)
+#define MK3_BTN_NOFB (CTLRA_ITEM_BUTTON | CTLRA_ITEM_LED_INTENSITY)
 static struct ctlra_item_info_t buttons_info[] = {
 	/* TODO: represent encoders better in the UI */
 	/* encoder press, right up left down */
-	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	/* shift, top-right above screen (mad ordering..) */
+	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 60},
+	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 58},
+	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 59},
+	{.x = 21, .y = 138, .w = 18,  .h = 10, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 61},
+	/* shift */
 	{.x =  94, .y = 268, .w = 24, .h = 14, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 44},
-	{.x = 278, .y =  10, .w = 24, .h =  8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 19},
 	/* group ABCDEFGH */
 	{.x =  9, .y = 210, .w = 24,  .h = 14, .flags = MK3_BTN, .colour = 0xffffffff, .fb_id = 29},
 	{.x = 37, .y = 210, .w = 24,  .h = 14, .flags = MK3_BTN, .colour = 0xffffffff, .fb_id = 30},
@@ -278,7 +280,7 @@ static struct ctlra_item_info_t buttons_info[] = {
 	{.x = 137, .y = 248, .w = 24, .h = 14, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 56},
 	{.x = 137, .y = 266, .w = 24, .h = 14, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 57},
 	/* Pitch, Mod, Perform */
-	{.x =  9, .y = 170, .w = 24, .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
+	{.x =  9, .y = 170, .w = 24, .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 25},
 	{.x = 37, .y = 170, .w = 24, .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 26},
 	{.x = 65, .y = 170, .w = 24, .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 27},
 	/* restart, erase, tap, follow */
@@ -304,26 +306,27 @@ static struct ctlra_item_info_t buttons_info[] = {
 	{.x = 9, .y =  62, .w = 24, .h =  8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 6},
 	{.x = 9, .y =  74, .w = 24, .h =  8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 8},
 	{.x = 9, .y =  86, .w = 24, .h =  8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 10},
-	/* Top buttons (7, 8 already above) */
+	/* Top buttons */
 	{.x =  82, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 12},
 	{.x = 110, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 13},
 	{.x = 138, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 14},
 	{.x = 166, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 15},
 	{.x = 194, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 16},
 	{.x = 222, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 17},
 	{.x = 250, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 18},
-	{.x = 278, .y = 10, .w = 24,  .h = 8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 19},
+	{.x = 278, .y =  10, .w = 24, .h =  8, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 19},
 	/* TODO: show encoder dial touch control */
 	/* big dial encoder touch */
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
 	/* 1-8 dial encoder touch */
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
-	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
+	{.x = 1, .y = 1, .w = 1, .h = 1, .flags = MK3_BTN_NOFB, .colour = 0xff000000, .fb_id = 0},
 };
 
 static struct ctlra_item_info_t sliders_info[] = {
@@ -424,7 +427,10 @@ struct ni_maschine_mk3_t {
 	/* base handles usb i/o etc */
 	struct ctlra_dev_t base;
 	/* current value of each controller is stored here */
-	float hw_values[CONTROLS_SIZE];
+	// AG: These appear to spit out some random values initially, which we
+	// just record on the first run without passing them on. Same applies
+	// to the big encoder and the touchstrip below.
+	float hw_values[CONTROLS_SIZE], hw_init[CONTROLS_SIZE];
 	/* current state of the lights, only flush on dirty */
 	uint8_t lights_dirty;
 	uint8_t lights_pads_dirty;
@@ -440,8 +446,8 @@ struct ni_maschine_mk3_t {
 	/* state of the pedal, according to the hardware */
 	uint8_t pedal;
 
-	uint8_t encoder_value;
-	uint16_t touchstrip_value;
+	uint8_t encoder_value, encoder_init;
+	uint16_t touchstrip_value, touchstrip_init;
 	/* Pressure filtering for note-onset detection */
 	uint64_t pad_last_msg_time;
 	uint16_t pad_hit;
@@ -462,6 +468,15 @@ ni_maschine_mk3_control_get_name(enum ctlra_event_type_t type,
 		return encoder_names[control_id];
 	if(type == CTLRA_EVENT_SLIDER && control_id == 0)
 		return "Touchstrip";
+	if(type == CTLRA_EVENT_GRID && control_id == 0)
+		return "Pad Grid";
+	if(type == CTLRA_FEEDBACK_ITEM) {
+		if(control_id == 0)
+			return "Left Screen";
+		else
+			return "Right Screen";
+	}
+
 	return 0;
 }
 
@@ -540,9 +555,7 @@ ni_maschine_mk3_pads_decode_set(struct ni_maschine_mk3_t *dev,
 		if(current == new)
 			continue;
 
-		/* rotate grid to match order on device (but zero
-		 * based counting instead of 1 based). */
-		event.grid.pos = (3-(i/4))*4 + (i%4);
+		event.grid.pos = i;
 		int press = new > 0;
 		event.grid.pressed = press;
 		event.grid.pressure = pad_pressures[i] * (1 / 4096.f) * press;
@@ -624,9 +637,12 @@ ni_maschine_mk3_usb_read_cb(struct ctlra_dev_t *base,
 		break;
 	case 42: {
 		/* pedal */
-		int pedal = buf[3] > 0;
+		// AG: 0x40 = bit mask for pedal; we *must* test for this
+		// specific value, since other bits of this byte may also be
+		// set by some of the buttons (see below)
+		int pedal = buf[3] & 0x40;
 		if(pedal != dev->pedal) {
-			printf("PEDAL: %d, inv = %d\n", pedal, !pedal);
+			//printf("PEDAL: %d, inv = %d\n", pedal, !pedal);
 			struct ctlra_event_t event[] = {
 				{ .type = CTLRA_EVENT_BUTTON,
 				  .button  = {
@@ -650,7 +666,10 @@ ni_maschine_mk3_usb_read_cb(struct ctlra_dev_t *base,
 
 		/* touchstrip: dont send event if 0, as this is release */
 		uint16_t v = *((uint16_t *)&buf[30]);
-		if(v && v != dev->touchstrip_value) {
+		if(!dev->touchstrip_init) {
+			dev->touchstrip_value = v;
+			dev->touchstrip_init = 1;
+		} else if(v && v != dev->touchstrip_value) {
 			struct ctlra_event_t event = {
 				.type = CTLRA_EVENT_SLIDER,
 				.slider = {
@@ -670,7 +689,16 @@ ni_maschine_mk3_usb_read_cb(struct ctlra_dev_t *base,
 			int offset = buttons[i].buf_byte_offset;
 			int mask   = buttons[i].mask;
 
+#if 0
+// AG XXXFIXME: Why should we read a 16 bit value here, only to mask out the
+// MSB immediately? (Note that all the button masks are single-byte.) Also,
+// the byte offsets for the various buttons are consecutive, so we'd actually
+// be reading overlapping values here. This just doesn't make any sense to me.
 			uint16_t v = *((uint16_t *)&buf[offset]) & mask;
+#else
+// This should work just as well.
+			uint16_t v = buf[offset] & mask;
+#endif
 			int value_idx = i;
 
 			if(dev->hw_values[value_idx] != v) {
@@ -695,7 +723,10 @@ ni_maschine_mk3_usb_read_cb(struct ctlra_dev_t *base,
 			const float value = v / 1000.f;
 			const uint8_t idx = BUTTONS_SIZE + i;
 
-			if(dev->hw_values[idx] != value) {
+			if(!dev->hw_init[idx]) {
+				dev->hw_values[idx] = value;
+				dev->hw_init[idx] = 1;
+			} else if(dev->hw_values[idx] != value) {
 				const float d = (value - dev->hw_values[idx]);
 				if(fabsf(d) > 0.7) {
 					/* wrap around */
@@ -729,7 +760,10 @@ ni_maschine_mk3_usb_read_cb(struct ctlra_dev_t *base,
 		};
 		struct ctlra_event_t *e = {&event};
 		int8_t enc   = buf[11] & 0x0f;
-		if(enc != dev->encoder_value) {
+		if(!dev->encoder_init) {
+			dev->encoder_value = enc;
+			dev->encoder_init = 1;
+		} else if(enc != dev->encoder_value) {
 			int dir = ctlra_dev_encoder_wrap_16(enc, dev->encoder_value);
 			event.encoder.delta = dir;
 			dev->encoder_value = enc;
@@ -751,8 +785,7 @@ static void ni_maschine_mk3_light_set(struct ctlra_dev_t *base,
 	if(!dev)
 		return;
 
-	// TODO: debug the -1, why is it required to get the right size?
-	if(light_id > (LIGHTS_SIZE + 25 + 16) - 1)
+	if(light_id >= (LIGHTS_SIZE + 25 + 16))
 		return;
 
 	int idx = light_id;

ctlra/event.c

@@ -1,9 +1,18 @@
 #include <stdint.h>
 #include "event.h"
+#include "impl.h"
 
 const char *ctlra_event_type_names[] = {
 	"Button",
 	"Encoder",
 	"Slider",
 	"Grid",
+	"Feedback",
 };
+#define NAMES_SIZE (sizeof(ctlra_event_type_names) / \
+		    sizeof(ctlra_event_type_names[0]))
+
+void event_checks(void)
+{
+	BUILD_BUG_ON(NAMES_SIZE != CTLRA_EVENT_T_COUNT);
+}

ctlra/impl.h

@@ -43,6 +43,7 @@ extern "C" {
 #include "ctlra.h"
 #include "event.h"
 
+
 #define debug_print_check(c, level)					\
 	(!c || ((c->opts.debug_level & CTLRA_DEBUG_LEVEL_MASK) > level))
 
@@ -302,10 +303,15 @@ static const struct ctlra_dev_connect_func_t __ctlra_dev = {	\
 __attribute__((constructor(102)))				\
 static void ctlra_ ## name ## _register() {			\
 	__ctlra_devices[__ctlra_device_count++] = __ctlra_dev;	\
+	if(1)							\
+	printf("[ctlra] register %s %s\n", __ctlra_dev.info->vendor,	\
+	       __ctlra_dev.info->device);			\
 }
 
-
-
+/* helper macro to compile-time debug struct sizes, and function to
+ * actually perform those checks in the correct .c file */
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+void event_checks(void);
 
 /* Helper function for dealing with wrapped encoders */
 static inline int8_t ctlra_dev_encoder_wrap_16(uint8_t newer, uint8_t older)