Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: skot/ESP-Miner
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.3.0
Choose a base ref
...
head repository: skot/ESP-Miner
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 15,788 additions and 11,154 deletions.
  1. +1 −1 .devcontainer/Dockerfile
  2. +6 −6 .github/workflows/build.yml
  3. +64 −0 .github/workflows/release-beta.yml
  4. +55 −0 .github/workflows/release-factory-beta.yml
  5. +8 −8 .github/workflows/release-factory.yml
  6. +10 −9 .github/workflows/release.yml
  7. +44 −5 .vscode/settings.json
  8. +43 −236 components/asic/bm1366.c
  9. +7 −6 components/asic/bm1368.c
  10. +45 −35 components/asic/bm1370.c
  11. +5 −5 components/asic/bm1397.c
  12. +1 −1 components/asic/include/bm1366.h
  13. +2 −2 components/asic/include/serial.h
  14. +12 −6 components/asic/serial.c
  15. +27 −12 components/connect/connect.c
  16. +1 −4 components/connect/include/connect.h
  17. +3 −2 components/stratum/include/stratum_api.h
  18. +15 −2 components/stratum/stratum_api.c
  19. +32 −5 components/stratum/test/test_stratum_json.c
  20. +1 −1 config-102.cvs
  21. +24 −0 config-201.cvs
  22. +1 −1 config-202.cvs
  23. +24 −0 config-203.cvs
  24. +1 −1 config-204.cvs
  25. +24 −0 config-205.cvs
  26. +115 −0 doc/unit_testing.md
  27. +9 −4 main/CMakeLists.txt
  28. +5 −4 main/DS4432U.c
  29. +1 −1 main/DS4432U.h
  30. +38 −14 main/EMC2101.c
  31. +78 −1 main/EMC2101.h
  32. +3 −2 main/INA260.c
  33. +43 −2 main/Kconfig.projbuild
  34. +2 −2 main/TMP1075.c
  35. +2 −2 main/TPS546.c
  36. +134 −0 main/display.c
  37. +6 −0 main/display.h
  38. +0 −50 main/fonts.c
  39. +13 −2 main/global_state.h
  40. BIN main/http_server/axe-os/Angel Wish License.pdf
  41. +22 −8 main/http_server/axe-os/only-gzip.js
  42. +2,841 −2,610 main/http_server/axe-os/package-lock.json
  43. +25 −25 main/http_server/axe-os/package.json
  44. +6 −2 main/http_server/axe-os/src/app/app.module.ts
  45. +12 −60 main/http_server/axe-os/src/app/components/edit/edit.component.html
  46. +93 −14 main/http_server/axe-os/src/app/components/edit/edit.component.ts
  47. +129 −145 main/http_server/axe-os/src/app/components/home/home.component.html
  48. +126 −58 main/http_server/axe-os/src/app/components/home/home.component.ts
  49. +6 −2 main/http_server/axe-os/src/app/components/logs/logs.component.html
  50. +10 −2 main/http_server/axe-os/src/app/components/logs/logs.component.scss
  51. +19 −2 main/http_server/axe-os/src/app/components/logs/logs.component.ts
  52. +5 −1 main/http_server/axe-os/src/app/components/network-edit/network.edit.component.html
  53. +16 −0 main/http_server/axe-os/src/app/components/network-edit/network.edit.component.ts
  54. +0 −35 main/http_server/axe-os/src/app/components/network/network.component.scss
  55. +2 −54 main/http_server/axe-os/src/app/components/network/network.component.ts
  56. +11 −7 main/http_server/axe-os/src/app/components/settings/settings.component.html
  57. +15 −8 main/http_server/axe-os/src/app/components/settings/settings.component.ts
  58. +230 −0 main/http_server/axe-os/src/app/components/settings/theme-config.component.ts
  59. +84 −23 main/http_server/axe-os/src/app/components/swarm/swarm.component.html
  60. +20 −6 main/http_server/axe-os/src/app/components/swarm/swarm.component.scss
  61. +215 −81 main/http_server/axe-os/src/app/components/swarm/swarm.component.ts
  62. +2 −2 main/http_server/axe-os/src/app/layout/app.footer.component.html
  63. +1 −1 main/http_server/axe-os/src/app/layout/app.menu.component.html
  64. +1 −1 main/http_server/axe-os/src/app/layout/app.topbar.component.html
  65. +124 −43 main/http_server/axe-os/src/app/layout/service/app.layout.service.ts
  66. +4 −0 main/http_server/axe-os/src/app/layout/styles/layout/_content.scss
  67. +0 −1 main/http_server/axe-os/src/app/layout/styles/layout/_responsive.scss
  68. +1 −1 main/http_server/axe-os/src/app/layout/styles/layout/_topbar.scss
  69. +1 −1 main/http_server/axe-os/src/app/layout/styles/layout/_variables.scss
  70. +18 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_colors.scss
  71. +75 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_common.scss
  72. +110 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_components.scss
  73. +339 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/_mixins.scss
  74. +625 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/button/_button.scss
  75. +96 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/button/_speeddial.scss
  76. +15 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/button/_splitbutton.scss
  77. +37 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_carousel.scss
  78. +338 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_datatable.scss
  79. +46 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_dataview.scss
  80. +142 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_filter.scss
  81. +125 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_orderlist.scss
  82. +50 −0 ...http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_organizationchart.scss
  83. +92 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_paginator.scss
  84. +125 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_picklist.scss
  85. +38 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_timeline.scss
  86. +172 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_tree.scss
  87. +278 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_treetable.scss
  88. +28 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/data/_virtualscroller.scss
  89. +64 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/file/_fileupload.scss
  90. +146 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_autocomplete.scss
  91. +267 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_calendar.scss
  92. +152 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_cascadeselect.scss
  93. +115 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_checkbox.scss
  94. +65 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_chips.scss
  95. +19 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_colorpicker.scss
  96. +167 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_dropdown.scss
  97. +122 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_editor.scss
  98. +7 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_iconfield.scss
  99. +74 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputgroup.scss
  100. +13 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputicon.scss
  101. +30 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputmask.scss
  102. +42 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputnumber.scss
  103. +10 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputotp.scss
  104. +60 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputswitch.scss
  105. +124 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_inputtext.scss
  106. +105 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_listbox.scss
  107. +194 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_multiselect.scss
  108. +52 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_password.scss
  109. +97 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_radiobutton.scss
  110. +66 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_rating.scss
  111. +50 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_selectbutton.scss
  112. +74 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_slider.scss
  113. +48 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_togglebutton.scss
  114. +151 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/input/_treeselect.scss
  115. +42 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_breadcrumb.scss
  116. +39 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_contextmenu.scss
  117. +95 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_dock.scss
  118. +56 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_megamenu.scss
  119. +37 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_menu.scss
  120. +142 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_menubar.scss
  121. +153 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_panelmenu.scss
  122. +59 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_slidemenu.scss
  123. +56 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_steps.scss
  124. +74 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_tabmenu.scss
  125. +44 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/menu/_tieredmenu.scss
  126. +69 −0 ...http_server/axe-os/src/app/layout/styles/theme/theme-base/components/messages/_inlinemessage.scss
  127. +141 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/messages/_message.scss
  128. +127 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/messages/_toast.scss
  129. +30 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_avatar.scss
  130. +55 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_badge.scss
  131. 0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_blockui.scss
  132. +42 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_chip.scss
  133. +17 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_inplace.scss
  134. +117 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_metergroup.scss
  135. +17 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_progressbar.scss
  136. +25 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_scrolltop.scss
  137. +8 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_skeleton.scss
  138. +52 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_tag.scss
  139. +12 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/misc/_terminal.scss
  140. +155 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/multimedia/_galleria.scss
  141. +49 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/multimedia/_image.scss
  142. +72 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_confirmpopup.scss
  143. +69 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_dialog.scss
  144. +64 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_overlaypanel.scss
  145. +27 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_sidebar.scss
  146. +33 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/overlay/_tooltip.scss
  147. +119 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_accordion.scss
  148. +30 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_card.scss
  149. +31 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_divider.scss
  150. +47 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_fieldset.scss
  151. +63 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_panel.scss
  152. +11 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_scrollpanel.scss
  153. +23 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_splitter.scss
  154. +201 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_stepper.scss
  155. +82 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_tabview.scss
  156. +11 −0 main/http_server/axe-os/src/app/layout/styles/theme/theme-base/components/panel/_toolbar.scss
  157. +39 −0 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/_extensions.scss
  158. +955 −0 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/_variables.scss
  159. +2 −0 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/_extensions.scss
  160. +1 −0 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/_fonts.scss
  161. +11 −0 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/_variables.scss
  162. +4 −0 main/http_server/axe-os/src/app/layout/styles/theme/themes/vela/bitaxe/theme.scss
  163. +0 −6,293 main/http_server/axe-os/src/app/layout/styles/theme/vela-blue/theme.css
  164. +16 −0 main/http_server/axe-os/src/app/local-storage.service.spec.ts
  165. +46 −0 main/http_server/axe-os/src/app/local-storage.service.ts
  166. +15 −6 main/http_server/axe-os/src/app/pipes/date-ago.pipe.ts
  167. +4 −2 main/http_server/axe-os/src/app/prime-ng.module.ts
  168. +4 −4 main/http_server/axe-os/src/app/services/system.service.ts
  169. +28 −0 main/http_server/axe-os/src/app/services/theme.service.ts
  170. BIN main/http_server/axe-os/src/assets/fonts/AngelWish.ttf
  171. BIN main/http_server/axe-os/src/assets/fonts/Nippo-Regular.ttf
  172. BIN main/http_server/axe-os/src/assets/fonts/Nippo-Regular.woff
  173. BIN main/http_server/axe-os/src/assets/fonts/Nippo-Regular.woff2
  174. +1 −0 main/http_server/axe-os/src/models/ISystemInfo.ts
  175. +145 −2 main/http_server/axe-os/src/styles.scss
  176. +46 −67 main/http_server/http_server.c
  177. +149 −0 main/http_server/theme_api.c
  178. +9 −0 main/http_server/theme_api.h
  179. +63 −11 main/i2c_bitaxe.c
  180. +4 −3 main/i2c_bitaxe.h
  181. +7 −0 main/idf_component.yml
  182. +81 −0 main/input.c
  183. +6 −0 main/input.h
  184. +0 −122 main/led_controller.c
  185. +0 −8 main/led_controller.h
  186. +64 −0 main/logo.c
  187. +63 −0 main/lv_conf.h
  188. +505 −0 main/lv_font_portfolio-6x8.c
  189. +34 −20 main/main.c
  190. +2 −1 main/main.h
  191. +5 −1 main/nvs_config.h
  192. +0 −297 main/oled.c
  193. +0 −52 main/oled.h
  194. +365 −0 main/screen.c
  195. +22 −0 main/screen.h
  196. +302 −153 main/self_test/self_test.c
  197. +17 −313 main/system.c
  198. +0 −4 main/system.h
  199. +13 −78 main/tasks/create_jobs_task.c
  200. +30 −16 main/tasks/power_management_task.c
  201. +9 −6 main/tasks/stratum_task.c
  202. +0 −48 main/tasks/user_input_task.c
  203. +0 −6 main/tasks/user_input_task.h
  204. +15 −10 main/vcore.c
  205. +2 −2 main/vcore.h
  206. +92 −0 merge_bin_all.sh
  207. +20 −4 readme.md
  208. +7 −0 sdkconfig.defaults
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM espressif/idf
FROM espressif/idf:v5.4

