Merge pull request #1120 from gedankenexperimenter/testing/mouse-reports
Add verification of mouse reports to testing infrastructurepull/1122/head
Jesse Vincent
3 years ago
committed by
GitHub
commit
d898725725
@ -0,0 +1,65 @@
|
||||
/* -*- mode: c++ -*-
|
||||
* Copyright (C) 2022 Keyboard.io, Inc
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "testing/ExpectedMouseReport.h"
|
||||
|
||||
namespace kaleidoscope {
|
||||
namespace testing {
|
||||
|
||||
ExpectedMouseReport::ExpectedMouseReport(uint32_t timestamp,
|
||||
uint8_t buttons,
|
||||
int8_t x, int8_t y,
|
||||
int8_t v, int8_t h,
|
||||
std::string message) {
|
||||
timestamp_ = timestamp;
|
||||
report_data_.buttons = buttons;
|
||||
report_data_.xAxis = x;
|
||||
report_data_.yAxis = y;
|
||||
report_data_.vWheel = v;
|
||||
report_data_.hWheel = h;
|
||||
failure_message_ = message;
|
||||
}
|
||||
|
||||
uint32_t ExpectedMouseReport::Timestamp() const {
|
||||
return timestamp_;
|
||||
}
|
||||
|
||||
const std::string & ExpectedMouseReport::Message() const {
|
||||
return failure_message_;
|
||||
}
|
||||
|
||||
uint8_t ExpectedMouseReport::Buttons() const {
|
||||
return report_data_.buttons;
|
||||
}
|
||||
|
||||
int8_t ExpectedMouseReport::XAxis() const {
|
||||
return report_data_.xAxis;
|
||||
}
|
||||
|
||||
int8_t ExpectedMouseReport::YAxis() const {
|
||||
return report_data_.yAxis;
|
||||
}
|
||||
|
||||
int8_t ExpectedMouseReport::VWheel() const {
|
||||
return report_data_.vWheel;
|
||||
}
|
||||
|
||||
int8_t ExpectedMouseReport::HWheel() const {
|
||||
return report_data_.hWheel;
|
||||
}
|
||||
|
||||
} // namespace testing
|
||||
} // namespace kaleidoscope
|
||||
@ -0,0 +1,52 @@
|
||||
/* -*- mode: c++ -*-
|
||||
* Copyright (C) 2022 Keyboard.io, Inc
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
#include "MouseReport.h"
|
||||
|
||||
namespace kaleidoscope {
|
||||
namespace testing {
|
||||
|
||||
class ExpectedMouseReport {
|
||||
public:
|
||||
ExpectedMouseReport(uint32_t timestamp,
|
||||
uint8_t buttons, int8_t x, int8_t y, int8_t v, int8_t h,
|
||||
std::string message = "");
|
||||
|
||||
uint8_t Buttons() const;
|
||||
int8_t XAxis() const;
|
||||
int8_t YAxis() const;
|
||||
int8_t VWheel() const;
|
||||
int8_t HWheel() const;
|
||||
|
||||
uint32_t Timestamp() const;
|
||||
|
||||
const std::string & Message() const;
|
||||
|
||||
private:
|
||||
uint32_t timestamp_;
|
||||
MouseReport::ReportData report_data_;
|
||||
std::string failure_message_;
|
||||
};
|
||||
|
||||
} // namespace testing
|
||||
} // namespace kaleidoscope
|
||||
@ -0,0 +1,61 @@
|
||||
/* -*- mode: c++ -*-
|
||||
* Copyright (C) 2020 Eric Paniagua (epaniagua@google.com)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "testing/MouseReport.h"
|
||||
|
||||
#include "Kaleidoscope.h"
|
||||
#include "testing/fix-macros.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "MouseButtons.h"
|
||||
|
||||
namespace kaleidoscope {
|
||||
namespace testing {
|
||||
|
||||
MouseReport::MouseReport(const void* data) {
|
||||
const ReportData& report_data =
|
||||
*static_cast<const ReportData*>(data);
|
||||
memcpy(&report_data_, &report_data, sizeof(report_data_));
|
||||
timestamp_ = Runtime.millisAtCycleStart();
|
||||
}
|
||||
|
||||
uint32_t MouseReport::Timestamp() const {
|
||||
return timestamp_;
|
||||
}
|
||||
|
||||
uint8_t MouseReport::Buttons() const {
|
||||
return report_data_.buttons;
|
||||
}
|
||||
|
||||
int8_t MouseReport::XAxis() const {
|
||||
return report_data_.xAxis;
|
||||
}
|
||||
|
||||
int8_t MouseReport::YAxis() const {
|
||||
return report_data_.yAxis;
|
||||
}
|
||||
|
||||
int8_t MouseReport::VWheel() const {
|
||||
return report_data_.vWheel;
|
||||
}
|
||||
|
||||
int8_t MouseReport::HWheel() const {
|
||||
return report_data_.hWheel;
|
||||
}
|
||||
|
||||
} // namespace testing
|
||||
} // namespace kaleidoscope
|
||||
@ -0,0 +1,56 @@
|
||||
/* -*- mode: c++ -*-
|
||||
* Copyright (C) 2020 Eric Paniagua (epaniagua@google.com)
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
#include "HID-Settings.h"
|
||||
#include "MultiReport/Mouse.h"
|
||||
|
||||
namespace kaleidoscope {
|
||||
namespace testing {
|
||||
|
||||
class MouseReport {
|
||||
public:
|
||||
typedef HID_MouseReport_Data_t ReportData;
|
||||
|
||||
static constexpr uint8_t kHidReportType = HID_REPORTID_MOUSE;
|
||||
|
||||
MouseReport(const void* data);
|
||||
|
||||
|
||||
static constexpr uint8_t kButtonLeft = MOUSE_LEFT;
|
||||
static constexpr uint8_t kButtonRight = MOUSE_RIGHT;
|
||||
static constexpr uint8_t kButtonMiddle = MOUSE_MIDDLE;
|
||||
static constexpr uint8_t kButtonPrev = MOUSE_PREV;
|
||||
static constexpr uint8_t kButtonNext = MOUSE_NEXT;
|
||||
|
||||
uint32_t Timestamp() const;
|
||||
uint8_t Buttons() const;
|
||||
int8_t XAxis() const;
|
||||
int8_t YAxis() const;
|
||||
int8_t VWheel() const;
|
||||
int8_t HWheel() const;
|
||||
|
||||
private:
|
||||
uint32_t timestamp_;
|
||||
ReportData report_data_;
|
||||
};
|
||||
|
||||
} // namespace testing
|
||||
} // namespce kaleidoscope
|
||||
@ -0,0 +1,49 @@
|
||||
/* -*- mode: c++ -*-
|
||||
* Copyright (C) 2022 Keyboard.io, Inc.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <Kaleidoscope.h>
|
||||
#include <Kaleidoscope-MouseKeys.h>
|
||||
|
||||
// *INDENT-OFF*
|
||||
KEYMAPS(
|
||||
[0] = KEYMAP_STACKED
|
||||
(
|
||||
Key_mouseUp, Key_mouseDn, Key_mouseL, Key_mouseR, ___, ___, ___,
|
||||
Key_mouseScrollUp, Key_mouseScrollDn, Key_mouseScrollL, Key_mouseScrollR, ___, ___, ___,
|
||||
Key_mouseBtnL, Key_mouseBtnM, Key_mouseBtnR, ___, ___, ___,
|
||||
___, ___, ___, ___, ___, ___, ___,
|
||||
___, ___, ___, ___,
|
||||
___,
|
||||
|
||||
___, ___, ___, ___, ___, ___, ___,
|
||||
___, ___, ___, ___, ___, ___, ___,
|
||||
___, ___, ___, ___, ___, ___,
|
||||
___, ___, ___, ___, ___, ___, ___,
|
||||
___, ___, ___, ___,
|
||||
___
|
||||
),
|
||||
)
|
||||
// *INDENT-ON*
|
||||
|
||||
KALEIDOSCOPE_INIT_PLUGINS(MouseKeys);
|
||||
|
||||
void setup() {
|
||||
Kaleidoscope.setup();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
Kaleidoscope.loop();
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"cpu": {
|
||||
"fqbn": "keyboardio:virtual:model01",
|
||||
"port": ""
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
VERSION 1
|
||||
|
||||
KEYSWITCH MOVE_UP 0 0
|
||||
KEYSWITCH MOVE_DOWN 0 1
|
||||
KEYSWITCH MOVE_LEFT 0 2
|
||||
KEYSWITCH MOVE_RIGHT 0 3
|
||||
|
||||
KEYSWITCH SCROLL_UP 1 0
|
||||
KEYSWITCH SCROLL_DOWN 1 1
|
||||
KEYSWITCH SCROLL_LEFT 1 2
|
||||
KEYSWITCH SCROLL_RIGHT 1 3
|
||||
|
||||
KEYSWITCH BUTTON_L 2 0
|
||||
KEYSWITCH BUTTON_M 2 1
|
||||
KEYSWITCH BUTTON_R 2 2
|
||||
|
||||
# ==============================================================================
|
||||
NAME MouseKeys move up
|
||||
|
||||
RUN 3 ms
|
||||
PRESS MOVE_UP
|
||||
RUN 1 cycle
|
||||
|
||||
RUN 15 ms
|
||||
EXPECT mouse-report y=-1
|
||||
RUN 1 cycle
|
||||
EXPECT mouse-report empty
|
||||
|
||||
RUN 15 ms
|
||||
EXPECT mouse-report y=-1
|
||||
RUN 1 cycle
|
||||
EXPECT mouse-report empty
|
||||
|
||||
RUN 5 ms
|
||||
RELEASE MOVE_UP
|
||||
RUN 1 cycle
|
||||
EXPECT no mouse-report
|
||||
|
||||
RUN 5 ms
|
||||
|
||||
# ==============================================================================
|
||||
NAME MouseKeys button left
|
||||
|
||||
RUN 4 ms
|
||||
PRESS BUTTON_L
|
||||
RUN 1 cycle
|
||||
EXPECT mouse-report button=L
|
||||
|
||||
RUN 20 ms
|
||||
RELEASE BUTTON_L
|
||||
RUN 1 cycle
|
||||
EXPECT mouse-report empty
|
||||
|
||||
RUN 5 ms
|
||||
|
||||
# ==============================================================================
|
||||
NAME MouseKeys scroll down
|
||||
|
||||
RUN 4 ms
|
||||
PRESS SCROLL_UP
|
||||
RUN 1 cycle
|
||||
EXPECT mouse-report v=1
|
||||
|
||||
RUN 50 ms
|
||||
EXPECT mouse-report v=1
|
||||
|
||||
RUN 10 ms
|
||||
RELEASE SCROLL_UP
|
||||
RUN 1 cycle
|
||||
EXPECT no mouse-report
|
||||
|
||||
RUN 5 ms
|
||||
Loading…
Reference in new issue