From ba55bd006ef81e654f24130c415cc66f8eb5093c Mon Sep 17 00:00:00 2001
From: Unreal-Dan <72595612+Unreal-Dan@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:32:24 -0700
Subject: [PATCH] Daniel/duo/full hardened malloc removal (#241)
* huge refactor and cleanup
* fixed major bugs
* added more mode slots via flash storage
* added one click to toggle off auto cycle
* adv modesharing is led selection now
* adv color select and pattern select had to be removed
---
Makefile | 44 +-
VortexEngine/VortexEngine.cppproj | 8 +-
VortexEngine/VortexLib/VortexLib.cpp | 18 +-
VortexEngine/src/Buttons/Buttons.cpp | 20 +-
VortexEngine/src/Buttons/Buttons.h | 2 -
VortexEngine/src/Colors/ColorTypes.cpp | 30 +-
VortexEngine/src/Colors/ColorTypes.h | 4 +-
VortexEngine/src/Colors/Colorset.cpp | 114 +-
VortexEngine/src/Colors/Colorset.h | 8 +-
.../src/Menus/MenuList/ColorSelect.cpp | 39 +-
.../src/Menus/MenuList/EditorConnection.cpp | 12 +-
.../src/Menus/MenuList/ModeSharing.cpp | 48 +-
VortexEngine/src/Menus/MenuList/ModeSharing.h | 3 +
.../src/Menus/MenuList/PatternSelect.cpp | 52 +-
.../src/Menus/MenuList/PatternSelect.h | 3 -
.../src/Menus/MenuList/Randomizer.cpp | 8 +-
VortexEngine/src/Modes/DefaultModes.cpp | 88 +-
VortexEngine/src/Modes/Mode.cpp | 102 +-
VortexEngine/src/Modes/Mode.h | 8 +-
VortexEngine/src/Modes/Modes.cpp | 214 +-
VortexEngine/src/Modes/Modes.h | 18 +-
.../src/Patterns/Multi/Sequencer/Sequence.cpp | 80 +-
.../src/Patterns/Multi/Sequencer/Sequence.h | 16 +-
VortexEngine/src/Patterns/Pattern.cpp | 28 +-
VortexEngine/src/Patterns/Pattern.h | 4 +-
VortexEngine/src/Patterns/PatternArgs.cpp | 19 +-
VortexEngine/src/Patterns/PatternArgs.h | 4 +-
VortexEngine/src/Patterns/PatternBuilder.cpp | 13 +-
VortexEngine/src/Serial/ByteStream.cpp | 72 +-
VortexEngine/src/Serial/ByteStream.h | 28 +-
VortexEngine/src/Serial/Serial.cpp | 2 +-
VortexEngine/src/Storage/Storage.cpp | 151 +-
VortexEngine/src/Storage/Storage.h | 4 +-
VortexEngine/src/VortexConfig.h | 8 +-
VortexEngine/src/VortexEngine.cpp | 18 +-
.../tests_general/0004_End_Auto-cycle.test | 10006 ++++++++--------
.../0014_Enter_Adv_Mode_Share.test | 502 +-
.../0015_Enter_Adv_Color_Select.test | 340 -
.../0016_Enter_Adv_Pattern_Select.test | 341 -
.../0023_Stop_Auto-randomizer_Both_Bulbs.test | 2 +-
.../0027_Stop_Auto-randomizer_Front_Bulb.test | 2 +-
.../0031_Stop_Auto-randomizer_Top_Bulb.test | 2 +-
...Color_Only_Auto-randomizer_Both_Bulbs.test | 2 +-
...ttern_Only_Auto-randomizer_Both_Bulbs.test | 2 +-
...nd_Pattern_Auto-randomizer_Both_Bulbs.test | 2 +-
...Color_Only_Auto-randomizer_Front_Bulb.test | 2 +-
...ttern_Only_Auto-randomizer_Front_Bulb.test | 2 +-
...nd_Pattern_Auto-randomizer_Front_Bulb.test | 2 +-
...p_Color_Only_Auto-randomizer_Top_Bulb.test | 2 +-
...Pattern_Only_Auto-randomizer_Top_Bulb.test | 2 +-
..._and_Pattern_Auto-randomizer_Top_Bulb.test | 2 +-
...74_Reveice_a_mode_in_adv_mode_sharing.test | 502 +-
.../0075_Exit_adv_mode_sharing.test | 604 +-
...138_Cycle_bulbs_in_Adv_Pattern_Select.test | 914 --
...am_1_in_Adv_Pattern_Select_Both_Bulbs.test | 313 -
...t_10_in_Adv_Pattern_Select_Both_Bulbs.test | 314 -
...am_2_in_Adv_Pattern_Select_Both_Bulbs.test | 314 -
...t_10_in_Adv_Pattern_Select_Both_Bulbs.test | 315 -
...am_3_in_Adv_Pattern_Select_Both_Bulbs.test | 315 -
...t_10_in_Adv_Pattern_Select_Both_Bulbs.test | 316 -
...am_4_in_Adv_Pattern_Select_Both_Bulbs.test | 316 -
...t_10_in_Adv_Pattern_Select_Both_Bulbs.test | 317 -
...am_5_in_Adv_Pattern_Select_Both_Bulbs.test | 317 -
...t_10_in_Adv_Pattern_Select_Both_Bulbs.test | 318 -
...tern_in_Adv_Pattern_Select_Both_Bulbs.test | 318 -
...ions_in_Adv_Pattern_Select_Both_Bulbs.test | 325 -
...ions_in_Adv_Pattern_Select_Both_Bulbs.test | 335 -
...ions_in_Adv_Pattern_Select_Both_Bulbs.test | 336 -
...ions_in_Adv_Pattern_Select_Both_Bulbs.test | 333 -
...ions_in_Adv_Pattern_Select_Both_Bulbs.test | 332 -
...am_1_in_Adv_Pattern_Select_Front_Bulb.test | 314 -
...t_10_in_Adv_Pattern_Select_Front_Bulb.test | 315 -
...am_2_in_Adv_Pattern_Select_Front_Bulb.test | 315 -
...t_10_in_Adv_Pattern_Select_Front_Bulb.test | 316 -
...am_3_in_Adv_Pattern_Select_Front_Bulb.test | 316 -
...t_10_in_Adv_Pattern_Select_Front_Bulb.test | 317 -
...am_4_in_Adv_Pattern_Select_Front_Bulb.test | 317 -
...t_10_in_Adv_Pattern_Select_Front_Bulb.test | 318 -
...am_5_in_Adv_Pattern_Select_Front_Bulb.test | 318 -
...t_10_in_Adv_Pattern_Select_Front_Bulb.test | 319 -
...tern_in_Adv_Pattern_Select_Front_Bulb.test | 319 -
...ions_in_Adv_Pattern_Select_Front_Bulb.test | 326 -
...ions_in_Adv_Pattern_Select_Front_Bulb.test | 336 -
...ions_in_Adv_Pattern_Select_Front_Bulb.test | 336 -
...ions_in_Adv_Pattern_Select_Front_Bulb.test | 334 -
...ions_in_Adv_Pattern_Select_Front_Bulb.test | 333 -
...aram_1_in_Adv_Pattern_Select_Top_Bulb.test | 315 -
...ext_10_in_Adv_Pattern_Select_Top_Bulb.test | 316 -
...aram_2_in_Adv_Pattern_Select_Top_Bulb.test | 316 -
...ext_10_in_Adv_Pattern_Select_Top_Bulb.test | 317 -
...aram_3_in_Adv_Pattern_Select_Top_Bulb.test | 317 -
...ext_10_in_Adv_Pattern_Select_Top_Bulb.test | 318 -
...aram_4_in_Adv_Pattern_Select_Top_Bulb.test | 318 -
...ext_10_in_Adv_Pattern_Select_Top_Bulb.test | 319 -
...aram_5_in_Adv_Pattern_Select_Top_Bulb.test | 319 -
...ext_10_in_Adv_Pattern_Select_Top_Bulb.test | 320 -
...attern_in_Adv_Pattern_Select_Top_Bulb.test | 320 -
...ptions_in_Adv_Pattern_Select_Top_Bulb.test | 327 -
...ptions_in_Adv_Pattern_Select_Top_Bulb.test | 337 -
...ptions_in_Adv_Pattern_Select_Top_Bulb.test | 337 -
...ptions_in_Adv_Pattern_Select_Top_Bulb.test | 335 -
...ptions_in_Adv_Pattern_Select_Top_Bulb.test | 334 -
avrsize.sh | 16 +-
103 files changed, 6617 insertions(+), 23370 deletions(-)
delete mode 100644 VortexEngine/tests/tests_general/0015_Enter_Adv_Color_Select.test
delete mode 100644 VortexEngine/tests/tests_general/0016_Enter_Adv_Pattern_Select.test
delete mode 100644 VortexEngine/tests/tests_general/0138_Cycle_bulbs_in_Adv_Pattern_Select.test
delete mode 100644 VortexEngine/tests/tests_general/0139_Increase_Param_1_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0140_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0141_Increase_Param_2_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0142_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0143_Increase_Param_3_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0144_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0145_Increase_Param_4_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0146_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0147_Increase_Param_5_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0148_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0149_Save_Custom_Pattern_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0150_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0151_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0152_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0153_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0154_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Both_Bulbs.test
delete mode 100644 VortexEngine/tests/tests_general/0155_Increase_Param_1_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0156_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0157_Increase_Param_2_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0158_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0159_Increase_Param_3_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0160_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0161_Increase_Param_4_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0162_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0163_Increase_Param_5_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0164_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0165_Save_Custom_Pattern_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0166_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0167_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0168_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0169_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0170_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Front_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0171_Increase_Param_1_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0172_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0173_Increase_Param_2_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0174_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0175_Increase_Param_3_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0176_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0177_Increase_Param_4_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0178_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0179_Increase_Param_5_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0180_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0181_Save_Custom_Pattern_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0182_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0183_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0184_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0185_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Top_Bulb.test
delete mode 100644 VortexEngine/tests/tests_general/0186_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Top_Bulb.test
diff --git a/Makefile b/Makefile
index 054acf5d56..39c53bc529 100644
--- a/Makefile
+++ b/Makefile
@@ -38,15 +38,31 @@ CPU_SPEED = 10000000L
# the port for serial upload
SERIAL_PORT = COM11
+# whether eeprom is erased on flash (must write this fuse first to take effect)
SAVE_EEPROM = 1
-FUSE0 = 0b00000000
-FUSE2 = 0x02
-FUSE5 = 0b1100010$(SAVE_EEPROM)
-FUSE6 = 0x04
+
+# WDTCFG { PERIOD=OFF, WINDOW=OFF }
+WDTCFG = 0b00000000
+# BODCFG { SLEEP=DIS, ACTIVE=DIS, SAMPFREQ=1KHZ, LVL=BODLEVEL0 }
+BODCFG = 0x00
+# OSCCFG { FREQSEL=20mhz, OSCLOCK=CLEAR }
+OSCCFG = 0x02
+# RESERVED
+#FUSE3 = 0x00
+# TCD0CFG { CMPA=CLEAR, CMPB=CLEAR, CMPC=CLEAR, CMPD=CLEAR, CMPAEN=CLEAR, CPMCEN=CLEAR, CMPDEN=CLEAR }
+TCD0CFG = 0x00
+# SYSCFG0
+SYSCFG0 = 0b1100010$(SAVE_EEPROM)
+# SYSCFG1 { SUT=64ms }
+SYSCFG1 = 0x07
# fuse7 = APPEND
-FUSE7 = 0x00
+APPEND = 0x00
# fuse8 = BOOTEND
-FUSE8 = 0x7e
+# This controls the amount of storage for modes at the end of the flash memory,
+# it is the boundary for the segment that can be rewritten by the program, 0x7e
+# means 0x7e00/0x8000 bytes are program and 0x200 bytes are reserved for flash
+# storage of modes, this does not include the eeprom.
+BOOTEND = 0x7e
CFLAGS = -g \
-Os \
@@ -107,7 +123,7 @@ all: $(TARGET).hex
$(OBJDUMP) --disassemble --source --line-numbers --demangle --section=.text $(TARGET).elf > $(TARGET).lst
$(NM) --numeric-sort --line-numbers --demangle --print-size --format=s $(TARGET).elf > $(TARGET).map
chmod +x avrsize.sh
- ./avrsize.sh $(TARGET).elf
+ ./avrsize.sh $(TARGET).elf $(BOOTEND)00
$(TARGET).hex: $(TARGET).elf
$(OBJCOPY) -O binary -R .eeprom $(TARGET).elf $(TARGET).bin
@@ -124,11 +140,21 @@ $(TARGET).elf: $(OBJS)
$(CC) $(CFLAGS) -c $< -o $@
upload: $(TARGET).hex
- $(AVRDUDE) $(AVRDUDE_FLAGS) -Ufuse0:w:$(FUSE0):m -Ufuse2:w:$(FUSE2):m -Ufuse5:w:$(FUSE5):m -Ufuse6:w:$(FUSE6):m -Ufuse7:w:$(FUSE7):m -Ufuse8:w:$(FUSE8):m -Uflash:w:$(TARGET).hex:i
+ $(AVRDUDE) $(AVRDUDE_FLAGS) \
+ -Ufuse0:w:$(WDTCFG):m \
+ -Ufuse1:w:$(BODCFG):m \
+ -Ufuse2:w:$(OSCCFG):m \
+ -Ufuse4:w:$(TCD0CFG):m \
+ -Ufuse5:w:$(SYSCFG0):m \
+ -Ufuse6:w:$(SYSCFG1):m \
+ -Ufuse7:w:$(APPEND):m \
+ -Ufuse8:w:$(BOOTEND):m \
+ -Uflash:w:$(TARGET).hex:i
# upload via SerialUPDI
serial: $(TARGET).hex
- $(PYTHON) -u $(PYPROG) -t uart -u $(SERIAL_PORT) -b 921600 -d $(AVRDUDE_CHIP) --fuses 0:$(FUSE0) 2:$(FUSE2) 5:$(FUSE5) 6:$(FUSE6) 7:$(FUSE7) 8:$(FUSE8) -f $< -a write -v
+ $(PYTHON) -u $(PYPROG) -t uart -u $(SERIAL_PORT) -b 921600 -d $(AVRDUDE_CHIP) \
+ --fuses 0:$(WDTCFG) 1:$(BODCFG) 2:$(OSCCFG) 4:$(TCD0CFG) 5:$(SYSCFG0) 6:$(SYSCFG1) 7:$(APPEND) 8:$(BOOTEND) -f $< -a write -v
ifneq ($(OS),Windows_NT) # Linux
build: all
diff --git a/VortexEngine/VortexEngine.cppproj b/VortexEngine/VortexEngine.cppproj
index 398206bc88..2c7e5d6e4f 100644
--- a/VortexEngine/VortexEngine.cppproj
+++ b/VortexEngine/VortexEngine.cppproj
@@ -266,9 +266,6 @@
compile
-
- compile
-
compile
@@ -455,9 +452,6 @@
compile
-
- compile
-
compile
@@ -606,4 +600,4 @@
-
+
\ No newline at end of file
diff --git a/VortexEngine/VortexLib/VortexLib.cpp b/VortexEngine/VortexLib/VortexLib.cpp
index d325ae874d..dfcfa06f47 100644
--- a/VortexEngine/VortexLib/VortexLib.cpp
+++ b/VortexEngine/VortexLib/VortexLib.cpp
@@ -166,15 +166,16 @@ EMSCRIPTEN_BINDINGS(Vortex) {
.function("sanity", &ByteStream::sanity)
.function("checkCRC", &ByteStream::checkCRC)
.function("isCRCDirty", &ByteStream::isCRCDirty)
- .function("serialize", select_overload(&ByteStream::serialize))
- .function("serialize16", select_overload(&ByteStream::serialize))
- .function("serialize32", select_overload(&ByteStream::serialize))
+ .function("serialize8", &ByteStream::serialize8)
+ .function("serialize16", &ByteStream::serialize16)
+ .function("serialize32", &ByteStream::serialize32)
.function("resetUnserializer", &ByteStream::resetUnserializer)
.function("moveUnserializer", &ByteStream::moveUnserializer)
.function("unserializerAtEnd", &ByteStream::unserializerAtEnd)
- .function("unserialize8", &ByteStream::unserialize8)
- .function("unserialize16", &ByteStream::unserialize16)
- .function("unserialize32", &ByteStream::unserialize32)
+ // TODO: provide better apis here
+ //.function("unserialize8", &ByteStream::unserialize8)
+ //.function("unserialize16", &ByteStream::unserialize16)
+ //.function("unserialize32", &ByteStream::unserialize32)
.function("peek8", &ByteStream::peek8)
.function("peek16", &ByteStream::peek16)
.function("peek32", &ByteStream::peek32)
@@ -658,8 +659,9 @@ bool Vortex::init(VortexCallbacks *callbacks)
// init the engine
VortexEngine::init();
- // clear the modes
- //Modes::clearModes();
+ // load the modes
+ // TODO: don't load modes here? separate api?
+ Modes::load();
// save and set undo buffer
doSave();
diff --git a/VortexEngine/src/Buttons/Buttons.cpp b/VortexEngine/src/Buttons/Buttons.cpp
index 466b22920c..36c4736b43 100644
--- a/VortexEngine/src/Buttons/Buttons.cpp
+++ b/VortexEngine/src/Buttons/Buttons.cpp
@@ -15,32 +15,26 @@
// This will simply point at Buttons::m_button.
Button *g_pButton = nullptr;
-// static members
-Button Buttons::m_buttons[NUM_BUTTONS];
-
bool Buttons::init()
{
- // initialize the button on pin 1
- if (!m_buttons[0].init(1)) {
+ g_pButton = new Button();
+ if (!g_pButton) {
return false;
}
- g_pButton = &m_buttons[0];
- return true;
+ // init the button on pin 1
+ return g_pButton->init(1);
}
void Buttons::cleanup()
{
+ delete g_pButton;
}
void Buttons::update()
{
- // would iterate all buttons and check them here
- // but there's only one button so
- for (uint8_t i = 0; i < NUM_BUTTONS; ++i) {
- m_buttons[i].update();
- }
+ g_pButton->update();
#ifdef VORTEX_LIB
// read input from the vortex lib interface, for example Vortex::shortClick()
- Vortex::handleInputQueue(m_buttons, NUM_BUTTONS);
+ Vortex::handleInputQueue(g_pButton, NUM_BUTTONS);
#endif
}
diff --git a/VortexEngine/src/Buttons/Buttons.h b/VortexEngine/src/Buttons/Buttons.h
index 7f02e34c73..ad9ed95146 100644
--- a/VortexEngine/src/Buttons/Buttons.h
+++ b/VortexEngine/src/Buttons/Buttons.h
@@ -25,8 +25,6 @@ class Buttons
static uint8_t numButtons() { return NUM_BUTTONS; }
private:
- // feel free to add more I guess
- static Button m_buttons[NUM_BUTTONS];
};
// best way I think
diff --git a/VortexEngine/src/Colors/ColorTypes.cpp b/VortexEngine/src/Colors/ColorTypes.cpp
index 8b1c009bc6..5dec968e3b 100644
--- a/VortexEngine/src/Colors/ColorTypes.cpp
+++ b/VortexEngine/src/Colors/ColorTypes.cpp
@@ -198,18 +198,32 @@ RGBColor RGBColor::adjustBrightness(uint8_t fadeBy)
return *this;
}
-void RGBColor::serialize(ByteStream &buffer) const
+bool RGBColor::serialize(ByteStream &buffer) const
{
- buffer.serialize(red);
- buffer.serialize(green);
- buffer.serialize(blue);
+ if (!buffer.serialize8(red)) {
+ return false;
+ }
+ if (!buffer.serialize8(green)) {
+ return false;
+ }
+ if (!buffer.serialize8(blue)) {
+ return false;
+ }
+ return true;
}
-void RGBColor::unserialize(ByteStream &buffer)
+bool RGBColor::unserialize(ByteStream &buffer)
{
- buffer.unserialize(&red);
- buffer.unserialize(&green);
- buffer.unserialize(&blue);
+ if (!buffer.unserialize8(&red)) {
+ return false;
+ }
+ if (!buffer.unserialize8(&green)) {
+ return false;
+ }
+ if (!buffer.unserialize8(&blue)) {
+ return false;
+ }
+ return true;
}
// ========================================================
diff --git a/VortexEngine/src/Colors/ColorTypes.h b/VortexEngine/src/Colors/ColorTypes.h
index c4c69a5aa6..c4e92b2936 100644
--- a/VortexEngine/src/Colors/ColorTypes.h
+++ b/VortexEngine/src/Colors/ColorTypes.h
@@ -79,8 +79,8 @@ class RGBColor
void clear();
RGBColor adjustBrightness(uint8_t fadeBy);
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
uint32_t raw() const { return ((uint32_t)red << 16) | ((uint32_t)green << 8) | (uint32_t)blue; }
diff --git a/VortexEngine/src/Colors/Colorset.cpp b/VortexEngine/src/Colors/Colorset.cpp
index c5ebfafa7f..8d19353bd8 100644
--- a/VortexEngine/src/Colors/Colorset.cpp
+++ b/VortexEngine/src/Colors/Colorset.cpp
@@ -14,7 +14,7 @@
#define INDEX_NONE UINT8_MAX
Colorset::Colorset() :
- m_palette(nullptr),
+ m_palette(),
m_curIndex(INDEX_NONE),
m_numColors(0)
{
@@ -52,18 +52,18 @@ Colorset::~Colorset()
}
Colorset::Colorset(Colorset &&other) noexcept :
- m_palette(other.m_palette),
+ m_palette(),
m_curIndex(INDEX_NONE),
m_numColors(other.m_numColors)
{
- other.m_palette = nullptr;
+ memcpy((void *)m_palette, (void *)other.m_palette, sizeof(m_palette));
+ memset((void *)other.m_palette, 0, sizeof(m_palette));
other.m_numColors = 0;
other.m_curIndex = INDEX_NONE;
}
void Colorset::operator=(const Colorset &other)
{
- clear();
initPalette(other.m_numColors);
for (uint8_t i = 0; i < other.m_numColors; ++i) {
m_palette[i] = other.m_palette[i];
@@ -101,10 +101,7 @@ void Colorset::init(RGBColor c1, RGBColor c2, RGBColor c3, RGBColor c4,
void Colorset::clear()
{
- if (m_palette) {
- delete[] m_palette;
- m_palette = nullptr;
- }
+ memset((void *)m_palette, 0, sizeof(m_palette));
m_numColors = 0;
resetIndex();
}
@@ -133,22 +130,6 @@ bool Colorset::addColor(RGBColor col)
if (m_numColors >= MAX_COLOR_SLOTS) {
return false;
}
- // allocate a new palette one larger than before
- RGBColor *temp = new RGBColor[m_numColors + 1];
- if (!temp) {
- return false;
- }
- // if there is already some colors in the palette
- if (m_numColors && m_palette) {
- // copy over existing colors
- for (uint8_t i = 0; i < m_numColors; ++i) {
- temp[i] = m_palette[i];
- }
- // and delete the existing palette
- delete[] m_palette;
- }
- // reassign new palette
- m_palette = temp;
// insert new color and increment number of colors
m_palette[m_numColors] = col;
m_numColors++;
@@ -212,10 +193,6 @@ void Colorset::removeColor(uint8_t index)
m_palette[i] = m_palette[i + 1];
}
m_palette[--m_numColors].clear();
- if (!m_numColors) {
- delete[] m_palette;
- m_palette = nullptr;
- }
}
// create a set of truely random colors
@@ -310,7 +287,7 @@ void Colorset::adjustBrightness(uint8_t fadeby)
// get a color from the colorset
RGBColor Colorset::get(uint8_t index) const
{
- if (index >= m_numColors || !m_palette) {
+ if (index >= m_numColors) {
return RGBColor(0, 0, 0);
}
return m_palette[index];
@@ -328,20 +305,13 @@ void Colorset::set(uint8_t index, RGBColor col)
}
return;
}
- if (!m_palette) {
- // should be impossible because if the index is less than
- // the number of colors then there must be non-zero number
- // of colors which means the palette should be initialized
- ERROR_LOGF("Programmer error setting color index %u with no palette", index);
- return;
- }
m_palette[index] = col;
}
// skip some amount of colors
void Colorset::skip(int32_t amount)
{
- if (!m_numColors || !m_palette) {
+ if (!m_numColors) {
return;
}
// if the colorset hasn't started yet
@@ -364,7 +334,7 @@ void Colorset::skip(int32_t amount)
RGBColor Colorset::cur()
{
- if (m_curIndex >= m_numColors || !m_palette) {
+ if (m_curIndex >= m_numColors) {
return RGBColor(0, 0, 0);
}
if (m_curIndex == INDEX_NONE) {
@@ -391,7 +361,7 @@ void Colorset::resetIndex()
RGBColor Colorset::getPrev()
{
- if (!m_numColors || !m_palette) {
+ if (!m_numColors) {
return RGB_OFF;
}
// handle wrapping at 0
@@ -406,7 +376,7 @@ RGBColor Colorset::getPrev()
RGBColor Colorset::getNext()
{
- if (!m_numColors || !m_palette) {
+ if (!m_numColors) {
return RGB_OFF;
}
// iterate current index, let it wrap at max uint8
@@ -420,7 +390,7 @@ RGBColor Colorset::getNext()
// peek at the next color but don't iterate
RGBColor Colorset::peek(int32_t offset) const
{
- if (!m_numColors || !m_palette) {
+ if (!m_numColors) {
return RGB_OFF;
}
uint8_t nextIndex = 0;
@@ -450,52 +420,64 @@ bool Colorset::onEnd() const
return (m_curIndex == m_numColors - 1);
}
-void Colorset::serialize(ByteStream &buffer) const
+bool Colorset::serialize(ByteStream &buffer) const
{
- buffer.serialize(m_numColors);
+ if (!buffer.serialize8(m_numColors)) {
+ return false;
+ }
// write all the reds/greens/blues together to maximize chance of
// repeated values to improve RLE compression
for (uint8_t i = 0; i < m_numColors; ++i) {
- buffer.serialize(m_palette[i].red);
+ if (!buffer.serialize8(m_palette[i].red)) {
+ return false;
+ }
}
for (uint8_t i = 0; i < m_numColors; ++i) {
- buffer.serialize(m_palette[i].green);
+ if (!buffer.serialize8(m_palette[i].green)) {
+ return false;
+ }
}
for (uint8_t i = 0; i < m_numColors; ++i) {
- buffer.serialize(m_palette[i].blue);
+ if (!buffer.serialize8(m_palette[i].blue)) {
+ return false;
+ }
}
+ return true;
}
-void Colorset::unserialize(ByteStream &buffer)
+bool Colorset::unserialize(ByteStream &buffer)
{
- buffer.unserialize(&m_numColors);
- initPalette(m_numColors);
+ if (!buffer.unserialize8(&m_numColors)) {
+ return false;
+ }
+ if (m_numColors > MAX_COLOR_SLOTS) {
+ return false;
+ }
+ if (!initPalette(m_numColors)) {
+ return false;
+ }
for (uint8_t i = 0; i < m_numColors; ++i) {
- buffer.unserialize(&m_palette[i].red);
+ if (!buffer.unserialize8(&m_palette[i].red)) {
+ return false;
+ }
}
for (uint8_t i = 0; i < m_numColors; ++i) {
- buffer.unserialize(&m_palette[i].green);
+ if (!buffer.unserialize8(&m_palette[i].green)) {
+ return false;
+ }
}
for (uint8_t i = 0; i < m_numColors; ++i) {
- buffer.unserialize(&m_palette[i].blue);
+ if (!buffer.unserialize8(&m_palette[i].blue)) {
+ return false;
+ }
}
+ return true;
}
-void Colorset::initPalette(uint8_t numColors)
+bool Colorset::initPalette(uint8_t numColors)
{
- if (m_palette) {
- delete[] m_palette;
- m_palette = nullptr;
- }
- if (!numColors) {
- return;
- }
- //m_palette = (RGBColor *)vcalloc(numColors, sizeof(RGBColor));
- m_palette = new RGBColor[numColors];
- if (!m_palette) {
- ERROR_OUT_OF_MEMORY();
- return;
- }
+ clear();
m_numColors = numColors;
+ return true;
}
diff --git a/VortexEngine/src/Colors/Colorset.h b/VortexEngine/src/Colors/Colorset.h
index 099b4ab177..2c34f32c0d 100644
--- a/VortexEngine/src/Colors/Colorset.h
+++ b/VortexEngine/src/Colors/Colorset.h
@@ -143,15 +143,15 @@ class Colorset
bool onEnd() const;
// serialize the colorset to save/load
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
private:
// pre-allocate the palette
- void initPalette(uint8_t numColors);
+ bool initPalette(uint8_t numColors);
// palette of colors
- RGBColor *m_palette;
+ RGBColor m_palette[MAX_COLOR_SLOTS];
// the current index, starts at UINT8_MAX so that
// the very first call to getNext will iterate to 0
uint8_t m_curIndex;
diff --git a/VortexEngine/src/Menus/MenuList/ColorSelect.cpp b/VortexEngine/src/Menus/MenuList/ColorSelect.cpp
index f474f31759..a5858c8840 100644
--- a/VortexEngine/src/Menus/MenuList/ColorSelect.cpp
+++ b/VortexEngine/src/Menus/MenuList/ColorSelect.cpp
@@ -29,9 +29,7 @@ ColorSelect::ColorSelect(const RGBColor &col, bool advanced) :
// function uses a different algorithm to generate the colors that results
// in a smaller color space with less bright colors. The tradeoff is you lose
// the bright colors but the rainbow looks a lot better
- if (!m_advanced) {
- g_hsv_rgb_alg = HSV_TO_RGB_RAINBOW;
- }
+ g_hsv_rgb_alg = HSV_TO_RGB_RAINBOW;
}
ColorSelect::~ColorSelect()
@@ -57,12 +55,6 @@ bool ColorSelect::init()
m_ledSelected = true;
}
m_state = STATE_INIT;
- if (m_advanced) {
- // turn off force sleep while in this adv menu
- VortexEngine::toggleForceSleep(false);
- m_previewMode.setColorset(Colorset(RGB_RED, RGB_RED));
- m_previewMode.init();
- }
DEBUG_LOG("Entered color select");
return true;
}
@@ -74,17 +66,6 @@ Menu::MenuAction ColorSelect::run()
return result;
}
- if (m_advanced) {
- // leave after several clicks
- if (g_pButton->onConsecutivePresses(LEAVE_ADV_COL_SELECT_CLICKS)) {
- return MENU_QUIT;
- }
- // just render the current pattern for active color picking
- // iterate all patterns and plkay
- m_previewMode.play();
- return MENU_CONTINUE;
- }
-
// all states start with a blank slate
Leds::clearAll();
switch (m_state) {
@@ -125,18 +106,6 @@ void ColorSelect::onLedSelected()
void ColorSelect::onShortClick()
{
- if (m_advanced) {
- // grab one of the colorsets of the targeted leds
- Colorset set = m_previewMode.getColorset(ledmapGetFirstLed(m_targetLeds));
- // grab the first color convert it to hsv
- HSVColor col = set.get(1);
- col.hue += 15;
- // set the color again after adjusting
- set.set(1, col);
- // update the colorset
- m_previewMode.setColorsetMap(m_targetLeds, set);
- return;
- }
// increment selection
m_curSelection++;
if (m_state == STATE_PICK_SLOT) {
@@ -148,12 +117,6 @@ void ColorSelect::onShortClick()
void ColorSelect::onLongClick()
{
- if (m_advanced) {
- Colorset set = m_previewMode.getColorset();
- set.set(0, set.get(1));
- m_previewMode.setColorset(set);
- return;
- }
// if we're on 'exit' and we're on any menu past the slot selection
if (m_curSelection == 4 && m_state > STATE_PICK_SLOT) {
// move back to the previous selection
diff --git a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp
index 56cbd8953f..b47b25146e 100644
--- a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp
+++ b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp
@@ -49,7 +49,9 @@ bool EditorConnection::receiveMessage(const char *message)
return false;
}
for (size_t i = 0; i < len; ++i) {
- m_receiveBuffer.unserialize(&byte);
+ if (!m_receiveBuffer.unserialize8(&byte)) {
+ return false;
+ }
}
// if everything was read out, reset
if (m_receiveBuffer.unserializerAtEnd()) {
@@ -264,7 +266,9 @@ bool EditorConnection::receiveModes()
return false;
}
// okay unserialize now, first unserialize the size
- m_receiveBuffer.unserialize(&size);
+ if (!m_receiveBuffer.unserialize32(&size)) {
+ return false;
+ }
// create a new ByteStream that will hold the full buffer of data
ByteStream buf(m_receiveBuffer.rawSize());
// then copy everything from the receive buffer into the rawdata
@@ -294,7 +298,9 @@ bool EditorConnection::receiveDemoMode()
return false;
}
// okay unserialize now, first unserialize the size
- m_receiveBuffer.unserialize(&size);
+ if (!m_receiveBuffer.unserialize32(&size)) {
+ return false;
+ }
// create a new ByteStream that will hold the full buffer of data
ByteStream buf(m_receiveBuffer.rawSize());
// then copy everything from the receive buffer into the rawdata
diff --git a/VortexEngine/src/Menus/MenuList/ModeSharing.cpp b/VortexEngine/src/Menus/MenuList/ModeSharing.cpp
index a5ed9f949b..d537380eb4 100644
--- a/VortexEngine/src/Menus/MenuList/ModeSharing.cpp
+++ b/VortexEngine/src/Menus/MenuList/ModeSharing.cpp
@@ -6,6 +6,7 @@
#include "../../Time/Timings.h"
#include "../../Wireless/VLReceiver.h"
#include "../../Wireless/VLSender.h"
+#include "../../Patterns/Pattern.h"
#include "../../Buttons/Button.h"
#include "../../Modes/Modes.h"
#include "../../Modes/Mode.h"
@@ -28,8 +29,10 @@ bool ModeSharing::init()
if (!Menu::init()) {
return false;
}
- // skip led selection
- m_ledSelected = true;
+ if (!m_advanced) {
+ // skip led selection
+ m_ledSelected = true;
+ }
// start on receive because it's the more responsive of the two
// the odds of opening receive and then accidentally receiving
// a mode that is being broadcast nearby is completely unlikely
@@ -61,6 +64,17 @@ Menu::MenuAction ModeSharing::run()
return MENU_CONTINUE;
}
+void ModeSharing::onLedSelected()
+{
+ // if we selected leds that implies advanced mode
+ if (m_targetLeds == MAP_LED(LED_1)) {
+ // if we selected the top led then simply swap the two patterns
+ // so that the top led is sent first -- if the receiver is receiving
+ // into one slot then it will only use the first pattern to do so
+ m_previewMode.swapPatterns(LED_0, LED_1);
+ }
+}
+
// handlers for clicks
void ModeSharing::onShortClick()
{
@@ -79,8 +93,7 @@ void ModeSharing::onShortClick()
void ModeSharing::onLongClick()
{
- Modes::updateCurMode(&m_previewMode);
- leaveMenu(true);
+ leaveMenu();
}
void ModeSharing::beginSending()
@@ -92,7 +105,7 @@ void ModeSharing::beginSending()
}
m_sharingMode = ModeShareState::SHARE_SEND;
// initialize it with the current mode data
- VLSender::loadMode(Modes::curMode());
+ VLSender::loadMode(&m_previewMode);
// send the first chunk of data, leave if we're done
if (!VLSender::send()) {
// when send has completed, stores time that last action was completed to calculate interval between sends
@@ -141,11 +154,20 @@ void ModeSharing::receiveMode()
return;
}
DEBUG_LOGF("Success receiving mode: %u", m_previewMode.getPatternID());
- if (!m_advanced) {
- Modes::updateCurMode(&m_previewMode);
- // leave menu and save settings, even if the mode was the same whatever
- leaveMenu(true);
+ if (m_advanced && m_targetLeds != MAP_LED_ALL) {
+ LedPos target = ledmapGetFirstLed(m_targetLeds);
+ LedPos other = LED_1;
+ // if the user picked the top led to copy into then swap the patterns
+ // in the incoming mode so the 0th pattern is on the top led
+ if (target == LED_1) {
+ other = LED_0;
+ m_previewMode.swapPatterns(LED_0, LED_1);
+ }
+ m_previewMode.copyPatternFrom(Modes::curMode(), other, other);
}
+ Modes::updateCurMode(&m_previewMode);
+ // leave menu and save settings, even if the mode was the same whatever
+ leaveMenu(true);
}
void ModeSharing::showSendMode()
@@ -163,12 +185,6 @@ void ModeSharing::showReceiveMode()
Leds::setIndex(LED_0, RGBColor(0, VLReceiver::percentReceived(), 0));
Leds::clearIndex(LED_1);
} else {
- if (m_advanced) {
- m_previewMode.play();
- // don't play on LED 1 so that it doesn't interfere
- Leds::clearIndex(LED_1);
- } else {
- Leds::setAll(RGB_WHITE0);
- }
+ Leds::setAll(RGB_WHITE0);
}
}
diff --git a/VortexEngine/src/Menus/MenuList/ModeSharing.h b/VortexEngine/src/Menus/MenuList/ModeSharing.h
index 133eaf8eb2..96512e0de3 100644
--- a/VortexEngine/src/Menus/MenuList/ModeSharing.h
+++ b/VortexEngine/src/Menus/MenuList/ModeSharing.h
@@ -12,6 +12,9 @@ class ModeSharing : public Menu
bool init() override;
MenuAction run() override;
+ // callback after the user selects the target led
+ void onLedSelected() override;
+
// handlers for clicks
void onShortClick() override;
void onLongClick() override;
diff --git a/VortexEngine/src/Menus/MenuList/PatternSelect.cpp b/VortexEngine/src/Menus/MenuList/PatternSelect.cpp
index 870c21b660..227a69f835 100644
--- a/VortexEngine/src/Menus/MenuList/PatternSelect.cpp
+++ b/VortexEngine/src/Menus/MenuList/PatternSelect.cpp
@@ -16,7 +16,6 @@
PatternSelect::PatternSelect(const RGBColor &col, bool advanced) :
Menu(col, advanced),
m_srcLed(LED_FIRST),
- m_argIndex(0),
m_started(false)
{
}
@@ -43,7 +42,7 @@ Menu::MenuAction PatternSelect::run()
// run the current mode
m_previewMode.play();
// show dimmer selections in advanced mode
- Menus::showSelection(m_advanced ? RGB_GREEN0 : RGB_WHITE5);
+ Menus::showSelection(RGB_WHITE5);
return MENU_CONTINUE;
}
@@ -54,47 +53,6 @@ void PatternSelect::onLedSelected()
void PatternSelect::onShortClick()
{
- if (m_advanced) {
- // double click = skip 10
- bool doSkip = g_pButton->onConsecutivePresses(2);
- MAP_FOREACH_LED(m_targetLeds) {
- Pattern *pat = m_previewMode.getPattern(pos);
- if (pat->getNumArgs() <= m_argIndex) {
- continue;
- }
- uint8_t &arg = pat->argRef(m_argIndex);
- if (doSkip) {
- arg += 10 - (arg % 10);
- } else {
- arg++;
- }
- // on/off/gap/dash duration max 100
- uint8_t max = 100;
- if (m_argIndex == 6) {
- // blend number of numflips
- max = 4;
- } else if (m_argIndex > 3) {
- // group size, solid index, blendspeed
- max = 20;
- }
- if (arg > max) {
- // red flash indicates reaching end
- Leds::holdAll(RGB_RED);
- arg %= (max + 1);
- }
- // do not let argument0 be reset to 0
- if (!m_argIndex && !arg) {
- arg = 1;
- }
- }
- m_previewMode.init();
- if (doSkip) {
- // hold white for a moment to show they are skipping 25
- Leds::holdAll(RGB_YELLOW1);
- }
- return;
- }
-
PatternID newID = (PatternID)(m_previewMode.getPatternID(m_srcLed) + 1);
if (newID > PATTERN_SINGLE_LAST) {
newID = PATTERN_SINGLE_FIRST;
@@ -116,14 +74,6 @@ void PatternSelect::onShortClick()
void PatternSelect::onLongClick()
{
- if (m_advanced) {
- m_argIndex++;
- if (m_argIndex < m_previewMode.getPattern(m_srcLed)->getNumArgs()) {
- // if we haven't reached number of args yet then just return and kee pgoing
- return;
- }
- Leds::holdAll(m_menuColor);
- }
// store the mode as current mode
Modes::updateCurMode(&m_previewMode);
leaveMenu(true);
diff --git a/VortexEngine/src/Menus/MenuList/PatternSelect.h b/VortexEngine/src/Menus/MenuList/PatternSelect.h
index 317611a7fa..e825f56b54 100644
--- a/VortexEngine/src/Menus/MenuList/PatternSelect.h
+++ b/VortexEngine/src/Menus/MenuList/PatternSelect.h
@@ -26,9 +26,6 @@ class PatternSelect : public Menu
// helpful member
LedPos m_srcLed;
- // used for adv pat select
- uint8_t m_argIndex;
-
// the pat select starts by showing the current pattern
// then the first click begin cycling the list of pats
bool m_started;
diff --git a/VortexEngine/src/Menus/MenuList/Randomizer.cpp b/VortexEngine/src/Menus/MenuList/Randomizer.cpp
index 632a2ab571..90d76daa0c 100644
--- a/VortexEngine/src/Menus/MenuList/Randomizer.cpp
+++ b/VortexEngine/src/Menus/MenuList/Randomizer.cpp
@@ -40,7 +40,9 @@ bool Randomizer::init()
ByteStream ledData;
Pattern *pat = cur->getPattern(LED_MULTI);
if (pat) {
- pat->serialize(ledData);
+ if (!pat->serialize(ledData)) {
+ return false;
+ }
}
m_multiRandCtx.seed(ledData.recalcCRC());
}
@@ -51,7 +53,9 @@ bool Randomizer::init()
ByteStream ledData;
Pattern *pat = cur->getPattern(l);
if (pat) {
- pat->serialize(ledData);
+ if (!pat->serialize(ledData)) {
+ return false;
+ }
}
m_singlesRandCtx[l].seed(ledData.recalcCRC());
}
diff --git a/VortexEngine/src/Modes/DefaultModes.cpp b/VortexEngine/src/Modes/DefaultModes.cpp
index ce8d72780a..5323c98f27 100644
--- a/VortexEngine/src/Modes/DefaultModes.cpp
+++ b/VortexEngine/src/Modes/DefaultModes.cpp
@@ -104,5 +104,91 @@ const DefaultModeEntry defaultModes[MAX_MODES] = {
}
}
}
- }
+ },
+ {
+ {
+ {
+ PATTERN_RIBBON, 8, {
+ 0x6a0000,
+ 0xf3ff00,
+ 0x6c00ff,
+ 0x00fe89,
+ 0x003fff,
+ 0xff00bd,
+ 0x00ff3c,
+ 0x5057ff,
+ }
+ },
+ {
+ PATTERN_HYPERSTROBE, 8, {
+ 0x6a0000,
+ 0xf3ff00,
+ 0x6c00ff,
+ 0x00fe89,
+ 0x003fff,
+ 0xff00bd,
+ 0x00ff3c,
+ 0x5057ff,
+ }
+ }
+ }
+ },
+ {
+ {
+ {
+ PATTERN_STROBE, 4, {
+ 0x6c00ff,
+ 0x00fe89,
+ 0xff00bd,
+ 0x00ff3c,
+ }
+ },
+ {
+ PATTERN_HYPERSTROBE, 2, {
+ 0x6a0000,
+ 0xf3ff00,
+ }
+ }
+ }
+ },
+ {
+ {
+ {
+ PATTERN_BLEND, 2, {
+ RGB_RED0,
+ RGB_CYAN,
+ }
+ },
+ {
+ PATTERN_BLEND, 3, {
+ RGB_RED,
+ RGB_GREEN,
+ RGB_BLUE,
+ }
+ }
+ }
+ },
+ {
+ {
+ {
+ PATTERN_ULTRAGAP, 7, {
+ RGB_RED0,
+ RGB_RED0,
+ RGB_CYAN5,
+ RGB_RED0,
+ RGB_RED0,
+ RGB_RED0,
+ RGB_CYAN5,
+ }
+ },
+ {
+ PATTERN_DOPS, 2, {
+ RGB_CYAN1,
+ RGB_PURPLE3,
+ }
+ }
+ }
+ },
+
+
};
diff --git a/VortexEngine/src/Modes/Mode.cpp b/VortexEngine/src/Modes/Mode.cpp
index a644c944f5..ffe581e025 100644
--- a/VortexEngine/src/Modes/Mode.cpp
+++ b/VortexEngine/src/Modes/Mode.cpp
@@ -197,8 +197,12 @@ bool Mode::loadFromBuffer(ByteStream &modeBuffer)
uint8_t major = 0;
uint8_t minor = 0;
// unserialize the vortex version
- modeBuffer.unserialize(&major);
- modeBuffer.unserialize(&minor);
+ if (!modeBuffer.unserialize8(&major)) {
+ return false;
+ }
+ if (!modeBuffer.unserialize8(&minor)) {
+ return false;
+ }
// check the version for incompatibility
if (!VortexEngine::checkVersion(major, minor)) {
// incompatible version
@@ -214,35 +218,43 @@ bool Mode::loadFromBuffer(ByteStream &modeBuffer)
return true;
}
-void Mode::serialize(ByteStream &buffer, uint8_t numLeds) const
+bool Mode::serialize(ByteStream &buffer, uint8_t numLeds) const
{
if (!numLeds) {
numLeds = MODE_LEDCOUNT;
}
// serialize the number of leds
- buffer.serialize(numLeds);
+ if (!buffer.serialize8(numLeds)) {
+ return false;
+ }
// empty mode?
if (!numLeds) {
- return;
+ return true;
}
// serialize the flags
ModeFlags flags = getFlags();
- buffer.serialize(flags);
+ if (!buffer.serialize8(flags)) {
+ return false;
+ }
#if VORTEX_SLIM == 0
// serialiaze the multi led?
if ((flags & MODE_FLAG_MULTI_LED) && m_multiPat) {
// serialize the multi led
- m_multiPat->serialize(buffer);
+ if (!m_multiPat->serialize(buffer)) {
+ return false;
+ }
}
#endif
// if no single leds then just stop here
if (!(flags & MODE_FLAG_SINGLE_LED)) {
- return;
+ return true;
}
// if there are any sparse singles (spaces) then we need to
// serialize an led map of which singles are set
if (flags & MODE_FLAG_SPARSE_SINGLES) {
- buffer.serialize((uint32_t)getSingleLedMap());
+ if (!buffer.serialize32((uint32_t)getSingleLedMap())) {
+ return false;
+ }
}
// then iterate each single led and serialize it
for (LedPos pos = LED_FIRST; pos < numLeds; ++pos) {
@@ -251,12 +263,15 @@ void Mode::serialize(ByteStream &buffer, uint8_t numLeds) const
continue;
}
// just serialize the pattern then colorset
- entry->serialize(buffer);
+ if (!entry->serialize(buffer)) {
+ return false;
+ }
// if they are all same single then only serialize one
if (flags & MODE_FLAG_ALL_SAME_SINGLE) {
break;
}
}
+ return true;
}
// this is a hairy function, but a bit of a necessary complexity
@@ -265,7 +280,9 @@ bool Mode::unserialize(ByteStream &buffer)
clearPattern(LED_ALL);
uint8_t ledCount = LED_COUNT;
// unserialize the number of leds
- buffer.unserialize(&ledCount);
+ if (!buffer.unserialize8(&ledCount)) {
+ return false;
+ }
#if FIXED_LED_COUNT == 0
// it's important that we only increase the led count if necessary
// otherwise we may end up reducing our led count and only rendering
@@ -282,25 +299,20 @@ bool Mode::unserialize(ByteStream &buffer)
}
// unserialize the flags value
ModeFlags flags = 0;
- buffer.unserialize(&flags);
+ if (!buffer.unserialize8(&flags)) {
+ return false;
+ }
Pattern *firstPat = nullptr;
// if there is a multi led pattern then unserialize it
if (flags & MODE_FLAG_MULTI_LED) {
#if VORTEX_SLIM == 1
- // unserialize the multi pattern
- Pattern *multiPat = PatternBuilder::unserialize(buffer);
- // if there are no single leds then discard the firstpat
- if ((flags & MODE_FLAG_SINGLE_LED) != 0 && multiPat) {
- // discard the multi pattern
- delete multiPat;
- } else {
- // otherwise turn on the all same single flag to use the multi as a single
- flags = MODE_FLAG_SINGLE_LED | MODE_FLAG_ALL_SAME_SINGLE;
- firstPat = multiPat;
- }
+ return false;
#else
// otherwise in normal build actually unserialize it
m_multiPat = PatternBuilder::unserialize(buffer);
+ if (!m_multiPat) {
+ return false;
+ }
m_multiPat->init();
#endif
}
@@ -311,26 +323,29 @@ bool Mode::unserialize(ByteStream &buffer)
// is there an led map to unserialize? if not default to all
LedMap map = (1 << ledCount) - 1;
if (flags & MODE_FLAG_SPARSE_SINGLES) {
- buffer.unserialize((uint32_t *)&map);
+ return false;
}
// unserialize all singleled patterns into their positions
MAP_FOREACH_LED(map) {
if (pos >= LED_COUNT) {
// in case the map encodes led positions this device doesn't support
- break;
+ continue;
}
- if (!firstPat) {
- // save the first pattern so that it can be duped if this is 'all same'
+ //if (!firstPat) {
+ // save the first pattern so that it can be duped if this is 'all same'
+ if (pos == LED_FIRST || (flags & MODE_FLAG_ALL_SAME_SINGLE) == 0) {
m_singlePats[pos] = firstPat = PatternBuilder::unserialize(buffer);
- } else if (flags & MODE_FLAG_ALL_SAME_SINGLE) {
- // if all same then just dupe first
- m_singlePats[pos] = PatternBuilder::dupe(firstPat);
} else {
- // otherwise unserialize the pattern like normal
- m_singlePats[pos] = PatternBuilder::unserialize(buffer);
+ // if all same then just dupe first
+ m_singlePats[pos] = PatternBuilder::dupe(m_singlePats[LED_FIRST]);
+ }
+ if (!m_singlePats[pos]) {
+ clearPattern(LED_ALL);
+ return false;
}
m_singlePats[pos]->bind(pos);
}
+
// there is a few different possibilities here:
// 1. The provided ledCount is less than our current LED_COUNT
// -> if this happens we need to repeat the first ledCount leds
@@ -351,6 +366,9 @@ bool Mode::unserialize(ByteStream &buffer)
// around at ledCount so that we repeat the first ledCount over again
for (LedPos pos = (LedPos)ledCount; pos < LED_COUNT; ++pos) {
m_singlePats[pos] = PatternBuilder::dupe(m_singlePats[src]);
+ if (!m_singlePats[pos]) {
+ return false;
+ }
m_singlePats[pos]->bind(pos);
// have to modulate the source by the source mode's led count
src = (LedPos)((src + 1) % ledCount);
@@ -576,6 +594,26 @@ bool Mode::setPatternMap(LedMap map, PatternID pat, const PatternArgs *args, con
return true;
}
+void Mode::copyPatternFrom(const Mode *other, LedPos to, LedPos from)
+{
+ if (to >= LED_COUNT || from >= LED_COUNT) {
+ return;
+ }
+ delete m_singlePats[to];
+ m_singlePats[to] = PatternBuilder::dupe(other->m_singlePats[from]);
+}
+
+
+void Mode::swapPatterns(LedPos a, LedPos b)
+{
+ if (a >= LED_COUNT || b >= LED_COUNT) {
+ return;
+ }
+ Pattern *temp = m_singlePats[a];
+ m_singlePats[a] = m_singlePats[b];
+ m_singlePats[b] = temp;
+}
+
// set colorset at a specific position
bool Mode::setColorset(const Colorset &set, LedPos pos)
{
diff --git a/VortexEngine/src/Modes/Mode.h b/VortexEngine/src/Modes/Mode.h
index e45825859d..3c0c574b6d 100644
--- a/VortexEngine/src/Modes/Mode.h
+++ b/VortexEngine/src/Modes/Mode.h
@@ -69,7 +69,7 @@ class Mode
bool loadFromBuffer(ByteStream &saveBuffer);
// save the mode to serial
- void serialize(ByteStream &buffer, uint8_t numLeds = 0) const;
+ bool serialize(ByteStream &buffer, uint8_t numLeds = 0) const;
// load the mode from serial (optional led count)
bool unserialize(ByteStream &buffer);
@@ -97,6 +97,12 @@ class Mode
bool setPattern(PatternID pat, LedPos pos = LED_ANY, const PatternArgs *args = nullptr, const Colorset *set = nullptr);
bool setPatternMap(LedMap pos, PatternID pat, const PatternArgs *args = nullptr, const Colorset *set = nullptr);
+ // copy a pattern from another mode ledpos into this mode
+ void copyPatternFrom(const Mode *other, LedPos to, LedPos from);
+
+ // swap two patterns
+ void swapPatterns(LedPos a, LedPos b);
+
// set colorset at a specific position
bool setColorset(const Colorset &set, LedPos pos = LED_ANY);
// set colorset at each position in a map
diff --git a/VortexEngine/src/Modes/Modes.cpp b/VortexEngine/src/Modes/Modes.cpp
index 776fb1a36e..b42b34b123 100644
--- a/VortexEngine/src/Modes/Modes.cpp
+++ b/VortexEngine/src/Modes/Modes.cpp
@@ -16,6 +16,7 @@
#include "../Log/Log.h"
// static members
+bool Modes::m_loaded = false;
uint8_t Modes::m_curMode = 0;
uint8_t Modes::m_numModes = 0;
// the current instantiated mode and it's respective link
@@ -34,15 +35,10 @@ bool Modes::init()
test();
return true;
#endif
- // try to load the saved settings or set defaults
- if (!loadStorage()) {
- if (!setDefaults()) {
- return false;
- }
- if (!saveStorage()) {
- return false;
- }
- }
+ ByteStream headerBuffer;
+ Storage::read(0, headerBuffer);
+ unserializeSaveHeader(headerBuffer);
+ m_loaded = false;
#ifdef VORTEX_LIB
// enable the adv menus by default in vortex lib
m_globalFlags |= MODES_FLAG_ADV_MENUS;
@@ -55,6 +51,24 @@ void Modes::cleanup()
clearModes();
}
+bool Modes::load()
+{
+ if (m_loaded) {
+ return true;
+ }
+ // try to load the saved settings or set defaults
+ if (!loadStorage()) {
+ if (!setDefaults()) {
+ return false;
+ }
+ if (!saveStorage()) {
+ return false;
+ }
+ }
+ m_loaded = true;
+ return true;
+}
+
void Modes::play()
{
if (!m_numModes) {
@@ -77,53 +91,48 @@ void Modes::play()
VortexEngine::enterSleep(false);
return;
}
- nextModeSkipEmpty();
+ nextMode();
}
// play the current mode
m_pCurModeLink->play();
}
-// full save/load to/from buffer
-bool Modes::saveToBuffer(ByteStream &modesBuffer)
+bool Modes::serializeSaveHeader(ByteStream &saveBuffer)
{
// serialize the engine version into the modes buffer
- if (!VortexEngine::serializeVersion(modesBuffer)) {
+ if (!VortexEngine::serializeVersion(saveBuffer)) {
return false;
}
// NOTE: instead of global brightness the duo uses this to store the
// startup mode ID. The duo doesn't offer a global brightness option
- if (!modesBuffer.serialize(m_globalFlags)) {
+ if (!saveBuffer.serialize8(m_globalFlags)) {
return false;
}
// serialize the global brightness
- if (!modesBuffer.serialize((uint8_t)Leds::getBrightness())) {
- return false;
- }
- // serialize all modes data into the modesBuffer
- if (!serialize(modesBuffer)) {
- return false;
- }
- DEBUG_LOGF("Serialized all modes, uncompressed size: %u", modesBuffer.size());
- if (!modesBuffer.compress()) {
+ if (!saveBuffer.serialize8((uint8_t)Leds::getBrightness())) {
return false;
}
+ DEBUG_LOGF("Serialized all modes, uncompressed size: %u", saveBuffer.size());
return true;
}
-// load modes from a save buffer
-bool Modes::loadFromBuffer(ByteStream &modesBuffer)
+bool Modes::unserializeSaveHeader(ByteStream &saveHeader)
{
- if (!modesBuffer.decompress()) {
+ if (!saveHeader.decompress()) {
// failed to decompress?
return false;
}
// reset the unserializer index before unserializing anything
- modesBuffer.resetUnserializer();
+ saveHeader.resetUnserializer();
uint8_t major = 0;
uint8_t minor = 0;
// unserialize the vortex version
- modesBuffer.unserialize(&major);
- modesBuffer.unserialize(&minor);
+ if (!saveHeader.unserialize8(&major)) {
+ return false;
+ }
+ if (!saveHeader.unserialize8(&minor)) {
+ return false;
+ }
// check the version for incompatibility
if (!VortexEngine::checkVersion(major, minor)) {
// incompatible version
@@ -133,13 +142,44 @@ bool Modes::loadFromBuffer(ByteStream &modesBuffer)
// NOTE: instead of global brightness the duo uses this to store the
// startup mode ID. The duo doesn't offer a global brightness option
// unserialize the global brightness
- modesBuffer.unserialize(&m_globalFlags);
+ if (!saveHeader.unserialize8(&m_globalFlags)) {
+ return false;
+ }
// unserialize the global brightness
uint8_t brightness = 0;
- modesBuffer.unserialize(&brightness);
+ if (!saveHeader.unserialize8(&brightness)) {
+ return false;
+ }
if (brightness) {
Leds::setBrightness(brightness);
}
+ return true;
+}
+
+// full save/load to/from buffer
+bool Modes::saveToBuffer(ByteStream &modesBuffer)
+{
+ // first write out the header
+ if (!serializeSaveHeader(modesBuffer)) {
+ return false;
+ }
+ // serialize all modes data into the modesBuffer
+ if (!serialize(modesBuffer)) {
+ return false;
+ }
+ DEBUG_LOGF("Serialized all modes, uncompressed size: %u", modesBuffer.size());
+ if (!modesBuffer.compress()) {
+ return false;
+ }
+ return true;
+}
+
+// load modes from a save buffer
+bool Modes::loadFromBuffer(ByteStream &modesBuffer)
+{
+ if (!unserializeSaveHeader(modesBuffer)) {
+ return false;
+ }
// now just unserialize the list of modes
if (!unserialize(modesBuffer)) {
return false;
@@ -149,20 +189,38 @@ bool Modes::loadFromBuffer(ByteStream &modesBuffer)
bool Modes::loadStorage()
{
- // this is good on memory, but it erases what they have stored
- // before we know whether there is something actually saved
- clearModes();
- ByteStream modesBuffer;
+ ByteStream headerBuffer;
// only read storage if the modebuffer isn't filled
- if (!Storage::read(modesBuffer) || !modesBuffer.size()) {
+ if (!Storage::read(0, headerBuffer) || !headerBuffer.size()) {
DEBUG_LOG("Empty buffer read from storage");
// this kinda sucks whatever they had loaded is gone
return false;
}
- // try to load the modes buffer
- if (!loadFromBuffer(modesBuffer)) {
+ // this erases what is stored before we know whether there is data
+ // but it's the easiest way to just re-load new data from storage
+ clearModes();
+ // read the header and load the data
+ if (!unserializeSaveHeader(headerBuffer)) {
+ return false;
+ }
+ // unserialize the number of modes next
+ uint8_t numModes = 0;
+ if (!headerBuffer.unserialize8(&numModes)) {
return false;
}
+ if (!numModes) {
+ DEBUG_LOG("Did not find any modes");
+ // this kinda sucks whatever they had loaded is gone
+ return false;
+ }
+ // iterate each mode and read it out of it's storage slot then add it
+ for (uint8_t i = 0; i < numModes; ++i) {
+ ByteStream modeBuffer(MAX_MODE_SIZE);
+ // read each mode from a storage slot and load it
+ if (!Storage::read(i + 1, modeBuffer) || !addSerializedMode(modeBuffer)) {
+ return false;
+ }
+ }
if (oneClickModeEnabled()) {
// set the current mode to the startup mode
switchToStartupMode();
@@ -170,24 +228,62 @@ bool Modes::loadStorage()
return true;
}
+bool Modes::saveHeader()
+{
+ ByteStream headerBuffer(MAX_MODE_SIZE);
+ if (!serializeSaveHeader(headerBuffer)) {
+ return false;
+ }
+ // serialize the number of modes
+ if (!headerBuffer.serialize8(m_numModes)) {
+ return false;
+ }
+ if (!Storage::write(0, headerBuffer)) {
+ return false;
+ }
+ return true;
+}
+
// NOTE: Flash storage is limited to about 10,000 writes so
// use this function sparingly!
bool Modes::saveStorage()
{
DEBUG_LOG("Saving modes...");
- // A ByteStream to hold all the serialized data
- ByteStream modesBuffer(STORAGE_SIZE / 2);
- // save data to the buffer
- if (!saveToBuffer(modesBuffer)) {
- return false;
+ saveHeader();
+ // make sure the current mode is saved in case it has changed somehow
+ saveCurMode();
+ // uninstantiate cur mode so we have stack space to serialize
+ if (m_pCurModeLink) {
+ m_pCurModeLink->uninstantiate();
+ }
+ uint8_t i = 0;
+ ModeLink *ptr = m_storedModes;
+ while (ptr && i < MAX_MODES) {
+ ByteStream modeBuffer(MAX_MODE_SIZE);
+ // instantiate the mode temporarily
+ Mode *mode = ptr->instantiate();
+ if (!mode) {
+ ERROR_OUT_OF_MEMORY();
+ return false;
+ }
+ // serialize it into the target modes buffer
+ if (!mode->serialize(modeBuffer)) {
+ return false;
+ }
+ // just uninstansiate the mode after serializing
+ ptr->uninstantiate();
+ // next mode
+ ptr = ptr->next();
+ // now write this mode into a storage slot (skip first slot, that's header)
+ if (!Storage::write(++i, modeBuffer)) {
+ return false;
+ }
}
- // write the serial buffer to flash storage, this
- // will compress the buffer and include crc/flags
- if (!Storage::write(modesBuffer)) {
- DEBUG_LOG("Failed to write storage");
+ // reinstanstiate the current mode
+ if (m_pCurModeLink && !m_pCurModeLink->instantiate()) {
return false;
}
- DEBUG_LOG("Success saving modes to storage");
+ DEBUG_LOGF("Serialized num modes: %u", m_numModes);
return true;
}
@@ -195,7 +291,7 @@ bool Modes::saveStorage()
bool Modes::serialize(ByteStream &modesBuffer)
{
// serialize the number of modes
- if (!modesBuffer.serialize(m_numModes)) {
+ if (!modesBuffer.serialize8(m_numModes)) {
return false;
}
// make sure the current mode is saved in case it has changed somehow
@@ -213,7 +309,9 @@ bool Modes::serialize(ByteStream &modesBuffer)
return false;
}
// serialize it into the target modes buffer
- mode->serialize(modesBuffer);
+ if (!mode->serialize(modesBuffer)) {
+ return false;
+ }
// just uninstansiate the mode after serializing
ptr->uninstantiate();
// next mode
@@ -236,7 +334,9 @@ bool Modes::unserialize(ByteStream &modesBuffer)
clearModes();
// unserialize the number of modes next
uint8_t numModes = 0;
- modesBuffer.unserialize(&numModes);
+ if (!modesBuffer.unserialize8(&numModes)) {
+ return false;
+ }
if (!numModes) {
DEBUG_LOG("Did not find any modes");
// this kinda sucks whatever they had loaded is gone
@@ -603,17 +703,7 @@ bool Modes::setFlag(uint8_t flag, bool enable, bool save)
m_globalFlags &= ~flag;
}
DEBUG_LOGF("Toggled instant on/off to %s", enable ? "on" : "off");
- return !save || saveStorage();
-}
-
-bool Modes::getFlag(uint8_t flag)
-{
- return ((m_globalFlags & flag) != 0);
-}
-
-void Modes::resetFlags()
-{
- m_globalFlags = 0;
+ return !save || saveHeader();
}
#ifdef VORTEX_LIB
diff --git a/VortexEngine/src/Modes/Modes.h b/VortexEngine/src/Modes/Modes.h
index 4978282d0a..f9371d8c37 100644
--- a/VortexEngine/src/Modes/Modes.h
+++ b/VortexEngine/src/Modes/Modes.h
@@ -36,6 +36,9 @@ class Modes
static bool init();
static void cleanup();
+ // load modes so they are ready to play
+ static bool load();
+
// play the current mode
static void play();
@@ -43,6 +46,9 @@ class Modes
static bool saveToBuffer(ByteStream &saveBuffer);
static bool loadFromBuffer(ByteStream &saveBuffer);
+ // save the header to storage
+ static bool saveHeader();
+
// full save/load to/from storage
static bool loadStorage();
static bool saveStorage();
@@ -108,9 +114,10 @@ class Modes
// set or get flags
static bool setFlag(uint8_t flag, bool enable, bool save = true);
- static bool getFlag(uint8_t flag);
+ static bool getFlag(uint8_t flag) { return ((m_globalFlags & flag) != 0); }
+
// reset flags to factory default (must save after)
- static void resetFlags();
+ static void resetFlags() { m_globalFlags = 0; }
// inline functions to toggle the various flags
static bool setOneClickMode(bool enable, bool save = true) {
@@ -202,6 +209,10 @@ class Modes
ModeLink *m_prev;
};
+ // save load the savefile header from storage
+ static bool serializeSaveHeader(ByteStream &saveBuffer);
+ static bool unserializeSaveHeader(ByteStream &saveBuffer);
+
// fetch a link from the chain by index
static ModeLink *getModeLink(uint32_t index);
@@ -210,6 +221,9 @@ class Modes
static Mode *initCurMode(bool force = false);
static bool saveCurMode();
+ // whether modes have been loaded
+ static bool m_loaded;
+
// the current mode we're on
static uint8_t m_curMode;
diff --git a/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.cpp b/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.cpp
index 48733cade5..33a7239b92 100644
--- a/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.cpp
+++ b/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.cpp
@@ -39,19 +39,25 @@ PatternID PatternMap::operator[](LedPos index) const
return m_patternMap[index];
}
-void PatternMap::serialize(ByteStream &buffer) const
+bool PatternMap::serialize(ByteStream &buffer) const
{
for (LedPos i = LED_FIRST; i < LED_COUNT; ++i) {
// ensure the PatternID is interpreted as uint8_t
- buffer.serialize((uint8_t)m_patternMap[i]);
+ if (!buffer.serialize8((uint8_t)m_patternMap[i])) {
+ return false;
+ }
}
+ return true;
}
-void PatternMap::unserialize(ByteStream &buffer)
+bool PatternMap::unserialize(ByteStream &buffer)
{
for (LedPos i = LED_FIRST; i < LED_COUNT; ++i) {
- buffer.unserialize((uint8_t *)m_patternMap + i);
+ if (!buffer.unserialize8((uint8_t *)m_patternMap + i)) {
+ return false;
+ }
}
+ return true;
}
ColorsetMap::ColorsetMap() :
@@ -79,18 +85,24 @@ const Colorset &ColorsetMap::operator[](LedPos index) const
return m_colorsetMap[index];
}
-void ColorsetMap::serialize(ByteStream &buffer) const
+bool ColorsetMap::serialize(ByteStream &buffer) const
{
for (LedPos i = LED_FIRST; i < LED_COUNT; ++i) {
- m_colorsetMap[i].serialize(buffer);
+ if (!m_colorsetMap[i].serialize(buffer)) {
+ return false;
+ }
}
+ return true;
}
-void ColorsetMap::unserialize(ByteStream &buffer)
+bool ColorsetMap::unserialize(ByteStream &buffer)
{
for (LedPos i = LED_FIRST; i < LED_COUNT; ++i) {
- m_colorsetMap[i].unserialize(buffer);
+ if (!m_colorsetMap[i].unserialize(buffer)) {
+ return false;
+ }
}
+ return true;
}
// Make an array of sequence steps to create a sequenced pattern
@@ -107,18 +119,32 @@ SequenceStep::SequenceStep(const SequenceStep &other) :
{
}
-void SequenceStep::serialize(ByteStream &buffer) const
+bool SequenceStep::serialize(ByteStream &buffer) const
{
- buffer.serialize(m_duration);
- m_patternMap.serialize(buffer);
- m_colorsetMap.serialize(buffer);
+ if (!buffer.serialize16(m_duration)) {
+ return false;
+ }
+ if (!m_patternMap.serialize(buffer)) {
+ return false;
+ }
+ if (!m_colorsetMap.serialize(buffer)) {
+ return false;
+ }
+ return true;
}
-void SequenceStep::unserialize(ByteStream &buffer)
+bool SequenceStep::unserialize(ByteStream &buffer)
{
- buffer.unserialize(&m_duration);
- m_patternMap.unserialize(buffer);
- m_colorsetMap.unserialize(buffer);
+ if (!buffer.unserialize16(&m_duration)) {
+ return false;
+ }
+ if (!m_patternMap.unserialize(buffer)) {
+ return false;
+ }
+ if (!m_colorsetMap.unserialize(buffer)) {
+ return false;
+ }
+ return true;
}
Sequence::Sequence() :
@@ -222,20 +248,30 @@ void Sequence::clear()
m_numSteps = 0;
}
-void Sequence::serialize(ByteStream &buffer) const
+bool Sequence::serialize(ByteStream &buffer) const
{
- buffer.serialize(m_numSteps);
+ if (!buffer.serialize8(m_numSteps)) {
+ return false;
+ }
for (uint8_t i = 0; i < m_numSteps; ++i) {
- m_sequenceSteps[i].serialize(buffer);
+ if (!m_sequenceSteps[i].serialize(buffer)) {
+ return false;
+ }
}
+ return true;
}
-void Sequence::unserialize(ByteStream &buffer)
+bool Sequence::unserialize(ByteStream &buffer)
{
- buffer.unserialize(&m_numSteps);
+ if (!buffer.unserialize8(&m_numSteps)) {
+ return false;
+ }
for (uint8_t i = 0; i < m_numSteps; ++i) {
- m_sequenceSteps[i].unserialize(buffer);
+ if (!m_sequenceSteps[i].unserialize(buffer)) {
+ return false;
+ }
}
+ return true;
}
uint8_t Sequence::numSteps() const
diff --git a/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.h b/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.h
index 4ca766a694..37ddf75911 100644
--- a/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.h
+++ b/VortexEngine/src/Patterns/Multi/Sequencer/Sequence.h
@@ -22,8 +22,8 @@ class PatternMap
PatternID operator[](LedPos index) const;
// serialize and unserialize a pattern map
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
// public list of pattern IDs for each led
PatternID m_patternMap[LED_COUNT];
@@ -41,8 +41,8 @@ class ColorsetMap
const Colorset &operator[](LedPos index) const;
// serialize and unserialize a colorset map
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
// public list of pattern IDs for each led
Colorset m_colorsetMap[LED_COUNT];
@@ -57,8 +57,8 @@ class SequenceStep
SequenceStep(const SequenceStep &other);
// serialize and unserialize a step in the sequencer
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
// public members to allow for easy initialization of an array of SequenceSteps
uint16_t m_duration;
@@ -85,8 +85,8 @@ class Sequence
uint8_t addStep(uint16_t duration, const PatternMap &patternMap, const ColorsetMap &colorsetMap = Colorset());
void clear();
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
uint8_t numSteps() const;
const SequenceStep &operator[](uint8_t index) const;
diff --git a/VortexEngine/src/Patterns/Pattern.cpp b/VortexEngine/src/Patterns/Pattern.cpp
index 6078cc4ed1..bcdf645fc9 100644
--- a/VortexEngine/src/Patterns/Pattern.cpp
+++ b/VortexEngine/src/Patterns/Pattern.cpp
@@ -54,10 +54,14 @@ void Pattern::skip(uint32_t ticks)
#endif
// must override the serialize routine to save the pattern
-void Pattern::serialize(ByteStream &buffer) const
+bool Pattern::serialize(ByteStream &buffer) const
{
- buffer.serialize((uint8_t)m_patternID);
- m_colorset.serialize(buffer);
+ if (!buffer.serialize8((uint8_t)m_patternID)) {
+ return false;
+ }
+ if (!m_colorset.serialize(buffer)) {
+ return false;
+ }
PatternArgs args;
getArgs(args);
PatternArgs defaults = PatternBuilder::getDefaultArgs(m_patternID);
@@ -68,23 +72,27 @@ void Pattern::serialize(ByteStream &buffer) const
ARGMAP_SET(argmap, i);
}
}
- args.serialize(buffer, argmap);
+ if (!args.serialize(buffer, argmap)) {
+ return false;
+ }
+ return true;
}
// must override unserialize to load patterns
-void Pattern::unserialize(ByteStream &buffer)
+bool Pattern::unserialize(ByteStream &buffer)
{
// don't unserialize the pattern ID because it is already
// unserialized by the pattern builder to decide which pattern
// to instantiate, instead only unserialize the colorset
- m_colorset.unserialize(buffer);
+ if (!m_colorset.unserialize(buffer)) {
+ return false;
+ }
// start with the default args for this pattern
PatternArgs args = PatternBuilder::getDefaultArgs(m_patternID);
// then unserialize any different args overtop of the defaults
- if (args.unserialize(buffer) != ARG_NONE) {
- // if any args were unserialized, set them
- setArgs(args);
- }
+ args.unserialize(buffer);
+ setArgs(args);
+ return true;
}
void Pattern::setArg(uint8_t index, uint8_t value)
diff --git a/VortexEngine/src/Patterns/Pattern.h b/VortexEngine/src/Patterns/Pattern.h
index e659abf885..0a3454ce04 100644
--- a/VortexEngine/src/Patterns/Pattern.h
+++ b/VortexEngine/src/Patterns/Pattern.h
@@ -76,8 +76,8 @@ class Pattern
#endif
// serialize and unserialize a pattern to a bytestream
- void serialize(ByteStream &buffer) const;
- void unserialize(ByteStream &buffer);
+ bool serialize(ByteStream &buffer) const;
+ bool unserialize(ByteStream &buffer);
// get or set a single arg
void setArg(uint8_t index, uint8_t value);
diff --git a/VortexEngine/src/Patterns/PatternArgs.cpp b/VortexEngine/src/Patterns/PatternArgs.cpp
index a26389dff8..8ea98aa93d 100644
--- a/VortexEngine/src/Patterns/PatternArgs.cpp
+++ b/VortexEngine/src/Patterns/PatternArgs.cpp
@@ -171,23 +171,32 @@ uint8_t PatternArgs::operator[](int index) const
return args[index];
}
-void PatternArgs::serialize(ByteStream &buffer, ArgMap argmap) const
+bool PatternArgs::serialize(ByteStream &buffer, ArgMap argmap) const
{
- buffer.serialize(argmap);
+ if (!buffer.serialize8(argmap)) {
+ return false;
+ }
for (uint8_t i = 0; i < MAX_ARGS; ++i) {
if (ARGMAP_ISSET(argmap, i)) {
- buffer.serialize(args[i]);
+ if (!buffer.serialize8(args[i])) {
+ return false;
+ }
}
}
+ return true;
}
ArgMap PatternArgs::unserialize(ByteStream &buffer)
{
ArgMap argmap = ARG_NONE;
- buffer.unserialize(&argmap);
+ if (!buffer.unserialize8(&argmap)) {
+ return ARG_NONE;
+ }
for (uint8_t i = 0; i < MAX_ARGS; ++i) {
if (ARGMAP_ISSET(argmap, i)) {
- buffer.unserialize(args + i);
+ if (!buffer.unserialize8(args + i)) {
+ break;
+ }
}
}
return argmap;
diff --git a/VortexEngine/src/Patterns/PatternArgs.h b/VortexEngine/src/Patterns/PatternArgs.h
index 942aa9f050..67759ad682 100644
--- a/VortexEngine/src/Patterns/PatternArgs.h
+++ b/VortexEngine/src/Patterns/PatternArgs.h
@@ -29,7 +29,7 @@ typedef uint8_t ArgMap;
// some helpers to set/clear/check
#define ARGMAP_SET(map, arg) (map |= ARG(arg))
#define ARGMAP_CLEAR(map, arg) (map &= ~ARG(arg))
-#define ARGMAP_ISSET(map, arg) (map & ARG(arg))
+#define ARGMAP_ISSET(map, arg) ((map & ARG(arg)) != 0)
// a structured method for passing arguments to patterns, there's definitely more dynamic
// ways to approach this but I'm aiming for simple and lightweight here
@@ -71,7 +71,7 @@ class PatternArgs
uint8_t operator[](int index) const;
// serialize the pattern args with a specific mapping of which args to store
- void serialize(ByteStream &buffer, ArgMap argmap = ARG_ALL) const;
+ bool serialize(ByteStream &buffer, ArgMap argmap = ARG_ALL) const;
// unserialize the pattern args and return the argmap of which args were loaded
// NOTE: You should start with an instance of the default args before you unserialize
ArgMap unserialize(ByteStream &buffer);
diff --git a/VortexEngine/src/Patterns/PatternBuilder.cpp b/VortexEngine/src/Patterns/PatternBuilder.cpp
index 0f0b15587d..2d965664b7 100644
--- a/VortexEngine/src/Patterns/PatternBuilder.cpp
+++ b/VortexEngine/src/Patterns/PatternBuilder.cpp
@@ -44,9 +44,11 @@ Pattern *PatternBuilder::make(PatternID id, const PatternArgs *args)
DEBUG_LOGF("Invalid pattern id: %u", id);
id = PATTERN_FIRST;
}
+#if VORTEX_SLIM == 0
if (isMultiLedPatternID(id)) {
return makeMulti(id, args);
}
+#endif
return makeSingle(id, args);
}
@@ -95,11 +97,18 @@ MultiLedPattern *PatternBuilder::makeMulti(PatternID id, const PatternArgs *args
Pattern *PatternBuilder::unserialize(ByteStream &buffer)
{
- Pattern *pat = make((PatternID)buffer.unserialize8());
+ PatternID id = PATTERN_NONE;
+ if (!buffer.unserialize8((uint8_t *)&id)) {
+ return nullptr;
+ }
+ Pattern *pat = make(id);
if (!pat) {
return nullptr;
}
- pat->unserialize(buffer);
+ if (!pat->unserialize(buffer)) {
+ delete pat;
+ return nullptr;
+ }
return pat;
}
diff --git a/VortexEngine/src/Serial/ByteStream.cpp b/VortexEngine/src/Serial/ByteStream.cpp
index 73089fcc75..32c659f370 100644
--- a/VortexEngine/src/Serial/ByteStream.cpp
+++ b/VortexEngine/src/Serial/ByteStream.cpp
@@ -319,7 +319,7 @@ uint32_t ByteStream::recalcCRC(bool force)
void ByteStream::sanity()
{
// to ensure size never exceeds the buffer capacity
- if (m_pData->size > m_capacity) {
+ if (m_pData && m_pData->size > m_capacity) {
m_pData->size = m_capacity;
}
}
@@ -338,7 +338,7 @@ bool ByteStream::isCRCDirty() const
return (m_pData && (m_pData->flags & BUFFER_FLAG_DIRTY) != 0);
}
-bool ByteStream::serialize(uint8_t byte)
+bool ByteStream::serialize8(uint8_t byte)
{
//DEBUG_LOGF("Serialize8(): %u", byte);
if (!m_pData || (m_pData->size + sizeof(uint8_t)) > m_capacity) {
@@ -354,7 +354,7 @@ bool ByteStream::serialize(uint8_t byte)
return true;
}
-bool ByteStream::serialize(uint16_t bytes)
+bool ByteStream::serialize16(uint16_t bytes)
{
//DEBUG_LOGF("Serialize16(): %u", bytes);
if (!m_pData || (m_pData->size + sizeof(uint16_t)) > m_capacity) {
@@ -370,7 +370,7 @@ bool ByteStream::serialize(uint16_t bytes)
return true;
}
-bool ByteStream::serialize(uint32_t bytes)
+bool ByteStream::serialize32(uint32_t bytes)
{
//DEBUG_LOGF("Serialize32(): %u", bytes);
if (!m_pData || (m_pData->size + sizeof(uint32_t)) > m_capacity) {
@@ -414,9 +414,15 @@ bool ByteStream::unserializerAtEnd() const
}
// unserialize data and walk the buffer that many bytes
-bool ByteStream::unserialize(uint8_t *byte)
+bool ByteStream::unserialize8(uint8_t *byte)
{
- if (!m_pData || m_position >= m_pData->size || (m_pData->size - m_position) < sizeof(uint8_t)) {
+ if (!m_pData) {
+ return false;
+ }
+ if (m_position >= m_pData->size) {
+ return false;
+ }
+ if ((m_pData->size - m_position) < sizeof(uint8_t)) {
return false;
}
memcpy(byte, m_pData->buf + m_position, sizeof(uint8_t));
@@ -425,7 +431,7 @@ bool ByteStream::unserialize(uint8_t *byte)
return true;
}
-bool ByteStream::unserialize(uint16_t *bytes)
+bool ByteStream::unserialize16(uint16_t *bytes)
{
if (!m_pData || m_position >= m_pData->size || (m_pData->size - m_position) < sizeof(uint16_t)) {
return false;
@@ -436,7 +442,7 @@ bool ByteStream::unserialize(uint16_t *bytes)
return true;
}
-bool ByteStream::unserialize(uint32_t *bytes)
+bool ByteStream::unserialize32(uint32_t *bytes)
{
if (!m_pData || m_position >= m_pData->size || (m_pData->size - m_position) < sizeof(uint32_t)) {
return false;
@@ -447,27 +453,6 @@ bool ByteStream::unserialize(uint32_t *bytes)
return true;
}
-uint8_t ByteStream::unserialize8()
-{
- uint8_t byte = 0;
- unserialize(&byte);
- return byte;
-}
-
-uint16_t ByteStream::unserialize16()
-{
- uint16_t bytes = 0;
- unserialize(&bytes);
- return bytes;
-}
-
-uint32_t ByteStream::unserialize32()
-{
- uint32_t bytes = 0;
- unserialize(&bytes);
- return bytes;
-}
-
uint8_t ByteStream::peek8() const
{
if (!m_pData) {
@@ -492,33 +477,6 @@ uint32_t ByteStream::peek32() const
return *(uint32_t *)frontUnserializer();
}
-// read the data from a flash storage
-// overload += for appending buffer
-ByteStream &ByteStream::operator+=(const ByteStream &rhs)
-{
- append(rhs);
- return *this;
-}
-
-// also overload += for appending bytes
-ByteStream &ByteStream::operator+=(const uint8_t &rhs)
-{
- serialize(rhs);
- return *this;
-}
-
-ByteStream &ByteStream::operator+=(const uint16_t &rhs)
-{
- serialize(rhs);
- return *this;
-}
-
-ByteStream &ByteStream::operator+=(const uint32_t &rhs)
-{
- serialize(rhs);
- return *this;
-}
-
bool ByteStream::is_compressed() const
{
if (!m_pData) {
@@ -549,4 +507,4 @@ uint32_t ByteStream::getWidth(uint32_t value) const
}
}
return 0;
-}
\ No newline at end of file
+}
diff --git a/VortexEngine/src/Serial/ByteStream.h b/VortexEngine/src/Serial/ByteStream.h
index 16cff1bcd9..af73af39b9 100644
--- a/VortexEngine/src/Serial/ByteStream.h
+++ b/VortexEngine/src/Serial/ByteStream.h
@@ -78,9 +78,9 @@ class ByteStream
bool isCRCDirty() const;
// serialize a byte into the buffer
- bool serialize(uint8_t byte);
- bool serialize(uint16_t bytes);
- bool serialize(uint32_t bytes);
+ bool serialize8(uint8_t byte);
+ bool serialize16(uint16_t bytes);
+ bool serialize32(uint32_t bytes);
// reset the unserializer index
void resetUnserializer();
@@ -90,26 +90,14 @@ class ByteStream
bool unserializerAtEnd() const;
// serialize a byte into the buffer
- bool unserialize(uint8_t *byte);
- bool unserialize(uint16_t *bytes);
- bool unserialize(uint32_t *bytes);
-
- // same thing but via return value
- uint8_t unserialize8();
- uint16_t unserialize16();
- uint32_t unserialize32();
+ bool unserialize8(uint8_t *byte);
+ bool unserialize16(uint16_t *bytes);
+ bool unserialize32(uint32_t *bytes);
uint8_t peek8() const;
uint16_t peek16() const;
uint32_t peek32() const;
- // overload += for appending buffer
- ByteStream &operator+=(const ByteStream &rhs);
- // also overload += for appending bytes
- ByteStream &operator+=(const uint8_t &rhs);
- ByteStream &operator+=(const uint16_t &rhs);
- ByteStream &operator+=(const uint32_t &rhs);
-
// overload [] for array access (no bounds check lol)
uint8_t &operator[](uint32_t index) { return m_pData->buf[index]; }
// overload (uint8_t *) for cast to buffer
@@ -185,9 +173,9 @@ class ByteStream
// The raw buffer of data along with size and flags
RawBuffer *m_pData;
// the index in the raw buffer for unserialization
- uint32_t m_position;
+ uint16_t m_position;
// the actual size of the buffer raw buffer
- uint32_t m_capacity;
+ uint16_t m_capacity;
};
#endif
diff --git a/VortexEngine/src/Serial/Serial.cpp b/VortexEngine/src/Serial/Serial.cpp
index 2d3c4bd343..a3433b79fd 100644
--- a/VortexEngine/src/Serial/Serial.cpp
+++ b/VortexEngine/src/Serial/Serial.cpp
@@ -127,7 +127,7 @@ void SerialComs::read(ByteStream &byteStream)
#else
byte = Serial.read();
#endif
- byteStream.serialize(byte);
+ byteStream.serialize8(byte);
} while (--amt > 0);
#endif
}
diff --git a/VortexEngine/src/Storage/Storage.cpp b/VortexEngine/src/Storage/Storage.cpp
index e794281737..a00f1aaef8 100644
--- a/VortexEngine/src/Storage/Storage.cpp
+++ b/VortexEngine/src/Storage/Storage.cpp
@@ -37,6 +37,16 @@ std::string Storage::m_storageFilename;
#define STORAGE_FILENAME DEFAULT_STORAGE_FILENAME
#endif
+// The first half of the data goes into the eeprom and then the rest goes into
+// flash, the EEPROM is 256 and storage size is 512 so the flash storage is 256
+#define FLASH_STORAGE_SIZE (STORAGE_SIZE)
+// The position of the flash storage is right before the end of the flash, as long
+// as the program leaves 256 bytes of space at the end of flash then this will fit
+#define FLASH_STORAGE_SPACE ((volatile uint8_t *)(0x10000 - FLASH_STORAGE_SIZE))
+
+// 12 for the serialbuffer header + 5 for the actual header data
+#define STORAGE_HEADER_SIZE 17
+
uint32_t Storage::m_lastSaveSize = 0;
Storage::Storage()
@@ -57,8 +67,11 @@ void Storage::cleanup()
{
}
+#define FLASH_PAGE_SIZE 128
+
+
// store a serial buffer to storage
-bool Storage::write(ByteStream &buffer)
+bool Storage::write(uint8_t slot, ByteStream &buffer)
{
#ifdef VORTEX_LIB
if (!Vortex::storageEnabled()) {
@@ -66,25 +79,72 @@ bool Storage::write(ByteStream &buffer)
return true;
}
#endif
- // Check size
+ // check size
uint16_t size = buffer.rawSize();
- if (!size || size > STORAGE_SIZE) {
+ if (buffer.rawSize() > MAX_MODE_SIZE) {
ERROR_LOG("Buffer too big for storage space");
return false;
}
+ if (slot >= NUM_MODE_SLOTS) {
+ return false;
+ }
// just in case
buffer.recalcCRC();
#ifdef VORTEX_EMBEDDED
const uint8_t *buf = (const uint8_t *)buffer.rawData();
- // start writing to eeprom
- for (uint16_t i = 0; i < size; ++i) {
- if (buf[i] != eepromReadByte(i)) {
- eepromWriteByte(i, buf[i]);
+ // the header is slot 0 and it gets 17 bytes in the start of the eeprom then
+ // the next 3 modes are 76 bytes each taking up 228 bytes for a total of 245
+ if (slot < 4) {
+ uint8_t eepSlot = 0;
+ if (slot > 0) {
+ eepSlot = STORAGE_HEADER_SIZE + (MAX_MODE_SIZE * (slot - 1));
+ }
+ // header eeprom (12 bytes of 256)
+ // 3 modes eeprom (76 x 3 bytes of 244)
+ uint8_t slotSize = (slot == 0) ? STORAGE_HEADER_SIZE : MAX_MODE_SIZE;
+ for (uint8_t i = 0; i < slotSize; ++i) {
+ uint8_t b = (i < size) ? buf[i] : 0x00;
+ eepromWriteByte(eepSlot + i, b);
+ }
+ } else {
+ // Then flash storage is 0x200 or 512 bytes which allows for 6 x 76 byte modes
+ // the base address of the slot we are writing
+ uint16_t slotAddr = (uint16_t)FLASH_STORAGE_SPACE + (MAX_MODE_SIZE * (slot - 4));
+ // The storage slot may lay across a page boundary which means potentially writing
+ // two pages instead of just one. In order to update only part of a page, the page
+ // buffer must be filled with both the previous content along with the new data.
+ // For example, imagine 2 pages of data: |xxxxxxSSSS|SSSxxxxxxx| the x's are other
+ // data that must be preserved, and the S's denote the storage slot being written.
+ // This would take place over two iterations of the loop, each writing out one page
+ // by read-then-writing-back the x's and writing out the new S's. This is necessary
+ // because the page buffer must be filled to perform a page write, at least I think
+ while (size > 0) {
+ uint16_t pageStart = slotAddr & ~(FLASH_PAGE_SIZE - 1);
+ uint16_t offset = slotAddr % FLASH_PAGE_SIZE;
+ uint16_t space = FLASH_PAGE_SIZE - offset;
+ uint16_t writeSize = (size < space) ? size : space;
+
+ for (uint8_t i = 0; i < FLASH_PAGE_SIZE; ++i) {
+ uint8_t value;
+ if (i >= offset && i < offset + writeSize) {
+ // if this is within the slot then write out the new data
+ value = buf[i - offset];
+ } else {
+ // otherwise just write-back the same value to fill the pagebuffer
+ value = *(volatile uint8_t *)(pageStart + i);
+ }
+ *(volatile uint8_t *)(pageStart + i) = value;
+ }
+
+ // Erase and write the flash page
+ _PROTECTED_WRITE_SPM(NVMCTRL.CTRLA, NVMCTRL_CMD_PAGEERASEWRITE_gc);
+ while (NVMCTRL.STATUS & (NVMCTRL_FBUSY_bm | NVMCTRL_EEBUSY_bm));
+
+ // continue to the next page
+ slotAddr += writeSize;
+ buf += writeSize;
+ size -= writeSize;
}
- }
- DEBUG_LOGF("Wrote %u bytes to storage (max: %u)", m_lastSaveSize, STORAGE_SIZE);
- if ((NVMCTRL.STATUS & 4) != 0) {
- return false;
}
#elif defined(_WIN32)
HANDLE hFile = CreateFile(STORAGE_FILENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -93,7 +153,13 @@ bool Storage::write(ByteStream &buffer)
return false;
}
DWORD written = 0;
- if (!WriteFile(hFile, buffer.rawData(), buffer.rawSize(), &written, NULL)) {
+ DWORD offset = slot * MAX_MODE_SIZE;
+ SetFilePointer(hFile, offset, NULL, FILE_BEGIN);
+ uint8_t modeBuffer[MAX_MODE_SIZE] = {0};
+ // copy the mode data into a temp buffer
+ memcpy(modeBuffer, buffer.rawData(), size);
+ // then copy the full size of the temp buffer in
+ if (!WriteFile(hFile, modeBuffer, MAX_MODE_SIZE, &written, NULL)) {
// error
return false;
}
@@ -103,16 +169,22 @@ bool Storage::write(ByteStream &buffer)
if (!f) {
return false;
}
- if (!fwrite(buffer.rawData(), sizeof(char), buffer.rawSize(), f)) {
+ long offset = slot * MAX_MODE_SIZE;
+ fseek(f, offset, SEEK_SET);
+ uint8_t modeBuffer[MAX_MODE_SIZE] = {0};
+ // copy the mode data into a temp buffer
+ memcpy(modeBuffer, buffer.rawData(), size);
+ if (!fwrite(modeBuffer, sizeof(char), MAX_MODE_SIZE, f)) {
return false;
}
fclose(f);
#endif // VORTEX_EMBEDDED
+ DEBUG_LOGF("Wrote %u bytes to storage (max: %u)", m_lastSaveSize, STORAGE_SIZE);
return true;
}
// read a serial buffer from storage
-bool Storage::read(ByteStream &buffer)
+bool Storage::read(uint8_t slot, ByteStream &buffer)
{
#ifdef VORTEX_LIB
if (!Vortex::storageEnabled()) {
@@ -120,22 +192,27 @@ bool Storage::read(ByteStream &buffer)
// an empty buffer after returning true
return false;
}
- uint16_t size = STORAGE_SIZE;
-#else
- uint16_t size = *(uint16_t *)MAPPED_EEPROM_START;
#endif
- if (size > STORAGE_SIZE || size < sizeof(ByteStream::RawBuffer) + 4) {
- size = STORAGE_SIZE;
+ uint32_t size = MAX_MODE_SIZE;
+ if (size > STORAGE_SIZE || size < sizeof(ByteStream::RawBuffer) + 4 || slot >= NUM_MODE_SLOTS) {
+ return false;
}
if (!buffer.init(size)) {
return false;
}
#ifdef VORTEX_EMBEDDED
- // Read the data from EEPROM first
- uint8_t *pos = (uint8_t *)buffer.rawData();
- uint16_t fullsize = buffer.rawSize() + size;
- for (uint16_t i = 0; i < fullsize; ++i) {
- pos[i] = eepromReadByte(i);
+ uint8_t *buf = (uint8_t *)buffer.rawData();
+ volatile uint8_t *src;
+ if (slot == 0) { // slot 0 is header eeprom
+ src = (volatile uint8_t *)MAPPED_EEPROM_START;
+ size = STORAGE_HEADER_SIZE;
+ } else if (slot < 4) { // slots 1-3 are eeprom
+ src = (volatile uint8_t *)MAPPED_EEPROM_START + STORAGE_HEADER_SIZE + (MAX_MODE_SIZE * (slot - 1));
+ } else { // slots 4-9 are flash
+ src = (volatile uint8_t *)FLASH_STORAGE_SPACE + (MAX_MODE_SIZE * (slot - 4));
+ }
+ for (uint8_t i = 0; i < size; ++i) {
+ buf[i] = src[i];
}
#elif defined(_WIN32)
HANDLE hFile = CreateFile(STORAGE_FILENAME, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -144,7 +221,9 @@ bool Storage::read(ByteStream &buffer)
return false;
}
DWORD bytesRead = 0;
- if (!ReadFile(hFile, buffer.rawData(), size, &bytesRead, NULL)) {
+ DWORD offset = slot * MAX_MODE_SIZE;
+ SetFilePointer(hFile, offset, NULL, FILE_BEGIN);
+ if (!ReadFile(hFile, buffer.rawData(), MAX_MODE_SIZE, &bytesRead, NULL)) {
// error
return false;
}
@@ -154,7 +233,9 @@ bool Storage::read(ByteStream &buffer)
if (!f) {
return false;
}
- if (!fread(buffer.rawData(), sizeof(char), size, f)) {
+ long offset = slot * MAX_MODE_SIZE;
+ fseek(f, offset, SEEK_SET);
+ if (!fread(buffer.rawData(), sizeof(char), MAX_MODE_SIZE, f)) {
return false;
}
fclose(f);
@@ -183,14 +264,12 @@ uint32_t Storage::lastSaveSize()
// write out the eeprom byte
void Storage::eepromWriteByte(uint16_t index, uint8_t in)
{
- uint16_t adr;
+ if (eepromReadByte(index) == in) {
+ return;
+ }
// The first two pages of the data goes into the eeprom and then the last page goes
// into the USERROW which is located at 0x1300
- if (index > 255) {
- adr = 0x1300 + (index & 0xFF);
- } else {
- adr = MAPPED_EEPROM_START + index;
- }
+ uint16_t adr = MAPPED_EEPROM_START + (index);
__asm__ __volatile__(
"ldi r30, 0x00" "\n\t"
"ldi r31, 0x10" "\n\t"
@@ -205,14 +284,12 @@ void Storage::eepromWriteByte(uint16_t index, uint8_t in)
:"+d"(in)
: "x"(adr)
: "r30", "r31", "r18");
+
+ while (!(NVMCTRL.STATUS & NVMCTRL_EEBUSY_bm));
}
uint8_t Storage::eepromReadByte(uint16_t index)
{
- if (index > 255) {
- // USERROW start
- return *(uint8_t *)(0x1300 + (index & 0xFF));
- }
- return *(uint8_t *)(MAPPED_EEPROM_START + index);
+ return *(volatile uint8_t *)(MAPPED_EEPROM_START + index);
}
#endif
diff --git a/VortexEngine/src/Storage/Storage.h b/VortexEngine/src/Storage/Storage.h
index 4bf0654832..80da3edcb9 100644
--- a/VortexEngine/src/Storage/Storage.h
+++ b/VortexEngine/src/Storage/Storage.h
@@ -19,9 +19,9 @@ class Storage
static void cleanup();
// store a serial buffer to storage
- static bool write(ByteStream &buffer);
+ static bool write(uint8_t slot, ByteStream &buffer);
// read a serial buffer from storage
- static bool read(ByteStream &buffer);
+ static bool read(uint8_t slot, ByteStream &buffer);
// the last save size (use STORAGE_SIZE For total space)
static uint32_t lastSaveSize();
diff --git a/VortexEngine/src/VortexConfig.h b/VortexEngine/src/VortexConfig.h
index fe7c78cea6..e4163f9a40 100644
--- a/VortexEngine/src/VortexConfig.h
+++ b/VortexEngine/src/VortexConfig.h
@@ -185,7 +185,7 @@
// This should not be set to 0, it should be a specific maximum for
// each separate device
//
-#define MAX_MODES 5
+#define MAX_MODES 9
// Default Tickrate in Ticks Per Second (TPS)
//
@@ -533,9 +533,9 @@
// the number of storage slots for modes, add 1 for the header
#define NUM_MODE_SLOTS (MAX_MODES + 1)
-// the space available for storing modes, we can't make this too big
-// otherwise we will have trouble loading it into memory
-#define STORAGE_SIZE 384
+// the space available for storing modes, this is a bit inaccurate on the duo
+// because the eeprom is also used but that isn't reflected here
+#define STORAGE_SIZE 0x200
// ===================================================================
// Test Framework configurations
diff --git a/VortexEngine/src/VortexEngine.cpp b/VortexEngine/src/VortexEngine.cpp
index de70d6b9a1..28e7af62cf 100644
--- a/VortexEngine/src/VortexEngine.cpp
+++ b/VortexEngine/src/VortexEngine.cpp
@@ -228,6 +228,9 @@ void VortexEngine::runMainLogic()
// if the button hasn't been released since turning on then there is custom logic
if (g_pButton->releaseCount() == 0) {
+ if (!Modes::load()) {
+ return;
+ }
// if the button is held for 2 seconds from off, switch to on click mode on
// the last mode shown before sleep
if (!Modes::keychainModeEnabled() && now == ONE_CLICK_THRESHOLD_TICKS && g_pButton->isPressed()) {
@@ -262,6 +265,10 @@ void VortexEngine::runMainLogic()
}
#endif
+ if (!Modes::load()) {
+ return;
+ }
+
// finally the user has released the button after initially turning it on,
// just run the regular main logic of the system
@@ -342,7 +349,7 @@ void VortexEngine::runMainLogic()
// if auto cycle is enabled and the last switch was more than the delay ago
if (m_autoCycle && (Modes::lastSwitchTime() + AUTO_RANDOM_DELAY < now)) {
// then switch to the next mode automatically
- Modes::nextModeSkipEmpty();
+ Modes::nextMode();
}
// otherwise just play the modes
@@ -352,8 +359,13 @@ void VortexEngine::runMainLogic()
bool VortexEngine::serializeVersion(ByteStream &stream)
{
// serialize the vortex version
- return stream.serialize((uint8_t)VORTEX_VERSION_MAJOR) &&
- stream.serialize((uint8_t)VORTEX_VERSION_MINOR);
+ if (!stream.serialize8((uint8_t)VORTEX_VERSION_MAJOR)) {
+ return false;
+ }
+ if (!stream.serialize8((uint8_t)VORTEX_VERSION_MINOR)) {
+ return false;
+ }
+ return true;
}
bool VortexEngine::checkVersion(uint8_t major, uint8_t minor)
diff --git a/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test b/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test
index f77cae1d99..5995ed6f62 100644
--- a/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test
+++ b/VortexEngine/tests/tests_general/0004_End_Auto-cycle.test
@@ -1,4 +1,4 @@
-Input=w2000r10w5000r10w5000q
+Input=w2000r10w5000cw5000q
Brief=end the auto-cycle mode
Args=
--------------------------------------------------------------------------------
@@ -7005,5005 +7005,5005 @@ FF0057FF0057
000000000000
000000000000
FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+6C00FF00FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+00FE8900FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF00FE89
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+6A0000003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+F3FF00003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF003FFF
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+00FF3CFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+5057FFFF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000FF00BD
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+003FFF00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+FF00BD00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C00FF3C
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+6C00FF5057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+00FE895057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF5057FF
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+6A00006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+F3FF006A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF6A0000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+003FFF000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+FF00BD000000
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+00FF3CF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+5057FFF3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000F3FF00
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+6C00FF000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+00FE89000000
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+003FFF6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+FF00BD6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C6C00FF
+00FF3C000000
+00FF3C000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+5057FF000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+6A0000000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
+F3FF00000000
diff --git a/VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test b/VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test
index cefa3731b2..2d009a10e6 100644
--- a/VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test
+++ b/VortexEngine/tests/tests_general/0014_Enter_Adv_Mode_Share.test
@@ -36,36 +36,133 @@ Args=
707070000000
000000000000
000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
000000000000
000000000000
000000000000
@@ -91,249 +188,152 @@ FF0000000000
000000000000
000000000000
000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
diff --git a/VortexEngine/tests/tests_general/0015_Enter_Adv_Color_Select.test b/VortexEngine/tests/tests_general/0015_Enter_Adv_Color_Select.test
deleted file mode 100644
index 4f5b14f812..0000000000
--- a/VortexEngine/tests/tests_general/0015_Enter_Adv_Color_Select.test
+++ /dev/null
@@ -1,340 +0,0 @@
-Input=mw30c2aw300q
-Brief=go to the adv color select menu
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-000000000000
-000000000000
-000000000000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
-007000007000
diff --git a/VortexEngine/tests/tests_general/0016_Enter_Adv_Pattern_Select.test b/VortexEngine/tests/tests_general/0016_Enter_Adv_Pattern_Select.test
deleted file mode 100644
index 482239a004..0000000000
--- a/VortexEngine/tests/tests_general/0016_Enter_Adv_Pattern_Select.test
+++ /dev/null
@@ -1,341 +0,0 @@
-Input=mw30c3aw300q
-Brief=go to the adv pattern select menu
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
diff --git a/VortexEngine/tests/tests_general/0023_Stop_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0023_Stop_Auto-randomizer_Both_Bulbs.test
index dd4f7b135f..e5e9582b4a 100644
--- a/VortexEngine/tests/tests_general/0023_Stop_Auto-randomizer_Both_Bulbs.test
+++ b/VortexEngine/tests/tests_general/0023_Stop_Auto-randomizer_Both_Bulbs.test
@@ -1,4 +1,4 @@
-Input=mwllr3w3000r3w3000q
+Input=mwllr3w3000cw3000q
Brief=enter randomizer select both bulbs stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0027_Stop_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0027_Stop_Auto-randomizer_Front_Bulb.test
index 05e1110d2f..2d7805b819 100644
--- a/VortexEngine/tests/tests_general/0027_Stop_Auto-randomizer_Front_Bulb.test
+++ b/VortexEngine/tests/tests_general/0027_Stop_Auto-randomizer_Front_Bulb.test
@@ -1,4 +1,4 @@
-Input=mlclr3w3000r3w3000q
+Input=mlclr3w3000cw3000q
Brief=enter randomizer select front bulb stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0031_Stop_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0031_Stop_Auto-randomizer_Top_Bulb.test
index d95d0e6e53..37bf16cd2a 100644
--- a/VortexEngine/tests/tests_general/0031_Stop_Auto-randomizer_Top_Bulb.test
+++ b/VortexEngine/tests/tests_general/0031_Stop_Auto-randomizer_Top_Bulb.test
@@ -1,4 +1,4 @@
-Input=mlc2lr3w3000r3w3000q
+Input=mlc2lr3w3000cw3000q
Brief=enter randomizer select top bulb stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0037_Stop_Color_Only_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0037_Stop_Color_Only_Auto-randomizer_Both_Bulbs.test
index 7acbf580c6..e227fe62b4 100644
--- a/VortexEngine/tests/tests_general/0037_Stop_Color_Only_Auto-randomizer_Both_Bulbs.test
+++ b/VortexEngine/tests/tests_general/0037_Stop_Color_Only_Auto-randomizer_Both_Bulbs.test
@@ -1,4 +1,4 @@
-Input=mallr3w3000r3w3000q
+Input=mallr3w3000cw3000q
Brief=enter adv randomizer select both bulbs select color only stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0041_Stop_Pattern_Only_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0041_Stop_Pattern_Only_Auto-randomizer_Both_Bulbs.test
index f712469a17..e294d2e89b 100644
--- a/VortexEngine/tests/tests_general/0041_Stop_Pattern_Only_Auto-randomizer_Both_Bulbs.test
+++ b/VortexEngine/tests/tests_general/0041_Stop_Pattern_Only_Auto-randomizer_Both_Bulbs.test
@@ -1,4 +1,4 @@
-Input=malclr3w3000r3w3000q
+Input=malclr3w3000cw3000q
Brief=enter adv randomizer select both bulbs select pattern only stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0045_Stop_Color_and_Pattern_Auto-randomizer_Both_Bulbs.test b/VortexEngine/tests/tests_general/0045_Stop_Color_and_Pattern_Auto-randomizer_Both_Bulbs.test
index 4da0b59b10..f71eabff79 100644
--- a/VortexEngine/tests/tests_general/0045_Stop_Color_and_Pattern_Auto-randomizer_Both_Bulbs.test
+++ b/VortexEngine/tests/tests_general/0045_Stop_Color_and_Pattern_Auto-randomizer_Both_Bulbs.test
@@ -1,4 +1,4 @@
-Input=malc2lr3w3000r3w3000q
+Input=malc2lr3w3000cw3000q
Brief=enter adv randomizer select both bulbs select color and pattern stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0050_Stop_Color_Only_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0050_Stop_Color_Only_Auto-randomizer_Front_Bulb.test
index 0d909ee5cb..94003fa8f0 100644
--- a/VortexEngine/tests/tests_general/0050_Stop_Color_Only_Auto-randomizer_Front_Bulb.test
+++ b/VortexEngine/tests/tests_general/0050_Stop_Color_Only_Auto-randomizer_Front_Bulb.test
@@ -1,4 +1,4 @@
-Input=macllcr3w3000r3w3000q
+Input=macllcr3w3000cw3000q
Brief=enter adv randomizer select front bulb select color only stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0054_Stop_Pattern_Only_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0054_Stop_Pattern_Only_Auto-randomizer_Front_Bulb.test
index ab4acf72cd..c75a9ebe43 100644
--- a/VortexEngine/tests/tests_general/0054_Stop_Pattern_Only_Auto-randomizer_Front_Bulb.test
+++ b/VortexEngine/tests/tests_general/0054_Stop_Pattern_Only_Auto-randomizer_Front_Bulb.test
@@ -1,4 +1,4 @@
-Input=maclclr3w3000r3w3000q
+Input=maclclr3w3000cw3000q
Brief=enter adv randomizer select front bulb select pattern only stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0058_Stop_Color_and_Pattern_Auto-randomizer_Front_Bulb.test b/VortexEngine/tests/tests_general/0058_Stop_Color_and_Pattern_Auto-randomizer_Front_Bulb.test
index bfb124a924..8aa4284330 100644
--- a/VortexEngine/tests/tests_general/0058_Stop_Color_and_Pattern_Auto-randomizer_Front_Bulb.test
+++ b/VortexEngine/tests/tests_general/0058_Stop_Color_and_Pattern_Auto-randomizer_Front_Bulb.test
@@ -1,4 +1,4 @@
-Input=maclc2lr3w3000r3w3000q
+Input=maclc2lr3w3000cw3000q
Brief=enter adv randomizer select front bulb select color and pattern stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0063_Stop_Color_Only_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0063_Stop_Color_Only_Auto-randomizer_Top_Bulb.test
index fe9aca6c74..0bc72ec0d0 100644
--- a/VortexEngine/tests/tests_general/0063_Stop_Color_Only_Auto-randomizer_Top_Bulb.test
+++ b/VortexEngine/tests/tests_general/0063_Stop_Color_Only_Auto-randomizer_Top_Bulb.test
@@ -1,4 +1,4 @@
-Input=mac2llr3w3000r3w3000q
+Input=mac2llr3w3000cw3000q
Brief=enter adv randomizer select top bulb select color only stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0067_Stop_Pattern_Only_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0067_Stop_Pattern_Only_Auto-randomizer_Top_Bulb.test
index 40527c6bd6..95198e486e 100644
--- a/VortexEngine/tests/tests_general/0067_Stop_Pattern_Only_Auto-randomizer_Top_Bulb.test
+++ b/VortexEngine/tests/tests_general/0067_Stop_Pattern_Only_Auto-randomizer_Top_Bulb.test
@@ -1,4 +1,4 @@
-Input=mac2lclr3w3000r3w3000q
+Input=mac2lclr3w3000cw3000q
Brief=enter adv randomizer select top bulb select pattern only stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0071_Stop_Color_and_Pattern_Auto-randomizer_Top_Bulb.test b/VortexEngine/tests/tests_general/0071_Stop_Color_and_Pattern_Auto-randomizer_Top_Bulb.test
index 7aee758103..1c065725dd 100644
--- a/VortexEngine/tests/tests_general/0071_Stop_Color_and_Pattern_Auto-randomizer_Top_Bulb.test
+++ b/VortexEngine/tests/tests_general/0071_Stop_Color_and_Pattern_Auto-randomizer_Top_Bulb.test
@@ -1,4 +1,4 @@
-Input=mac2lc2lr3w3000r3w3000q
+Input=mac2lc2lr3w3000cw3000q
Brief=enter adv randomizer select top bulb select color and pattern stop auto-randomizer
Args=
--------------------------------------------------------------------------------
diff --git a/VortexEngine/tests/tests_general/0074_Reveice_a_mode_in_adv_mode_sharing.test b/VortexEngine/tests/tests_general/0074_Reveice_a_mode_in_adv_mode_sharing.test
index c55ad19716..93e72a0fa3 100644
--- a/VortexEngine/tests/tests_general/0074_Reveice_a_mode_in_adv_mode_sharing.test
+++ b/VortexEngine/tests/tests_general/0074_Reveice_a_mode_in_adv_mode_sharing.test
@@ -6,36 +6,163 @@ Args=
707070000000
000000000000
000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
000000000000
000000000000
000000000000
@@ -61,249 +188,122 @@ FF0000000000
000000000000
000000000000
000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
000000000000
000000000000
000000000000
000000000000
000000000000
000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
+007070007070
diff --git a/VortexEngine/tests/tests_general/0075_Exit_adv_mode_sharing.test b/VortexEngine/tests/tests_general/0075_Exit_adv_mode_sharing.test
index 6b0d4a2143..55e026973b 100644
--- a/VortexEngine/tests/tests_general/0075_Exit_adv_mode_sharing.test
+++ b/VortexEngine/tests/tests_general/0075_Exit_adv_mode_sharing.test
@@ -6,305 +6,305 @@ Args=
707070000000
000000000000
000000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
+007070007070
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
+101010101010
diff --git a/VortexEngine/tests/tests_general/0138_Cycle_bulbs_in_Adv_Pattern_Select.test b/VortexEngine/tests/tests_general/0138_Cycle_bulbs_in_Adv_Pattern_Select.test
deleted file mode 100644
index 221d9395b0..0000000000
--- a/VortexEngine/tests/tests_general/0138_Cycle_bulbs_in_Adv_Pattern_Select.test
+++ /dev/null
@@ -1,914 +0,0 @@
-Input=mc3acw300cw300cw300q
-Brief=cycle through the bulb options in adv pattern select
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000070000000
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000000000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
-000070000070
diff --git a/VortexEngine/tests/tests_general/0139_Increase_Param_1_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0139_Increase_Param_1_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 0f3125b3a4..0000000000
--- a/VortexEngine/tests/tests_general/0139_Increase_Param_1_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,313 +0,0 @@
-Input=mc3alcw300q
-Brief=enter adv pattern select select both bulbs increase param 1
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0140_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0140_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 1205dbd141..0000000000
--- a/VortexEngine/tests/tests_general/0140_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,314 +0,0 @@
-Input=mc3alr2w300q
-Brief=enter adv pattern select select both bulbs increase param 1 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0141_Increase_Param_2_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0141_Increase_Param_2_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index beea325cc4..0000000000
--- a/VortexEngine/tests/tests_general/0141_Increase_Param_2_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,314 +0,0 @@
-Input=mc3al2cw300q
-Brief=enter adv pattern select select both bulbs select param 1 increase param 2
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
diff --git a/VortexEngine/tests/tests_general/0142_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0142_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 31e5b46e9d..0000000000
--- a/VortexEngine/tests/tests_general/0142_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,315 +0,0 @@
-Input=mc3al2r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 increase param 2 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0143_Increase_Param_3_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0143_Increase_Param_3_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index cb55e1581e..0000000000
--- a/VortexEngine/tests/tests_general/0143_Increase_Param_3_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,315 +0,0 @@
-Input=mc3al3cw300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 increase param 3
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0144_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0144_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 94603465b8..0000000000
--- a/VortexEngine/tests/tests_general/0144_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,316 +0,0 @@
-Input=mc3al3r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 increase param 3 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
diff --git a/VortexEngine/tests/tests_general/0145_Increase_Param_4_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0145_Increase_Param_4_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 282683600f..0000000000
--- a/VortexEngine/tests/tests_general/0145_Increase_Param_4_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,316 +0,0 @@
-Input=mc3al4cw300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 increase param 4
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0146_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0146_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 9bb125b249..0000000000
--- a/VortexEngine/tests/tests_general/0146_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,317 +0,0 @@
-Input=mc3al4r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 increase param 4 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0147_Increase_Param_5_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0147_Increase_Param_5_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index ceb429154d..0000000000
--- a/VortexEngine/tests/tests_general/0147_Increase_Param_5_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,317 +0,0 @@
-Input=mc3al5cw300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 select param 4 increase param 5
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0148_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0148_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 28a555b689..0000000000
--- a/VortexEngine/tests/tests_general/0148_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,318 +0,0 @@
-Input=mc3al5r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 select param 4 increase param 5 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0149_Save_Custom_Pattern_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0149_Save_Custom_Pattern_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 83cb8d4291..0000000000
--- a/VortexEngine/tests/tests_general/0149_Save_Custom_Pattern_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,318 +0,0 @@
-Input=mc3al6w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 select param 4 select param 5
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000070000070
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0150_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0150_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index a6456c4312..0000000000
--- a/VortexEngine/tests/tests_general/0150_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,325 +0,0 @@
-Input=mc3al5c9w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 select param 4 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0151_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0151_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 6fe0788b65..0000000000
--- a/VortexEngine/tests/tests_general/0151_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,335 +0,0 @@
-Input=mc3al4r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 select param 3 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0152_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0152_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 904ffcad5a..0000000000
--- a/VortexEngine/tests/tests_general/0152_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,336 +0,0 @@
-Input=mc3al3r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 select param 2 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0153_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0153_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index 9156c1a8f3..0000000000
--- a/VortexEngine/tests/tests_general/0153_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,333 +0,0 @@
-Input=mc3al2r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select both bulbs select param 1 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
diff --git a/VortexEngine/tests/tests_general/0154_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Both_Bulbs.test b/VortexEngine/tests/tests_general/0154_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Both_Bulbs.test
deleted file mode 100644
index a85cc65b15..0000000000
--- a/VortexEngine/tests/tests_general/0154_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Both_Bulbs.test
+++ /dev/null
@@ -1,332 +0,0 @@
-Input=mc3alr2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select both bulbs cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000070
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0155_Increase_Param_1_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0155_Increase_Param_1_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 775bbc1ab4..0000000000
--- a/VortexEngine/tests/tests_general/0155_Increase_Param_1_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,314 +0,0 @@
-Input=mc3aclcw300q
-Brief=enter adv pattern select select front bulb increase param 1
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0156_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0156_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 6721c2fc47..0000000000
--- a/VortexEngine/tests/tests_general/0156_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,315 +0,0 @@
-Input=mc3aclr2w300q
-Brief=enter adv pattern select select front bulb increase param 1 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0157_Increase_Param_2_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0157_Increase_Param_2_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 0ae8512099..0000000000
--- a/VortexEngine/tests/tests_general/0157_Increase_Param_2_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,315 +0,0 @@
-Input=mc3acl2cw300q
-Brief=enter adv pattern select select front bulb select param 1 increase param 2
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF000000FF
-00FF000000FF
diff --git a/VortexEngine/tests/tests_general/0158_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0158_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 9a23c12eb1..0000000000
--- a/VortexEngine/tests/tests_general/0158_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,316 +0,0 @@
-Input=mc3acl2r2w300q
-Brief=enter adv pattern select select front bulb select param 1 increase param 2 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0159_Increase_Param_3_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0159_Increase_Param_3_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 73d74e2339..0000000000
--- a/VortexEngine/tests/tests_general/0159_Increase_Param_3_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,316 +0,0 @@
-Input=mc3acl3cw300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 increase param 3
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0160_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0160_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 71621e5d57..0000000000
--- a/VortexEngine/tests/tests_general/0160_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,317 +0,0 @@
-Input=mc3acl3r2w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 increase param 3 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-FF00000000FF
diff --git a/VortexEngine/tests/tests_general/0161_Increase_Param_4_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0161_Increase_Param_4_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 29f3efe791..0000000000
--- a/VortexEngine/tests/tests_general/0161_Increase_Param_4_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,317 +0,0 @@
-Input=mc3acl4cw300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 increase param 4
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-FF00000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0162_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0162_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index f057a623f1..0000000000
--- a/VortexEngine/tests/tests_general/0162_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,318 +0,0 @@
-Input=mc3acl4r2w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 increase param 4 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0163_Increase_Param_5_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0163_Increase_Param_5_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 4abd830041..0000000000
--- a/VortexEngine/tests/tests_general/0163_Increase_Param_5_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,318 +0,0 @@
-Input=mc3acl5cw300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 select param 4 increase param 5
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0164_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0164_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 525ac677d1..0000000000
--- a/VortexEngine/tests/tests_general/0164_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,319 +0,0 @@
-Input=mc3acl5r2w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 select param 4 increase param 5 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0165_Save_Custom_Pattern_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0165_Save_Custom_Pattern_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index c314d0fdd0..0000000000
--- a/VortexEngine/tests/tests_general/0165_Save_Custom_Pattern_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,319 +0,0 @@
-Input=mc3acl6w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 select param 4 select param 5
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000070000070
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0166_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0166_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 076632768e..0000000000
--- a/VortexEngine/tests/tests_general/0166_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,326 +0,0 @@
-Input=mc3acl5c9w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 select param 4 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0167_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0167_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index 779f93a0a4..0000000000
--- a/VortexEngine/tests/tests_general/0167_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,336 +0,0 @@
-Input=mc3acl4r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 select param 3 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0168_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0168_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index f69752b748..0000000000
--- a/VortexEngine/tests/tests_general/0168_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,336 +0,0 @@
-Input=mc3acl3r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select front bulb select param 1 select param 2 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0169_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0169_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index e41d9988ac..0000000000
--- a/VortexEngine/tests/tests_general/0169_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,334 +0,0 @@
-Input=mc3acl2r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select front bulb select param 1 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
diff --git a/VortexEngine/tests/tests_general/0170_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Front_Bulb.test b/VortexEngine/tests/tests_general/0170_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Front_Bulb.test
deleted file mode 100644
index ab2d73cfe3..0000000000
--- a/VortexEngine/tests/tests_general/0170_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Front_Bulb.test
+++ /dev/null
@@ -1,333 +0,0 @@
-Input=mc3aclr2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select front bulb cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000070000000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0171_Increase_Param_1_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0171_Increase_Param_1_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 69b938a4f5..0000000000
--- a/VortexEngine/tests/tests_general/0171_Increase_Param_1_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,315 +0,0 @@
-Input=mc3ac2lcw300q
-Brief=enter adv pattern select select top bulb increase param 1
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0172_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0172_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index a44222ebaf..0000000000
--- a/VortexEngine/tests/tests_general/0172_Increase_Param_1_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,316 +0,0 @@
-Input=mc3ac2lr2w300q
-Brief=enter adv pattern select select top bulb increase param 1 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0173_Increase_Param_2_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0173_Increase_Param_2_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index f7f40ef127..0000000000
--- a/VortexEngine/tests/tests_general/0173_Increase_Param_2_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,316 +0,0 @@
-Input=mc3ac2l2cw300q
-Brief=enter adv pattern select select top bulb select param 1 increase param 2
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-0000FF00FF00
-0000FF00FF00
diff --git a/VortexEngine/tests/tests_general/0174_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0174_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index ed05c31282..0000000000
--- a/VortexEngine/tests/tests_general/0174_Increase_Param_2_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,317 +0,0 @@
-Input=mc3ac2l2r2w300q
-Brief=enter adv pattern select select top bulb select param 1 increase param 2 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0175_Increase_Param_3_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0175_Increase_Param_3_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 933c8cb6d4..0000000000
--- a/VortexEngine/tests/tests_general/0175_Increase_Param_3_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,317 +0,0 @@
-Input=mc3ac2l3cw300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 increase param 3
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0176_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0176_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 96064a160a..0000000000
--- a/VortexEngine/tests/tests_general/0176_Increase_Param_3_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,318 +0,0 @@
-Input=mc3ac2l3r2w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 increase param 3 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FFFF0000
diff --git a/VortexEngine/tests/tests_general/0177_Increase_Param_4_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0177_Increase_Param_4_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 5d2834afdd..0000000000
--- a/VortexEngine/tests/tests_general/0177_Increase_Param_4_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,318 +0,0 @@
-Input=mc3ac2l4cw300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 increase param 4
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FFFF0000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0178_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0178_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 646d3cd1af..0000000000
--- a/VortexEngine/tests/tests_general/0178_Increase_Param_4_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,319 +0,0 @@
-Input=mc3ac2l4r2w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 increase param 4 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0179_Increase_Param_5_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0179_Increase_Param_5_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 73b8a9d3b8..0000000000
--- a/VortexEngine/tests/tests_general/0179_Increase_Param_5_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,319 +0,0 @@
-Input=mc3ac2l5cw300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 select param 4 increase param 5
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0180_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0180_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 77fcccd7da..0000000000
--- a/VortexEngine/tests/tests_general/0180_Increase_Param_5_to_next_10_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,320 +0,0 @@
-Input=mc3ac2l5r2w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 select param 4 increase param 5 to next 10
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0181_Save_Custom_Pattern_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0181_Save_Custom_Pattern_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 63659a1914..0000000000
--- a/VortexEngine/tests/tests_general/0181_Save_Custom_Pattern_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,320 +0,0 @@
-Input=mc3ac2l6w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 select param 4 select param 5
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000070000070
-000070000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
diff --git a/VortexEngine/tests/tests_general/0182_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0182_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 2f0f6c5efd..0000000000
--- a/VortexEngine/tests/tests_general/0182_Cycle_Through_Param_5_Options_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,327 +0,0 @@
-Input=mc3ac2l5c9w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 select param 4 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0183_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0183_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index c14851c117..0000000000
--- a/VortexEngine/tests/tests_general/0183_Cycle_Through_Param_4_Options_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,337 +0,0 @@
-Input=mc3ac2l4r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 select param 3 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0184_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0184_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 5be155221c..0000000000
--- a/VortexEngine/tests/tests_general/0184_Cycle_Through_Param_3_Options_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,337 +0,0 @@
-Input=mc3ac2l3r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select top bulb select param 1 select param 2 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0185_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0185_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index 0acbaaddca..0000000000
--- a/VortexEngine/tests/tests_general/0185_Cycle_Through_Param_2_Options_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,335 +0,0 @@
-Input=mc3ac2l2r2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select top bulb select param 1 cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-FF0000FF0000
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FF000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-FF0000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-00FF00000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000FF000000
-0000FF000000
diff --git a/VortexEngine/tests/tests_general/0186_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Top_Bulb.test b/VortexEngine/tests/tests_general/0186_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Top_Bulb.test
deleted file mode 100644
index d8624a3dcd..0000000000
--- a/VortexEngine/tests/tests_general/0186_Cycle_Through_Param_1_Options_in_Adv_Pattern_Select_Top_Bulb.test
+++ /dev/null
@@ -1,334 +0,0 @@
-Input=mc3ac2lr2r2r2r2r2r2r2r2r2r2w300q
-Brief=enter adv pattern select select top bulb cycle all options
-Args=
---------------------------------------------------------------------------------
-000000000000
-707070000000
-000000000000
-000000000000
-000000000000
-000000000000
-000070000000
-000000000070
-000000000070
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-1C1C001C1C00
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-FF0000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-00FF00FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-0000FFFF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000FF0000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-FF000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00FF0000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-0000FF00FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-00000000FF00
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-000000000000
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000FF0000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-FF00000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-00FF000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000000000FF
-0000FF0000FF
-0000FF0000FF
diff --git a/avrsize.sh b/avrsize.sh
index 4bf59662e6..5b3b07ce6b 100644
--- a/avrsize.sh
+++ b/avrsize.sh
@@ -12,7 +12,7 @@ fi
ELF_FILE=$1
if [ "$ELF_FILE" == "" ]; then
- echo "Please specify a file: $0 "
+ echo "Please specify a file: $0 [max flash size]"
exit 1
fi
@@ -41,6 +41,16 @@ DYNAMIC_MEMORY_USED=$((DATA_SIZE + BSS_SIZE))
PROGRAM_STORAGE_PERCENT=$(awk -v used="$PROGRAM_STORAGE_USED" -v total="$PROGRAM_STORAGE" 'BEGIN { printf("%.2f", used / total * 100) }')
DYNAMIC_MEMORY_PERCENT=$(awk -v used="$DYNAMIC_MEMORY_USED" -v total="$DYNAMIC_MEMORY" 'BEGIN { printf("%.2f", used / total * 100) }')
+# if a max flash size was passed then compare it against the amount used
+if [ ! -z "$2" ] && [ "$(printf '%d' $2)" -lt "$(printf '%d' $PROGRAM_STORAGE_USED)" ]; then
+ echo "---------"
+ echo "Failure! Program space: 0x$(printf '%x' $PROGRAM_STORAGE_USED) larger than allowed: 0x$(printf '%x' $2)"
+ echo "Reduce program size within 0x$(printf '%x' $2), or reduce flash storage space then adjust BOOTEND in the Makefile"
+ #exit 1
+fi
+
# Display the results
-echo "Sketch uses $PROGRAM_STORAGE_USED bytes ($PROGRAM_STORAGE_PERCENT%) of program storage space. Maximum is $PROGRAM_STORAGE bytes. (Hex: $(printf '%x' $PROGRAM_STORAGE_USED)/$(printf '%x' $PROGRAM_STORAGE))"
-echo "Global variables use $DYNAMIC_MEMORY_USED bytes ($DYNAMIC_MEMORY_PERCENT%) of dynamic memory, leaving $(($DYNAMIC_MEMORY - $DYNAMIC_MEMORY_USED)) bytes for local variables. Maximum is $DYNAMIC_MEMORY bytes. (Hex: $(printf '%x' $DYNAMIC_MEMORY_USED)/$(printf '%x' $DYNAMIC_MEMORY))"
+echo "Success! Program uses $PROGRAM_STORAGE_USED/$PROGRAM_STORAGE or $(printf '0x%x' $PROGRAM_STORAGE_USED)/$(printf '0x%x' $PROGRAM_STORAGE) bytes of flash space ($PROGRAM_STORAGE_PERCENT%)"
+echo "Global variables use $DYNAMIC_MEMORY_USED/$DYNAMIC_MEMORY or $(printf '0x%x' $DYNAMIC_MEMORY_USED)/$(printf '0x%x' $DYNAMIC_MEMORY) bytes of SRAM ($DYNAMIC_MEMORY_PERCENT%)"
+
+