Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/ ZXSSCJ into dev

Fork: 0

codedev / ZXSSCJ

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/ ZXSSCJ into dev 20211020 recommit mock one frame per second for kafka test. dev dev-offline
commit 5c757d751004484a4ba54f5d23039e89d0e0aac8 2 parents f2d4072 + cd541d1 tan yue authored on 20 Oct 2021

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View CounterAcq/CounterDevice.cpp

Ignore Space Show notes View CounterAcq/CounterWindow.cpp

Ignore Space Show notes View CounterAcq/CounterWindow.h

Show notes View CounterAcq/CounterWindow.ui 100644 → 0

Ignore Space Show notes View CounterAcq/common/utils/QSerialPortUtil.cpp

Ignore Space Show notes View CounterAcq/conf/config.ini

Show line notes below