Browse Source

修改整个工程为cpp工程

master
zhaohe 2 years ago
parent
commit
90646a0c44
  1. 62
      app/MDK-ARM/app.uvguix.h_zha
  2. 14
      app/MDK-ARM/app.uvoptx
  3. 12
      app/MDK-ARM/app.uvprojx
  4. 2
      dep/libiflytop_micro
  5. 2
      dep/libtrinamic
  6. 4
      src/port.cpp
  7. 0
      src/port.hpp
  8. 0
      src/project_board.hpp
  9. 21
      src/umain.cpp

62
app/MDK-ARM/app.uvguix.h_zha
File diff suppressed because it is too large
View File

14
app/MDK-ARM/app.uvoptx

@ -637,31 +637,31 @@
<Group>
<GroupName>src</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>32</FileNumber>
<FileType>1</FileType>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\src\port.c</PathWithFileName>
<FilenameWithoutPath>port.c</FilenameWithoutPath>
<PathWithFileName>..\..\src\port.cpp</PathWithFileName>
<FilenameWithoutPath>port.cpp</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>33</FileNumber>
<FileType>1</FileType>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\src\umain.c</PathWithFileName>
<FilenameWithoutPath>umain.c</FilenameWithoutPath>
<PathWithFileName>..\..\src\umain.cpp</PathWithFileName>
<FilenameWithoutPath>umain.cpp</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>

12
app/MDK-ARM/app.uvprojx

@ -921,14 +921,14 @@
<GroupName>src</GroupName>
<Files>
<File>
<FileName>port.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\src\port.c</FilePath>
<FileName>port.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\..\src\port.cpp</FilePath>
</File>
<File>
<FileName>umain.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\src\umain.c</FilePath>
<FileName>umain.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\..\src\umain.cpp</FilePath>
</File>
</Files>
</Group>

2
dep/libiflytop_micro

@ -1 +1 @@
Subproject commit 5ec980e5bf5fe73bfdd7c5d7f1072ceeeb8982b0
Subproject commit 035088488535565c63d8d9215393e4acc0f0f4f6

2
dep/libtrinamic

@ -1 +1 @@
Subproject commit c14b8b32f3be6597254ff3c3c7990b8e205f1130
Subproject commit 3899ab046bea32b5f4e165147d3f6790539d0d25

4
src/port.c → src/port.cpp

@ -3,7 +3,7 @@
#include "libiflytop_micro/stm32/basic/basic.h"
#include "main.h"
#include "project_board.h"
#include "project_board.hpp"
#include "spi.h"
#include "tim.h"
#include "usart.h"
@ -14,11 +14,13 @@
* @param stream
* @return int
*/
extern "C" {
int fputc(int ch, FILE* stream) {
uint8_t c = ch;
HAL_UART_Transmit(&DEBUG_UART, &c, 1, 100);
return ch;
}
}
void port_do_debug_light_state() {
static uint32_t lastprocess = 0;

0
src/port.h → src/port.hpp

0
src/project_board.h → src/project_board.hpp

21
src/umain.c → src/umain.cpp

@ -2,30 +2,21 @@
#include <stdio.h>
#include "libiflytop_micro\stm32\basic\basic.h"
#include "port.h"
#include "project_board.h"
#include "port.hpp"
#include "project_board.hpp"
#define TAG "main"
/**
* @brief libtrinamic
*
* @param channel
* @param data
* @param length
*/
// void libtrinamic_readWriteArray(uint8_t channel, uint8_t *data, size_t length) {}
void libtrinamic_readWriteArray(uint8_t channel, uint8_t *data, size_t length) {}
extern "C" {
int umain(int argc, char const *argv[]) {
sys_loggger_enable(true);
ZLOGI(TAG, "VERSION:%s", VERSION);
while (true) {
port_do_debug_light_state();
}
return 0;
}
}
Loading…
Cancel
Save