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

refactor: unify merge_bin scripts #189

Merged
merged 1 commit into from
Jun 20, 2024
Merged

refactor: unify merge_bin scripts #189

merged 1 commit into from
Jun 20, 2024

Conversation

tdb3
Copy link
Contributor

@tdb3 tdb3 commented May 27, 2024

Noticed that there was a bit of duplication in the merge_bin scripts. This PR combines the functionality of merge_bin_update.sh and merge_bin_with_config.sh into merge_bin.sh.

Now running merge_bin.sh -u <output_file> is the same as running merge_bin_update.sh <output_file> previously.
Running merge_bin.sh -c <output_file> is the same as running merge_bin_with_config.sh <output_file> previously.

Some considerations/rationale:

  • merge_bin_update.sh and merge_bin_with_config.sh are simplified to call merge_bin.sh for now (they can be removed later if desired, kept for deprecation path).
  • The default behavior of running merge_bin.sh <output_file> was kept the same to minimize disruption to existing developer workflow. The argument behavior could easily be changed if desired.
  • Additional usage info and error printing were added to increase clarity for developers/users.
  • Addresses and binary names were modularized to increase re-use.

@tdb3 tdb3 force-pushed the unify_merge_bin branch 3 times, most recently from e453f87 to 39a2220 Compare May 27, 2024 20:18
Combines the functionality of merge_bin_update.sh
and merge_bin_with_config.sh into merge_bin.sh.
Also adds more verbose usage printing.
@skot
Copy link
Owner

skot commented Jun 20, 2024

this LGTM. thanks for the tooling help!

@skot skot merged commit ce0be46 into skot:master Jun 20, 2024
1 check passed
tommywatson pushed a commit to tommywatson/ESP-Miner that referenced this pull request Jun 20, 2024
Combines the functionality of merge_bin_update.sh
and merge_bin_with_config.sh into merge_bin.sh.
Also adds more verbose usage printing.
skot added a commit that referenced this pull request Jun 20, 2024
* Fixed fan speed web update #141

These changes fix fan rpm/percent requested and update both on the web

* fix readme

* refactor self_test to be modular for new hardware

* Supra 402 (#221)

* port TCH Supra 402 branch

* refactor TMP1075 (unused?) driver using i2c_master module

* pulled in @BitMaker-hub stratum_task.c DNS changes from PR #185

* removing serial debug

---------

Co-authored-by: Skot <[email protected]>

* adjust share accpeted/rejected functions to take higher level GLOBAL_STATE to fix share accounting.

* Code clean resulting from looking into #218 (#220)

* Code clean resulting from looking into #218

* Fixed asic count

Set canary value for invalid device's asic_count

---------

Co-authored-by: tommy <[email protected]>

* fix another pointer error

* Changes efficiency metric display in AxeOS (#231)

Fixes #230

* try to explain nonce space duration from paramters (#228)

* try to explain nonce space duration from paramters

* Fix Nonce Space duration for BM1397 (no version-rolling)

* fixed issue with version mask on 1397. added easy serial debugging on 1397

* cleanup jobID debugs

---------

Co-authored-by: Skot <[email protected]>

* Update bm1397.c to increase the max frequency to 650Mhz (#209)

* Update bm1397.c to increase the max frequency to 650Mhz

The original version was setting everything above 500Mhz to 500Mhz, the update increases the limit to 650Mhz.
No changes to the web interface - drop-down still shows up to 575Mhz

* Update edit.component.ts to include higher freqeuncy for BM1397

* Updated BM1397 frequencies to above 500Mhz

* Update bm1397.c

* Update bm1397.c

* UN-Update readme.md

* Update bm1397.c

* Update bm1397.c

* Update bm1397.c

* fix: add recovery page (#232)

Adds a recovery web interface to enable users
to recover from a failed www.bin update.
Partial fix for Issue #213.

* refactor: unify merge_bin scripts (#189)

Combines the functionality of merge_bin_update.sh
and merge_bin_with_config.sh into merge_bin.sh.
Also adds more verbose usage printing.

* fix: check www.bin size before updating (#216)

Adds a basic sanity check for www.bin uploading.
Returns 400 if upload is attempted on a file larger
than the available partition space.

---------

Co-authored-by: tommy <[email protected]>
Co-authored-by: Georges Palauqui <[email protected]>
Co-authored-by: Skot <[email protected]>
Co-authored-by: Nathan Day <[email protected]>
Co-authored-by: yanir99 <[email protected]>
Co-authored-by: tdb3 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants