Compare commits
1 Commits
zeroconf
...
9a21be6f07
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a21be6f07 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -2,8 +2,6 @@
|
||||
*.py[oc]
|
||||
*.swp
|
||||
|
||||
_buildid.py
|
||||
|
||||
build/
|
||||
dist/
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Luftdaten.info Flashing Tool (v{version})</string>
|
||||
<string>Luftdaten.info Flashing Tool</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset>
|
||||
@@ -279,19 +279,6 @@
|
||||
<property name="spacing">
|
||||
<number>12</number>
|
||||
</property>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="buildLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><b>Luftdaten.info Flashing Tool</b><br/>Build {build_id}</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="maximumSize">
|
||||
@@ -311,6 +298,19 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Luftdaten.info Flashing Tool</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="text">
|
||||
|
||||
@@ -11,7 +11,6 @@ import logging
|
||||
import requests
|
||||
from esptool import ESPLoader
|
||||
|
||||
import luftdatentool
|
||||
from luftdatentool.qtvariant import QtGui, QtCore, QtWidgets
|
||||
from luftdatentool.utils import QuickThread
|
||||
from luftdatentool.workers import PortDetectThread, FirmwareListThread, \
|
||||
@@ -46,8 +45,8 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
||||
os.chdir(oldcwd)
|
||||
|
||||
self.app = app
|
||||
|
||||
self.translator = QtCore.QTranslator()
|
||||
|
||||
self.i18n_init(QtCore.QLocale.system())
|
||||
|
||||
self.statusbar.showMessage(self.tr("Loading firmware list..."))
|
||||
@@ -69,7 +68,6 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
||||
# Hide WIP GUI parts...
|
||||
self.on_expertModeBox_clicked()
|
||||
self.expertModeBox.hide()
|
||||
self.tabWidget.removeTab(self.tabWidget.indexOf(self.serialTab))
|
||||
|
||||
self.uploadProgress.connect(self.on_work_update)
|
||||
self.errorSignal.connect(self.on_work_error)
|
||||
@@ -88,21 +86,6 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
||||
def on_work_error(self, message):
|
||||
self.statusbar.showMessage(message)
|
||||
|
||||
@property
|
||||
def version(self):
|
||||
return luftdatentool.__version__
|
||||
|
||||
@property
|
||||
def build_id(self):
|
||||
try:
|
||||
from luftdatentool._buildid import commit, builddate
|
||||
except ImportError:
|
||||
import datetime
|
||||
commit = 'devel'
|
||||
builddate = datetime.datetime.now().strftime('%Y%m%d')
|
||||
|
||||
return '{}-{}/{}'.format(self.version, commit, builddate)
|
||||
|
||||
def i18n_init(self, locale):
|
||||
"""Initializes i18n to specified QLocale"""
|
||||
|
||||
@@ -113,13 +96,6 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
||||
self.app.installTranslator(self.translator)
|
||||
self.retranslateUi(self)
|
||||
|
||||
def retranslateUi(self, win):
|
||||
super(MainWindow, self).retranslateUi(win)
|
||||
|
||||
win.setWindowTitle(win.windowTitle().format(
|
||||
version=self.version))
|
||||
win.buildLabel.setText(win.buildLabel.text().format(
|
||||
build_id=self.build_id))
|
||||
def populate_versions(self, files):
|
||||
"""Loads available firmware versions into versionbox widget"""
|
||||
|
||||
@@ -152,8 +128,6 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
||||
sep.setEnabled(False)
|
||||
self.boardBox.model().appendRow(sep)
|
||||
|
||||
# No prefered boards has been found so far and there is a
|
||||
# suggested driver download URL available
|
||||
if not self.boards_detected and DRIVERS_URL:
|
||||
self.show_global_message(
|
||||
self.tr('No boards found'),
|
||||
|
||||
@@ -2,16 +2,6 @@
|
||||
|
||||
block_cipher = None
|
||||
|
||||
import subprocess
|
||||
import datetime
|
||||
|
||||
commit = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).strip().decode('utf-8')
|
||||
builddate = datetime.datetime.now().strftime('%Y%m%d')
|
||||
|
||||
with open('luftdatentool/_buildid.py', 'w') as fd:
|
||||
fd.write('''# This file is autogenerated in luftdaten-tool.spec file
|
||||
commit = "{commit}"
|
||||
builddate = "{builddate}"'''.format(commit=commit, builddate=builddate))
|
||||
|
||||
a = Analysis(['luftdaten-tool.py'],
|
||||
pathex=['.'],
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
__version__ = '0.2'
|
||||
|
||||
@@ -17,11 +17,11 @@ class PortDetectThread(QuickThread):
|
||||
def target(self):
|
||||
"""Checks list of available ports and emits signal when necessary"""
|
||||
|
||||
ports = None
|
||||
ports = []
|
||||
while True:
|
||||
new_ports = serial.tools.list_ports.comports()
|
||||
|
||||
if ports is None or [p.name for p in ports] != [p.name for p in new_ports]:
|
||||
if [p.name for p in ports] != [p.name for p in new_ports]:
|
||||
self.portsUpdate.emit(new_ports)
|
||||
|
||||
time.sleep(self.interval)
|
||||
|
||||
Reference in New Issue
Block a user