diff --git a/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/.suo b/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/.suo index c38e39e..1b66460 100644 Binary files a/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/.suo and b/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/.suo differ diff --git a/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/Server/sqlite3/storage.ide-wal b/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/Server/sqlite3/storage.ide-wal index a86f275..b50c7f3 100644 Binary files a/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/Server/sqlite3/storage.ide-wal and b/LED Matrix Control 2/.vs/LED Matrix Control 2/v15/Server/sqlite3/storage.ide-wal differ diff --git a/LED Matrix Control 2/LED Matrix Control 2/MainForm.Designer.cs b/LED Matrix Control 2/LED Matrix Control 2/MainForm.Designer.cs index b86b98c..85e4697 100644 --- a/LED Matrix Control 2/LED Matrix Control 2/MainForm.Designer.cs +++ b/LED Matrix Control 2/LED Matrix Control 2/MainForm.Designer.cs @@ -263,12 +263,12 @@ private void InitializeComponent() this.groupBox9.Controls.Add(this.resetPixelOrder); this.groupBox9.Controls.Add(this.savePixelOrder); this.groupBox9.Controls.Add(this.editPixelOrder); - this.groupBox9.Location = new System.Drawing.Point(298, 19); + this.groupBox9.Location = new System.Drawing.Point(152, 19); this.groupBox9.Name = "groupBox9"; this.groupBox9.Size = new System.Drawing.Size(140, 148); this.groupBox9.TabIndex = 7; this.groupBox9.TabStop = false; - this.groupBox9.Text = "3. Pixel Order"; + this.groupBox9.Text = "2. Pixel Order"; // // loadPixelOrder // @@ -408,12 +408,12 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.disconnectFromCOMPort); this.groupBox1.Controls.Add(this.portsList); this.groupBox1.Controls.Add(this.connectToCOMPort); - this.groupBox1.Location = new System.Drawing.Point(152, 19); + this.groupBox1.Location = new System.Drawing.Point(298, 19); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(140, 146); this.groupBox1.TabIndex = 5; this.groupBox1.TabStop = false; - this.groupBox1.Text = "2. Serial Connection"; + this.groupBox1.Text = "3. Serial Connection"; // // refreshCOMPorts // diff --git a/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.exe b/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.exe index a6e8df9..6480f49 100644 Binary files a/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.exe and b/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.exe differ diff --git a/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.pdb b/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.pdb index 1994639..497d7f2 100644 Binary files a/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.pdb and b/LED Matrix Control 2/LED Matrix Control 2/bin/Release/LED Matrix Control 2.pdb differ diff --git a/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.csproj.GenerateResource.cache b/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.csproj.GenerateResource.cache index 015fde1..d3c8dfb 100644 Binary files a/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.csproj.GenerateResource.cache and b/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.csproj.GenerateResource.cache differ diff --git a/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.exe b/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.exe index a6e8df9..6480f49 100644 Binary files a/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.exe and b/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.exe differ diff --git a/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.pdb b/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.pdb index 1994639..497d7f2 100644 Binary files a/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.pdb and b/LED Matrix Control 2/LED Matrix Control 2/obj/Release/LED Matrix Control 2.pdb differ diff --git a/LMCS Arduino/LEDMatrixSerial/LEDMatrixSerial.ino b/LMCS Arduino/LEDMatrixSerial/LEDMatrixSerial.ino index d02f982..3a3cb7c 100644 --- a/LMCS Arduino/LEDMatrixSerial/LEDMatrixSerial.ino +++ b/LMCS Arduino/LEDMatrixSerial/LEDMatrixSerial.ino @@ -1,11 +1,13 @@ #include "FastLED.h" -// How many leds in your matrix? -#define NUM_LEDS 512 +//You must include a reference to the FastLED library to use this code. http://fastled.io/ -int width = 32; -int height = 16; +const int width = 32; +const int height = 16; +const int DATA_PIN = 3; + +const int NUM_LEDS = width * height; int drawIndex = 0; int x; int y; @@ -14,42 +16,12 @@ char drawIn[5]; char frameIn[NUM_LEDS * 3]; -// For led chips like Neopixels, which have a data line, ground, and power, you just -// need to define DATA_PIN. For led chipsets that are SPI based (four wires - data, clock, -// ground, and power), like the LPD8806 define both DATA_PIN and CLOCK_PIN -#define DATA_PIN 3 - // Define the array of leds CRGB leds[NUM_LEDS]; void setup() { - // Uncomment/edit one of the following lines for your leds arrangement. - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); + FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); - // FastLED.addLeds(leds, NUM_LEDS); for (int i = 0; i < NUM_LEDS; i++) { @@ -60,9 +32,7 @@ void setup() { Serial.begin(1000000); } -void loop() { - -} +void loop() {} void serialEvent() { pixelType = Serial.read(); @@ -81,7 +51,6 @@ void serialEvent() { break; - case 1: //clear mode @@ -99,13 +68,6 @@ void serialEvent() { Serial.readBytes((char*)leds, NUM_LEDS * 3); FastLED.show(); break; - - case 3: - - int brightnessLED = Serial.read(); - FastLED.setBrightness(brightnessLED); - FastLED.show(); - break; } Serial.write(16); } diff --git a/README.txt b/README.txt index bdb433e..e4fb7f3 100644 --- a/README.txt +++ b/README.txt @@ -1,2 +1,10 @@ # LMCS2 LED Matrix Control Software 2 + +Setup + +1. configure the arduino sketch to match your matrix setup. +2. upload the arduino sketch. +3. load the software and set the width and height. +4. create a new pixel order and save it. +5. connect to the arduino.