ARG DEBIAN_FRONTEND=nointeractive

12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '22.12.0'
- name: Build web dist
working-directory: ./main/http_server/axe-os
run: |
@@ -20,7 +20,7 @@ jobs:
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.3.1
esp_idf_version: v5.4
target: esp32s3
command: GITHUB_ACTIONS="true" idf.py build
path: '.'
@@ -32,17 +32,17 @@ jobs:
- name: "Create factory/merged image"
run: "./merge_bin.sh ./esp-miner-merged.bin"
- name: upload esp-miner-merged.bin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: esp-miner-factory.bin
path: ./esp-miner-merged.bin
- name: upload esp-miner.bin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: esp-miner-ota.bin
name: esp-miner.bin
path: ./build/esp-miner.bin
- name: upload www.bin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: www.bin
path: ./build/www.bin
64 changes: 64 additions & 0 deletions .github/workflows/release-beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Build & Release Firmware [Pre-Release]

on:
release:
types: [prereleased]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22.12.0'
- name: Build web dist
working-directory: ./main/http_server/axe-os
run: |
npm ci
npm run build
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.4
target: esp32s3
command: GITHUB_ACTIONS="true" idf.py build
path: '.'
- uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
- run: pip install esptool
- name: "Create factory/merged image"
run: "./merge_bin.sh ./esp-miner-merged.bin"
- name: upload esp-miner-merged.bin
uses: actions/upload-artifact@v4
with:
name: esp-miner-factory.bin
path: ./esp-miner-merged.bin
- name: upload esp-miner.bin
uses: actions/upload-artifact@v4
with:
name: esp-miner.bin
path: ./build/esp-miner.bin
- name: upload www.bin
uses: actions/upload-artifact@v4
with:
name: www.bin
path: ./build/www.bin
- name: Release www.bin
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
prerelease: true
files: ./build/www.bin
- name: Release esp-miner.bin
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
prerelease: true
files: ./build/esp-miner.bin
55 changes: 55 additions & 0 deletions .github/workflows/release-factory-beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Build & Release Factory Images [Pre-Release]

