Changeset 074ab0776f20e64fa3748352b6e8e4808c13af2b


Ignore:
Timestamp:
21/12/10 13:13:03 (2 years ago)
Author:
Matias De la Puente <mfpuente.ar@…>
Children:
f096c48b4894fe8c41da1baeb3fce1e1e1d1e56a
Parents:
694d86baafd237d38fc2df4d152aafa3d17cff88
git-author:
Matias De la Puente <mfpuente.ar@…> (21/12/10 12:21:25)
git-committer:
Matias De la Puente <mfpuente.ar@…> (21/12/10 13:13:03)
Message:

Programmers: Add support for multiple firmware types

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • data/lpc21isp.i4ucprogrammer

    r8befbb5 r074ab07  
    77has_clock=true 
    88write_flash_command=lpc21isp -control -wipe -verify %hexfile %serial_port %baud_rate %clock 
    9 devices=LPC21xx 
     9devices=LPC21xx; 
     10firmware_types=.hex; 

  • data/pickit2.i4ucprogrammer

    r18b65cd r074ab07  
    1414get_version_command=pk2cmd -b%devices_folder -?V 
    1515devices=11LC010;11LC020;11LC040;11LC080;11LC160;24LC00;24LC01B;24LC02B;24LC04B;24LC08B;24LC1025;24LC128;24LC16B;24LC256;24LC32A;24LC512;24LC64;25LC010A;25LC020A;25LC040A;25LC080A;25LC080B;25LC1024;25LC128;25LC160A;25LC160B;25LC256;25LC320A;25LC512;25LC640A;93LC46A;93LC46B;93LC56A;93LC56B;93LC66A;93LC66B;93LC76A;93LC76B;93LC86A;93LC86B;DSPIC30F1010;DSPIC30F2010;DSPIC30F2011;DSPIC30F2012;DSPIC30F2020;DSPIC30F2023;DSPIC30F3010;DSPIC30F3011;DSPIC30F3012;DSPIC30F3013;DSPIC30F3014;DSPIC30F4011;DSPIC30F4012;DSPIC30F4013;DSPIC30F5011;DSPIC30F5013;DSPIC30F5015;DSPIC30F5016;DSPIC30F6010A;DSPIC30F6011A;DSPIC30F6012A;DSPIC30F6013A;DSPIC30F6014A;DSPIC30F6015;DSPIC33FJ06GS101;DSPIC33FJ06GS102;DSPIC33FJ06GS202;DSPIC33FJ128GP202;DSPIC33FJ128GP204;DSPIC33FJ128GP206;DSPIC33FJ128GP306;DSPIC33FJ128GP310;DSPIC33FJ128GP706;DSPIC33FJ128GP708;DSPIC33FJ128GP710;DSPIC33FJ128GP802;DSPIC33FJ128GP804;DSPIC33FJ128MC202;DSPIC33FJ128MC204;DSPIC33FJ128MC506;DSPIC33FJ128MC510;DSPIC33FJ128MC706;DSPIC33FJ128MC708;DSPIC33FJ128MC710;DSPIC33FJ128MC802;DSPIC33FJ128MC804;DSPIC33FJ12GP201;DSPIC33FJ12GP202;DSPIC33FJ12MC201;DSPIC33FJ12MC202;DSPIC33FJ16GP304;DSPIC33FJ16GS402;DSPIC33FJ16GS404;DSPIC33FJ16GS502;DSPIC33FJ16GS504;DSPIC33FJ16MC304;DSPIC33FJ256GP506;DSPIC33FJ256GP510;DSPIC33FJ256GP710;DSPIC33FJ256MC510;DSPIC33FJ256MC710;DSPIC33FJ32GP202;DSPIC33FJ32GP204;DSPIC33FJ32GP302;DSPIC33FJ32GP304;DSPIC33FJ32MC202;DSPIC33FJ32MC204;DSPIC33FJ32MC302;DSPIC33FJ32MC304;DSPIC33FJ64GP202;DSPIC33FJ64GP204;DSPIC33FJ64GP206;DSPIC33FJ64GP306;DSPIC33FJ64GP310;DSPIC33FJ64GP706;DSPIC33FJ64GP708;DSPIC33FJ64GP710;DSPIC33FJ64GP802;DSPIC33FJ64GP804;DSPIC33FJ64MC202;DSPIC33FJ64MC204;DSPIC33FJ64MC506;DSPIC33FJ64MC508;DSPIC33FJ64MC510;DSPIC33FJ64MC706;DSPIC33FJ64MC710;DSPIC33FJ64MC802;DSPIC33FJ64MC804;HCS200;HCS201;HCS300;HCS301;HCS320;HCS360;HCS361;HCS362;MCP25020;MCP25025;MCP25050;MCP25055;PIC10F200;PIC10F202;PIC10F204;PIC10F206;PIC10F220;PIC10F222;PIC12F508;PIC12F509;PIC12F510;PIC12F519;PIC12F609;PIC12F615;PIC12F629;PIC12F635;PIC12F675;PIC12F683;PIC12HV609;PIC12HV615;PIC16F1933;PIC16F1934;PIC16F1936;PIC16F1937;PIC16F1938;PIC16F1939;PIC16F505;PIC16F506;PIC16F526;PIC16F54;PIC16F57;PIC16F59;PIC16F610;PIC16F616;PIC16F627;PIC16F627A;PIC16F628;PIC16F628A;PIC16F630;PIC16F631;PIC16F636;PIC16F648A;PIC16F676;PIC16F677;PIC16F684;PIC16F685;PIC16F687;PIC16F688;PIC16F689;PIC16F690;PIC16F716;PIC16F72;PIC16F722;PIC16F723;PIC16F724;PIC16F726;PIC16F727;PIC16F73;PIC16F737;PIC16F74;PIC16F747;PIC16F76;PIC16F767;PIC16F77;PIC16F777;PIC16F785;PIC16F818;PIC16F819;PIC16F84A;PIC16F87;PIC16F870;PIC16F871;PIC16F872;PIC16F873;PIC16F873A;PIC16F874;PIC16F874A;PIC16F876;PIC16F876A;PIC16F877;PIC16F877A;PIC16F88;PIC16F882;PIC16F883;PIC16F884;PIC16F886;PIC16F887;PIC16F913;PIC16F914;PIC16F916;PIC16F917;PIC16F946;PIC16HV610;PIC16HV616;PIC16HV785;PIC16LF1933;PIC16LF1934;PIC16LF1936;PIC16LF1937;PIC16LF1938;PIC16LF1939;PIC16LF722;PIC16LF723;PIC16LF724;PIC16LF726;PIC16LF727;PIC18F1220;PIC18F1230;PIC18F1320;PIC18F1330;PIC18F1330-ICD;PIC18F13K22;PIC18F13K50;PIC18F14K22;PIC18F14K50;PIC18F14K50-ICD;PIC18F2220;PIC18F2221;PIC18F2320;PIC18F2321;PIC18F2331;PIC18F23K20;PIC18F2410;PIC18F242;PIC18F2420;PIC18F2423;PIC18F2431;PIC18F2450;PIC18F2455;PIC18F2458;PIC18F248;PIC18F2480;PIC18F24J10;PIC18F24J11;PIC18F24J50;PIC18F24K20;PIC18F2510;PIC18F2515;PIC18F252;PIC18F2520;PIC18F2523;PIC18F2525;PIC18F2550;PIC18F2553;PIC18F258;PIC18F2580;PIC18F2585;PIC18F25J10;PIC18F25J11;PIC18F25J50;PIC18F25K20;PIC18F2610;PIC18F2620;PIC18F2680;PIC18F2682;PIC18F2685;PIC18F26J11;PIC18F26J50;PIC18F26K20;PIC18F4220;PIC18F4221;PIC18F4320;PIC18F4321;PIC18F4331;PIC18F43K20;PIC18F4410;PIC18F442;PIC18F4420;PIC18F4423;PIC18F4431;PIC18F4450;PIC18F4455;PIC18F4458;PIC18F448;PIC18F4480;PIC18F44J10;PIC18F44J11;PIC18F44J50;PIC18F44K20;PIC18F4510;PIC18F4515;PIC18F452;PIC18F4520;PIC18F4523;PIC18F4525;PIC18F4550;PIC18F4553;PIC18F458;PIC18F4580;PIC18F4585;PIC18F45J10;PIC18F45J11;PIC18F45J50;PIC18F45K20;PIC18F4610;PIC18F4620;PIC18F4680;PIC18F4682;PIC18F4685;PIC18F46J11;PIC18F46J50;PIC18F46K20;PIC18F6310;PIC18F6390;PIC18F6393;PIC18F63J11;PIC18F63J90;PIC18F6410;PIC18F6490;PIC18F6493;PIC18F64J11;PIC18F64J90;PIC18F6520;PIC18F6525;PIC18F6527;PIC18F6585;PIC18F65J10;PIC18F65J11;PIC18F65J15;PIC18F65J50;PIC18F65J90;PIC18F6620;PIC18F6621;PIC18F6622;PIC18F6627;PIC18F6628;PIC18F6680;PIC18F66J10;PIC18F66J11;PIC18F66J15;PIC18F66J16;PIC18F66J50;PIC18F66J55;PIC18F66J60;PIC18F66J65;PIC18F66J90;PIC18F6720;PIC18F6722;PIC18F6723;PIC18F67J10;PIC18F67J11;PIC18F67J50;PIC18F67J60;PIC18F67J90;PIC18F8310;PIC18F8390;PIC18F8393;PIC18F83J11;PIC18F83J90;PIC18F8410;PIC18F8490;PIC18F8493;PIC18F84J11;PIC18F84J90;PIC18F8520;PIC18F8525;PIC18F8527;PIC18F8585;PIC18F85J10;PIC18F85J11;PIC18F85J15;PIC18F85J50;PIC18F85J90;PIC18F8620;PIC18F8621;PIC18F8622;PIC18F8627;PIC18F8628;PIC18F8680;PIC18F86J10;PIC18F86J11;PIC18F86J15;PIC18F86J16;PIC18F86J50;PIC18F86J55;PIC18F86J60;PIC18F86J65;PIC18F86J90;PIC18F8720;PIC18F8722;PIC18F8723;PIC18F87J10;PIC18F87J11;PIC18F87J50;PIC18F87J60;PIC18F87J90;PIC18F96J60;PIC18F96J65;PIC18F97J60;PIC18LF13K22;PIC18LF13K50;PIC18LF14K22;PIC18LF14K50;PIC18LF14K50-ICD;PIC18LF24J10;PIC18LF24J11;PIC18LF24J50;PIC18LF25J10;PIC18LF25J11;PIC18LF25J50;PIC18LF26J11;PIC18LF26J50;PIC18LF44J10;PIC18LF44J11;PIC18LF44J50;PIC18LF45J10;PIC18LF45J11;PIC18LF45J50;PIC18LF46J11;PIC18LF46J50;PIC18LF6520;PIC18LF8520;PIC24FJ128GA006;PIC24FJ128GA008;PIC24FJ128GA010;PIC24FJ128GA106;PIC24FJ128GA108;PIC24FJ128GA110;PIC24FJ128GB106;PIC24FJ128GB108;PIC24FJ128GB110;PIC24FJ16GA002;PIC24FJ16GA004;PIC24FJ192GA106;PIC24FJ192GA108;PIC24FJ192GA110;PIC24FJ192GB106;PIC24FJ192GB108;PIC24FJ192GB110;PIC24FJ256GA106;PIC24FJ256GA108;PIC24FJ256GA110;PIC24FJ256GB106;PIC24FJ256GB108;PIC24FJ256GB110;PIC24FJ32GA002;PIC24FJ32GA004;PIC24FJ48GA002;PIC24FJ48GA004;PIC24FJ64GA002;PIC24FJ64GA004;PIC24FJ64GA006;PIC24FJ64GA008;PIC24FJ64GA010;PIC24FJ64GB106;PIC24FJ64GB108;PIC24FJ64GB110;PIC24FJ96GA006;PIC24FJ96GA008;PIC24FJ96GA010;PIC24HJ128GP202;PIC24HJ128GP204;PIC24HJ128GP206;PIC24HJ128GP210;PIC24HJ128GP306;PIC24HJ128GP310;PIC24HJ128GP502;PIC24HJ128GP504;PIC24HJ128GP506;PIC24HJ128GP510;PIC24HJ12GP201;PIC24HJ12GP202;PIC24HJ16GP304;PIC24HJ256GP206;PIC24HJ256GP210;PIC24HJ256GP610;PIC24HJ32GP202;PIC24HJ32GP204;PIC24HJ32GP302;PIC24HJ32GP304;PIC24HJ64GP202;PIC24HJ64GP204;PIC24HJ64GP206;PIC24HJ64GP210;PIC24HJ64GP502;PIC24HJ64GP504;PIC24HJ64GP506;PIC24HJ64GP510;PIC32MX320F032H;PIC32MX320F064H;PIC32MX320F128H;PIC32MX320F128L;PIC32MX340F128H;PIC32MX340F128L;PIC32MX340F256H;PIC32MX360F256L;PIC32MX360F512L;PIC32MX420F032H;PIC32MX440F128H;PIC32MX440F128L;PIC32MX440F256H;PIC32MX440F512H;PIC32MX460F256L;PIC32MX460F512L; 
    16  
     16firmware_types=.hex; 

  • data/picstartplus.i4ucprogrammer

    ra5c7c73 r074ab07  
    1414get_version_command=picp %serial_port -v 
    1515devices=10F200;10F202;10F204;10F206;12C508;12C508A;12C509;12C509A;12C671;12C672;12CE518;12CE519;12CE673;12CE674;12F508;12F509;12F629;12F675;12F683;14000;16C505;16C52;16C54;16C54A;16C54B;16C54C;16C55;16C554;16C558;16C55A;16C56;16C56A;16C57;16C57C;16C58A;16C58B;16C61;16C62;16C620;16C620A;16C621;16C621A;16C622;16C622A;16C62A;16C62B;16C63;16C63A;16C63B;16C64;16C642;16C64A;16C65;16C65A;16C65B;16C66;16C662;16C66A;16C67;16C67A;16C71;16C710;16C711;16C712;16C715;16C716;16C717;16C72;16C72A;16C73;16C73A;16C73B;16C74;16C745;16C74A;16C74B;16C74C;16C76;16C765;16C77;16C770;16C771;16C773;16C774;16C781;16C782;16C84;16C923;16C924;16C925;16C926;16CE623;16CE624;16CE625;16F505;16F627;16F627A;16F628;16F628A;16F630;16F648;16F648A;16F676;16F684;16F688;16F690;16F72;16F73;16F74;16F76;16F767;16F77;16F777;16F818;16F819;16F83;16F84;16F84A;16F87;16F870;16F871;16F872;16F873;16F873A;16F874;16F874A;16F876;16F876A;16F877;16F877A;16F88;16F913;16F917;16HV540;17C42;17C42A;17C43;17C44;17C752;17C756;17C756A;17C762;17C766;18C242;18C252;18C442;18C452;18C658;18C858;18F2410;18F242;18F2431;18F2455;18F248;18F252;18F2525;18F2550;18F258;18F2680;18F2682;18F2685;18F442;18F4431;18F448;18F452;18F4525;18F4550;18F458;rf509AF;rf509AG; 
     16firmware_types=.hex; 

  • gtkfrontend/programmersview.vala

    r78c0493 r074ab07  
    101101        } 
    102102         
    103         public void show_open_dialog (ref string folder_uri, out string hexfile_uri) 
     103        public void show_open_dialog (Gee.List<string> firmware_types, ref string folder_uri, out string hexfile_uri) 
    104104        { 
    105105                var dialog = new FileChooserDialog (_("Save hexfile as"), null, FileChooserAction.SAVE); 
    … …  
    110110                dialog.set_default_response (ResponseType.OK); 
    111111                var filter = new FileFilter (); 
    112                 filter.set_name (_("Hexfiles")); 
    113                 filter.add_pattern ("*.hex"); 
     112                filter.set_name (_("Firmware")); 
     113                foreach (var firmware_type in firmware_types) 
     114                        filter.add_pattern ("*" + firmware_type); 
    114115                dialog.add_filter (filter); 
    115116                 

  • libi4uccore/programmer.vala

    rdfe49c7 r074ab07  
    2727        private Document _programmer_file = new Document (); 
    2828        private ArrayList<string> _devices = new ArrayList<string> (); 
     29        private ArrayList<string> _firmware_types = new ArrayList<string> (); 
    2930         
    3031        public string id { set; get; } 
    … …  
    5152         
    5253        public Gee.List<string> devices { get { return _devices; } } 
     54        public Gee.List<string> firmware_types { get { return _firmware_types; } } 
    5355         
    5456        public void open (string uri) throws GLib.Error, GLib.KeyFileError 
    … …  
    9395                foreach (var device in key_file.get_string_list (_I4UC_PROGRAMMER, "devices")) 
    9496                        _devices.add (device); 
     97                 
     98                _firmware_types.clear (); 
     99                if (key_file.has_key (_I4UC_PROGRAMMER, "firmware_types")) 
     100                        foreach (var firmware_type in key_file.get_string_list (_I4UC_PROGRAMMER, "firmware_types")) 
     101                                _firmware_types.add (firmware_type); 
    95102        } 
    96103         
    … …  
    122129                 
    123130                key_file.set_string_list (_I4UC_PROGRAMMER, "devices", _devices.to_array ()); 
     131                key_file.set_string_list (_I4UC_PROGRAMMER, "firmware_types", _firmware_types.to_array ()); 
    124132                 
    125133                _programmer_file.save_contents (key_file.to_data (null), uri); 
    126134        } 
     135         
     136        public bool is_valid_firmware_type (string filename) 
     137        { 
     138                foreach (var firmware_type in _firmware_types) 
     139                        if (filename.has_suffix (firmware_type)) 
     140                                return true; 
     141                return false; 
     142        } 
    127143} 

  • libi4uccore/programmerslogic.vala

    r78c0493 r074ab07  
    345345                if (_read_hexfile == null) 
    346346                { 
    347                         if (_view.pages_panel.current_page != null && _view.pages_panel.current_page.tab_title.has_suffix (".hex")) 
     347                        if (_view.pages_panel.current_page != null && 
     348                            _current_programmer.is_valid_firmware_type (_view.pages_panel.current_page.tab_title)) 
    348349                        { 
    349350                                var hexfile = File.new_for_uri (_view.pages_panel.current_page.title).get_path (); 
    … …  
    398399        private void enable_actions () 
    399400        { 
    400                 var valid_page = _view.pages_panel.current_page != null && _view.pages_panel.current_page.tab_title.has_suffix (".hex"); 
     401                var valid_page = _view.pages_panel.current_page != null && 
     402                                 _current_programmer.is_valid_firmware_type (_view.pages_panel.current_page.tab_title); 
    401403                var valid_serial_port =  !_current_programmer.has_serial_port || _view.page.current_serial_port != null; 
    402404                var valid_baud_rate = !_current_programmer.has_baud_rate || _view.page.current_baud_rate != null; 

  • libi4uccore/programmersview.vala

    r78c0493 r074ab07  
    4747        public abstract DialogResponse show_yes_no_message (string message, bool cancel = false); 
    4848        public abstract void show_log_page (); 
    49         public abstract void show_open_dialog (ref string folder_uri, out string hexfile_uri); 
     49        public abstract void show_open_dialog (Gee.List<string> firmware_types, ref string folder_uri, out string hexfile_uri); 
    5050} 
Note: See TracChangeset for help on using the changeset viewer.