8000 Api rework asic by WantClue · Pull Request #862 · bitaxeorg/ESP-Miner · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Api rework asic #862

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

Merged
merged 8 commits into from
Apr 27, 2025
Merged

Api rework asic #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7db42cc
init
WantClue Apr 20, 2025
d1f6893
add asic_api endpoint and create new api folder
WantClue Apr 20, 2025
dc2820c
missed comment
WantClue Apr 20, 2025
0acf6cf
fix: remove hardcode freq and volt, add mapping of new api endpoint asic
WantClue Apr 22, 2025
28294f7
Merge branch 'dev-latest' into api-rework-asic
WantClue Apr 22, 2025
23eb16e
fix: update openapi.yaml
WantClue Apr 22, 2025
e66ff6d
add properties and example mock data output
WantClue Apr 22, 2025
4c98269
Merge branch 'dev-latest' into api-rework-asic
WantClue Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ SRCS
"logo.c"
"./http_server/http_server.c"
"./http_server/theme_api.c"
"./http_server/axe-os/api/system/asic_settings.c"
"./self_test/self_test.c"
"./tasks/stratum_task.c"
"./tasks/create_jobs_task.c"
Expand All @@ -35,6 +36,7 @@ INCLUDE_DIRS
"."
"tasks"
"http_server"
"http_server/axe-os/api/system"
"self_test"
"../components/asic/include"
"../components/connect/include"
Expand Down
145 changes: 145 additions & 0 deletions main/http_server/axe-os/api/system/asic_settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
#include <string.h>
#include "esp_log.h"
#include "esp_http_server.h"
#include "cJSON.h"
#include "global_state.h"
#include "asic.h"

static const char *TAG = "asic_api";
static GlobalState *GLOBAL_STATE = NULL;

// Function declarations from http_server.c
extern esp_err_t is_network_allowed(httpd_req_t *req);
extern esp_err_t set_cors_headers(httpd_req_t *req);

// Initialize the ASIC API with the global state
void asic_api_init(GlobalState *global_state) {
GLOBAL_STATE = global_state;
}

/* Handler for system asic endpoint */
esp_err_t GET_system_asic(httpd_req_t *req)
{
if (is_network_allowed(req) != ESP_OK) {
return httpd_resp_send_err(req, HTTPD_401_UNAUTHORIZED, "Unauthorized");
}

httpd_resp_set_type(req, "application/json");

// Set CORS headers
if (set_cors_headers(req) != ESP_OK) {
httpd_resp_send_500(req);
return ESP_OK;
}

cJSON *root = cJSON_CreateObject();

// Add ASIC model to the JSON object
cJSON_AddStringToObject(root, "ASICModel", GLOBAL_STATE->asic_model_str);

// Create arrays for frequency and voltage options based on ASIC model
cJSON *freqOptions = cJSON_CreateArray();
cJSON *voltageOptions = cJSON_CreateArray();

// Set different frequency and voltage options based on ASIC model
if (strcmp(GLOBAL_STATE->asic_model_str, "BM1370") == 0) {
// BM1370 frequency options
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(400));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(490));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(525));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(550));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(600));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(625));

// BM1370 voltage options
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1000));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1060));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1100));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1150));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1200));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1250));
}
else if (strcmp(GLOBAL_STATE->asic_model_str, "BM1368") == 0) {
// BM1368 frequency options
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(400));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(425));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(450));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(475));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(485));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(500));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(525));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(550));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(575));

// BM1368 voltage options
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1100));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1150));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1200));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1250));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1300));
}
else if (strcmp(GLOBAL_STATE->asic_model_str, "BM1366") == 0) {
// BM1366 frequency options
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(400));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(425));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(450));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(475));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(485));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(500));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(525));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(550));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(575));

// BM1366 voltage options
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1100));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1150));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1200));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1250));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1300));
}
else if (strcmp(GLOBAL_STATE->asic_model_str, "BM1397") == 0) {
// BM1397 frequency options
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(400));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(425));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(450));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(475));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(485));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(500));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(525));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(550));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(575));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(600));

// BM1397 voltage options
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1100));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1150));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1200));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1250));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1300));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1350));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1400));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1450));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1500));
}
else {
// Default options for other ASIC models
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(400));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(425));
cJSON_AddItemToArray(freqOptions, cJSON_CreateNumber(450));

cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1200));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1250));
cJSON_AddItemToArray(voltageOptions, cJSON_CreateNumber(1300));
}

// Add the arrays to the response
cJSON_AddItemToObject(root, "frequencyOptions", freqOptions);
cJSON_AddItemToObject(root, "voltageOptions", voltageOptions);

const char *response = cJSON_Print(root);
httpd_resp_sendstr(req, response);

free((void *)response);
cJSON_Delete(root);
return ESP_OK;
}
13 changes: 13 additions & 0 deletions main/http_server/axe-os/api/system/asic_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#ifndef ASIC_API_SETTINGS_H_
#define ASIC_API_SETTINGS_H_

#include <esp_http_server.h>
#include "global_state.h"

// Function to handle the /api/system/asic endpoint
esp_err_t GET_system_asic(httpd_req_t *req);

// Initialize the ASIC API with the global state
void asic_api_init(GlobalState *global_state);

#endif // ASIC_API_SETTINGS_H_
Loading
Loading
0