-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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.
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
Ethernet IP Config #14385
Ethernet IP Config #14385
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -687,7 +687,13 @@ typedef struct { | |
uint8_t weight_change; // E9F | ||
uint8_t web_color2[2][3]; // EA0 Needs to be on integer / 3 distance from web_color | ||
|
||
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32 | ||
uint8_t free_ea6[10]; // EA6 | ||
uint32_t eth_ipv4_address[5]; // EB0 | ||
uint8_t free_ec4[2]; // EC4 | ||
#else | ||
uint8_t free_ea6[32]; // EA6 | ||
#endif | ||
|
||
uint8_t shift595_device_count; // EC6 | ||
uint8_t sta_config; // EC7 | ||
|
@@ -853,8 +859,8 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu | |
uint16_t http_init : 1; | ||
uint16_t shutter_moved : 1; | ||
uint16_t shutter_moving : 1; | ||
uint16_t spare11 : 1; | ||
uint16_t spare12 : 1; | ||
uint16_t eth_connected : 1; | ||
uint16_t eth_disconnected : 1; | ||
uint16_t spare13 : 1; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is an issue with shutters here. I don't like the shutter solution and I will see if this can be solved first to merge your PR. In short, ifdef USE_SHUTTERS changes the amount of bits tested based on the assumptions the last two bits are for shutter status. This changes with your implemntation. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The bits are not persistent so I suggest the following:
|
||
uint16_t spare14 : 1; | ||
uint16_t spare15 : 1; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see your point but this results in issues in the future where these bits are used for all processor types. I suggest to move it to the 32-bit register area at the bottom just above F9C and reserve it fixed for all processor types. No ifdefs needed.