From e253d7fc54e10422348ab3dafab176afdd92f53a Mon Sep 17 00:00:00 2001 From: Donovan Goodwin Date: Tue, 13 Jun 2017 14:01:40 -0600 Subject: [PATCH] Minor Incremental Update V0.3.1 This is just prep work for adding in the backend. Fixed many warnings during runtime and compiling. See Changelog for more info. --- CHANGELOG.md | 10 +++++++++- README.md | 11 ++++++----- src/espflasher | Bin 13624 -> 13744 bytes src/espflasher.ui | 12 +++++++----- src/espflasher.vala | 40 ++++++++++++++++++++++++++++------------ 5 files changed, 50 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77ccf8b..ac5f55e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ +# V0.3.1 +Simple Bug Fix... + Preparation for backend has begun, more functionality has been added in the executable. + espflasher.vala has been modified with extra functions for the hooking into the Ui and backend. + Inclusion of Granite library will help aid in adding functions and allowing me to quickly build the application. + espflasher.ui has been updated with a few small Ui fixes as well as a new About Dialog that still needs implementing. + If you could be of assistance in helping me get that working I'd be greatly appreciative... + # v0.3 New Ui enhancements, and code rework. espflasher.vala was changed to shorten as well as remove unused code. The Binary was compiled using the new version 0.3 vala code. - And changes to the Ui have been commited to the espflasher.ui file. + And changes to the Ui have been committed to the espflasher.ui file. Ui enhancements include adding spacers, packing everything to make it look better, and adding better button, label, and list looks to the program. diff --git a/README.md b/README.md index d2742b7..569078b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is a Public test Repo for ESP Flasher. This Repo contains an Alpha version of the ESP Flasher Program developed by Donovan Goodwin (DGxInfinitY). -This version of ESP Flasher is unusable as of Version 0.3. +This version of ESP Flasher is unusable as of Version 0.3.1. ESP Flasher is built on: @@ -38,7 +38,8 @@ If you're on MacOS you can install vala and it's compiler using homebrew: If you're on Windows you can install vala and it's compiler by following the info on this page: https://wiki.gnome.org/Projects/Vala/ValaOnWindows -# Roadmap -I am wanting to have the program in a working state by the end of this month if at all possible, it is going to be hard with -my birthday being this month as well as my sister's, grandpa's, and brother's but I will try my hardest to get the back end -functioning this month. +# To Do list +1. Getting the About Dialog to open after pressing the about button(It may also be better to get it to open from a seperate Ui file) +2. Getting File Manager and Board Selector to look in the right places for device as well as filtering the selectable files. +3. Converting the esptool python program to Linux executable for greatest portability as well as ease of use. +4. Implementing a way for us to hook into the esptool program. diff --git a/src/espflasher b/src/espflasher index 1af97e0ef1611283b2bb3ed8e62bb236677553ee..76733d6dc5d4396f5f85190a5d66464cfd2ff4da 100755 GIT binary patch delta 3635 zcmaJ^eNdFg8Q;C*;5fKXIFE~n2jM_KxI3bxNyeEwDEg8RgNSLIf+t^=Qwmg$npT~o zC1yMs9bh{(&14*sI<1p7lbbMgfIlLj6FRXUU?&+RoessCa;;9#riP&Q`aFC4qMWqP z&F=60Jsn14CnvjM5ykBZ6&0I$+&HXbMY$;Jvl@j%lu{NqE zwQPi54yZb3;|*oCf4_J9ne*!k`$t2$`*V!oVS%E6k^rU8(5*IPrY0SaSFJmqN~%D` z?N-3GP|~4fKtWj#B@;>(5)gY7c%1`vuHgFvZyx#QpT5|lleXLG$jRHfYu|e%ef0Xk zk@sG>K6W6n?9#;8-FtW+3&BP(LQ@R>A`y!7Qd_hU^|

