Merge pull request #21 from Ghost64847/fix/p4-c5-firmware-link-guard

anarchyysm · web-flow · commit cd72cdf106a3 · 2026-03-22T09:59:17.000-03:00
chore(build): update sdkconfig to 5.5.3 and guard c5 firmware embedde…
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug Report
-description: Report a bug to help us improve HighBoy Firmware.
+description: Report a bug to help us improve High Boy Firmware.
 labels: ["bug"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,5 +1,5 @@
 name: Feature Request
-description: Suggest a new feature or improvement for HighBoy.
+description: Suggest a new feature or improvement for High Boy.
 labels: ["enhancement"]
 body:
   - type: textarea
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
-# Contributing to HighBoy Firmware
+# Contributing to High Boy Firmware
 
-Thank you for your interest in contributing to HighBoy! We welcome contributions from everyone. This document provides guidelines and instructions to help you get started.
+Thank you for your interest in contributing to High Boy! We welcome contributions from everyone. This document provides guidelines and instructions to help you get started.
 
 
 ## Getting Started
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 </p>
 
 
-# HighBoy Firmware (Beta)
+# High Boy Firmware (Beta)
 
 [![License](https://img.shields.io/github/license/HighCodeh/TentacleOS)](LICENSE)
 [![GitHub Stars](https://img.shields.io/github/stars/HighCodeh/TentacleOS)](https://github.com/HighCodeh/TentacleOS/stargazers)
@@ -12,7 +12,7 @@
 
 > **Languages**:  [🇺🇸 English](README.md) | [🇧🇷 Português](README.pt.md) 
 
-This repository contains a **firmware in development** for the **HighBoy** platform.
+This repository contains a **firmware in development** for the **High Boy** platform.
 **Warning:** this firmware is in its **beta phase** and is **still incomplete**.
 
 ---
diff --git a/README.pt.md b/README.pt.md
@@ -3,7 +3,7 @@
 </p>
 
 
-# Firmware HighBoy (Beta)
+# Firmware High Boy (Beta)
 
 [![License](https://img.shields.io/github/license/HighCodeh/TentacleOS)](LICENSE)
 [![GitHub Stars](https://img.shields.io/github/stars/HighCodeh/TentacleOS)](https://github.com/HighCodeh/TentacleOS/stargazers)
@@ -12,7 +12,7 @@
 
 > **Idiomas**:  [🇺🇸 English](README.md) | [🇧🇷 Português](README.pt.md) 
 
-Este repositório contém um **firmware em desenvolvimento** para a plataforma **HighBoy**.  
+Este repositório contém um **firmware em desenvolvimento** para a plataforma **High Boy**.  
 **Atenção:** este firmware está em **fase beta** e **ainda está incompleto**.
 
 ---
diff --git a/firmware_c5/assets/config/OTA/firmware.json b/firmware_c5/assets/config/OTA/firmware.json
@@ -1,6 +1,6 @@
 {
   "system_hardware": "HighBoy",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "ota_repository_url": "https://repo.highboy.com.br/firmware/system/update.json",
   "changelog": ""
 }
diff --git a/firmware_p4/assets/config/OTA/firmware.json b/firmware_p4/assets/config/OTA/firmware.json
@@ -1,6 +1,6 @@
 {
   "system_hardware": "HighBoy",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "ota_repository_url": "https://repo.highboy.com.br/firmware/system/update.json",
   "changelog": ""
 }
diff --git a/firmware_p4/components/Service/CMakeLists.txt b/firmware_p4/components/Service/CMakeLists.txt
@@ -100,9 +100,13 @@ idf_component_register(SRCS
 
 # Embed C5 Firmware Binary into Service component (used by c5_flasher)
 set(C5_BIN_PATH "${CMAKE_SOURCE_DIR}/../firmware_c5/build/TentacleOS_C5.bin")
+set(C5_FIRMWARE_EMBEDDED 0)
 if(EXISTS ${C5_BIN_PATH})
     target_add_binary_data(${COMPONENT_LIB} "${C5_BIN_PATH}" BINARY)
+    set(C5_FIRMWARE_EMBEDDED 1)
     message(STATUS "Embedding C5 Firmware: ${C5_BIN_PATH}")
 else()
     message(WARNING "C5 Firmware binary not found at ${C5_BIN_PATH}. Firmware update feature will be disabled.")
 endif()
+
+target_compile_definitions(${COMPONENT_LIB} PRIVATE C5_FIRMWARE_EMBEDDED=${C5_FIRMWARE_EMBEDDED})
diff --git a/firmware_p4/components/Service/c5_flasher/c5_flasher.c b/firmware_p4/components/Service/c5_flasher/c5_flasher.c
@@ -12,8 +12,10 @@ static const char *TAG = "C5_FLASHER";
 #define FLASH_BLOCK_SIZE 1024
 
 // Access to embedded binary symbols
+#if C5_FIRMWARE_EMBEDDED
 extern const uint8_t c5_firmware_bin_start[] asm("_binary_TentacleOS_C5_bin_start");
 extern const uint8_t c5_firmware_bin_end[]   asm("_binary_TentacleOS_C5_bin_end");
+#endif
 
 // ESP Serial Protocol Constants
 #define ESP_ROM_BAUD  115200
@@ -104,8 +106,13 @@ void c5_flasher_reset_normal(void) {
 
 esp_err_t c5_flasher_update(const uint8_t *bin_data, uint32_t bin_size) {
     if (!bin_data) {
+#if C5_FIRMWARE_EMBEDDED
         bin_data = c5_firmware_bin_start;
         bin_size = c5_firmware_bin_end - c5_firmware_bin_start;
+#else
+        ESP_LOGE(TAG, "Embedded C5 firmware is unavailable");
+        return ESP_ERR_NOT_FOUND;
+#endif
     }
 
     if (bin_size == 0) {
diff --git a/firmware_p4/components/Service/ota/include/ota_version.h b/firmware_p4/components/Service/ota/include/ota_version.h
@@ -1,6 +1,6 @@
 #ifndef OTA_VERSION_H
 #define OTA_VERSION_H
 
-#define FIRMWARE_VERSION "0.1.0"
+#define FIRMWARE_VERSION "1.1.0"
 
 #endif // OTA_VERSION_H
diff --git a/firmware_p4/sdkconfig b/firmware_p4/sdkconfig

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"system_hardware": "HighBoy",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"ota_repository_url": "https://repo.highboy.com.br/firmware/system/update.json",`
`5`	`5`	`"changelog": ""`
`6`	`6`	`}`