Daniel/duo/unserialize harden

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

VortexEngine/VortexEngine.cppproj

@@ -266,9 +266,6 @@
     <Compile Include="src\Patterns\Multi\LighthousePattern.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="src\Patterns\Multi\MateriaPattern.cpp">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="src\Patterns\Multi\MeteorPattern.cpp">
       <SubType>compile</SubType>
     </Compile>
@@ -455,9 +452,6 @@
     <Compile Include="src\Patterns\Multi\LighthousePattern.h">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="src\Patterns\Multi\MateriaPattern.h">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="src\Patterns\Multi\MeteorPattern.h">
       <SubType>compile</SubType>
     </Compile>
@@ -606,4 +600,4 @@
     <Folder Include="src\Wireless\" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
-</Project>
+</Project>

VortexEngine/src/Colors/Colorset.cpp

@@ -466,36 +466,51 @@ void Colorset::serialize(ByteStream &buffer) const
   }
 }
 
-void Colorset::unserialize(ByteStream &buffer)
+bool Colorset::unserialize(ByteStream &buffer)
 {
-  buffer.unserialize(&m_numColors);
-  initPalette(m_numColors);
+  if (!buffer.unserialize(&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.unserialize(&m_palette[i].red)) {
+      return false;
+    }
   }
   for (uint8_t i = 0; i < m_numColors; ++i) {
-    buffer.unserialize(&m_palette[i].green);
+    if (!buffer.unserialize(&m_palette[i].green)) {
+      return false;
+    }
   }
   for (uint8_t i = 0; i < m_numColors; ++i) {
-    buffer.unserialize(&m_palette[i].blue);
+    if (!buffer.unserialize(&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;
+    return true;
   }
   //m_palette = (RGBColor *)vcalloc(numColors, sizeof(RGBColor));
   m_palette = new RGBColor[numColors];
   if (!m_palette) {
     ERROR_OUT_OF_MEMORY();
-    return;
+    return false;
   }
   m_numColors = numColors;
+  return true;
 }
 

VortexEngine/src/Colors/Colorset.h

@@ -144,11 +144,11 @@ class Colorset
 
   // serialize the colorset to save/load
   void serialize(ByteStream &buffer) const;
-  void unserialize(ByteStream &buffer);
+  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;

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

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);

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;