on:
release:
types: [prereleased]

jobs:
build:
runs-on: ubuntu-latest
name: "Factory ${{ matrix.build_type }}"
strategy:
fail-fast: false
matrix:
build_type: ["102", "202", "204", "205", "401", "402", "403", "601"]
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22.12.0'
- name: Build web dist
working-directory: ./main/http_server/axe-os
run: |
npm ci
npm run build
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.4
target: esp32s3
command: GITHUB_ACTIONS="true" idf.py build
path: '.'
- name: "esp-idf build factory config for ${{ matrix.build_type }}"
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.4
target: esp32s3
command: /opt/esp/idf/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py generate config-${{ matrix.build_type }}.cvs config.bin 0x6000
path: '.'
- uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
- run: pip install esptool
- name: "Create factory image for ${{ matrix.build_type }}-${{ github.ref_name }}"
run: "./merge_bin.sh -c esp-miner-factory-${{ matrix.build_type }}-${{ github.ref_name }}.bin"
- name: Release esp-miner.bin
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
prerelease: true
files: "esp-miner-factory-${{ matrix.build_type }}-${{ github.ref_name }}.bin"
16 changes: 8 additions & 8 deletions .github/workflows/release-factory.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Build & Release Factory Images
name: Build & Release Factory Images [Release]

