mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-21 01:01:43 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -10,7 +10,7 @@
|
||||
#include "wpi/hal/PowerDistribution.h"
|
||||
#include "wpi/util/jni_util.hpp"
|
||||
|
||||
using namespace hal;
|
||||
using namespace wpi::hal;
|
||||
|
||||
static_assert(org_wpilib_hardware_hal_PowerDistributionJNI_AUTOMATIC_TYPE ==
|
||||
HAL_PowerDistributionType::HAL_PowerDistributionType_kAutomatic);
|
||||
@@ -33,7 +33,7 @@ Java_org_wpilib_hardware_hal_PowerDistributionJNI_initialize
|
||||
(JNIEnv* env, jclass, jint busId, jint module, jint type)
|
||||
{
|
||||
int32_t status = 0;
|
||||
auto stack = wpi::java::GetJavaStackTrace(env, "edu.wpi.first");
|
||||
auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
|
||||
auto handle = HAL_InitializePowerDistribution(
|
||||
busId, module, static_cast<HAL_PowerDistributionType>(type),
|
||||
stack.c_str(), &status);
|
||||
@@ -182,7 +182,7 @@ Java_org_wpilib_hardware_hal_PowerDistributionJNI_getAllCurrents
|
||||
{
|
||||
int32_t status = 0;
|
||||
int32_t size = HAL_GetPowerDistributionNumChannels(handle, &status);
|
||||
wpi::SmallVector<double, 24> storage;
|
||||
wpi::util::SmallVector<double, 24> storage;
|
||||
storage.resize_for_overwrite(size);
|
||||
|
||||
HAL_GetPowerDistributionAllChannelCurrents(handle, storage.data(), size,
|
||||
|
||||
Reference in New Issue
Block a user