AtguiguCorp/KeyBoard_QT
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Connect APP shell to logic

Browse Source
This commit is contained in:
stli
2026-04-11 09:46:45 +08:00
parent 18f40840ba
commit acea92b0de
6 changed files with 164 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
KeyBorad/KeyBorad/APP/AppMainWindow.cpp
View File

@@ -5,6 +5,7 @@
#include "APP/AppTheme.h"
#include <QtWidgets/QTabWidget>
#include <QtCore/QTimer>
#include <QtWidgets/QVBoxLayout>
namespace APP
@@ -29,6 +30,32 @@ App_MainWindow::App_MainWindow(QWidget* p_Parent)
appTabWidget->addTab(appSettingsPage, QStringLiteral("Settings"));
p_RootLayout->addWidget(appTabWidget);
appPollTimer = new QTimer(this);
connect(appPollTimer, &QTimer::timeout, this, [this]()
{
if (Lgc_Core_Poll(&appLogic))
{
App_Func_RefreshFromLogic();
}
});
App_Func_StartLogic();
}
void App_MainWindow::App_Func_StartLogic()
{
Lgc_Core_Init(&appLogic);
Lgc_Core_Start(&appLogic);
App_Func_RefreshFromLogic();
appPollTimer->start(30);
}
void App_MainWindow::App_Func_RefreshFromLogic()
{
const Lgc_State& State = Lgc_Core_GetState(&appLogic);
appSettingsPage->App_Func_SetConnectionText(State.ConnectionText);
appSettingsPage->App_Func_SetLastActionText(State.LastActionText);
}
App_KeyboardPage* App_MainWindow::App_Func_GetKeyboardPage() const

8
KeyBorad/KeyBorad/APP/AppMainWindow.h
View File

@@ -1,8 +1,11 @@
#pragma once
#include "LOGIC/Lgc_Core.h"
#include <QtWidgets/QWidget>
class QTabWidget;
class QTimer;
namespace APP
{
@@ -19,9 +22,14 @@ public:
App_SettingsPage* App_Func_GetSettingsPage() const;
private:
void App_Func_StartLogic();
void App_Func_RefreshFromLogic();
QTabWidget* appTabWidget = nullptr;
App_KeyboardPage* appKeyboardPage = nullptr;
App_SettingsPage* appSettingsPage = nullptr;
QTimer* appPollTimer = nullptr;
Lgc_Core appLogic;
};
} // namespace APP

14
KeyBorad/KeyBorad/KeyBorad.vcxproj
View File

@@ -37,12 +37,12 @@
</ImportGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="QtSettings">
<QtInstall>D:\App\Qt\5.13.1\msvc2015_64</QtInstall>
<QtModules>core;serialport</QtModules>
<QtModules>core;serialport;widgets</QtModules>
<QtBuildConfig>debug</QtBuildConfig>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
<QtInstall>D:\App\Qt\5.13.1\msvc2015_64</QtInstall>
<QtModules>core;serialport</QtModules>
<QtModules>core;serialport;widgets</QtModules>
<QtBuildConfig>release</QtBuildConfig>
</PropertyGroup>
<Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
@@ -94,6 +94,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="APP\AppKeyButton.cpp" />
<ClInclude Include="APP\AppKeyButton.h" />
<ClCompile Include="APP\AppKeyboardPage.cpp" />
<ClInclude Include="APP\AppKeyboardPage.h" />
<ClCompile Include="APP\AppMainWindow.cpp" />
<ClInclude Include="APP\AppMainWindow.h" />
<ClCompile Include="APP\AppSettingsPage.cpp" />
<ClInclude Include="APP\AppSettingsPage.h" />
<ClInclude Include="APP\AppTheme.h" />
<ClInclude Include="COM\Com_Cdc.h" />
<ClCompile Include="COM\Com_ProtoCodec.cpp" />
@@ -108,6 +116,8 @@
<ClCompile Include="APP\AppTheme.cpp" />
<ClCompile Include="LOGIC\Lgc_Core.cpp" />
<ClInclude Include="LOGIC\Lgc_Core.h" />
<ClCompile Include="LOGIC\Lgc_FunctionExecutor.cpp" />
<ClInclude Include="LOGIC\Lgc_FunctionExecutor.h" />
<ClCompile Include="LOGIC\Lgc_Session.cpp" />
<ClInclude Include="LOGIC\Lgc_Session.h" />
<ClInclude Include="LOGIC\Lgc_State.h" />

30
KeyBorad/KeyBorad/KeyBorad.vcxproj.filters
View File

@@ -23,6 +23,30 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="APP\AppKeyButton.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="APP\AppKeyButton.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="APP\AppKeyboardPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="APP\AppKeyboardPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="APP\AppMainWindow.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="APP\AppMainWindow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="APP\AppSettingsPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="APP\AppSettingsPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="APP\AppTheme.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -65,6 +89,12 @@
<ClInclude Include="LOGIC\Lgc_Core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="LOGIC\Lgc_FunctionExecutor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClInclude Include="LOGIC\Lgc_FunctionExecutor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="LOGIC\Lgc_Session.cpp">
<Filter>Source Files</Filter>
</ClCompile>

18
KeyBorad/KeyBorad/main.cpp
View File

@@ -1,19 +1,13 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtWidgets/QApplication>
#include "DRI/Dri_Cdc.h"
#include "APP/AppMainWindow.h"
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
QApplication App(argc, argv);
Dri_Cdc_Struct_Port Port;
Dri_Cdc_Struct_InitConfig Config;
Config.BaudRate = 115200;
APP::App_MainWindow Window;
Window.show();
const bool IsInitOk = Dri_Cdc_Init(&Port, Config);
qDebug() << "Dri_Cdc_Init =" << IsInitOk;
Dri_Cdc_Deinit(&Port);
return 0;
return App.exec();
}