Clone flash operations into EEPROM operations

src/python/adgui.py

@@ -292,6 +292,7 @@ class adgui(QObject):
         gsc = QGraphicsScene()
         gsc.addPixmap(logo)
         self.memories.avr.setScene(gsc)
+        self.memories.ee_avr.setScene(gsc)
 
         self.adgui.show()
 
@@ -350,6 +351,12 @@ class adgui(QObject):
             self.memories.erase.pressed.connect(self.chip_erase)
             self.memories.clear.pressed.connect(self.clear_buffer)
             self.memories.filename.editingFinished.connect(self.detect_flash_file)
+            self.memories.ee_choose.pressed.connect(self.ask_eeprom_file)
+            self.memories.ee_read.pressed.connect(self.eeprom_read)
+            self.memories.ee_program.pressed.connect(self.eeprom_write)
+            self.memories.ee_save.pressed.connect(self.eeprom_save)
+            self.memories.ee_load.pressed.connect(self.eeprom_load)
+            self.memories.ee_filename.editingFinished.connect(self.detect_eeprom_file)
             self.load_settings()
 
         self.buffer_empty = 'background-color: rgb(255,240,240);'
@@ -721,7 +728,7 @@ class adgui(QObject):
             self.log("No data to write into 'flash' memory", ad.MSG_WARNING)
             return
         amnt = ad.avr_write_mem(self.pgm, self.dev, m, self.flash_size)
-        self.log(f"Programmed {amnt}  bytes")
+        self.log(f"Programmed {amnt} bytes")
 
     def clear_buffer(self):
         m = ad.avr_locate_mem(self.dev, 'flash')
@@ -767,7 +774,7 @@ class adgui(QObject):
             fmt = ad.FMT_AUTO
         elif self.memories.ffELF.isChecked():
             fmt = ad.FMT_ELF
-        if self.memories.ffIhex.isChecked():
+        elif self.memories.ffIhex.isChecked():
             fmt = ad.FMT_IHEX
         elif self.memories.ffSrec.isChecked():
             fmt = ad.FMT_SREC
@@ -815,6 +822,129 @@ class adgui(QObject):
             except Exception as e:
                 self.log(f"Cannot write log file: {str(e)}", ad.LOG_WXT_ERROR)
 
