me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'update' into i2c-rework-2

Browse Source
This commit is contained in:
Ben V. Brown
2025-02-24 20:30:15 +11:00
parent e8db6d5f4d 3e453f1363
commit dd6c71a385
36 changed files with 28831 additions and 20413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/BSP/Pinecilv2/FreeRTOSConfig.h
View File

@@ -17,7 +17,6 @@
#define configTOTAL_HEAP_SIZE ((size_t)1024 * 8)
#define configMAX_TASK_NAME_LEN (24)
#define configUSE_TRACE_FACILITY 0
#define configUSE_16_BIT_TICKS 0
#define configIDLE_SHOULD_YIELD 0
#define configUSE_MUTEXES 1
#define configQUEUE_REGISTRY_SIZE 8
@@ -32,6 +31,7 @@
#define configUSE_TICKLESS_IDLE 0
#define configTASK_NOTIFICATION_ARRAY_ENTRIES 2
#define configUSE_TASK_NOTIFICATIONS 1
#define configTICK_TYPE_WIDTH_IN_BITS TICK_TYPE_WIDTH_32_BITS
/* Co-routine definitions. */
#define configUSE_CO_ROUTINES 0

8
source/Core/BSP/Pinecilv2/ble_handlers.cpp
View File

@@ -133,6 +133,8 @@ int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_att
memcpy(buf, &temp, sizeof(temp));
return sizeof(temp);
break;
default:
break;
}
MSG((char *)"Unhandled attr read %d | %d\n", (uint32_t)attr->uuid, uuid_value);
return 0;
@@ -150,7 +152,7 @@ int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt
// Bulk data
{
uint32_t bulkData[] = {
TipThermoModel::getTipInC(), // 0 - Current temp
(uint32_t)TipThermoModel::getTipInC(), // 0 - Current temp
getSettingValue(SettingsOptions::SolderingTemp), // 1 - Setpoint
getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0), // 2 - Input voltage
getHandleTemperature(0), // 3 - Handle X10 Temp in C
@@ -159,9 +161,9 @@ int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt
getTipResistanceX10(), // 6 - Tip resistance
xTaskGetTickCount() / TICKS_100MS, // 7 - uptime in deciseconds
lastMovementTime / TICKS_100MS, // 8 - last movement time (deciseconds)
TipThermoModel::getTipMaxInC(), // 9 - max temp
(uint32_t)TipThermoModel::getTipMaxInC(), // 9 - max temp
TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true), // 10 - Raw tip in μV
abs(getRawHallEffect()), // 11 - hall sensor
(uint32_t)abs(getRawHallEffect()), // 11 - hall sensor
(uint32_t)currentOperatingMode, // 12 - Operating mode
x10WattHistory.average(), // 13 - Estimated Wattage *10
};