diff --git a/Arduino/LED_Matrix/Matrix.ino b/Arduino/LED_Matrix/Matrix.ino index 0e3dfd1..bdf0f6b 100644 --- a/Arduino/LED_Matrix/Matrix.ino +++ b/Arduino/LED_Matrix/Matrix.ino @@ -153,18 +153,30 @@ void config() { } } +void upload() { + return; +} + +void info() { + Serial.write((uint8_t) 91); + Serial.write((uint8_t) 0b01000000); + Serial.write("ATmega328P Arduino"); +} + FNPTR_t opcodeTable[] = { scale, // opcode 0x00 single, // opcode 0x01 image, // opcode 0x02 fill, // opcode 0x03 - config // opcode 0x04 + config, // opcode 0x04 + upload, + info }; void setup() { ledCount = STD_LED_MAX_COUNT; - Serial.begin(48000); + Serial.begin(9600); FastLED.addLeds(leds, ledCount); FastLED.setCorrection(TypicalLEDStrip); @@ -190,7 +202,7 @@ void loop() { Serial.println(opcode); #endif - if (opcode <= 4) { + if (opcode <= 6) { opcodeTable[opcode](); Serial.write(75); } diff --git a/Matrix App/Resources/Splashcreen.png b/Matrix App/Resources/Splashcreen.png index c9bad80..10e87ee 100644 Binary files a/Matrix App/Resources/Splashcreen.png and b/Matrix App/Resources/Splashcreen.png differ diff --git a/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.dll b/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.dll index fbdb700..e8d7bd9 100644 Binary files a/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.dll and b/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.dll differ diff --git a/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.pdb b/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.pdb index e3ad152..3a3f2c8 100644 Binary files a/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.pdb and b/Matrix App/bin/Debug/netcoreapp3.1/Matrix App.pdb differ diff --git a/Matrix App/forms/Settings.Designer.cs b/Matrix App/forms/Settings.Designer.cs index 29334eb..4251c8b 100644 --- a/Matrix App/forms/Settings.Designer.cs +++ b/Matrix App/forms/Settings.Designer.cs @@ -85,7 +85,6 @@ namespace Matrix_App.forms this.label3.Size = new System.Drawing.Size(88, 17); this.label3.TabIndex = 6; this.label3.Text = "Serial Port"; - this.label3.Click += new System.EventHandler(this.label3_Click); // // groupBox1 // @@ -115,7 +114,6 @@ namespace Matrix_App.forms this.label5.Size = new System.Drawing.Size(129, 17); this.label5.TabIndex = 10; this.label5.Text = "USB"; - this.label5.Click += new System.EventHandler(this.label5_Click); // // label4 // @@ -133,7 +131,6 @@ namespace Matrix_App.forms this.label2.Size = new System.Drawing.Size(127, 25); this.label2.TabIndex = 8; this.label2.Text = "Features"; - this.label2.Click += new System.EventHandler(this.label2_Click); // // button1 // diff --git a/Matrix App/forms/Settings.cs b/Matrix App/forms/Settings.cs index 8fb8b3a..ef51c56 100644 --- a/Matrix App/forms/Settings.cs +++ b/Matrix App/forms/Settings.cs @@ -227,24 +227,9 @@ namespace Matrix_App.forms } } - private void label3_Click(object sender, EventArgs e) - { - throw new System.NotImplementedException(); - } - private void WritePortCombobox_SelectedIndexChanged_1(object sender, EventArgs e) { ValidatePortSelection(WritePortCombobox, port); } - - private void label2_Click(object sender, EventArgs e) - { - throw new System.NotImplementedException(); - } - - private void label5_Click(object sender, EventArgs e) - { - throw new System.NotImplementedException(); - } } } \ No newline at end of file diff --git a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.csprojAssemblyReference.cache b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.csprojAssemblyReference.cache index 3b5c6d0..d25fdb2 100644 Binary files a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.csprojAssemblyReference.cache and b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.csprojAssemblyReference.cache differ diff --git a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.dll b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.dll index fbdb700..e8d7bd9 100644 Binary files a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.dll and b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.dll differ diff --git a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.pdb b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.pdb index e3ad152..3a3f2c8 100644 Binary files a/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.pdb and b/Matrix App/obj/Debug/netcoreapp3.1/Matrix App.pdb differ diff --git a/Matrix App/obj/Debug/netcoreapp3.1/Matrix_App.Properties.Resources.resources b/Matrix App/obj/Debug/netcoreapp3.1/Matrix_App.Properties.Resources.resources index 6388a3f..a49ddde 100644 Binary files a/Matrix App/obj/Debug/netcoreapp3.1/Matrix_App.Properties.Resources.resources and b/Matrix App/obj/Debug/netcoreapp3.1/Matrix_App.Properties.Resources.resources differ