Changeset f096c48b4894fe8c41da1baeb3fce1e1e1d1e56a

Timestamp:

21/12/10 13:20:57 (2 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

15c36f68bf2989f4965aa740a6d7e33fb6fd0016

Parents:

074ab0776f20e64fa3748352b6e8e4808c13af2b

git-committer:

Matias De la Puente <mfpuente.ar@…> (21/12/10 13:20:57)

Message:

Programmers: Rename 'hexfile' as 'firmware'

Now that multiple firmware types are supported, 'firmware' is a more proper name

Files:

• data/lpc21isp.i4ucprogrammer (modified) (1 diff)
• data/pickit2.i4ucprogrammer (modified) (1 diff)
• data/picstartplus.i4ucprogrammer (modified) (1 diff)
• gtkfrontend/programmersview.vala (modified) (2 diffs)
• libi4uccore/programmerslogic.vala (modified) (5 diffs)
• libi4uccore/programmersview.vala (modified) (1 diff)

data/lpc21isp.i4ucprogrammer

@@ -6 +6 @@
 has_devices_folder=false
 has_clock=true
-write_flash_command=lpc21isp -control -wipe -verify %hexfile %serial_port %baud_rate %clock
+write_flash_command=lpc21isp -control -wipe -verify %firmware %serial_port %baud_rate %clock
 devices=LPC21xx;
 firmware_types=.hex;

data/pickit2.i4ucprogrammer

@@ -7 +7 @@
 has_devices_folder=true
 has_clock=false
-write_flash_command=pk2cmd -b%devices_folder -P%device -F%hexfile -M
-read_flash_command=pk2cmd -b%devices_folder -P%device -GF%hexfile
-verify_flash_command=pk2cmd -b%devices_folder -P%device -F%hexfile -Y
+write_flash_command=pk2cmd -b%devices_folder -P%device -F%firmware -M
+read_flash_command=pk2cmd -b%devices_folder -P%device -GF%firmware
+verify_flash_command=pk2cmd -b%devices_folder -P%device -F%firmware -Y
 erase_flash_command=pk2cmd -b%devices_folder -P%device -E
 read_fuses_command=pk2cmd -b%devices_folder -P%device -GC

data/picstartplus.i4ucprogrammer

@@ -7 +7 @@
 has_devices_folder=false
 has_clock=false
-write_flash_command=picp %serial_port %device -bp -wp %hexfile
-read_flash_command=picp %serial_port %device -rp %hexfile
+write_flash_command=picp %serial_port %device -bp -wp %firmware
+read_flash_command=picp %serial_port %device -rp %firmware
 erase_flash_command=picp %serial_port %device -ef
 write_fuses_command=picp %serial_port %device -wc %fuses

gtkfrontend/programmersview.vala

@@ -101 +101 @@
         }
         
-        public void show_open_dialog (Gee.List<string> firmware_types, ref string folder_uri, out string hexfile_uri)
-        {
-                var dialog = new FileChooserDialog (_("Save hexfile as"), null, FileChooserAction.SAVE);
+        public void show_open_dialog (Gee.List<string> firmware_types, ref string folder_uri, out string firmware_uri)
+        {
+                var dialog = new FileChooserDialog (_("Save firmware as"), null, FileChooserAction.SAVE);
                 dialog.set_current_folder_uri (folder_uri);
                 dialog.do_overwrite_confirmation = true;
@@ -118 +118 @@
                 {
                         folder_uri = dialog.get_current_folder_uri ();
-                        hexfile_uri = dialog.get_uri ();
+                        firmware_uri = dialog.get_uri ();
                 }
                 dialog.destroy ();

libi4uccore/programmerslogic.vala

@@ -27 +27 @@
         private Command _command = create_command ();
         private SerialPortUtils _serial_port_utils = create_serial_port_utils ();
-        private string _read_hexfile;
+        private string _read_firmware;
         
         public bool can_write_flash { private set; get; }
@@ -86 +86 @@
                 var filtered_command = filter_command (_current_programmer.write_flash_command);
                 
-                var hexfile = File.new_for_uri (uri).get_path ();
-                filtered_command = filtered_command.replace ("%hexfile", Shell.quote (hexfile));
+                var firmware = File.new_for_uri (uri).get_path ();
+                filtered_command = filtered_command.replace ("%firmware", Shell.quote (firmware));
                 
                 try
@@ -295 +295 @@
         {
                 string folder_uri = I4uc.Core.Settings.instance.working_folder;
-                string hexfile_uri;
-                _view.show_open_dialog (ref folder_uri, out hexfile_uri);
-                if (hexfile_uri != null)
+                string firmware_uri;
+                _view.show_open_dialog (_current_programmer.firmware_types, ref folder_uri, out firmware_uri);
+                if (firmware_uri != null)
                 {
                         I4uc.Core.Settings.instance.working_folder = folder_uri;
-                        _read_hexfile = hexfile_uri;
+                        _read_firmware = firmware_uri;
                         run_command (_current_programmer.read_flash_command);
                 }
@@ -328 +328 @@
                 
                 // Open the hex file if read flash was selected
-                if (_read_hexfile != null)
-                {
-                        _documents_logic.open_document (_read_hexfile);
-                        _read_hexfile = null;
+                if (_read_firmware != null)
+                {
+                        _documents_logic.open_document (_read_firmware);
+                        _read_firmware = null;
                 }
                 
@@ -343 +343 @@
                 var filtered_command = filter_command (command);
                 
-                if (_read_hexfile == null)
+                if (_read_firmware == null)
                 {
                         if (_view.pages_panel.current_page != null &&
                             _current_programmer.is_valid_firmware_type (_view.pages_panel.current_page.tab_title))
                         {
-                                var hexfile = File.new_for_uri (_view.pages_panel.current_page.title).get_path ();
-                                filtered_command = filtered_command.replace ("%hexfile", Shell.quote (hexfile));
+                                var firmware = File.new_for_uri (_view.pages_panel.current_page.title).get_path ();
+                                filtered_command = filtered_command.replace ("%firmware", Shell.quote (firmware));
                         }
                 }
                 else
                 {
-                        var hexfile = File.new_for_uri (_read_hexfile).get_path ();
-                        filtered_command = filtered_command.replace ("%hexfile", Shell.quote (hexfile));
+                        var firmware = File.new_for_uri (_read_firmware).get_path ();
+                        filtered_command = filtered_command.replace ("%firmware", Shell.quote (firmware));
                 }
                 

libi4uccore/programmersview.vala

@@ -47 +47 @@
         public abstract DialogResponse show_yes_no_message (string message, bool cancel = false);
         public abstract void show_log_page ();
-        public abstract void show_open_dialog (Gee.List<string> firmware_types, ref string folder_uri, out string hexfile_uri);
+        public abstract void show_open_dialog (Gee.List<string> firmware_types, ref string folder_uri, out string firmware_uri);
 }