Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ошибки, произошедшие в результате слияния с Software pack 1986ВЕ8(1)Т #57

Closed
andshn opened this issue Jun 25, 2019 · 1 comment
Closed

Ошибки, произошедшие в результате слияния с Software pack 1986ВЕ8(1)Т #57

andshn opened this issue Jun 25, 2019 · 1 comment
Assignees
@eldarkg
Labels
bug

Comments

@andshn
Copy link

andshn commented Jun 25, 2019 •
edited
Loading

Из-за этого MDR32F9Qx_eth.c даже не компилируется.

emdr1986x-std-per-lib/MDR32F9Qx_StdPeriph_Driver/src/MDR32F9Qx_eth.c

Line 247 in b3f25b3

ETHERNETx->ETH_Dilimiter = 0x1000;

emdr1986x-std-per-lib/CMSIS/CM1/DeviceSupport/MDR1986VE1T/inc/MDR1986VE1T.h

Line 4136 in b3f25b3

__IO uint16_t ETH_Delimiter; //0

В официальной библиотеке ETH_Dilimiter. Возможно стоит проверить, не привело ли это слияние к другим ошибкам.
eldarkg added a commit that referenced this issue Jul 13, 2019
@eldarkg
Fix a merging regression #57
a8da748
@eldarkg eldarkg self-assigned this Jul 13, 2019
@eldarkg eldarkg added the bug label Jul 13, 2019
@eldarkg
Copy link
Owner

eldarkg commented Jul 13, 2019

@andshn Thank u

@eldarkg eldarkg closed this as completed Jul 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@eldarkg eldarkg

Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@eldarkg @andshn