Introduce data structures for channel remapping

Author: cbdevnet

TODO

@@ -6,3 +6,6 @@ Fix pixmap clearing when moving from big to small gobo
 Mask-repeat for prism?
 Manpage
 Fail from config / sanity check config!
+
+Aggregate data events for vsync
+Preprocess DMX data with fix/min/max/inverted

artnet.c

@@ -184,8 +184,8 @@ int artnet_output_handler(CONFIG* config, ArtNetPacket* packet) {
 		return -1;
 	}
 
-	memcpy(config->dmx_channels, dmx_packet->data + config->dmx_address - 1, DMX_CHANNELS);
-	print_dmx_output(config->dmx_channels, DMX_CHANNELS);
+	memcpy(config->dmx_data, dmx_packet->data + config->dmx_address - 1, DMX_CHANNELS);
+	print_dmx_output(config->dmx_data, DMX_CHANNELS);
 
 	return 0;
 }

coreloop.c

@@ -73,10 +73,10 @@ int xlaser(XRESOURCES* xres, CONFIG* config){
 			}
 		}
 
-		if(exposed || config->dmx_channels[SHUTTER] != 0){
+		if(exposed || config->dmx_data[SHUTTER] != 0){
 			fprintf(stderr, "Window exposed, drawing\n");
 			//FIXME this might loop
-			if(xlaser_render(xres, config->dmx_channels) < 0){
+			if(xlaser_render(xres, config->dmx_data) < 0){
 				fprintf(stderr, "Render procedure failed\n");
 			}
 			//set the last render timer
@@ -96,8 +96,8 @@ int xlaser(XRESOURCES* xres, CONFIG* config){
 		FD_ZERO(&readfds);
 		maxfd = -1;
 		//when using the shutter feature, cycle faster
-		tv.tv_sec = (config->dmx_channels[SHUTTER] == 0) ? 1:0;
-		tv.tv_usec = (config->dmx_channels[SHUTTER] == 0) ? 0:1000;
+		tv.tv_sec = (config->dmx_data[SHUTTER] == 0) ? 1:0;
+		tv.tv_usec = (config->dmx_data[SHUTTER] == 0) ? 0:1000;
 
 		for(i = 0; i < xres->xfds.size; i++){
 			FD_SET(xres->xfds.fds[i], &readfds);

sample.conf

@@ -15,3 +15,10 @@ address = 1
 [artnet]
 net = 0
 subuni = 0
+
+[remap]
+pan = fixed 128
+panfine = fixed 0
+tilt = fixed 128
+tiltfine = fixed 0
+dimmer = 0

xlaser.c

@@ -14,6 +14,7 @@ int getHelp() {
 }
 
 int main(int argc, char** argv){
+	unsigned u;
 	CONFIG config = {
 		.dmx_address = 0,
 		.windowed = false,
@@ -25,6 +26,13 @@ int main(int argc, char** argv){
 	XRESOURCES xres = {};
 	printf("%s starting up\n", XLASER_VERSION);
 
+	//initialize channel mapping configuration
+	for(u = 0; u < DMX_CHANNELS; u++){
+		config.dmx_config[u].source = u;
+		config.dmx_config[u].min = 0;
+		config.dmx_config[u].max = 255;
+	}
+
 	char* invalid_arguments[argc];
 	int invalid_arguments_len = parse_args(&config, argc, argv, invalid_arguments);
 

xlaser.h

@@ -10,28 +10,28 @@
 
 #define XLASER_VERSION "XLaser v1.1"
 #define SHORTNAME "XLaser"
+#define DMX_CHANNELS 16
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#ifndef OPENGL
+#ifdef OPENGL
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#else
 #include <X11/extensions/Xdbe.h>
 #include <X11/extensions/Xrender.h>
 #define BLUR_KERNEL_DIM 3
 #define BLUR_SIGMA 20.0
 #define BLUR_CONSTANT 4
-#else
-#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
 #endif
 
 #include "xfds.h"
 
 volatile sig_atomic_t abort_signaled = 0;
 
-
 typedef struct /*_GOBO*/ {
 	int width;
 	int height;
@@ -84,10 +84,17 @@ typedef struct /*_XDATA*/ {
 	#endif
 } XRESOURCES;
 
-#define DMX_CHANNELS 16
+typedef struct /*_CHANNEL_CFG*/ {
+	bool fixed;
+	uint16_t source;
+	uint8_t min;
+	uint8_t max;
+} CHANNEL_CONFIG;
+
 typedef struct /*XLASER_CFG*/ {
 	uint16_t dmx_address;
-	uint8_t dmx_channels[DMX_CHANNELS];
+	uint8_t dmx_data[DMX_CHANNELS];
+	CHANNEL_CONFIG dmx_config[DMX_CHANNELS];
 	uint8_t art_net;
 	uint8_t art_subUni;
 	uint8_t art_universe;