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.

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

[refactoring] sourcefile 'common.c' #1218

Merged
merged 6 commits into from
Jan 29, 2022

Conversation

hydroconstructor
Copy link
Collaborator

File divided to some parts. Functions with "flash" in names extracted to common_flash.c, with "option" extracted to option.c etc.
Removed unnecessary headers.
Removed one single function which was used nowhere.
And so on.
Project built under Windows and Ubuntu and seems to be working.

File divided to some parts. Functions with "flash" in names extracted to common_flash.c, with "option" extracted to option.c etc.
Removed unnecessary headers.
Removed one single function which was used nowhere.
And so on.
Project built under Windows and seems to be working.
File divided to some parts. Functions with "flash" in names extracted to common_flash.c, with "option" extracted to option.c etc.
Removed unnecessary headers.
Removed one single function which was used nowhere.
And so on.
Project built under Windows and seems to be working.
@hydroconstructor
Copy link
Collaborator Author

Problem with some defines... going to fix tomorrow or so.

@Nightwalker-87 Nightwalker-87 changed the base branch from develop to chipid_cleanup January 20, 2022 20:17
@Nightwalker-87
Copy link
Member

Nightwalker-87 commented Jan 20, 2022

@hydroconstructor Please note that there is a PR #1216 already open, so please ensure that

  1. there is no conflict with branch chipid_cleanup,
  2. the all build tests pass and
  3. all features remain functional.

Added forgotten defines
@hydroconstructor
Copy link
Collaborator Author

In #1212 pointed:

rewrite and modularisation of: chipid.c chipid.h common.c stlink.h stm32.h

Here, I tried to rewrite and modularise common.c - splitting it to some files.
chipid_cleanup branch has common.c as single file, not divided to some parts.
Does it mean that splitting common.c not necessary right now?

Or maybe split common.c in different branch, not chipid_cleanup - and merge them later?

@Nightwalker-87
Copy link
Member

Nightwalker-87 commented Jan 21, 2022

As long as it does not conflict with HEAD in branch chipid_cleanup and is an addition to #1216 it's ok.
Please avoid/resolve the current conflicts as they will not disappear in any case and must be resolved anyway.
We can then merge step by step.

CMakeLists.txt Outdated Show resolved Hide resolved
src/calculate.h Outdated Show resolved Hide resolved
src/option.c Outdated Show resolved Hide resolved
src/map_file.h Outdated Show resolved Hide resolved
src/common_flash.h Outdated Show resolved Hide resolved
src/common.h Outdated Show resolved Hide resolved
@Nightwalker-87 Nightwalker-87 changed the base branch from chipid_cleanup to develop January 28, 2022 20:41
@Nightwalker-87 Nightwalker-87 requested review from Nightwalker-87 and removed request for gszy January 29, 2022 18:20
@Nightwalker-87 Nightwalker-87 changed the title Common c refactor Refactoring for sourcefile 'common.c' Jan 29, 2022
@Nightwalker-87 Nightwalker-87 merged commit 849503b into stlink-org:develop Jan 29, 2022
@stlink-org stlink-org locked as resolved and limited conversation to collaborators Jan 29, 2022
@Nightwalker-87 Nightwalker-87 changed the title Refactoring for sourcefile 'common.c' [refactoring] sourcefile 'common.c' Feb 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants