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.

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

Improve printf types to fix ESP32C6 compatibility #637

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
+21 −3
Open

Improve printf types to fix ESP32C6 compatibility #637

Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
442c316
Update jk_bms_ble.cpp
SupermotoJerry Nov 30, 2024
94e2b7b
Merge pull request #1 from syssi/main
SupermotoJerry Dec 11, 2024
20c7763
Update components/jk_bms_ble/jk_bms_ble.cpp
syssi Dec 11, 2024
c98fd9e
Update components/jk_bms_ble/jk_bms_ble.cpp
syssi Dec 11, 2024
3a9849d
Added MQTT auto-discovery
SupermotoJerry Dec 13, 2024
72b8028
Update esp32-ble-example-multiple-devices.yaml
SupermotoJerry Dec 13, 2024
9b6684a
Update esp32-ble-example.yaml
SupermotoJerry Dec 13, 2024
50d3b1f
Update esp32-ble-jk04-example.yaml
SupermotoJerry Dec 13, 2024
82e66a6
Update esp32-ble-uart-hybrid-example.yaml
SupermotoJerry Dec 13, 2024
4f58671
Update esp32-ble-v11-example.yaml
SupermotoJerry Dec 13, 2024
e9f8cbc
Update esp32-ble-v14-example.yaml
SupermotoJerry Dec 13, 2024
56ece20
Update esp32-ble-v14-multiple.yaml
SupermotoJerry Dec 13, 2024
340ee0f
Update esp32-display-example.yaml
SupermotoJerry Dec 13, 2024
7a997b2
Update esp32-example-multiple-devices.yaml
SupermotoJerry Dec 13, 2024
9287166
Update esp32-example.yaml
SupermotoJerry Dec 13, 2024
b61f65f
Update esp32-heltec-balancer-ble-example-multiple-devices.yaml
SupermotoJerry Dec 13, 2024
ff60ef3
Update esp32-heltec-balancer-ble-example-multiple-devices.yaml
SupermotoJerry Dec 13, 2024
1af0541
Update esp32-heltec-balancer-ble-example.yaml
SupermotoJerry Dec 13, 2024
efd9075
Update esp32-jk-pb-modbus-example.yaml
SupermotoJerry Dec 13, 2024
0d7cdee
Update esp8266-display-example.yaml
SupermotoJerry Dec 13, 2024
5035e88
Update esp8266-example.yaml
SupermotoJerry Dec 13, 2024
397967f
Update esp8266-jk-pb-modbus-example.yaml
SupermotoJerry Dec 13, 2024
e3b7ca3
Update esp32-ble-example-multiple-devices.yaml
SupermotoJerry Dec 13, 2024
bb58bee
Update esp32-ble-example.yaml
SupermotoJerry Dec 13, 2024
ceec603
Update esp32-ble-jk04-example.yaml
SupermotoJerry Dec 13, 2024
b0297d8
Update esp32-ble-uart-hybrid-example.yaml
SupermotoJerry Dec 13, 2024
1e6f932
Update esp32-ble-v11-example.yaml
SupermotoJerry Dec 13, 2024
86db91a
Update esp32-ble-v14-example.yaml
SupermotoJerry Dec 13, 2024
b8c5292
Update esp32-ble-v14-multiple.yaml
SupermotoJerry Dec 13, 2024
acbd39c
Update esp32-display-example.yaml
SupermotoJerry Dec 13, 2024
fef27c1
Update esp32-example-multiple-devices.yaml
SupermotoJerry Dec 13, 2024
f3b8a42
Update esp32-example.yaml
SupermotoJerry Dec 13, 2024
f77fa50
Update esp32-ble-block-traffic.yaml
SupermotoJerry Dec 13, 2024
5908bf9
Update esp32-ble-energy-dashboard.yaml
SupermotoJerry Dec 13, 2024
56838cb
Merge branch 'syssi:main' into main
SupermotoJerry Dec 18, 2024
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
6 changes: 3 additions & 3 deletions components/jk_bms_ble/jk_bms_ble.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ void JkBmsBle::decode_jk02_cell_info_(const std::vector<uint8_t> &data) {
ESP_LOGD(TAG, "Temperature sensor 3: %.1f °C", (float) jk_get_16bit(222 + offset) * 0.1f);
ESP_LOGD(TAG, "Temperature sensor 4: %.1f °C", (float) jk_get_16bit(224 + offset) * 0.1f);
ESP_LOGD(TAG, "Temperature sensor 5: %.1f °C", (float) jk_get_16bit(226 + offset) * 0.1f);
ESP_LOGD(TAG, "Time enter sleep: %u s", jk_get_32bit(238 + offset));
ESP_LOGD(TAG, "Time enter sleep: %lu s", jk_get_32bit(238 + offset));
ESP_LOGD(TAG, "PCL Module State: %s", ONOFF((bool) data[242 + offset]));

if (frame_version == FRAME_VERSION_JK02_32S) {
Expand Down Expand Up @@ -1251,10 +1251,10 @@ void JkBmsBle::decode_device_info_(const std::vector<uint8_t> &data) {
ESP_LOGI(TAG, " Software version: %s", std::string(data.begin() + 30, data.begin() + 30 + 8).c_str());

// 38 4 0x54 0xE6 0x01 0x00
ESP_LOGI(TAG, " Uptime: %d s", jk_get_32bit(38));
ESP_LOGI(TAG, " Uptime: %ld s", jk_get_32bit(38));
syssi marked this conversation as resolved.
Show resolved Hide resolved

// 42 4 0x9C 0x00 0x00 0x00
ESP_LOGI(TAG, " Power on count: %d", jk_get_32bit(42));
ESP_LOGI(TAG, " Power on count: %ld", jk_get_32bit(42));
syssi marked this conversation as resolved.
Show resolved Hide resolved

// 46 16 0x4A 0x4B 0x5F 0x50 0x42 0x32 0x41 0x31 0x36 0x53 0x31 0x35 0x50 0x00 0x00 0x00
ESP_LOGI(TAG, " Device name: %s", std::string(data.begin() + 46, data.begin() + 46 + 16).c_str());
Expand Down
Loading