Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

clang-format changes

Browse source
This commit is contained in:
skullY 2019-08-30 11:19:03 -07:00 • committed by skullydazed
parent 61af76a10d
commit b624f32f94
502 changed files with 32259 additions and 39062 deletions
Download patch file Download diff file Expand all files Collapse all files

62
tests/test_common/keyboard_report_util.cpp
View file

@ -14,30 +14,29 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "keyboard_report_util.hpp"
#include <vector>
#include <algorithm>
using namespace testing;
#include "keyboard_report_util.hpp"
#include <vector>
#include <algorithm>
using namespace testing;
namespace
{
std::vector<uint8_t> get_keys(const report_keyboard_t& report) {
std::vector<uint8_t> result;
#if defined(NKRO_ENABLE)
#error NKRO support not implemented yet
#elif defined(USB_6KRO_ENABLE)
#error 6KRO support not implemented yet
#else
for(size_t i=0; i<KEYBOARD_REPORT_KEYS; i++) {
if (report.keys[i]) {
result.emplace_back(report.keys[i]);
}
namespace {
std::vector<uint8_t> get_keys(const report_keyboard_t& report) {
std::vector<uint8_t> result;
#if defined(NKRO_ENABLE)
# error NKRO support not implemented yet
#elif defined(USB_6KRO_ENABLE)
# error 6KRO support not implemented yet
#else
for (size_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
if (report.keys[i]) {
result.emplace_back(report.keys[i]);
}
#endif
std::sort(result.begin(), result.end());
return result;
}
}
}
#endif
std::sort(result.begin(), result.end());
return result;
}
} // namespace
bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs) {
auto lhskeys = get_keys(lhs);
@ -50,7 +49,7 @@ std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& value) {
stream << "Mods: " << (uint32_t)value.mods << std::endl;
stream << "Keys: ";
// TODO: This should probably print friendly names for the keys
for (uint32_t k: get_keys(value)) {
for (uint32_t k : get_keys(value)) {
stream << k << " ";
}
stream << std::endl;
@ -59,24 +58,17 @@ std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& value) {
KeyboardReportMatcher::KeyboardReportMatcher(const std::vector<uint8_t>& keys) {
memset(m_report.raw, 0, sizeof(m_report.raw));
for (auto k: keys) {
for (auto k : keys) {
if (IS_MOD(k)) {
m_report.mods |= MOD_BIT(k);
}
else {
} else {
add_key_to_report(&m_report, k);
}
}
}
bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResultListener* listener) const {
return m_report == report;
}
bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResultListener* listener) const { return m_report == report; }
void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const {
*os << "is equal to " << m_report;
}
void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const { *os << "is equal to " << m_report; }
void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const {
*os << "is not equal to " << m_report;
}
void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; }