>Qct#HsWs4a9Gug|d^%5Ag?pIJyL(KY3-dG) z9Z{Lwd~ov6?^D$4$yuQnBPV*{U!sfp;}W6lX`~R2F)RQI*B@ZHP4z z0||*XnvMQhLq7qu9nyh-wf z-X-+kj2XFG=$)dSX5k+PdKzqMZlJrhN^_VQ|JejKR=%E=+`h$K_-_YLW_cnC-{q1eu##UeBf#xRC(%jmyOu9N++v}T_ z=_9Q{V}6#taVbjorCE}*{Gpa72 zwxL4x1Py3YZA3aY=2y)>2cc5WCH2KS!&mqSR5gz1x26&)Fg^E6|xPlJx$h$fJ7&-2~a0llT$Z>Ck z_i{dp9HvCVRh)l-T!Y-r`Mb!IkUKel2YE7b8|QDP*aD;l)`)}+Trq$SI^=}&6Ug<* z7ybhZ`;U?1Qif+a{~>ZbO~O;0Pnc|EUmtKTu3Hts={-_#PU`vFLRC%0uI5 zp)@&(-y`!Uoia~D80j+Zl7ctp+n}Gik5nI;m?inC!oIqTs9gzC&rO3AJh~|L99<-S zozz>tCUD^VAh`p^%wF<-K`;mwg zEFXj>1_7_mKg<50-2tbFO;>6y2jl$MJ@Du`+DH7U;M9k$)v?36Z2Ap0sC!ZIv7UXQ z%hpAk8^&4BFD|i6{aTvDw&=?$zgof$CZyhDEif;s*R9@JT@f7j3^#!5$UMZ2+Ti&9 z5MSyA43D-E!myr82I*up4tjmC#D1sGryll|eq)J#{cGqovJi1+MeuG#@RQ2C8?ahxY5ak5KEU=E?(V|d0k=qKF%mfkxbSr(@+#ox(B%~1 zEx-l9F98j(x$glw0iT40r~>>Ayy#Z}aRa;oh&ykV^&4|(2OBXuC}Ck^Za@c7{Mhv9 z46iH7wDG0M2{=c*Nt&Si8+!d;cAVOu|BwAF*e`;810a#xZ;ZB|4XR7{&0qeS6`QhD zH-T?vyG?6V$uL$o`+=!URRd2gL*u5?YK=i0V+&d~vo5FF2No0oC-H;Qcb21pMv8|EQIWf zsDwQ$FVIRoT*u6nWe&hQ5QAB1*Ak}~(@MRL$d~6z{p0BX+LdsD$XEJGelUo%A9V^Y=s(3-iPGlD;Br_Y$E-j>x zLk!2{5V*++Ng-F)?d4B$^?(`e7AtFJa1MeIKIGDlcumXwl22?H1QDZhd@#4~rKJMd`&h=^!L~X=&iHTKaUJ zr(P4h^S_8@V$-%o)}Ldc|H2_q1>2Epp?a+A)1V(5Y;2BW2R-%`yUZIwzgm*!7VX3) zT`#dr=&OB2Sa`;!VZGdH;?~F0%XfGS@ALX1ujhFED`wnap$q&u!uztaY0zxK z+O=K0sE3(abWwMMezgR(g~uMjdLVC3S@U8UyOvj%4q04hySJsjt*Nz{e8+zPayVaW zQ}aP@Tk|2dBfmR!waku9<>!>F$nLz&m<*CmKZG81ySG(Vl$Lpmi;9ajla+}dGZb7N znlJbxWy6KD^c?$Hk;5b(AZ{2s%9xVP6crieW0n7f0d+UCIvmDsab9*~UIbFbb~_vz z`4pW>WCM;8&GHeWVON04CyP_VOwJOGe2mW~v1*{p=Sngg04g6RPA$9QEP41pO&t0S z%<6I`ik*xXfa__Qg-mR~^|WF6?^<+#wd|V9VGIdvNc^dLYsgxBNI~Id-Ly^n3SONc W_#dp8-Ply1k@C2Lya7v5nDJk22_Clq delta 2887 zcmZuzdr*{B6uU^W zYJC)Vnuci_hss`#IgC`Z`iFuU%-Bq^n$3<)GxT1{CN+l%%C>Xv-cJcS-+cGn-?``9 zd+y`hb9*+0H+D?Z>QjA;C{Z%Dvvbb7mM`r>#=f+7UOeT}5};m7=;(Y=Ld+JyasF9- zjX!WWD|gJw)&$PKr>sNuw)$!{}bOIc(S_Y!lmfe z`*Rmw-J5%S{}tP>=YO|Bgy-@gykT&{BZg^wfNFfHD31#1kfEHf0-hA)xv)CvF8;ZY z_9Zp(`A}f=a3*yBfNzaX?=X6x;*eoi6ApQkeirhaDe_a`Pj;3(fUS0x%3@~UO%tq* z<8No_?2xL<-x^Qm#^Ab^))p8`8H0`H#U2G`O`pOJi9r%QI9giL7&EXxrEEt|ivUacf1WH?z1E?lAuEIN6NFO; zKO*ok!Y0B^0v{%fQ)46b0>4SvLf9wpYlKq?mkWG=u$8c@O$hdo0N09*r~*Gr*hZKM z`~=~2!k7O+fqNTamGH2@8wu0N9T^h%n8U@^bs!ex{jDw(X$*wE3$*`mxqe06U|%qtkh}fGMU+G`5WWW2R zG#6VL*nbQ0<#nOay3mCsbAAl8Uor*yuNz`7K%;&14!Tk3O!fU4kBhCs@tP2iA}0^> z(CsMl9^6q3Ek---LQY3)1H7Lxn|DDZ!^4Y#J7z1DMHNw0@eyMbB}8}y<^}BwO+JBWU5HF3sLC&!6;1I8 zh%?_p72UVX5+6+Qfj@Ke0oSy)B1=NGQu12KS4qB3^2a29Uh-EZe@F6fA~5O#%m6tsfOwq&L+gP4vi40sH11`|c1ZeS*+&wOH| zfthh({!ib+^acE{zP#1p?E=kU#bA#VWE#?#4?WB@*jPRBB@=J>o7M)*Bs~}*lgYp| zrl-bhB zX+y+WS2G7iPayMKla`I9tv+qDBXf~J! zgfDAF$=FiSdRcfp^+nJude|z;-J(1s%7d`A*vXHHdOwYo{WbPatJpK?B@z=l28a|p zy))!Kw90Gf03~XqV&vL{(?|K5XaQMaGV;zDgUXT>)7Nj`6kM~T<>BVF+k&lYA7{bf zilx=TntK)ngRn0pA3iNv4Y!rLVRPwp@T6qH2c;icg2CoTw*)t=Zf)*uoO_Ogr|esP zJ7^w{UB8y1a(luGGeRP&IP!$TFN;7Kyl L+OLPsiu`{8bHk%e diff --git a/src/espflasher.ui b/src/espflasher.ui index 59f910f..5567ce6 100644 --- a/src/espflasher.ui +++ b/src/espflasher.ui @@ -1,5 +1,6 @@ + @@ -53,7 +54,7 @@ False center center - Alpha v0.3 + Alpha v0.3.1 False @@ -260,13 +261,14 @@ gtk-about + about_button True True True True 0.50999999046325684 True - + True @@ -311,7 +313,7 @@ window1 about_button ESP Flasher - V0.3 Alpha + V0.3.1 Alpha This Program uses the esptool backend to flash .bin files onto the esp8266. https://github.com/DGxInfinitY/Vault-Project @@ -319,8 +321,8 @@ onto the esp8266. Donovan Goodwin Donovan Goodwin Donovan Goodwin - utilities-terminal - gpl-3-0 + + lgpl-2-1 False diff --git a/src/espflasher.vala b/src/espflasher.vala index b90d71a..e3abe85 100644 --- a/src/espflasher.vala +++ b/src/espflasher.vala @@ -1,27 +1,43 @@ /* -//Version 0.3 Alpha -//ESPFlasher by Donovan Goodwin +// Version 0.3.1 Alpha +// ESPFlasher by Donovan Goodwin */ using Gtk; +using Granite; + +public void about_button_clicked() { + //Adding Stuff Here +} +public void help_clicked() { + //Adding Stuff Here +} +public void upload_clicked() { + //Adding Stuff Here +} -/* -// Here I am going to add the functions of the buttons -// To allow for selecting, uploading, and monitoring -// Of ESP operations. -// -*/ int main (string[] args) { Gtk.init (ref args); try { // If the UI contains custom widgets, their types must've been instantiated once - // Type type = typeof(Foo.BarEntry); - // assert(type != 0); + //Type type = typeof(aboutdialog); + //assert(type != 0); var builder = new Builder (); builder.add_from_file ("espflasher.ui"); builder.connect_signals (null); - var window = builder.get_object ("window1") as Window; - //var aboutdialog = builder.get_object ("aboutdialog") as Gtkaboutdialog; + var window = builder.get_object("window1") as Window; + //var aboutdialog = builder.get_object("aboutdialog"); + + + //string[] authors = {"Donovan Goodwin", "The Irish Dragon"}; + // Use property names as keys + //Gtk.show_about_dialog (window, + //program_name: "ESP Flasher", + //copyright: "Copyright © 1998-2000 Gyro Gearloose", + //authors: authors, + //website: "http://gihub.com/dgxinfinity/Vault-Project", + //website_label: "Github"); + window.show_all (); Gtk.main (); } catch (Error e) {