Compare commits
1 Commits
motion
...
ring_proto
Author | SHA1 | Date | |
---|---|---|---|
0495a13e31 |
@ -24,7 +24,6 @@ enum class InputType {
|
||||
Analog,
|
||||
Trigger,
|
||||
Motion,
|
||||
VirtualMotion,
|
||||
Touch,
|
||||
Color,
|
||||
Vibration,
|
||||
|
@ -5,8 +5,6 @@
|
||||
#include <random>
|
||||
|
||||
#include "common/input.h"
|
||||
#include "common/math_util.h"
|
||||
#include "common/quaternion.h"
|
||||
#include "core/hid/input_converter.h"
|
||||
|
||||
namespace Core::HID {
|
||||
@ -83,7 +81,7 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu
|
||||
Common::Input::MotionStatus status{};
|
||||
switch (callback.type) {
|
||||
case Common::Input::InputType::Button: {
|
||||
const Common::Input::AnalogProperties properties{
|
||||
Common::Input::AnalogProperties properties{
|
||||
.deadzone = 0.0f,
|
||||
.range = 1.0f,
|
||||
.offset = 0.0f,
|
||||
@ -95,18 +93,31 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu
|
||||
.raw_value = 0.0f,
|
||||
.properties = properties,
|
||||
};
|
||||
status.delta_timestamp = 5000;
|
||||
status.force_update = true;
|
||||
status.accel.x = default_analog_status;
|
||||
status.accel.y = default_analog_status;
|
||||
status.accel.y = {
|
||||
.value = 0.0f,
|
||||
.raw_value = 0.0f,
|
||||
.properties = properties,
|
||||
};
|
||||
status.accel.z = {
|
||||
.value = 0.0f,
|
||||
.raw_value = -1.0f,
|
||||
.properties = properties,
|
||||
};
|
||||
status.gyro.x = default_analog_status;
|
||||
status.gyro.y = default_analog_status;
|
||||
status.gyro.z = default_analog_status;
|
||||
status.gyro.x = {
|
||||
.value = 0.0f,
|
||||
.raw_value = 0.0f,
|
||||
.properties = properties,
|
||||
};
|
||||
status.gyro.y = {
|
||||
.value = 0.0f,
|
||||
.raw_value = 0.0f,
|
||||
.properties = properties,
|
||||
};
|
||||
status.gyro.z = {
|
||||
.value = 0.0f,
|
||||
.raw_value = 0.0f,
|
||||
.properties = properties,
|
||||
};
|
||||
if (TransformToButton(callback).value) {
|
||||
std::random_device device;
|
||||
std::mt19937 gen(device());
|
||||
@ -123,9 +134,6 @@ Common::Input::MotionStatus TransformToMotion(const Common::Input::CallbackStatu
|
||||
case Common::Input::InputType::Motion:
|
||||
status = callback.motion_status;
|
||||
break;
|
||||
case Common::Input::InputType::VirtualMotion:
|
||||
status = GetVirtualMotion(callback.motion_status);
|
||||
break;
|
||||
default:
|
||||
LOG_ERROR(Input, "Conversion from type {} to motion not implemented", callback.type);
|
||||
break;
|
||||
@ -429,32 +437,4 @@ void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogS
|
||||
}
|
||||
}
|
||||
|
||||
Common::Input::MotionStatus GetVirtualMotion(Common::Input::MotionStatus input_data,
|
||||
Common::Vec3f last_giro) {
|
||||
Common::Input::MotionStatus motion_status = input_data;
|
||||
|
||||
// Axis data is stored in the gyro value
|
||||
float wx = input_data.gyro.x.raw_value;
|
||||
float wy = input_data.gyro.y.raw_value;
|
||||
|
||||
float rotX = (wy * 2 - 1.0f) * 135.0f; // up/down best
|
||||
float rotY = (wx * 2 - 1.0f) * -180.0f; // left/right
|
||||
float rotZ = input_data.gyro.y.raw_value * 14.0f + m_lastGyroRotation.z;
|
||||
|
||||
Common::Vec3f rotation(rotX - m_lastGyroRotation.x, (rotY - m_lastGyroRotation.y) * 15.0f,
|
||||
rotZ - m_lastGyroRotation.z);
|
||||
|
||||
rotation.x = std::min(1.0f, std::max(-1.0f, rotation.x / 360.0f));
|
||||
rotation.y = std::min(1.0f, std::max(-1.0f, rotation.y / 360.0f));
|
||||
rotation.z = std::min(1.0f, std::max(-1.0f, rotation.z / 360.0f));
|
||||
|
||||
motion_status.gyro.x.raw_value = rotation.x;
|
||||
motion_status.gyro.y.raw_value = rotation.y;
|
||||
motion_status.gyro.z.raw_value = rotation.z;
|
||||
|
||||
motion_status.accel.x.raw_value = 0.0f;
|
||||
motion_status.accel.y.raw_value = 0.0f;
|
||||
motion_status.accel.z.raw_value = -1.0f;
|
||||
}
|
||||
|
||||
} // namespace Core::HID
|
||||
|
@ -116,21 +116,4 @@ void SanitizeAnalog(Common::Input::AnalogStatus& analog, bool clamp_value);
|
||||
void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogStatus& analog_y,
|
||||
bool clamp_value);
|
||||
|
||||
/**
|
||||
* Converts raw stick data into a valid stick value
|
||||
* @param analog_x raw analog data and properties for the x-axis
|
||||
* @param analog_y raw analog data and properties for the y-axis
|
||||
* @param clamp_value bool that determines if the value needs to be clamped into the unit circle.
|
||||
*/
|
||||
void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogStatus& analog_y,
|
||||
bool clamp_value);
|
||||
|
||||
/**
|
||||
* Calculates the accelerometer value needed to reach the axis position as if it was a pointer to a screen
|
||||
*
|
||||
* @param input_data Motion status containing the position of all 3 axis
|
||||
* @return Motion status with accelerometer data
|
||||
*/
|
||||
Common::Input::MotionStatus GetVirtualMotion(Common::Input::MotionStatus input_data);
|
||||
|
||||
} // namespace Core::HID
|
||||
|
@ -388,6 +388,32 @@ enum class ExternalDeviceId : u16 {
|
||||
Starlink = 0x2800,
|
||||
};
|
||||
|
||||
// Most missing command names are leftovers from other firmware versions
|
||||
enum class RingConCommand : u32 {
|
||||
GetFirmwareVersion = 0x00020000,
|
||||
ReadId = 0x00020100,
|
||||
JoyPolling = 0x00020101,
|
||||
Unknown1 = 0x00020104,
|
||||
c20105 = 0x00020105,
|
||||
Unknown2 = 0x00020204,
|
||||
Unknown3 = 0x00020304,
|
||||
Unknown4 = 0x00020404,
|
||||
ReadUnkCal = 0x00020504,
|
||||
ReadFactoryCal = 0x00020A04,
|
||||
Unknown5 = 0x00021104,
|
||||
Unknown6 = 0x00021204,
|
||||
Unknown7 = 0x00021304,
|
||||
ReadUserCal = 0x00021A04,
|
||||
ReadRepCount = 0x00023104,
|
||||
ReadTotalPushCount = 0x00023204,
|
||||
ResetRepCount = 0x04013104,
|
||||
Unknown8 = 0x04011104,
|
||||
Unknown9 = 0x04011204,
|
||||
Unknown10 = 0x04011304,
|
||||
SaveCalData = 0x10011A04,
|
||||
Error = 0xFFFFFFFF,
|
||||
};
|
||||
|
||||
enum class DriverResult {
|
||||
Success,
|
||||
WrongReply,
|
||||
@ -687,6 +713,57 @@ struct RingStatus {
|
||||
s16 min_value;
|
||||
};
|
||||
|
||||
#pragma pack(push, 1)
|
||||
struct RingCommandData {
|
||||
u8 data_type;
|
||||
RingConCommand command;
|
||||
};
|
||||
static_assert(sizeof(RingCommandData) == 0x5, "RingCommandData is an invalid size");
|
||||
#pragma pack(pop)
|
||||
|
||||
struct RingFactoryCalibration {
|
||||
s32_le os_max;
|
||||
s32_le hk_max;
|
||||
s32_le zero_min;
|
||||
s32_le zero_max;
|
||||
};
|
||||
static_assert(sizeof(RingFactoryCalibration) == 0x10, "RingFactoryCalibration is an invalid size");
|
||||
|
||||
struct RingCalibrationValue {
|
||||
s16 value;
|
||||
u16 crc;
|
||||
};
|
||||
static_assert(sizeof(RingCalibrationValue) == 0x4, "RingCalibrationValue is an invalid size");
|
||||
|
||||
struct RingUserCalibration {
|
||||
RingCalibrationValue os_max;
|
||||
RingCalibrationValue hk_max;
|
||||
RingCalibrationValue zero;
|
||||
};
|
||||
static_assert(sizeof(RingUserCalibration) == 0xC, "RingUserCalibration is an invalid size");
|
||||
|
||||
struct RingReadId {
|
||||
u16 id_l_x0;
|
||||
u16 id_l_x0_2;
|
||||
u16 id_l_x4;
|
||||
u16 id_h_x0;
|
||||
u16 id_h_x0_2;
|
||||
u16 id_h_x4;
|
||||
};
|
||||
static_assert(sizeof(RingReadId) == 0xC, "RingReadId is an invalid size");
|
||||
|
||||
struct RingCommandReply {
|
||||
DriverResult result;
|
||||
RingConCommand command;
|
||||
FirmwareVersion firmware;
|
||||
RingFactoryCalibration factory_calibration;
|
||||
RingUserCalibration user_calibration;
|
||||
RingReadId read_id;
|
||||
u8 c20105;
|
||||
u8 total_push_count;
|
||||
u8 total_rep_count;
|
||||
};
|
||||
|
||||
struct VibrationPacket {
|
||||
OutputReport output_report;
|
||||
u8 packet_counter;
|
||||
|
@ -108,6 +108,65 @@ DriverResult RingConProtocol::ConfigureRing() {
|
||||
return SendSubCommand(SubCommand::ENABLE_EXTERNAL_POLLING, ringcon_data);
|
||||
}
|
||||
|
||||
|
||||
DriverResult RingConProtocol::SendCommand(RingConCommand command) {
|
||||
SubCommandResponce output{};
|
||||
RingCommandData data{
|
||||
.data_type = 0x04, // This seems to be always 4 for this command
|
||||
.command = command,
|
||||
};
|
||||
RingCommandReply reply{
|
||||
.result = DriverResult::Success,
|
||||
.command = command,
|
||||
};
|
||||
|
||||
std::array<u8, sizeof(RingCommandData)> raw_data{};
|
||||
memcpy(raw_data.data(), &data, sizeof(RingCommandData));
|
||||
const DriverResult result = SendSubCommand(SubCommand::SET_EXTERNAL_CONFIG, raw_data, output);
|
||||
|
||||
if (result != DriverResult::Success) {
|
||||
reply.result = result;
|
||||
return result;
|
||||
}
|
||||
|
||||
switch (command) {
|
||||
case RingConCommand::GetFirmwareVersion:
|
||||
memcpy(&reply.firmware, output.command_data.data() + 6, sizeof(FirmwareVersion));
|
||||
break;
|
||||
case RingConCommand::ReadId:
|
||||
memcpy(&reply.read_id, output.command_data.data() + 6,
|
||||
sizeof(RingReadId));
|
||||
break;
|
||||
case RingConCommand::c20105:
|
||||
reply.c20105 = output.command_data[6];
|
||||
break;
|
||||
case RingConCommand::ReadUnkCal:
|
||||
break;
|
||||
case RingConCommand::ReadFactoryCal:
|
||||
memcpy(&reply.factory_calibration, output.command_data.data() + 6,
|
||||
sizeof(RingFactoryCalibration));
|
||||
break;
|
||||
case RingConCommand::ReadUserCal:
|
||||
memcpy(&reply.user_calibration, output.command_data.data() + 6, sizeof(RingUserCalibration));
|
||||
break;
|
||||
case RingConCommand::ReadRepCount:
|
||||
reply.total_rep_count = output.command_data[6];
|
||||
break;
|
||||
case RingConCommand::ReadTotalPushCount:
|
||||
reply.total_push_count = output.command_data[6];
|
||||
break;
|
||||
case RingConCommand::ResetRepCount:
|
||||
break;
|
||||
case RingConCommand::SaveCalData:
|
||||
break;
|
||||
default:
|
||||
reply.result = DriverResult::NotSupported;
|
||||
break;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool RingConProtocol::IsEnabled() const {
|
||||
return is_enabled;
|
||||
}
|
||||
|
@ -25,6 +25,9 @@ public:
|
||||
|
||||
DriverResult StartRingconPolling();
|
||||
|
||||
// Hidbus can send individual commands to the ring each one with an unique reply
|
||||
DriverResult SendCommand(RingConCommand command);
|
||||
|
||||
bool IsEnabled() const;
|
||||
|
||||
private:
|
||||
|
@ -674,7 +674,7 @@ public:
|
||||
|
||||
void ForceUpdate() override {
|
||||
const Common::Input::CallbackStatus status{
|
||||
.type = Common::Input::InputType::VirtualMotion,
|
||||
.type = Common::Input::InputType::Motion,
|
||||
.motion_status = GetStatus(),
|
||||
};
|
||||
|
||||
@ -686,7 +686,7 @@ public:
|
||||
|
||||
void OnChange() {
|
||||
const Common::Input::CallbackStatus status{
|
||||
.type = Common::Input::InputType::VirtualMotion,
|
||||
.type = Common::Input::InputType::Motion,
|
||||
.motion_status = GetStatus(),
|
||||
};
|
||||
|
||||
@ -1039,13 +1039,14 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateColorDevice(
|
||||
}
|
||||
|
||||
std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateMotionDevice(
|
||||
const Common::ParamPackage& params) {
|
||||
Common::ParamPackage params) {
|
||||
const PadIdentifier identifier = {
|
||||
.guid = Common::UUID{params.Get("guid", "")},
|
||||
.port = static_cast<std::size_t>(params.Get("port", 0)),
|
||||
.pad = static_cast<std::size_t>(params.Get("pad", 0)),
|
||||
};
|
||||
|
||||
if (params.Has("motion")) {
|
||||
const auto motion_sensor = params.Get("motion", 0);
|
||||
const auto gyro_threshold = params.Get("threshold", 0.007f);
|
||||
input_engine->PreSetController(identifier);
|
||||
@ -1054,14 +1055,6 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateMotionDevice(
|
||||
input_engine.get());
|
||||
}
|
||||
|
||||
std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateVirtualMotionDevice(
|
||||
const Common::ParamPackage& params) {
|
||||
const PadIdentifier identifier = {
|
||||
.guid = Common::UUID{params.Get("guid", "")},
|
||||
.port = static_cast<std::size_t>(params.Get("port", 0)),
|
||||
.pad = static_cast<std::size_t>(params.Get("pad", 0)),
|
||||
};
|
||||
|
||||
const auto deadzone = std::clamp(params.Get("deadzone", 0.15f), 0.0f, 1.0f);
|
||||
const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f);
|
||||
const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f);
|
||||
@ -1154,7 +1147,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::Create(
|
||||
return CreateHatButtonDevice(params);
|
||||
}
|
||||
if (params.Has("axis_x") && params.Has("axis_y") && params.Has("axis_z")) {
|
||||
return CreateVirtualMotionDevice(params);
|
||||
return CreateMotionDevice(params);
|
||||
}
|
||||
if (params.Has("motion")) {
|
||||
return CreateMotionDevice(params);
|
||||
|
@ -204,19 +204,6 @@ private:
|
||||
/**
|
||||
* Creates a motion device from the parameters given.
|
||||
* @param params contains parameters for creating the device:
|
||||
* - "motion": index of the motion sensor
|
||||
* - "threshold": gyro deadzone to avoid drifting
|
||||
* - "guid": text string for identifying controllers
|
||||
* - "port": port of the connected device
|
||||
* - "pad": slot of the connected controller
|
||||
* @returns a unique input device with the parameters specified
|
||||
*/
|
||||
std::unique_ptr<Common::Input::InputDevice> CreateMotionDevice(
|
||||
const Common::ParamPackage& params);
|
||||
|
||||
/**
|
||||
* Creates a virtual motion device from the parameters given.
|
||||
* @param params contains parameters for creating the device:
|
||||
* - "axis_x": the controller horizontal axis id to bind with the input
|
||||
* - "axis_y": the controller vertical axis id to bind with the input
|
||||
* - "axis_z": the controller forward axis id to bind with the input
|
||||
@ -233,8 +220,7 @@ private:
|
||||
* - "pad": slot of the connected controller
|
||||
* @returns a unique input device with the parameters specified
|
||||
*/
|
||||
std::unique_ptr<Common::Input::InputDevice> CreateVirtualMotionDevice(
|
||||
const Common::ParamPackage& params);
|
||||
std::unique_ptr<Common::Input::InputDevice> CreateMotionDevice(Common::ParamPackage params);
|
||||
|
||||
/**
|
||||
* Creates a camera device from the parameters given.
|
||||
|
Reference in New Issue
Block a user