upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/main/tollgate_api.c
diff options
context:
space:
mode:
authorYour Name <you@example.com>2026-05-19 16:16:54 +0530
committerYour Name <you@example.com>2026-05-19 16:16:54 +0530
commit62bce81d26994bd242035905c94d611cf956bd37 (patch)
treed3818ea8d36cc3d39406b48fa37eae70553faf74 /main/tollgate_api.c
parent4af9a0042f2dbe053cacec8427f7f370bd0e0f22 (diff)
fix: ESP-IDF build on master — negentropy_lib component + merge leftoversHEADmaster
- Create components/negentropy_lib/ wrapping negentropy submodule - CMakeLists.txt references submodule sources via relative path - OpenSSL SHA-256 compat using mbedTLS for ESP32 - Enables C++ exceptions + RTTI for negentropy_wrapper.cpp - Remove esp_littlefs, esp_timer from REQUIRES (transitive via wisp_relay) - Keep tcp_transport (direct dep of stratum_client.c via esp_transport.h) - Fix config.c duplicate seed_relays/sync_interval/fallback_interval blocks - Remove leftover merge conflict marker in tollgate_api.c - Add MINER_INTEGRATION_PLAN.md with miner integration checklist idf.py build: PASS (1.3MB, 68% free) make test-unit: PASS (19 suites, 344+ assertions)
Diffstat (limited to 'main/tollgate_api.c')
-rw-r--r--main/tollgate_api.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/main/tollgate_api.c b/main/tollgate_api.c
index b775f55..45cd02f 100644
--- a/main/tollgate_api.c
+++ b/main/tollgate_api.c
@@ -678,7 +678,6 @@ static esp_err_t api_get_mining_stats(httpd_req_t *req)
678 httpd_resp_send(req, json, strlen(json)); 678 httpd_resp_send(req, json, strlen(json));
679 cJSON_free(json); 679 cJSON_free(json);
680 cJSON_Delete(root); 680 cJSON_Delete(root);
681>>>>>>> feature/mining-payment
682 return ESP_OK; 681 return ESP_OK;
683} 682}
684 683