qmsk-dmx: comparison src/hello-dmx.c

equal deleted inserted replaced

-:625f34328820
+:0cf14786b909
 {
 xbi(&DEBUG_PORT, DEBUG_LED);
 }
 // dmx
+#define DMX_COUNT 255
 /*
 * DMX state
 */
 static struct dmx_state {
-byte out[256];
+byte out[DMX_COUNT];
 byte count;
 } dmx;
 enum state {
 START       = '\n',
 CMD         = ';',
 ARG         = ',',
 ERROR       = '!',
 };
-enum cmd {
-CMD_
-};
 #define CONSOLE_ARGS 8
 /*
 * Console input state.
 */
 static struct console {
-enum state state;
+byte state;
+byte cmd;
-enum cmd cmd;
+byte argc;
-char argc;
+byte argv[CONSOLE_ARGS];
-char argv[CONSOLE_ARGS];
 } console;
 /*
+* Clear output (no state).
+*/
+int cmd_clear ()
+{
+dmx.count = 0;
+return 0;
+}
+/*
+* Set output to given sequence.
+*/
+int cmd_out ()
+{
+byte i;
+for (i = 0; i < console.argc; i++) {
+dmx.out[i] = console.argv[i];
+}
+dmx.count = i;
+return 0;
+}
+/*
+* Set output at offset.
+*/
+int cmd_set ()
+{
+if (console.argc < 1) {
+return '!';
+}
+byte i = console.argv[0];
+for (byte a = 1; a < console.argc; a++) {
+dmx.out[i++] = console.argv[a];
+}
+if (i > dmx.count)
+dmx.count = i;
+return 0;
+}
+/*
+* Set output to max. zeroes
+*/
+int cmd_zero ()
+{
+byte count;
+if (console.argc == 0) {
+count = DMX_COUNT;
+} else if (console.argc == 1) {
+count = console.argv[0];
+} else {
+return '!';
+}
+// set
+byte i;
+for (i = 0; i < count; i++) {
+dmx.out[i] = 0;
+}
+dmx.count = i;
+return 0;
+}
+/*
 * Process console command.
 */
 int command ()
 {
 switch (console.cmd) {
-default:
+case 'c':       return cmd_clear();
-return '?';
+case 'o':       return cmd_out();
+case 's':       return cmd_set();
+case 'z':       return cmd_zero();
+default:        return '?';
 }
 }
 /*
 * Process console input.
 ret = '\n';
 }
 // return to START with response
 console.state = START;
-return ret;
+return '\n'; // XXX: required to delimit command reponses..
-} else if (c == ' ' || c == '\t') {
+} else if (c == ' ' || c == '\t' || c == ',') {
 // argument
 if (console.state == CMD) {
 console.state = ARG;
 console.argc = 0;
-return c;
+return ',';
 } else if (console.state == ARG) {
 if (console.argc++ < CONSOLE_ARGS) {
 console.argv[console.argc] = 0;
-return c;
+return ',';
 }
 }
 // printable
 } else if (32 < c && c < 128) {
 /*
 * Tick output state
 */
 void update ()
 {
-dmx_break();
+dmx_packet(dmx.count, dmx.out);
-dmx_frame(0);
-for (byte i = 0; i < dmx.count; i++) {
-dmx_frame(dmx.out[i]);
-}
 }
 void main ()
 {
 led_init();
 timer_init();
 serial_init();
-//dmx_init();
+dmx_init();
 // mainloop
 char c = '>';
 unsigned timeout = 8000; // 2Hz
+// start
 sei();
+serial_write(c);
 while (true) {
 // sleep
 //led_on();
 if (timer_sleep(timeout)) {
-c = '.';
+//c = ' ';
+led_toggle();
+c = 0;
 } else if ((c = serial_read())) {
 // got serial data
 c = input(c);
 // unknown interrupt
 c = '?';
 }
 //led_off();
-// respond
+if (c)
-serial_write(c);
+// respond
+serial_write(c);
 // output
 update();
+}
-led_toggle();
+}
-}
-}

changeset 66	0cf14786b909
parent 65	625f34328820
child 67	53743ecc9150