tianjialong
/
copyZ_subwater_camera_enhancemen_board
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加sub modules

master
zwsd 3 years ago
parent
bed26cc1f1
commit
837cf21385
7 changed files with 144 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      .gitmodules
  2. 4
      .vscode/c_cpp_properties.json
  3. 4
      .vscode/settings.json
  4. 29
      app/MDK-ARM/app.uvguix.zwsd_cad3
  5. 92
      app/MDK-ARM/app.uvoptx
  6. 27
      app/MDK-ARM/app.uvprojx
  7. 11
      src/user_main.c

6
.gitmodules
View File

@ -0,0 +1,6 @@
[submodule "copyZ_zmodbus"]
path = copyZ_zmodbus
url = zwsd@192.168.1.3:tianjialong/copyZ_zmodbus.git
[submodule "copyZ_zstm32uart_irq_rx_service"]
path = copyZ_zstm32uart_irq_rx_service
url = zwsd@192.168.1.3:tianjialong/copyZ_zstm32uart_irq_rx_service.git

4
.vscode/c_cpp_properties.json
View File

@ -12,7 +12,9 @@
"D:\\keil\\ARM\\ARMCC\\include\\rw", "D:\\keil\\ARM\\ARMCC\\include\\rw",
"${workspaceFolder}/app/MDK-ARM", "${workspaceFolder}/app/MDK-ARM",
"${workspaceFolder}/app/Src", "${workspaceFolder}/app/Src",
"${workspaceFolder}/app/Drivers/STM32F1xx_HAL_Driver/Src"
"${workspaceFolder}/app/Drivers/STM32F1xx_HAL_Driver/Src",
"${workspaceFolder}/zmodbus",
"${workspaceFolder}/zstm32uart_irq_rx_service"
], ],
"defines": [ "defines": [
"USE_HAL_DRIVER", "USE_HAL_DRIVER",

4
.vscode/settings.json
View File

@ -1,5 +1,7 @@
{ {
"files.associations": { "files.associations": {
"main.h": "c"
"main.h": "c",
"new": "c",
"zstm32uart_irq_rx_service.h": "c"
} }
} }

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

92
app/MDK-ARM/app.uvoptx
View File

@ -315,6 +315,66 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\copyZ_zmodbus\modbus_processer.c</PathWithFileName>
<FilenameWithoutPath>modbus_processer.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\copyZ_zmodbus\zmodbus_common.c</PathWithFileName>
<FilenameWithoutPath>zmodbus_common.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\copyZ_zmodbus\zmodbus_master.c</PathWithFileName>
<FilenameWithoutPath>zmodbus_master.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\copyZ_zmodbus\zmodbus_slave.c</PathWithFileName>
<FilenameWithoutPath>zmodbus_slave.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\copyZ_zstm32uart_irq_rx_service\zstm32uart_irq_rx_service.c</PathWithFileName>
<FilenameWithoutPath>zstm32uart_irq_rx_service.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
@ -325,7 +385,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>11</FileNumber>
<FileNumber>16</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -337,7 +397,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>12</FileNumber>
<FileNumber>17</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -349,7 +409,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>13</FileNumber>
<FileNumber>18</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -361,7 +421,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>14</FileNumber>
<FileNumber>19</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -373,7 +433,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>15</FileNumber>
<FileNumber>20</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -385,7 +445,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>16</FileNumber>
<FileNumber>21</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -397,7 +457,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>17</FileNumber>
<FileNumber>22</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -409,7 +469,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>18</FileNumber>
<FileNumber>23</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -421,7 +481,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>19</FileNumber>
<FileNumber>24</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -433,7 +493,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>20</FileNumber>
<FileNumber>25</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -445,7 +505,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>21</FileNumber>
<FileNumber>26</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -457,7 +517,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>22</FileNumber>
<FileNumber>27</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -469,7 +529,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>23</FileNumber>
<FileNumber>28</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -481,7 +541,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>24</FileNumber>
<FileNumber>29</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -493,7 +553,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>25</FileNumber>
<FileNumber>30</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -513,7 +573,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>26</FileNumber>
<FileNumber>31</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

27
app/MDK-ARM/app.uvprojx
View File

@ -339,7 +339,7 @@
<MiscControls>--diag_suppress=381 --diag_suppress=1 --diag_suppress=177 --diag_suppress=111 --diag_suppress=1295</MiscControls> <MiscControls>--diag_suppress=381 --diag_suppress=1 --diag_suppress=177 --diag_suppress=111 --diag_suppress=1295</MiscControls>
<Define>USE_HAL_DRIVER,STM32F103xB</Define> <Define>USE_HAL_DRIVER,STM32F103xB</Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath>../Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc; ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F1xx/Include; ../Drivers/CMSIS/Include; ../../src</IncludePath>
<IncludePath>../Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../../src;../../copyZ_zmodbus;../../copyZ_zstm32uart_irq_rx_service</IncludePath>
</VariousControls> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>
@ -438,6 +438,31 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>../Src/stm32f1xx_hal_msp.c</FilePath> <FilePath>../Src/stm32f1xx_hal_msp.c</FilePath>
</File> </File>
<File>
<FileName>modbus_processer.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\copyZ_zmodbus\modbus_processer.c</FilePath>
</File>
<File>
<FileName>zmodbus_common.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\copyZ_zmodbus\zmodbus_common.c</FilePath>
</File>
<File>
<FileName>zmodbus_master.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\copyZ_zmodbus\zmodbus_master.c</FilePath>
</File>
<File>
<FileName>zmodbus_slave.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\copyZ_zmodbus\zmodbus_slave.c</FilePath>
</File>
<File>
<FileName>zstm32uart_irq_rx_service.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\copyZ_zstm32uart_irq_rx_service\zstm32uart_irq_rx_service.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>

11
src/user_main.c
View File

@ -13,6 +13,16 @@
#include "tim.h" #include "tim.h"
#include "usart.h" #include "usart.h"
#include "../copyZ_zstm32uart_irq_rx_service/zstm32uart_irq_rx_service.h"
#include "modbus_processer.h"
#include "zmodbus_slave.h"
static zstm32uart_t s_uarts[] = {
{
.huart = &ORDER_485_UART,
} //
};
/** /**
* @brief 调试指示灯控制 * @brief 调试指示灯控制
*/ */
@ -29,6 +39,7 @@ void port_do_debug_light_state() {
} }
void user_main() { void user_main() {
uart_service_start_all_uart_rx(s_uarts, ARRARY_SIZE(s_uarts));
while (true) { while (true) {
port_do_debug_light_state(); port_do_debug_light_state();

Write Preview
Loading…
Cancel
Save