on:
push:
tags:
- '*'
release:
types: [released]

jobs:
build:
@@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
build_type: ["102", "202", "204", "401", "402", "403", "601"]
build_type: ["102", "201", "202", "203", "204", "205", "401", "402", "403", "601"]
steps:
- name: Checkout repo
uses: actions/checkout@v4
@@ -20,7 +20,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '22.12.0'
- name: Build web dist
working-directory: ./main/http_server/axe-os
run: |
@@ -29,14 +29,14 @@ jobs:
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.3.1
esp_idf_version: v5.4
target: esp32s3
command: GITHUB_ACTIONS="true" idf.py build
path: '.'
- name: "esp-idf build factory config for ${{ matrix.build_type }}"
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.3.1
esp_idf_version: v5.4
target: esp32s3
command: /opt/esp/idf/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py generate config-${{ matrix.build_type }}.cvs config.bin 0x6000
path: '.'
19 changes: 10 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Build & Release Firmware
name: Build & Release Firmware [Release]

on:
push:
tags:
- '*'
release:
types: [released]

jobs:
build:
runs-on: ubuntu-latest
@@ -14,7 +15,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '22'
node-version: '22.12.0'
- name: Build web dist
working-directory: ./main/http_server/axe-os
run: |
@@ -23,7 +24,7 @@ jobs:
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.3.1
esp_idf_version: v5.4
target: esp32s3
command: GITHUB_ACTIONS="true" idf.py build
path: '.'
@@ -35,17 +36,17 @@ jobs:
- name: "Create factory/merged image"
run: "./merge_bin.sh ./esp-miner-merged.bin"
- name: upload esp-miner-merged.bin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: esp-miner-factory.bin
path: ./esp-miner-merged.bin
- name: upload esp-miner.bin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: esp-miner.bin
path: ./build/esp-miner.bin
- name: upload www.bin
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: www.bin
path: ./build/www.bin
49 changes: 44 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"idf.flashType": "UART",
"idf.portWin": "COM3",
"idf.portWin": "COM72",
"idf.adapterTargetName": "esp32s3",
"idf.openOcdConfigs": [
"interface/ftdi/esp32_devkitj_v1.cfg",
"target/esp32s3.cfg"
"board/esp32s3-builtin.cfg"
],
"files.associations": {
"freertos.h": "c",
@@ -16,12 +15,52 @@
"array": "c",
"string": "c",
"string_view": "c",
"*.tcc": "c"
"*.tcc": "c",
"esp_lvgl_port.h": "c",
"cstdint": "c",
"regex": "c",
"i2c_bitaxe.h": "c",
"i2c_master.h": "c",
"nvs_config.h": "c",
"display.h": "c",
"esp_lcd_panel_vendor.h": "c",
"esp_lcd_panel_st7789.h": "c",
"esp_lcd_panel_ssd1306.h": "c",
"esp_lcd_panel_io.h": "c",
"esp_lcd_panel_ops.h": "c",
"esp_lcd_io_i2c.h": "c",
"esp_lcd_types.h": "c",
"i2c.h": "c",
"cstdlib": "c",
"i2c_types.h": "c",
"esp_lcd_panel_dev.h": "c",
"bitset": "c",
"memory": "c",
"random": "c",
"future": "c",
"optional": "c",
"esp_lcd_panel_interface.h": "c",
"span": "c",
"oled.h": "c",
"charconv": "c",
"chrono": "c",
"format": "c",
"ratio": "c",
"system_error": "c",
"functional": "c",
"tuple": "c",
"type_traits": "c",
"utility": "c",
"compare": "c",
"cmath": "c",
"utils.h": "c",
"task.h": "c",
"stdlib.h": "c"
},
"editor.formatOnSave": false,
"cSpell.words": [
"ssid"
],
"idf.port": "/dev/cu.usbmodem1434301",
"idf.port": "/dev/ttyACM0",
"C_Cpp.intelliSenseEngine": "Tag Parser"
}
Loading