+    def ask_eeprom_file(self):
+        dlg = QFileDialog(caption = "Select file",
+                          filter = "Load files (*.elf *.hex *.eep *.srec *.bin);; All Files (*)")
+        if dlg.exec():
+            self.memories.ee_filename.setText(dlg.selectedFiles()[0])
+            self.detect_eeprom_file()
+
+    def detect_eeprom_file(self):
+        # If file exists, try finding out real format. If file doesn't
+        # exist, try guessing the intended file format based on the
+        # suffix.
+        fname = self.memories.ee_filename.text()
+        if len(fname) > 0:
+            self.eepromname = fname
+            self.memories.ee_load.setEnabled(True)
+            self.memories.ee_save.setEnabled(True)
+        else:
+            # no filename, disable load/save buttons
+            self.eepromname = None
+            self.memories.ee_load.setEnabled(False)
+            self.memories.ee_save.setEnabled(False)
+            return
+        p = pathlib.Path(fname)
+        if p.is_file():
+            fmt = ad.fileio_fmt_autodetect(fname)
+            if fmt == ad.FMT_ELF:
+                self.memories.ee_ffELF.setChecked(True)
+            elif fmt == ad.FMT_IHEX:
+                self.memories.ee_ffIhex.setChecked(True)
+            elif fmt == ad.FMT_SREC:
+                self.memories.ee_ffSrec.setChecked(True)
+        else:
+            if fname.endswith('.hex') or fname.endswith('.ihex') \
+               or fname.endswith('.eep'): # common name for EEPROM Intel hex files
+                self.memories.ee_ffIhex.setChecked(True)
+            elif fname.endswith('.srec'):
+                self.memories.ee_ffSrec.setChecked(True)
+            elif fname.endswith('.bin'):
+                self.memories.ee_ffRbin.setChecked(True)
+
+    def eeprom_read(self):
+        self.adgui.progressBar.setEnabled(True)
+        m = ad.avr_locate_mem(self.dev, 'eeprom')
+        if not m:
+            self.log("Could not find 'eeprom' memory", ad.MSG_ERROR)
+            return
+        amnt = ad.avr_read_mem(self.pgm, self.dev, m)
+        self.eeprom_size = amnt
+        self.log(f"Read {amnt} bytes")
+        if amnt > 0:
+            self.memories.ee_buffer.setStyleSheet(self.buffer_full)
+
+    def eeprom_write(self):
+        self.adgui.progressBar.setEnabled(True)
+        m = ad.avr_locate_mem(self.dev, 'eeprom')
+        if not m:
+            self.log("Could not find 'eeprom' memory", ad.MSG_ERROR)
+            return
+        if self.eeprom_size == 0:
+            self.log("No data to write into 'eeprom' memory", ad.MSG_WARNING)
+            return
+        amnt = ad.avr_write_mem(self.pgm, self.dev, m, self.eeprom_size)
+        self.log(f"Programmed {amnt} bytes")
+
+    def clear_buffer(self):
+        m = ad.avr_locate_mem(self.dev, 'eeprom')
+        if not m:
+            self.log("Could not find 'eeprom' memory", ad.MSG_ERROR)
+            return
+        m.clear(m.size)
+        self.log(f"Cleared {m.size} bytes of buffer, and allocation flags")
+        self.eeprom_size = 0
+        self.memories.ee_buffer.setStyleSheet(self.buffer_empty)
+
+    def eeprom_save(self):
+        if self.memories.ee_ffAuto.isChecked() or \
+           self.memories.ee_ffELF.isChecked():
+            self.log("Auto or ELF are not valid for saving files", ad.MSG_ERROR)
+            return
+        if self.memories.ee_ffIhex.isChecked():
+            fmt = ad.FMT_IHEX
+        elif self.memories.ee_ffSrec.isChecked():
+            fmt = ad.FMT_SREC
+        elif self.memories.ee_ffRbin.isChecked():
+            fmt = ad.FMT_RBIN
+        else:
+            self.log("Internal error: cannot determine file format", ad.MSG_ERROR)
+            return
+        fname = self.eepromname
+        p = pathlib.Path(fname)
+        if p.is_file():
+            result = QMessageBox.question(self.memories,
+                                          f"Overwrite {fname}?",
+                                          f"Do you want to overwrite {fname}?")
+            if result != QMessageBox.StandardButton.Yes:
+                return
+        if self.eeprom_size != 0:
+            amnt = self.eeprom_size
+        else:
+            amnt = -1
+        amnt = ad.fileio(ad.FIO_WRITE, self.eepromname, fmt, self.dev, "eeprom", amnt)
+        self.log(f"Wrote {amnt} bytes to {self.eepromname}")
+
+    def eeprom_load(self):
+        if self.memories.ee_ffAuto.isChecked():
+            fmt = ad.FMT_AUTO
+        elif self.memories.ee_ffELF.isChecked():
+            fmt = ad.FMT_ELF
+        elif self.memories.ee_ffIhex.isChecked():
+            fmt = ad.FMT_IHEX
+        elif self.memories.ee_ffSrec.isChecked():
+            fmt = ad.FMT_SREC
+        elif self.memories.ee_ffRbin.isChecked():
+            fmt = ad.FMT_RBIN
+        else:
+            self.log("Internal error: cannot determine file format", ad.MSG_ERROR)
+            return
+        amnt = ad.fileio(ad.FIO_READ, self.eepromname, fmt, self.dev, "eeprom", -1)
+        self.log(f"Read {amnt} bytes from {self.eepromname}")
+        self.eeprom_size = amnt
+        if amnt > 0:
+            self.memories.ee_buffer.setStyleSheet(self.buffer_full)
+
 def main():
     gui = adgui(sys.argv)
 

src/python/memories.ui

@@ -418,7 +418,7 @@ color: rgb(180, 180, 180);</string>
        </rect>
       </property>
       <property name="toolTip">
-       <string>Read devuce into buffer</string>
+       <string>Read device into buffer</string>
       </property>
       <property name="text">
        <string>Read →</string>
@@ -481,6 +481,266 @@ color: rgb(180, 180, 180);</string>
     <attribute name="title">
      <string>EEPROM</string>
     </attribute>
