ProDevelopTeam#MasterRace / Mbed 2 deprecated ArtnetDMX

Dependencies:   mbed DMX TextLCD mbed-rtos

Files at this revision

API Documentation at this revision

Comitter:
Ayrton_L
Date:
Tue Mar 08 15:52:36 2016 +0000
Parent:
12:86cd397047c8
Child:
14:141c9f3b58ee
Commit message:
Displaydriver added;

Changed in this revision

DMX.h Show annotated file Show diff for this revision Revisions of this file
TextLCD.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
main.h Show annotated file Show diff for this revision Revisions of this file
--- a/DMX.h	Tue Mar 08 13:31:17 2016 +0000
+++ b/DMX.h	Tue Mar 08 15:52:36 2016 +0000
@@ -102,22 +102,22 @@
                     //XLR2
                     if (I8_Data2[I8_Teller] & 0x01 == 0x01)
                     {
-                        XLR1 = 1;
+                        XLR2 = 1;
                     }
                     else
                     {
-                        XLR1 = 0;
+                        XLR2 = 0;
                     }
                     I8_Data2[I8_Teller] = I8_Data2[I8_Teller] >> 1;                     //bitjes shiften
                     
                     //XLR3
                     if (I8_Data3[I8_Teller] & 0x01 == 0x01)
                     {
-                        XLR1 = 1;
+                        XLR3 = 1;
                     }
                     else
                     {
-                        XLR1 = 0;
+                        XLR3 = 0;
                     }
                     I8_Data3[I8_Teller] = I8_Data3[I8_Teller] >> 1;                     //bitjes shiften
                 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TextLCD.lib	Tue Mar 08 15:52:36 2016 +0000
@@ -0,0 +1,1 @@
+http://developer.mbed.org/users/simon/code/TextLCD/#308d188a2d3a
--- a/main.cpp	Tue Mar 08 13:31:17 2016 +0000
+++ b/main.cpp	Tue Mar 08 15:52:36 2016 +0000
@@ -5,7 +5,7 @@
     
     Programma geschreven door Ayrton Leyssens en Tim Swannet
     
-    Laatst aangepast op:        07/03/2016
+    Laatst aangepast op:        08/03/2016
                                 
     changes:                    - Banner geschreven
                                 - Begin van display
@@ -27,6 +27,23 @@
 
 int main() 
 {
+    
+    lcd.locate(3, 1);
+    lcd.printf("Art-Net to DMX/n");
+    lcd.locate(6, 3);
+    lcd.printf("B-00-01");
+    
+    
+    
      DMX_TIMING.attach_us(&V_DMX, 4);
     
 }
+
+void V_Powerup()
+{
+    lcd.locate(3, 1);
+    lcd.printf("Art-Net to DMX/n");
+    lcd.locate(6, 3);
+    lcd.printf("B-00-01");
+    wait(1);
+}
--- a/main.h	Tue Mar 08 13:31:17 2016 +0000
+++ b/main.h	Tue Mar 08 15:52:36 2016 +0000
@@ -3,14 +3,19 @@
 
 #include "mbed.h"
 #include "stdint.h"
+#include "TextLCD.h"
 
 #define DMX_CHANNELS 512
 
 uint8_t I8_Data1[DMX_CHANNELS];
 uint8_t I8_Data2[DMX_CHANNELS];
 uint8_t I8_Data3[DMX_CHANNELS];
+TextLCD lcd(p10, p12, p15, p16, p29, p30); // rs, e, d4-d7
+ 
+#include "DMX.h"
 
-#include "DMX.h"
+
+void V_powerup();
 
 #endif