From 6ee1467bafe18735a3043fcb93305378656b323f Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 6 Aug 2024 11:23:37 +0800 Subject: [PATCH] v1.0.1 --- .gitignore | 3 +- CMakeLists.txt | 12 +- CMakeLists.txt.user | 320 -------------------------------- app.rc | 3 +- logo.ico | Bin 4286 -> 4286 bytes logo.png | Bin 0 -> 6849 bytes logo.svg | 1 + logo128x128.ico | Bin 0 -> 67646 bytes logores/1/logo.ico | Bin 0 -> 4286 bytes logores/1/logo128x128.ico | Bin 0 -> 67646 bytes p_lusterinc_xsync - 快捷方式.lnk | Bin 985 -> 0 bytes src/app/syncbox16ch/syncbox16ch.cpp | 14 +- src/app/syncbox16ch/syncbox16ch.ui | 2 +- src/app/syncbox16ch/syncbox16ch_sdk.cpp | 8 +- src/app/syncbox16ch/syncbox16ch_sdk.hpp | 4 +- src/app_version.hpp | 2 +- 16 files changed, 26 insertions(+), 343 deletions(-) delete mode 100644 CMakeLists.txt.user create mode 100644 logo.png create mode 100644 logo.svg create mode 100644 logo128x128.ico create mode 100644 logores/1/logo.ico create mode 100644 logores/1/logo128x128.ico delete mode 100644 p_lusterinc_xsync - 快捷方式.lnk diff --git a/.gitignore b/.gitignore index 7f96686..f9259fe 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,5 @@ Thumbs.db # -------- *.dll -build \ No newline at end of file +build +CMakeLists.txt.user diff --git a/CMakeLists.txt b/CMakeLists.txt index 19a3ae3..08dc119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(zfpga_pc VERSION 0.1 LANGUAGES CXX) +project(IflyLogic VERSION 0.1 LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -37,19 +37,19 @@ set(PROJECT_SOURCES app.rc ) -add_executable(zfpga_pc WIN32 +add_executable(IflyLogic WIN32 ${PROJECT_SOURCES} ) -target_link_options(zfpga_pc PRIVATE -static -static-libgcc -static-libstdc++) +target_link_options(IflyLogic PRIVATE -static -static-libgcc -static-libstdc++) -target_link_libraries(zfpga_pc PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) +target_link_libraries(IflyLogic PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) -set_target_properties(zfpga_pc PROPERTIES +set_target_properties(IflyLogic PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) if(QT_VERSION_MAJOR EQUAL 6) - qt_finalize_executable(zfpga_pc) + qt_finalize_executable(IflyLogic) endif() diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user deleted file mode 100644 index 2cb9ce5..0000000 --- a/CMakeLists.txt.user +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - EnvironmentId - {4b1b8946-9605-410f-846a-42fb19af5924} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - false - true - false - 0 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - - 0 - true - - -fno-delayed-template-parsing - - true - Builtin.BuildSystem - - true - true - Builtin.DefaultTidyAndClazy - 10 - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop Qt 5.12.12 MinGW 64-bit - Desktop Qt 5.12.12 MinGW 64-bit - qt.qt5.51212.win64_mingw73_kit - 0 - 0 - 0 - - Debug - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\zfpge_workspace\build-zfpga_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - Release - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=Release --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\zfpge_workspace\build-zfpga_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - CMakeProjectManager.CMakeBuildConfiguration - - - RelWithDebInfo - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\zfpge_workspace\build-zfpga_pc-Desktop_Qt_5_12_12_MinGW_64_bit-RelWithDebInfo - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - MinSizeRel - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=MinSizeRel --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\zfpge_workspace\build-zfpga_pc-Desktop_Qt_5_12_12_MinGW_64_bit-MinSizeRel - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 4 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - true - - 2 - - zfpga_pc - CMakeProjectManager.CMakeRunConfiguration.zfpga_pc - zfpga_pc - false - true - true - false - true - D:/zfpge_workspace/build-zfpga_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/app.rc b/app.rc index c309aa1..ced6430 100644 --- a/app.rc +++ b/app.rc @@ -1 +1,2 @@ -IDI_ICON1 ICON "logo.ico" \ No newline at end of file +IDI_ICON1 ICON "logo.ico" +IDI_ICON2 ICON "logo128x128.ico" \ No newline at end of file diff --git a/logo.ico b/logo.ico index c7b5197e70edca93aba3b526add4ef3073f9e622..e878c5c4f9c67451329a069d83273cb7bbe91537 100644 GIT binary patch literal 4286 zcmeHKc~I0<9DjfuUZduePC4n60&3`TSgCnTsZ-e~iby(`#3gx~q?H1zh^RQJnBbk{ zxqyPor6PhWhYFVB2#erZ3M|;x+31Hc6s1gOm9G>kg{US8t0MoxR-X$!2B*w@-i1lTxx`&p|T zASVNZ{B4~3`rD{JGm{@;e!icLsuN^@m9Q}FSI&7M;yG^)6SH0)?5cL~*cjf^D=xf; z#Fo&m?nf6mj7bW8*F9ftKRN?Q4eK`Q&=cvA8uHG_Q{g?vCSY&gBI902tcjb}w!cTl zXy?~xuZm$!Dr$A@g0P)YKlL}Z-rR?zHe~Vu2OoGdy^_QpP)0*nN%Emn2OhB zQStglumSUHGwGM}S3CMvp1bo>rgX>_!}(KDgF5Y3w6PxOrv%lh~PSMAr) z?fgng3|vmy#qo43GNDOm7ww|xpr0sYNg}0&Z6zwXM^t*Bs?*D9VNcHlL}ZivJ10hn zC4D9YSElReX6`l0!I_VB{}7cuFyMS0QN^Q%ap4i^4_~CR9R+l^uommF4}0~Q6|~T4 ztmH>-h#{73#V3|+OmV<-fHm;Bzjbe)5PNq`Wro5Z4*qknqoNDnNw+nRN`K9L3UY31 zE|qP|r}Ntjs1)O>17(uG=I{jyad0p6Z`OMfIJ|&XKz)8o%ysxmICfgp`^yNU{+aXR zsIK^yv?JS~FglHrr$$qLR1)Pa-EG3wacat(w}tYS?U6VzcO&hexyGcwy62db3BtZJ za{yeU>hs%S&O5+b6+FM&h!p03aQbh`Ua*4>{;-+u9IqyV?F(0>QrXVq2KyU*0;!Em zq#N2lh|1xg@`qHNb&=BNY>@Ys`rD5@i?c()F%{rCX~ypc`@3;%b@sFBH9*~COw9GP zQh9gwU%~QZD%qlyoQ2Wg-=1%X1@?*JmmK)%#*xbgJ7G`tp>oPl`1P3=D6ISF!@d^p z^#cdjORm*s{3idq8u&e8ucw0_vCDU7TV6~&CG~oSA8W4eEvA%Nv2+Xh!h876_4z{` zN9EycPw)-{xPR2=XZ>BUW}v!eXE2k6eR znfh%kUE2Mdft&5o06+B4^0jap$Q*!8ll&P<{4d-|j}@KR7Mh83Xy3FYbg$@!fe+s* zG$-l6_nYX>3H|f**ZNsG4F@mxEbg0)=@0)K^q2V`4t~x*#8|=dBsw(h3re3dj;^Qa z4Dn&~KkCGd>?@7(EB@~fUe>=M`*Z%g_*wS)h~v+ge>p~e=vkX}iITrjQ^t2Ipg-yh z+Xeh}XKvE|>Ctp~&+kgiqUJpte@A>Rod$!0dv`^BS9hdBlkS1KZ^c}o^@w# zAr|hKxY^f5F(2x{Dv{vKhV}y080IFc+0&0 znDl4+q4lH6Ewa{WQ|Xm z86#`HHX`2iO|C<~PMy7$_Dx?cZDizsq5kW$SoYuR89I6ld+WC4$(~cRI-MBYe@f!C z^bp_l$cLiUX>#89-5}HCx~u!n%9^D|{2BXiQ}2(>9zTjjs&O;9-q)gs)E>EnyuK`R z+ayuv*{7V3hB^Lznf}VT^3+=1UjuMY4s#r>!GC|6e1FY-`%^KygOAZ`^QJPjE{lT;C`DJJdSW4zb?F&*AB>7)R=6%U82xy_se~}7iTPX^;XYl zKVV3HWTFVLeg6B?JQj^(yr)H=jk71D6Ql>wUjdI@fD!nnf?N<_qw0upP>`J)zrSC} zk8=eW3UmdA0G!7R9(M=0raJ&rfcAiAke%zR=I8pr?-pCs3Tp}3$NAmh#@`@iUUMC5 y9@zZl?fgoN^&dNgjK6FvqHGJgKUj3WFC^MP8qqQvx$`nG+iN_dGoNpQ!uv0&*0Dzb literal 4286 zcmchbZHQD=7{||@*$jJgi_+-DosHSqCHxQsA-HDHdsHN43R3hb+WJr*L=bheL@^8c z5P=YpWo1NAeJY4xz+NCEia?aLv^OdWv~p)=SGU{mf95QgBd$F-YN+#$cg{?Y2~AJ?X$r zPy^|I2@4@Jznj5&Igz&50MZu6;Tq_sRAwz{Ko7hHray^)CuEN4W>6Y%HtYk_m)!<_ zZn~-0Su1Fiu-`ze{~>MNSLcu!+YOn2E@-)d#hi4@ufCA1hKaKV=$*R$T-#1y&nXtdjfwswB&1pt+l^Bf?Ka1u;^3V$uM%E*WL@IEL{&tNauIq(|(v}e{Tkm1y*`Rfv2_XWn9w%O;# zEAw2VlK7GIOaBTu8gjqGYTtbu+8<$OwFb#o%}d}bFkQ2s5L*DT{xEGl8|A2f5quEZ zx{oqs{L<`@a^W7(8DhF-Rj&_X{Z+K>Ila?po<+ODSk<`O^0O7&QO!N?4e9R;%V(G}0j434bewWls9aIV<mGQy1JmlX4f5`S^o;YQ7GBud_c3_`5?~XVFIZJhUzMLE3ue zBkdJ9-J@SRn&*R{v6{m>K=EflG2z#RD&ULwOqRCoQJqbe+yVka9`!g;sN=$RM25f&Q?_HP&aq5h| z@SKGb}Fo;KiL8X6PcD{tc4T$=rn*pPDKOKs4a z(6`&G@HAWuaat~avi+SCzgJBEQ)+6hO{>Lw#(8+>oG2HQDZVS`dZ|9>{i5^3v}N^7 zbw13sbgpr#4+Eh2j`c^IeY1O}xkRI+riTBvIS}dVoqLP={_88~Yo6nCSbMPif9Q|5 z&taW|w(md2&wZBv(;TJg*0fC#UnJ?Nz9elJi(PtLoM-e_-8uYcLQk8tXX%-#gDp!J ZG#SQj5`CWP=!&%Zc$!uzZyZh2zX5Yi<2wKV diff --git a/logo.png b/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..299d6fe87b1abfb22d4bc8a1fbe3a3e6db170296 GIT binary patch literal 6849 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 literal 0 HcmV?d00001 diff --git a/logo.svg b/logo.svg new file mode 100644 index 0000000..8599f8d --- /dev/null +++ b/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/logo128x128.ico b/logo128x128.ico new file mode 100644 index 0000000000000000000000000000000000000000..d00cafeb22d4ca7d3e38e63caf8ca5b1ffe47661 GIT binary patch literal 67646 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 CM_n2K literal 0 HcmV?d00001 diff --git a/logores/1/logo.ico b/logores/1/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..0ea6ba4c09996cd9bbd60c9bd8b86934028b8b55 GIT binary patch literal 4286 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 literal 0 HcmV?d00001 diff --git a/p_lusterinc_xsync - 快捷方式.lnk b/p_lusterinc_xsync - 快捷方式.lnk deleted file mode 100644 index 99d751cb7bf2e33a883b6d0c551202836fd447e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 985 zcmeZaU|?VrVFHp23P+-si#<~@QCP*0=OaYQ0!wf#EZh!AC zC9w1(Q$o+Y*K16H;#?pVAj5=!n3$*m1wF`O1_uz~lm$-Il0YU4hz~Le#Ar|b=4TlR zi6}mhgaZ&GC;40;ALOQGS;-o!}Nyn)lPL4}$CJAS|uv&w}VE_Pd CqSajh diff --git a/src/app/syncbox16ch/syncbox16ch.cpp b/src/app/syncbox16ch/syncbox16ch.cpp index 4eaa29f..a0c1ed6 100644 --- a/src/app/syncbox16ch/syncbox16ch.cpp +++ b/src/app/syncbox16ch/syncbox16ch.cpp @@ -41,7 +41,7 @@ SyncBox16CH::SyncBox16CH(QWidget *parent) : QWidget(parent), ui(new Ui::SyncBox1 { // ui->OutputModeVal->addItems(QStringListValueOf(WorkModeStrList())); - ui->OutputPluseWidthVal->setText("1"); + ui->OutputPluseWidthVal->setText("10"); ui->OutputPluseNumVal->setText("1"); ui->OutputPluseFreqVal->setText("1000"); } @@ -119,10 +119,10 @@ void SyncBox16CH::on_SendButton_clicked() { ICLEAR(); try { - WorkMode_t outputMode = syncbox16chsdk::WorkModeValueOf(ui->OutputModeVal->currentText()); - uint32_t outputPluseWidthUs = zstr2int(ui->OutputPluseWidthVal->text()); - uint32_t outputPluseNum = zstr2int(ui->OutputPluseNumVal->text()); - uint32_t outputPluseFreq = zstr2int(ui->OutputPluseFreqVal->text()); + WorkMode_t outputMode = syncbox16chsdk::WorkModeValueOf(ui->OutputModeVal->currentText()); + uint32_t outputPluseWidth100ns = zstr2int(ui->OutputPluseWidthVal->text()); + uint32_t outputPluseNum = zstr2int(ui->OutputPluseNumVal->text()); + uint32_t outputPluseFreq = zstr2int(ui->OutputPluseFreqVal->text()); // void SyncBox16ChSDK::setPlusePeriod(uint32_t us) { cmder()->writeReg(kreg_app_trigger_mode_pluse_period, US2CNT(us)); } // void SyncBox16ChSDK::manualTrigger() { @@ -131,8 +131,8 @@ void SyncBox16CH::on_SendButton_clicked() { SDK->setPluseGeneratorMode(outputMode); if (outputMode == kWorkMode_manualTriMode) { SDK->setPluseNum(outputPluseNum); - SDK->setPluseWidth(outputPluseWidthUs); - SDK->setPlusePeriod(1.0 / outputPluseFreq * 1000 * 1000); + SDK->setPluseWidth(outputPluseWidth100ns * 10); + SDK->setPlusePeriod(1.0 / outputPluseFreq * 1000 * 1000 * 100); SDK->manualTrigger(); } } catch (const std::exception &e) { diff --git a/src/app/syncbox16ch/syncbox16ch.ui b/src/app/syncbox16ch/syncbox16ch.ui index 990b398..309f361 100644 --- a/src/app/syncbox16ch/syncbox16ch.ui +++ b/src/app/syncbox16ch/syncbox16ch.ui @@ -152,7 +152,7 @@ - 脉冲宽度(us) + 脉冲宽度(0.1us) diff --git a/src/app/syncbox16ch/syncbox16ch_sdk.cpp b/src/app/syncbox16ch/syncbox16ch_sdk.cpp index b5ba66f..d7a4fcb 100644 --- a/src/app/syncbox16ch/syncbox16ch_sdk.cpp +++ b/src/app/syncbox16ch/syncbox16ch_sdk.cpp @@ -31,11 +31,11 @@ using namespace iflytop; using namespace syncbox16chsdk; void SyncBox16ChSDK::initialize() { ZFPGACommander::ins()->initialize(); } -#define US2CNT(us) (us * 100) -#define CNT2US(cnt) (cnt * 10 / 1000.0) +// #define US2CNT(us) (uint32_t)(us * 100) +// #define CNT2US(cnt) (cnt * 10 / 1000.0) -void SyncBox16ChSDK::setPluseWidth(uint32_t us) { cmder()->writeReg(kreg_app_trigger_mode_pluse_width, US2CNT(us)); } -void SyncBox16ChSDK::setPlusePeriod(uint32_t us) { cmder()->writeReg(kreg_app_trigger_mode_pluse_period, US2CNT(us)); } +void SyncBox16ChSDK::setPluseWidth(uint32_t _10ns) { cmder()->writeReg(kreg_app_trigger_mode_pluse_width, _10ns); } +void SyncBox16ChSDK::setPlusePeriod(uint32_t _10ns) { cmder()->writeReg(kreg_app_trigger_mode_pluse_period, _10ns); } void SyncBox16ChSDK::setPluseNum(uint32_t npluse) { cmder()->writeReg(kreg_app_trigger_mode_pluse_num, npluse); } void SyncBox16ChSDK::setPluseGeneratorMode(WorkMode_t mode) { cmder()->writeReg(kreg_app_mode, (uint32_t)mode); } void SyncBox16ChSDK::manualTrigger() { diff --git a/src/app/syncbox16ch/syncbox16ch_sdk.hpp b/src/app/syncbox16ch/syncbox16ch_sdk.hpp index f577a17..15bfd17 100644 --- a/src/app/syncbox16ch/syncbox16ch_sdk.hpp +++ b/src/app/syncbox16ch/syncbox16ch_sdk.hpp @@ -74,8 +74,8 @@ class SyncBox16ChSDK { public: void initialize(); - void setPluseWidth(uint32_t us); - void setPlusePeriod(uint32_t us); + void setPluseWidth(uint32_t _10ns); + void setPlusePeriod(uint32_t _10ns); void setPluseNum(uint32_t npluse); void setPluseGeneratorMode(WorkMode_t mode); void manualTrigger(); diff --git a/src/app_version.hpp b/src/app_version.hpp index 5cb0ea4..d4d0289 100644 --- a/src/app_version.hpp +++ b/src/app_version.hpp @@ -1,7 +1,7 @@ #pragma once #include "zfpga_basic_protocol\zaf_protocol.h" -#define APP_VERSION VERSION(1, 0, 0) +#define APP_VERSION VERSION(1, 0, 1) #define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION) #define APP_VERSION_SUB VERSION_SUB(APP_VERSION)