Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sim] halsim_ws_core: Store SimDeviceValueData by value

Browse Source
This commit is contained in:
Peter Johnson
2024-10-25 14:02:59 -07:00
parent 27e07d6787
commit 67e1b5fe95
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp
View File

@@ -69,18 +69,18 @@ void HALSimWSProviderSimDevice::OnNetValueChanged(const wpi::json& json) {
auto vd = m_valueHandles.find(it.key());
if (vd != m_valueHandles.end()) {
HAL_Value value;
value.type = vd->second->valueType;
value.type = vd->second.valueType;
switch (value.type) {
case HAL_BOOLEAN:
value.data.v_boolean = static_cast<bool>(it.value()) ? 1 : 0;
break;
case HAL_DOUBLE:
value.data.v_double = it.value();
value.data.v_double -= vd->second->doubleOffset;
value.data.v_double -= vd->second.doubleOffset;
break;
case HAL_ENUM: {
if (it->is_string()) {
auto& options = vd->second->options;
auto& options = vd->second.options;
auto& str = it.value().get_ref<const std::string&>();
auto optionIt =
std::find_if(options.begin(), options.end(),
@@ -89,7 +89,7 @@ void HALSimWSProviderSimDevice::OnNetValueChanged(const wpi::json& json) {
value.data.v_enum = optionIt - options.begin();
}
} else if (it->is_number()) {
auto& values = vd->second->optionValues;
auto& values = vd->second.optionValues;
double num = it.value();
auto valueIt = std::find_if(
values.begin(), values.end(),
@@ -103,17 +103,17 @@ void HALSimWSProviderSimDevice::OnNetValueChanged(const wpi::json& json) {
}
case HAL_INT:
value.data.v_int = it.value();
value.data.v_int -= vd->second->intOffset;
value.data.v_int -= vd->second.intOffset;
break;
case HAL_LONG:
value.data.v_long = it.value();
value.data.v_long -= vd->second->intOffset;
value.data.v_long -= vd->second.intOffset;
break;
default:
break;
}
HAL_SetSimValue(vd->second->handle, &value);
HAL_SetSimValue(vd->second.handle, &value);
}
}
}
@@ -146,30 +146,31 @@ void HALSimWSProviderSimDevice::OnValueCreated(const char* name,
}
}
std::string key = fmt::format("{}{}", prefix, name);
auto data = std::make_unique<SimDeviceValueData>();
data->device = this;
data->handle = handle;
data->key = key;
SimDeviceValueData data;
data.device = this;
data.handle = handle;
data.key = key;
if (value->type == HAL_ENUM) {
int32_t numOptions = 0;
const char** options = HALSIM_GetSimValueEnumOptions(handle, &numOptions);
data->options.reserve(numOptions);
data.options.reserve(numOptions);
for (int32_t i = 0; i < numOptions; ++i) {
data->options.emplace_back(options[i]);
data.options.emplace_back(options[i]);
}
const double* values =
HALSIM_GetSimValueEnumDoubleValues(handle, &numOptions);
data->optionValues.assign(values, values + numOptions);
data.optionValues.assign(values, values + numOptions);
}
data->valueType = value->type;
data.valueType = value->type;
auto param = data.get();
SimDeviceValueData* param;
{
std::unique_lock lock(m_vhLock);
m_valueHandles[data->key] = std::move(data);
param = &m_valueHandles.insert_or_assign(data.key, std::move(data))
.first->second;
}
int32_t cbKey = HALSIM_RegisterSimValueChangedCallback(

2
simulation/halsim_ws_core/src/main/native/include/WSProvider_SimDevice.h
View File

@@ -74,7 +74,7 @@ class HALSimWSProviderSimDevice : public HALSimWSBaseProvider {
void CancelCallbacks();
wpi::StringMap<std::unique_ptr<SimDeviceValueData>> m_valueHandles;
wpi::StringMap<SimDeviceValueData> m_valueHandles;
std::shared_mutex m_vhLock;
HAL_SimDeviceHandle m_handle;