+    <widget class="QLabel" name="ee_buffer">
+     <property name="geometry">
+      <rect>
+       <x>560</x>
+       <y>50</y>
+       <width>101</width>
+       <height>251</height>
+      </rect>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color: rgb(255,240,240);</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Box</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+     <property name="text">
+      <string>Buffer</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+    <widget class="QGroupBox" name="groupBox_7">
+     <property name="geometry">
+      <rect>
+       <x>40</x>
+       <y>30</y>
+       <width>481</width>
+       <height>191</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string>File:</string>
+     </property>
+     <widget class="QPushButton" name="ee_load">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>370</x>
+        <y>60</y>
+        <width>83</width>
+        <height>25</height>
+       </rect>
+      </property>
+      <property name="toolTip">
+       <string>Load section from file into buffer</string>
+      </property>
+      <property name="text">
+       <string>Load →</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="ee_save">
+      <property name="enabled">
+       <bool>false</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>370</x>
+        <y>120</y>
+        <width>83</width>
+        <height>25</height>
+       </rect>
+      </property>
+      <property name="toolTip">
+       <string>Save memory buffer to file</string>
+      </property>
+      <property name="text">
+       <string>← Save</string>
+      </property>
+     </widget>
+     <widget class="QGroupBox" name="groupBox_8">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>80</y>
+        <width>321</width>
+        <height>91</height>
+       </rect>
+      </property>
+      <property name="title">
+       <string>Format:</string>
+      </property>
+      <widget class="QRadioButton" name="ee_ffAuto">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>30</y>
+         <width>141</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Auto (load only)</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="ee_ffELF">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>50</y>
+         <width>141</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>ELF (load only)</string>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="ee_ffIhex">
+       <property name="geometry">
+        <rect>
+         <x>170</x>
+         <y>20</y>
+         <width>107</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Intel Hex</string>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="ee_ffSrec">
+       <property name="geometry">
+        <rect>
+         <x>170</x>
+         <y>40</y>
+         <width>141</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Motorola S-Record</string>
+       </property>
+      </widget>
+      <widget class="QRadioButton" name="ee_ffRbin">
+       <property name="geometry">
+        <rect>
+         <x>170</x>
+         <y>60</y>
+         <width>107</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Raw Binary</string>
+       </property>
+      </widget>
+     </widget>
+     <widget class="QLineEdit" name="ee_filename">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>40</y>
+        <width>271</width>
+        <height>25</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="ee_choose">
+      <property name="geometry">
+       <rect>
+        <x>290</x>
+        <y>40</y>
+        <width>41</width>
+        <height>25</height>
+       </rect>
+      </property>
+      <property name="toolTip">
+       <string>Choose filename for load or save</string>
+      </property>
+      <property name="text">
+       <string>…</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QPushButton" name="ee_clear">
+     <property name="geometry">
+      <rect>
+       <x>570</x>
+       <y>330</y>
+       <width>83</width>
+       <height>25</height>
+      </rect>
+     </property>
+     <property name="toolTip">
+      <string>Clear buffer and &quot;allocated&quot; flags</string>
+     </property>
+     <property name="text">
+      <string>Clear</string>
+     </property>
+    </widget>
+    <widget class="QGroupBox" name="groupBox_9">
+     <property name="geometry">
+      <rect>
+       <x>40</x>
+       <y>230</y>
+       <width>481</width>
+       <height>141</height>
+      </rect>
+     </property>
+     <property name="title">
+      <string>Device:</string>
+     </property>
+     <widget class="QPushButton" name="ee_read">
+      <property name="geometry">
+       <rect>
+        <x>370</x>
+        <y>50</y>
+        <width>83</width>
+        <height>25</height>
+       </rect>
+      </property>
+      <property name="toolTip">
+       <string>Read device into buffer</string>
+      </property>
+      <property name="text">
+       <string>Read →</string>
+      </property>
+     </widget>
+     <widget class="QPushButton" name="ee_program">
+      <property name="geometry">
+       <rect>
+        <x>370</x>
+        <y>90</y>
+        <width>83</width>
+        <height>25</height>
+       </rect>
+      </property>
+      <property name="toolTip">
+       <string>Programm buffer into device</string>
+      </property>
+      <property name="text">
+       <string>← Program</string>
+      </property>
+     </widget>
+     <widget class="QGraphicsView" name="ee_avr">
+      <property name="geometry">
+       <rect>
+        <x>150</x>
+        <y>30</y>
+        <width>171</width>
+        <height>101</height>
+       </rect>
+      </property>
+      <property name="interactive">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </widget>
    </widget>
   </widget>
  </widget>