diff --git a/config/__init__.py b/config/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/gui/app.py b/gui/app.py index a5c4c326ef0458279f3de1d765572358fd3b861e..dfae50a1f48caa0ca25a8282bebc7287694cde5b 100644 --- a/gui/app.py +++ b/gui/app.py @@ -5,11 +5,10 @@ import sys from PyQt6.QtGui import QIcon -from PyQt6.QtWidgets import QApplication, QLabel, QMainWindow, QTabWidget, QTextEdit, QVBoxLayout, QWidget +from PyQt6.QtWidgets import (QApplication, QLabel, QMainWindow, QTabWidget, + QTextEdit, QVBoxLayout, QWidget) from dfu_image_generator import DfuImageGenerator - -sys.path.append('..') -from config.setting import Settings +from setting import Settings class NrfxToolbox(QMainWindow): diff --git a/gui/dfu_image_generator.py b/gui/dfu_image_generator.py index 922aa438f9b34ece1246132d700b6bb0c6bf6023..78fec98ac276ee6131eaca73daa6cadab1cf38ac 100644 --- a/gui/dfu_image_generator.py +++ b/gui/dfu_image_generator.py @@ -1,9 +1,28 @@ #!/usr/bin/env python -from PyQt6.QtGui import QTextLine -from PyQt6.QtWidgets import (QComboBox, QGridLayout, QHBoxLayout, QLineEdit, - QPushButton, QTextEdit, QVBoxLayout, QWidget, - QLabel, QTabWidget) +import sys +from PyQt6.QtWidgets import (QComboBox, QGridLayout, QLineEdit, QPushButton, + QVBoxLayout, QWidget, QLabel, QTabWidget) + +sys.path.append('..') +from click.testing import CliRunner +from nordicsemi import __main__ +from pathlib import Path + +runner = CliRunner() +cli = __main__.cli + +# 获取根目录 +root_dir = Path.cwd().parent +print(root_dir) +# 创建输出目录 +output_dir = '../_out/' +print(output_dir) +if root_dir.joinpath('_out').exists(): + print('_out is exit.') +else: + print('create a new ') + root_dir.joinpath('_out').mkdir(parents=False, exist_ok=False) class DfuImageGenerator(QWidget): @@ -40,6 +59,7 @@ class DfuImageGenerator(QWidget): class GenerateKeyTab(QWidget): def __init__(self, parent): super(GenerateKeyTab, self).__init__(parent) + self.init_ui() def init_ui(self): @@ -65,9 +85,23 @@ class GenerateKeyTab(QWidget): def gen_btn_handler(self): print('gen_btn_handler') + out_file = '../_out/key.pem' + print(out_file) + result = runner.invoke(cli, ['keys', 'generate', out_file]) + print(result.output) + print(result.exit_code) + #self.assertIsNone(result.exception) def dis_btn_handler(self): print('gen_btn_handler') + key_file = '../_out/key.pem' + key_file_c = '../_out/dfu_public_key.c' + result = runner.invoke(cli, [ + 'keys', 'display', '--key', 'pk', '--format', 'code', key_file, + '--out_file', key_file_c + ]) + print(result.output) + print(result.exit_code) def rst_btn_handler(self): print('gen_btn_handler') diff --git a/config/setting.py b/gui/setting.py similarity index 100% rename from config/setting.py rename to gui/setting.py