Changeset 704dd17c89c92120558913929eb1e86130c68ce6

Timestamp:

08/01/11 21:22:58 (2 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

9cd11c02b25537ee501c8e398b6baeb2e6eb7bc7

Parents:

c8a12325832a68ad842b2d51a7380aebdb4ca52a

git-committer:

Matias De la Puente <mfpuente.ar@…> (08/01/11 21:22:58)

Message:

Programmers: switch programmers to xml

Some programmer information (i.e. devices and has_* flags) aren't loaded or used. They will be replaced with command introspection

Files:

• data/programmers/Makefile.am (modified) (1 diff)
• data/programmers/lpc21isp.i4ucprogrammer (deleted)
• data/programmers/lpc21isp.xml (added)
• data/programmers/pickit2.i4ucprogrammer (deleted)
• data/programmers/pickit2.xml (added)
• data/programmers/picstartplus.i4ucprogrammer (deleted)
• data/programmers/picstartplus.xml (added)
• gtkfrontend/main.vala (modified) (2 diffs)
• libi4uccore/Makefile.am (modified) (1 diff)
• libi4uccore/programmer.vala (modified) (3 diffs)
• libi4uccore/programmerloader.vala (added)
• libi4uccore/programmerslogic.vala (modified) (8 diffs)

data/programmers/Makefile.am

@@ -4 +4 @@
 
 programmers_DATA = \
-        lpc21isp.i4ucprogrammer \
-        pickit2.i4ucprogrammer \
-        picstartplus.i4ucprogrammer \
+        lpc21isp.xml \
+        pickit2.xml \
+        picstartplus.xml \
         $(NULL)
 

gtkfrontend/main.vala

@@ -275 +275 @@
         // Get programmers files in $(pkgdatadir)/programmers/
         var programmers_list = new ArrayList<File> ();
-        programmers_list.add_all (get_files (File.new_for_path (Config.PROGRAMMERS_DIR), ".i4ucprogrammer"));
+        programmers_list.add_all (get_files (File.new_for_path (Config.PROGRAMMERS_DIR), ".xml"));
         
         // Get programmers files in $(HOME)/.i4uc/programmers/. If the folder doesn't exists, create it
         var home_folder = File.new_for_path (Path.build_filename (Environment.get_home_dir (), ".i4uc", "programmers"));
-        programmers_list.add_all (get_files (home_folder, ".i4ucprogrammer", true));
+        programmers_list.add_all (get_files (home_folder, ".xml", true));
         
         // Load programmers
@@ -287 +287 @@
                 try
                 {
-                        programmer.open (programmer_file.get_uri ());
-                        _app.programmers[programmer.id] = programmer;
+                        ProgrammerLoader.load (programmer, programmer_file.get_uri ());
+                        _app.programmers[programmer.name] = programmer;
                 }
                 catch (KeyFileError e)

libi4uccore/Makefile.am

@@ -70 +70 @@
         profiledialogview.vala \
         programmer.vala \
+        programmerloader.vala \
         programmerslogic.vala \
         programmerspage.vala \

libi4uccore/programmer.vala

@@ -1 +1 @@
 /* programmer.vala
  *
- * Copyright (C) 2010  Matias De la Puente
+ * Copyright (C) 2010-2011  Matias De la Puente
  *
  * This program is free software: you can redistribute it and/or modify
@@ -23 +23 @@
 public class I4uc.Core.Programmer : GLib.Object
 {
-        private const string _I4UC_PROGRAMMER = "i4uc programmer";
-        
-        private Document _programmer_file = new Document ();
         private ArrayList<string> _devices = new ArrayList<string> ();
         private ArrayList<string> _firmware_types = new ArrayList<string> ();
         
-        public string id { set; get; }
+        public string name { set; get; }
+        public string command { set; get; }
         public bool has_serial_port { set; get; }
         public bool has_baud_rate { set; get; }
@@ -54 +52 @@
         public Gee.List<string> firmware_types { get { return _firmware_types; } }
         
-        public void open (string uri) throws GLib.Error, GLib.KeyFileError
-        {
-                var programmer_content = _programmer_file.load_contents (uri);
-                var key_file = new KeyFile ();
-                if (!key_file.load_from_data (programmer_content, programmer_content.length, KeyFileFlags.NONE) ||
-                    key_file.get_start_group () != _I4UC_PROGRAMMER)
-                        throw new GLib.KeyFileError.GROUP_NOT_FOUND (_("The file doesn't start with the [%s] group"), _I4UC_PROGRAMMER);
-                
-                this.id = key_file.get_string (_I4UC_PROGRAMMER, "id");
-                this.has_serial_port = key_file.get_boolean (_I4UC_PROGRAMMER, "has_serial_port");
-                this.has_baud_rate = key_file.get_boolean (_I4UC_PROGRAMMER, "has_baud_rate");
-                this.has_devices_file = key_file.get_boolean (_I4UC_PROGRAMMER, "has_devices_file");
-                this.has_devices_folder = key_file.get_boolean (_I4UC_PROGRAMMER, "has_devices_folder");
-                this.has_clock = key_file.get_boolean (_I4UC_PROGRAMMER, "has_clock");
-                
-                this.can_write_flash = key_file.has_key (_I4UC_PROGRAMMER, "write_flash_command");
-                this.can_read_flash = key_file.has_key (_I4UC_PROGRAMMER, "read_flash_command");
-                this.can_verify_flash = key_file.has_key (_I4UC_PROGRAMMER, "verify_flash_command");
-                this.can_erase_flash = key_file.has_key (_I4UC_PROGRAMMER, "erase_flash_command");
-                this.can_write_fuses = key_file.has_key (_I4UC_PROGRAMMER, "write_fuses_command");
-                this.can_read_fuses = key_file.has_key (_I4UC_PROGRAMMER, "read_fuses_command");
-                this.can_get_version = key_file.has_key (_I4UC_PROGRAMMER, "get_version_command");
-                
-                if (_can_write_flash)
-                        this.write_flash_command = key_file.get_string (_I4UC_PROGRAMMER, "write_flash_command");
-                if (_can_read_flash)
-                        this.read_flash_command = key_file.get_string (_I4UC_PROGRAMMER, "read_flash_command");
-                if (_can_verify_flash)
-                        this.verify_flash_command = key_file.get_string (_I4UC_PROGRAMMER, "verify_flash_command");
-                if (_can_erase_flash)
-                        this.erase_flash_command = key_file.get_string (_I4UC_PROGRAMMER, "erase_flash_command");
-                if (_can_write_fuses)
-                        this.write_fuses_command = key_file.get_string (_I4UC_PROGRAMMER, "write_fuses_command");
-                if (_can_read_fuses)
-                        this.read_fuses_command = key_file.get_string (_I4UC_PROGRAMMER, "read_fuses_command");
-                if (_can_get_version)
-                        this.get_version_command = key_file.get_string (_I4UC_PROGRAMMER, "get_version_command");
-                
-                _devices.clear ();
-                foreach (var device in key_file.get_string_list (_I4UC_PROGRAMMER, "devices"))
-                        _devices.add (device);
-                
-                _firmware_types.clear ();
-                if (key_file.has_key (_I4UC_PROGRAMMER, "firmware_types"))
-                        foreach (var firmware_type in key_file.get_string_list (_I4UC_PROGRAMMER, "firmware_types"))
-                                _firmware_types.add (firmware_type);
-        }
-        
-        public void save (string? uri = null) throws GLib.Error, GLib.FileError
-        {
-                var key_file = new KeyFile ();
-                
-                key_file.set_string (_I4UC_PROGRAMMER, "id", _id);
-                key_file.set_boolean (_I4UC_PROGRAMMER, "has_serial_port", _has_serial_port);
-                key_file.set_boolean (_I4UC_PROGRAMMER, "has_baud_rate", _has_baud_rate);
-                key_file.set_boolean (_I4UC_PROGRAMMER, "has_devices_file", _has_devices_file);
-                key_file.set_boolean (_I4UC_PROGRAMMER, "has_devices_folder", _has_devices_folder);
-                key_file.set_boolean (_I4UC_PROGRAMMER, "has_clock", _has_clock);
-                
-                if (_can_write_flash)
-                        key_file.set_string (_I4UC_PROGRAMMER, "write_flash_command", _write_flash_command);
-                if (_can_read_flash)
-                        key_file.set_string (_I4UC_PROGRAMMER, "read_flash_command", _read_flash_command);
-                if (_can_verify_flash)
-                        key_file.set_string (_I4UC_PROGRAMMER, "verify_flash_command", _verify_flash_command);
-                if (_can_erase_flash)
-                        key_file.set_string (_I4UC_PROGRAMMER, "erase_flash_command", _erase_flash_command);
-                if (_can_write_fuses)
-                        key_file.set_string (_I4UC_PROGRAMMER, "write_fuses_command", _write_fuses_command);
-                if (_can_read_fuses)
-                        key_file.set_string (_I4UC_PROGRAMMER, "read_fuses_command", _read_fuses_command);
-                if (_can_get_version)
-                        key_file.set_string (_I4UC_PROGRAMMER, "get_version_command", _get_version_command);
-                
-                key_file.set_string_list (_I4UC_PROGRAMMER, "devices", _devices.to_array ());
-                key_file.set_string_list (_I4UC_PROGRAMMER, "firmware_types", _firmware_types.to_array ());
-                
-                _programmer_file.save_contents (key_file.to_data (null), uri);
-        }
-        
         public bool is_valid_firmware_type (string filename)
         {

libi4uccore/programmerslogic.vala

@@ -54 +54 @@
                 //Load programmers
                 foreach (var programmer in _app.programmers.values)
-                        _view.page.add_programmer (programmer.id);
+                        _view.page.add_programmer (programmer.name);
                 if (_app.settings.programmer in _app.programmers.keys)
                         _view.page.current_programmer = _app.settings.programmer;
@@ -130 +130 @@
                 _current_programmer = _app.programmers[_view.page.current_programmer];
                 
-                if (_app.settings.programmer != _current_programmer.id)
-                        _app.settings.programmer = _current_programmer.id;
+                if (_app.settings.programmer != _current_programmer.name)
+                        _app.settings.programmer = _current_programmer.name;
                 
                 var working_folder = _app.settings.working_folder;
                 
                 //Load devices file if the programmer has devices file
-                var has_devices_file_key = _app.settings.devices_files.has_key (_current_programmer.id);
+                var has_devices_file_key = _app.settings.devices_files.has_key (_current_programmer.name);
                 if (_current_programmer.has_devices_file)
-                        _view.page.current_devices_file = has_devices_file_key ? _app.settings.devices_files[_current_programmer.id] : working_folder;
+                        _view.page.current_devices_file = has_devices_file_key ? _app.settings.devices_files[_current_programmer.name] : working_folder;
                 
                 //Load devices folder if the programmer has devices folder
-                var has_devices_folder_key = _app.settings.devices_folders.has_key (_current_programmer.id);
+                var has_devices_folder_key = _app.settings.devices_folders.has_key (_current_programmer.name);
                 if (_current_programmer.has_devices_folder)
-                        _view.page.current_devices_folder = has_devices_folder_key ? _app.settings.devices_folders[_current_programmer.id] : working_folder;
+                        _view.page.current_devices_folder = has_devices_folder_key ? _app.settings.devices_folders[_current_programmer.name] : working_folder;
                 
                 //Load clock if the programmer has clock
-                var has_clock_key = _app.settings.clocks.has_key (_current_programmer.id);
+                var has_clock_key = _app.settings.clocks.has_key (_current_programmer.name);
                 if (_current_programmer.has_clock)
-                        _view.page.current_clock = has_clock_key ? _app.settings.clocks[_current_programmer.id] : "";
+                        _view.page.current_clock = has_clock_key ? _app.settings.clocks[_current_programmer.name] : "";
                 
                 //Load devices list
@@ -154 +154 @@
                 foreach (var device in _current_programmer.devices)
                         _view.page.add_device (device);
-                var has_device_key = _app.settings.devices.has_key (_current_programmer.id);
+                var has_device_key = _app.settings.devices.has_key (_current_programmer.name);
                 if (has_device_key)
-                        _view.page.current_device = _app.settings.devices[_current_programmer.id];
+                        _view.page.current_device = _app.settings.devices[_current_programmer.name];
                 
                 //Load fuses if the programmer can write fuses
-                var can_write_fuses_key = _app.settings.fuses.has_key (_current_programmer.id);
+                var can_write_fuses_key = _app.settings.fuses.has_key (_current_programmer.name);
                 if (_current_programmer.can_write_fuses)
-                        _view.page.current_fuses = can_write_fuses_key ? _app.settings.fuses[_current_programmer.id] : "";
+                        _view.page.current_fuses = can_write_fuses_key ? _app.settings.fuses[_current_programmer.name] : "";
                 
                 _view.page.serial_port_visible = _current_programmer.has_serial_port;
@@ -222 +222 @@
                 var current_devices_file = _view.page.current_devices_file;
                 
-                if (_app.settings.devices_files[_current_programmer.id] != current_devices_file)
-                        _app.settings.devices_files[_current_programmer.id] = current_devices_file;
+                if (_app.settings.devices_files[_current_programmer.name] != current_devices_file)
+                        _app.settings.devices_files[_current_programmer.name] = current_devices_file;
                 
                 enable_actions ();
@@ -237 +237 @@
                 var current_devices_folder = _view.page.current_devices_folder;
                 
-                if (_app.settings.devices_folders[_current_programmer.id] != current_devices_folder)
-                        _app.settings.devices_folders[_current_programmer.id] = current_devices_folder;
+                if (_app.settings.devices_folders[_current_programmer.name] != current_devices_folder)
+                        _app.settings.devices_folders[_current_programmer.name] = current_devices_folder;
                 
                 enable_actions ();
@@ -252 +252 @@
                 var current_clock = _view.page.current_clock;
                 
-                if (_app.settings.clocks[_current_programmer.id] != current_clock)
-                        _app.settings.clocks[_current_programmer.id] = current_clock;
+                if (_app.settings.clocks[_current_programmer.name] != current_clock)
+                        _app.settings.clocks[_current_programmer.name] = current_clock;
                 
                 enable_actions ();
@@ -267 +267 @@
                 var current_device = _view.page.current_device;
                 
-                if (current_device != null && _app.settings.devices[_current_programmer.id] != current_device)
-                        _app.settings.devices[_current_programmer.id] = current_device;
+                if (current_device != null && _app.settings.devices[_current_programmer.name] != current_device)
+                        _app.settings.devices[_current_programmer.name] = current_device;
                 
                 enable_actions ();
@@ -282 +282 @@
                 var current_fuses = _view.page.current_fuses;
                 
-                if (_app.settings.fuses[_current_programmer.id] != current_fuses)
-                        _app.settings.fuses[_current_programmer.id] = current_fuses;
+                if (_app.settings.fuses[_current_programmer.name] != current_fuses)
+                        _app.settings.fuses[_current_programmer.name] = current_fuses;
                 
                 enable_actions ();