Skip to content

Commit

Permalink
【发布】eBox最新版本2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@shentqlf
shentqlf committed Aug 12, 2017
1 parent f8ffa1f commit 498c83d
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 439 deletions.
68 changes: 22 additions & 46 deletions Project/stm32f10x/mdk/stm32f10x.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1756,30 +1756,6 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>112</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\user\frame.cpp</PathWithFileName>
<FilenameWithoutPath>frame.cpp</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>113</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\user\gateWay.cpp</PathWithFileName>
<FilenameWithoutPath>gateWay.cpp</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>

<Group>
Expand All @@ -1790,7 +1766,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>114</FileNumber>
<FileNumber>112</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1802,7 +1778,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>115</FileNumber>
<FileNumber>113</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1814,7 +1790,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>116</FileNumber>
<FileNumber>114</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1826,7 +1802,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>117</FileNumber>
<FileNumber>115</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1838,7 +1814,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>118</FileNumber>
<FileNumber>116</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1850,7 +1826,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>119</FileNumber>
<FileNumber>117</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1862,7 +1838,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>120</FileNumber>
<FileNumber>118</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1874,7 +1850,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>121</FileNumber>
<FileNumber>119</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1886,7 +1862,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>122</FileNumber>
<FileNumber>120</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1898,7 +1874,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>123</FileNumber>
<FileNumber>121</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1910,7 +1886,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>124</FileNumber>
<FileNumber>122</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1922,7 +1898,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>125</FileNumber>
<FileNumber>123</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1934,7 +1910,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>126</FileNumber>
<FileNumber>124</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1946,7 +1922,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>127</FileNumber>
<FileNumber>125</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1958,7 +1934,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>128</FileNumber>
<FileNumber>126</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1970,7 +1946,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>129</FileNumber>
<FileNumber>127</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1982,7 +1958,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>130</FileNumber>
<FileNumber>128</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1994,7 +1970,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>131</FileNumber>
<FileNumber>129</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2006,7 +1982,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>132</FileNumber>
<FileNumber>130</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2018,7 +1994,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>133</FileNumber>
<FileNumber>131</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2030,7 +2006,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>134</FileNumber>
<FileNumber>132</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2050,7 +2026,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>12</GroupNumber>
<FileNumber>135</FileNumber>
<FileNumber>133</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand Down
10 changes: 0 additions & 10 deletions Project/stm32f10x/mdk/stm32f10x.uvprojx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,16 +977,6 @@
<FileType>8</FileType>
<FilePath>..\..\..\user\main.cpp</FilePath>
</File>
<File>
<FileName>frame.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\..\..\user\frame.cpp</FilePath>
</File>
<File>
<FileName>gateWay.cpp</FileName>
<FileType>8</FileType>
<FilePath>..\..\..\user\gateWay.cpp</FilePath>
</File>
</Files>
</Group>
<Group>
Expand Down
21 changes: 10 additions & 11 deletions mcu/stm32f10x/ebox/Peripherals/ebox_uart.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ void Uart::begin(uint32_t baud_rate, uint8_t data_bit, uint8_t parity, float sto
if((_USARTx == USART1 || _USARTx == USART2 || _USARTx == USART3) && (use_dma == 1) )
USART_DMACmd(_USARTx, USART_DMAReq_Tx, ENABLE);
USART_Cmd(_USARTx, ENABLE);
interrupt(RxIrq,ENABLE);
interrupt(TcIrq,ENABLE);
interrupt(RxIrq,DISABLE);
interrupt(TcIrq,DISABLE);
USART_ClearITPendingBit(_USARTx, USART_IT_TC);
USART_ClearFlag(USART2,USART_FLAG_TC);
}
Expand Down Expand Up @@ -495,7 +495,6 @@ extern "C" {
if(USART_GetITStatus(USART1, USART_IT_TC) == SET)
{
busy[0] = 0;

irq_handler(serial_irq_ids[NUM_UART1],TcIrq);
USART_ClearITPendingBit(USART1, USART_IT_TC);
}
Expand All @@ -504,55 +503,55 @@ extern "C" {
{
if(USART_GetITStatus(USART2, USART_IT_RXNE) == SET)
{
irq_handler(serial_irq_ids[NUM_UART2],RxIrq);
irq_handler(serial_irq_ids[NUM_UART2],RxIrq);
USART_ClearITPendingBit(USART2, USART_IT_RXNE);
}
if(USART_GetITStatus(USART2, USART_IT_TC) == SET)
{
busy[1] = 0;
irq_handler(serial_irq_ids[NUM_UART2],TcIrq);
irq_handler(serial_irq_ids[NUM_UART2],TcIrq);
USART_ClearITPendingBit(USART2, USART_IT_TC);
}
}
void USART3_IRQHandler(void)
{
if(USART_GetITStatus(USART3, USART_IT_RXNE) == SET)
{
irq_handler(serial_irq_ids[NUM_UART3],RxIrq);
irq_handler(serial_irq_ids[NUM_UART3],RxIrq);
USART_ClearITPendingBit(USART3, USART_IT_RXNE);
}
if(USART_GetITStatus(USART3, USART_IT_TC) == SET)
{
busy[2] = 0;
irq_handler(serial_irq_ids[NUM_UART3],TcIrq);
irq_handler(serial_irq_ids[NUM_UART3],TcIrq);
USART_ClearITPendingBit(USART3, USART_IT_TC);
}
}
void UART4_IRQHandler(void)
{
if(USART_GetITStatus(UART4, USART_IT_RXNE) == SET)
{
irq_handler(serial_irq_ids[NUM_UART4],RxIrq);
irq_handler(serial_irq_ids[NUM_UART4],RxIrq);
USART_ClearITPendingBit(UART4, USART_IT_RXNE);
}
if(USART_GetITStatus(UART4, USART_IT_TC) == SET)
{
busy[3] = 0;
irq_handler(serial_irq_ids[NUM_UART4],TcIrq);
irq_handler(serial_irq_ids[NUM_UART4],TcIrq);
USART_ClearITPendingBit(UART4, USART_IT_TC);
}
}
void UART5_IRQHandler(void)
{
if(USART_GetITStatus(UART5, USART_IT_RXNE) == SET)
{
irq_handler(serial_irq_ids[NUM_UART5],RxIrq);
irq_handler(serial_irq_ids[NUM_UART5],RxIrq);
USART_ClearITPendingBit(UART5, USART_IT_RXNE);
}
if(USART_GetITStatus(UART5, USART_IT_TC) == SET)
{
busy[4] = 0;
irq_handler(serial_irq_ids[NUM_UART5],TcIrq);
irq_handler(serial_irq_ids[NUM_UART5],TcIrq);
USART_ClearITPendingBit(UART5, USART_IT_TC);
}
}
Expand Down
Loading

0 comments on commit 498c83d

Please sign in to comment.