diff --git a/openpilot/cereal/gen/cpp/car.capnp.c++ b/openpilot/cereal/gen/cpp/car.capnp.c++ index 855c08f89..be2a3ee30 100644 --- a/openpilot/cereal/gen/cpp/car.capnp.c++ +++ b/openpilot/cereal/gen/cpp/car.capnp.c++ @@ -4234,7 +4234,7 @@ const ::capnp::_::RawSchema s_d817d6655115ca85 = { 1, 1, i_d817d6655115ca85, nullptr, nullptr, { &s_d817d6655115ca85, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { +static const ::capnp::_::AlignedData<765> b_8c69372490aaa9da = { { 0, 0, 0, 0, 5, 0, 6, 0, 218, 169, 170, 144, 36, 55, 105, 140, 10, 0, 0, 0, 1, 0, 18, 0, @@ -4244,7 +4244,7 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 21, 0, 0, 0, 162, 0, 0, 0, 29, 0, 0, 0, 231, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 25, 1, 0, 0, 23, 10, 0, 0, + 25, 1, 0, 0, 55, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 97, 114, 46, 99, 97, 112, 110, @@ -4315,329 +4315,301 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 101, 0, 0, 0, 0, 0, 0, 0, 78, 101, 116, 119, 111, 114, 107, 76, 111, 99, 97, 116, 105, 111, 110, 0, - 184, 0, 0, 0, 3, 0, 4, 0, + 168, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 249, 4, 0, 0, 50, 0, 0, 0, + 137, 4, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 244, 4, 0, 0, 3, 0, 1, 0, - 0, 5, 0, 0, 2, 0, 1, 0, + 132, 4, 0, 0, 3, 0, 1, 0, + 144, 4, 0, 0, 2, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 253, 4, 0, 0, 122, 0, 0, 0, + 141, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 252, 4, 0, 0, 3, 0, 1, 0, - 8, 5, 0, 0, 2, 0, 1, 0, - 45, 0, 0, 0, 0, 0, 0, 0, + 140, 4, 0, 0, 3, 0, 1, 0, + 152, 4, 0, 0, 2, 0, 1, 0, + 41, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 193, 148, 27, 21, 154, 15, 247, 144, - 5, 5, 0, 0, 90, 0, 0, 0, + 149, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 241, 4, 0, 0, 82, 0, 0, 0, + 129, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 240, 4, 0, 0, 3, 0, 1, 0, - 252, 4, 0, 0, 2, 0, 1, 0, - 8, 0, 0, 0, 1, 0, 0, 0, + 128, 4, 0, 0, 3, 0, 1, 0, + 140, 4, 0, 0, 2, 0, 1, 0, + 7, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 249, 4, 0, 0, 122, 0, 0, 0, + 137, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 248, 4, 0, 0, 3, 0, 1, 0, - 4, 5, 0, 0, 2, 0, 1, 0, - 9, 0, 0, 0, 2, 0, 0, 0, + 136, 4, 0, 0, 3, 0, 1, 0, + 148, 4, 0, 0, 2, 0, 1, 0, + 8, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 5, 0, 0, 114, 0, 0, 0, + 145, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 5, 0, 0, 3, 0, 1, 0, - 12, 5, 0, 0, 2, 0, 1, 0, - 15, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 1, 0, 17, 0, 0, 0, + 144, 4, 0, 0, 3, 0, 1, 0, + 156, 4, 0, 0, 2, 0, 1, 0, + 14, 0, 0, 0, 5, 0, 0, 0, + 0, 0, 1, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 5, 0, 0, 42, 0, 0, 0, + 153, 4, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 152, 4, 0, 0, 3, 0, 1, 0, + 164, 4, 0, 0, 2, 0, 1, 0, + 15, 0, 0, 0, 6, 0, 0, 0, + 0, 0, 1, 0, 19, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 161, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 160, 4, 0, 0, 3, 0, 1, 0, + 172, 4, 0, 0, 2, 0, 1, 0, + 16, 0, 0, 0, 7, 0, 0, 0, + 0, 0, 1, 0, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 169, 4, 0, 0, 90, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 168, 4, 0, 0, 3, 0, 1, 0, + 180, 4, 0, 0, 2, 0, 1, 0, + 17, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 1, 0, 22, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 177, 4, 0, 0, 202, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 184, 4, 0, 0, 3, 0, 1, 0, + 196, 4, 0, 0, 2, 0, 1, 0, + 19, 0, 0, 0, 10, 0, 0, 0, + 0, 0, 1, 0, 23, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 193, 4, 0, 0, 210, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 200, 4, 0, 0, 3, 0, 1, 0, + 212, 4, 0, 0, 2, 0, 1, 0, + 20, 0, 0, 0, 11, 0, 0, 0, + 0, 0, 1, 0, 24, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 209, 4, 0, 0, 202, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 216, 4, 0, 0, 3, 0, 1, 0, + 228, 4, 0, 0, 2, 0, 1, 0, + 21, 0, 0, 0, 8, 0, 0, 0, + 0, 0, 1, 0, 25, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 225, 4, 0, 0, 154, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 228, 4, 0, 0, 3, 0, 1, 0, + 240, 4, 0, 0, 2, 0, 1, 0, + 22, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 42, 149, 64, 183, 59, 202, 28, 179, + 237, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 24, 0, 0, 0, 30, 0, 0, 0, + 0, 0, 1, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 217, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 220, 4, 0, 0, 3, 0, 1, 0, + 232, 4, 0, 0, 2, 0, 1, 0, + 25, 0, 0, 0, 8, 0, 0, 0, + 0, 0, 1, 0, 35, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 229, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 232, 4, 0, 0, 3, 0, 1, 0, + 244, 4, 0, 0, 2, 0, 1, 0, + 27, 0, 0, 0, 16, 0, 0, 0, + 0, 0, 1, 0, 36, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 241, 4, 0, 0, 154, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 244, 4, 0, 0, 3, 0, 1, 0, + 0, 5, 0, 0, 2, 0, 1, 0, + 29, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 1, 0, 37, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 253, 4, 0, 0, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0, 0, 3, 0, 1, 0, 16, 5, 0, 0, 2, 0, 1, 0, - 16, 0, 0, 0, 5, 0, 0, 0, - 0, 0, 1, 0, 18, 0, 0, 0, + 30, 0, 0, 0, 10, 0, 0, 0, + 0, 0, 1, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13, 5, 0, 0, 82, 0, 0, 0, + 13, 5, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 5, 0, 0, 3, 0, 1, 0, - 24, 5, 0, 0, 2, 0, 1, 0, - 17, 0, 0, 0, 6, 0, 0, 0, - 0, 0, 1, 0, 19, 0, 0, 0, + 8, 5, 0, 0, 3, 0, 1, 0, + 20, 5, 0, 0, 2, 0, 1, 0, + 31, 0, 0, 0, 11, 0, 0, 0, + 0, 0, 1, 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 5, 0, 0, 114, 0, 0, 0, + 17, 5, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 20, 5, 0, 0, 3, 0, 1, 0, - 32, 5, 0, 0, 2, 0, 1, 0, - 18, 0, 0, 0, 7, 0, 0, 0, - 0, 0, 1, 0, 20, 0, 0, 0, + 16, 5, 0, 0, 3, 0, 1, 0, + 28, 5, 0, 0, 2, 0, 1, 0, + 33, 0, 0, 0, 34, 0, 0, 0, + 0, 0, 1, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 5, 0, 0, 90, 0, 0, 0, + 25, 5, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 5, 0, 0, 3, 0, 1, 0, 40, 5, 0, 0, 2, 0, 1, 0, - 19, 0, 0, 0, 8, 0, 0, 0, - 0, 0, 1, 0, 21, 0, 0, 0, + 34, 0, 0, 0, 11, 0, 0, 0, + 0, 0, 1, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 5, 0, 0, 122, 0, 0, 0, + 37, 5, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 5, 0, 0, 3, 0, 1, 0, - 48, 5, 0, 0, 2, 0, 1, 0, - 20, 0, 0, 0, 9, 0, 0, 0, - 0, 0, 1, 0, 22, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 45, 5, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 48, 5, 0, 0, 3, 0, 1, 0, + 32, 5, 0, 0, 3, 0, 1, 0, 60, 5, 0, 0, 2, 0, 1, 0, - 22, 0, 0, 0, 10, 0, 0, 0, - 0, 0, 1, 0, 23, 0, 0, 0, + 23, 0, 0, 0, 19, 0, 0, 0, + 0, 0, 1, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 5, 0, 0, 154, 0, 0, 0, + 57, 5, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 5, 0, 0, 3, 0, 1, 0, - 72, 5, 0, 0, 2, 0, 1, 0, - 23, 0, 0, 0, 11, 0, 0, 0, - 0, 0, 1, 0, 24, 0, 0, 0, + 56, 5, 0, 0, 3, 0, 1, 0, + 68, 5, 0, 0, 2, 0, 1, 0, + 36, 0, 0, 0, 35, 0, 0, 0, + 0, 0, 1, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 69, 5, 0, 0, 146, 0, 0, 0, + 65, 5, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 5, 0, 0, 3, 0, 1, 0, - 84, 5, 0, 0, 2, 0, 1, 0, - 24, 0, 0, 0, 8, 0, 0, 0, - 0, 0, 1, 0, 25, 0, 0, 0, + 68, 5, 0, 0, 3, 0, 1, 0, + 80, 5, 0, 0, 2, 0, 1, 0, + 37, 0, 0, 0, 40, 0, 0, 0, + 0, 0, 1, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 81, 5, 0, 0, 154, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 84, 5, 0, 0, 3, 0, 1, 0, - 96, 5, 0, 0, 2, 0, 1, 0, - 26, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 26, 46, 65, 127, 155, 179, 96, 177, - 93, 5, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 28, 0, 0, 0, 30, 0, 0, 0, - 0, 0, 1, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 73, 5, 0, 0, 138, 0, 0, 0, + 77, 5, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, 5, 0, 0, 3, 0, 1, 0, 88, 5, 0, 0, 2, 0, 1, 0, - 29, 0, 0, 0, 8, 0, 0, 0, - 0, 0, 1, 0, 35, 0, 0, 0, + 2, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 1, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 5, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 5, 0, 0, 3, 0, 1, 0, 100, 5, 0, 0, 2, 0, 1, 0, - 31, 0, 0, 0, 16, 0, 0, 0, - 0, 0, 1, 0, 36, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 97, 5, 0, 0, 154, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 100, 5, 0, 0, 3, 0, 1, 0, - 112, 5, 0, 0, 2, 0, 1, 0, - 33, 0, 0, 0, 9, 0, 0, 0, - 0, 0, 1, 0, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 109, 5, 0, 0, 234, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 116, 5, 0, 0, 3, 0, 1, 0, - 128, 5, 0, 0, 2, 0, 1, 0, - 34, 0, 0, 0, 10, 0, 0, 0, - 0, 0, 1, 0, 38, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 125, 5, 0, 0, 58, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 120, 5, 0, 0, 3, 0, 1, 0, - 132, 5, 0, 0, 2, 0, 1, 0, - 35, 0, 0, 0, 11, 0, 0, 0, - 0, 0, 1, 0, 41, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 129, 5, 0, 0, 98, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 128, 5, 0, 0, 3, 0, 1, 0, - 140, 5, 0, 0, 2, 0, 1, 0, - 37, 0, 0, 0, 34, 0, 0, 0, - 0, 0, 1, 0, 43, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 137, 5, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 140, 5, 0, 0, 3, 0, 1, 0, - 152, 5, 0, 0, 2, 0, 1, 0, - 38, 0, 0, 0, 11, 0, 0, 0, - 0, 0, 1, 0, 44, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 149, 5, 0, 0, 50, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 144, 5, 0, 0, 3, 0, 1, 0, - 172, 5, 0, 0, 2, 0, 1, 0, - 27, 0, 0, 0, 19, 0, 0, 0, - 0, 0, 1, 0, 47, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 169, 5, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 168, 5, 0, 0, 3, 0, 1, 0, - 180, 5, 0, 0, 2, 0, 1, 0, - 25, 0, 0, 0, 12, 0, 0, 0, - 0, 0, 1, 0, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 177, 5, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 176, 5, 0, 0, 3, 0, 1, 0, - 188, 5, 0, 0, 2, 0, 1, 0, - 40, 0, 0, 0, 35, 0, 0, 0, - 0, 0, 1, 0, 49, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 185, 5, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 188, 5, 0, 0, 3, 0, 1, 0, - 200, 5, 0, 0, 2, 0, 1, 0, - 41, 0, 0, 0, 40, 0, 0, 0, - 0, 0, 1, 0, 50, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 197, 5, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 196, 5, 0, 0, 3, 0, 1, 0, - 208, 5, 0, 0, 2, 0, 1, 0, - 2, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 1, 0, 55, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 205, 5, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 208, 5, 0, 0, 3, 0, 1, 0, - 220, 5, 0, 0, 2, 0, 1, 0, - 5, 0, 0, 0, 14, 0, 0, 0, - 0, 0, 1, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 217, 5, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 216, 5, 0, 0, 3, 0, 1, 0, - 228, 5, 0, 0, 2, 0, 1, 0, - 32, 0, 0, 0, 25, 0, 0, 0, + 28, 0, 0, 0, 25, 0, 0, 0, 0, 0, 1, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 225, 5, 0, 0, 210, 0, 0, 0, + 97, 5, 0, 0, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 232, 5, 0, 0, 3, 0, 1, 0, - 244, 5, 0, 0, 2, 0, 1, 0, - 30, 0, 0, 0, 27, 0, 0, 0, + 104, 5, 0, 0, 3, 0, 1, 0, + 116, 5, 0, 0, 2, 0, 1, 0, + 26, 0, 0, 0, 27, 0, 0, 0, 0, 0, 1, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 241, 5, 0, 0, 82, 0, 0, 0, + 113, 5, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 240, 5, 0, 0, 3, 0, 1, 0, - 252, 5, 0, 0, 2, 0, 1, 0, - 11, 0, 0, 0, 13, 0, 0, 0, + 112, 5, 0, 0, 3, 0, 1, 0, + 124, 5, 0, 0, 2, 0, 1, 0, + 10, 0, 0, 0, 13, 0, 0, 0, 0, 0, 1, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 249, 5, 0, 0, 114, 0, 0, 0, + 121, 5, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 248, 5, 0, 0, 3, 0, 1, 0, - 20, 6, 0, 0, 2, 0, 1, 0, - 42, 0, 0, 0, 29, 0, 0, 0, + 120, 5, 0, 0, 3, 0, 1, 0, + 148, 5, 0, 0, 2, 0, 1, 0, + 38, 0, 0, 0, 29, 0, 0, 0, 0, 0, 1, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 17, 6, 0, 0, 138, 0, 0, 0, + 145, 5, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 20, 6, 0, 0, 3, 0, 1, 0, - 32, 6, 0, 0, 2, 0, 1, 0, - 6, 0, 0, 0, 30, 0, 0, 0, + 148, 5, 0, 0, 3, 0, 1, 0, + 160, 5, 0, 0, 2, 0, 1, 0, + 5, 0, 0, 0, 30, 0, 0, 0, 0, 0, 1, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 6, 0, 0, 50, 0, 0, 0, + 157, 5, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 6, 0, 0, 3, 0, 1, 0, - 36, 6, 0, 0, 2, 0, 1, 0, - 12, 0, 0, 0, 41, 0, 0, 0, + 152, 5, 0, 0, 3, 0, 1, 0, + 164, 5, 0, 0, 2, 0, 1, 0, + 11, 0, 0, 0, 41, 0, 0, 0, 0, 0, 1, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 33, 6, 0, 0, 178, 0, 0, 0, + 161, 5, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 6, 0, 0, 3, 0, 1, 0, - 48, 6, 0, 0, 2, 0, 1, 0, + 164, 5, 0, 0, 3, 0, 1, 0, + 176, 5, 0, 0, 2, 0, 1, 0, 3, 0, 0, 0, 224, 3, 0, 0, 0, 0, 1, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 6, 0, 0, 58, 0, 0, 0, + 173, 5, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 40, 6, 0, 0, 3, 0, 1, 0, - 52, 6, 0, 0, 2, 0, 1, 0, - 13, 0, 0, 0, 32, 0, 0, 0, + 168, 5, 0, 0, 3, 0, 1, 0, + 180, 5, 0, 0, 2, 0, 1, 0, + 12, 0, 0, 0, 32, 0, 0, 0, 0, 0, 1, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 6, 0, 0, 130, 0, 0, 0, + 177, 5, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 6, 0, 0, 3, 0, 1, 0, - 60, 6, 0, 0, 2, 0, 1, 0, - 14, 0, 0, 0, 225, 3, 0, 0, + 176, 5, 0, 0, 3, 0, 1, 0, + 188, 5, 0, 0, 2, 0, 1, 0, + 13, 0, 0, 0, 225, 3, 0, 0, 0, 0, 1, 0, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 6, 0, 0, 114, 0, 0, 0, + 185, 5, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 56, 6, 0, 0, 3, 0, 1, 0, - 68, 6, 0, 0, 2, 0, 1, 0, - 7, 0, 0, 0, 227, 3, 0, 0, + 184, 5, 0, 0, 3, 0, 1, 0, + 196, 5, 0, 0, 2, 0, 1, 0, + 6, 0, 0, 0, 227, 3, 0, 0, 0, 0, 1, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 6, 0, 0, 218, 0, 0, 0, + 193, 5, 0, 0, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 6, 0, 0, 3, 0, 1, 0, - 84, 6, 0, 0, 2, 0, 1, 0, - 21, 0, 0, 0, 33, 0, 0, 0, + 200, 5, 0, 0, 3, 0, 1, 0, + 212, 5, 0, 0, 2, 0, 1, 0, + 18, 0, 0, 0, 33, 0, 0, 0, 0, 0, 1, 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 81, 6, 0, 0, 162, 0, 0, 0, + 209, 5, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 6, 0, 0, 3, 0, 1, 0, - 96, 6, 0, 0, 2, 0, 1, 0, - 36, 0, 0, 0, 228, 3, 0, 0, + 212, 5, 0, 0, 3, 0, 1, 0, + 224, 5, 0, 0, 2, 0, 1, 0, + 32, 0, 0, 0, 228, 3, 0, 0, 0, 0, 1, 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 6, 0, 0, 66, 0, 0, 0, + 221, 5, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 6, 0, 0, 3, 0, 1, 0, - 100, 6, 0, 0, 2, 0, 1, 0, - 39, 0, 0, 0, 34, 0, 0, 0, + 216, 5, 0, 0, 3, 0, 1, 0, + 228, 5, 0, 0, 2, 0, 1, 0, + 35, 0, 0, 0, 34, 0, 0, 0, 0, 0, 1, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 97, 6, 0, 0, 90, 0, 0, 0, + 225, 5, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 96, 6, 0, 0, 3, 0, 1, 0, - 108, 6, 0, 0, 2, 0, 1, 0, - 43, 0, 0, 0, 229, 3, 0, 0, + 224, 5, 0, 0, 3, 0, 1, 0, + 236, 5, 0, 0, 2, 0, 1, 0, + 39, 0, 0, 0, 229, 3, 0, 0, 0, 0, 1, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 105, 6, 0, 0, 114, 0, 0, 0, + 233, 5, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 104, 6, 0, 0, 3, 0, 1, 0, - 116, 6, 0, 0, 2, 0, 1, 0, - 44, 0, 0, 0, 230, 3, 0, 0, + 232, 5, 0, 0, 3, 0, 1, 0, + 244, 5, 0, 0, 2, 0, 1, 0, + 40, 0, 0, 0, 230, 3, 0, 0, 0, 0, 1, 0, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 113, 6, 0, 0, 146, 0, 0, 0, + 241, 5, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 6, 0, 0, 3, 0, 1, 0, - 128, 6, 0, 0, 2, 0, 1, 0, - 10, 0, 0, 0, 231, 3, 0, 0, + 244, 5, 0, 0, 3, 0, 1, 0, + 0, 6, 0, 0, 2, 0, 1, 0, + 9, 0, 0, 0, 231, 3, 0, 0, 0, 0, 1, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 6, 0, 0, 146, 0, 0, 0, + 253, 5, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 128, 6, 0, 0, 3, 0, 1, 0, - 140, 6, 0, 0, 2, 0, 1, 0, + 0, 6, 0, 0, 3, 0, 1, 0, + 12, 6, 0, 0, 2, 0, 1, 0, 98, 114, 97, 110, 100, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4684,14 +4656,6 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 109, 97, 115, 115, 0, 0, 0, 0, - 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 119, 104, 101, 101, 108, 98, 97, 115, 101, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, @@ -4719,18 +4683,10 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 115, 116, 101, 101, 114, 82, 97, 116, - 105, 111, 82, 101, 97, 114, 0, 0, - 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 114, 111, 116, 97, 116, 105, 111, 110, 97, 108, 73, 110, 101, 114, 116, 105, - 97, 0, 0, 0, 0, 0, 0, 0, + 97, 80, 101, 114, 77, 97, 115, 115, + 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4740,7 +4696,8 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 0, 0, 0, 0, 0, 0, 0, 0, 116, 105, 114, 101, 83, 116, 105, 102, 102, 110, 101, 115, 115, 70, 114, 111, - 110, 116, 0, 0, 0, 0, 0, 0, + 110, 116, 80, 101, 114, 77, 97, 115, + 115, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4750,7 +4707,8 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 0, 0, 0, 0, 0, 0, 0, 0, 116, 105, 114, 101, 83, 116, 105, 102, 102, 110, 101, 115, 115, 82, 101, 97, - 114, 0, 0, 0, 0, 0, 0, 0, + 114, 80, 101, 114, 77, 97, 115, 115, + 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4859,15 +4817,6 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 108, 97, 116, 101, 114, 97, 108, 80, - 97, 114, 97, 109, 115, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 163, 221, 137, 28, 59, 178, 129, 181, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 102, 105, 110, 103, 101, 114, 112, 114, 105, 110, 116, 83, 111, 117, 114, 99, 101, 0, 0, 0, 0, 0, 0, 0, @@ -4897,15 +4846,6 @@ static const ::capnp::_::AlignedData<825> b_8c69372490aaa9da = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101, 110, 97, 98, 108, 101, 66, 115, - 109, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 110, 103, 105, 116, 117, 100, 105, 110, 97, 108, 65, 99, 116, 117, 97, 116, 111, 114, 68, 101, 108, 97, @@ -5068,18 +5008,17 @@ static const ::capnp::_::RawSchema* const d_8c69372490aaa9da[] = { &s_90f70f9a151b94c1, &s_962b56180c9359ce, &s_9fd95523d8dc40ce, - &s_b160b39b7f412e1a, - &s_b581b23b1c89dda3, + &s_b31cca3bb740952a, &s_c342cefc303e9b8e, &s_d661512be2def77f, &s_e836349c6056b0c9, &s_ff99e3682a833c51, }; -static const uint16_t m_8c69372490aaa9da[] = {39, 35, 38, 0, 1, 23, 20, 8, 21, 2, 29, 26, 34, 28, 25, 15, 30, 14, 6, 37, 4, 5, 27, 36, 19, 41, 3, 42, 17, 11, 32, 44, 43, 18, 45, 16, 24, 9, 10, 31, 40, 12, 13, 22, 33, 7}; -static const uint16_t i_8c69372490aaa9da[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45}; +static const uint16_t m_8c69372490aaa9da[] = {35, 31, 34, 0, 1, 21, 18, 7, 19, 2, 23, 30, 25, 13, 26, 12, 33, 4, 5, 24, 32, 17, 37, 3, 38, 15, 9, 28, 40, 39, 16, 41, 14, 22, 8, 27, 36, 10, 11, 20, 29, 6}; +static const uint16_t i_8c69372490aaa9da[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41}; const ::capnp::_::RawSchema s_8c69372490aaa9da = { - 0x8c69372490aaa9da, b_8c69372490aaa9da.words, 825, d_8c69372490aaa9da, m_8c69372490aaa9da, - 10, 46, i_8c69372490aaa9da, nullptr, nullptr, { &s_8c69372490aaa9da, nullptr, nullptr, 0, 0, nullptr }, false + 0x8c69372490aaa9da, b_8c69372490aaa9da.words, 765, d_8c69372490aaa9da, m_8c69372490aaa9da, + 9, 42, i_8c69372490aaa9da, nullptr, nullptr, { &s_8c69372490aaa9da, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<60> b_e836349c6056b0c9 = { @@ -6315,7 +6254,7 @@ const ::capnp::_::RawSchema s_a1adf400915718e5 = { 0, 8, i_a1adf400915718e5, nullptr, nullptr, { &s_a1adf400915718e5, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<189> b_95551e5b1edaf451 = { +static const ::capnp::_::AlignedData<201> b_95551e5b1edaf451 = { { 0, 0, 0, 0, 5, 0, 6, 0, 81, 244, 218, 30, 91, 30, 85, 149, 20, 0, 0, 0, 2, 0, 0, 0, @@ -6325,7 +6264,7 @@ static const ::capnp::_::AlignedData<189> b_95551e5b1edaf451 = { 21, 0, 0, 0, 2, 1, 0, 0, 33, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 0, 127, 3, 0, 0, + 29, 0, 0, 0, 199, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 97, 114, 46, 99, 97, 112, 110, @@ -6333,117 +6272,126 @@ static const ::capnp::_::AlignedData<189> b_95551e5b1edaf451 = { 97, 109, 115, 46, 83, 97, 102, 101, 116, 121, 77, 111, 100, 101, 108, 0, 0, 0, 0, 0, 1, 0, 1, 0, - 148, 0, 0, 0, 1, 0, 2, 0, + 160, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 1, 0, 0, 58, 0, 0, 0, + 217, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 173, 1, 0, 0, 90, 0, 0, 0, + 209, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 169, 1, 0, 0, 58, 0, 0, 0, + 205, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 161, 1, 0, 0, 58, 0, 0, 0, + 197, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, - 153, 1, 0, 0, 26, 0, 0, 0, + 189, 1, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, - 145, 1, 0, 0, 146, 0, 0, 0, + 181, 1, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, - 145, 1, 0, 0, 42, 0, 0, 0, + 181, 1, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, - 137, 1, 0, 0, 74, 0, 0, 0, + 173, 1, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, - 133, 1, 0, 0, 66, 0, 0, 0, + 169, 1, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, - 125, 1, 0, 0, 74, 0, 0, 0, + 161, 1, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, - 121, 1, 0, 0, 50, 0, 0, 0, + 157, 1, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, - 113, 1, 0, 0, 58, 0, 0, 0, + 149, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 105, 1, 0, 0, 82, 0, 0, 0, + 141, 1, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, - 101, 1, 0, 0, 50, 0, 0, 0, + 137, 1, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, - 93, 1, 0, 0, 58, 0, 0, 0, + 129, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, - 85, 1, 0, 0, 90, 0, 0, 0, + 121, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 81, 1, 0, 0, 90, 0, 0, 0, + 117, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, - 77, 1, 0, 0, 82, 0, 0, 0, + 113, 1, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, - 73, 1, 0, 0, 58, 0, 0, 0, + 109, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 65, 1, 0, 0, 74, 0, 0, 0, + 101, 1, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, - 61, 1, 0, 0, 90, 0, 0, 0, + 97, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, - 57, 1, 0, 0, 106, 0, 0, 0, + 93, 1, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, - 53, 1, 0, 0, 130, 0, 0, 0, + 89, 1, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, - 49, 1, 0, 0, 114, 0, 0, 0, + 85, 1, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, - 45, 1, 0, 0, 138, 0, 0, 0, + 81, 1, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, - 45, 1, 0, 0, 114, 0, 0, 0, + 81, 1, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, - 41, 1, 0, 0, 58, 0, 0, 0, + 77, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, - 33, 1, 0, 0, 42, 0, 0, 0, + 69, 1, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, - 25, 1, 0, 0, 106, 0, 0, 0, + 61, 1, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 21, 1, 0, 0, 138, 0, 0, 0, + 57, 1, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, - 21, 1, 0, 0, 106, 0, 0, 0, + 57, 1, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, - 17, 1, 0, 0, 34, 0, 0, 0, + 53, 1, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 9, 1, 0, 0, 90, 0, 0, 0, + 45, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, - 5, 1, 0, 0, 58, 0, 0, 0, + 41, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, - 253, 0, 0, 0, 114, 0, 0, 0, + 33, 1, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, - 249, 0, 0, 0, 26, 0, 0, 0, + 29, 1, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, - 241, 0, 0, 0, 34, 0, 0, 0, + 21, 1, 0, 0, 50, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 37, 0, 0, 0, 0, 0, 0, 0, + 13, 1, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 38, 0, 0, 0, 0, 0, 0, 0, + 5, 1, 0, 0, 26, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 39, 0, 0, 0, 0, 0, 0, 0, + 253, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 105, 108, 101, 110, 116, 0, 0, 104, 111, 110, 100, 97, 78, 105, 100, @@ -6503,15 +6451,18 @@ static const ::capnp::_::AlignedData<189> b_95551e5b1edaf451 = { 114, 105, 118, 105, 97, 110, 0, 0, 118, 111, 108, 107, 115, 119, 97, 103, 101, 110, 77, 101, 98, 0, 0, 0, + 98, 121, 100, 0, 0, 0, 0, 0, + 118, 111, 108, 118, 111, 0, 0, 0, + 98, 109, 119, 0, 0, 0, 0, 0, 109, 103, 0, 0, 0, 0, 0, 0, 103, 119, 109, 0, 0, 0, 0, 0, } }; ::capnp::word const* const bp_95551e5b1edaf451 = b_95551e5b1edaf451.words; #if !CAPNP_LITE -static const uint16_t m_95551e5b1edaf451[] = {17, 27, 7, 9, 30, 3, 32, 6, 4, 18, 12, 36, 20, 5, 1, 26, 8, 28, 24, 23, 13, 35, 14, 19, 31, 33, 0, 11, 22, 10, 2, 16, 15, 34, 25, 29, 21}; +static const uint16_t m_95551e5b1edaf451[] = {17, 37, 27, 35, 7, 9, 30, 3, 32, 6, 4, 18, 12, 39, 20, 5, 1, 26, 8, 28, 24, 23, 13, 38, 14, 19, 31, 33, 0, 11, 22, 10, 2, 16, 15, 34, 25, 29, 21, 36}; const ::capnp::_::RawSchema s_95551e5b1edaf451 = { - 0x95551e5b1edaf451, b_95551e5b1edaf451.words, 189, nullptr, m_95551e5b1edaf451, - 0, 37, nullptr, nullptr, nullptr, { &s_95551e5b1edaf451, nullptr, nullptr, 0, 0, nullptr }, false + 0x95551e5b1edaf451, b_95551e5b1edaf451.words, 201, nullptr, m_95551e5b1edaf451, + 0, 40, nullptr, nullptr, nullptr, { &s_95551e5b1edaf451, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE CAPNP_DEFINE_ENUM(SafetyModel_95551e5b1edaf451, 95551e5b1edaf451); @@ -7021,7 +6972,7 @@ const ::capnp::_::RawSchema s_ff99e3682a833c51 = { }; #endif // !CAPNP_LITE CAPNP_DEFINE_ENUM(NetworkLocation_ff99e3682a833c51, ff99e3682a833c51); -static const ::capnp::_::AlignedData<530> b_90f70f9a151b94c1 = { +static const ::capnp::_::AlignedData<593> b_90f70f9a151b94c1 = { { 0, 0, 0, 0, 5, 0, 6, 0, 193, 148, 27, 21, 154, 15, 247, 144, 20, 0, 0, 0, 1, 0, 18, 0, @@ -7031,224 +6982,252 @@ static const ::capnp::_::AlignedData<530> b_90f70f9a151b94c1 = { 21, 0, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 25, 0, 0, 0, 151, 6, 0, 0, + 25, 0, 0, 0, 119, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 97, 114, 46, 99, 97, 112, 110, 112, 58, 67, 97, 114, 80, 97, 114, 97, 109, 115, 46, 100, 101, 112, 114, 101, 99, 97, 116, 101, 100, 0, 0, - 120, 0, 0, 0, 3, 0, 4, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 136, 0, 0, 0, 3, 0, 4, 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 3, 0, 0, 170, 0, 0, 0, + 169, 3, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 3, 0, 0, 3, 0, 1, 0, - 72, 3, 0, 0, 2, 0, 1, 0, - 1, 0, 0, 0, 2, 0, 0, 0, + 172, 3, 0, 0, 3, 0, 1, 0, + 184, 3, 0, 0, 2, 0, 1, 0, + 4, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 69, 3, 0, 0, 106, 0, 0, 0, + 181, 3, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 3, 0, 0, 3, 0, 1, 0, - 80, 3, 0, 0, 2, 0, 1, 0, - 24, 0, 0, 0, 3, 0, 0, 0, + 180, 3, 0, 0, 3, 0, 1, 0, + 192, 3, 0, 0, 2, 0, 1, 0, + 27, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 77, 3, 0, 0, 82, 0, 0, 0, + 189, 3, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76, 3, 0, 0, 3, 0, 1, 0, - 88, 3, 0, 0, 2, 0, 1, 0, - 2, 0, 0, 0, 4, 0, 0, 0, + 188, 3, 0, 0, 3, 0, 1, 0, + 200, 3, 0, 0, 2, 0, 1, 0, + 5, 0, 0, 0, 4, 0, 0, 0, 0, 0, 1, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 85, 3, 0, 0, 90, 0, 0, 0, + 197, 3, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 3, 0, 0, 3, 0, 1, 0, - 96, 3, 0, 0, 2, 0, 1, 0, - 8, 0, 0, 0, 1, 0, 0, 0, + 196, 3, 0, 0, 3, 0, 1, 0, + 208, 3, 0, 0, 2, 0, 1, 0, + 11, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 3, 0, 0, 98, 0, 0, 0, + 205, 3, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 92, 3, 0, 0, 3, 0, 1, 0, - 104, 3, 0, 0, 2, 0, 1, 0, - 7, 0, 0, 0, 6, 0, 0, 0, + 204, 3, 0, 0, 3, 0, 1, 0, + 216, 3, 0, 0, 2, 0, 1, 0, + 10, 0, 0, 0, 6, 0, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101, 3, 0, 0, 98, 0, 0, 0, + 213, 3, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 100, 3, 0, 0, 3, 0, 1, 0, - 112, 3, 0, 0, 2, 0, 1, 0, - 13, 0, 0, 0, 2, 0, 0, 0, + 212, 3, 0, 0, 3, 0, 1, 0, + 224, 3, 0, 0, 2, 0, 1, 0, + 16, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 109, 3, 0, 0, 90, 0, 0, 0, + 221, 3, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 108, 3, 0, 0, 3, 0, 1, 0, - 136, 3, 0, 0, 2, 0, 1, 0, - 14, 0, 0, 0, 3, 0, 0, 0, + 220, 3, 0, 0, 3, 0, 1, 0, + 248, 3, 0, 0, 2, 0, 1, 0, + 17, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 3, 0, 0, 82, 0, 0, 0, + 245, 3, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 3, 0, 0, 3, 0, 1, 0, - 160, 3, 0, 0, 2, 0, 1, 0, - 15, 0, 0, 0, 4, 0, 0, 0, + 244, 3, 0, 0, 3, 0, 1, 0, + 16, 4, 0, 0, 2, 0, 1, 0, + 18, 0, 0, 0, 4, 0, 0, 0, 0, 0, 1, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 3, 0, 0, 74, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 156, 3, 0, 0, 3, 0, 1, 0, - 184, 3, 0, 0, 2, 0, 1, 0, - 16, 0, 0, 0, 5, 0, 0, 0, - 0, 0, 1, 0, 14, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 181, 3, 0, 0, 66, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 176, 3, 0, 0, 3, 0, 1, 0, - 204, 3, 0, 0, 2, 0, 1, 0, - 17, 0, 0, 0, 6, 0, 0, 0, - 0, 0, 1, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 201, 3, 0, 0, 90, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 200, 3, 0, 0, 3, 0, 1, 0, - 228, 3, 0, 0, 2, 0, 1, 0, - 18, 0, 0, 0, 7, 0, 0, 0, - 0, 0, 1, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 225, 3, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 224, 3, 0, 0, 3, 0, 1, 0, - 252, 3, 0, 0, 2, 0, 1, 0, - 3, 0, 0, 0, 5, 0, 0, 0, - 0, 0, 1, 0, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 249, 3, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 248, 3, 0, 0, 3, 0, 1, 0, - 4, 4, 0, 0, 2, 0, 1, 0, - 28, 0, 0, 0, 12, 0, 0, 0, - 0, 0, 1, 0, 29, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 4, 0, 0, 106, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 3, 0, 1, 0, - 12, 4, 0, 0, 2, 0, 1, 0, - 19, 0, 0, 0, 6, 0, 0, 0, - 0, 0, 1, 0, 30, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 9, 4, 0, 0, 154, 0, 0, 0, + 13, 4, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 4, 0, 0, 3, 0, 1, 0, - 24, 4, 0, 0, 2, 0, 1, 0, - 22, 0, 0, 0, 7, 0, 0, 0, - 0, 0, 1, 0, 31, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 21, 4, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 20, 4, 0, 0, 3, 0, 1, 0, - 32, 4, 0, 0, 2, 0, 1, 0, - 26, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 1, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 29, 4, 0, 0, 90, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 28, 4, 0, 0, 3, 0, 1, 0, 40, 4, 0, 0, 2, 0, 1, 0, - 4, 0, 0, 0, 14, 0, 0, 0, - 0, 0, 1, 0, 33, 0, 0, 0, + 19, 0, 0, 0, 5, 0, 0, 0, + 0, 0, 1, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 4, 0, 0, 114, 0, 0, 0, + 37, 4, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 4, 0, 0, 3, 0, 1, 0, - 48, 4, 0, 0, 2, 0, 1, 0, - 5, 0, 0, 0, 10, 0, 0, 0, - 0, 0, 1, 0, 39, 0, 0, 0, + 32, 4, 0, 0, 3, 0, 1, 0, + 60, 4, 0, 0, 2, 0, 1, 0, + 20, 0, 0, 0, 6, 0, 0, 0, + 0, 0, 1, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 4, 0, 0, 106, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 44, 4, 0, 0, 3, 0, 1, 0, - 56, 4, 0, 0, 2, 0, 1, 0, - 9, 0, 0, 0, 31, 0, 0, 0, - 0, 0, 1, 0, 42, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 53, 4, 0, 0, 154, 0, 0, 0, + 57, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 4, 0, 0, 3, 0, 1, 0, - 68, 4, 0, 0, 2, 0, 1, 0, - 23, 0, 0, 0, 18, 0, 0, 0, - 0, 0, 1, 0, 45, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 65, 4, 0, 0, 114, 0, 0, 0, + 84, 4, 0, 0, 2, 0, 1, 0, + 21, 0, 0, 0, 7, 0, 0, 0, + 0, 0, 1, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 4, 0, 0, 3, 0, 1, 0, - 76, 4, 0, 0, 2, 0, 1, 0, - 11, 0, 0, 0, 12, 0, 0, 0, - 0, 0, 1, 0, 46, 0, 0, 0, + 81, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 4, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 76, 4, 0, 0, 3, 0, 1, 0, - 88, 4, 0, 0, 2, 0, 1, 0, - 10, 0, 0, 0, 21, 0, 0, 0, - 0, 0, 1, 0, 51, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 85, 4, 0, 0, 98, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 84, 4, 0, 0, 3, 0, 1, 0, - 96, 4, 0, 0, 2, 0, 1, 0, - 29, 0, 0, 0, 22, 0, 0, 0, - 0, 0, 1, 0, 52, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 93, 4, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 96, 4, 0, 0, 3, 0, 1, 0, + 80, 4, 0, 0, 3, 0, 1, 0, 108, 4, 0, 0, 2, 0, 1, 0, - 12, 0, 0, 0, 23, 0, 0, 0, - 0, 0, 1, 0, 53, 0, 0, 0, + 0, 0, 0, 0, 4, 0, 0, 0, + 0, 0, 1, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 105, 4, 0, 0, 146, 0, 0, 0, + 105, 4, 0, 0, 42, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 100, 4, 0, 0, 3, 0, 1, 0, + 112, 4, 0, 0, 2, 0, 1, 0, + 1, 0, 0, 0, 8, 0, 0, 0, + 0, 0, 1, 0, 21, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 109, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 4, 0, 0, 3, 0, 1, 0, 120, 4, 0, 0, 2, 0, 1, 0, - 20, 0, 0, 0, 24, 0, 0, 0, - 0, 0, 1, 0, 54, 0, 0, 0, + 6, 0, 0, 0, 5, 0, 0, 0, + 0, 0, 1, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 117, 4, 0, 0, 162, 0, 0, 0, + 117, 4, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 120, 4, 0, 0, 3, 0, 1, 0, - 132, 4, 0, 0, 2, 0, 1, 0, - 6, 0, 0, 0, 15, 0, 0, 0, - 0, 0, 1, 0, 57, 0, 0, 0, + 116, 4, 0, 0, 3, 0, 1, 0, + 128, 4, 0, 0, 2, 0, 1, 0, + 32, 0, 0, 0, 12, 0, 0, 0, + 0, 0, 1, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 129, 4, 0, 0, 122, 0, 0, 0, + 125, 4, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 128, 4, 0, 0, 3, 0, 1, 0, - 140, 4, 0, 0, 2, 0, 1, 0, - 25, 0, 0, 0, 26, 0, 0, 0, - 0, 0, 1, 0, 59, 0, 0, 0, + 124, 4, 0, 0, 3, 0, 1, 0, + 136, 4, 0, 0, 2, 0, 1, 0, + 22, 0, 0, 0, 6, 0, 0, 0, + 0, 0, 1, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 106, 0, 0, 0, + 133, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 136, 4, 0, 0, 3, 0, 1, 0, 148, 4, 0, 0, 2, 0, 1, 0, - 21, 0, 0, 0, 28, 0, 0, 0, + 25, 0, 0, 0, 7, 0, 0, 0, + 0, 0, 1, 0, 31, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 145, 4, 0, 0, 130, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 144, 4, 0, 0, 3, 0, 1, 0, + 156, 4, 0, 0, 2, 0, 1, 0, + 30, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 1, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 153, 4, 0, 0, 90, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 152, 4, 0, 0, 3, 0, 1, 0, + 164, 4, 0, 0, 2, 0, 1, 0, + 7, 0, 0, 0, 14, 0, 0, 0, + 0, 0, 1, 0, 33, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 161, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 160, 4, 0, 0, 3, 0, 1, 0, + 172, 4, 0, 0, 2, 0, 1, 0, + 8, 0, 0, 0, 10, 0, 0, 0, + 0, 0, 1, 0, 39, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 169, 4, 0, 0, 106, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 168, 4, 0, 0, 3, 0, 1, 0, + 180, 4, 0, 0, 2, 0, 1, 0, + 12, 0, 0, 0, 31, 0, 0, 0, + 0, 0, 1, 0, 42, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 177, 4, 0, 0, 154, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 180, 4, 0, 0, 3, 0, 1, 0, + 192, 4, 0, 0, 2, 0, 1, 0, + 26, 0, 0, 0, 18, 0, 0, 0, + 0, 0, 1, 0, 45, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 189, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 188, 4, 0, 0, 3, 0, 1, 0, + 200, 4, 0, 0, 2, 0, 1, 0, + 14, 0, 0, 0, 12, 0, 0, 0, + 0, 0, 1, 0, 46, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 197, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 200, 4, 0, 0, 3, 0, 1, 0, + 212, 4, 0, 0, 2, 0, 1, 0, + 2, 0, 0, 0, 12, 0, 0, 0, + 0, 0, 1, 0, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 209, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 208, 4, 0, 0, 3, 0, 1, 0, + 220, 4, 0, 0, 2, 0, 1, 0, + 13, 0, 0, 0, 21, 0, 0, 0, + 0, 0, 1, 0, 51, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 217, 4, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 216, 4, 0, 0, 3, 0, 1, 0, + 228, 4, 0, 0, 2, 0, 1, 0, + 33, 0, 0, 0, 22, 0, 0, 0, + 0, 0, 1, 0, 52, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 225, 4, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 228, 4, 0, 0, 3, 0, 1, 0, + 240, 4, 0, 0, 2, 0, 1, 0, + 15, 0, 0, 0, 23, 0, 0, 0, + 0, 0, 1, 0, 53, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 237, 4, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 240, 4, 0, 0, 3, 0, 1, 0, + 252, 4, 0, 0, 2, 0, 1, 0, + 23, 0, 0, 0, 24, 0, 0, 0, + 0, 0, 1, 0, 54, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 249, 4, 0, 0, 162, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 252, 4, 0, 0, 3, 0, 1, 0, + 8, 5, 0, 0, 2, 0, 1, 0, + 28, 0, 0, 0, 14, 0, 0, 0, + 0, 0, 1, 0, 56, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 5, 5, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 4, 5, 0, 0, 3, 0, 1, 0, + 16, 5, 0, 0, 2, 0, 1, 0, + 9, 0, 0, 0, 15, 0, 0, 0, + 0, 0, 1, 0, 57, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 13, 5, 0, 0, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 12, 5, 0, 0, 3, 0, 1, 0, + 24, 5, 0, 0, 2, 0, 1, 0, + 29, 0, 0, 0, 26, 0, 0, 0, + 0, 0, 1, 0, 59, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 21, 5, 0, 0, 106, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 20, 5, 0, 0, 3, 0, 1, 0, + 32, 5, 0, 0, 2, 0, 1, 0, + 24, 0, 0, 0, 28, 0, 0, 0, 0, 0, 1, 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 145, 4, 0, 0, 34, 1, 0, 0, + 29, 5, 0, 0, 34, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 156, 4, 0, 0, 3, 0, 1, 0, - 168, 4, 0, 0, 2, 0, 1, 0, - 27, 0, 0, 0, 226, 3, 0, 0, + 40, 5, 0, 0, 3, 0, 1, 0, + 52, 5, 0, 0, 2, 0, 1, 0, + 31, 0, 0, 0, 226, 3, 0, 0, 0, 0, 1, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 165, 4, 0, 0, 114, 0, 0, 0, + 49, 5, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 164, 4, 0, 0, 3, 0, 1, 0, - 176, 4, 0, 0, 2, 0, 1, 0, + 48, 5, 0, 0, 3, 0, 1, 0, + 60, 5, 0, 0, 2, 0, 1, 0, 101, 110, 97, 98, 108, 101, 71, 97, 115, 73, 110, 116, 101, 114, 99, 101, 112, 116, 111, 114, 0, 0, 0, 0, @@ -7381,6 +7360,23 @@ static const ::capnp::_::AlignedData<530> b_90f70f9a151b94c1 = { 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 109, 97, 115, 115, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 115, 116, 101, 101, 114, 82, 97, 116, + 105, 111, 82, 101, 97, 114, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 115, 116, 101, 101, 114, 76, 105, 109, 105, 116, 65, 108, 101, 114, 116, 0, 1, 0, 0, 0, 0, 0, 0, 0, @@ -7474,6 +7470,15 @@ static const ::capnp::_::AlignedData<530> b_90f70f9a151b94c1 = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 108, 97, 116, 101, 114, 97, 108, 80, + 97, 114, 97, 109, 115, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 163, 221, 137, 28, 59, 178, 129, 181, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 109, 105, 110, 83, 112, 101, 101, 100, 67, 97, 110, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, @@ -7513,6 +7518,15 @@ static const ::capnp::_::AlignedData<530> b_90f70f9a151b94c1 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 101, 110, 97, 98, 108, 101, 66, 115, + 109, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 104, 97, 115, 83, 116, 111, 99, 107, 67, 97, 109, 101, 114, 97, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, @@ -7558,17 +7572,18 @@ static const ::capnp::_::AlignedData<530> b_90f70f9a151b94c1 = { static const ::capnp::_::RawSchema* const d_90f70f9a151b94c1[] = { &s_8c69372490aaa9da, &s_95551e5b1edaf451, + &s_b581b23b1c89dda3, }; -static const uint16_t m_90f70f9a151b94c1[] = {10, 11, 21, 14, 3, 1, 2, 0, 8, 9, 26, 18, 28, 25, 22, 20, 4, 19, 5, 16, 24, 29, 12, 6, 7, 17, 15, 23, 27, 13}; -static const uint16_t i_90f70f9a151b94c1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}; +static const uint16_t m_90f70f9a151b94c1[] = {10, 11, 23, 16, 3, 29, 1, 2, 0, 8, 9, 30, 20, 24, 32, 12, 28, 25, 22, 4, 21, 5, 18, 27, 33, 14, 6, 7, 19, 13, 17, 26, 31, 15}; +static const uint16_t i_90f70f9a151b94c1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33}; const ::capnp::_::RawSchema s_90f70f9a151b94c1 = { - 0x90f70f9a151b94c1, b_90f70f9a151b94c1.words, 530, d_90f70f9a151b94c1, m_90f70f9a151b94c1, - 2, 30, i_90f70f9a151b94c1, nullptr, nullptr, { &s_90f70f9a151b94c1, nullptr, nullptr, 0, 0, nullptr }, false + 0x90f70f9a151b94c1, b_90f70f9a151b94c1.words, 593, d_90f70f9a151b94c1, m_90f70f9a151b94c1, + 3, 34, i_90f70f9a151b94c1, nullptr, nullptr, { &s_90f70f9a151b94c1, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<80> b_b160b39b7f412e1a = { +static const ::capnp::_::AlignedData<80> b_b31cca3bb740952a = { { 0, 0, 0, 0, 5, 0, 6, 0, - 26, 46, 65, 127, 155, 179, 96, 177, + 42, 149, 64, 183, 59, 202, 28, 179, 20, 0, 0, 0, 1, 0, 18, 0, 218, 169, 170, 144, 36, 55, 105, 140, 14, 0, 7, 0, 1, 0, 4, 0, @@ -7648,20 +7663,20 @@ static const ::capnp::_::AlignedData<80> b_b160b39b7f412e1a = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, } }; -::capnp::word const* const bp_b160b39b7f412e1a = b_b160b39b7f412e1a.words; +::capnp::word const* const bp_b31cca3bb740952a = b_b31cca3bb740952a.words; #if !CAPNP_LITE -static const ::capnp::_::RawSchema* const d_b160b39b7f412e1a[] = { +static const ::capnp::_::RawSchema* const d_b31cca3bb740952a[] = { &s_80366e0e804ecc1d, &s_8c69372490aaa9da, &s_9622723fcbd14c2e, &s_a1adf400915718e5, &s_caa441291b152efd, }; -static const uint16_t m_b160b39b7f412e1a[] = {1, 2, 0, 3}; -static const uint16_t i_b160b39b7f412e1a[] = {0, 1, 2, 3}; -const ::capnp::_::RawSchema s_b160b39b7f412e1a = { - 0xb160b39b7f412e1a, b_b160b39b7f412e1a.words, 80, d_b160b39b7f412e1a, m_b160b39b7f412e1a, - 5, 4, i_b160b39b7f412e1a, nullptr, nullptr, { &s_b160b39b7f412e1a, nullptr, nullptr, 0, 0, nullptr }, false +static const uint16_t m_b31cca3bb740952a[] = {1, 2, 0, 3}; +static const uint16_t i_b31cca3bb740952a[] = {0, 1, 2, 3}; +const ::capnp::_::RawSchema s_b31cca3bb740952a = { + 0xb31cca3bb740952a, b_b31cca3bb740952a.words, 80, d_b31cca3bb740952a, m_b31cca3bb740952a, + 5, 4, i_b31cca3bb740952a, nullptr, nullptr, { &s_b31cca3bb740952a, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE } // namespace schemas diff --git a/openpilot/cereal/gen/cpp/car.capnp.h b/openpilot/cereal/gen/cpp/car.capnp.h index 1f98ded10..3fcf4b754 100644 --- a/openpilot/cereal/gen/cpp/car.capnp.h +++ b/openpilot/cereal/gen/cpp/car.capnp.h @@ -286,6 +286,9 @@ enum class SafetyModel_95551e5b1edaf451: uint16_t { FCA_GIORGIO, RIVIAN, VOLKSWAGEN_MEB, + BYD, + VOLVO, + BMW, MG, GWM, }; @@ -350,7 +353,7 @@ enum class NetworkLocation_ff99e3682a833c51: uint16_t { }; CAPNP_DECLARE_ENUM(NetworkLocation, ff99e3682a833c51); CAPNP_DECLARE_SCHEMA(90f70f9a151b94c1); -CAPNP_DECLARE_SCHEMA(b160b39b7f412e1a); +CAPNP_DECLARE_SCHEMA(b31cca3bb740952a); } // namespace schemas } // namespace capnp @@ -920,7 +923,7 @@ struct CarParams::LateralTuning { }; struct _capnpPrivate { - CAPNP_DECLARE_STRUCT_HEADER(b160b39b7f412e1a, 18, 14) + CAPNP_DECLARE_STRUCT_HEADER(b31cca3bb740952a, 18, 14) #if !CAPNP_LITE static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; } #endif // !CAPNP_LITE @@ -3174,21 +3177,17 @@ public: inline float getMinSteerSpeed() const; - inline float getMass() const; - inline float getWheelbase() const; inline float getCenterToFront() const; inline float getSteerRatio() const; - inline float getSteerRatioRear() const; + inline float getRotationalInertiaPerMass() const; - inline float getRotationalInertia() const; + inline float getTireStiffnessFrontPerMass() const; - inline float getTireStiffnessFront() const; - - inline float getTireStiffnessRear() const; + inline float getTireStiffnessRearPerMass() const; inline bool hasLongitudinalTuning() const; inline ::cereal::CarParams::LongitudinalPIDTuning::Reader getLongitudinalTuning() const; @@ -3215,17 +3214,12 @@ public: inline float getSteerLimitTimer() const; - inline bool hasLateralParams() const; - inline ::cereal::CarParams::LateralParams::Reader getLateralParams() const; - inline ::cereal::CarParams::FingerprintSource getFingerprintSource() const; inline ::cereal::CarParams::NetworkLocation getNetworkLocation() const; inline bool getFuzzyFingerprint() const; - inline bool getEnableBsm() const; - inline float getLongitudinalActuatorDelay() const; inline float getStopAccel() const; @@ -3313,9 +3307,6 @@ public: inline float getMinSteerSpeed(); inline void setMinSteerSpeed(float value); - inline float getMass(); - inline void setMass(float value); - inline float getWheelbase(); inline void setWheelbase(float value); @@ -3325,17 +3316,14 @@ public: inline float getSteerRatio(); inline void setSteerRatio(float value); - inline float getSteerRatioRear(); - inline void setSteerRatioRear(float value); + inline float getRotationalInertiaPerMass(); + inline void setRotationalInertiaPerMass(float value); - inline float getRotationalInertia(); - inline void setRotationalInertia(float value); + inline float getTireStiffnessFrontPerMass(); + inline void setTireStiffnessFrontPerMass(float value); - inline float getTireStiffnessFront(); - inline void setTireStiffnessFront(float value); - - inline float getTireStiffnessRear(); - inline void setTireStiffnessRear(float value); + inline float getTireStiffnessRearPerMass(); + inline void setTireStiffnessRearPerMass(float value); inline bool hasLongitudinalTuning(); inline ::cereal::CarParams::LongitudinalPIDTuning::Builder getLongitudinalTuning(); @@ -3382,13 +3370,6 @@ public: inline float getSteerLimitTimer(); inline void setSteerLimitTimer(float value); - inline bool hasLateralParams(); - inline ::cereal::CarParams::LateralParams::Builder getLateralParams(); - inline void setLateralParams( ::cereal::CarParams::LateralParams::Reader value); - inline ::cereal::CarParams::LateralParams::Builder initLateralParams(); - inline void adoptLateralParams(::capnp::Orphan< ::cereal::CarParams::LateralParams>&& value); - inline ::capnp::Orphan< ::cereal::CarParams::LateralParams> disownLateralParams(); - inline ::cereal::CarParams::FingerprintSource getFingerprintSource(); inline void setFingerprintSource( ::cereal::CarParams::FingerprintSource value); @@ -3398,9 +3379,6 @@ public: inline bool getFuzzyFingerprint(); inline void setFuzzyFingerprint(bool value); - inline bool getEnableBsm(); - inline void setEnableBsm(bool value); - inline float getLongitudinalActuatorDelay(); inline void setLongitudinalActuatorDelay(float value); @@ -3474,7 +3452,6 @@ public: inline typename Deprecated::Pipeline getDeprecated(); inline ::cereal::CarParams::LongitudinalPIDTuning::Pipeline getLongitudinalTuning(); inline typename LateralTuning::Pipeline getLateralTuning(); - inline ::cereal::CarParams::LateralParams::Pipeline getLateralParams(); private: ::capnp::AnyPointer::Pipeline _typeless; friend class ::capnp::PipelineHook; @@ -4857,6 +4834,10 @@ public: inline bool hasBrakeMaxV() const; inline ::capnp::List::Reader getBrakeMaxV() const; + inline float getMass() const; + + inline float getSteerRatioRear() const; + inline bool getSteerLimitAlert() const; inline float getVEgoStopping() const; @@ -4877,6 +4858,9 @@ public: inline bool getCommunityFeature() const; + inline bool hasLateralParams() const; + inline ::cereal::CarParams::LateralParams::Reader getLateralParams() const; + inline float getMinSpeedCan() const; inline float getStoppingDecelRate() const; @@ -4885,6 +4869,8 @@ public: inline float getMaxSteeringAngleDeg() const; + inline bool getEnableBsm() const; + inline bool getHasStockCamera() const; inline float getVEgoStarting() const; @@ -4987,6 +4973,12 @@ public: inline void adoptBrakeMaxV(::capnp::Orphan< ::capnp::List>&& value); inline ::capnp::Orphan< ::capnp::List> disownBrakeMaxV(); + inline float getMass(); + inline void setMass(float value); + + inline float getSteerRatioRear(); + inline void setSteerRatioRear(float value); + inline bool getSteerLimitAlert(); inline void setSteerLimitAlert(bool value); @@ -5017,6 +5009,13 @@ public: inline bool getCommunityFeature(); inline void setCommunityFeature(bool value); + inline bool hasLateralParams(); + inline ::cereal::CarParams::LateralParams::Builder getLateralParams(); + inline void setLateralParams( ::cereal::CarParams::LateralParams::Reader value); + inline ::cereal::CarParams::LateralParams::Builder initLateralParams(); + inline void adoptLateralParams(::capnp::Orphan< ::cereal::CarParams::LateralParams>&& value); + inline ::capnp::Orphan< ::cereal::CarParams::LateralParams> disownLateralParams(); + inline float getMinSpeedCan(); inline void setMinSpeedCan(float value); @@ -5029,6 +5028,9 @@ public: inline float getMaxSteeringAngleDeg(); inline void setMaxSteeringAngleDeg(float value); + inline bool getEnableBsm(); + inline void setEnableBsm(bool value); + inline bool getHasStockCamera(); inline void setHasStockCamera(bool value); @@ -5059,6 +5061,7 @@ public: inline explicit Pipeline(::capnp::AnyPointer::Pipeline&& typeless) : _typeless(kj::mv(typeless)) {} + inline ::cereal::CarParams::LateralParams::Pipeline getLateralParams(); private: ::capnp::AnyPointer::Pipeline _typeless; friend class ::capnp::PipelineHook; @@ -7836,9 +7839,12 @@ inline typename CarParams::Deprecated::Builder CarParams::Builder::initDeprecate _builder.setDataField(::capnp::bounded<7>() * ::capnp::ELEMENTS, 0); _builder.setDataField(::capnp::bounded<10>() * ::capnp::ELEMENTS, 0); _builder.setDataField(::capnp::bounded<12>() * ::capnp::ELEMENTS, 0); + _builder.setDataField(::capnp::bounded<14>() * ::capnp::ELEMENTS, 0); _builder.setDataField(::capnp::bounded<15>() * ::capnp::ELEMENTS, 0); _builder.setDataField< ::uint16_t>(::capnp::bounded<1>() * ::capnp::ELEMENTS, 0); _builder.setDataField< ::uint16_t>(::capnp::bounded<6>() * ::capnp::ELEMENTS, 0); + _builder.setDataField< ::uint32_t>(::capnp::bounded<4>() * ::capnp::ELEMENTS, 0); + _builder.setDataField< ::uint32_t>(::capnp::bounded<8>() * ::capnp::ELEMENTS, 0); _builder.setDataField< ::uint32_t>(::capnp::bounded<12>() * ::capnp::ELEMENTS, 0); _builder.setDataField< ::uint32_t>(::capnp::bounded<13>() * ::capnp::ELEMENTS, 0); _builder.setDataField< ::uint32_t>(::capnp::bounded<14>() * ::capnp::ELEMENTS, 0); @@ -7857,6 +7863,7 @@ inline typename CarParams::Deprecated::Builder CarParams::Builder::initDeprecate _builder.getPointerField(::capnp::bounded<5>() * ::capnp::POINTERS).clear(); _builder.getPointerField(::capnp::bounded<6>() * ::capnp::POINTERS).clear(); _builder.getPointerField(::capnp::bounded<7>() * ::capnp::POINTERS).clear(); + _builder.getPointerField(::capnp::bounded<12>() * ::capnp::POINTERS).clear(); return typename CarParams::Deprecated::Builder(_builder); } inline bool CarParams::Reader::getPcmCruise() const { @@ -7901,20 +7908,6 @@ inline void CarParams::Builder::setMinSteerSpeed(float value) { ::capnp::bounded<2>() * ::capnp::ELEMENTS, value); } -inline float CarParams::Reader::getMass() const { - return _reader.getDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS); -} - -inline float CarParams::Builder::getMass() { - return _builder.getDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS); -} -inline void CarParams::Builder::setMass(float value) { - _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, value); -} - inline float CarParams::Reader::getWheelbase() const { return _reader.getDataField( ::capnp::bounded<5>() * ::capnp::ELEMENTS); @@ -7957,58 +7950,44 @@ inline void CarParams::Builder::setSteerRatio(float value) { ::capnp::bounded<7>() * ::capnp::ELEMENTS, value); } -inline float CarParams::Reader::getSteerRatioRear() const { - return _reader.getDataField( - ::capnp::bounded<8>() * ::capnp::ELEMENTS); -} - -inline float CarParams::Builder::getSteerRatioRear() { - return _builder.getDataField( - ::capnp::bounded<8>() * ::capnp::ELEMENTS); -} -inline void CarParams::Builder::setSteerRatioRear(float value) { - _builder.setDataField( - ::capnp::bounded<8>() * ::capnp::ELEMENTS, value); -} - -inline float CarParams::Reader::getRotationalInertia() const { +inline float CarParams::Reader::getRotationalInertiaPerMass() const { return _reader.getDataField( ::capnp::bounded<9>() * ::capnp::ELEMENTS); } -inline float CarParams::Builder::getRotationalInertia() { +inline float CarParams::Builder::getRotationalInertiaPerMass() { return _builder.getDataField( ::capnp::bounded<9>() * ::capnp::ELEMENTS); } -inline void CarParams::Builder::setRotationalInertia(float value) { +inline void CarParams::Builder::setRotationalInertiaPerMass(float value) { _builder.setDataField( ::capnp::bounded<9>() * ::capnp::ELEMENTS, value); } -inline float CarParams::Reader::getTireStiffnessFront() const { +inline float CarParams::Reader::getTireStiffnessFrontPerMass() const { return _reader.getDataField( ::capnp::bounded<10>() * ::capnp::ELEMENTS); } -inline float CarParams::Builder::getTireStiffnessFront() { +inline float CarParams::Builder::getTireStiffnessFrontPerMass() { return _builder.getDataField( ::capnp::bounded<10>() * ::capnp::ELEMENTS); } -inline void CarParams::Builder::setTireStiffnessFront(float value) { +inline void CarParams::Builder::setTireStiffnessFrontPerMass(float value) { _builder.setDataField( ::capnp::bounded<10>() * ::capnp::ELEMENTS, value); } -inline float CarParams::Reader::getTireStiffnessRear() const { +inline float CarParams::Reader::getTireStiffnessRearPerMass() const { return _reader.getDataField( ::capnp::bounded<11>() * ::capnp::ELEMENTS); } -inline float CarParams::Builder::getTireStiffnessRear() { +inline float CarParams::Builder::getTireStiffnessRearPerMass() { return _builder.getDataField( ::capnp::bounded<11>() * ::capnp::ELEMENTS); } -inline void CarParams::Builder::setTireStiffnessRear(float value) { +inline void CarParams::Builder::setTireStiffnessRearPerMass(float value) { _builder.setDataField( ::capnp::bounded<11>() * ::capnp::ELEMENTS, value); } @@ -8234,45 +8213,6 @@ inline void CarParams::Builder::setSteerLimitTimer(float value) { ::capnp::bounded<19>() * ::capnp::ELEMENTS, value); } -inline bool CarParams::Reader::hasLateralParams() const { - return !_reader.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS).isNull(); -} -inline bool CarParams::Builder::hasLateralParams() { - return !_builder.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS).isNull(); -} -inline ::cereal::CarParams::LateralParams::Reader CarParams::Reader::getLateralParams() const { - return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::get(_reader.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS)); -} -inline ::cereal::CarParams::LateralParams::Builder CarParams::Builder::getLateralParams() { - return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::get(_builder.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS)); -} -#if !CAPNP_LITE -inline ::cereal::CarParams::LateralParams::Pipeline CarParams::Pipeline::getLateralParams() { - return ::cereal::CarParams::LateralParams::Pipeline(_typeless.getPointerField(12)); -} -#endif // !CAPNP_LITE -inline void CarParams::Builder::setLateralParams( ::cereal::CarParams::LateralParams::Reader value) { - ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::set(_builder.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS), value); -} -inline ::cereal::CarParams::LateralParams::Builder CarParams::Builder::initLateralParams() { - return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::init(_builder.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS)); -} -inline void CarParams::Builder::adoptLateralParams( - ::capnp::Orphan< ::cereal::CarParams::LateralParams>&& value) { - ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::adopt(_builder.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS), kj::mv(value)); -} -inline ::capnp::Orphan< ::cereal::CarParams::LateralParams> CarParams::Builder::disownLateralParams() { - return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::disown(_builder.getPointerField( - ::capnp::bounded<12>() * ::capnp::POINTERS)); -} - inline ::cereal::CarParams::FingerprintSource CarParams::Reader::getFingerprintSource() const { return _reader.getDataField< ::cereal::CarParams::FingerprintSource>( ::capnp::bounded<35>() * ::capnp::ELEMENTS); @@ -8315,20 +8255,6 @@ inline void CarParams::Builder::setFuzzyFingerprint(bool value) { ::capnp::bounded<13>() * ::capnp::ELEMENTS, value); } -inline bool CarParams::Reader::getEnableBsm() const { - return _reader.getDataField( - ::capnp::bounded<14>() * ::capnp::ELEMENTS); -} - -inline bool CarParams::Builder::getEnableBsm() { - return _builder.getDataField( - ::capnp::bounded<14>() * ::capnp::ELEMENTS); -} -inline void CarParams::Builder::setEnableBsm(bool value) { - _builder.setDataField( - ::capnp::bounded<14>() * ::capnp::ELEMENTS, value); -} - inline float CarParams::Reader::getLongitudinalActuatorDelay() const { return _reader.getDataField( ::capnp::bounded<25>() * ::capnp::ELEMENTS); @@ -10417,6 +10343,34 @@ inline ::capnp::Orphan< ::capnp::List> CarPara ::capnp::bounded<7>() * ::capnp::POINTERS)); } +inline float CarParams::Deprecated::Reader::getMass() const { + return _reader.getDataField( + ::capnp::bounded<4>() * ::capnp::ELEMENTS); +} + +inline float CarParams::Deprecated::Builder::getMass() { + return _builder.getDataField( + ::capnp::bounded<4>() * ::capnp::ELEMENTS); +} +inline void CarParams::Deprecated::Builder::setMass(float value) { + _builder.setDataField( + ::capnp::bounded<4>() * ::capnp::ELEMENTS, value); +} + +inline float CarParams::Deprecated::Reader::getSteerRatioRear() const { + return _reader.getDataField( + ::capnp::bounded<8>() * ::capnp::ELEMENTS); +} + +inline float CarParams::Deprecated::Builder::getSteerRatioRear() { + return _builder.getDataField( + ::capnp::bounded<8>() * ::capnp::ELEMENTS); +} +inline void CarParams::Deprecated::Builder::setSteerRatioRear(float value) { + _builder.setDataField( + ::capnp::bounded<8>() * ::capnp::ELEMENTS, value); +} + inline bool CarParams::Deprecated::Reader::getSteerLimitAlert() const { return _reader.getDataField( ::capnp::bounded<5>() * ::capnp::ELEMENTS); @@ -10557,6 +10511,45 @@ inline void CarParams::Deprecated::Builder::setCommunityFeature(bool value) { ::capnp::bounded<12>() * ::capnp::ELEMENTS, value); } +inline bool CarParams::Deprecated::Reader::hasLateralParams() const { + return !_reader.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS).isNull(); +} +inline bool CarParams::Deprecated::Builder::hasLateralParams() { + return !_builder.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS).isNull(); +} +inline ::cereal::CarParams::LateralParams::Reader CarParams::Deprecated::Reader::getLateralParams() const { + return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::get(_reader.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS)); +} +inline ::cereal::CarParams::LateralParams::Builder CarParams::Deprecated::Builder::getLateralParams() { + return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::get(_builder.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS)); +} +#if !CAPNP_LITE +inline ::cereal::CarParams::LateralParams::Pipeline CarParams::Deprecated::Pipeline::getLateralParams() { + return ::cereal::CarParams::LateralParams::Pipeline(_typeless.getPointerField(12)); +} +#endif // !CAPNP_LITE +inline void CarParams::Deprecated::Builder::setLateralParams( ::cereal::CarParams::LateralParams::Reader value) { + ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::set(_builder.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS), value); +} +inline ::cereal::CarParams::LateralParams::Builder CarParams::Deprecated::Builder::initLateralParams() { + return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::init(_builder.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS)); +} +inline void CarParams::Deprecated::Builder::adoptLateralParams( + ::capnp::Orphan< ::cereal::CarParams::LateralParams>&& value) { + ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::adopt(_builder.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS), kj::mv(value)); +} +inline ::capnp::Orphan< ::cereal::CarParams::LateralParams> CarParams::Deprecated::Builder::disownLateralParams() { + return ::capnp::_::PointerHelpers< ::cereal::CarParams::LateralParams>::disown(_builder.getPointerField( + ::capnp::bounded<12>() * ::capnp::POINTERS)); +} + inline float CarParams::Deprecated::Reader::getMinSpeedCan() const { return _reader.getDataField( ::capnp::bounded<21>() * ::capnp::ELEMENTS); @@ -10613,6 +10606,20 @@ inline void CarParams::Deprecated::Builder::setMaxSteeringAngleDeg(float value) ::capnp::bounded<24>() * ::capnp::ELEMENTS, value); } +inline bool CarParams::Deprecated::Reader::getEnableBsm() const { + return _reader.getDataField( + ::capnp::bounded<14>() * ::capnp::ELEMENTS); +} + +inline bool CarParams::Deprecated::Builder::getEnableBsm() { + return _builder.getDataField( + ::capnp::bounded<14>() * ::capnp::ELEMENTS); +} +inline void CarParams::Deprecated::Builder::setEnableBsm(bool value) { + _builder.setDataField( + ::capnp::bounded<14>() * ::capnp::ELEMENTS, value); +} + inline bool CarParams::Deprecated::Reader::getHasStockCamera() const { return _reader.getDataField( ::capnp::bounded<15>() * ::capnp::ELEMENTS); diff --git a/openpilot/cereal/gen/cpp/custom.capnp.c++ b/openpilot/cereal/gen/cpp/custom.capnp.c++ index 47a98820b..65f132f2c 100644 --- a/openpilot/cereal/gen/cpp/custom.capnp.c++ +++ b/openpilot/cereal/gen/cpp/custom.capnp.c++ @@ -3568,7 +3568,7 @@ const ::capnp::_::RawSchema s_f6e831752fcdf793 = { 1, 11, i_f6e831752fcdf793, nullptr, nullptr, { &s_f6e831752fcdf793, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<169> b_b8007ed8a646b5e6 = { +static const ::capnp::_::AlignedData<170> b_b8007ed8a646b5e6 = { { 0, 0, 0, 0, 5, 0, 6, 0, 230, 181, 70, 166, 216, 126, 0, 184, 27, 0, 0, 0, 2, 0, 0, 0, @@ -3631,40 +3631,40 @@ static const ::capnp::_::AlignedData<169> b_b8007ed8a646b5e6 = { 33, 1, 0, 0, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, - 37, 1, 0, 0, 202, 0, 0, 0, + 37, 1, 0, 0, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, - 41, 1, 0, 0, 178, 0, 0, 0, + 45, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 41, 1, 0, 0, 178, 0, 0, 0, + 45, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, - 41, 1, 0, 0, 106, 0, 0, 0, + 45, 1, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, - 37, 1, 0, 0, 114, 0, 0, 0, + 41, 1, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 33, 1, 0, 0, 162, 0, 0, 0, + 37, 1, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, - 33, 1, 0, 0, 138, 0, 0, 0, + 37, 1, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, - 33, 1, 0, 0, 146, 0, 0, 0, + 37, 1, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, - 33, 1, 0, 0, 146, 0, 0, 0, + 37, 1, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, - 33, 1, 0, 0, 74, 0, 0, 0, + 37, 1, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, - 29, 1, 0, 0, 154, 0, 0, 0, + 33, 1, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, - 29, 1, 0, 0, 114, 0, 0, 0, + 33, 1, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 107, 97, 115, 69, 110, 97, 98, 108, 101, 0, 0, 0, 0, 0, 0, @@ -3708,7 +3708,8 @@ static const ::capnp::_::AlignedData<169> b_b8007ed8a646b5e6 = { 101, 120, 112, 101, 114, 105, 109, 101, 110, 116, 97, 108, 77, 111, 100, 101, 83, 119, 105, 116, 99, 104, 101, 100, - 0, 0, 0, 0, 0, 0, 0, 0, + 68, 69, 80, 82, 69, 67, 65, 84, + 69, 68, 0, 0, 0, 0, 0, 0, 119, 114, 111, 110, 103, 67, 97, 114, 77, 111, 100, 101, 65, 108, 101, 114, 116, 79, 110, 108, 121, 0, 0, 0, @@ -3743,7 +3744,7 @@ static const ::capnp::_::AlignedData<169> b_b8007ed8a646b5e6 = { #if !CAPNP_LITE static const uint16_t m_b8007ed8a646b5e6[] = {25, 12, 23, 14, 13, 24, 17, 18, 1, 0, 3, 2, 16, 6, 9, 5, 4, 11, 8, 10, 7, 20, 21, 22, 19, 15}; const ::capnp::_::RawSchema s_b8007ed8a646b5e6 = { - 0xb8007ed8a646b5e6, b_b8007ed8a646b5e6.words, 169, nullptr, m_b8007ed8a646b5e6, + 0xb8007ed8a646b5e6, b_b8007ed8a646b5e6.words, 170, nullptr, m_b8007ed8a646b5e6, 0, 26, nullptr, nullptr, nullptr, { &s_b8007ed8a646b5e6, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE diff --git a/openpilot/cereal/gen/cpp/custom.capnp.h b/openpilot/cereal/gen/cpp/custom.capnp.h index 6ef1f63b7..30e0a1198 100644 --- a/openpilot/cereal/gen/cpp/custom.capnp.h +++ b/openpilot/cereal/gen/cpp/custom.capnp.h @@ -197,7 +197,7 @@ enum class EventName_b8007ed8a646b5e6: uint16_t { SILENT_PARK_BRAKE, CONTROLS_MISMATCH_LATERAL, HYUNDAI_RADAR_TRACKS_CONFIRMED, - EXPERIMENTAL_MODE_SWITCHED, + EXPERIMENTAL_MODE_SWITCHED_D_E_P_R_E_C_A_T_E_D, WRONG_CAR_MODE_ALERT_ONLY, PEDAL_PRESSED_ALERT_ONLY, LANE_TURN_LEFT, diff --git a/openpilot/cereal/gen/cpp/log.capnp.c++ b/openpilot/cereal/gen/cpp/log.capnp.c++ index e1385ba30..8a84001f4 100644 --- a/openpilot/cereal/gen/cpp/log.capnp.c++ +++ b/openpilot/cereal/gen/cpp/log.capnp.c++ @@ -369,7 +369,7 @@ const ::capnp::_::RawSchema s_c4fa6047f024e718 = { 1, 11, i_c4fa6047f024e718, nullptr, nullptr, { &s_c4fa6047f024e718, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<582> b_91f1992a1f77fb03 = { +static const ::capnp::_::AlignedData<588> b_91f1992a1f77fb03 = { { 0, 0, 0, 0, 5, 0, 6, 0, 3, 251, 119, 31, 42, 153, 241, 145, 22, 0, 0, 0, 2, 0, 0, 0, @@ -379,7 +379,7 @@ static const ::capnp::_::AlignedData<582> b_91f1992a1f77fb03 = { 21, 0, 0, 0, 2, 1, 0, 0, 33, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 0, 199, 9, 0, 0, + 29, 0, 0, 0, 223, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -387,318 +387,321 @@ static const ::capnp::_::AlignedData<582> b_91f1992a1f77fb03 = { 69, 118, 101, 110, 116, 46, 69, 118, 101, 110, 116, 78, 97, 109, 101, 0, 0, 0, 0, 0, 1, 0, 1, 0, - 160, 1, 0, 0, 1, 0, 2, 0, + 164, 1, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 217, 4, 0, 0, 74, 0, 0, 0, + 229, 4, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 213, 4, 0, 0, 138, 0, 0, 0, + 225, 4, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 213, 4, 0, 0, 82, 0, 0, 0, + 225, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 209, 4, 0, 0, 74, 0, 0, 0, + 221, 4, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, - 205, 4, 0, 0, 154, 0, 0, 0, + 217, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, - 205, 4, 0, 0, 98, 0, 0, 0, + 217, 4, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, - 201, 4, 0, 0, 106, 0, 0, 0, + 213, 4, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, - 197, 4, 0, 0, 170, 0, 0, 0, + 209, 4, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, - 197, 4, 0, 0, 98, 0, 0, 0, + 209, 4, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, - 193, 4, 0, 0, 106, 0, 0, 0, + 205, 4, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, - 189, 4, 0, 0, 106, 0, 0, 0, + 201, 4, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, - 185, 4, 0, 0, 106, 0, 0, 0, + 197, 4, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 181, 4, 0, 0, 162, 0, 0, 0, + 193, 4, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, - 181, 4, 0, 0, 154, 0, 0, 0, + 193, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, - 181, 4, 0, 0, 114, 0, 0, 0, + 193, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 177, 4, 0, 0, 122, 0, 0, 0, + 189, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, - 173, 4, 0, 0, 98, 0, 0, 0, + 185, 4, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, - 169, 4, 0, 0, 90, 0, 0, 0, + 181, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 165, 4, 0, 0, 74, 0, 0, 0, + 177, 4, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, - 161, 4, 0, 0, 178, 0, 0, 0, + 173, 4, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, - 161, 4, 0, 0, 154, 0, 0, 0, + 173, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, - 161, 4, 0, 0, 202, 0, 0, 0, + 173, 4, 0, 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, - 165, 4, 0, 0, 138, 0, 0, 0, + 177, 4, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, - 165, 4, 0, 0, 82, 0, 0, 0, + 177, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, - 161, 4, 0, 0, 90, 0, 0, 0, + 173, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, - 157, 4, 0, 0, 90, 0, 0, 0, + 169, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, - 153, 4, 0, 0, 82, 0, 0, 0, + 165, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, - 149, 4, 0, 0, 82, 0, 0, 0, + 161, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, - 145, 4, 0, 0, 114, 0, 0, 0, + 157, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, - 141, 4, 0, 0, 114, 0, 0, 0, + 153, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 170, 0, 0, 0, + 149, 4, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 218, 0, 0, 0, + 149, 4, 0, 0, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, - 141, 4, 0, 0, 122, 0, 0, 0, + 153, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 146, 0, 0, 0, + 149, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 146, 0, 0, 0, + 149, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 146, 0, 0, 0, + 149, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 162, 0, 0, 0, + 149, 4, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 162, 0, 0, 0, + 149, 4, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 162, 0, 0, 0, + 149, 4, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, - 137, 4, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 98, 0, 0, 0, 0, 0, 0, 0, - 133, 4, 0, 0, 170, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 42, 0, 0, 0, 0, 0, 0, 0, - 133, 4, 0, 0, 90, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 43, 0, 0, 0, 0, 0, 0, 0, - 129, 4, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 44, 0, 0, 0, 0, 0, 0, 0, - 129, 4, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 45, 0, 0, 0, 0, 0, 0, 0, - 125, 4, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 46, 0, 0, 0, 0, 0, 0, 0, - 125, 4, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 47, 0, 0, 0, 0, 0, 0, 0, - 121, 4, 0, 0, 122, 0, 0, 0, + 149, 4, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 0, 0, - 117, 4, 0, 0, 226, 0, 0, 0, + 145, 4, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 0, 0, 0, 0, 0, 0, 0, - 121, 4, 0, 0, 146, 0, 0, 0, + 42, 0, 0, 0, 0, 0, 0, 0, + 145, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 0, 0, 0, 0, 0, 0, 0, - 121, 4, 0, 0, 154, 0, 0, 0, + 43, 0, 0, 0, 0, 0, 0, 0, + 141, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 50, 0, 0, 0, 0, 0, 0, 0, - 121, 4, 0, 0, 90, 0, 0, 0, + 44, 0, 0, 0, 0, 0, 0, 0, + 141, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 51, 0, 0, 0, 0, 0, 0, 0, - 117, 4, 0, 0, 82, 0, 0, 0, + 45, 0, 0, 0, 0, 0, 0, 0, + 137, 4, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 52, 0, 0, 0, 0, 0, 0, 0, - 113, 4, 0, 0, 74, 0, 0, 0, + 46, 0, 0, 0, 0, 0, 0, 0, + 137, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 55, 0, 0, 0, 0, 0, 0, 0, - 109, 4, 0, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 56, 0, 0, 0, 0, 0, 0, 0, - 101, 4, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 57, 0, 0, 0, 0, 0, 0, 0, - 97, 4, 0, 0, 154, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 58, 0, 0, 0, 0, 0, 0, 0, - 97, 4, 0, 0, 106, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 59, 0, 0, 0, 0, 0, 0, 0, - 93, 4, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 0, 0, - 93, 4, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 61, 0, 0, 0, 0, 0, 0, 0, - 93, 4, 0, 0, 74, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 62, 0, 0, 0, 0, 0, 0, 0, - 89, 4, 0, 0, 66, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 63, 0, 0, 0, 0, 0, 0, 0, - 81, 4, 0, 0, 106, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 64, 0, 0, 0, 0, 0, 0, 0, - 77, 4, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 65, 0, 0, 0, 0, 0, 0, 0, - 77, 4, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 66, 0, 0, 0, 0, 0, 0, 0, - 77, 4, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 67, 0, 0, 0, 0, 0, 0, 0, - 73, 4, 0, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 68, 0, 0, 0, 0, 0, 0, 0, - 65, 4, 0, 0, 122, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 69, 0, 0, 0, 0, 0, 0, 0, - 61, 4, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 70, 0, 0, 0, 0, 0, 0, 0, - 61, 4, 0, 0, 50, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 71, 0, 0, 0, 0, 0, 0, 0, - 53, 4, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 72, 0, 0, 0, 0, 0, 0, 0, - 49, 4, 0, 0, 114, 0, 0, 0, + 47, 0, 0, 0, 0, 0, 0, 0, + 133, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, - 45, 4, 0, 0, 194, 0, 0, 0, + 129, 4, 0, 0, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 0, 0, 0, 0, 0, 0, 0, - 45, 4, 0, 0, 122, 0, 0, 0, + 48, 0, 0, 0, 0, 0, 0, 0, + 133, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 74, 0, 0, 0, 0, 0, 0, 0, - 41, 4, 0, 0, 146, 0, 0, 0, + 49, 0, 0, 0, 0, 0, 0, 0, + 133, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 75, 0, 0, 0, 0, 0, 0, 0, - 41, 4, 0, 0, 130, 0, 0, 0, + 50, 0, 0, 0, 0, 0, 0, 0, + 133, 4, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76, 0, 0, 0, 0, 0, 0, 0, - 37, 4, 0, 0, 146, 0, 0, 0, + 51, 0, 0, 0, 0, 0, 0, 0, + 129, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 77, 0, 0, 0, 0, 0, 0, 0, - 37, 4, 0, 0, 98, 0, 0, 0, + 52, 0, 0, 0, 0, 0, 0, 0, + 125, 4, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 78, 0, 0, 0, 0, 0, 0, 0, - 33, 4, 0, 0, 178, 0, 0, 0, + 55, 0, 0, 0, 0, 0, 0, 0, + 121, 4, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 56, 0, 0, 0, 0, 0, 0, 0, + 113, 4, 0, 0, 130, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 57, 0, 0, 0, 0, 0, 0, 0, + 109, 4, 0, 0, 154, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 58, 0, 0, 0, 0, 0, 0, 0, + 109, 4, 0, 0, 106, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 59, 0, 0, 0, 0, 0, 0, 0, + 105, 4, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 60, 0, 0, 0, 0, 0, 0, 0, + 105, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 61, 0, 0, 0, 0, 0, 0, 0, + 105, 4, 0, 0, 74, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 62, 0, 0, 0, 0, 0, 0, 0, + 101, 4, 0, 0, 66, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 63, 0, 0, 0, 0, 0, 0, 0, + 93, 4, 0, 0, 106, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, + 89, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 65, 0, 0, 0, 0, 0, 0, 0, + 89, 4, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 66, 0, 0, 0, 0, 0, 0, 0, + 89, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 67, 0, 0, 0, 0, 0, 0, 0, + 85, 4, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 68, 0, 0, 0, 0, 0, 0, 0, + 77, 4, 0, 0, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 69, 0, 0, 0, 0, 0, 0, 0, + 73, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 70, 0, 0, 0, 0, 0, 0, 0, + 73, 4, 0, 0, 50, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 71, 0, 0, 0, 0, 0, 0, 0, + 65, 4, 0, 0, 130, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 72, 0, 0, 0, 0, 0, 0, 0, + 61, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 0, - 33, 4, 0, 0, 154, 0, 0, 0, + 57, 4, 0, 0, 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 79, 0, 0, 0, 0, 0, 0, 0, - 33, 4, 0, 0, 122, 0, 0, 0, + 73, 0, 0, 0, 0, 0, 0, 0, + 57, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 80, 0, 0, 0, 0, 0, 0, 0, - 29, 4, 0, 0, 114, 0, 0, 0, + 74, 0, 0, 0, 0, 0, 0, 0, + 53, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 81, 0, 0, 0, 0, 0, 0, 0, - 25, 4, 0, 0, 146, 0, 0, 0, + 75, 0, 0, 0, 0, 0, 0, 0, + 53, 4, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 82, 0, 0, 0, 0, 0, 0, 0, - 25, 4, 0, 0, 114, 0, 0, 0, + 76, 0, 0, 0, 0, 0, 0, 0, + 49, 4, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 0, 0, 0, 0, 0, 0, 0, - 21, 4, 0, 0, 122, 0, 0, 0, + 77, 0, 0, 0, 0, 0, 0, 0, + 49, 4, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 85, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 178, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 86, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 194, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 87, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 194, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 88, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 178, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 89, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 178, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 90, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 194, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 91, 0, 0, 0, 0, 0, 0, 0, - 17, 4, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 92, 0, 0, 0, 0, 0, 0, 0, - 13, 4, 0, 0, 154, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 93, 0, 0, 0, 0, 0, 0, 0, - 13, 4, 0, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 27, 0, 0, 0, 0, 0, 0, 0, - 5, 4, 0, 0, 170, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 15, 0, 0, 0, 0, 0, 0, 0, - 5, 4, 0, 0, 122, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 94, 0, 0, 0, 0, 0, 0, 0, - 1, 4, 0, 0, 106, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 95, 0, 0, 0, 0, 0, 0, 0, - 253, 3, 0, 0, 154, 0, 0, 0, + 78, 0, 0, 0, 0, 0, 0, 0, + 45, 4, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102, 0, 0, 0, 0, 0, 0, 0, - 253, 3, 0, 0, 194, 0, 0, 0, + 45, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 53, 0, 0, 0, 0, 0, 0, 0, - 253, 3, 0, 0, 82, 0, 0, 0, + 79, 0, 0, 0, 0, 0, 0, 0, + 45, 4, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 54, 0, 0, 0, 0, 0, 0, 0, - 249, 3, 0, 0, 130, 0, 0, 0, + 80, 0, 0, 0, 0, 0, 0, 0, + 41, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 81, 0, 0, 0, 0, 0, 0, 0, + 37, 4, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 82, 0, 0, 0, 0, 0, 0, 0, + 37, 4, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 84, 0, 0, 0, 0, 0, 0, 0, + 33, 4, 0, 0, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 85, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 178, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 86, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 194, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 87, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 194, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 88, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 178, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 89, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 178, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 90, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 194, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 91, 0, 0, 0, 0, 0, 0, 0, + 29, 4, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 92, 0, 0, 0, 0, 0, 0, 0, + 25, 4, 0, 0, 154, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 93, 0, 0, 0, 0, 0, 0, 0, + 25, 4, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 27, 0, 0, 0, 0, 0, 0, 0, + 17, 4, 0, 0, 170, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 0, 0, 0, 0, + 17, 4, 0, 0, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 94, 0, 0, 0, 0, 0, 0, 0, + 13, 4, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, - 245, 3, 0, 0, 130, 0, 0, 0, + 9, 4, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 0, - 241, 3, 0, 0, 194, 0, 0, 0, + 9, 4, 0, 0, 194, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 53, 0, 0, 0, 0, 0, 0, 0, + 9, 4, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 54, 0, 0, 0, 0, 0, 0, 0, + 5, 4, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, 0, - 241, 3, 0, 0, 122, 0, 0, 0, + 1, 4, 0, 0, 130, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 104, 0, 0, 0, 0, 0, 0, 0, + 253, 3, 0, 0, 194, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 98, 0, 0, 0, 0, 0, 0, 0, + 253, 3, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, 0, - 237, 3, 0, 0, 98, 0, 0, 0, + 249, 3, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 95, 0, 0, 0, 0, 0, 0, 0, + 245, 3, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 97, 110, 69, 114, 114, 111, 114, 0, 0, 0, 0, 0, 0, 0, 0, @@ -951,14 +954,17 @@ static const ::capnp::_::AlignedData<582> b_91f1992a1f77fb03 = { 98, 105, 103, 77, 111, 100, 101, 108, 70, 97, 105, 108, 101, 100, 0, 0, 99, 97, 114, 78, 111, 116, 82, 101, - 97, 100, 121, 0, 0, 0, 0, 0, } + 97, 100, 121, 0, 0, 0, 0, 0, + 117, 115, 101, 114, 66, 111, 111, 107, + 109, 97, 114, 107, 78, 111, 116, 80, + 97, 105, 114, 101, 100, 0, 0, 0, } }; ::capnp::word const* const bp_91f1992a1f77fb03 = b_91f1992a1f77fb03.words; #if !CAPNP_LITE -static const uint16_t m_91f1992a1f77fb03[] = {41, 89, 92, 97, 67, 39, 102, 100, 101, 26, 9, 10, 19, 20, 21, 74, 73, 80, 0, 103, 54, 43, 44, 22, 15, 79, 76, 71, 3, 33, 34, 35, 36, 37, 38, 90, 5, 96, 72, 65, 13, 55, 29, 50, 57, 99, 53, 86, 85, 30, 40, 51, 28, 70, 68, 17, 18, 88, 87, 27, 24, 23, 11, 91, 46, 12, 48, 49, 75, 25, 93, 58, 82, 32, 8, 4, 77, 81, 42, 47, 56, 16, 60, 64, 61, 62, 63, 94, 14, 66, 7, 31, 83, 1, 52, 59, 98, 45, 78, 95, 84, 6, 69, 2}; +static const uint16_t m_91f1992a1f77fb03[] = {41, 89, 92, 97, 67, 39, 102, 100, 101, 26, 9, 10, 19, 20, 21, 74, 73, 80, 0, 103, 54, 43, 44, 22, 15, 79, 76, 71, 3, 33, 34, 35, 36, 37, 38, 90, 5, 96, 72, 65, 13, 55, 29, 50, 57, 99, 53, 86, 85, 30, 40, 51, 28, 70, 68, 17, 18, 88, 87, 27, 24, 23, 11, 91, 46, 12, 48, 49, 75, 25, 93, 58, 82, 32, 8, 4, 77, 81, 42, 47, 56, 16, 60, 64, 61, 62, 63, 94, 14, 66, 7, 31, 83, 1, 52, 59, 98, 45, 78, 95, 104, 84, 6, 69, 2}; const ::capnp::_::RawSchema s_91f1992a1f77fb03 = { - 0x91f1992a1f77fb03, b_91f1992a1f77fb03.words, 582, nullptr, m_91f1992a1f77fb03, - 0, 104, nullptr, nullptr, nullptr, { &s_91f1992a1f77fb03, nullptr, nullptr, 0, 0, nullptr }, false + 0x91f1992a1f77fb03, b_91f1992a1f77fb03.words, 588, nullptr, m_91f1992a1f77fb03, + 0, 105, nullptr, nullptr, nullptr, { &s_91f1992a1f77fb03, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE CAPNP_DEFINE_ENUM(EventName_91f1992a1f77fb03, 91f1992a1f77fb03); @@ -1006,7 +1012,7 @@ const ::capnp::_::RawSchema s_d692e23d1a247d99 = { }; #endif // !CAPNP_LITE CAPNP_DEFINE_ENUM(LongitudinalPersonality_d692e23d1a247d99, d692e23d1a247d99); -static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { +static const ::capnp::_::AlignedData<349> b_e71008caeb3fb65c = { { 0, 0, 0, 0, 5, 0, 6, 0, 92, 182, 63, 235, 202, 8, 16, 231, 10, 0, 0, 0, 1, 0, 2, 0, @@ -1016,7 +1022,7 @@ static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { 21, 0, 0, 0, 154, 0, 0, 0, 29, 0, 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 77, 0, 0, 0, 159, 4, 0, 0, + 77, 0, 0, 0, 247, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -1036,154 +1042,133 @@ static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { 67, 104, 102, 102, 114, 65, 110, 100, 114, 111, 105, 100, 69, 120, 116, 114, 97, 0, 0, 0, 0, 0, 0, 0, - 84, 0, 0, 0, 3, 0, 4, 0, + 72, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 61, 2, 0, 0, 90, 0, 0, 0, + 233, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 2, 0, 0, 3, 0, 1, 0, - 88, 2, 0, 0, 2, 0, 1, 0, - 20, 0, 0, 0, 0, 0, 0, 0, + 232, 1, 0, 0, 3, 0, 1, 0, + 4, 2, 0, 0, 2, 0, 1, 0, + 17, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 247, 245, 54, 229, 174, 210, 48, 191, - 85, 2, 0, 0, 90, 0, 0, 0, + 1, 2, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 2, 0, 0, 74, 0, 0, 0, + 237, 1, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 2, 0, 0, 3, 0, 1, 0, - 76, 2, 0, 0, 2, 0, 1, 0, + 236, 1, 0, 0, 3, 0, 1, 0, + 248, 1, 0, 0, 2, 0, 1, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 2, 0, 0, 90, 0, 0, 0, + 245, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 2, 0, 0, 3, 0, 1, 0, - 84, 2, 0, 0, 2, 0, 1, 0, + 244, 1, 0, 0, 3, 0, 1, 0, + 0, 2, 0, 0, 2, 0, 1, 0, 6, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 81, 2, 0, 0, 66, 0, 0, 0, + 253, 1, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76, 2, 0, 0, 3, 0, 1, 0, - 88, 2, 0, 0, 2, 0, 1, 0, - 14, 0, 0, 0, 7, 0, 0, 0, - 0, 0, 1, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 85, 2, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 84, 2, 0, 0, 3, 0, 1, 0, - 96, 2, 0, 0, 2, 0, 1, 0, - 15, 0, 0, 0, 16, 0, 0, 0, + 248, 1, 0, 0, 3, 0, 1, 0, + 4, 2, 0, 0, 2, 0, 1, 0, + 13, 0, 0, 0, 16, 0, 0, 0, 0, 0, 1, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 2, 0, 0, 50, 0, 0, 0, + 1, 2, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 2, 0, 0, 3, 0, 1, 0, - 100, 2, 0, 0, 2, 0, 1, 0, + 252, 1, 0, 0, 3, 0, 1, 0, + 8, 2, 0, 0, 2, 0, 1, 0, 7, 0, 0, 0, 8, 0, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 97, 2, 0, 0, 82, 0, 0, 0, + 5, 2, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 96, 2, 0, 0, 3, 0, 1, 0, - 108, 2, 0, 0, 2, 0, 1, 0, + 4, 2, 0, 0, 3, 0, 1, 0, + 16, 2, 0, 0, 2, 0, 1, 0, 9, 0, 0, 0, 9, 0, 0, 0, 0, 0, 1, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 105, 2, 0, 0, 82, 0, 0, 0, + 13, 2, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 104, 2, 0, 0, 3, 0, 1, 0, - 116, 2, 0, 0, 2, 0, 1, 0, - 16, 0, 0, 0, 17, 0, 0, 0, - 0, 0, 1, 0, 12, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 113, 2, 0, 0, 66, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 108, 2, 0, 0, 3, 0, 1, 0, - 120, 2, 0, 0, 2, 0, 1, 0, + 12, 2, 0, 0, 3, 0, 1, 0, + 24, 2, 0, 0, 2, 0, 1, 0, 10, 0, 0, 0, 10, 0, 0, 0, 0, 0, 1, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 117, 2, 0, 0, 82, 0, 0, 0, + 21, 2, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 2, 0, 0, 3, 0, 1, 0, - 128, 2, 0, 0, 2, 0, 1, 0, + 20, 2, 0, 0, 3, 0, 1, 0, + 32, 2, 0, 0, 2, 0, 1, 0, 1, 0, 0, 0, 12, 0, 0, 0, 0, 0, 1, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 2, 0, 0, 114, 0, 0, 0, + 29, 2, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 124, 2, 0, 0, 3, 0, 1, 0, - 136, 2, 0, 0, 2, 0, 1, 0, - 13, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 1, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 133, 2, 0, 0, 146, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 136, 2, 0, 0, 3, 0, 1, 0, - 220, 2, 0, 0, 2, 0, 1, 0, - 17, 0, 0, 0, 14, 0, 0, 0, + 28, 2, 0, 0, 3, 0, 1, 0, + 40, 2, 0, 0, 2, 0, 1, 0, + 14, 0, 0, 0, 14, 0, 0, 0, 0, 0, 1, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 217, 2, 0, 0, 58, 0, 0, 0, + 37, 2, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 212, 2, 0, 0, 3, 0, 1, 0, - 40, 3, 0, 0, 2, 0, 1, 0, + 32, 2, 0, 0, 3, 0, 1, 0, + 116, 2, 0, 0, 2, 0, 1, 0, 2, 0, 0, 0, 15, 0, 0, 0, 0, 0, 1, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 3, 0, 0, 82, 0, 0, 0, + 113, 2, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 3, 0, 0, 3, 0, 1, 0, - 48, 3, 0, 0, 2, 0, 1, 0, - 18, 0, 0, 0, 16, 0, 0, 0, + 112, 2, 0, 0, 3, 0, 1, 0, + 124, 2, 0, 0, 2, 0, 1, 0, + 15, 0, 0, 0, 16, 0, 0, 0, 0, 0, 1, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 3, 0, 0, 74, 0, 0, 0, + 121, 2, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 44, 3, 0, 0, 3, 0, 1, 0, - 128, 3, 0, 0, 2, 0, 1, 0, - 19, 0, 0, 0, 1, 0, 0, 0, + 120, 2, 0, 0, 3, 0, 1, 0, + 204, 2, 0, 0, 2, 0, 1, 0, + 16, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 3, 0, 0, 114, 0, 0, 0, + 201, 2, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 124, 3, 0, 0, 3, 0, 1, 0, - 136, 3, 0, 0, 2, 0, 1, 0, + 200, 2, 0, 0, 3, 0, 1, 0, + 212, 2, 0, 0, 2, 0, 1, 0, 8, 0, 0, 0, 17, 0, 0, 0, 0, 0, 1, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 3, 0, 0, 114, 0, 0, 0, + 209, 2, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 3, 0, 0, 3, 0, 1, 0, - 144, 3, 0, 0, 2, 0, 1, 0, + 208, 2, 0, 0, 3, 0, 1, 0, + 220, 2, 0, 0, 2, 0, 1, 0, 4, 0, 0, 0, 18, 0, 0, 0, 0, 0, 1, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 3, 0, 0, 82, 0, 0, 0, + 217, 2, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 140, 3, 0, 0, 3, 0, 1, 0, - 152, 3, 0, 0, 2, 0, 1, 0, + 216, 2, 0, 0, 3, 0, 1, 0, + 228, 2, 0, 0, 2, 0, 1, 0, 11, 0, 0, 0, 19, 0, 0, 0, 0, 0, 1, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 149, 3, 0, 0, 106, 0, 0, 0, + 225, 2, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 3, 0, 0, 3, 0, 1, 0, - 160, 3, 0, 0, 2, 0, 1, 0, + 224, 2, 0, 0, 3, 0, 1, 0, + 236, 2, 0, 0, 2, 0, 1, 0, 12, 0, 0, 0, 20, 0, 0, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 3, 0, 0, 138, 0, 0, 0, + 233, 2, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 160, 3, 0, 0, 3, 0, 1, 0, - 172, 3, 0, 0, 2, 0, 1, 0, + 236, 2, 0, 0, 3, 0, 1, 0, + 248, 2, 0, 0, 2, 0, 1, 0, 107, 101, 114, 110, 101, 108, 65, 114, 103, 115, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, @@ -1225,15 +1210,6 @@ static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 112, 97, 110, 100, 97, 73, 110, 102, - 111, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 173, 240, 223, 92, 114, 232, 115, 230, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 100, 105, 114, 116, 121, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1260,14 +1236,6 @@ static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 112, 97, 115, 115, 105, 118, 101, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 103, 105, 116, 82, 101, 109, 111, 116, 101, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, @@ -1286,34 +1254,6 @@ static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 97, 110, 100, 114, 111, 105, 100, 80, - 114, 111, 112, 101, 114, 116, 105, 101, - 115, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 150, 182, 62, 24, 226, 60, 177, 248, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 0, - 1, 0, 0, 0, 31, 0, 0, 0, - 4, 0, 0, 0, 2, 0, 1, 0, - 150, 182, 62, 24, 226, 60, 177, 248, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 39, 0, 0, 0, - 8, 0, 0, 0, 1, 0, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 8, 0, 0, 0, 3, 0, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 3, 0, 1, 0, - 12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 112, 97, 114, 97, 109, 115, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 150, 182, 62, 24, 226, 60, 177, 248, @@ -1428,19 +1368,17 @@ static const ::capnp::_::AlignedData<415> b_e71008caeb3fb65c = { static const ::capnp::_::RawSchema* const d_e71008caeb3fb65c[] = { &s_9d5d7238eba86608, &s_bf30d2aee536f5f7, - &s_e673e8725cdff0ad, &s_f8b13ce2183eb696, }; -static const uint16_t m_e71008caeb3fb65c[] = {12, 18, 15, 1, 3, 6, 2, 8, 7, 17, 10, 19, 20, 0, 11, 14, 5, 13, 9, 4, 16}; -static const uint16_t i_e71008caeb3fb65c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}; +static const uint16_t m_e71008caeb3fb65c[] = {15, 12, 1, 3, 5, 2, 7, 6, 14, 8, 16, 17, 0, 9, 11, 10, 4, 13}; +static const uint16_t i_e71008caeb3fb65c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; KJ_CONSTEXPR(const) ::capnp::_::RawBrandedSchema::Dependency bd_e71008caeb3fb65c[] = { - { 16777228, ::cereal::Map< ::capnp::Text, ::capnp::Text>::_capnpPrivate::brand() }, - { 16777229, ::cereal::Map< ::capnp::Text, ::capnp::Data>::_capnpPrivate::brand() }, - { 16777231, ::cereal::Map< ::capnp::Text, ::capnp::Data>::_capnpPrivate::brand() }, + { 16777226, ::cereal::Map< ::capnp::Text, ::capnp::Data>::_capnpPrivate::brand() }, + { 16777228, ::cereal::Map< ::capnp::Text, ::capnp::Data>::_capnpPrivate::brand() }, }; const ::capnp::_::RawSchema s_e71008caeb3fb65c = { - 0xe71008caeb3fb65c, b_e71008caeb3fb65c.words, 415, d_e71008caeb3fb65c, m_e71008caeb3fb65c, - 4, 21, i_e71008caeb3fb65c, nullptr, nullptr, { &s_e71008caeb3fb65c, nullptr, bd_e71008caeb3fb65c, 0, sizeof(bd_e71008caeb3fb65c) / sizeof(bd_e71008caeb3fb65c[0]), nullptr }, true + 0xe71008caeb3fb65c, b_e71008caeb3fb65c.words, 349, d_e71008caeb3fb65c, m_e71008caeb3fb65c, + 3, 18, i_e71008caeb3fb65c, nullptr, nullptr, { &s_e71008caeb3fb65c, nullptr, bd_e71008caeb3fb65c, 0, sizeof(bd_e71008caeb3fb65c) / sizeof(bd_e71008caeb3fb65c[0]), nullptr }, true }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<52> b_9d5d7238eba86608 = { @@ -1671,7 +1609,7 @@ const ::capnp::_::RawSchema s_9cfb5d53a4f615a5 = { 1, 1, i_9cfb5d53a4f615a5, nullptr, nullptr, { &s_9cfb5d53a4f615a5, nullptr, bd_9cfb5d53a4f615a5, 0, sizeof(bd_9cfb5d53a4f615a5) / sizeof(bd_9cfb5d53a4f615a5[0]), nullptr }, true }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<102> b_bf30d2aee536f5f7 = { +static const ::capnp::_::AlignedData<168> b_bf30d2aee536f5f7 = { { 0, 0, 0, 0, 5, 0, 6, 0, 247, 245, 54, 229, 174, 210, 48, 191, 19, 0, 0, 0, 1, 0, 2, 0, @@ -1681,49 +1619,70 @@ static const ::capnp::_::AlignedData<102> b_bf30d2aee536f5f7 = { 21, 0, 0, 0, 242, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 25, 0, 0, 0, 31, 1, 0, 0, + 25, 0, 0, 0, 199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, 112, 58, 73, 110, 105, 116, 68, 97, 116, 97, 46, 100, 101, 112, 114, 101, 99, 97, 116, 101, 100, 0, 0, 0, - 20, 0, 0, 0, 3, 0, 4, 0, + 32, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 0, 0, 0, 42, 0, 0, 0, + 209, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 120, 0, 0, 0, 3, 0, 1, 0, - 132, 0, 0, 0, 2, 0, 1, 0, + 204, 0, 0, 0, 3, 0, 1, 0, + 216, 0, 0, 0, 2, 0, 1, 0, 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 1, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 129, 0, 0, 0, 138, 0, 0, 0, + 213, 0, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 0, 0, 0, 3, 0, 1, 0, - 144, 0, 0, 0, 2, 0, 1, 0, + 216, 0, 0, 0, 3, 0, 1, 0, + 228, 0, 0, 0, 2, 0, 1, 0, 2, 0, 0, 0, 5, 0, 0, 0, 0, 0, 1, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 0, 0, 0, 122, 0, 0, 0, + 225, 0, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 140, 0, 0, 0, 3, 0, 1, 0, - 168, 0, 0, 0, 2, 0, 1, 0, + 224, 0, 0, 0, 3, 0, 1, 0, + 252, 0, 0, 0, 2, 0, 1, 0, 3, 0, 0, 0, 6, 0, 0, 0, 0, 0, 1, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 165, 0, 0, 0, 146, 0, 0, 0, + 249, 0, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 168, 0, 0, 0, 3, 0, 1, 0, - 180, 0, 0, 0, 2, 0, 1, 0, - 4, 0, 0, 0, 11, 0, 0, 0, + 252, 0, 0, 0, 3, 0, 1, 0, + 8, 1, 0, 0, 2, 0, 1, 0, + 4, 0, 0, 0, 7, 0, 0, 0, + 0, 0, 1, 0, 8, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 5, 1, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 4, 1, 0, 0, 3, 0, 1, 0, + 16, 1, 0, 0, 2, 0, 1, 0, + 5, 0, 0, 0, 17, 0, 0, 0, + 0, 0, 1, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 13, 1, 0, 0, 66, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 8, 1, 0, 0, 3, 0, 1, 0, + 20, 1, 0, 0, 2, 0, 1, 0, + 6, 0, 0, 0, 11, 0, 0, 0, 0, 0, 1, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 177, 0, 0, 0, 106, 0, 0, 0, + 17, 1, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 176, 0, 0, 0, 3, 0, 1, 0, - 188, 0, 0, 0, 2, 0, 1, 0, + 16, 1, 0, 0, 3, 0, 1, 0, + 28, 1, 0, 0, 2, 0, 1, 0, + 7, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 1, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 25, 1, 0, 0, 146, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 28, 1, 0, 0, 3, 0, 1, 0, + 112, 1, 0, 0, 2, 0, 1, 0, 103, 99, 116, 120, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1765,12 +1724,57 @@ static const ::capnp::_::AlignedData<102> b_bf30d2aee536f5f7 = { 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 112, 97, 110, 100, 97, 73, 110, 102, + 111, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 173, 240, 223, 92, 114, 232, 115, 230, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 112, 97, 115, 115, 105, 118, 101, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 105, 111, 115, 66, 117, 105, 108, 100, 73, 110, 102, 111, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 128, 85, 159, 35, 40, 59, 126, 217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 97, 110, 100, 114, 111, 105, 100, 80, + 114, 111, 112, 101, 114, 116, 105, 101, + 115, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 0, 0, 0, 0, + 150, 182, 62, 24, 226, 60, 177, 248, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 1, 0, 0, 0, 31, 0, 0, 0, + 4, 0, 0, 0, 2, 0, 1, 0, + 150, 182, 62, 24, 226, 60, 177, 248, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 39, 0, 0, 0, + 8, 0, 0, 0, 1, 0, 1, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 3, 0, 1, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 16, 0, 0, 0, 3, 0, 1, 0, + 12, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 12, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, } @@ -1781,14 +1785,19 @@ static const ::capnp::_::RawSchema* const d_bf30d2aee536f5f7[] = { &s_9b513b93a887dbcd, &s_9cfb5d53a4f615a5, &s_d97e3b28239f5580, + &s_e673e8725cdff0ad, &s_e71008caeb3fb65c, + &s_f8b13ce2183eb696, &s_fe2919d5c21f426c, }; -static const uint16_t m_bf30d2aee536f5f7[] = {1, 2, 3, 0, 4}; -static const uint16_t i_bf30d2aee536f5f7[] = {0, 1, 2, 3, 4}; +static const uint16_t m_bf30d2aee536f5f7[] = {1, 7, 2, 3, 0, 6, 4, 5}; +static const uint16_t i_bf30d2aee536f5f7[] = {0, 1, 2, 3, 4, 5, 6, 7}; +KJ_CONSTEXPR(const) ::capnp::_::RawBrandedSchema::Dependency bd_bf30d2aee536f5f7[] = { + { 16777223, ::cereal::Map< ::capnp::Text, ::capnp::Text>::_capnpPrivate::brand() }, +}; const ::capnp::_::RawSchema s_bf30d2aee536f5f7 = { - 0xbf30d2aee536f5f7, b_bf30d2aee536f5f7.words, 102, d_bf30d2aee536f5f7, m_bf30d2aee536f5f7, - 5, 5, i_bf30d2aee536f5f7, nullptr, nullptr, { &s_bf30d2aee536f5f7, nullptr, nullptr, 0, 0, nullptr }, true + 0xbf30d2aee536f5f7, b_bf30d2aee536f5f7.words, 168, d_bf30d2aee536f5f7, m_bf30d2aee536f5f7, + 7, 8, i_bf30d2aee536f5f7, nullptr, nullptr, { &s_bf30d2aee536f5f7, nullptr, bd_bf30d2aee536f5f7, 0, sizeof(bd_bf30d2aee536f5f7) / sizeof(bd_bf30d2aee536f5f7[0]), nullptr }, true }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<310> b_ea0245f695ae0a33 = { @@ -5153,7 +5162,7 @@ const ::capnp::_::RawSchema s_f2a471ddb31e795a = { 1, 19, i_f2a471ddb31e795a, nullptr, nullptr, { &s_f2a471ddb31e795a, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<551> b_a7649e2575e4591e = { +static const ::capnp::_::AlignedData<583> b_a7649e2575e4591e = { { 0, 0, 0, 0, 5, 0, 6, 0, 30, 89, 228, 117, 37, 158, 100, 167, 10, 0, 0, 0, 1, 0, 10, 0, @@ -5163,7 +5172,7 @@ static const ::capnp::_::AlignedData<551> b_a7649e2575e4591e = { 21, 0, 0, 0, 170, 0, 0, 0, 29, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 105, 0, 0, 0, 7, 7, 0, 0, + 105, 0, 0, 0, 119, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -5190,231 +5199,245 @@ static const ::capnp::_::AlignedData<551> b_a7649e2575e4591e = { 116, 97, 116, 117, 115, 0, 0, 0, 80, 97, 110, 100, 97, 67, 97, 110, 83, 116, 97, 116, 101, 0, 0, 0, - 128, 0, 0, 0, 3, 0, 4, 0, + 136, 0, 0, 0, 3, 0, 4, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 113, 3, 0, 0, 66, 0, 0, 0, + 169, 3, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 108, 3, 0, 0, 3, 0, 1, 0, - 120, 3, 0, 0, 2, 0, 1, 0, + 164, 3, 0, 0, 3, 0, 1, 0, + 176, 3, 0, 0, 2, 0, 1, 0, 28, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 117, 3, 0, 0, 66, 0, 0, 0, + 173, 3, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 112, 3, 0, 0, 3, 0, 1, 0, - 124, 3, 0, 0, 2, 0, 1, 0, + 168, 3, 0, 0, 3, 0, 1, 0, + 180, 3, 0, 0, 2, 0, 1, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 121, 3, 0, 0, 106, 0, 0, 0, + 177, 3, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 120, 3, 0, 0, 3, 0, 1, 0, - 132, 3, 0, 0, 2, 0, 1, 0, + 176, 3, 0, 0, 3, 0, 1, 0, + 188, 3, 0, 0, 2, 0, 1, 0, 20, 0, 0, 0, 65, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 129, 3, 0, 0, 130, 0, 0, 0, + 185, 3, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 128, 3, 0, 0, 3, 0, 1, 0, - 140, 3, 0, 0, 2, 0, 1, 0, - 31, 0, 0, 0, 0, 0, 0, 0, + 184, 3, 0, 0, 3, 0, 1, 0, + 196, 3, 0, 0, 2, 0, 1, 0, + 33, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 68, 250, 79, 228, 97, 255, 114, 238, - 137, 3, 0, 0, 90, 0, 0, 0, + 193, 3, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 117, 3, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 120, 3, 0, 0, 3, 0, 1, 0, - 132, 3, 0, 0, 2, 0, 1, 0, - 2, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 1, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 129, 3, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 132, 3, 0, 0, 3, 0, 1, 0, - 144, 3, 0, 0, 2, 0, 1, 0, - 3, 0, 0, 0, 5, 0, 0, 0, - 0, 0, 1, 0, 10, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 141, 3, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 140, 3, 0, 0, 3, 0, 1, 0, - 152, 3, 0, 0, 2, 0, 1, 0, - 4, 0, 0, 0, 69, 0, 0, 0, - 0, 0, 1, 0, 13, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 149, 3, 0, 0, 98, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 148, 3, 0, 0, 3, 0, 1, 0, - 160, 3, 0, 0, 2, 0, 1, 0, - 23, 0, 0, 0, 14, 0, 0, 0, - 0, 0, 1, 0, 14, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 157, 3, 0, 0, 98, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 156, 3, 0, 0, 3, 0, 1, 0, - 168, 3, 0, 0, 2, 0, 1, 0, - 5, 0, 0, 0, 15, 0, 0, 0, - 0, 0, 1, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 165, 3, 0, 0, 98, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 164, 3, 0, 0, 3, 0, 1, 0, - 176, 3, 0, 0, 2, 0, 1, 0, - 6, 0, 0, 0, 70, 0, 0, 0, - 0, 0, 1, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 173, 3, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 176, 3, 0, 0, 3, 0, 1, 0, 188, 3, 0, 0, 2, 0, 1, 0, + 2, 0, 0, 0, 4, 0, 0, 0, + 0, 0, 1, 0, 8, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 185, 3, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 188, 3, 0, 0, 3, 0, 1, 0, + 200, 3, 0, 0, 2, 0, 1, 0, + 3, 0, 0, 0, 5, 0, 0, 0, + 0, 0, 1, 0, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 197, 3, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 196, 3, 0, 0, 3, 0, 1, 0, + 208, 3, 0, 0, 2, 0, 1, 0, + 4, 0, 0, 0, 69, 0, 0, 0, + 0, 0, 1, 0, 13, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 205, 3, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 204, 3, 0, 0, 3, 0, 1, 0, + 216, 3, 0, 0, 2, 0, 1, 0, + 23, 0, 0, 0, 14, 0, 0, 0, + 0, 0, 1, 0, 14, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 213, 3, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 212, 3, 0, 0, 3, 0, 1, 0, + 224, 3, 0, 0, 2, 0, 1, 0, + 5, 0, 0, 0, 15, 0, 0, 0, + 0, 0, 1, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 221, 3, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 220, 3, 0, 0, 3, 0, 1, 0, + 232, 3, 0, 0, 2, 0, 1, 0, + 6, 0, 0, 0, 70, 0, 0, 0, + 0, 0, 1, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 229, 3, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 232, 3, 0, 0, 3, 0, 1, 0, + 244, 3, 0, 0, 2, 0, 1, 0, 7, 0, 0, 0, 8, 0, 0, 0, 0, 0, 1, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 185, 3, 0, 0, 58, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 180, 3, 0, 0, 3, 0, 1, 0, - 192, 3, 0, 0, 2, 0, 1, 0, - 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 18, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 189, 3, 0, 0, 58, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 184, 3, 0, 0, 3, 0, 1, 0, - 212, 3, 0, 0, 2, 0, 1, 0, - 21, 0, 0, 0, 9, 0, 0, 0, - 0, 0, 1, 0, 19, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 209, 3, 0, 0, 130, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 208, 3, 0, 0, 3, 0, 1, 0, - 220, 3, 0, 0, 2, 0, 1, 0, - 13, 0, 0, 0, 21, 0, 0, 0, - 0, 0, 1, 0, 21, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 217, 3, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 216, 3, 0, 0, 3, 0, 1, 0, - 228, 3, 0, 0, 2, 0, 1, 0, - 9, 0, 0, 0, 71, 0, 0, 0, - 0, 0, 1, 0, 22, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 225, 3, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 224, 3, 0, 0, 3, 0, 1, 0, - 236, 3, 0, 0, 2, 0, 1, 0, - 25, 0, 0, 0, 22, 0, 0, 0, - 0, 0, 1, 0, 23, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 233, 3, 0, 0, 178, 0, 0, 0, + 241, 3, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, 3, 0, 0, 3, 0, 1, 0, 248, 3, 0, 0, 2, 0, 1, 0, - 22, 0, 0, 0, 12, 0, 0, 0, - 0, 0, 1, 0, 24, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 245, 3, 0, 0, 130, 0, 0, 0, + 245, 3, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 244, 3, 0, 0, 3, 0, 1, 0, - 0, 4, 0, 0, 2, 0, 1, 0, - 10, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 1, 0, 25, 0, 0, 0, + 240, 3, 0, 0, 3, 0, 1, 0, + 12, 4, 0, 0, 2, 0, 1, 0, + 21, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 1, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 253, 3, 0, 0, 114, 0, 0, 0, + 9, 4, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 252, 3, 0, 0, 3, 0, 1, 0, - 8, 4, 0, 0, 2, 0, 1, 0, - 24, 0, 0, 0, 23, 0, 0, 0, - 0, 0, 1, 0, 27, 0, 0, 0, + 8, 4, 0, 0, 3, 0, 1, 0, + 20, 4, 0, 0, 2, 0, 1, 0, + 13, 0, 0, 0, 21, 0, 0, 0, + 0, 0, 1, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5, 4, 0, 0, 98, 0, 0, 0, + 17, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 4, 0, 0, 3, 0, 1, 0, - 16, 4, 0, 0, 2, 0, 1, 0, - 11, 0, 0, 0, 9, 0, 0, 0, - 0, 0, 1, 0, 28, 0, 0, 0, + 16, 4, 0, 0, 3, 0, 1, 0, + 28, 4, 0, 0, 2, 0, 1, 0, + 9, 0, 0, 0, 71, 0, 0, 0, + 0, 0, 1, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13, 4, 0, 0, 74, 0, 0, 0, + 25, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 4, 0, 0, 3, 0, 1, 0, - 24, 4, 0, 0, 2, 0, 1, 0, - 17, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 1, 0, 29, 0, 0, 0, + 24, 4, 0, 0, 3, 0, 1, 0, + 36, 4, 0, 0, 2, 0, 1, 0, + 25, 0, 0, 0, 22, 0, 0, 0, + 0, 0, 1, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 4, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 20, 4, 0, 0, 3, 0, 1, 0, - 32, 4, 0, 0, 2, 0, 1, 0, - 18, 0, 0, 0, 2, 0, 0, 0, - 0, 0, 1, 0, 30, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 29, 4, 0, 0, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 28, 4, 0, 0, 3, 0, 1, 0, - 40, 4, 0, 0, 2, 0, 1, 0, - 19, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 1, 0, 31, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 37, 4, 0, 0, 82, 0, 0, 0, + 33, 4, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 4, 0, 0, 3, 0, 1, 0, 48, 4, 0, 0, 2, 0, 1, 0, - 26, 0, 0, 0, 224, 1, 0, 0, - 0, 0, 1, 0, 32, 0, 0, 0, + 22, 0, 0, 0, 12, 0, 0, 0, + 0, 0, 1, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 4, 0, 0, 178, 0, 0, 0, + 45, 4, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 4, 0, 0, 3, 0, 1, 0, - 60, 4, 0, 0, 2, 0, 1, 0, - 12, 0, 0, 0, 31, 0, 0, 0, - 0, 0, 1, 0, 33, 0, 0, 0, + 44, 4, 0, 0, 3, 0, 1, 0, + 56, 4, 0, 0, 2, 0, 1, 0, + 10, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 1, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 4, 0, 0, 114, 0, 0, 0, + 53, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 56, 4, 0, 0, 3, 0, 1, 0, - 68, 4, 0, 0, 2, 0, 1, 0, - 14, 0, 0, 0, 16, 0, 0, 0, - 0, 0, 1, 0, 35, 0, 0, 0, + 52, 4, 0, 0, 3, 0, 1, 0, + 64, 4, 0, 0, 2, 0, 1, 0, + 24, 0, 0, 0, 23, 0, 0, 0, + 0, 0, 1, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 4, 0, 0, 98, 0, 0, 0, + 61, 4, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 4, 0, 0, 3, 0, 1, 0, - 76, 4, 0, 0, 2, 0, 1, 0, - 15, 0, 0, 0, 17, 0, 0, 0, - 0, 0, 1, 0, 36, 0, 0, 0, + 60, 4, 0, 0, 3, 0, 1, 0, + 72, 4, 0, 0, 2, 0, 1, 0, + 11, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 1, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 4, 0, 0, 98, 0, 0, 0, + 69, 4, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 4, 0, 0, 3, 0, 1, 0, - 84, 4, 0, 0, 2, 0, 1, 0, - 16, 0, 0, 0, 36, 0, 0, 0, - 0, 0, 1, 0, 37, 0, 0, 0, + 68, 4, 0, 0, 3, 0, 1, 0, + 80, 4, 0, 0, 2, 0, 1, 0, + 17, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 81, 4, 0, 0, 138, 0, 0, 0, + 77, 4, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 76, 4, 0, 0, 3, 0, 1, 0, + 88, 4, 0, 0, 2, 0, 1, 0, + 18, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 1, 0, 30, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 85, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 4, 0, 0, 3, 0, 1, 0, 96, 4, 0, 0, 2, 0, 1, 0, - 29, 0, 0, 0, 225, 1, 0, 0, - 0, 0, 1, 0, 38, 0, 0, 0, + 19, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 1, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 4, 0, 0, 186, 0, 0, 0, + 93, 4, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 96, 4, 0, 0, 3, 0, 1, 0, - 108, 4, 0, 0, 2, 0, 1, 0, - 30, 0, 0, 0, 226, 1, 0, 0, - 0, 0, 1, 0, 39, 0, 0, 0, + 92, 4, 0, 0, 3, 0, 1, 0, + 104, 4, 0, 0, 2, 0, 1, 0, + 26, 0, 0, 0, 224, 1, 0, 0, + 0, 0, 1, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 105, 4, 0, 0, 226, 0, 0, 0, + 101, 4, 0, 0, 178, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 104, 4, 0, 0, 3, 0, 1, 0, + 116, 4, 0, 0, 2, 0, 1, 0, + 12, 0, 0, 0, 31, 0, 0, 0, + 0, 0, 1, 0, 33, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 113, 4, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 4, 0, 0, 3, 0, 1, 0, 124, 4, 0, 0, 2, 0, 1, 0, + 14, 0, 0, 0, 16, 0, 0, 0, + 0, 0, 1, 0, 35, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 121, 4, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 120, 4, 0, 0, 3, 0, 1, 0, + 132, 4, 0, 0, 2, 0, 1, 0, + 15, 0, 0, 0, 17, 0, 0, 0, + 0, 0, 1, 0, 36, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 129, 4, 0, 0, 98, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 128, 4, 0, 0, 3, 0, 1, 0, + 140, 4, 0, 0, 2, 0, 1, 0, + 16, 0, 0, 0, 36, 0, 0, 0, + 0, 0, 1, 0, 37, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 137, 4, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 140, 4, 0, 0, 3, 0, 1, 0, + 152, 4, 0, 0, 2, 0, 1, 0, + 29, 0, 0, 0, 225, 1, 0, 0, + 0, 0, 1, 0, 38, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 149, 4, 0, 0, 186, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 152, 4, 0, 0, 3, 0, 1, 0, + 164, 4, 0, 0, 2, 0, 1, 0, + 30, 0, 0, 0, 226, 1, 0, 0, + 0, 0, 1, 0, 39, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 161, 4, 0, 0, 226, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 168, 4, 0, 0, 3, 0, 1, 0, + 180, 4, 0, 0, 2, 0, 1, 0, + 31, 0, 0, 0, 227, 1, 0, 0, + 0, 0, 1, 0, 40, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 177, 4, 0, 0, 74, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 176, 4, 0, 0, 3, 0, 1, 0, + 188, 4, 0, 0, 2, 0, 1, 0, + 32, 0, 0, 0, 228, 1, 0, 0, + 0, 0, 1, 0, 41, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 185, 4, 0, 0, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 184, 4, 0, 0, 3, 0, 1, 0, + 196, 4, 0, 0, 2, 0, 1, 0, 118, 111, 108, 116, 97, 103, 101, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5698,6 +5721,24 @@ static const ::capnp::_::AlignedData<551> b_a7649e2575e4591e = { 65, 108, 108, 111, 119, 101, 100, 76, 111, 110, 103, 105, 116, 117, 100, 105, 110, 97, 108, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 110, 109, 105, 82, 101, 115, 101, 116, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 104, 97, 114, 100, 102, 97, 117, 108, + 116, 82, 101, 115, 101, 116, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5717,11 +5758,11 @@ static const ::capnp::_::RawSchema* const d_a7649e2575e4591e[] = { &s_f69a3ed1e8c081bf, &s_f8d2972deb0cd45c, }; -static const uint16_t m_a7649e2575e4591e[] = {17, 22, 23, 24, 3, 30, 31, 1, 4, 21, 10, 13, 15, 16, 8, 2, 19, 7, 11, 5, 9, 20, 25, 14, 18, 27, 28, 29, 26, 6, 12, 0}; -static const uint16_t i_a7649e2575e4591e[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; +static const uint16_t m_a7649e2575e4591e[] = {17, 22, 23, 24, 3, 30, 31, 1, 4, 21, 10, 13, 33, 15, 16, 8, 2, 19, 32, 7, 11, 5, 9, 20, 25, 14, 18, 27, 28, 29, 26, 6, 12, 0}; +static const uint16_t i_a7649e2575e4591e[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33}; const ::capnp::_::RawSchema s_a7649e2575e4591e = { - 0xa7649e2575e4591e, b_a7649e2575e4591e.words, 551, d_a7649e2575e4591e, m_a7649e2575e4591e, - 7, 32, i_a7649e2575e4591e, nullptr, nullptr, { &s_a7649e2575e4591e, nullptr, nullptr, 0, 0, nullptr }, false + 0xa7649e2575e4591e, b_a7649e2575e4591e.words, 583, d_a7649e2575e4591e, m_a7649e2575e4591e, + 7, 34, i_a7649e2575e4591e, nullptr, nullptr, { &s_a7649e2575e4591e, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<33> b_f2fd0b8b0ac9adbb = { @@ -6920,17 +6961,17 @@ const ::capnp::_::RawSchema s_c8f7b80780f5f1b7 = { 2, 1, i_c8f7b80780f5f1b7, nullptr, nullptr, { &s_c8f7b80780f5f1b7, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<39> b_8b644b0be77bac9f = { +static const ::capnp::_::AlignedData<55> b_8b644b0be77bac9f = { { 0, 0, 0, 0, 5, 0, 6, 0, 159, 172, 123, 231, 11, 75, 100, 139, - 10, 0, 0, 0, 1, 0, 0, 0, + 10, 0, 0, 0, 1, 0, 1, 0, 91, 40, 164, 37, 126, 241, 177, 243, 1, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 154, 0, 0, 0, 29, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 0, 0, 0, 63, 0, 0, 0, + 37, 0, 0, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -6940,14 +6981,21 @@ static const ::capnp::_::AlignedData<39> b_8b644b0be77bac9f = { 154, 206, 1, 156, 156, 248, 156, 149, 1, 0, 0, 0, 58, 0, 0, 0, 68, 101, 118, 105, 99, 101, 0, 0, - 4, 0, 0, 0, 3, 0, 4, 0, + 8, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 66, 0, 0, 0, + 41, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 8, 0, 0, 0, 3, 0, 1, 0, - 36, 0, 0, 0, 2, 0, 1, 0, + 36, 0, 0, 0, 3, 0, 1, 0, + 64, 0, 0, 0, 2, 0, 1, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 61, 0, 0, 0, 82, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 60, 0, 0, 0, 3, 0, 1, 0, + 72, 0, 0, 0, 2, 0, 1, 0, 100, 101, 118, 105, 99, 101, 115, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6958,6 +7006,15 @@ static const ::capnp::_::AlignedData<39> b_8b644b0be77bac9f = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 99, 111, 110, 110, 101, 99, 116, 101, + 100, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, } }; @@ -6966,11 +7023,11 @@ static const ::capnp::_::AlignedData<39> b_8b644b0be77bac9f = { static const ::capnp::_::RawSchema* const d_8b644b0be77bac9f[] = { &s_959cf89c9c01ce9a, }; -static const uint16_t m_8b644b0be77bac9f[] = {0}; -static const uint16_t i_8b644b0be77bac9f[] = {0}; +static const uint16_t m_8b644b0be77bac9f[] = {1, 0}; +static const uint16_t i_8b644b0be77bac9f[] = {0, 1}; const ::capnp::_::RawSchema s_8b644b0be77bac9f = { - 0x8b644b0be77bac9f, b_8b644b0be77bac9f.words, 39, d_8b644b0be77bac9f, m_8b644b0be77bac9f, - 1, 1, i_8b644b0be77bac9f, nullptr, nullptr, { &s_8b644b0be77bac9f, nullptr, nullptr, 0, 0, nullptr }, false + 0x8b644b0be77bac9f, b_8b644b0be77bac9f.words, 55, d_8b644b0be77bac9f, m_8b644b0be77bac9f, + 1, 2, i_8b644b0be77bac9f, nullptr, nullptr, { &s_8b644b0be77bac9f, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<163> b_959cf89c9c01ce9a = { @@ -8390,7 +8447,7 @@ const ::capnp::_::RawSchema s_c593e8bf980ad645 = { 1, 4, i_c593e8bf980ad645, nullptr, nullptr, { &s_c593e8bf980ad645, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<249> b_b52430dc48f4a83b = { +static const ::capnp::_::AlignedData<232> b_b52430dc48f4a83b = { { 0, 0, 0, 0, 5, 0, 6, 0, 59, 168, 244, 72, 220, 48, 36, 181, 10, 0, 0, 0, 1, 0, 2, 0, @@ -8400,7 +8457,7 @@ static const ::capnp::_::AlignedData<249> b_b52430dc48f4a83b = { 21, 0, 0, 0, 202, 0, 0, 0, 33, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 0, 0, 0, 23, 3, 0, 0, + 93, 0, 0, 0, 223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -8424,105 +8481,98 @@ static const ::capnp::_::AlignedData<249> b_b52430dc48f4a83b = { 116, 117, 115, 0, 0, 0, 0, 0, 65, 108, 101, 114, 116, 83, 105, 122, 101, 0, 0, 0, 0, 0, 0, 0, - 56, 0, 0, 0, 3, 0, 4, 0, + 52, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 121, 1, 0, 0, 50, 0, 0, 0, + 93, 1, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 1, 0, 0, 3, 0, 1, 0, - 128, 1, 0, 0, 2, 0, 1, 0, + 88, 1, 0, 0, 3, 0, 1, 0, + 100, 1, 0, 0, 2, 0, 1, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 1, 0, 0, 66, 0, 0, 0, + 97, 1, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 120, 1, 0, 0, 3, 0, 1, 0, - 132, 1, 0, 0, 2, 0, 1, 0, + 92, 1, 0, 0, 3, 0, 1, 0, + 104, 1, 0, 0, 2, 0, 1, 0, 2, 0, 0, 0, 17, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 129, 1, 0, 0, 58, 0, 0, 0, + 101, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 124, 1, 0, 0, 3, 0, 1, 0, - 136, 1, 0, 0, 2, 0, 1, 0, + 96, 1, 0, 0, 3, 0, 1, 0, + 108, 1, 0, 0, 2, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 1, 0, 0, 90, 0, 0, 0, + 105, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 1, 0, 0, 3, 0, 1, 0, - 144, 1, 0, 0, 2, 0, 1, 0, + 104, 1, 0, 0, 3, 0, 1, 0, + 116, 1, 0, 0, 2, 0, 1, 0, 5, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 1, 0, 0, 90, 0, 0, 0, + 113, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 140, 1, 0, 0, 3, 0, 1, 0, - 152, 1, 0, 0, 2, 0, 1, 0, + 112, 1, 0, 0, 3, 0, 1, 0, + 124, 1, 0, 0, 2, 0, 1, 0, 6, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 149, 1, 0, 0, 98, 0, 0, 0, + 121, 1, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 1, 0, 0, 3, 0, 1, 0, - 160, 1, 0, 0, 2, 0, 1, 0, + 120, 1, 0, 0, 3, 0, 1, 0, + 132, 1, 0, 0, 2, 0, 1, 0, 7, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 1, 0, 0, 82, 0, 0, 0, + 129, 1, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 156, 1, 0, 0, 3, 0, 1, 0, - 168, 1, 0, 0, 2, 0, 1, 0, + 128, 1, 0, 0, 3, 0, 1, 0, + 140, 1, 0, 0, 2, 0, 1, 0, 8, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 165, 1, 0, 0, 82, 0, 0, 0, + 137, 1, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 164, 1, 0, 0, 3, 0, 1, 0, - 176, 1, 0, 0, 2, 0, 1, 0, - 13, 0, 0, 0, 0, 0, 0, 0, + 136, 1, 0, 0, 3, 0, 1, 0, + 148, 1, 0, 0, 2, 0, 1, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 96, 233, 73, 193, 108, 74, 225, 155, - 173, 1, 0, 0, 90, 0, 0, 0, + 145, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 18, 0, 0, 0, 0, 0, 1, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 153, 1, 0, 0, 90, 0, 0, 0, + 125, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 152, 1, 0, 0, 3, 0, 1, 0, - 164, 1, 0, 0, 2, 0, 1, 0, - 11, 0, 0, 0, 19, 0, 0, 0, - 0, 0, 1, 0, 10, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 161, 1, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 164, 1, 0, 0, 3, 0, 1, 0, - 176, 1, 0, 0, 2, 0, 1, 0, - 12, 0, 0, 0, 5, 0, 0, 0, + 124, 1, 0, 0, 3, 0, 1, 0, + 136, 1, 0, 0, 2, 0, 1, 0, + 11, 0, 0, 0, 5, 0, 0, 0, 0, 0, 1, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 173, 1, 0, 0, 98, 0, 0, 0, + 133, 1, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 172, 1, 0, 0, 3, 0, 1, 0, - 184, 1, 0, 0, 2, 0, 1, 0, + 132, 1, 0, 0, 3, 0, 1, 0, + 144, 1, 0, 0, 2, 0, 1, 0, 10, 0, 0, 0, 6, 0, 0, 0, 0, 0, 1, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 1, 0, 0, 122, 0, 0, 0, + 141, 1, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 180, 1, 0, 0, 3, 0, 1, 0, - 192, 1, 0, 0, 2, 0, 1, 0, + 140, 1, 0, 0, 3, 0, 1, 0, + 152, 1, 0, 0, 2, 0, 1, 0, 9, 0, 0, 0, 7, 0, 0, 0, 0, 0, 1, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 189, 1, 0, 0, 90, 0, 0, 0, + 149, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 188, 1, 0, 0, 3, 0, 1, 0, - 200, 1, 0, 0, 2, 0, 1, 0, + 148, 1, 0, 0, 3, 0, 1, 0, + 160, 1, 0, 0, 2, 0, 1, 0, 115, 116, 97, 116, 101, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 97, 172, 209, 210, 150, 139, 229, 219, @@ -8603,16 +8653,6 @@ static const ::capnp::_::AlignedData<249> b_b52430dc48f4a83b = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101, 120, 112, 101, 114, 105, 109, 101, - 110, 116, 97, 108, 77, 111, 100, 101, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 112, 101, 114, 115, 111, 110, 97, 108, 105, 116, 121, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, @@ -8652,11 +8692,11 @@ static const ::capnp::_::RawSchema* const d_b52430dc48f4a83b[] = { &s_e98bb99d6e985f64, &s_e9e600c8b9e6b62d, }; -static const uint16_t m_b52430dc48f4a83b[] = {2, 12, 6, 13, 5, 3, 4, 7, 8, 1, 9, 10, 11, 0}; -static const uint16_t i_b52430dc48f4a83b[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}; +static const uint16_t m_b52430dc48f4a83b[] = {2, 11, 6, 12, 5, 3, 4, 7, 8, 1, 9, 10, 0}; +static const uint16_t i_b52430dc48f4a83b[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; const ::capnp::_::RawSchema s_b52430dc48f4a83b = { - 0xb52430dc48f4a83b, b_b52430dc48f4a83b.words, 249, d_b52430dc48f4a83b, m_b52430dc48f4a83b, - 7, 14, i_b52430dc48f4a83b, nullptr, nullptr, { &s_b52430dc48f4a83b, nullptr, nullptr, 0, 0, nullptr }, false + 0xb52430dc48f4a83b, b_b52430dc48f4a83b.words, 232, d_b52430dc48f4a83b, m_b52430dc48f4a83b, + 7, 13, i_b52430dc48f4a83b, nullptr, nullptr, { &s_b52430dc48f4a83b, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<72> b_e9e600c8b9e6b62d = { @@ -8886,7 +8926,7 @@ const ::capnp::_::RawSchema s_e98bb99d6e985f64 = { }; #endif // !CAPNP_LITE CAPNP_DEFINE_ENUM(AlertSize_e98bb99d6e985f64, e98bb99d6e985f64); -static const ::capnp::_::AlignedData<34> b_9be14a6cc149e960 = { +static const ::capnp::_::AlignedData<51> b_9be14a6cc149e960 = { { 0, 0, 0, 0, 5, 0, 6, 0, 96, 233, 73, 193, 108, 74, 225, 155, 25, 0, 0, 0, 1, 0, 2, 0, @@ -8896,7 +8936,7 @@ static const ::capnp::_::AlignedData<34> b_9be14a6cc149e960 = { 21, 0, 0, 0, 34, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 0, 63, 0, 0, 0, + 29, 0, 0, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -8904,14 +8944,21 @@ static const ::capnp::_::AlignedData<34> b_9be14a6cc149e960 = { 105, 118, 101, 83, 116, 97, 116, 101, 46, 100, 101, 112, 114, 101, 99, 97, 116, 101, 100, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 3, 0, 4, 0, + 8, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 1, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 90, 0, 0, 0, + 41, 0, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 3, 0, 1, 0, - 24, 0, 0, 0, 2, 0, 1, 0, + 40, 0, 0, 0, 3, 0, 1, 0, + 52, 0, 0, 0, 2, 0, 1, 0, + 1, 0, 0, 0, 19, 0, 0, 0, + 0, 0, 1, 0, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 49, 0, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 52, 0, 0, 0, 3, 0, 1, 0, + 64, 0, 0, 0, 2, 0, 1, 0, 97, 108, 101, 114, 116, 83, 111, 117, 110, 100, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, @@ -8919,6 +8966,16 @@ static const ::capnp::_::AlignedData<34> b_9be14a6cc149e960 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 101, 120, 112, 101, 114, 105, 109, 101, + 110, 116, 97, 108, 77, 111, 100, 101, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, } }; @@ -8928,11 +8985,11 @@ static const ::capnp::_::RawSchema* const d_9be14a6cc149e960[] = { &s_b52430dc48f4a83b, &s_f5a5e26c954e339e, }; -static const uint16_t m_9be14a6cc149e960[] = {0}; -static const uint16_t i_9be14a6cc149e960[] = {0}; +static const uint16_t m_9be14a6cc149e960[] = {0, 1}; +static const uint16_t i_9be14a6cc149e960[] = {0, 1}; const ::capnp::_::RawSchema s_9be14a6cc149e960 = { - 0x9be14a6cc149e960, b_9be14a6cc149e960.words, 34, d_9be14a6cc149e960, m_9be14a6cc149e960, - 2, 1, i_9be14a6cc149e960, nullptr, nullptr, { &s_9be14a6cc149e960, nullptr, nullptr, 0, 0, nullptr }, false + 0x9be14a6cc149e960, b_9be14a6cc149e960.words, 51, d_9be14a6cc149e960, m_9be14a6cc149e960, + 2, 2, i_9be14a6cc149e960, nullptr, nullptr, { &s_9be14a6cc149e960, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<209> b_97ff69c53601abf1 = { @@ -13682,7 +13739,7 @@ const ::capnp::_::RawSchema s_ed12f1c294702e30 = { 0, 1, i_ed12f1c294702e30, nullptr, nullptr, { &s_ed12f1c294702e30, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<248> b_e00b5b3eba12876c = { +static const ::capnp::_::AlignedData<264> b_e00b5b3eba12876c = { { 0, 0, 0, 0, 5, 0, 6, 0, 108, 135, 18, 186, 62, 91, 11, 224, 10, 0, 0, 0, 1, 0, 11, 0, @@ -13692,7 +13749,7 @@ static const ::capnp::_::AlignedData<248> b_e00b5b3eba12876c = { 21, 0, 0, 0, 218, 0, 0, 0, 33, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 0, 0, 0, 23, 3, 0, 0, + 49, 0, 0, 0, 79, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -13705,105 +13762,112 @@ static const ::capnp::_::AlignedData<248> b_e00b5b3eba12876c = { 76, 111, 110, 103, 105, 116, 117, 100, 105, 110, 97, 108, 80, 108, 97, 110, 83, 111, 117, 114, 99, 101, 0, 0, - 56, 0, 0, 0, 3, 0, 4, 0, - 13, 0, 0, 0, 0, 0, 0, 0, + 60, 0, 0, 0, 3, 0, 4, 0, + 14, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 33, 39, 127, 216, 90, 49, 65, 242, - 121, 1, 0, 0, 90, 0, 0, 0, + 149, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101, 1, 0, 0, 66, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 96, 1, 0, 0, 3, 0, 1, 0, - 108, 1, 0, 0, 2, 0, 1, 0, - 2, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 1, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 105, 1, 0, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 100, 1, 0, 0, 3, 0, 1, 0, - 112, 1, 0, 0, 2, 0, 1, 0, - 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 1, 0, 9, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 109, 1, 0, 0, 114, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 108, 1, 0, 0, 3, 0, 1, 0, - 120, 1, 0, 0, 2, 0, 1, 0, - 3, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 1, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 117, 1, 0, 0, 186, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 120, 1, 0, 0, 3, 0, 1, 0, - 132, 1, 0, 0, 2, 0, 1, 0, - 8, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 1, 0, 18, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 129, 1, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 1, 0, 0, 3, 0, 1, 0, 136, 1, 0, 0, 2, 0, 1, 0, + 2, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 1, 0, 8, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 133, 1, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 128, 1, 0, 0, 3, 0, 1, 0, + 140, 1, 0, 0, 2, 0, 1, 0, + 0, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 1, 0, 9, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 137, 1, 0, 0, 114, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 136, 1, 0, 0, 3, 0, 1, 0, + 148, 1, 0, 0, 2, 0, 1, 0, + 3, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 145, 1, 0, 0, 186, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 148, 1, 0, 0, 3, 0, 1, 0, + 160, 1, 0, 0, 2, 0, 1, 0, + 8, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 1, 0, 18, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 157, 1, 0, 0, 66, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 152, 1, 0, 0, 3, 0, 1, 0, + 164, 1, 0, 0, 2, 0, 1, 0, 4, 0, 0, 0, 18, 0, 0, 0, 0, 0, 1, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 1, 0, 0, 130, 0, 0, 0, + 161, 1, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 1, 0, 0, 3, 0, 1, 0, - 144, 1, 0, 0, 2, 0, 1, 0, + 160, 1, 0, 0, 3, 0, 1, 0, + 172, 1, 0, 0, 2, 0, 1, 0, 5, 0, 0, 0, 3, 0, 0, 0, 0, 0, 1, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 1, 0, 0, 58, 0, 0, 0, + 169, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 136, 1, 0, 0, 3, 0, 1, 0, - 164, 1, 0, 0, 2, 0, 1, 0, + 164, 1, 0, 0, 3, 0, 1, 0, + 192, 1, 0, 0, 2, 0, 1, 0, 6, 0, 0, 0, 4, 0, 0, 0, 0, 0, 1, 0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 161, 1, 0, 0, 58, 0, 0, 0, + 189, 1, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 156, 1, 0, 0, 3, 0, 1, 0, - 184, 1, 0, 0, 2, 0, 1, 0, + 184, 1, 0, 0, 3, 0, 1, 0, + 212, 1, 0, 0, 2, 0, 1, 0, 7, 0, 0, 0, 5, 0, 0, 0, 0, 0, 1, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 1, 0, 0, 50, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 176, 1, 0, 0, 3, 0, 1, 0, - 204, 1, 0, 0, 2, 0, 1, 0, - 12, 0, 0, 0, 19, 0, 0, 0, - 0, 0, 1, 0, 35, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 201, 1, 0, 0, 162, 0, 0, 0, + 209, 1, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 204, 1, 0, 0, 3, 0, 1, 0, - 216, 1, 0, 0, 2, 0, 1, 0, + 232, 1, 0, 0, 2, 0, 1, 0, + 13, 0, 0, 0, 19, 0, 0, 0, + 0, 0, 1, 0, 35, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 229, 1, 0, 0, 162, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 232, 1, 0, 0, 3, 0, 1, 0, + 244, 1, 0, 0, 2, 0, 1, 0, 9, 0, 0, 0, 12, 0, 0, 0, 0, 0, 1, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 213, 1, 0, 0, 90, 0, 0, 0, + 241, 1, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 212, 1, 0, 0, 3, 0, 1, 0, - 224, 1, 0, 0, 2, 0, 1, 0, + 240, 1, 0, 0, 3, 0, 1, 0, + 252, 1, 0, 0, 2, 0, 1, 0, 10, 0, 0, 0, 13, 0, 0, 0, 0, 0, 1, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 221, 1, 0, 0, 114, 0, 0, 0, + 249, 1, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 220, 1, 0, 0, 3, 0, 1, 0, - 232, 1, 0, 0, 2, 0, 1, 0, + 248, 1, 0, 0, 3, 0, 1, 0, + 4, 2, 0, 0, 2, 0, 1, 0, 11, 0, 0, 0, 14, 0, 0, 0, 0, 0, 1, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 229, 1, 0, 0, 90, 0, 0, 0, + 1, 2, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 228, 1, 0, 0, 3, 0, 1, 0, - 240, 1, 0, 0, 2, 0, 1, 0, + 0, 2, 0, 0, 3, 0, 1, 0, + 12, 2, 0, 0, 2, 0, 1, 0, + 12, 0, 0, 0, 21, 0, 0, 0, + 0, 0, 1, 0, 40, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 9, 2, 0, 0, 90, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 8, 2, 0, 0, 3, 0, 1, 0, + 20, 2, 0, 0, 2, 0, 1, 0, 100, 101, 112, 114, 101, 99, 97, 116, 101, 100, 0, 0, 0, 0, 0, 0, 104, 97, 115, 76, 101, 97, 100, 0, @@ -13929,6 +13993,15 @@ static const ::capnp::_::AlignedData<248> b_e00b5b3eba12876c = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 97, 99, 99, 101, 108, 66, 111, 111, + 115, 116, 0, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, } }; @@ -13938,11 +14011,11 @@ static const ::capnp::_::RawSchema* const d_e00b5b3eba12876c[] = { &s_b231a753cc079120, &s_f241315ad87f2721, }; -static const uint16_t m_e00b5b3eba12876c[] = {5, 7, 13, 12, 0, 2, 1, 9, 4, 3, 6, 11, 10, 8}; -static const uint16_t i_e00b5b3eba12876c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}; +static const uint16_t m_e00b5b3eba12876c[] = {5, 14, 7, 13, 12, 0, 2, 1, 9, 4, 3, 6, 11, 10, 8}; +static const uint16_t i_e00b5b3eba12876c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}; const ::capnp::_::RawSchema s_e00b5b3eba12876c = { - 0xe00b5b3eba12876c, b_e00b5b3eba12876c.words, 248, d_e00b5b3eba12876c, m_e00b5b3eba12876c, - 2, 14, i_e00b5b3eba12876c, nullptr, nullptr, { &s_e00b5b3eba12876c, nullptr, nullptr, 0, 0, nullptr }, false + 0xe00b5b3eba12876c, b_e00b5b3eba12876c.words, 264, d_e00b5b3eba12876c, m_e00b5b3eba12876c, + 2, 15, i_e00b5b3eba12876c, nullptr, nullptr, { &s_e00b5b3eba12876c, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<41> b_b231a753cc079120 = { @@ -26512,7 +26585,7 @@ const ::capnp::_::RawSchema s_e00d55cd16ef95ac = { 2, 8, i_e00d55cd16ef95ac, nullptr, nullptr, { &s_e00d55cd16ef95ac, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<68> b_fea3f4cb7265dd75 = { +static const ::capnp::_::AlignedData<83> b_fea3f4cb7265dd75 = { { 0, 0, 0, 0, 5, 0, 6, 0, 117, 221, 101, 114, 203, 244, 163, 254, 50, 0, 0, 0, 1, 0, 1, 0, @@ -26522,7 +26595,7 @@ static const ::capnp::_::AlignedData<68> b_fea3f4cb7265dd75 = { 21, 0, 0, 0, 18, 2, 0, 0, 53, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 49, 0, 0, 0, 175, 0, 0, 0, + 49, 0, 0, 0, 231, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 111, 103, 46, 99, 97, 112, 110, @@ -26535,28 +26608,35 @@ static const ::capnp::_::AlignedData<68> b_fea3f4cb7265dd75 = { 99, 116, 101, 100, 84, 121, 112, 101, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, - 12, 0, 0, 0, 3, 0, 4, 0, + 16, 0, 0, 0, 3, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 69, 0, 0, 0, 42, 0, 0, 0, + 97, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 0, 0, 0, 3, 0, 1, 0, - 76, 0, 0, 0, 2, 0, 1, 0, + 92, 0, 0, 0, 3, 0, 1, 0, + 104, 0, 0, 0, 2, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 0, 0, 0, 34, 0, 0, 0, + 101, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 0, 0, 0, 3, 0, 1, 0, - 80, 0, 0, 0, 2, 0, 1, 0, + 96, 0, 0, 0, 3, 0, 1, 0, + 108, 0, 0, 0, 2, 0, 1, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 77, 0, 0, 0, 50, 0, 0, 0, + 105, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 72, 0, 0, 0, 3, 0, 1, 0, - 84, 0, 0, 0, 2, 0, 1, 0, + 100, 0, 0, 0, 3, 0, 1, 0, + 112, 0, 0, 0, 2, 0, 1, 0, + 3, 0, 0, 0, 3, 0, 0, 0, + 0, 0, 1, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 109, 0, 0, 0, 50, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 104, 0, 0, 0, 3, 0, 1, 0, + 116, 0, 0, 0, 2, 0, 1, 0, 112, 111, 115, 101, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -26574,6 +26654,14 @@ static const ::capnp::_::AlignedData<68> b_fea3f4cb7265dd75 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 104, 111, 110, 101, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 115, 108, 101, 101, 112, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -26584,11 +26672,11 @@ static const ::capnp::_::AlignedData<68> b_fea3f4cb7265dd75 = { }; ::capnp::word const* const bp_fea3f4cb7265dd75 = b_fea3f4cb7265dd75.words; #if !CAPNP_LITE -static const uint16_t m_fea3f4cb7265dd75[] = {1, 2, 0}; -static const uint16_t i_fea3f4cb7265dd75[] = {0, 1, 2}; +static const uint16_t m_fea3f4cb7265dd75[] = {1, 2, 0, 3}; +static const uint16_t i_fea3f4cb7265dd75[] = {0, 1, 2, 3}; const ::capnp::_::RawSchema s_fea3f4cb7265dd75 = { - 0xfea3f4cb7265dd75, b_fea3f4cb7265dd75.words, 68, nullptr, m_fea3f4cb7265dd75, - 0, 3, i_fea3f4cb7265dd75, nullptr, nullptr, { &s_fea3f4cb7265dd75, nullptr, nullptr, 0, 0, nullptr }, false + 0xfea3f4cb7265dd75, b_fea3f4cb7265dd75.words, 83, nullptr, m_fea3f4cb7265dd75, + 0, 4, i_fea3f4cb7265dd75, nullptr, nullptr, { &s_fea3f4cb7265dd75, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE static const ::capnp::_::AlignedData<115> b_d33df88c8626ec40 = { @@ -30345,7 +30433,7 @@ const ::capnp::_::RawSchema s_8795cd2944faeab6 = { 0, 5, i_8795cd2944faeab6, nullptr, nullptr, { &s_8795cd2944faeab6, nullptr, nullptr, 0, 0, nullptr }, false }; #endif // !CAPNP_LITE -static const ::capnp::_::AlignedData<2647> b_d314cfd957229c11 = { +static const ::capnp::_::AlignedData<2644> b_d314cfd957229c11 = { { 0, 0, 0, 0, 5, 0, 6, 0, 17, 156, 34, 87, 217, 207, 20, 211, 10, 0, 0, 0, 1, 0, 2, 0, @@ -30939,507 +31027,507 @@ static const ::capnp::_::AlignedData<2647> b_d314cfd957229c11 = { 149, 0, 175, 255, 0, 0, 0, 0, 0, 0, 1, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 5, 21, 0, 0, 202, 0, 0, 0, + 5, 21, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 21, 0, 0, 3, 0, 1, 0, - 24, 21, 0, 0, 2, 0, 1, 0, + 4, 21, 0, 0, 3, 0, 1, 0, + 16, 21, 0, 0, 2, 0, 1, 0, 150, 0, 174, 255, 0, 0, 0, 0, 0, 0, 1, 0, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 21, 0, 0, 154, 0, 0, 0, + 13, 21, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 21, 0, 0, 3, 0, 1, 0, - 36, 21, 0, 0, 2, 0, 1, 0, + 12, 21, 0, 0, 3, 0, 1, 0, + 24, 21, 0, 0, 2, 0, 1, 0, 151, 0, 173, 255, 0, 0, 0, 0, 0, 0, 1, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 33, 21, 0, 0, 186, 0, 0, 0, + 21, 21, 0, 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 21, 0, 0, 3, 0, 1, 0, - 48, 21, 0, 0, 2, 0, 1, 0, + 24, 21, 0, 0, 3, 0, 1, 0, + 36, 21, 0, 0, 2, 0, 1, 0, 61, 0, 172, 255, 0, 0, 0, 0, 0, 0, 1, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 21, 0, 0, 130, 0, 0, 0, + 33, 21, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 44, 21, 0, 0, 3, 0, 1, 0, - 56, 21, 0, 0, 2, 0, 1, 0, + 32, 21, 0, 0, 3, 0, 1, 0, + 44, 21, 0, 0, 2, 0, 1, 0, 68, 0, 171, 255, 0, 0, 0, 0, 0, 0, 1, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 53, 21, 0, 0, 170, 0, 0, 0, + 41, 21, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 56, 21, 0, 0, 3, 0, 1, 0, - 68, 21, 0, 0, 2, 0, 1, 0, + 44, 21, 0, 0, 3, 0, 1, 0, + 56, 21, 0, 0, 2, 0, 1, 0, 69, 0, 170, 255, 0, 0, 0, 0, 0, 0, 1, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 21, 0, 0, 130, 0, 0, 0, + 53, 21, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 21, 0, 0, 3, 0, 1, 0, - 76, 21, 0, 0, 2, 0, 1, 0, + 52, 21, 0, 0, 3, 0, 1, 0, + 64, 21, 0, 0, 2, 0, 1, 0, 70, 0, 169, 255, 0, 0, 0, 0, 0, 0, 1, 0, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 21, 0, 0, 154, 0, 0, 0, + 61, 21, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76, 21, 0, 0, 3, 0, 1, 0, - 88, 21, 0, 0, 2, 0, 1, 0, + 64, 21, 0, 0, 3, 0, 1, 0, + 76, 21, 0, 0, 2, 0, 1, 0, 71, 0, 168, 255, 0, 0, 0, 0, 0, 0, 1, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 85, 21, 0, 0, 178, 0, 0, 0, + 73, 21, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 88, 21, 0, 0, 3, 0, 1, 0, - 100, 21, 0, 0, 2, 0, 1, 0, + 76, 21, 0, 0, 3, 0, 1, 0, + 88, 21, 0, 0, 2, 0, 1, 0, 47, 0, 167, 255, 0, 0, 0, 0, 0, 0, 1, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 97, 21, 0, 0, 170, 0, 0, 0, + 85, 21, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 100, 21, 0, 0, 3, 0, 1, 0, - 112, 21, 0, 0, 2, 0, 1, 0, + 88, 21, 0, 0, 3, 0, 1, 0, + 100, 21, 0, 0, 2, 0, 1, 0, 152, 0, 166, 255, 0, 0, 0, 0, 0, 0, 1, 0, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 109, 21, 0, 0, 218, 0, 0, 0, + 97, 21, 0, 0, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 21, 0, 0, 3, 0, 1, 0, - 128, 21, 0, 0, 2, 0, 1, 0, + 104, 21, 0, 0, 3, 0, 1, 0, + 116, 21, 0, 0, 2, 0, 1, 0, 40, 0, 165, 255, 0, 0, 0, 0, 0, 0, 1, 0, 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 21, 0, 0, 114, 0, 0, 0, + 113, 21, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 124, 21, 0, 0, 3, 0, 1, 0, - 136, 21, 0, 0, 2, 0, 1, 0, + 112, 21, 0, 0, 3, 0, 1, 0, + 124, 21, 0, 0, 2, 0, 1, 0, 64, 0, 164, 255, 0, 0, 0, 0, 0, 0, 1, 0, 93, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 21, 0, 0, 106, 0, 0, 0, + 121, 21, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 21, 0, 0, 3, 0, 1, 0, - 144, 21, 0, 0, 2, 0, 1, 0, + 120, 21, 0, 0, 3, 0, 1, 0, + 132, 21, 0, 0, 2, 0, 1, 0, 30, 0, 163, 255, 0, 0, 0, 0, 0, 0, 1, 0, 94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 21, 0, 0, 194, 0, 0, 0, + 129, 21, 0, 0, 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 144, 21, 0, 0, 3, 0, 1, 0, - 156, 21, 0, 0, 2, 0, 1, 0, + 132, 21, 0, 0, 3, 0, 1, 0, + 144, 21, 0, 0, 2, 0, 1, 0, 10, 0, 162, 255, 0, 0, 0, 0, 0, 0, 1, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 153, 21, 0, 0, 106, 0, 0, 0, + 141, 21, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 152, 21, 0, 0, 3, 0, 1, 0, - 164, 21, 0, 0, 2, 0, 1, 0, + 140, 21, 0, 0, 3, 0, 1, 0, + 152, 21, 0, 0, 2, 0, 1, 0, 11, 0, 161, 255, 0, 0, 0, 0, 0, 0, 1, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 161, 21, 0, 0, 98, 0, 0, 0, + 149, 21, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 160, 21, 0, 0, 3, 0, 1, 0, - 172, 21, 0, 0, 2, 0, 1, 0, + 148, 21, 0, 0, 3, 0, 1, 0, + 160, 21, 0, 0, 2, 0, 1, 0, 12, 0, 160, 255, 0, 0, 0, 0, 0, 0, 1, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 169, 21, 0, 0, 146, 0, 0, 0, + 157, 21, 0, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 172, 21, 0, 0, 3, 0, 1, 0, - 184, 21, 0, 0, 2, 0, 1, 0, + 160, 21, 0, 0, 3, 0, 1, 0, + 172, 21, 0, 0, 2, 0, 1, 0, 9, 0, 159, 255, 0, 0, 0, 0, 0, 0, 1, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 181, 21, 0, 0, 114, 0, 0, 0, + 169, 21, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 180, 21, 0, 0, 3, 0, 1, 0, - 192, 21, 0, 0, 2, 0, 1, 0, + 168, 21, 0, 0, 3, 0, 1, 0, + 180, 21, 0, 0, 2, 0, 1, 0, 8, 0, 158, 255, 0, 0, 0, 0, 0, 0, 1, 0, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 189, 21, 0, 0, 82, 0, 0, 0, + 177, 21, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 188, 21, 0, 0, 3, 0, 1, 0, - 200, 21, 0, 0, 2, 0, 1, 0, + 176, 21, 0, 0, 3, 0, 1, 0, + 188, 21, 0, 0, 2, 0, 1, 0, 143, 0, 157, 255, 0, 0, 0, 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 197, 21, 0, 0, 170, 0, 0, 0, + 185, 21, 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 200, 21, 0, 0, 3, 0, 1, 0, - 212, 21, 0, 0, 2, 0, 1, 0, + 188, 21, 0, 0, 3, 0, 1, 0, + 200, 21, 0, 0, 2, 0, 1, 0, 144, 0, 156, 255, 0, 0, 0, 0, 0, 0, 1, 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 209, 21, 0, 0, 202, 0, 0, 0, + 197, 21, 0, 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 216, 21, 0, 0, 3, 0, 1, 0, - 228, 21, 0, 0, 2, 0, 1, 0, + 204, 21, 0, 0, 3, 0, 1, 0, + 216, 21, 0, 0, 2, 0, 1, 0, 63, 0, 155, 255, 0, 0, 0, 0, 0, 0, 1, 0, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 225, 21, 0, 0, 66, 0, 0, 0, + 213, 21, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 220, 21, 0, 0, 3, 0, 1, 0, - 232, 21, 0, 0, 2, 0, 1, 0, + 208, 21, 0, 0, 3, 0, 1, 0, + 220, 21, 0, 0, 2, 0, 1, 0, 51, 0, 154, 255, 0, 0, 0, 0, 0, 0, 1, 0, 103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 229, 21, 0, 0, 114, 0, 0, 0, + 217, 21, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 228, 21, 0, 0, 3, 0, 1, 0, - 240, 21, 0, 0, 2, 0, 1, 0, + 216, 21, 0, 0, 3, 0, 1, 0, + 228, 21, 0, 0, 2, 0, 1, 0, 138, 0, 153, 255, 0, 0, 0, 0, 0, 0, 1, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 237, 21, 0, 0, 154, 0, 0, 0, + 225, 21, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 240, 21, 0, 0, 3, 0, 1, 0, - 252, 21, 0, 0, 2, 0, 1, 0, + 228, 21, 0, 0, 3, 0, 1, 0, + 240, 21, 0, 0, 2, 0, 1, 0, 153, 0, 152, 255, 0, 0, 0, 0, 0, 0, 1, 0, 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 249, 21, 0, 0, 202, 0, 0, 0, + 237, 21, 0, 0, 202, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 244, 21, 0, 0, 3, 0, 1, 0, + 0, 22, 0, 0, 2, 0, 1, 0, + 139, 0, 151, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 106, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 253, 21, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 3, 0, 1, 0, 12, 22, 0, 0, 2, 0, 1, 0, - 139, 0, 151, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 106, 0, 0, 0, + 79, 0, 150, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 22, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 22, 0, 0, 3, 0, 1, 0, 24, 22, 0, 0, 2, 0, 1, 0, - 79, 0, 150, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 107, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 21, 22, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 24, 22, 0, 0, 3, 0, 1, 0, - 36, 22, 0, 0, 2, 0, 1, 0, 80, 0, 149, 255, 0, 0, 0, 0, 0, 0, 1, 0, 108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 33, 22, 0, 0, 122, 0, 0, 0, + 21, 22, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 22, 0, 0, 3, 0, 1, 0, - 44, 22, 0, 0, 2, 0, 1, 0, + 20, 22, 0, 0, 3, 0, 1, 0, + 32, 22, 0, 0, 2, 0, 1, 0, 81, 0, 148, 255, 0, 0, 0, 0, 0, 0, 1, 0, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 41, 22, 0, 0, 154, 0, 0, 0, + 29, 22, 0, 0, 154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 44, 22, 0, 0, 3, 0, 1, 0, - 56, 22, 0, 0, 2, 0, 1, 0, + 32, 22, 0, 0, 3, 0, 1, 0, + 44, 22, 0, 0, 2, 0, 1, 0, 82, 0, 147, 255, 0, 0, 0, 0, 0, 0, 1, 0, 110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 53, 22, 0, 0, 122, 0, 0, 0, + 41, 22, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 52, 22, 0, 0, 3, 0, 1, 0, - 64, 22, 0, 0, 2, 0, 1, 0, + 40, 22, 0, 0, 3, 0, 1, 0, + 52, 22, 0, 0, 2, 0, 1, 0, 83, 0, 146, 255, 0, 0, 0, 0, 0, 0, 1, 0, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 61, 22, 0, 0, 98, 0, 0, 0, + 49, 22, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 22, 0, 0, 3, 0, 1, 0, - 72, 22, 0, 0, 2, 0, 1, 0, + 48, 22, 0, 0, 3, 0, 1, 0, + 60, 22, 0, 0, 2, 0, 1, 0, 84, 0, 145, 255, 0, 0, 0, 0, 0, 0, 1, 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 69, 22, 0, 0, 106, 0, 0, 0, + 57, 22, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 22, 0, 0, 3, 0, 1, 0, - 80, 22, 0, 0, 2, 0, 1, 0, + 56, 22, 0, 0, 3, 0, 1, 0, + 68, 22, 0, 0, 2, 0, 1, 0, 85, 0, 144, 255, 0, 0, 0, 0, 0, 0, 1, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 77, 22, 0, 0, 130, 0, 0, 0, + 65, 22, 0, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76, 22, 0, 0, 3, 0, 1, 0, - 88, 22, 0, 0, 2, 0, 1, 0, + 64, 22, 0, 0, 3, 0, 1, 0, + 76, 22, 0, 0, 2, 0, 1, 0, 86, 0, 143, 255, 0, 0, 0, 0, 0, 0, 1, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 85, 22, 0, 0, 90, 0, 0, 0, + 73, 22, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 22, 0, 0, 3, 0, 1, 0, - 96, 22, 0, 0, 2, 0, 1, 0, + 72, 22, 0, 0, 3, 0, 1, 0, + 84, 22, 0, 0, 2, 0, 1, 0, 87, 0, 142, 255, 0, 0, 0, 0, 0, 0, 1, 0, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 93, 22, 0, 0, 114, 0, 0, 0, + 81, 22, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 92, 22, 0, 0, 3, 0, 1, 0, - 104, 22, 0, 0, 2, 0, 1, 0, + 80, 22, 0, 0, 3, 0, 1, 0, + 92, 22, 0, 0, 2, 0, 1, 0, 88, 0, 141, 255, 0, 0, 0, 0, 0, 0, 1, 0, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 101, 22, 0, 0, 114, 0, 0, 0, + 89, 22, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 100, 22, 0, 0, 3, 0, 1, 0, - 112, 22, 0, 0, 2, 0, 1, 0, + 88, 22, 0, 0, 3, 0, 1, 0, + 100, 22, 0, 0, 2, 0, 1, 0, 48, 0, 140, 255, 0, 0, 0, 0, 0, 0, 1, 0, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 109, 22, 0, 0, 242, 0, 0, 0, + 97, 22, 0, 0, 242, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 116, 22, 0, 0, 3, 0, 1, 0, - 128, 22, 0, 0, 2, 0, 1, 0, + 104, 22, 0, 0, 3, 0, 1, 0, + 116, 22, 0, 0, 2, 0, 1, 0, 49, 0, 139, 255, 0, 0, 0, 0, 0, 0, 1, 0, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 125, 22, 0, 0, 226, 0, 0, 0, + 113, 22, 0, 0, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 132, 22, 0, 0, 3, 0, 1, 0, - 144, 22, 0, 0, 2, 0, 1, 0, + 120, 22, 0, 0, 3, 0, 1, 0, + 132, 22, 0, 0, 2, 0, 1, 0, 50, 0, 138, 255, 0, 0, 0, 0, 0, 0, 1, 0, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 22, 0, 0, 202, 0, 0, 0, + 129, 22, 0, 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 148, 22, 0, 0, 3, 0, 1, 0, - 160, 22, 0, 0, 2, 0, 1, 0, + 136, 22, 0, 0, 3, 0, 1, 0, + 148, 22, 0, 0, 2, 0, 1, 0, 73, 0, 137, 255, 0, 0, 0, 0, 0, 0, 1, 0, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 157, 22, 0, 0, 250, 0, 0, 0, + 145, 22, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 164, 22, 0, 0, 3, 0, 1, 0, - 176, 22, 0, 0, 2, 0, 1, 0, + 152, 22, 0, 0, 3, 0, 1, 0, + 164, 22, 0, 0, 2, 0, 1, 0, 74, 0, 136, 255, 0, 0, 0, 0, 0, 0, 1, 0, 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 173, 22, 0, 0, 234, 0, 0, 0, + 161, 22, 0, 0, 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 180, 22, 0, 0, 3, 0, 1, 0, - 192, 22, 0, 0, 2, 0, 1, 0, + 168, 22, 0, 0, 3, 0, 1, 0, + 180, 22, 0, 0, 2, 0, 1, 0, 75, 0, 135, 255, 0, 0, 0, 0, 0, 0, 1, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 189, 22, 0, 0, 210, 0, 0, 0, + 177, 22, 0, 0, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 196, 22, 0, 0, 3, 0, 1, 0, - 208, 22, 0, 0, 2, 0, 1, 0, + 184, 22, 0, 0, 3, 0, 1, 0, + 196, 22, 0, 0, 2, 0, 1, 0, 145, 0, 134, 255, 0, 0, 0, 0, 0, 0, 1, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 205, 22, 0, 0, 234, 0, 0, 0, + 193, 22, 0, 0, 234, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 200, 22, 0, 0, 3, 0, 1, 0, + 212, 22, 0, 0, 2, 0, 1, 0, + 76, 0, 133, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 124, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 209, 22, 0, 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 212, 22, 0, 0, 3, 0, 1, 0, 224, 22, 0, 0, 2, 0, 1, 0, - 76, 0, 133, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 124, 0, 0, 0, + 77, 0, 132, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 22, 0, 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 22, 0, 0, 3, 0, 1, 0, 236, 22, 0, 0, 2, 0, 1, 0, - 77, 0, 132, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 125, 0, 0, 0, + 78, 0, 131, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 233, 22, 0, 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 236, 22, 0, 0, 3, 0, 1, 0, 248, 22, 0, 0, 2, 0, 1, 0, - 78, 0, 131, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 126, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 245, 22, 0, 0, 186, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 248, 22, 0, 0, 3, 0, 1, 0, - 4, 23, 0, 0, 2, 0, 1, 0, 21, 0, 130, 255, 0, 0, 0, 0, 0, 0, 1, 0, 127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 23, 0, 0, 82, 0, 0, 0, + 245, 22, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 23, 0, 0, 3, 0, 1, 0, - 12, 23, 0, 0, 2, 0, 1, 0, + 244, 22, 0, 0, 3, 0, 1, 0, + 0, 23, 0, 0, 2, 0, 1, 0, 39, 0, 129, 255, 0, 0, 0, 0, 0, 0, 1, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 23, 0, 0, 138, 0, 0, 0, + 253, 22, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 23, 0, 0, 3, 0, 1, 0, - 24, 23, 0, 0, 2, 0, 1, 0, + 0, 23, 0, 0, 3, 0, 1, 0, + 12, 23, 0, 0, 2, 0, 1, 0, 37, 0, 128, 255, 0, 0, 0, 0, 0, 0, 1, 0, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 23, 0, 0, 106, 0, 0, 0, + 9, 23, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 20, 23, 0, 0, 3, 0, 1, 0, - 32, 23, 0, 0, 2, 0, 1, 0, + 8, 23, 0, 0, 3, 0, 1, 0, + 20, 23, 0, 0, 2, 0, 1, 0, 7, 0, 127, 255, 0, 0, 0, 0, 0, 0, 1, 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 23, 0, 0, 122, 0, 0, 0, + 17, 23, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 28, 23, 0, 0, 3, 0, 1, 0, - 40, 23, 0, 0, 2, 0, 1, 0, + 16, 23, 0, 0, 3, 0, 1, 0, + 28, 23, 0, 0, 2, 0, 1, 0, 16, 0, 126, 255, 0, 0, 0, 0, 0, 0, 1, 0, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 37, 23, 0, 0, 98, 0, 0, 0, + 25, 23, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 23, 0, 0, 3, 0, 1, 0, - 48, 23, 0, 0, 2, 0, 1, 0, + 24, 23, 0, 0, 3, 0, 1, 0, + 36, 23, 0, 0, 2, 0, 1, 0, 23, 0, 125, 255, 0, 0, 0, 0, 0, 0, 1, 0, 132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 23, 0, 0, 138, 0, 0, 0, + 33, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 23, 0, 0, 3, 0, 1, 0, - 60, 23, 0, 0, 2, 0, 1, 0, + 36, 23, 0, 0, 3, 0, 1, 0, + 48, 23, 0, 0, 2, 0, 1, 0, 72, 0, 124, 255, 0, 0, 0, 0, 0, 0, 1, 0, 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 23, 0, 0, 90, 0, 0, 0, + 45, 23, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 56, 23, 0, 0, 3, 0, 1, 0, - 68, 23, 0, 0, 2, 0, 1, 0, + 44, 23, 0, 0, 3, 0, 1, 0, + 56, 23, 0, 0, 2, 0, 1, 0, 34, 0, 123, 255, 0, 0, 0, 0, 0, 0, 1, 0, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 23, 0, 0, 106, 0, 0, 0, + 53, 23, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 64, 23, 0, 0, 3, 0, 1, 0, - 92, 23, 0, 0, 2, 0, 1, 0, + 52, 23, 0, 0, 3, 0, 1, 0, + 80, 23, 0, 0, 2, 0, 1, 0, 62, 0, 122, 255, 0, 0, 0, 0, 0, 0, 1, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 89, 23, 0, 0, 50, 0, 0, 0, + 77, 23, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 84, 23, 0, 0, 3, 0, 1, 0, - 112, 23, 0, 0, 2, 0, 1, 0, + 72, 23, 0, 0, 3, 0, 1, 0, + 100, 23, 0, 0, 2, 0, 1, 0, 89, 0, 121, 255, 0, 0, 0, 0, 0, 0, 1, 0, 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 97, 23, 0, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 100, 23, 0, 0, 3, 0, 1, 0, + 112, 23, 0, 0, 2, 0, 1, 0, + 90, 0, 120, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 137, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 109, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 23, 0, 0, 3, 0, 1, 0, 124, 23, 0, 0, 2, 0, 1, 0, - 90, 0, 120, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 137, 0, 0, 0, + 91, 0, 119, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 23, 0, 0, 3, 0, 1, 0, 136, 23, 0, 0, 2, 0, 1, 0, - 91, 0, 119, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 138, 0, 0, 0, + 92, 0, 118, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 133, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 136, 23, 0, 0, 3, 0, 1, 0, 148, 23, 0, 0, 2, 0, 1, 0, - 92, 0, 118, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 139, 0, 0, 0, + 93, 0, 117, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 23, 0, 0, 3, 0, 1, 0, 160, 23, 0, 0, 2, 0, 1, 0, - 93, 0, 117, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 140, 0, 0, 0, + 94, 0, 116, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 157, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, 23, 0, 0, 3, 0, 1, 0, 172, 23, 0, 0, 2, 0, 1, 0, - 94, 0, 116, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 141, 0, 0, 0, + 95, 0, 115, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 169, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 23, 0, 0, 3, 0, 1, 0, 184, 23, 0, 0, 2, 0, 1, 0, - 95, 0, 115, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 142, 0, 0, 0, + 96, 0, 114, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 181, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, 23, 0, 0, 3, 0, 1, 0, 196, 23, 0, 0, 2, 0, 1, 0, - 96, 0, 114, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 143, 0, 0, 0, + 97, 0, 113, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 196, 23, 0, 0, 3, 0, 1, 0, 208, 23, 0, 0, 2, 0, 1, 0, - 97, 0, 113, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 144, 0, 0, 0, + 98, 0, 112, 255, 0, 0, 0, 0, + 0, 0, 1, 0, 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, 23, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, 23, 0, 0, 3, 0, 1, 0, 220, 23, 0, 0, 2, 0, 1, 0, - 98, 0, 112, 255, 0, 0, 0, 0, - 0, 0, 1, 0, 145, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 217, 23, 0, 0, 138, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 220, 23, 0, 0, 3, 0, 1, 0, - 232, 23, 0, 0, 2, 0, 1, 0, 31, 0, 111, 255, 0, 0, 0, 0, 0, 0, 1, 0, 146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 229, 23, 0, 0, 106, 0, 0, 0, + 217, 23, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 228, 23, 0, 0, 3, 0, 1, 0, - 240, 23, 0, 0, 2, 0, 1, 0, + 216, 23, 0, 0, 3, 0, 1, 0, + 228, 23, 0, 0, 2, 0, 1, 0, 52, 0, 110, 255, 0, 0, 0, 0, 0, 0, 1, 0, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 237, 23, 0, 0, 106, 0, 0, 0, + 225, 23, 0, 0, 106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 236, 23, 0, 0, 3, 0, 1, 0, - 248, 23, 0, 0, 2, 0, 1, 0, + 224, 23, 0, 0, 3, 0, 1, 0, + 236, 23, 0, 0, 2, 0, 1, 0, 65, 0, 109, 255, 0, 0, 0, 0, 0, 0, 1, 0, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 245, 23, 0, 0, 122, 0, 0, 0, + 233, 23, 0, 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 244, 23, 0, 0, 3, 0, 1, 0, - 0, 24, 0, 0, 2, 0, 1, 0, + 232, 23, 0, 0, 3, 0, 1, 0, + 244, 23, 0, 0, 2, 0, 1, 0, 100, 0, 108, 255, 0, 0, 0, 0, 0, 0, 1, 0, 149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 253, 23, 0, 0, 194, 0, 0, 0, + 241, 23, 0, 0, 194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 24, 0, 0, 3, 0, 1, 0, - 12, 24, 0, 0, 2, 0, 1, 0, + 244, 23, 0, 0, 3, 0, 1, 0, + 0, 24, 0, 0, 2, 0, 1, 0, 66, 0, 107, 255, 0, 0, 0, 0, 0, 0, 1, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 24, 0, 0, 162, 0, 0, 0, + 253, 23, 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 12, 24, 0, 0, 3, 0, 1, 0, - 24, 24, 0, 0, 2, 0, 1, 0, + 0, 24, 0, 0, 3, 0, 1, 0, + 12, 24, 0, 0, 2, 0, 1, 0, 36, 0, 106, 255, 0, 0, 0, 0, 0, 0, 1, 0, 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 24, 0, 0, 178, 0, 0, 0, + 9, 24, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 24, 24, 0, 0, 3, 0, 1, 0, - 36, 24, 0, 0, 2, 0, 1, 0, + 12, 24, 0, 0, 3, 0, 1, 0, + 24, 24, 0, 0, 2, 0, 1, 0, 58, 0, 105, 255, 0, 0, 0, 0, 0, 0, 1, 0, 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 33, 24, 0, 0, 114, 0, 0, 0, + 21, 24, 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 32, 24, 0, 0, 3, 0, 1, 0, - 44, 24, 0, 0, 2, 0, 1, 0, + 20, 24, 0, 0, 3, 0, 1, 0, + 32, 24, 0, 0, 2, 0, 1, 0, 59, 0, 104, 255, 0, 0, 0, 0, 0, 0, 1, 0, 153, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 41, 24, 0, 0, 138, 0, 0, 0, + 29, 24, 0, 0, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 44, 24, 0, 0, 3, 0, 1, 0, - 56, 24, 0, 0, 2, 0, 1, 0, + 32, 24, 0, 0, 3, 0, 1, 0, + 44, 24, 0, 0, 2, 0, 1, 0, 108, 111, 103, 77, 111, 110, 111, 84, 105, 109, 101, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, @@ -32286,9 +32374,7 @@ static const ::capnp::_::AlignedData<2647> b_d314cfd957229c11 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 97, 118, 73, 110, 115, 116, 114, - 117, 99, 116, 105, 111, 110, 68, 69, - 80, 82, 69, 67, 65, 84, 69, 68, - 0, 0, 0, 0, 0, 0, 0, 0, + 117, 99, 116, 105, 111, 110, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 175, 2, 134, 127, 178, 22, 130, 193, 0, 0, 0, 0, 0, 0, 0, 0, @@ -32297,8 +32383,7 @@ static const ::capnp::_::AlignedData<2647> b_d314cfd957229c11 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 97, 118, 82, 111, 117, 116, 101, - 68, 69, 80, 82, 69, 67, 65, 84, - 69, 68, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 211, 151, 13, 68, 246, 82, 20, 166, 0, 0, 0, 0, 0, 0, 0, 0, @@ -33112,7 +33197,7 @@ static const ::capnp::_::RawSchema* const d_d314cfd957229c11[] = { static const uint16_t m_d314cfd957229c11[] = {98, 101, 133, 30, 55, 42, 149, 113, 148, 60, 70, 87, 76, 63, 5, 23, 112, 127, 69, 111, 22, 114, 28, 153, 152, 35, 7, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 124, 125, 126, 129, 6, 132, 151, 71, 59, 92, 128, 85, 26, 19, 10, 91, 21, 48, 3, 41, 40, 99, 100, 1, 65, 146, 150, 64, 94, 32, 96, 8, 46, 25, 72, 51, 44, 37, 62, 115, 36, 16, 14, 122, 119, 120, 117, 121, 118, 49, 18, 0, 24, 109, 95, 78, 105, 9, 116, 108, 75, 2, 86, 15, 82, 104, 83, 38, 84, 27, 134, 68, 110, 20, 54, 58, 56, 47, 53, 45, 12, 81, 80, 33, 89, 90, 31, 13, 131, 147, 130, 107, 17, 4, 11, 73, 103, 97, 123, 52, 66, 135, 43, 34, 39, 102, 57, 50, 106, 79, 93, 67, 61, 74, 88, 77, 29}; static const uint16_t i_d314cfd957229c11[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 0, 67}; const ::capnp::_::RawSchema s_d314cfd957229c11 = { - 0xd314cfd957229c11, b_d314cfd957229c11.words, 2647, d_d314cfd957229c11, m_d314cfd957229c11, + 0xd314cfd957229c11, b_d314cfd957229c11.words, 2644, d_d314cfd957229c11, m_d314cfd957229c11, 111, 154, i_d314cfd957229c11, nullptr, nullptr, { &s_d314cfd957229c11, nullptr, nullptr, 0, 0, nullptr }, true }; #endif // !CAPNP_LITE diff --git a/openpilot/cereal/gen/cpp/log.capnp.h b/openpilot/cereal/gen/cpp/log.capnp.h index 01f6024e7..d46fc1334 100644 --- a/openpilot/cereal/gen/cpp/log.capnp.h +++ b/openpilot/cereal/gen/cpp/log.capnp.h @@ -131,6 +131,7 @@ enum class EventName_91f1992a1f77fb03: uint16_t { BIG_MODEL_READY_D_E_P_R_E_C_A_T_E_D, BIG_MODEL_FAILED, CAR_NOT_READY, + USER_BOOKMARK_NOT_PAIRED, }; CAPNP_DECLARE_ENUM(EventName, 91f1992a1f77fb03); CAPNP_DECLARE_SCHEMA(d692e23d1a247d99); @@ -1192,7 +1193,7 @@ struct UsbState { struct Device; struct _capnpPrivate { - CAPNP_DECLARE_STRUCT_HEADER(8b644b0be77bac9f, 0, 1) + CAPNP_DECLARE_STRUCT_HEADER(8b644b0be77bac9f, 1, 1) #if !CAPNP_LITE static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; } #endif // !CAPNP_LITE @@ -3265,8 +3266,8 @@ struct Event { UPLOADER_STATE_D_E_P_R_E_C_A_T_E_D, PERIPHERAL_STATE, PANDA_STATES, - NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D, - NAV_ROUTE_D_E_P_R_E_C_A_T_E_D, + NAV_INSTRUCTION, + NAV_ROUTE, NAV_THUMBNAIL_D_E_P_R_E_C_A_T_E_D, ERROR_LOG_MESSAGE, NARROW_ROAD_ENCODE_DATA, @@ -3707,9 +3708,6 @@ public: inline bool hasVersion() const; inline ::capnp::Text::Reader getVersion() const; - inline bool hasPandaInfo() const; - inline ::cereal::InitData::PandaInfo::Reader getPandaInfo() const; - inline bool getDirty() const; inline bool hasGitCommit() const; @@ -3718,17 +3716,12 @@ public: inline bool hasGitBranch() const; inline ::capnp::Text::Reader getGitBranch() const; - inline bool getPassive() const; - inline bool hasGitRemote() const; inline ::capnp::Text::Reader getGitRemote() const; inline bool hasKernelVersion() const; inline ::capnp::Text::Reader getKernelVersion() const; - inline bool hasAndroidProperties() const; - inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader getAndroidProperties() const; - inline bool hasParams() const; inline ::cereal::Map< ::capnp::Text, ::capnp::Data>::Reader getParams() const; @@ -3808,13 +3801,6 @@ public: inline void adoptVersion(::capnp::Orphan< ::capnp::Text>&& value); inline ::capnp::Orphan< ::capnp::Text> disownVersion(); - inline bool hasPandaInfo(); - inline ::cereal::InitData::PandaInfo::Builder getPandaInfo(); - inline void setPandaInfo( ::cereal::InitData::PandaInfo::Reader value); - inline ::cereal::InitData::PandaInfo::Builder initPandaInfo(); - inline void adoptPandaInfo(::capnp::Orphan< ::cereal::InitData::PandaInfo>&& value); - inline ::capnp::Orphan< ::cereal::InitData::PandaInfo> disownPandaInfo(); - inline bool getDirty(); inline void setDirty(bool value); @@ -3832,9 +3818,6 @@ public: inline void adoptGitBranch(::capnp::Orphan< ::capnp::Text>&& value); inline ::capnp::Orphan< ::capnp::Text> disownGitBranch(); - inline bool getPassive(); - inline void setPassive(bool value); - inline bool hasGitRemote(); inline ::capnp::Text::Builder getGitRemote(); inline void setGitRemote( ::capnp::Text::Reader value); @@ -3849,13 +3832,6 @@ public: inline void adoptKernelVersion(::capnp::Orphan< ::capnp::Text>&& value); inline ::capnp::Orphan< ::capnp::Text> disownKernelVersion(); - inline bool hasAndroidProperties(); - inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder getAndroidProperties(); - inline void setAndroidProperties( ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader value); - inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder initAndroidProperties(); - inline void adoptAndroidProperties(::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>>&& value); - inline ::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>> disownAndroidProperties(); - inline bool hasParams(); inline ::cereal::Map< ::capnp::Text, ::capnp::Data>::Builder getParams(); inline void setParams( ::cereal::Map< ::capnp::Text, ::capnp::Data>::Reader value); @@ -3927,8 +3903,6 @@ public: : _typeless(kj::mv(typeless)) {} inline typename Deprecated::Pipeline getDeprecated(); - inline ::cereal::InitData::PandaInfo::Pipeline getPandaInfo(); - inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Pipeline getAndroidProperties(); inline ::cereal::Map< ::capnp::Text, ::capnp::Data>::Pipeline getParams(); inline ::cereal::Map< ::capnp::Text, ::capnp::Data>::Pipeline getCommands(); private: @@ -4156,9 +4130,17 @@ public: inline bool hasChffrAndroidExtra() const; inline ::cereal::InitData::ChffrAndroidExtra::Reader getChffrAndroidExtra() const; + inline bool hasPandaInfo() const; + inline ::cereal::InitData::PandaInfo::Reader getPandaInfo() const; + + inline bool getPassive() const; + inline bool hasIosBuildInfo() const; inline ::cereal::IosBuildInfo::Reader getIosBuildInfo() const; + inline bool hasAndroidProperties() const; + inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader getAndroidProperties() const; + private: ::capnp::_::StructReader _reader; template @@ -4215,6 +4197,16 @@ public: inline void adoptChffrAndroidExtra(::capnp::Orphan< ::cereal::InitData::ChffrAndroidExtra>&& value); inline ::capnp::Orphan< ::cereal::InitData::ChffrAndroidExtra> disownChffrAndroidExtra(); + inline bool hasPandaInfo(); + inline ::cereal::InitData::PandaInfo::Builder getPandaInfo(); + inline void setPandaInfo( ::cereal::InitData::PandaInfo::Reader value); + inline ::cereal::InitData::PandaInfo::Builder initPandaInfo(); + inline void adoptPandaInfo(::capnp::Orphan< ::cereal::InitData::PandaInfo>&& value); + inline ::capnp::Orphan< ::cereal::InitData::PandaInfo> disownPandaInfo(); + + inline bool getPassive(); + inline void setPassive(bool value); + inline bool hasIosBuildInfo(); inline ::cereal::IosBuildInfo::Builder getIosBuildInfo(); inline void setIosBuildInfo( ::cereal::IosBuildInfo::Reader value); @@ -4222,6 +4214,13 @@ public: inline void adoptIosBuildInfo(::capnp::Orphan< ::cereal::IosBuildInfo>&& value); inline ::capnp::Orphan< ::cereal::IosBuildInfo> disownIosBuildInfo(); + inline bool hasAndroidProperties(); + inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder getAndroidProperties(); + inline void setAndroidProperties( ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader value); + inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder initAndroidProperties(); + inline void adoptAndroidProperties(::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>>&& value); + inline ::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>> disownAndroidProperties(); + private: ::capnp::_::StructBuilder _builder; template @@ -4242,7 +4241,9 @@ public: inline ::cereal::AndroidBuildInfo::Pipeline getAndroidBuildInfo(); inline ::cereal::InitData::ChffrAndroidExtra::Pipeline getChffrAndroidExtra(); + inline ::cereal::InitData::PandaInfo::Pipeline getPandaInfo(); inline ::cereal::IosBuildInfo::Pipeline getIosBuildInfo(); + inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Pipeline getAndroidProperties(); private: ::capnp::AnyPointer::Pipeline _typeless; friend class ::capnp::PipelineHook; @@ -6401,6 +6402,10 @@ public: inline bool getControlsAllowedLongitudinal() const; + inline bool getNmiReset() const; + + inline bool getHardfaultReset() const; + private: ::capnp::_::StructReader _reader; template @@ -6542,6 +6547,12 @@ public: inline bool getControlsAllowedLongitudinal(); inline void setControlsAllowedLongitudinal(bool value); + inline bool getNmiReset(); + inline void setNmiReset(bool value); + + inline bool getHardfaultReset(); + inline void setHardfaultReset(bool value); + private: ::capnp::_::StructBuilder _builder; template @@ -7077,6 +7088,8 @@ public: inline bool hasDevices() const; inline ::capnp::List< ::cereal::UsbState::Device, ::capnp::Kind::STRUCT>::Reader getDevices() const; + inline bool getConnected() const; + private: ::capnp::_::StructReader _reader; template @@ -7112,6 +7125,9 @@ public: inline void adoptDevices(::capnp::Orphan< ::capnp::List< ::cereal::UsbState::Device, ::capnp::Kind::STRUCT>>&& value); inline ::capnp::Orphan< ::capnp::List< ::cereal::UsbState::Device, ::capnp::Kind::STRUCT>> disownDevices(); + inline bool getConnected(); + inline void setConnected(bool value); + private: ::capnp::_::StructBuilder _builder; template @@ -8173,8 +8189,6 @@ public: inline bool getEngageable() const; - inline bool getExperimentalMode() const; - inline ::cereal::LongitudinalPersonality getPersonality() const; inline ::cereal::CarControl::HUDControl::VisualAlert getAlertHudVisual() const; @@ -8251,9 +8265,6 @@ public: inline bool getEngageable(); inline void setEngageable(bool value); - inline bool getExperimentalMode(); - inline void setExperimentalMode(bool value); - inline ::cereal::LongitudinalPersonality getPersonality(); inline void setPersonality( ::cereal::LongitudinalPersonality value); @@ -8309,6 +8320,8 @@ public: inline ::cereal::CarControl::HUDControl::AudibleAlert getAlertSound() const; + inline bool getExperimentalMode() const; + private: ::capnp::_::StructReader _reader; template @@ -8340,6 +8353,9 @@ public: inline ::cereal::CarControl::HUDControl::AudibleAlert getAlertSound(); inline void setAlertSound( ::cereal::CarControl::HUDControl::AudibleAlert value); + inline bool getExperimentalMode(); + inline void setExperimentalMode(bool value); + private: ::capnp::_::StructBuilder _builder; template @@ -11824,6 +11840,8 @@ public: inline bool getAllowBrake() const; + inline float getAccelBoost() const; + private: ::capnp::_::StructReader _reader; template @@ -11909,6 +11927,9 @@ public: inline bool getAllowBrake(); inline void setAllowBrake(bool value); + inline float getAccelBoost(); + inline void setAccelBoost(float value); + private: ::capnp::_::StructBuilder _builder; template @@ -19441,6 +19462,8 @@ public: inline bool getPhone() const; + inline bool getSleep() const; + private: ::capnp::_::StructReader _reader; template @@ -19478,6 +19501,9 @@ public: inline bool getPhone(); inline void setPhone(bool value); + inline bool getSleep(); + inline void setSleep(bool value); + private: ::capnp::_::StructBuilder _builder; template @@ -23075,13 +23101,13 @@ public: inline bool hasPandaStates() const; inline ::capnp::List< ::cereal::PandaState, ::capnp::Kind::STRUCT>::Reader getPandaStates() const; - inline bool isNavInstructionDEPRECATED() const; - inline bool hasNavInstructionDEPRECATED() const; - inline ::cereal::NavInstruction::Reader getNavInstructionDEPRECATED() const; + inline bool isNavInstruction() const; + inline bool hasNavInstruction() const; + inline ::cereal::NavInstruction::Reader getNavInstruction() const; - inline bool isNavRouteDEPRECATED() const; - inline bool hasNavRouteDEPRECATED() const; - inline ::cereal::NavRoute::Reader getNavRouteDEPRECATED() const; + inline bool isNavRoute() const; + inline bool hasNavRoute() const; + inline ::cereal::NavRoute::Reader getNavRoute() const; inline bool isNavThumbnailDEPRECATED() const; inline bool hasNavThumbnailDEPRECATED() const; @@ -24038,21 +24064,21 @@ public: inline void adoptPandaStates(::capnp::Orphan< ::capnp::List< ::cereal::PandaState, ::capnp::Kind::STRUCT>>&& value); inline ::capnp::Orphan< ::capnp::List< ::cereal::PandaState, ::capnp::Kind::STRUCT>> disownPandaStates(); - inline bool isNavInstructionDEPRECATED(); - inline bool hasNavInstructionDEPRECATED(); - inline ::cereal::NavInstruction::Builder getNavInstructionDEPRECATED(); - inline void setNavInstructionDEPRECATED( ::cereal::NavInstruction::Reader value); - inline ::cereal::NavInstruction::Builder initNavInstructionDEPRECATED(); - inline void adoptNavInstructionDEPRECATED(::capnp::Orphan< ::cereal::NavInstruction>&& value); - inline ::capnp::Orphan< ::cereal::NavInstruction> disownNavInstructionDEPRECATED(); + inline bool isNavInstruction(); + inline bool hasNavInstruction(); + inline ::cereal::NavInstruction::Builder getNavInstruction(); + inline void setNavInstruction( ::cereal::NavInstruction::Reader value); + inline ::cereal::NavInstruction::Builder initNavInstruction(); + inline void adoptNavInstruction(::capnp::Orphan< ::cereal::NavInstruction>&& value); + inline ::capnp::Orphan< ::cereal::NavInstruction> disownNavInstruction(); - inline bool isNavRouteDEPRECATED(); - inline bool hasNavRouteDEPRECATED(); - inline ::cereal::NavRoute::Builder getNavRouteDEPRECATED(); - inline void setNavRouteDEPRECATED( ::cereal::NavRoute::Reader value); - inline ::cereal::NavRoute::Builder initNavRouteDEPRECATED(); - inline void adoptNavRouteDEPRECATED(::capnp::Orphan< ::cereal::NavRoute>&& value); - inline ::capnp::Orphan< ::cereal::NavRoute> disownNavRouteDEPRECATED(); + inline bool isNavRoute(); + inline bool hasNavRoute(); + inline ::cereal::NavRoute::Builder getNavRoute(); + inline void setNavRoute( ::cereal::NavRoute::Reader value); + inline ::cereal::NavRoute::Builder initNavRoute(); + inline void adoptNavRoute(::capnp::Orphan< ::cereal::NavRoute>&& value); + inline ::capnp::Orphan< ::cereal::NavRoute> disownNavRoute(); inline bool isNavThumbnailDEPRECATED(); inline bool hasNavThumbnailDEPRECATED(); @@ -25058,11 +25084,14 @@ inline typename InitData::Deprecated::Pipeline InitData::Pipeline::getDeprecated } #endif // !CAPNP_LITE inline typename InitData::Deprecated::Builder InitData::Builder::initDeprecated() { + _builder.setDataField(::capnp::bounded<17>() * ::capnp::ELEMENTS, 0); _builder.getPointerField(::capnp::bounded<1>() * ::capnp::POINTERS).clear(); _builder.getPointerField(::capnp::bounded<4>() * ::capnp::POINTERS).clear(); _builder.getPointerField(::capnp::bounded<5>() * ::capnp::POINTERS).clear(); _builder.getPointerField(::capnp::bounded<6>() * ::capnp::POINTERS).clear(); + _builder.getPointerField(::capnp::bounded<7>() * ::capnp::POINTERS).clear(); _builder.getPointerField(::capnp::bounded<11>() * ::capnp::POINTERS).clear(); + _builder.getPointerField(::capnp::bounded<13>() * ::capnp::POINTERS).clear(); return typename InitData::Deprecated::Builder(_builder); } inline bool InitData::Reader::hasDongleId() const { @@ -25147,45 +25176,6 @@ inline ::capnp::Orphan< ::capnp::Text> InitData::Builder::disownVersion() { ::capnp::bounded<3>() * ::capnp::POINTERS)); } -inline bool InitData::Reader::hasPandaInfo() const { - return !_reader.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS).isNull(); -} -inline bool InitData::Builder::hasPandaInfo() { - return !_builder.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS).isNull(); -} -inline ::cereal::InitData::PandaInfo::Reader InitData::Reader::getPandaInfo() const { - return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::get(_reader.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS)); -} -inline ::cereal::InitData::PandaInfo::Builder InitData::Builder::getPandaInfo() { - return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::get(_builder.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS)); -} -#if !CAPNP_LITE -inline ::cereal::InitData::PandaInfo::Pipeline InitData::Pipeline::getPandaInfo() { - return ::cereal::InitData::PandaInfo::Pipeline(_typeless.getPointerField(7)); -} -#endif // !CAPNP_LITE -inline void InitData::Builder::setPandaInfo( ::cereal::InitData::PandaInfo::Reader value) { - ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::set(_builder.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS), value); -} -inline ::cereal::InitData::PandaInfo::Builder InitData::Builder::initPandaInfo() { - return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::init(_builder.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS)); -} -inline void InitData::Builder::adoptPandaInfo( - ::capnp::Orphan< ::cereal::InitData::PandaInfo>&& value) { - ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::adopt(_builder.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS), kj::mv(value)); -} -inline ::capnp::Orphan< ::cereal::InitData::PandaInfo> InitData::Builder::disownPandaInfo() { - return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::disown(_builder.getPointerField( - ::capnp::bounded<7>() * ::capnp::POINTERS)); -} - inline bool InitData::Reader::getDirty() const { return _reader.getDataField( ::capnp::bounded<16>() * ::capnp::ELEMENTS); @@ -25268,20 +25258,6 @@ inline ::capnp::Orphan< ::capnp::Text> InitData::Builder::disownGitBranch() { ::capnp::bounded<9>() * ::capnp::POINTERS)); } -inline bool InitData::Reader::getPassive() const { - return _reader.getDataField( - ::capnp::bounded<17>() * ::capnp::ELEMENTS); -} - -inline bool InitData::Builder::getPassive() { - return _builder.getDataField( - ::capnp::bounded<17>() * ::capnp::ELEMENTS); -} -inline void InitData::Builder::setPassive(bool value) { - _builder.setDataField( - ::capnp::bounded<17>() * ::capnp::ELEMENTS, value); -} - inline bool InitData::Reader::hasGitRemote() const { return !_reader.getPointerField( ::capnp::bounded<10>() * ::capnp::POINTERS).isNull(); @@ -25350,45 +25326,6 @@ inline ::capnp::Orphan< ::capnp::Text> InitData::Builder::disownKernelVersion() ::capnp::bounded<12>() * ::capnp::POINTERS)); } -inline bool InitData::Reader::hasAndroidProperties() const { - return !_reader.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS).isNull(); -} -inline bool InitData::Builder::hasAndroidProperties() { - return !_builder.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS).isNull(); -} -inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader InitData::Reader::getAndroidProperties() const { - return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::get(_reader.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS)); -} -inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder InitData::Builder::getAndroidProperties() { - return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::get(_builder.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS)); -} -#if !CAPNP_LITE -inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Pipeline InitData::Pipeline::getAndroidProperties() { - return ::cereal::Map< ::capnp::Text, ::capnp::Text>::Pipeline(_typeless.getPointerField(13)); -} -#endif // !CAPNP_LITE -inline void InitData::Builder::setAndroidProperties( ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader value) { - ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::set(_builder.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS), value); -} -inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder InitData::Builder::initAndroidProperties() { - return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::init(_builder.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS)); -} -inline void InitData::Builder::adoptAndroidProperties( - ::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>>&& value) { - ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::adopt(_builder.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS), kj::mv(value)); -} -inline ::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>> InitData::Builder::disownAndroidProperties() { - return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::disown(_builder.getPointerField( - ::capnp::bounded<13>() * ::capnp::POINTERS)); -} - inline bool InitData::Reader::hasParams() const { return !_reader.getPointerField( ::capnp::bounded<14>() * ::capnp::POINTERS).isNull(); @@ -25952,6 +25889,59 @@ inline ::capnp::Orphan< ::cereal::InitData::ChffrAndroidExtra> InitData::Depreca ::capnp::bounded<6>() * ::capnp::POINTERS)); } +inline bool InitData::Deprecated::Reader::hasPandaInfo() const { + return !_reader.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS).isNull(); +} +inline bool InitData::Deprecated::Builder::hasPandaInfo() { + return !_builder.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS).isNull(); +} +inline ::cereal::InitData::PandaInfo::Reader InitData::Deprecated::Reader::getPandaInfo() const { + return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::get(_reader.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS)); +} +inline ::cereal::InitData::PandaInfo::Builder InitData::Deprecated::Builder::getPandaInfo() { + return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::get(_builder.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS)); +} +#if !CAPNP_LITE +inline ::cereal::InitData::PandaInfo::Pipeline InitData::Deprecated::Pipeline::getPandaInfo() { + return ::cereal::InitData::PandaInfo::Pipeline(_typeless.getPointerField(7)); +} +#endif // !CAPNP_LITE +inline void InitData::Deprecated::Builder::setPandaInfo( ::cereal::InitData::PandaInfo::Reader value) { + ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::set(_builder.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS), value); +} +inline ::cereal::InitData::PandaInfo::Builder InitData::Deprecated::Builder::initPandaInfo() { + return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::init(_builder.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS)); +} +inline void InitData::Deprecated::Builder::adoptPandaInfo( + ::capnp::Orphan< ::cereal::InitData::PandaInfo>&& value) { + ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::adopt(_builder.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS), kj::mv(value)); +} +inline ::capnp::Orphan< ::cereal::InitData::PandaInfo> InitData::Deprecated::Builder::disownPandaInfo() { + return ::capnp::_::PointerHelpers< ::cereal::InitData::PandaInfo>::disown(_builder.getPointerField( + ::capnp::bounded<7>() * ::capnp::POINTERS)); +} + +inline bool InitData::Deprecated::Reader::getPassive() const { + return _reader.getDataField( + ::capnp::bounded<17>() * ::capnp::ELEMENTS); +} + +inline bool InitData::Deprecated::Builder::getPassive() { + return _builder.getDataField( + ::capnp::bounded<17>() * ::capnp::ELEMENTS); +} +inline void InitData::Deprecated::Builder::setPassive(bool value) { + _builder.setDataField( + ::capnp::bounded<17>() * ::capnp::ELEMENTS, value); +} + inline bool InitData::Deprecated::Reader::hasIosBuildInfo() const { return !_reader.getPointerField( ::capnp::bounded<11>() * ::capnp::POINTERS).isNull(); @@ -25991,6 +25981,45 @@ inline ::capnp::Orphan< ::cereal::IosBuildInfo> InitData::Deprecated::Builder::d ::capnp::bounded<11>() * ::capnp::POINTERS)); } +inline bool InitData::Deprecated::Reader::hasAndroidProperties() const { + return !_reader.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS).isNull(); +} +inline bool InitData::Deprecated::Builder::hasAndroidProperties() { + return !_builder.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS).isNull(); +} +inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader InitData::Deprecated::Reader::getAndroidProperties() const { + return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::get(_reader.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS)); +} +inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder InitData::Deprecated::Builder::getAndroidProperties() { + return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::get(_builder.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS)); +} +#if !CAPNP_LITE +inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Pipeline InitData::Deprecated::Pipeline::getAndroidProperties() { + return ::cereal::Map< ::capnp::Text, ::capnp::Text>::Pipeline(_typeless.getPointerField(13)); +} +#endif // !CAPNP_LITE +inline void InitData::Deprecated::Builder::setAndroidProperties( ::cereal::Map< ::capnp::Text, ::capnp::Text>::Reader value) { + ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::set(_builder.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS), value); +} +inline ::cereal::Map< ::capnp::Text, ::capnp::Text>::Builder InitData::Deprecated::Builder::initAndroidProperties() { + return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::init(_builder.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS)); +} +inline void InitData::Deprecated::Builder::adoptAndroidProperties( + ::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>>&& value) { + ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::adopt(_builder.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS), kj::mv(value)); +} +inline ::capnp::Orphan< ::cereal::Map< ::capnp::Text, ::capnp::Text>> InitData::Deprecated::Builder::disownAndroidProperties() { + return ::capnp::_::PointerHelpers< ::cereal::Map< ::capnp::Text, ::capnp::Text>>::disown(_builder.getPointerField( + ::capnp::bounded<13>() * ::capnp::POINTERS)); +} + inline ::uint32_t FrameData::Reader::getFrameId() const { return _reader.getDataField< ::uint32_t>( ::capnp::bounded<0>() * ::capnp::ELEMENTS); @@ -29535,6 +29564,34 @@ inline void PandaState::Builder::setControlsAllowedLongitudinal(bool value) { ::capnp::bounded<482>() * ::capnp::ELEMENTS, value); } +inline bool PandaState::Reader::getNmiReset() const { + return _reader.getDataField( + ::capnp::bounded<483>() * ::capnp::ELEMENTS); +} + +inline bool PandaState::Builder::getNmiReset() { + return _builder.getDataField( + ::capnp::bounded<483>() * ::capnp::ELEMENTS); +} +inline void PandaState::Builder::setNmiReset(bool value) { + _builder.setDataField( + ::capnp::bounded<483>() * ::capnp::ELEMENTS, value); +} + +inline bool PandaState::Reader::getHardfaultReset() const { + return _reader.getDataField( + ::capnp::bounded<484>() * ::capnp::ELEMENTS); +} + +inline bool PandaState::Builder::getHardfaultReset() { + return _builder.getDataField( + ::capnp::bounded<484>() * ::capnp::ELEMENTS); +} +inline void PandaState::Builder::setHardfaultReset(bool value) { + _builder.setDataField( + ::capnp::bounded<484>() * ::capnp::ELEMENTS, value); +} + inline bool PandaState::PandaCanState::Reader::getBusOff() const { return _reader.getDataField( ::capnp::bounded<0>() * ::capnp::ELEMENTS); @@ -30130,6 +30187,20 @@ inline ::capnp::Orphan< ::capnp::List< ::cereal::UsbState::Device, ::capnp::Kin ::capnp::bounded<0>() * ::capnp::POINTERS)); } +inline bool UsbState::Reader::getConnected() const { + return _reader.getDataField( + ::capnp::bounded<0>() * ::capnp::ELEMENTS); +} + +inline bool UsbState::Builder::getConnected() { + return _builder.getDataField( + ::capnp::bounded<0>() * ::capnp::ELEMENTS); +} +inline void UsbState::Builder::setConnected(bool value) { + _builder.setDataField( + ::capnp::bounded<0>() * ::capnp::ELEMENTS, value); +} + inline ::uint8_t UsbState::Device::Reader::getBusnum() const { return _reader.getDataField< ::uint8_t>( ::capnp::bounded<0>() * ::capnp::ELEMENTS); @@ -31636,6 +31707,7 @@ inline typename SelfdriveState::Deprecated::Pipeline SelfdriveState::Pipeline::g } #endif // !CAPNP_LITE inline typename SelfdriveState::Deprecated::Builder SelfdriveState::Builder::initDeprecated() { + _builder.setDataField(::capnp::bounded<19>() * ::capnp::ELEMENTS, 0); _builder.setDataField< ::uint16_t>(::capnp::bounded<4>() * ::capnp::ELEMENTS, 0); return typename SelfdriveState::Deprecated::Builder(_builder); } @@ -31653,20 +31725,6 @@ inline void SelfdriveState::Builder::setEngageable(bool value) { ::capnp::bounded<18>() * ::capnp::ELEMENTS, value); } -inline bool SelfdriveState::Reader::getExperimentalMode() const { - return _reader.getDataField( - ::capnp::bounded<19>() * ::capnp::ELEMENTS); -} - -inline bool SelfdriveState::Builder::getExperimentalMode() { - return _builder.getDataField( - ::capnp::bounded<19>() * ::capnp::ELEMENTS); -} -inline void SelfdriveState::Builder::setExperimentalMode(bool value) { - _builder.setDataField( - ::capnp::bounded<19>() * ::capnp::ELEMENTS, value); -} - inline ::cereal::LongitudinalPersonality SelfdriveState::Reader::getPersonality() const { return _reader.getDataField< ::cereal::LongitudinalPersonality>( ::capnp::bounded<5>() * ::capnp::ELEMENTS); @@ -31723,6 +31781,20 @@ inline void SelfdriveState::Deprecated::Builder::setAlertSound( ::cereal::CarCon ::capnp::bounded<4>() * ::capnp::ELEMENTS, value); } +inline bool SelfdriveState::Deprecated::Reader::getExperimentalMode() const { + return _reader.getDataField( + ::capnp::bounded<19>() * ::capnp::ELEMENTS); +} + +inline bool SelfdriveState::Deprecated::Builder::getExperimentalMode() { + return _builder.getDataField( + ::capnp::bounded<19>() * ::capnp::ELEMENTS); +} +inline void SelfdriveState::Deprecated::Builder::setExperimentalMode(bool value) { + _builder.setDataField( + ::capnp::bounded<19>() * ::capnp::ELEMENTS, value); +} + inline typename ControlsState::Deprecated::Reader ControlsState::Reader::getDeprecated() const { return typename ControlsState::Deprecated::Reader(_reader); } @@ -37061,6 +37133,20 @@ inline void LongitudinalPlan::Builder::setAllowBrake(bool value) { ::capnp::bounded<14>() * ::capnp::ELEMENTS, value); } +inline float LongitudinalPlan::Reader::getAccelBoost() const { + return _reader.getDataField( + ::capnp::bounded<21>() * ::capnp::ELEMENTS); +} + +inline float LongitudinalPlan::Builder::getAccelBoost() { + return _builder.getDataField( + ::capnp::bounded<21>() * ::capnp::ELEMENTS); +} +inline void LongitudinalPlan::Builder::setAccelBoost(float value) { + _builder.setDataField( + ::capnp::bounded<21>() * ::capnp::ELEMENTS, value); +} + inline bool LongitudinalPlan::Deprecated::Reader::getLateralValid() const { return _reader.getDataField( ::capnp::bounded<0>() * ::capnp::ELEMENTS); @@ -48468,6 +48554,20 @@ inline void DriverMonitoringState::VisionPolicyState::DistractedTypes::Builder:: ::capnp::bounded<2>() * ::capnp::ELEMENTS, value); } +inline bool DriverMonitoringState::VisionPolicyState::DistractedTypes::Reader::getSleep() const { + return _reader.getDataField( + ::capnp::bounded<3>() * ::capnp::ELEMENTS); +} + +inline bool DriverMonitoringState::VisionPolicyState::DistractedTypes::Builder::getSleep() { + return _builder.getDataField( + ::capnp::bounded<3>() * ::capnp::ELEMENTS); +} +inline void DriverMonitoringState::VisionPolicyState::DistractedTypes::Builder::setSleep(bool value) { + _builder.setDataField( + ::capnp::bounded<3>() * ::capnp::ELEMENTS, value); +} + inline float DriverMonitoringState::VisionPolicyState::Pose::Reader::getPitch() const { return _reader.getDataField( ::capnp::bounded<0>() * ::capnp::ELEMENTS); @@ -56008,109 +56108,109 @@ inline ::capnp::Orphan< ::capnp::List< ::cereal::PandaState, ::capnp::Kind::STR ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline bool Event::Reader::isNavInstructionDEPRECATED() const { - return which() == Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D; +inline bool Event::Reader::isNavInstruction() const { + return which() == Event::NAV_INSTRUCTION; } -inline bool Event::Builder::isNavInstructionDEPRECATED() { - return which() == Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D; +inline bool Event::Builder::isNavInstruction() { + return which() == Event::NAV_INSTRUCTION; } -inline bool Event::Reader::hasNavInstructionDEPRECATED() const { - if (which() != Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D) return false; +inline bool Event::Reader::hasNavInstruction() const { + if (which() != Event::NAV_INSTRUCTION) return false; return !_reader.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS).isNull(); } -inline bool Event::Builder::hasNavInstructionDEPRECATED() { - if (which() != Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D) return false; +inline bool Event::Builder::hasNavInstruction() { + if (which() != Event::NAV_INSTRUCTION) return false; return !_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS).isNull(); } -inline ::cereal::NavInstruction::Reader Event::Reader::getNavInstructionDEPRECATED() const { - KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D), +inline ::cereal::NavInstruction::Reader Event::Reader::getNavInstruction() const { + KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION), "Must check which() before get()ing a union member."); return ::capnp::_::PointerHelpers< ::cereal::NavInstruction>::get(_reader.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline ::cereal::NavInstruction::Builder Event::Builder::getNavInstructionDEPRECATED() { - KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D), +inline ::cereal::NavInstruction::Builder Event::Builder::getNavInstruction() { + KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION), "Must check which() before get()ing a union member."); return ::capnp::_::PointerHelpers< ::cereal::NavInstruction>::get(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline void Event::Builder::setNavInstructionDEPRECATED( ::cereal::NavInstruction::Reader value) { +inline void Event::Builder::setNavInstruction( ::cereal::NavInstruction::Reader value) { _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D); + ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION); ::capnp::_::PointerHelpers< ::cereal::NavInstruction>::set(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS), value); } -inline ::cereal::NavInstruction::Builder Event::Builder::initNavInstructionDEPRECATED() { +inline ::cereal::NavInstruction::Builder Event::Builder::initNavInstruction() { _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D); + ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION); return ::capnp::_::PointerHelpers< ::cereal::NavInstruction>::init(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline void Event::Builder::adoptNavInstructionDEPRECATED( +inline void Event::Builder::adoptNavInstruction( ::capnp::Orphan< ::cereal::NavInstruction>&& value) { _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D); + ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION); ::capnp::_::PointerHelpers< ::cereal::NavInstruction>::adopt(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value)); } -inline ::capnp::Orphan< ::cereal::NavInstruction> Event::Builder::disownNavInstructionDEPRECATED() { - KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION_D_E_P_R_E_C_A_T_E_D), +inline ::capnp::Orphan< ::cereal::NavInstruction> Event::Builder::disownNavInstruction() { + KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION), "Must check which() before get()ing a union member."); return ::capnp::_::PointerHelpers< ::cereal::NavInstruction>::disown(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline bool Event::Reader::isNavRouteDEPRECATED() const { - return which() == Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D; +inline bool Event::Reader::isNavRoute() const { + return which() == Event::NAV_ROUTE; } -inline bool Event::Builder::isNavRouteDEPRECATED() { - return which() == Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D; +inline bool Event::Builder::isNavRoute() { + return which() == Event::NAV_ROUTE; } -inline bool Event::Reader::hasNavRouteDEPRECATED() const { - if (which() != Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D) return false; +inline bool Event::Reader::hasNavRoute() const { + if (which() != Event::NAV_ROUTE) return false; return !_reader.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS).isNull(); } -inline bool Event::Builder::hasNavRouteDEPRECATED() { - if (which() != Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D) return false; +inline bool Event::Builder::hasNavRoute() { + if (which() != Event::NAV_ROUTE) return false; return !_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS).isNull(); } -inline ::cereal::NavRoute::Reader Event::Reader::getNavRouteDEPRECATED() const { - KJ_IREQUIRE((which() == Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D), +inline ::cereal::NavRoute::Reader Event::Reader::getNavRoute() const { + KJ_IREQUIRE((which() == Event::NAV_ROUTE), "Must check which() before get()ing a union member."); return ::capnp::_::PointerHelpers< ::cereal::NavRoute>::get(_reader.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline ::cereal::NavRoute::Builder Event::Builder::getNavRouteDEPRECATED() { - KJ_IREQUIRE((which() == Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D), +inline ::cereal::NavRoute::Builder Event::Builder::getNavRoute() { + KJ_IREQUIRE((which() == Event::NAV_ROUTE), "Must check which() before get()ing a union member."); return ::capnp::_::PointerHelpers< ::cereal::NavRoute>::get(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline void Event::Builder::setNavRouteDEPRECATED( ::cereal::NavRoute::Reader value) { +inline void Event::Builder::setNavRoute( ::cereal::NavRoute::Reader value) { _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D); + ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_ROUTE); ::capnp::_::PointerHelpers< ::cereal::NavRoute>::set(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS), value); } -inline ::cereal::NavRoute::Builder Event::Builder::initNavRouteDEPRECATED() { +inline ::cereal::NavRoute::Builder Event::Builder::initNavRoute() { _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D); + ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_ROUTE); return ::capnp::_::PointerHelpers< ::cereal::NavRoute>::init(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS)); } -inline void Event::Builder::adoptNavRouteDEPRECATED( +inline void Event::Builder::adoptNavRoute( ::capnp::Orphan< ::cereal::NavRoute>&& value) { _builder.setDataField( - ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D); + ::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_ROUTE); ::capnp::_::PointerHelpers< ::cereal::NavRoute>::adopt(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value)); } -inline ::capnp::Orphan< ::cereal::NavRoute> Event::Builder::disownNavRouteDEPRECATED() { - KJ_IREQUIRE((which() == Event::NAV_ROUTE_D_E_P_R_E_C_A_T_E_D), +inline ::capnp::Orphan< ::cereal::NavRoute> Event::Builder::disownNavRoute() { + KJ_IREQUIRE((which() == Event::NAV_ROUTE), "Must check which() before get()ing a union member."); return ::capnp::_::PointerHelpers< ::cereal::NavRoute>::disown(_builder.getPointerField( ::capnp::bounded<0>() * ::capnp::POINTERS));