mirror of
https://github.com/dragonpilot/dragonpilot.git
synced 2026-07-08 06:22:03 +08:00
dragonpilot beta3
date: 2024-02-12T12:52:55 commit: 0f5fdc8c6be06fb8901e8be8f3fa7d00596eb1f4
This commit is contained in:
dragonpilot
@@ -88,5 +88,3 @@ build/
|
||||
|
||||
poetry.toml
|
||||
Pipfile
|
||||
|
||||
third_party/mapd/
|
||||
|
||||
+29
-2
@@ -1,4 +1,31 @@
|
||||
dragonpilot beta3 2023.12.23
|
||||
dragonpilot beta3 2024.02.12
|
||||
=======================
|
||||
* Comma 0.9.6 release
|
||||
* New driving model (Los Angles V2)
|
||||
* Vision model trained on more data
|
||||
* Improved driving performance
|
||||
* Directly outputs curvature for lateral control
|
||||
* New driver monitoring model
|
||||
* Trained on larger dataset
|
||||
* AGNOS 9 (9.6)
|
||||
* comma body streaming and controls over WebRTC
|
||||
* Improved fuzzy fingerprinting for many makes and models
|
||||
* Hyundai Staria 2023 support thanks to sunnyhaibin!
|
||||
* Kia Niro Plug-in Hybrid 2022 support thanks to sunnyhaibin!
|
||||
* Toyota RAV4 2023-24 support
|
||||
* Toyota RAV4 Hybrid 2023-24 support
|
||||
* DP HIGHLIGHT:
|
||||
* TSS2 long, Dynamic Follow and Accel profile tune has been updated.
|
||||
* New version of dynamic e2e with twice and fast detection.
|
||||
* De2e will now slow down for upcoming turns when using NOO.
|
||||
* Auto lane change assist (USE IT AT YOUR OWN RISK).
|
||||
* Optimized/Refactored NOO Voice Guidence.
|
||||
* Re-added: Rainbow road path.
|
||||
* Re-added: Full screen Nav.
|
||||
* Re-added: Toyota Low Speed Override.
|
||||
* Bug fixes and improvements.
|
||||
|
||||
dragonpilot beta3 [2023.12.23]
|
||||
=======================
|
||||
* Comma 0.9.6 release
|
||||
* New driving model (Blue Diamond).
|
||||
@@ -12,7 +39,7 @@ dragonpilot beta3 2023.12.23
|
||||
* Toyota RAV4 Hybrid 2023 support
|
||||
* DP HIGHLIGHT:
|
||||
* Flight Panel (compass, height, pitch).
|
||||
* Model Confidence indicator (in the max speed box).
|
||||
* Model Confidence indicator (in the max speed box).
|
||||
* New version of dynamic e2e controller with better detection logic.
|
||||
* Adjustable lane change speed (default 20mph, OFF = no control during lane change)
|
||||
* TSS2 long, Dynamic Follow and Accel profile tune has been updated.
|
||||
|
||||
@@ -13,7 +13,7 @@ What is openpilot?
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Running on a dedicated device in a car
|
||||
To start using openpilot in a car
|
||||
------
|
||||
|
||||
To use openpilot in a car, you need four things:
|
||||
@@ -22,30 +22,21 @@ To use openpilot in a car, you need four things:
|
||||
3. **Supported Car:** Ensure that you have one of [the 250+ supported cars](docs/CARS.md).
|
||||
4. **Car Harness:** You will also need a [car harness](https://comma.ai/shop/car-harness) to connect your comma 3/3X to your car.
|
||||
|
||||
We have detailed instructions for [how to install the harness and device in a car](https://comma.ai/setup).
|
||||
We have detailed instructions for [how to install the harness and device in a car](https://comma.ai/setup). Note that it's possible to run openpilot on [other hardware](https://blog.comma.ai/self-driving-car-for-free/), although it's not plug-and-play.
|
||||
|
||||
Running on PC
|
||||
------
|
||||
|
||||
All openpilot services can run as usual on a PC without requiring special hardware or a car. You can also run openpilot on recorded or simulated data to develop or experiment with openpilot.
|
||||
|
||||
With openpilot's tools, you can plot logs, replay drives, and watch the full-res camera streams. See [the tools README](tools/README.md) for more information.
|
||||
|
||||
You can also run openpilot in simulation [with the MetaDrive simulator](tools/sim/README.md). This allows openpilot to drive around a virtual car on your Ubuntu machine.
|
||||
|
||||
A PC running openpilot can also control your vehicle if it is connected to a [webcam](https://github.com/commaai/openpilot/tree/master/tools/webcam), a [black panda](https://comma.ai/shop/products/panda), and a [harness](https://comma.ai/shop/products/car-harness).
|
||||
|
||||
Community and Contributing
|
||||
To start developing openpilot
|
||||
------
|
||||
|
||||
openpilot is developed by [comma](https://comma.ai/) and by users like you. We welcome both pull requests and issues on [GitHub](http://github.com/commaai/openpilot).
|
||||
|
||||
* Join the [community Discord](https://discord.comma.ai)
|
||||
* Check out [the contributing docs](docs/CONTRIBUTING.md)
|
||||
* Check out the [openpilot tools](tools/)
|
||||
* Read about the [development workflow](docs/WORKFLOW.md)
|
||||
* Code documentation lives at https://docs.comma.ai
|
||||
* Information about running openpilot lives on the [community wiki](https://github.com/commaai/openpilot/wiki)
|
||||
|
||||
Want to get paid to work on openpilot? [comma is hiring](https://comma.ai/jobs#open-positions) and offers lots of [bounties](docs/BOUNTIES.md).
|
||||
Want to get paid to work on openpilot? [comma is hiring](https://comma.ai/jobs#open-positions) and offers lots of [bounties](docs/BOUNTIES.md) for external contributors.
|
||||
|
||||
Safety and Testing
|
||||
----
|
||||
|
||||
+8
-3
@@ -1,14 +1,19 @@
|
||||
Version 0.9.6 (20XX-XX-XX)
|
||||
Version 0.9.6 (2024-02-XX)
|
||||
========================
|
||||
* New driving model
|
||||
* Vision model trained on more data
|
||||
* Improved driving performance
|
||||
* Directly outputs curvature for lateral control
|
||||
* New driver monitoring model
|
||||
* Trained on larger dataset
|
||||
* AGNOS 9
|
||||
* comma body streaming and controls over WebRTC
|
||||
* Improved fuzzy fingerprinting for many makes and models
|
||||
* Hyundai Staria 2023 support thanks to sunnyhaibin!
|
||||
* Kia Niro Plug-in Hybrid 2022 support thanks to sunnyhaibin!
|
||||
* Toyota RAV4 2023 support
|
||||
* Toyota RAV4 Hybrid 2023 support
|
||||
* Lexus LC 2024 support thanks to nelsonjchen!
|
||||
* Toyota RAV4 2023-24 support
|
||||
* Toyota RAV4 Hybrid 2023-24 support
|
||||
|
||||
Version 0.9.5 (2023-11-17)
|
||||
========================
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
* is using in the C source code, usually in main.c. This file contains:
|
||||
* - Configuration section that allows to select:
|
||||
* - The STM32F4xx device used in the target application
|
||||
* - To use or not the peripheral’s drivers in application code(i.e.
|
||||
* code will be based on direct access to peripheral’s registers
|
||||
* - To use or not the peripheral's drivers in application code(i.e.
|
||||
* code will be based on direct access to peripheral's registers
|
||||
* rather than drivers API), this option is controlled by
|
||||
* "#define USE_HAL_DRIVER"
|
||||
*
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
const uint8_t gitversion[8] = "4ba36d72";
|
||||
const uint8_t gitversion[8] = "e92d1f09";
|
||||
|
||||
+3
-2
@@ -51,7 +51,6 @@ struct CarEvent @0x9b1657f34caf3ad3 {
|
||||
parkBrake @29;
|
||||
manualRestart @30;
|
||||
lowSpeedLockout @31;
|
||||
plannerError @32;
|
||||
joystickDebug @34;
|
||||
steerTempUnavailableSilent @35;
|
||||
resumeRequired @36;
|
||||
@@ -142,6 +141,7 @@ struct CarEvent @0x9b1657f34caf3ad3 {
|
||||
startupFuzzyFingerprintDEPRECATED @97;
|
||||
noTargetDEPRECATED @25;
|
||||
brakeUnavailableDEPRECATED @2;
|
||||
plannerErrorDEPRECATED @32;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -601,7 +601,8 @@ struct CarParams {
|
||||
enum SteerControlType {
|
||||
torque @0;
|
||||
angle @1;
|
||||
curvature @2;
|
||||
|
||||
curvatureDEPRECATED @2;
|
||||
}
|
||||
|
||||
enum TransmissionType {
|
||||
|
||||
+5
-1
@@ -65,7 +65,11 @@ struct ControlsStateExt @0xda96579883444c35 {
|
||||
alkaEnabled @1 :Bool;
|
||||
}
|
||||
|
||||
struct CustomReserved4 @0x80ae746ee2596b11 {
|
||||
struct NavInstructionExt @0x80ae746ee2596b11 {
|
||||
voiceDistance @0: Text;
|
||||
voiceDirection @1: Text;
|
||||
iconDistance @2: Text;
|
||||
iconDirection @3: Text;
|
||||
}
|
||||
|
||||
struct CustomReserved5 @0xa5cd762cd951a455 {
|
||||
|
||||
+322
-236
File diff suppressed because it is too large
Load Diff
@@ -6,11 +6,15 @@
|
||||
#include <capnp/generated-header-support.h>
|
||||
#include <kj/windows-sanity.h>
|
||||
|
||||
#if CAPNP_VERSION != 8000
|
||||
#ifndef CAPNP_VERSION
|
||||
#error "CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?"
|
||||
#elif CAPNP_VERSION != 1000002
|
||||
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
|
||||
#endif
|
||||
|
||||
|
||||
CAPNP_BEGIN_HEADER
|
||||
|
||||
namespace capnp {
|
||||
namespace schemas {
|
||||
|
||||
@@ -49,7 +53,7 @@ enum class EventName_baa8c5d505f727de: uint16_t {
|
||||
PARK_BRAKE,
|
||||
MANUAL_RESTART,
|
||||
LOW_SPEED_LOCKOUT,
|
||||
PLANNER_ERROR,
|
||||
PLANNER_ERROR_D_E_P_R_E_C_A_T_E_D,
|
||||
IPAS_OVERRIDE_D_E_P_R_E_C_A_T_E_D,
|
||||
JOYSTICK_DEBUG,
|
||||
STEER_TEMP_UNAVAILABLE_SILENT,
|
||||
@@ -265,7 +269,7 @@ CAPNP_DECLARE_SCHEMA(d661512be2def77f);
|
||||
enum class SteerControlType_d661512be2def77f: uint16_t {
|
||||
TORQUE,
|
||||
ANGLE,
|
||||
CURVATURE,
|
||||
CURVATURE_D_E_P_R_E_C_A_T_E_D,
|
||||
};
|
||||
CAPNP_DECLARE_ENUM(SteerControlType, d661512be2def77f);
|
||||
CAPNP_DECLARE_SCHEMA(8f162eeb14bfc0ec);
|
||||
@@ -8853,3 +8857,5 @@ inline ::capnp::Orphan< ::cereal::CarParams::LateralTorqueTuning> CarParams::Lat
|
||||
|
||||
} // namespace
|
||||
|
||||
CAPNP_END_HEADER
|
||||
|
||||
|
||||
+133
-26
@@ -379,7 +379,7 @@ static const uint16_t m_81c2f05a394cf4af[] = {13, 18, 19, 17, 14, 15, 16, 12, 1,
|
||||
static const uint16_t i_81c2f05a394cf4af[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
|
||||
const ::capnp::_::RawSchema s_81c2f05a394cf4af = {
|
||||
0x81c2f05a394cf4af, b_81c2f05a394cf4af.words, 366, nullptr, m_81c2f05a394cf4af,
|
||||
0, 20, i_81c2f05a394cf4af, nullptr, nullptr, { &s_81c2f05a394cf4af, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 20, i_81c2f05a394cf4af, nullptr, nullptr, { &s_81c2f05a394cf4af, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<115> b_aedffd8f31e7b55d = {
|
||||
@@ -509,7 +509,7 @@ static const uint16_t m_aedffd8f31e7b55d[] = {1, 0, 4, 2, 3};
|
||||
static const uint16_t i_aedffd8f31e7b55d[] = {0, 1, 2, 3, 4};
|
||||
const ::capnp::_::RawSchema s_aedffd8f31e7b55d = {
|
||||
0xaedffd8f31e7b55d, b_aedffd8f31e7b55d.words, 115, d_aedffd8f31e7b55d, m_aedffd8f31e7b55d,
|
||||
2, 5, i_aedffd8f31e7b55d, nullptr, nullptr, { &s_aedffd8f31e7b55d, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 5, i_aedffd8f31e7b55d, nullptr, nullptr, { &s_aedffd8f31e7b55d, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<46> b_b42a75baee731fce = {
|
||||
@@ -565,7 +565,7 @@ static const ::capnp::_::AlignedData<46> b_b42a75baee731fce = {
|
||||
static const uint16_t m_b42a75baee731fce[] = {0, 4, 1, 2, 3, 5};
|
||||
const ::capnp::_::RawSchema s_b42a75baee731fce = {
|
||||
0xb42a75baee731fce, b_b42a75baee731fce.words, 46, nullptr, m_b42a75baee731fce,
|
||||
0, 6, nullptr, nullptr, nullptr, { &s_b42a75baee731fce, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 6, nullptr, nullptr, nullptr, { &s_b42a75baee731fce, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(LongitudinalPlanExtSource_b42a75baee731fce, b42a75baee731fce);
|
||||
@@ -616,7 +616,7 @@ static const ::capnp::_::AlignedData<40> b_d1124e845254aeda = {
|
||||
static const uint16_t m_d1124e845254aeda[] = {0, 1, 3, 2};
|
||||
const ::capnp::_::RawSchema s_d1124e845254aeda = {
|
||||
0xd1124e845254aeda, b_d1124e845254aeda.words, 40, nullptr, m_d1124e845254aeda,
|
||||
0, 4, nullptr, nullptr, nullptr, { &s_d1124e845254aeda, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, nullptr, nullptr, nullptr, { &s_d1124e845254aeda, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(VisionTurnControllerState_d1124e845254aeda, d1124e845254aeda);
|
||||
@@ -686,7 +686,7 @@ static const uint16_t m_f35cc4560bbf6ec2[] = {0, 1};
|
||||
static const uint16_t i_f35cc4560bbf6ec2[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_f35cc4560bbf6ec2 = {
|
||||
0xf35cc4560bbf6ec2, b_f35cc4560bbf6ec2.words, 58, nullptr, m_f35cc4560bbf6ec2,
|
||||
0, 2, i_f35cc4560bbf6ec2, nullptr, nullptr, { &s_f35cc4560bbf6ec2, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_f35cc4560bbf6ec2, nullptr, nullptr, { &s_f35cc4560bbf6ec2, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<50> b_da96579883444c35 = {
|
||||
@@ -747,33 +747,100 @@ static const uint16_t m_da96579883444c35[] = {0, 1};
|
||||
static const uint16_t i_da96579883444c35[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_da96579883444c35 = {
|
||||
0xda96579883444c35, b_da96579883444c35.words, 50, nullptr, m_da96579883444c35,
|
||||
0, 2, i_da96579883444c35, nullptr, nullptr, { &s_da96579883444c35, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_da96579883444c35, nullptr, nullptr, { &s_da96579883444c35, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<17> b_80ae746ee2596b11 = {
|
||||
static const ::capnp::_::AlignedData<82> b_80ae746ee2596b11 = {
|
||||
{ 0, 0, 0, 0, 5, 0, 6, 0,
|
||||
17, 107, 89, 226, 110, 116, 174, 128,
|
||||
13, 0, 0, 0, 1, 0, 0, 0,
|
||||
89, 10, 85, 29, 102, 186, 38, 181,
|
||||
0, 0, 7, 0, 0, 0, 0, 0,
|
||||
4, 0, 7, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
21, 0, 0, 0, 234, 0, 0, 0,
|
||||
21, 0, 0, 0, 250, 0, 0, 0,
|
||||
33, 0, 0, 0, 7, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
29, 0, 0, 0, 231, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
99, 117, 115, 116, 111, 109, 46, 99,
|
||||
97, 112, 110, 112, 58, 67, 117, 115,
|
||||
116, 111, 109, 82, 101, 115, 101, 114,
|
||||
118, 101, 100, 52, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 1, 0, 1, 0, }
|
||||
97, 112, 110, 112, 58, 78, 97, 118,
|
||||
73, 110, 115, 116, 114, 117, 99, 116,
|
||||
105, 111, 110, 69, 120, 116, 0, 0,
|
||||
0, 0, 0, 0, 1, 0, 1, 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,
|
||||
97, 0, 0, 0, 114, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
96, 0, 0, 0, 3, 0, 1, 0,
|
||||
108, 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,
|
||||
105, 0, 0, 0, 122, 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,
|
||||
2, 0, 0, 0, 2, 0, 0, 0,
|
||||
0, 0, 1, 0, 2, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
113, 0, 0, 0, 106, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
112, 0, 0, 0, 3, 0, 1, 0,
|
||||
124, 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,
|
||||
121, 0, 0, 0, 114, 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,
|
||||
118, 111, 105, 99, 101, 68, 105, 115,
|
||||
116, 97, 110, 99, 101, 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,
|
||||
12, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
118, 111, 105, 99, 101, 68, 105, 114,
|
||||
101, 99, 116, 105, 111, 110, 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,
|
||||
12, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
105, 99, 111, 110, 68, 105, 115, 116,
|
||||
97, 110, 99, 101, 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,
|
||||
12, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
105, 99, 111, 110, 68, 105, 114, 101,
|
||||
99, 116, 105, 111, 110, 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,
|
||||
12, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, }
|
||||
};
|
||||
::capnp::word const* const bp_80ae746ee2596b11 = b_80ae746ee2596b11.words;
|
||||
#if !CAPNP_LITE
|
||||
static const uint16_t m_80ae746ee2596b11[] = {3, 2, 1, 0};
|
||||
static const uint16_t i_80ae746ee2596b11[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_80ae746ee2596b11 = {
|
||||
0x80ae746ee2596b11, b_80ae746ee2596b11.words, 17, nullptr, nullptr,
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_80ae746ee2596b11, nullptr, nullptr, 0, 0, nullptr }
|
||||
0x80ae746ee2596b11, b_80ae746ee2596b11.words, 82, nullptr, m_80ae746ee2596b11,
|
||||
0, 4, i_80ae746ee2596b11, nullptr, nullptr, { &s_80ae746ee2596b11, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<17> b_a5cd762cd951a455 = {
|
||||
@@ -799,7 +866,7 @@ static const ::capnp::_::AlignedData<17> b_a5cd762cd951a455 = {
|
||||
#if !CAPNP_LITE
|
||||
const ::capnp::_::RawSchema s_a5cd762cd951a455 = {
|
||||
0xa5cd762cd951a455, b_a5cd762cd951a455.words, 17, nullptr, nullptr,
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_a5cd762cd951a455, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_a5cd762cd951a455, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<17> b_f98d843bfd7004a3 = {
|
||||
@@ -825,7 +892,7 @@ static const ::capnp::_::AlignedData<17> b_f98d843bfd7004a3 = {
|
||||
#if !CAPNP_LITE
|
||||
const ::capnp::_::RawSchema s_f98d843bfd7004a3 = {
|
||||
0xf98d843bfd7004a3, b_f98d843bfd7004a3.words, 17, nullptr, nullptr,
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_f98d843bfd7004a3, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_f98d843bfd7004a3, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<17> b_b86e6369214c01c8 = {
|
||||
@@ -851,7 +918,7 @@ static const ::capnp::_::AlignedData<17> b_b86e6369214c01c8 = {
|
||||
#if !CAPNP_LITE
|
||||
const ::capnp::_::RawSchema s_b86e6369214c01c8 = {
|
||||
0xb86e6369214c01c8, b_b86e6369214c01c8.words, 17, nullptr, nullptr,
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_b86e6369214c01c8, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_b86e6369214c01c8, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<17> b_f416ec09499d9d19 = {
|
||||
@@ -877,7 +944,7 @@ static const ::capnp::_::AlignedData<17> b_f416ec09499d9d19 = {
|
||||
#if !CAPNP_LITE
|
||||
const ::capnp::_::RawSchema s_f416ec09499d9d19 = {
|
||||
0xf416ec09499d9d19, b_f416ec09499d9d19.words, 17, nullptr, nullptr,
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_f416ec09499d9d19, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_f416ec09499d9d19, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<17> b_a1680744031fdb2d = {
|
||||
@@ -903,7 +970,7 @@ static const ::capnp::_::AlignedData<17> b_a1680744031fdb2d = {
|
||||
#if !CAPNP_LITE
|
||||
const ::capnp::_::RawSchema s_a1680744031fdb2d = {
|
||||
0xa1680744031fdb2d, b_a1680744031fdb2d.words, 17, nullptr, nullptr,
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_a1680744031fdb2d, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 0, nullptr, nullptr, nullptr, { &s_a1680744031fdb2d, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
} // namespace schemas
|
||||
@@ -914,83 +981,123 @@ const ::capnp::_::RawSchema s_a1680744031fdb2d = {
|
||||
namespace cereal {
|
||||
|
||||
// LiveMapData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LiveMapData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LiveMapData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LiveMapData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LiveMapData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LongitudinalPlanExt
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LongitudinalPlanExt::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LongitudinalPlanExt::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LongitudinalPlanExt::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LongitudinalPlanExt::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LateralPlanExt
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LateralPlanExt::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LateralPlanExt::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LateralPlanExt::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LateralPlanExt::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ControlsStateExt
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ControlsStateExt::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ControlsStateExt::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ControlsStateExt::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ControlsStateExt::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CustomReserved4
|
||||
constexpr uint16_t CustomReserved4::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CustomReserved4::_capnpPrivate::pointerCount;
|
||||
// NavInstructionExt
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t NavInstructionExt::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t NavInstructionExt::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
constexpr ::capnp::Kind CustomReserved4::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CustomReserved4::_capnpPrivate::schema;
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind NavInstructionExt::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* NavInstructionExt::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CustomReserved5
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CustomReserved5::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CustomReserved5::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CustomReserved5::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CustomReserved5::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CustomReserved6
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CustomReserved6::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CustomReserved6::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CustomReserved6::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CustomReserved6::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CustomReserved7
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CustomReserved7::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CustomReserved7::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CustomReserved7::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CustomReserved7::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CustomReserved8
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CustomReserved8::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CustomReserved8::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CustomReserved8::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CustomReserved8::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CustomReserved9
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CustomReserved9::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CustomReserved9::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CustomReserved9::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CustomReserved9::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
|
||||
|
||||
+192
-10
@@ -6,11 +6,15 @@
|
||||
#include <capnp/generated-header-support.h>
|
||||
#include <kj/windows-sanity.h>
|
||||
|
||||
#if CAPNP_VERSION != 8000
|
||||
#ifndef CAPNP_VERSION
|
||||
#error "CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?"
|
||||
#elif CAPNP_VERSION != 1000002
|
||||
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
|
||||
#endif
|
||||
|
||||
|
||||
CAPNP_BEGIN_HEADER
|
||||
|
||||
namespace capnp {
|
||||
namespace schemas {
|
||||
|
||||
@@ -112,15 +116,15 @@ struct ControlsStateExt {
|
||||
};
|
||||
};
|
||||
|
||||
struct CustomReserved4 {
|
||||
CustomReserved4() = delete;
|
||||
struct NavInstructionExt {
|
||||
NavInstructionExt() = delete;
|
||||
|
||||
class Reader;
|
||||
class Builder;
|
||||
class Pipeline;
|
||||
|
||||
struct _capnpPrivate {
|
||||
CAPNP_DECLARE_STRUCT_HEADER(80ae746ee2596b11, 0, 0)
|
||||
CAPNP_DECLARE_STRUCT_HEADER(80ae746ee2596b11, 0, 4)
|
||||
#if !CAPNP_LITE
|
||||
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
|
||||
#endif // !CAPNP_LITE
|
||||
@@ -668,9 +672,9 @@ private:
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
class CustomReserved4::Reader {
|
||||
class NavInstructionExt::Reader {
|
||||
public:
|
||||
typedef CustomReserved4 Reads;
|
||||
typedef NavInstructionExt Reads;
|
||||
|
||||
Reader() = default;
|
||||
inline explicit Reader(::capnp::_::StructReader base): _reader(base) {}
|
||||
@@ -685,6 +689,18 @@ public:
|
||||
}
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
inline bool hasVoiceDistance() const;
|
||||
inline ::capnp::Text::Reader getVoiceDistance() const;
|
||||
|
||||
inline bool hasVoiceDirection() const;
|
||||
inline ::capnp::Text::Reader getVoiceDirection() const;
|
||||
|
||||
inline bool hasIconDistance() const;
|
||||
inline ::capnp::Text::Reader getIconDistance() const;
|
||||
|
||||
inline bool hasIconDirection() const;
|
||||
inline ::capnp::Text::Reader getIconDirection() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -697,9 +713,9 @@ private:
|
||||
friend class ::capnp::Orphanage;
|
||||
};
|
||||
|
||||
class CustomReserved4::Builder {
|
||||
class NavInstructionExt::Builder {
|
||||
public:
|
||||
typedef CustomReserved4 Builds;
|
||||
typedef NavInstructionExt Builds;
|
||||
|
||||
Builder() = delete; // Deleted to discourage incorrect usage.
|
||||
// You can explicitly initialize to nullptr instead.
|
||||
@@ -713,6 +729,34 @@ public:
|
||||
inline ::kj::StringTree toString() const { return asReader().toString(); }
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
inline bool hasVoiceDistance();
|
||||
inline ::capnp::Text::Builder getVoiceDistance();
|
||||
inline void setVoiceDistance( ::capnp::Text::Reader value);
|
||||
inline ::capnp::Text::Builder initVoiceDistance(unsigned int size);
|
||||
inline void adoptVoiceDistance(::capnp::Orphan< ::capnp::Text>&& value);
|
||||
inline ::capnp::Orphan< ::capnp::Text> disownVoiceDistance();
|
||||
|
||||
inline bool hasVoiceDirection();
|
||||
inline ::capnp::Text::Builder getVoiceDirection();
|
||||
inline void setVoiceDirection( ::capnp::Text::Reader value);
|
||||
inline ::capnp::Text::Builder initVoiceDirection(unsigned int size);
|
||||
inline void adoptVoiceDirection(::capnp::Orphan< ::capnp::Text>&& value);
|
||||
inline ::capnp::Orphan< ::capnp::Text> disownVoiceDirection();
|
||||
|
||||
inline bool hasIconDistance();
|
||||
inline ::capnp::Text::Builder getIconDistance();
|
||||
inline void setIconDistance( ::capnp::Text::Reader value);
|
||||
inline ::capnp::Text::Builder initIconDistance(unsigned int size);
|
||||
inline void adoptIconDistance(::capnp::Orphan< ::capnp::Text>&& value);
|
||||
inline ::capnp::Orphan< ::capnp::Text> disownIconDistance();
|
||||
|
||||
inline bool hasIconDirection();
|
||||
inline ::capnp::Text::Builder getIconDirection();
|
||||
inline void setIconDirection( ::capnp::Text::Reader value);
|
||||
inline ::capnp::Text::Builder initIconDirection(unsigned int size);
|
||||
inline void adoptIconDirection(::capnp::Orphan< ::capnp::Text>&& value);
|
||||
inline ::capnp::Orphan< ::capnp::Text> disownIconDirection();
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -723,9 +767,9 @@ private:
|
||||
};
|
||||
|
||||
#if !CAPNP_LITE
|
||||
class CustomReserved4::Pipeline {
|
||||
class NavInstructionExt::Pipeline {
|
||||
public:
|
||||
typedef CustomReserved4 Pipelines;
|
||||
typedef NavInstructionExt Pipelines;
|
||||
|
||||
inline Pipeline(decltype(nullptr)): _typeless(nullptr) {}
|
||||
inline explicit Pipeline(::capnp::AnyPointer::Pipeline&& typeless)
|
||||
@@ -1642,5 +1686,143 @@ inline void ControlsStateExt::Builder::setAlkaEnabled(bool value) {
|
||||
::capnp::bounded<1>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline bool NavInstructionExt::Reader::hasVoiceDistance() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool NavInstructionExt::Builder::hasVoiceDistance() {
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::capnp::Text::Reader NavInstructionExt::Reader::getVoiceDistance() const {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::getVoiceDistance() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void NavInstructionExt::Builder::setVoiceDistance( ::capnp::Text::Reader value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::set(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::initVoiceDistance(unsigned int size) {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::init(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), size);
|
||||
}
|
||||
inline void NavInstructionExt::Builder::adoptVoiceDistance(
|
||||
::capnp::Orphan< ::capnp::Text>&& value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::capnp::Text> NavInstructionExt::Builder::disownVoiceDistance() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool NavInstructionExt::Reader::hasVoiceDirection() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool NavInstructionExt::Builder::hasVoiceDirection() {
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::capnp::Text::Reader NavInstructionExt::Reader::getVoiceDirection() const {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_reader.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::getVoiceDirection() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_builder.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void NavInstructionExt::Builder::setVoiceDirection( ::capnp::Text::Reader value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::set(_builder.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::initVoiceDirection(unsigned int size) {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::init(_builder.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS), size);
|
||||
}
|
||||
inline void NavInstructionExt::Builder::adoptVoiceDirection(
|
||||
::capnp::Orphan< ::capnp::Text>&& value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::capnp::Text> NavInstructionExt::Builder::disownVoiceDirection() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<1>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool NavInstructionExt::Reader::hasIconDistance() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool NavInstructionExt::Builder::hasIconDistance() {
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::capnp::Text::Reader NavInstructionExt::Reader::getIconDistance() const {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_reader.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::getIconDistance() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_builder.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void NavInstructionExt::Builder::setIconDistance( ::capnp::Text::Reader value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::set(_builder.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::initIconDistance(unsigned int size) {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::init(_builder.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS), size);
|
||||
}
|
||||
inline void NavInstructionExt::Builder::adoptIconDistance(
|
||||
::capnp::Orphan< ::capnp::Text>&& value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::capnp::Text> NavInstructionExt::Builder::disownIconDistance() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<2>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool NavInstructionExt::Reader::hasIconDirection() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool NavInstructionExt::Builder::hasIconDirection() {
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::capnp::Text::Reader NavInstructionExt::Reader::getIconDirection() const {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_reader.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::getIconDirection() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::get(_builder.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void NavInstructionExt::Builder::setIconDirection( ::capnp::Text::Reader value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::set(_builder.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::capnp::Text::Builder NavInstructionExt::Builder::initIconDirection(unsigned int size) {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::init(_builder.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS), size);
|
||||
}
|
||||
inline void NavInstructionExt::Builder::adoptIconDirection(
|
||||
::capnp::Orphan< ::capnp::Text>&& value) {
|
||||
::capnp::_::PointerHelpers< ::capnp::Text>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::capnp::Text> NavInstructionExt::Builder::disownIconDirection() {
|
||||
return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<3>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
CAPNP_END_HEADER
|
||||
|
||||
|
||||
+212
-52
@@ -61,7 +61,7 @@ static const uint16_t m_9811e1f38f62f2d1[] = {1, 0};
|
||||
static const uint16_t i_9811e1f38f62f2d1[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_9811e1f38f62f2d1 = {
|
||||
0x9811e1f38f62f2d1, b_9811e1f38f62f2d1.words, 48, nullptr, m_9811e1f38f62f2d1,
|
||||
0, 2, i_9811e1f38f62f2d1, nullptr, nullptr, { &s_9811e1f38f62f2d1, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_9811e1f38f62f2d1, nullptr, nullptr, { &s_9811e1f38f62f2d1, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<81> b_c08240f996aefced = {
|
||||
@@ -153,7 +153,7 @@ static const uint16_t m_c08240f996aefced[] = {1, 2, 3, 0};
|
||||
static const uint16_t i_c08240f996aefced[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_c08240f996aefced = {
|
||||
0xc08240f996aefced, b_c08240f996aefced.words, 81, nullptr, m_c08240f996aefced,
|
||||
0, 4, i_c08240f996aefced, nullptr, nullptr, { &s_c08240f996aefced, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, i_c08240f996aefced, nullptr, nullptr, { &s_c08240f996aefced, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<86> b_88dcce08ad29dda0 = {
|
||||
@@ -253,7 +253,7 @@ static const uint16_t m_88dcce08ad29dda0[] = {0, 2, 3, 1};
|
||||
static const uint16_t i_88dcce08ad29dda0[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_88dcce08ad29dda0 = {
|
||||
0x88dcce08ad29dda0, b_88dcce08ad29dda0.words, 86, d_88dcce08ad29dda0, m_88dcce08ad29dda0,
|
||||
1, 4, i_88dcce08ad29dda0, nullptr, nullptr, { &s_88dcce08ad29dda0, nullptr, nullptr, 0, 0, nullptr }
|
||||
1, 4, i_88dcce08ad29dda0, nullptr, nullptr, { &s_88dcce08ad29dda0, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<39> b_9917470acf94d285 = {
|
||||
@@ -302,7 +302,7 @@ static const ::capnp::_::AlignedData<39> b_9917470acf94d285 = {
|
||||
static const uint16_t m_9917470acf94d285[] = {0, 1, 2, 4, 3};
|
||||
const ::capnp::_::RawSchema s_9917470acf94d285 = {
|
||||
0x9917470acf94d285, b_9917470acf94d285.words, 39, nullptr, m_9917470acf94d285,
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_9917470acf94d285, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_9917470acf94d285, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(App_9917470acf94d285, 9917470acf94d285);
|
||||
@@ -447,7 +447,7 @@ static const uint16_t m_8afd33dc9b35e1aa[] = {0, 5, 4, 2, 3, 1};
|
||||
static const uint16_t i_8afd33dc9b35e1aa[] = {0, 1, 2, 3, 4, 5};
|
||||
const ::capnp::_::RawSchema s_8afd33dc9b35e1aa = {
|
||||
0x8afd33dc9b35e1aa, b_8afd33dc9b35e1aa.words, 133, nullptr, m_8afd33dc9b35e1aa,
|
||||
0, 6, i_8afd33dc9b35e1aa, nullptr, nullptr, { &s_8afd33dc9b35e1aa, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 6, i_8afd33dc9b35e1aa, nullptr, nullptr, { &s_8afd33dc9b35e1aa, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<48> b_a99a9d5b33cf5859 = {
|
||||
@@ -506,7 +506,7 @@ static const uint16_t m_a99a9d5b33cf5859[] = {0, 1};
|
||||
static const uint16_t i_a99a9d5b33cf5859[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_a99a9d5b33cf5859 = {
|
||||
0xa99a9d5b33cf5859, b_a99a9d5b33cf5859.words, 48, nullptr, m_a99a9d5b33cf5859,
|
||||
0, 2, i_a99a9d5b33cf5859, nullptr, nullptr, { &s_a99a9d5b33cf5859, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_a99a9d5b33cf5859, nullptr, nullptr, { &s_a99a9d5b33cf5859, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<48> b_cff7566681c277ce = {
|
||||
@@ -565,7 +565,7 @@ static const uint16_t m_cff7566681c277ce[] = {1, 0};
|
||||
static const uint16_t i_cff7566681c277ce[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_cff7566681c277ce = {
|
||||
0xcff7566681c277ce, b_cff7566681c277ce.words, 48, nullptr, m_cff7566681c277ce,
|
||||
0, 2, i_cff7566681c277ce, nullptr, nullptr, { &s_cff7566681c277ce, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_cff7566681c277ce, nullptr, nullptr, { &s_cff7566681c277ce, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<260> b_d4df5a192382ba0b = {
|
||||
@@ -839,7 +839,7 @@ static const uint16_t m_d4df5a192382ba0b[] = {0, 2, 6, 7, 8, 13, 14, 3, 11, 4, 9
|
||||
static const uint16_t i_d4df5a192382ba0b[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14};
|
||||
const ::capnp::_::RawSchema s_d4df5a192382ba0b = {
|
||||
0xd4df5a192382ba0b, b_d4df5a192382ba0b.words, 260, d_d4df5a192382ba0b, m_d4df5a192382ba0b,
|
||||
1, 15, i_d4df5a192382ba0b, nullptr, nullptr, { &s_d4df5a192382ba0b, nullptr, nullptr, 0, 0, nullptr }
|
||||
1, 15, i_d4df5a192382ba0b, nullptr, nullptr, { &s_d4df5a192382ba0b, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<40> b_cb6a279f015f6b51 = {
|
||||
@@ -889,7 +889,7 @@ static const ::capnp::_::AlignedData<40> b_cb6a279f015f6b51 = {
|
||||
static const uint16_t m_cb6a279f015f6b51[] = {3, 0, 1, 2, 4};
|
||||
const ::capnp::_::RawSchema s_cb6a279f015f6b51 = {
|
||||
0xcb6a279f015f6b51, b_cb6a279f015f6b51.words, 40, nullptr, m_cb6a279f015f6b51,
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_cb6a279f015f6b51, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_cb6a279f015f6b51, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(ChannelWidth_cb6a279f015f6b51, cb6a279f015f6b51);
|
||||
@@ -949,7 +949,7 @@ static const uint16_t m_94b7baa90c5c321e[] = {0, 1};
|
||||
static const uint16_t i_94b7baa90c5c321e[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_94b7baa90c5c321e = {
|
||||
0x94b7baa90c5c321e, b_94b7baa90c5c321e.words, 48, nullptr, m_94b7baa90c5c321e,
|
||||
0, 2, i_94b7baa90c5c321e, nullptr, nullptr, { &s_94b7baa90c5c321e, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_94b7baa90c5c321e, nullptr, nullptr, { &s_94b7baa90c5c321e, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<314> b_b8aad62cffef28a9 = {
|
||||
@@ -1281,7 +1281,7 @@ static const uint16_t m_b8aad62cffef28a9[] = {12, 13, 0, 6, 16, 4, 7, 2, 11, 10,
|
||||
static const uint16_t i_b8aad62cffef28a9[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
const ::capnp::_::RawSchema s_b8aad62cffef28a9 = {
|
||||
0xb8aad62cffef28a9, b_b8aad62cffef28a9.words, 314, d_b8aad62cffef28a9, m_b8aad62cffef28a9,
|
||||
5, 17, i_b8aad62cffef28a9, nullptr, nullptr, { &s_b8aad62cffef28a9, nullptr, nullptr, 0, 0, nullptr }
|
||||
5, 17, i_b8aad62cffef28a9, nullptr, nullptr, { &s_b8aad62cffef28a9, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<121> b_8817eeea389e9f08 = {
|
||||
@@ -1413,7 +1413,7 @@ static const uint16_t m_8817eeea389e9f08[] = {0, 4, 1, 2, 3, 5};
|
||||
static const uint16_t i_8817eeea389e9f08[] = {0, 1, 2, 3, 4, 5};
|
||||
const ::capnp::_::RawSchema s_8817eeea389e9f08 = {
|
||||
0x8817eeea389e9f08, b_8817eeea389e9f08.words, 121, nullptr, m_8817eeea389e9f08,
|
||||
0, 6, i_8817eeea389e9f08, nullptr, nullptr, { &s_8817eeea389e9f08, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 6, i_8817eeea389e9f08, nullptr, nullptr, { &s_8817eeea389e9f08, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<154> b_d1c9bef96d26fa91 = {
|
||||
@@ -1578,7 +1578,7 @@ static const uint16_t m_d1c9bef96d26fa91[] = {0, 1, 7, 8, 3, 4, 5, 6, 2};
|
||||
static const uint16_t i_d1c9bef96d26fa91[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
|
||||
const ::capnp::_::RawSchema s_d1c9bef96d26fa91 = {
|
||||
0xd1c9bef96d26fa91, b_d1c9bef96d26fa91.words, 154, nullptr, m_d1c9bef96d26fa91,
|
||||
0, 9, i_d1c9bef96d26fa91, nullptr, nullptr, { &s_d1c9bef96d26fa91, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 9, i_d1c9bef96d26fa91, nullptr, nullptr, { &s_d1c9bef96d26fa91, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<141> b_a26e3710efd3e914 = {
|
||||
@@ -1730,7 +1730,7 @@ static const uint16_t m_a26e3710efd3e914[] = {3, 2, 0, 1, 4, 6, 5};
|
||||
static const uint16_t i_a26e3710efd3e914[] = {0, 1, 2, 3, 4, 5, 6};
|
||||
const ::capnp::_::RawSchema s_a26e3710efd3e914 = {
|
||||
0xa26e3710efd3e914, b_a26e3710efd3e914.words, 141, nullptr, m_a26e3710efd3e914,
|
||||
0, 7, i_a26e3710efd3e914, nullptr, nullptr, { &s_a26e3710efd3e914, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 7, i_a26e3710efd3e914, nullptr, nullptr, { &s_a26e3710efd3e914, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<126> b_9744f25fb60f2bf8 = {
|
||||
@@ -1867,7 +1867,7 @@ static const uint16_t m_9744f25fb60f2bf8[] = {2, 1, 5, 0, 3, 4};
|
||||
static const uint16_t i_9744f25fb60f2bf8[] = {0, 1, 2, 3, 4, 5};
|
||||
const ::capnp::_::RawSchema s_9744f25fb60f2bf8 = {
|
||||
0x9744f25fb60f2bf8, b_9744f25fb60f2bf8.words, 126, nullptr, m_9744f25fb60f2bf8,
|
||||
0, 6, i_9744f25fb60f2bf8, nullptr, nullptr, { &s_9744f25fb60f2bf8, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 6, i_9744f25fb60f2bf8, nullptr, nullptr, { &s_9744f25fb60f2bf8, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<78> b_f98f999c6a071122 = {
|
||||
@@ -1956,7 +1956,7 @@ static const uint16_t m_f98f999c6a071122[] = {1, 2, 0};
|
||||
static const uint16_t i_f98f999c6a071122[] = {0, 1, 2};
|
||||
const ::capnp::_::RawSchema s_f98f999c6a071122 = {
|
||||
0xf98f999c6a071122, b_f98f999c6a071122.words, 78, nullptr, m_f98f999c6a071122,
|
||||
0, 3, i_f98f999c6a071122, nullptr, nullptr, { &s_f98f999c6a071122, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 3, i_f98f999c6a071122, nullptr, nullptr, { &s_f98f999c6a071122, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<62> b_c25bbbd524983447 = {
|
||||
@@ -2029,7 +2029,7 @@ static const uint16_t m_c25bbbd524983447[] = {0, 1, 2};
|
||||
static const uint16_t i_c25bbbd524983447[] = {0, 1, 2};
|
||||
const ::capnp::_::RawSchema s_c25bbbd524983447 = {
|
||||
0xc25bbbd524983447, b_c25bbbd524983447.words, 62, nullptr, m_c25bbbd524983447,
|
||||
0, 3, i_c25bbbd524983447, nullptr, nullptr, { &s_c25bbbd524983447, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 3, i_c25bbbd524983447, nullptr, nullptr, { &s_c25bbbd524983447, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<64> b_e10e21168db0c7f7 = {
|
||||
@@ -2104,7 +2104,7 @@ static const uint16_t m_e10e21168db0c7f7[] = {0, 1, 2};
|
||||
static const uint16_t i_e10e21168db0c7f7[] = {0, 1, 2};
|
||||
const ::capnp::_::RawSchema s_e10e21168db0c7f7 = {
|
||||
0xe10e21168db0c7f7, b_e10e21168db0c7f7.words, 64, nullptr, m_e10e21168db0c7f7,
|
||||
0, 3, i_e10e21168db0c7f7, nullptr, nullptr, { &s_e10e21168db0c7f7, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 3, i_e10e21168db0c7f7, nullptr, nullptr, { &s_e10e21168db0c7f7, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<153> b_ab54c59699f8f9f3 = {
|
||||
@@ -2272,7 +2272,7 @@ static const uint16_t m_ab54c59699f8f9f3[] = {5, 6, 0, 7, 1, 4, 3, 2};
|
||||
static const uint16_t i_ab54c59699f8f9f3[] = {0, 1, 2, 3, 4, 5, 6, 7};
|
||||
const ::capnp::_::RawSchema s_ab54c59699f8f9f3 = {
|
||||
0xab54c59699f8f9f3, b_ab54c59699f8f9f3.words, 153, d_ab54c59699f8f9f3, m_ab54c59699f8f9f3,
|
||||
2, 8, i_ab54c59699f8f9f3, nullptr, nullptr, { &s_ab54c59699f8f9f3, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 8, i_ab54c59699f8f9f3, nullptr, nullptr, { &s_ab54c59699f8f9f3, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<155> b_f5ad1d90cdc1dd6b = {
|
||||
@@ -2442,7 +2442,7 @@ static const uint16_t m_f5ad1d90cdc1dd6b[] = {4, 6, 5, 1, 3, 2, 0, 7};
|
||||
static const uint16_t i_f5ad1d90cdc1dd6b[] = {0, 1, 2, 3, 4, 5, 6, 7};
|
||||
const ::capnp::_::RawSchema s_f5ad1d90cdc1dd6b = {
|
||||
0xf5ad1d90cdc1dd6b, b_f5ad1d90cdc1dd6b.words, 155, d_f5ad1d90cdc1dd6b, m_f5ad1d90cdc1dd6b,
|
||||
2, 8, i_f5ad1d90cdc1dd6b, nullptr, nullptr, { &s_f5ad1d90cdc1dd6b, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 8, i_f5ad1d90cdc1dd6b, nullptr, nullptr, { &s_f5ad1d90cdc1dd6b, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<103> b_90c8426c3eaddd3b = {
|
||||
@@ -2562,7 +2562,7 @@ static const uint16_t m_90c8426c3eaddd3b[] = {2, 4, 3, 1, 0};
|
||||
static const uint16_t i_90c8426c3eaddd3b[] = {0, 1, 2, 3, 4};
|
||||
const ::capnp::_::RawSchema s_90c8426c3eaddd3b = {
|
||||
0x90c8426c3eaddd3b, b_90c8426c3eaddd3b.words, 103, d_90c8426c3eaddd3b, m_90c8426c3eaddd3b,
|
||||
4, 5, i_90c8426c3eaddd3b, nullptr, nullptr, { &s_90c8426c3eaddd3b, nullptr, nullptr, 0, 0, nullptr }
|
||||
4, 5, i_90c8426c3eaddd3b, nullptr, nullptr, { &s_90c8426c3eaddd3b, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<53> b_e8db07dcf8fcea05 = {
|
||||
@@ -2625,7 +2625,7 @@ static const ::capnp::_::AlignedData<53> b_e8db07dcf8fcea05 = {
|
||||
static const uint16_t m_e8db07dcf8fcea05[] = {1, 2, 3, 4, 0, 5, 6};
|
||||
const ::capnp::_::RawSchema s_e8db07dcf8fcea05 = {
|
||||
0xe8db07dcf8fcea05, b_e8db07dcf8fcea05.words, 53, nullptr, m_e8db07dcf8fcea05,
|
||||
0, 7, nullptr, nullptr, nullptr, { &s_e8db07dcf8fcea05, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 7, nullptr, nullptr, nullptr, { &s_e8db07dcf8fcea05, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Type_e8db07dcf8fcea05, e8db07dcf8fcea05);
|
||||
@@ -2672,7 +2672,7 @@ static const ::capnp::_::AlignedData<36> b_b9aa88c75ef99a1f = {
|
||||
static const uint16_t m_b9aa88c75ef99a1f[] = {3, 2, 0, 1};
|
||||
const ::capnp::_::RawSchema s_b9aa88c75ef99a1f = {
|
||||
0xb9aa88c75ef99a1f, b_b9aa88c75ef99a1f.words, 36, nullptr, m_b9aa88c75ef99a1f,
|
||||
0, 4, nullptr, nullptr, nullptr, { &s_b9aa88c75ef99a1f, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, nullptr, nullptr, nullptr, { &s_b9aa88c75ef99a1f, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Status_b9aa88c75ef99a1f, b9aa88c75ef99a1f);
|
||||
@@ -3094,7 +3094,7 @@ static const uint16_t m_b99b2bc7a57e8128[] = {12, 13, 3, 15, 16, 11, 8, 22, 1, 2
|
||||
static const uint16_t i_b99b2bc7a57e8128[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22};
|
||||
const ::capnp::_::RawSchema s_b99b2bc7a57e8128 = {
|
||||
0xb99b2bc7a57e8128, b_b99b2bc7a57e8128.words, 406, d_b99b2bc7a57e8128, m_b99b2bc7a57e8128,
|
||||
2, 23, i_b99b2bc7a57e8128, nullptr, nullptr, { &s_b99b2bc7a57e8128, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 23, i_b99b2bc7a57e8128, nullptr, nullptr, { &s_b99b2bc7a57e8128, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<159> b_943dc4625473b03f = {
|
||||
@@ -3264,7 +3264,7 @@ static const uint16_t m_943dc4625473b03f[] = {7, 5, 6, 4, 0, 3, 2, 1};
|
||||
static const uint16_t i_943dc4625473b03f[] = {0, 1, 2, 3, 4, 5, 6, 7};
|
||||
const ::capnp::_::RawSchema s_943dc4625473b03f = {
|
||||
0x943dc4625473b03f, b_943dc4625473b03f.words, 159, nullptr, m_943dc4625473b03f,
|
||||
0, 8, i_943dc4625473b03f, nullptr, nullptr, { &s_943dc4625473b03f, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 8, i_943dc4625473b03f, nullptr, nullptr, { &s_943dc4625473b03f, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<41> b_c871d3cc252af657 = {
|
||||
@@ -3315,7 +3315,7 @@ static const ::capnp::_::AlignedData<41> b_c871d3cc252af657 = {
|
||||
static const uint16_t m_c871d3cc252af657[] = {0, 4, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_c871d3cc252af657 = {
|
||||
0xc871d3cc252af657, b_c871d3cc252af657.words, 41, nullptr, m_c871d3cc252af657,
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_c871d3cc252af657, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_c871d3cc252af657, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(SensorSource_c871d3cc252af657, c871d3cc252af657);
|
||||
@@ -3445,7 +3445,7 @@ static const uint16_t m_d7700859ed1f5b76[] = {1, 3, 2, 4, 5, 0};
|
||||
static const uint16_t i_d7700859ed1f5b76[] = {0, 1, 2, 3, 4, 5};
|
||||
const ::capnp::_::RawSchema s_d7700859ed1f5b76 = {
|
||||
0xd7700859ed1f5b76, b_d7700859ed1f5b76.words, 118, nullptr, m_d7700859ed1f5b76,
|
||||
0, 6, i_d7700859ed1f5b76, nullptr, nullptr, { &s_d7700859ed1f5b76, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 6, i_d7700859ed1f5b76, nullptr, nullptr, { &s_d7700859ed1f5b76, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<143> b_cd60164a8a0159ef = {
|
||||
@@ -3599,7 +3599,7 @@ static const uint16_t m_cd60164a8a0159ef[] = {3, 6, 4, 0, 5, 1, 2};
|
||||
static const uint16_t i_cd60164a8a0159ef[] = {0, 1, 2, 3, 4, 5, 6};
|
||||
const ::capnp::_::RawSchema s_cd60164a8a0159ef = {
|
||||
0xcd60164a8a0159ef, b_cd60164a8a0159ef.words, 143, nullptr, m_cd60164a8a0159ef,
|
||||
0, 7, i_cd60164a8a0159ef, nullptr, nullptr, { &s_cd60164a8a0159ef, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 7, i_cd60164a8a0159ef, nullptr, nullptr, { &s_cd60164a8a0159ef, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<99> b_d500d30c5803fa4f = {
|
||||
@@ -3709,7 +3709,7 @@ static const uint16_t m_d500d30c5803fa4f[] = {4, 2, 3, 0, 1};
|
||||
static const uint16_t i_d500d30c5803fa4f[] = {0, 1, 2, 3, 4};
|
||||
const ::capnp::_::RawSchema s_d500d30c5803fa4f = {
|
||||
0xd500d30c5803fa4f, b_d500d30c5803fa4f.words, 99, nullptr, m_d500d30c5803fa4f,
|
||||
0, 5, i_d500d30c5803fa4f, nullptr, nullptr, { &s_d500d30c5803fa4f, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 5, i_d500d30c5803fa4f, nullptr, nullptr, { &s_d500d30c5803fa4f, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<83> b_c8233c0345e27e24 = {
|
||||
@@ -3806,7 +3806,7 @@ static const uint16_t m_c8233c0345e27e24[] = {3, 2, 0, 1};
|
||||
static const uint16_t i_c8233c0345e27e24[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_c8233c0345e27e24 = {
|
||||
0xc8233c0345e27e24, b_c8233c0345e27e24.words, 83, d_c8233c0345e27e24, m_c8233c0345e27e24,
|
||||
1, 4, i_c8233c0345e27e24, nullptr, nullptr, { &s_c8233c0345e27e24, nullptr, nullptr, 0, 0, nullptr }
|
||||
1, 4, i_c8233c0345e27e24, nullptr, nullptr, { &s_c8233c0345e27e24, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<95> b_92e21bb7ea38793a = {
|
||||
@@ -3912,7 +3912,7 @@ static const uint16_t m_92e21bb7ea38793a[] = {1, 3, 0, 2};
|
||||
static const uint16_t i_92e21bb7ea38793a[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_92e21bb7ea38793a = {
|
||||
0x92e21bb7ea38793a, b_92e21bb7ea38793a.words, 95, nullptr, m_92e21bb7ea38793a,
|
||||
0, 4, i_92e21bb7ea38793a, nullptr, nullptr, { &s_92e21bb7ea38793a, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, i_92e21bb7ea38793a, nullptr, nullptr, { &s_92e21bb7ea38793a, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<92> b_9b326d4e436afec7 = {
|
||||
@@ -4015,7 +4015,7 @@ static const uint16_t m_9b326d4e436afec7[] = {2, 3, 1, 0};
|
||||
static const uint16_t i_9b326d4e436afec7[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_9b326d4e436afec7 = {
|
||||
0x9b326d4e436afec7, b_9b326d4e436afec7.words, 92, nullptr, m_9b326d4e436afec7,
|
||||
0, 4, i_9b326d4e436afec7, nullptr, nullptr, { &s_9b326d4e436afec7, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, i_9b326d4e436afec7, nullptr, nullptr, { &s_9b326d4e436afec7, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<91> b_8fdfadb254ea867a = {
|
||||
@@ -4117,7 +4117,7 @@ static const uint16_t m_8fdfadb254ea867a[] = {0, 1, 2, 3};
|
||||
static const uint16_t i_8fdfadb254ea867a[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_8fdfadb254ea867a = {
|
||||
0x8fdfadb254ea867a, b_8fdfadb254ea867a.words, 91, nullptr, m_8fdfadb254ea867a,
|
||||
0, 4, i_8fdfadb254ea867a, nullptr, nullptr, { &s_8fdfadb254ea867a, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, i_8fdfadb254ea867a, nullptr, nullptr, { &s_8fdfadb254ea867a, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<52> b_bd8822120928120c = {
|
||||
@@ -4183,7 +4183,7 @@ static const uint16_t m_bd8822120928120c[] = {1, 0};
|
||||
static const uint16_t i_bd8822120928120c[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_bd8822120928120c = {
|
||||
0xbd8822120928120c, b_bd8822120928120c.words, 52, d_bd8822120928120c, m_bd8822120928120c,
|
||||
1, 2, i_bd8822120928120c, nullptr, nullptr, { &s_bd8822120928120c, nullptr, nullptr, 0, 0, nullptr }
|
||||
1, 2, i_bd8822120928120c, nullptr, nullptr, { &s_bd8822120928120c, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<153> b_ce7cd672cacc7814 = {
|
||||
@@ -4347,7 +4347,7 @@ static const uint16_t m_ce7cd672cacc7814[] = {4, 6, 8, 3, 1, 2, 7, 5, 0};
|
||||
static const uint16_t i_ce7cd672cacc7814[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
|
||||
const ::capnp::_::RawSchema s_ce7cd672cacc7814 = {
|
||||
0xce7cd672cacc7814, b_ce7cd672cacc7814.words, 153, nullptr, m_ce7cd672cacc7814,
|
||||
0, 9, i_ce7cd672cacc7814, nullptr, nullptr, { &s_ce7cd672cacc7814, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 9, i_ce7cd672cacc7814, nullptr, nullptr, { &s_ce7cd672cacc7814, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<75> b_db98be6565516acb = {
|
||||
@@ -4436,7 +4436,7 @@ static const uint16_t m_db98be6565516acb[] = {1, 0, 2};
|
||||
static const uint16_t i_db98be6565516acb[] = {0, 1, 2};
|
||||
const ::capnp::_::RawSchema s_db98be6565516acb = {
|
||||
0xdb98be6565516acb, b_db98be6565516acb.words, 75, d_db98be6565516acb, m_db98be6565516acb,
|
||||
1, 3, i_db98be6565516acb, nullptr, nullptr, { &s_db98be6565516acb, nullptr, nullptr, 0, 0, nullptr }
|
||||
1, 3, i_db98be6565516acb, nullptr, nullptr, { &s_db98be6565516acb, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<48> b_9eaef9187cadbb9b = {
|
||||
@@ -4495,7 +4495,7 @@ static const uint16_t m_9eaef9187cadbb9b[] = {0, 1};
|
||||
static const uint16_t i_9eaef9187cadbb9b[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_9eaef9187cadbb9b = {
|
||||
0x9eaef9187cadbb9b, b_9eaef9187cadbb9b.words, 48, nullptr, m_9eaef9187cadbb9b,
|
||||
0, 2, i_9eaef9187cadbb9b, nullptr, nullptr, { &s_9eaef9187cadbb9b, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 2, i_9eaef9187cadbb9b, nullptr, nullptr, { &s_9eaef9187cadbb9b, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<150> b_a5b39b4fc4d7da3f = {
|
||||
@@ -4660,7 +4660,7 @@ static const uint16_t m_a5b39b4fc4d7da3f[] = {4, 3, 5, 0, 6, 7, 1, 2};
|
||||
static const uint16_t i_a5b39b4fc4d7da3f[] = {0, 1, 2, 3, 4, 5, 6, 7};
|
||||
const ::capnp::_::RawSchema s_a5b39b4fc4d7da3f = {
|
||||
0xa5b39b4fc4d7da3f, b_a5b39b4fc4d7da3f.words, 150, d_a5b39b4fc4d7da3f, m_a5b39b4fc4d7da3f,
|
||||
2, 8, i_a5b39b4fc4d7da3f, nullptr, nullptr, { &s_a5b39b4fc4d7da3f, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 8, i_a5b39b4fc4d7da3f, nullptr, nullptr, { &s_a5b39b4fc4d7da3f, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<117> b_c5417a637451246f = {
|
||||
@@ -4787,7 +4787,7 @@ static const ::capnp::_::AlignedData<117> b_c5417a637451246f = {
|
||||
static const uint16_t m_c5417a637451246f[] = {15, 16, 17, 2, 3, 6, 5, 9, 7, 11, 13, 4, 0, 1, 10, 12, 14, 18, 8, 19};
|
||||
const ::capnp::_::RawSchema s_c5417a637451246f = {
|
||||
0xc5417a637451246f, b_c5417a637451246f.words, 117, nullptr, m_c5417a637451246f,
|
||||
0, 20, nullptr, nullptr, nullptr, { &s_c5417a637451246f, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 20, nullptr, nullptr, nullptr, { &s_c5417a637451246f, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Instruction_c5417a637451246f, c5417a637451246f);
|
||||
@@ -4889,7 +4889,7 @@ static const uint16_t m_acfa74a094e62626[] = {2, 1, 3, 0};
|
||||
static const uint16_t i_acfa74a094e62626[] = {0, 1, 2, 3};
|
||||
const ::capnp::_::RawSchema s_acfa74a094e62626 = {
|
||||
0xacfa74a094e62626, b_acfa74a094e62626.words, 86, d_acfa74a094e62626, m_acfa74a094e62626,
|
||||
2, 4, i_acfa74a094e62626, nullptr, nullptr, { &s_acfa74a094e62626, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 4, i_acfa74a094e62626, nullptr, nullptr, { &s_acfa74a094e62626, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<43> b_d85d75253435bf4b = {
|
||||
@@ -4942,7 +4942,7 @@ static const ::capnp::_::AlignedData<43> b_d85d75253435bf4b = {
|
||||
static const uint16_t m_d85d75253435bf4b[] = {3, 1, 2, 4, 0};
|
||||
const ::capnp::_::RawSchema s_d85d75253435bf4b = {
|
||||
0xd85d75253435bf4b, b_d85d75253435bf4b.words, 43, nullptr, m_d85d75253435bf4b,
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_d85d75253435bf4b, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 5, nullptr, nullptr, nullptr, { &s_d85d75253435bf4b, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Type_d85d75253435bf4b, d85d75253435bf4b);
|
||||
@@ -4989,7 +4989,7 @@ static const ::capnp::_::AlignedData<36> b_a6f6ce72165ccb49 = {
|
||||
static const uint16_t m_a6f6ce72165ccb49[] = {0, 3, 2, 1};
|
||||
const ::capnp::_::RawSchema s_a6f6ce72165ccb49 = {
|
||||
0xa6f6ce72165ccb49, b_a6f6ce72165ccb49.words, 36, nullptr, m_a6f6ce72165ccb49,
|
||||
0, 4, nullptr, nullptr, nullptr, { &s_a6f6ce72165ccb49, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 4, nullptr, nullptr, nullptr, { &s_a6f6ce72165ccb49, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Action_a6f6ce72165ccb49, a6f6ce72165ccb49);
|
||||
@@ -5065,7 +5065,7 @@ static const uint16_t m_dfdf30d03fc485bd[] = {0, 1};
|
||||
static const uint16_t i_dfdf30d03fc485bd[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_dfdf30d03fc485bd = {
|
||||
0xdfdf30d03fc485bd, b_dfdf30d03fc485bd.words, 60, d_dfdf30d03fc485bd, m_dfdf30d03fc485bd,
|
||||
2, 2, i_dfdf30d03fc485bd, nullptr, nullptr, { &s_dfdf30d03fc485bd, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 2, i_dfdf30d03fc485bd, nullptr, nullptr, { &s_dfdf30d03fc485bd, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<61> b_a20710d4f428d6cd = {
|
||||
@@ -5141,7 +5141,7 @@ static const uint16_t m_a20710d4f428d6cd[] = {0, 1};
|
||||
static const uint16_t i_a20710d4f428d6cd[] = {0, 1};
|
||||
const ::capnp::_::RawSchema s_a20710d4f428d6cd = {
|
||||
0xa20710d4f428d6cd, b_a20710d4f428d6cd.words, 61, d_a20710d4f428d6cd, m_a20710d4f428d6cd,
|
||||
2, 2, i_a20710d4f428d6cd, nullptr, nullptr, { &s_a20710d4f428d6cd, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 2, i_a20710d4f428d6cd, nullptr, nullptr, { &s_a20710d4f428d6cd, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<290> b_a0e27b453a38f450 = {
|
||||
@@ -5442,7 +5442,7 @@ static const uint16_t m_a0e27b453a38f450[] = {9, 11, 13, 15, 7, 1, 8, 10, 12, 14
|
||||
static const uint16_t i_a0e27b453a38f450[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
|
||||
const ::capnp::_::RawSchema s_a0e27b453a38f450 = {
|
||||
0xa0e27b453a38f450, b_a0e27b453a38f450.words, 290, nullptr, m_a0e27b453a38f450,
|
||||
0, 16, i_a0e27b453a38f450, nullptr, nullptr, { &s_a0e27b453a38f450, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 16, i_a0e27b453a38f450, nullptr, nullptr, { &s_a0e27b453a38f450, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<420> b_d949bf717d77614d = {
|
||||
@@ -5877,7 +5877,7 @@ static const uint16_t m_d949bf717d77614d[] = {10, 9, 11, 15, 13, 17, 19, 6, 1, 1
|
||||
static const uint16_t i_d949bf717d77614d[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22};
|
||||
const ::capnp::_::RawSchema s_d949bf717d77614d = {
|
||||
0xd949bf717d77614d, b_d949bf717d77614d.words, 420, d_d949bf717d77614d, m_d949bf717d77614d,
|
||||
2, 23, i_d949bf717d77614d, nullptr, nullptr, { &s_d949bf717d77614d, nullptr, nullptr, 0, 0, nullptr }
|
||||
2, 23, i_d949bf717d77614d, nullptr, nullptr, { &s_d949bf717d77614d, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<50> b_9ef1f3ff0deb5ffb = {
|
||||
@@ -5937,7 +5937,7 @@ static const ::capnp::_::AlignedData<50> b_9ef1f3ff0deb5ffb = {
|
||||
static const uint16_t m_9ef1f3ff0deb5ffb[] = {5, 6, 3, 1, 4, 2, 0};
|
||||
const ::capnp::_::RawSchema s_9ef1f3ff0deb5ffb = {
|
||||
0x9ef1f3ff0deb5ffb, b_9ef1f3ff0deb5ffb.words, 50, nullptr, m_9ef1f3ff0deb5ffb,
|
||||
0, 7, nullptr, nullptr, nullptr, { &s_9ef1f3ff0deb5ffb, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 7, nullptr, nullptr, nullptr, { &s_9ef1f3ff0deb5ffb, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Constellation_9ef1f3ff0deb5ffb, 9ef1f3ff0deb5ffb);
|
||||
@@ -6044,7 +6044,7 @@ static const ::capnp::_::AlignedData<96> b_cbb9490adce12d72 = {
|
||||
static const uint16_t m_cbb9490adce12d72[] = {9, 10, 2, 1, 13, 11, 12, 7, 8, 5, 14, 3, 6, 4, 0};
|
||||
const ::capnp::_::RawSchema s_cbb9490adce12d72 = {
|
||||
0xcbb9490adce12d72, b_cbb9490adce12d72.words, 96, nullptr, m_cbb9490adce12d72,
|
||||
0, 15, nullptr, nullptr, nullptr, { &s_cbb9490adce12d72, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 15, nullptr, nullptr, nullptr, { &s_cbb9490adce12d72, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(State_cbb9490adce12d72, cbb9490adce12d72);
|
||||
@@ -6092,7 +6092,7 @@ static const ::capnp::_::AlignedData<37> b_c04e7b6231d4caa8 = {
|
||||
static const uint16_t m_c04e7b6231d4caa8[] = {1, 2, 0};
|
||||
const ::capnp::_::RawSchema s_c04e7b6231d4caa8 = {
|
||||
0xc04e7b6231d4caa8, b_c04e7b6231d4caa8.words, 37, nullptr, m_c04e7b6231d4caa8,
|
||||
0, 3, nullptr, nullptr, nullptr, { &s_c04e7b6231d4caa8, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 3, nullptr, nullptr, nullptr, { &s_c04e7b6231d4caa8, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(MultipathIndicator_c04e7b6231d4caa8, c04e7b6231d4caa8);
|
||||
@@ -6222,7 +6222,7 @@ static const uint16_t m_e2517b083095fd4e[] = {4, 2, 5, 3, 1, 0};
|
||||
static const uint16_t i_e2517b083095fd4e[] = {0, 1, 2, 3, 4, 5};
|
||||
const ::capnp::_::RawSchema s_e2517b083095fd4e = {
|
||||
0xe2517b083095fd4e, b_e2517b083095fd4e.words, 115, d_e2517b083095fd4e, m_e2517b083095fd4e,
|
||||
1, 6, i_e2517b083095fd4e, nullptr, nullptr, { &s_e2517b083095fd4e, nullptr, nullptr, 0, 0, nullptr }
|
||||
1, 6, i_e2517b083095fd4e, nullptr, nullptr, { &s_e2517b083095fd4e, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
static const ::capnp::_::AlignedData<35> b_ec1ff7996b35366f = {
|
||||
@@ -6267,7 +6267,7 @@ static const ::capnp::_::AlignedData<35> b_ec1ff7996b35366f = {
|
||||
static const uint16_t m_ec1ff7996b35366f[] = {1, 2, 0};
|
||||
const ::capnp::_::RawSchema s_ec1ff7996b35366f = {
|
||||
0xec1ff7996b35366f, b_ec1ff7996b35366f.words, 35, nullptr, m_ec1ff7996b35366f,
|
||||
0, 3, nullptr, nullptr, nullptr, { &s_ec1ff7996b35366f, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 3, nullptr, nullptr, nullptr, { &s_ec1ff7996b35366f, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
CAPNP_DEFINE_ENUM(Status_ec1ff7996b35366f, ec1ff7996b35366f);
|
||||
@@ -6383,7 +6383,7 @@ static const uint16_t m_e3d6685d4e9d8f7a[] = {3, 4, 0, 2, 1};
|
||||
static const uint16_t i_e3d6685d4e9d8f7a[] = {0, 1, 2, 3, 4};
|
||||
const ::capnp::_::RawSchema s_e3d6685d4e9d8f7a = {
|
||||
0xe3d6685d4e9d8f7a, b_e3d6685d4e9d8f7a.words, 104, nullptr, m_e3d6685d4e9d8f7a,
|
||||
0, 5, i_e3d6685d4e9d8f7a, nullptr, nullptr, { &s_e3d6685d4e9d8f7a, nullptr, nullptr, 0, 0, nullptr }
|
||||
0, 5, i_e3d6685d4e9d8f7a, nullptr, nullptr, { &s_e3d6685d4e9d8f7a, nullptr, nullptr, 0, 0, nullptr }, false
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
} // namespace schemas
|
||||
@@ -6394,323 +6394,483 @@ const ::capnp::_::RawSchema s_e3d6685d4e9d8f7a = {
|
||||
namespace cereal {
|
||||
|
||||
// LogRotate
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LogRotate::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LogRotate::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LogRotate::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LogRotate::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LiveUI
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LiveUI::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LiveUI::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LiveUI::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LiveUI::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// UiLayoutState
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t UiLayoutState::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t UiLayoutState::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind UiLayoutState::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* UiLayoutState::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// OrbslamCorrection
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t OrbslamCorrection::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t OrbslamCorrection::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind OrbslamCorrection::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* OrbslamCorrection::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// EthernetPacket
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t EthernetPacket::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t EthernetPacket::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind EthernetPacket::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* EthernetPacket::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CellInfo
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CellInfo::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CellInfo::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CellInfo::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CellInfo::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// WifiScan
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t WifiScan::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t WifiScan::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind WifiScan::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* WifiScan::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LiveEventData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LiveEventData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LiveEventData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LiveEventData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LiveEventData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ModelData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ModelData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ModelData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ModelData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ModelData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ModelData::PathData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ModelData::PathData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ModelData::PathData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ModelData::PathData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ModelData::PathData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ModelData::LeadData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ModelData::LeadData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ModelData::LeadData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ModelData::LeadData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ModelData::LeadData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ModelData::ModelSettings
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ModelData::ModelSettings::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ModelData::ModelSettings::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ModelData::ModelSettings::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ModelData::ModelSettings::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ModelData::MetaData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ModelData::MetaData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ModelData::MetaData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ModelData::MetaData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ModelData::MetaData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ModelData::LongitudinalData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ModelData::LongitudinalData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ModelData::LongitudinalData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ModelData::LongitudinalData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ModelData::LongitudinalData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ECEFPoint
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ECEFPoint::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ECEFPoint::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ECEFPoint::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ECEFPoint::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// ECEFPointDEPRECATED
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t ECEFPointDEPRECATED::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t ECEFPointDEPRECATED::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind ECEFPointDEPRECATED::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* ECEFPointDEPRECATED::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// GPSPlannerPoints
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t GPSPlannerPoints::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t GPSPlannerPoints::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind GPSPlannerPoints::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* GPSPlannerPoints::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// GPSPlannerPlan
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t GPSPlannerPlan::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t GPSPlannerPlan::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind GPSPlannerPlan::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* GPSPlannerPlan::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// UiNavigationEvent
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t UiNavigationEvent::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t UiNavigationEvent::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind UiNavigationEvent::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* UiNavigationEvent::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LiveLocationData
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LiveLocationData::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LiveLocationData::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LiveLocationData::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LiveLocationData::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LiveLocationData::Accuracy
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LiveLocationData::Accuracy::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LiveLocationData::Accuracy::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LiveLocationData::Accuracy::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LiveLocationData::Accuracy::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// OrbOdometry
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t OrbOdometry::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t OrbOdometry::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind OrbOdometry::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* OrbOdometry::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// OrbFeatures
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t OrbFeatures::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t OrbFeatures::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind OrbFeatures::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* OrbFeatures::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// OrbFeaturesSummary
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t OrbFeaturesSummary::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t OrbFeaturesSummary::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind OrbFeaturesSummary::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* OrbFeaturesSummary::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// OrbKeyFrame
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t OrbKeyFrame::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t OrbKeyFrame::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind OrbKeyFrame::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* OrbKeyFrame::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// KalmanOdometry
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t KalmanOdometry::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t KalmanOdometry::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind KalmanOdometry::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* KalmanOdometry::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// OrbObservation
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t OrbObservation::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t OrbObservation::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind OrbObservation::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* OrbObservation::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// CalibrationFeatures
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t CalibrationFeatures::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t CalibrationFeatures::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind CalibrationFeatures::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* CalibrationFeatures::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// NavStatus
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t NavStatus::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t NavStatus::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind NavStatus::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* NavStatus::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// NavStatus::Address
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t NavStatus::Address::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t NavStatus::Address::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind NavStatus::Address::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* NavStatus::Address::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// NavUpdate
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t NavUpdate::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t NavUpdate::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind NavUpdate::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* NavUpdate::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// NavUpdate::LatLng
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t NavUpdate::LatLng::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t NavUpdate::LatLng::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind NavUpdate::LatLng::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* NavUpdate::LatLng::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// NavUpdate::Segment
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t NavUpdate::Segment::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t NavUpdate::Segment::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind NavUpdate::Segment::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* NavUpdate::Segment::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// TrafficEvent
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t TrafficEvent::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t TrafficEvent::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind TrafficEvent::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* TrafficEvent::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// AndroidGnss
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t AndroidGnss::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t AndroidGnss::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind AndroidGnss::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* AndroidGnss::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// AndroidGnss::Measurements
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t AndroidGnss::Measurements::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t AndroidGnss::Measurements::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind AndroidGnss::Measurements::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* AndroidGnss::Measurements::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// AndroidGnss::Measurements::Clock
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t AndroidGnss::Measurements::Clock::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t AndroidGnss::Measurements::Clock::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind AndroidGnss::Measurements::Clock::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* AndroidGnss::Measurements::Clock::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// AndroidGnss::Measurements::Measurement
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t AndroidGnss::Measurements::Measurement::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t AndroidGnss::Measurements::Measurement::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind AndroidGnss::Measurements::Measurement::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* AndroidGnss::Measurements::Measurement::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// AndroidGnss::NavigationMessage
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t AndroidGnss::NavigationMessage::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t AndroidGnss::NavigationMessage::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind AndroidGnss::NavigationMessage::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* AndroidGnss::NavigationMessage::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// LidarPts
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr uint16_t LidarPts::_capnpPrivate::dataWordSize;
|
||||
constexpr uint16_t LidarPts::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
constexpr ::capnp::Kind LidarPts::_capnpPrivate::kind;
|
||||
constexpr ::capnp::_::RawSchema const* LidarPts::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
|
||||
|
||||
@@ -6,11 +6,15 @@
|
||||
#include <capnp/generated-header-support.h>
|
||||
#include <kj/windows-sanity.h>
|
||||
|
||||
#if CAPNP_VERSION != 8000
|
||||
#ifndef CAPNP_VERSION
|
||||
#error "CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?"
|
||||
#elif CAPNP_VERSION != 1000002
|
||||
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
|
||||
#endif
|
||||
|
||||
|
||||
CAPNP_BEGIN_HEADER
|
||||
|
||||
namespace capnp {
|
||||
namespace schemas {
|
||||
|
||||
@@ -11407,3 +11411,5 @@ inline ::capnp::Orphan< ::capnp::Data> LidarPts::Builder::disownPkt() {
|
||||
|
||||
} // namespace
|
||||
|
||||
CAPNP_END_HEADER
|
||||
|
||||
|
||||
+1590
-832
File diff suppressed because it is too large
Load Diff
+427
-128
@@ -6,7 +6,9 @@
|
||||
#include <capnp/generated-header-support.h>
|
||||
#include <kj/windows-sanity.h>
|
||||
|
||||
#if CAPNP_VERSION != 8000
|
||||
#ifndef CAPNP_VERSION
|
||||
#error "CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?"
|
||||
#elif CAPNP_VERSION != 1000002
|
||||
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
|
||||
#endif
|
||||
|
||||
@@ -14,6 +16,8 @@
|
||||
#include "custom.capnp.h"
|
||||
#include "legacy.capnp.h"
|
||||
|
||||
CAPNP_BEGIN_HEADER
|
||||
|
||||
namespace capnp {
|
||||
namespace schemas {
|
||||
|
||||
@@ -96,6 +100,32 @@ enum class SensorSource_d3ff79f25c734863: uint16_t {
|
||||
QCOMDIAG,
|
||||
};
|
||||
CAPNP_DECLARE_ENUM(SensorSource, d3ff79f25c734863);
|
||||
CAPNP_DECLARE_SCHEMA(ae674a34ba421466);
|
||||
enum class Desire_ae674a34ba421466: uint16_t {
|
||||
NONE,
|
||||
TURN_LEFT,
|
||||
TURN_RIGHT,
|
||||
LANE_CHANGE_LEFT,
|
||||
LANE_CHANGE_RIGHT,
|
||||
KEEP_LEFT,
|
||||
KEEP_RIGHT,
|
||||
};
|
||||
CAPNP_DECLARE_ENUM(Desire, ae674a34ba421466);
|
||||
CAPNP_DECLARE_SCHEMA(cd37924bf7b2d3d2);
|
||||
enum class LaneChangeState_cd37924bf7b2d3d2: uint16_t {
|
||||
OFF,
|
||||
PRE_LANE_CHANGE,
|
||||
LANE_CHANGE_STARTING,
|
||||
LANE_CHANGE_FINISHING,
|
||||
};
|
||||
CAPNP_DECLARE_ENUM(LaneChangeState, cd37924bf7b2d3d2);
|
||||
CAPNP_DECLARE_SCHEMA(9d0bc0c1fe671176);
|
||||
enum class LaneChangeDirection_9d0bc0c1fe671176: uint16_t {
|
||||
NONE,
|
||||
LEFT,
|
||||
RIGHT,
|
||||
};
|
||||
CAPNP_DECLARE_ENUM(LaneChangeDirection, 9d0bc0c1fe671176);
|
||||
CAPNP_DECLARE_SCHEMA(8785009a964c7c59);
|
||||
CAPNP_DECLARE_SCHEMA(a4d8b5af2aa492eb);
|
||||
CAPNP_DECLARE_SCHEMA(d0790029853df66f);
|
||||
@@ -180,6 +210,7 @@ enum class PandaType_8a58adf93e5b3751: uint16_t {
|
||||
RED_PANDA,
|
||||
RED_PANDA_V2,
|
||||
TRES,
|
||||
CUATRO,
|
||||
};
|
||||
CAPNP_DECLARE_ENUM(PandaType, 8a58adf93e5b3751);
|
||||
CAPNP_DECLARE_SCHEMA(f69a3ed1e8c081bf);
|
||||
@@ -271,6 +302,7 @@ CAPNP_DECLARE_ENUM(ConfidenceClass, aa3247d9d2a61cd4);
|
||||
CAPNP_DECLARE_SCHEMA(860aa5ddbcdc8d25);
|
||||
CAPNP_DECLARE_SCHEMA(fb3ec0702e67884f);
|
||||
CAPNP_DECLARE_SCHEMA(84caeca5a6b4acfe);
|
||||
CAPNP_DECLARE_SCHEMA(94d0bcb35a764584);
|
||||
CAPNP_DECLARE_SCHEMA(89d394e3541735fc);
|
||||
CAPNP_DECLARE_SCHEMA(c0ad259ec157ccd3);
|
||||
enum class Type_c0ad259ec157ccd3: uint16_t {
|
||||
@@ -652,7 +684,7 @@ struct FrameData {
|
||||
struct AndroidCaptureResult;
|
||||
|
||||
struct _capnpPrivate {
|
||||
CAPNP_DECLARE_STRUCT_HEADER(ea0245f695ae0a33, 11, 7)
|
||||
CAPNP_DECLARE_STRUCT_HEADER(ea0245f695ae0a33, 12, 7)
|
||||
#if !CAPNP_LITE
|
||||
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
|
||||
#endif // !CAPNP_LITE
|
||||
@@ -766,6 +798,12 @@ struct GpsLocationData {
|
||||
};
|
||||
};
|
||||
|
||||
typedef ::capnp::schemas::Desire_ae674a34ba421466 Desire;
|
||||
|
||||
typedef ::capnp::schemas::LaneChangeState_cd37924bf7b2d3d2 LaneChangeState;
|
||||
|
||||
typedef ::capnp::schemas::LaneChangeDirection_9d0bc0c1fe671176 LaneChangeDirection;
|
||||
|
||||
struct CanData {
|
||||
CanData() = delete;
|
||||
|
||||
@@ -1118,7 +1156,7 @@ struct ControlsState::LateralControlState {
|
||||
ANGLE_STATE,
|
||||
DEBUG_STATE,
|
||||
TORQUE_STATE,
|
||||
CURVATURE_STATE,
|
||||
CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D,
|
||||
};
|
||||
|
||||
struct _capnpPrivate {
|
||||
@@ -1158,9 +1196,10 @@ struct ModelDataV2 {
|
||||
struct DisengagePredictions;
|
||||
struct Pose;
|
||||
struct LateralPlannerSolution;
|
||||
struct Action;
|
||||
|
||||
struct _capnpPrivate {
|
||||
CAPNP_DECLARE_STRUCT_HEADER(c4713f6b0d36abe9, 6, 16)
|
||||
CAPNP_DECLARE_STRUCT_HEADER(c4713f6b0d36abe9, 6, 17)
|
||||
#if !CAPNP_LITE
|
||||
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
|
||||
#endif // !CAPNP_LITE
|
||||
@@ -1257,6 +1296,21 @@ struct ModelDataV2::LateralPlannerSolution {
|
||||
};
|
||||
};
|
||||
|
||||
struct ModelDataV2::Action {
|
||||
Action() = delete;
|
||||
|
||||
class Reader;
|
||||
class Builder;
|
||||
class Pipeline;
|
||||
|
||||
struct _capnpPrivate {
|
||||
CAPNP_DECLARE_STRUCT_HEADER(94d0bcb35a764584, 1, 0)
|
||||
#if !CAPNP_LITE
|
||||
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
|
||||
#endif // !CAPNP_LITE
|
||||
};
|
||||
};
|
||||
|
||||
struct EncodeIndex {
|
||||
EncodeIndex() = delete;
|
||||
|
||||
@@ -2293,7 +2347,7 @@ struct EncodeData {
|
||||
class Pipeline;
|
||||
|
||||
struct _capnpPrivate {
|
||||
CAPNP_DECLARE_STRUCT_HEADER(cf9aeab355dd85f0, 1, 3)
|
||||
CAPNP_DECLARE_STRUCT_HEADER(cf9aeab355dd85f0, 2, 3)
|
||||
#if !CAPNP_LITE
|
||||
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
|
||||
#endif // !CAPNP_LITE
|
||||
@@ -2400,7 +2454,7 @@ struct Event {
|
||||
LIVE_PARAMETERS,
|
||||
LIVE_MAP_DATA_D_E_P_R_E_C_A_T_E_D,
|
||||
CAMERA_ODOMETRY,
|
||||
LATERAL_PLAN,
|
||||
LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D,
|
||||
KALMAN_ODOMETRY_D_E_P_R_E_C_A_T_E_D,
|
||||
THUMBNAIL,
|
||||
ONROAD_EVENTS,
|
||||
@@ -2446,7 +2500,7 @@ struct Event {
|
||||
LONGITUDINAL_PLAN_EXT,
|
||||
LATERAL_PLAN_EXT,
|
||||
CONTROLS_STATE_EXT,
|
||||
CUSTOM_RESERVED4,
|
||||
NAV_INSTRUCTION_EXT,
|
||||
CUSTOM_RESERVED5,
|
||||
CUSTOM_RESERVED6,
|
||||
CUSTOM_RESERVED7,
|
||||
@@ -3767,6 +3821,8 @@ public:
|
||||
|
||||
inline float getExposureValPercent() const;
|
||||
|
||||
inline ::uint32_t getRequestId() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -3912,6 +3968,9 @@ public:
|
||||
inline float getExposureValPercent();
|
||||
inline void setExposureValPercent(float value);
|
||||
|
||||
inline ::uint32_t getRequestId();
|
||||
inline void setRequestId( ::uint32_t value);
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -6749,7 +6808,7 @@ public:
|
||||
|
||||
inline float getDesiredCurvature() const;
|
||||
|
||||
inline float getDesiredCurvatureRate() const;
|
||||
inline float getDesiredCurvatureRateDEPRECATED() const;
|
||||
|
||||
inline float getVCruiseCluster() const;
|
||||
|
||||
@@ -6975,8 +7034,8 @@ public:
|
||||
inline float getDesiredCurvature();
|
||||
inline void setDesiredCurvature(float value);
|
||||
|
||||
inline float getDesiredCurvatureRate();
|
||||
inline void setDesiredCurvatureRate(float value);
|
||||
inline float getDesiredCurvatureRateDEPRECATED();
|
||||
inline void setDesiredCurvatureRateDEPRECATED(float value);
|
||||
|
||||
inline float getVCruiseCluster();
|
||||
inline void setVCruiseCluster(float value);
|
||||
@@ -7845,9 +7904,9 @@ public:
|
||||
inline bool hasTorqueState() const;
|
||||
inline ::cereal::ControlsState::LateralTorqueState::Reader getTorqueState() const;
|
||||
|
||||
inline bool isCurvatureState() const;
|
||||
inline bool hasCurvatureState() const;
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Reader getCurvatureState() const;
|
||||
inline bool isCurvatureStateDEPRECATED() const;
|
||||
inline bool hasCurvatureStateDEPRECATED() const;
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Reader getCurvatureStateDEPRECATED() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
@@ -7926,13 +7985,13 @@ public:
|
||||
inline void adoptTorqueState(::capnp::Orphan< ::cereal::ControlsState::LateralTorqueState>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ControlsState::LateralTorqueState> disownTorqueState();
|
||||
|
||||
inline bool isCurvatureState();
|
||||
inline bool hasCurvatureState();
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder getCurvatureState();
|
||||
inline void setCurvatureState( ::cereal::ControlsState::LateralCurvatureState::Reader value);
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder initCurvatureState();
|
||||
inline void adoptCurvatureState(::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState> disownCurvatureState();
|
||||
inline bool isCurvatureStateDEPRECATED();
|
||||
inline bool hasCurvatureStateDEPRECATED();
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder getCurvatureStateDEPRECATED();
|
||||
inline void setCurvatureStateDEPRECATED( ::cereal::ControlsState::LateralCurvatureState::Reader value);
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder initCurvatureStateDEPRECATED();
|
||||
inline void adoptCurvatureStateDEPRECATED(::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState> disownCurvatureStateDEPRECATED();
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
@@ -8190,8 +8249,11 @@ public:
|
||||
|
||||
inline ::uint64_t getLocationMonoTime() const;
|
||||
|
||||
inline bool hasLateralPlannerSolution() const;
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Reader getLateralPlannerSolution() const;
|
||||
inline bool hasLateralPlannerSolutionDEPRECATED() const;
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Reader getLateralPlannerSolutionDEPRECATED() const;
|
||||
|
||||
inline bool hasAction() const;
|
||||
inline ::cereal::ModelDataV2::Action::Reader getAction() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
@@ -8359,12 +8421,19 @@ public:
|
||||
inline ::uint64_t getLocationMonoTime();
|
||||
inline void setLocationMonoTime( ::uint64_t value);
|
||||
|
||||
inline bool hasLateralPlannerSolution();
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder getLateralPlannerSolution();
|
||||
inline void setLateralPlannerSolution( ::cereal::ModelDataV2::LateralPlannerSolution::Reader value);
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder initLateralPlannerSolution();
|
||||
inline void adoptLateralPlannerSolution(::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution> disownLateralPlannerSolution();
|
||||
inline bool hasLateralPlannerSolutionDEPRECATED();
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder getLateralPlannerSolutionDEPRECATED();
|
||||
inline void setLateralPlannerSolutionDEPRECATED( ::cereal::ModelDataV2::LateralPlannerSolution::Reader value);
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder initLateralPlannerSolutionDEPRECATED();
|
||||
inline void adoptLateralPlannerSolutionDEPRECATED(::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution> disownLateralPlannerSolutionDEPRECATED();
|
||||
|
||||
inline bool hasAction();
|
||||
inline ::cereal::ModelDataV2::Action::Builder getAction();
|
||||
inline void setAction( ::cereal::ModelDataV2::Action::Reader value);
|
||||
inline ::cereal::ModelDataV2::Action::Builder initAction();
|
||||
inline void adoptAction(::capnp::Orphan< ::cereal::ModelDataV2::Action>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ModelDataV2::Action> disownAction();
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
@@ -8391,7 +8460,8 @@ public:
|
||||
inline ::cereal::ModelDataV2::MetaData::Pipeline getMeta();
|
||||
inline ::cereal::XYZTData::Pipeline getAcceleration();
|
||||
inline ::cereal::ModelDataV2::Pose::Pipeline getTemporalPose();
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Pipeline getLateralPlannerSolution();
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Pipeline getLateralPlannerSolutionDEPRECATED();
|
||||
inline ::cereal::ModelDataV2::Action::Pipeline getAction();
|
||||
private:
|
||||
::capnp::AnyPointer::Pipeline _typeless;
|
||||
friend class ::capnp::PipelineHook;
|
||||
@@ -8719,6 +8789,10 @@ public:
|
||||
|
||||
inline bool getHardBrakePredicted() const;
|
||||
|
||||
inline ::cereal::LaneChangeState getLaneChangeState() const;
|
||||
|
||||
inline ::cereal::LaneChangeDirection getLaneChangeDirection() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -8785,6 +8859,12 @@ public:
|
||||
inline bool getHardBrakePredicted();
|
||||
inline void setHardBrakePredicted(bool value);
|
||||
|
||||
inline ::cereal::LaneChangeState getLaneChangeState();
|
||||
inline void setLaneChangeState( ::cereal::LaneChangeState value);
|
||||
|
||||
inline ::cereal::LaneChangeDirection getLaneChangeDirection();
|
||||
inline void setLaneChangeDirection( ::cereal::LaneChangeDirection value);
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -9234,6 +9314,82 @@ private:
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
class ModelDataV2::Action::Reader {
|
||||
public:
|
||||
typedef Action Reads;
|
||||
|
||||
Reader() = default;
|
||||
inline explicit Reader(::capnp::_::StructReader base): _reader(base) {}
|
||||
|
||||
inline ::capnp::MessageSize totalSize() const {
|
||||
return _reader.totalSize().asPublic();
|
||||
}
|
||||
|
||||
#if !CAPNP_LITE
|
||||
inline ::kj::StringTree toString() const {
|
||||
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
|
||||
}
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
inline float getDesiredCurvature() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
template <typename, ::capnp::Kind>
|
||||
friend struct ::capnp::ToDynamic_;
|
||||
template <typename, ::capnp::Kind>
|
||||
friend struct ::capnp::_::PointerHelpers;
|
||||
template <typename, ::capnp::Kind>
|
||||
friend struct ::capnp::List;
|
||||
friend class ::capnp::MessageBuilder;
|
||||
friend class ::capnp::Orphanage;
|
||||
};
|
||||
|
||||
class ModelDataV2::Action::Builder {
|
||||
public:
|
||||
typedef Action Builds;
|
||||
|
||||
Builder() = delete; // Deleted to discourage incorrect usage.
|
||||
// You can explicitly initialize to nullptr instead.
|
||||
inline Builder(decltype(nullptr)) {}
|
||||
inline explicit Builder(::capnp::_::StructBuilder base): _builder(base) {}
|
||||
inline operator Reader() const { return Reader(_builder.asReader()); }
|
||||
inline Reader asReader() const { return *this; }
|
||||
|
||||
inline ::capnp::MessageSize totalSize() const { return asReader().totalSize(); }
|
||||
#if !CAPNP_LITE
|
||||
inline ::kj::StringTree toString() const { return asReader().toString(); }
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
inline float getDesiredCurvature();
|
||||
inline void setDesiredCurvature(float value);
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
template <typename, ::capnp::Kind>
|
||||
friend struct ::capnp::ToDynamic_;
|
||||
friend class ::capnp::Orphanage;
|
||||
template <typename, ::capnp::Kind>
|
||||
friend struct ::capnp::_::PointerHelpers;
|
||||
};
|
||||
|
||||
#if !CAPNP_LITE
|
||||
class ModelDataV2::Action::Pipeline {
|
||||
public:
|
||||
typedef Action Pipelines;
|
||||
|
||||
inline Pipeline(decltype(nullptr)): _typeless(nullptr) {}
|
||||
inline explicit Pipeline(::capnp::AnyPointer::Pipeline&& typeless)
|
||||
: _typeless(kj::mv(typeless)) {}
|
||||
|
||||
private:
|
||||
::capnp::AnyPointer::Pipeline _typeless;
|
||||
friend class ::capnp::PipelineHook;
|
||||
template <typename, ::capnp::Kind>
|
||||
friend struct ::capnp::ToDynamic_;
|
||||
};
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
class EncodeIndex::Reader {
|
||||
public:
|
||||
typedef EncodeIndex Reads;
|
||||
@@ -18318,6 +18474,10 @@ public:
|
||||
|
||||
inline ::uint64_t getUnixTimestampNanos() const;
|
||||
|
||||
inline ::uint32_t getWidth() const;
|
||||
|
||||
inline ::uint32_t getHeight() const;
|
||||
|
||||
private:
|
||||
::capnp::_::StructReader _reader;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -18370,6 +18530,12 @@ public:
|
||||
inline ::uint64_t getUnixTimestampNanos();
|
||||
inline void setUnixTimestampNanos( ::uint64_t value);
|
||||
|
||||
inline ::uint32_t getWidth();
|
||||
inline void setWidth( ::uint32_t value);
|
||||
|
||||
inline ::uint32_t getHeight();
|
||||
inline void setHeight( ::uint32_t value);
|
||||
|
||||
private:
|
||||
::capnp::_::StructBuilder _builder;
|
||||
template <typename, ::capnp::Kind>
|
||||
@@ -18831,9 +18997,9 @@ public:
|
||||
inline bool hasCameraOdometry() const;
|
||||
inline ::cereal::CameraOdometry::Reader getCameraOdometry() const;
|
||||
|
||||
inline bool isLateralPlan() const;
|
||||
inline bool hasLateralPlan() const;
|
||||
inline ::cereal::LateralPlan::Reader getLateralPlan() const;
|
||||
inline bool isLateralPlanDEPRECATED() const;
|
||||
inline bool hasLateralPlanDEPRECATED() const;
|
||||
inline ::cereal::LateralPlan::Reader getLateralPlanDEPRECATED() const;
|
||||
|
||||
inline bool isKalmanOdometryDEPRECATED() const;
|
||||
inline bool hasKalmanOdometryDEPRECATED() const;
|
||||
@@ -19017,9 +19183,9 @@ public:
|
||||
inline bool hasControlsStateExt() const;
|
||||
inline ::cereal::ControlsStateExt::Reader getControlsStateExt() const;
|
||||
|
||||
inline bool isCustomReserved4() const;
|
||||
inline bool hasCustomReserved4() const;
|
||||
inline ::cereal::CustomReserved4::Reader getCustomReserved4() const;
|
||||
inline bool isNavInstructionExt() const;
|
||||
inline bool hasNavInstructionExt() const;
|
||||
inline ::cereal::NavInstructionExt::Reader getNavInstructionExt() const;
|
||||
|
||||
inline bool isCustomReserved5() const;
|
||||
inline bool hasCustomReserved5() const;
|
||||
@@ -19617,13 +19783,13 @@ public:
|
||||
inline void adoptCameraOdometry(::capnp::Orphan< ::cereal::CameraOdometry>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::CameraOdometry> disownCameraOdometry();
|
||||
|
||||
inline bool isLateralPlan();
|
||||
inline bool hasLateralPlan();
|
||||
inline ::cereal::LateralPlan::Builder getLateralPlan();
|
||||
inline void setLateralPlan( ::cereal::LateralPlan::Reader value);
|
||||
inline ::cereal::LateralPlan::Builder initLateralPlan();
|
||||
inline void adoptLateralPlan(::capnp::Orphan< ::cereal::LateralPlan>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::LateralPlan> disownLateralPlan();
|
||||
inline bool isLateralPlanDEPRECATED();
|
||||
inline bool hasLateralPlanDEPRECATED();
|
||||
inline ::cereal::LateralPlan::Builder getLateralPlanDEPRECATED();
|
||||
inline void setLateralPlanDEPRECATED( ::cereal::LateralPlan::Reader value);
|
||||
inline ::cereal::LateralPlan::Builder initLateralPlanDEPRECATED();
|
||||
inline void adoptLateralPlanDEPRECATED(::capnp::Orphan< ::cereal::LateralPlan>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::LateralPlan> disownLateralPlanDEPRECATED();
|
||||
|
||||
inline bool isKalmanOdometryDEPRECATED();
|
||||
inline bool hasKalmanOdometryDEPRECATED();
|
||||
@@ -19988,13 +20154,13 @@ public:
|
||||
inline void adoptControlsStateExt(::capnp::Orphan< ::cereal::ControlsStateExt>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::ControlsStateExt> disownControlsStateExt();
|
||||
|
||||
inline bool isCustomReserved4();
|
||||
inline bool hasCustomReserved4();
|
||||
inline ::cereal::CustomReserved4::Builder getCustomReserved4();
|
||||
inline void setCustomReserved4( ::cereal::CustomReserved4::Reader value);
|
||||
inline ::cereal::CustomReserved4::Builder initCustomReserved4();
|
||||
inline void adoptCustomReserved4(::capnp::Orphan< ::cereal::CustomReserved4>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::CustomReserved4> disownCustomReserved4();
|
||||
inline bool isNavInstructionExt();
|
||||
inline bool hasNavInstructionExt();
|
||||
inline ::cereal::NavInstructionExt::Builder getNavInstructionExt();
|
||||
inline void setNavInstructionExt( ::cereal::NavInstructionExt::Reader value);
|
||||
inline ::cereal::NavInstructionExt::Builder initNavInstructionExt();
|
||||
inline void adoptNavInstructionExt(::capnp::Orphan< ::cereal::NavInstructionExt>&& value);
|
||||
inline ::capnp::Orphan< ::cereal::NavInstructionExt> disownNavInstructionExt();
|
||||
|
||||
inline bool isCustomReserved5();
|
||||
inline bool hasCustomReserved5();
|
||||
@@ -20293,15 +20459,19 @@ inline ::capnp::Orphan<Value> Map<Key, Value>::Entry::Builder::disownValue() {
|
||||
}
|
||||
|
||||
// Map<Key, Value>::Entry
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
template <typename Key, typename Value>
|
||||
constexpr uint16_t Map<Key, Value>::Entry::_capnpPrivate::dataWordSize;
|
||||
template <typename Key, typename Value>
|
||||
constexpr uint16_t Map<Key, Value>::Entry::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
template <typename Key, typename Value>
|
||||
constexpr ::capnp::Kind Map<Key, Value>::Entry::_capnpPrivate::kind;
|
||||
template <typename Key, typename Value>
|
||||
constexpr ::capnp::_::RawSchema const* Map<Key, Value>::Entry::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
template <typename Key, typename Value>
|
||||
const ::capnp::_::RawBrandedSchema::Scope Map<Key, Value>::Entry::_capnpPrivate::brandScopes[] = {
|
||||
{ 0xf8b13ce2183eb696, brandBindings + 0, 2, false},
|
||||
@@ -20319,15 +20489,19 @@ const ::capnp::_::RawBrandedSchema Map<Key, Value>::Entry::_capnpPrivate::specif
|
||||
#endif // !CAPNP_LITE
|
||||
|
||||
// Map<Key, Value>
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
template <typename Key, typename Value>
|
||||
constexpr uint16_t Map<Key, Value>::_capnpPrivate::dataWordSize;
|
||||
template <typename Key, typename Value>
|
||||
constexpr uint16_t Map<Key, Value>::_capnpPrivate::pointerCount;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
#if !CAPNP_LITE
|
||||
#if CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
template <typename Key, typename Value>
|
||||
constexpr ::capnp::Kind Map<Key, Value>::_capnpPrivate::kind;
|
||||
template <typename Key, typename Value>
|
||||
constexpr ::capnp::_::RawSchema const* Map<Key, Value>::_capnpPrivate::schema;
|
||||
#endif // !CAPNP_NEED_REDUNDANT_CONSTEXPR_DECL
|
||||
template <typename Key, typename Value>
|
||||
const ::capnp::_::RawBrandedSchema::Scope Map<Key, Value>::_capnpPrivate::brandScopes[] = {
|
||||
{ 0xf8b13ce2183eb696, brandBindings + 0, 2, false},
|
||||
@@ -22851,6 +23025,20 @@ inline void FrameData::Builder::setExposureValPercent(float value) {
|
||||
::capnp::bounded<21>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::uint32_t FrameData::Reader::getRequestId() const {
|
||||
return _reader.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<22>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline ::uint32_t FrameData::Builder::getRequestId() {
|
||||
return _builder.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<22>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void FrameData::Builder::setRequestId( ::uint32_t value) {
|
||||
_builder.setDataField< ::uint32_t>(
|
||||
::capnp::bounded<22>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::int32_t FrameData::AndroidCaptureResult::Reader::getSensitivity() const {
|
||||
return _reader.getDataField< ::int32_t>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS);
|
||||
@@ -28111,16 +28299,16 @@ inline void ControlsState::Builder::setDesiredCurvature(float value) {
|
||||
::capnp::bounded<44>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline float ControlsState::Reader::getDesiredCurvatureRate() const {
|
||||
inline float ControlsState::Reader::getDesiredCurvatureRateDEPRECATED() const {
|
||||
return _reader.getDataField<float>(
|
||||
::capnp::bounded<45>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline float ControlsState::Builder::getDesiredCurvatureRate() {
|
||||
inline float ControlsState::Builder::getDesiredCurvatureRateDEPRECATED() {
|
||||
return _builder.getDataField<float>(
|
||||
::capnp::bounded<45>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void ControlsState::Builder::setDesiredCurvatureRate(float value) {
|
||||
inline void ControlsState::Builder::setDesiredCurvatureRateDEPRECATED(float value) {
|
||||
_builder.setDataField<float>(
|
||||
::capnp::bounded<45>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
@@ -29312,55 +29500,55 @@ inline ::capnp::Orphan< ::cereal::ControlsState::LateralTorqueState> ControlsSta
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool ControlsState::LateralControlState::Reader::isCurvatureState() const {
|
||||
return which() == ControlsState::LateralControlState::CURVATURE_STATE;
|
||||
inline bool ControlsState::LateralControlState::Reader::isCurvatureStateDEPRECATED() const {
|
||||
return which() == ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D;
|
||||
}
|
||||
inline bool ControlsState::LateralControlState::Builder::isCurvatureState() {
|
||||
return which() == ControlsState::LateralControlState::CURVATURE_STATE;
|
||||
inline bool ControlsState::LateralControlState::Builder::isCurvatureStateDEPRECATED() {
|
||||
return which() == ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D;
|
||||
}
|
||||
inline bool ControlsState::LateralControlState::Reader::hasCurvatureState() const {
|
||||
if (which() != ControlsState::LateralControlState::CURVATURE_STATE) return false;
|
||||
inline bool ControlsState::LateralControlState::Reader::hasCurvatureStateDEPRECATED() const {
|
||||
if (which() != ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D) return false;
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool ControlsState::LateralControlState::Builder::hasCurvatureState() {
|
||||
if (which() != ControlsState::LateralControlState::CURVATURE_STATE) return false;
|
||||
inline bool ControlsState::LateralControlState::Builder::hasCurvatureStateDEPRECATED() {
|
||||
if (which() != ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D) return false;
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Reader ControlsState::LateralControlState::Reader::getCurvatureState() const {
|
||||
KJ_IREQUIRE((which() == ControlsState::LateralControlState::CURVATURE_STATE),
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Reader ControlsState::LateralControlState::Reader::getCurvatureStateDEPRECATED() const {
|
||||
KJ_IREQUIRE((which() == ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ControlsState::LateralCurvatureState>::get(_reader.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder ControlsState::LateralControlState::Builder::getCurvatureState() {
|
||||
KJ_IREQUIRE((which() == ControlsState::LateralControlState::CURVATURE_STATE),
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder ControlsState::LateralControlState::Builder::getCurvatureStateDEPRECATED() {
|
||||
KJ_IREQUIRE((which() == ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ControlsState::LateralCurvatureState>::get(_builder.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void ControlsState::LateralControlState::Builder::setCurvatureState( ::cereal::ControlsState::LateralCurvatureState::Reader value) {
|
||||
inline void ControlsState::LateralControlState::Builder::setCurvatureStateDEPRECATED( ::cereal::ControlsState::LateralCurvatureState::Reader value) {
|
||||
_builder.setDataField<ControlsState::LateralControlState::Which>(
|
||||
::capnp::bounded<71>() * ::capnp::ELEMENTS, ControlsState::LateralControlState::CURVATURE_STATE);
|
||||
::capnp::bounded<71>() * ::capnp::ELEMENTS, ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D);
|
||||
::capnp::_::PointerHelpers< ::cereal::ControlsState::LateralCurvatureState>::set(_builder.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder ControlsState::LateralControlState::Builder::initCurvatureState() {
|
||||
inline ::cereal::ControlsState::LateralCurvatureState::Builder ControlsState::LateralControlState::Builder::initCurvatureStateDEPRECATED() {
|
||||
_builder.setDataField<ControlsState::LateralControlState::Which>(
|
||||
::capnp::bounded<71>() * ::capnp::ELEMENTS, ControlsState::LateralControlState::CURVATURE_STATE);
|
||||
::capnp::bounded<71>() * ::capnp::ELEMENTS, ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D);
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ControlsState::LateralCurvatureState>::init(_builder.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void ControlsState::LateralControlState::Builder::adoptCurvatureState(
|
||||
inline void ControlsState::LateralControlState::Builder::adoptCurvatureStateDEPRECATED(
|
||||
::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState>&& value) {
|
||||
_builder.setDataField<ControlsState::LateralControlState::Which>(
|
||||
::capnp::bounded<71>() * ::capnp::ELEMENTS, ControlsState::LateralControlState::CURVATURE_STATE);
|
||||
::capnp::bounded<71>() * ::capnp::ELEMENTS, ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D);
|
||||
::capnp::_::PointerHelpers< ::cereal::ControlsState::LateralCurvatureState>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState> ControlsState::LateralControlState::Builder::disownCurvatureState() {
|
||||
KJ_IREQUIRE((which() == ControlsState::LateralControlState::CURVATURE_STATE),
|
||||
inline ::capnp::Orphan< ::cereal::ControlsState::LateralCurvatureState> ControlsState::LateralControlState::Builder::disownCurvatureStateDEPRECATED() {
|
||||
KJ_IREQUIRE((which() == ControlsState::LateralControlState::CURVATURE_STATE_D_E_P_R_E_C_A_T_E_D),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ControlsState::LateralCurvatureState>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<5>() * ::capnp::POINTERS));
|
||||
@@ -30329,45 +30517,84 @@ inline void ModelDataV2::Builder::setLocationMonoTime( ::uint64_t value) {
|
||||
::capnp::bounded<5>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline bool ModelDataV2::Reader::hasLateralPlannerSolution() const {
|
||||
inline bool ModelDataV2::Reader::hasLateralPlannerSolutionDEPRECATED() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool ModelDataV2::Builder::hasLateralPlannerSolution() {
|
||||
inline bool ModelDataV2::Builder::hasLateralPlannerSolutionDEPRECATED() {
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Reader ModelDataV2::Reader::getLateralPlannerSolution() const {
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Reader ModelDataV2::Reader::getLateralPlannerSolutionDEPRECATED() const {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::LateralPlannerSolution>::get(_reader.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder ModelDataV2::Builder::getLateralPlannerSolution() {
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder ModelDataV2::Builder::getLateralPlannerSolutionDEPRECATED() {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::LateralPlannerSolution>::get(_builder.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS));
|
||||
}
|
||||
#if !CAPNP_LITE
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Pipeline ModelDataV2::Pipeline::getLateralPlannerSolution() {
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Pipeline ModelDataV2::Pipeline::getLateralPlannerSolutionDEPRECATED() {
|
||||
return ::cereal::ModelDataV2::LateralPlannerSolution::Pipeline(_typeless.getPointerField(15));
|
||||
}
|
||||
#endif // !CAPNP_LITE
|
||||
inline void ModelDataV2::Builder::setLateralPlannerSolution( ::cereal::ModelDataV2::LateralPlannerSolution::Reader value) {
|
||||
inline void ModelDataV2::Builder::setLateralPlannerSolutionDEPRECATED( ::cereal::ModelDataV2::LateralPlannerSolution::Reader value) {
|
||||
::capnp::_::PointerHelpers< ::cereal::ModelDataV2::LateralPlannerSolution>::set(_builder.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder ModelDataV2::Builder::initLateralPlannerSolution() {
|
||||
inline ::cereal::ModelDataV2::LateralPlannerSolution::Builder ModelDataV2::Builder::initLateralPlannerSolutionDEPRECATED() {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::LateralPlannerSolution>::init(_builder.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void ModelDataV2::Builder::adoptLateralPlannerSolution(
|
||||
inline void ModelDataV2::Builder::adoptLateralPlannerSolutionDEPRECATED(
|
||||
::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution>&& value) {
|
||||
::capnp::_::PointerHelpers< ::cereal::ModelDataV2::LateralPlannerSolution>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution> ModelDataV2::Builder::disownLateralPlannerSolution() {
|
||||
inline ::capnp::Orphan< ::cereal::ModelDataV2::LateralPlannerSolution> ModelDataV2::Builder::disownLateralPlannerSolutionDEPRECATED() {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::LateralPlannerSolution>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<15>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool ModelDataV2::Reader::hasAction() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool ModelDataV2::Builder::hasAction() {
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::cereal::ModelDataV2::Action::Reader ModelDataV2::Reader::getAction() const {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::Action>::get(_reader.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::cereal::ModelDataV2::Action::Builder ModelDataV2::Builder::getAction() {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::Action>::get(_builder.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS));
|
||||
}
|
||||
#if !CAPNP_LITE
|
||||
inline ::cereal::ModelDataV2::Action::Pipeline ModelDataV2::Pipeline::getAction() {
|
||||
return ::cereal::ModelDataV2::Action::Pipeline(_typeless.getPointerField(16));
|
||||
}
|
||||
#endif // !CAPNP_LITE
|
||||
inline void ModelDataV2::Builder::setAction( ::cereal::ModelDataV2::Action::Reader value) {
|
||||
::capnp::_::PointerHelpers< ::cereal::ModelDataV2::Action>::set(_builder.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::cereal::ModelDataV2::Action::Builder ModelDataV2::Builder::initAction() {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::Action>::init(_builder.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void ModelDataV2::Builder::adoptAction(
|
||||
::capnp::Orphan< ::cereal::ModelDataV2::Action>&& value) {
|
||||
::capnp::_::PointerHelpers< ::cereal::ModelDataV2::Action>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::cereal::ModelDataV2::Action> ModelDataV2::Builder::disownAction() {
|
||||
return ::capnp::_::PointerHelpers< ::cereal::ModelDataV2::Action>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<16>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline float ModelDataV2::LeadDataV2::Reader::getProb() const {
|
||||
return _reader.getDataField<float>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS);
|
||||
@@ -31027,6 +31254,34 @@ inline void ModelDataV2::MetaData::Builder::setHardBrakePredicted(bool value) {
|
||||
::capnp::bounded<128>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::cereal::LaneChangeState ModelDataV2::MetaData::Reader::getLaneChangeState() const {
|
||||
return _reader.getDataField< ::cereal::LaneChangeState>(
|
||||
::capnp::bounded<9>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline ::cereal::LaneChangeState ModelDataV2::MetaData::Builder::getLaneChangeState() {
|
||||
return _builder.getDataField< ::cereal::LaneChangeState>(
|
||||
::capnp::bounded<9>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void ModelDataV2::MetaData::Builder::setLaneChangeState( ::cereal::LaneChangeState value) {
|
||||
_builder.setDataField< ::cereal::LaneChangeState>(
|
||||
::capnp::bounded<9>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::cereal::LaneChangeDirection ModelDataV2::MetaData::Reader::getLaneChangeDirection() const {
|
||||
return _reader.getDataField< ::cereal::LaneChangeDirection>(
|
||||
::capnp::bounded<10>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline ::cereal::LaneChangeDirection ModelDataV2::MetaData::Builder::getLaneChangeDirection() {
|
||||
return _builder.getDataField< ::cereal::LaneChangeDirection>(
|
||||
::capnp::bounded<10>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void ModelDataV2::MetaData::Builder::setLaneChangeDirection( ::cereal::LaneChangeDirection value) {
|
||||
_builder.setDataField< ::cereal::LaneChangeDirection>(
|
||||
::capnp::bounded<10>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline bool ModelDataV2::DisengagePredictions::Reader::hasT() const {
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
@@ -31749,6 +32004,20 @@ inline ::capnp::Orphan< ::capnp::List<float, ::capnp::Kind::PRIMITIVE>> ModelDa
|
||||
::capnp::bounded<7>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline float ModelDataV2::Action::Reader::getDesiredCurvature() const {
|
||||
return _reader.getDataField<float>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline float ModelDataV2::Action::Builder::getDesiredCurvature() {
|
||||
return _builder.getDataField<float>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void ModelDataV2::Action::Builder::setDesiredCurvature(float value) {
|
||||
_builder.setDataField<float>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::uint32_t EncodeIndex::Reader::getFrameId() const {
|
||||
return _reader.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS);
|
||||
@@ -45967,6 +46236,34 @@ inline void EncodeData::Builder::setUnixTimestampNanos( ::uint64_t value) {
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::uint32_t EncodeData::Reader::getWidth() const {
|
||||
return _reader.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<2>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline ::uint32_t EncodeData::Builder::getWidth() {
|
||||
return _builder.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<2>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void EncodeData::Builder::setWidth( ::uint32_t value) {
|
||||
_builder.setDataField< ::uint32_t>(
|
||||
::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline ::uint32_t EncodeData::Reader::getHeight() const {
|
||||
return _reader.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<3>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
|
||||
inline ::uint32_t EncodeData::Builder::getHeight() {
|
||||
return _builder.getDataField< ::uint32_t>(
|
||||
::capnp::bounded<3>() * ::capnp::ELEMENTS);
|
||||
}
|
||||
inline void EncodeData::Builder::setHeight( ::uint32_t value) {
|
||||
_builder.setDataField< ::uint32_t>(
|
||||
::capnp::bounded<3>() * ::capnp::ELEMENTS, value);
|
||||
}
|
||||
|
||||
inline float Microphone::Reader::getSoundPressure() const {
|
||||
return _reader.getDataField<float>(
|
||||
::capnp::bounded<0>() * ::capnp::ELEMENTS);
|
||||
@@ -49448,55 +49745,55 @@ inline ::capnp::Orphan< ::cereal::CameraOdometry> Event::Builder::disownCameraOd
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool Event::Reader::isLateralPlan() const {
|
||||
return which() == Event::LATERAL_PLAN;
|
||||
inline bool Event::Reader::isLateralPlanDEPRECATED() const {
|
||||
return which() == Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D;
|
||||
}
|
||||
inline bool Event::Builder::isLateralPlan() {
|
||||
return which() == Event::LATERAL_PLAN;
|
||||
inline bool Event::Builder::isLateralPlanDEPRECATED() {
|
||||
return which() == Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D;
|
||||
}
|
||||
inline bool Event::Reader::hasLateralPlan() const {
|
||||
if (which() != Event::LATERAL_PLAN) return false;
|
||||
inline bool Event::Reader::hasLateralPlanDEPRECATED() const {
|
||||
if (which() != Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D) return false;
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool Event::Builder::hasLateralPlan() {
|
||||
if (which() != Event::LATERAL_PLAN) return false;
|
||||
inline bool Event::Builder::hasLateralPlanDEPRECATED() {
|
||||
if (which() != Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D) return false;
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::cereal::LateralPlan::Reader Event::Reader::getLateralPlan() const {
|
||||
KJ_IREQUIRE((which() == Event::LATERAL_PLAN),
|
||||
inline ::cereal::LateralPlan::Reader Event::Reader::getLateralPlanDEPRECATED() const {
|
||||
KJ_IREQUIRE((which() == Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::LateralPlan>::get(_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::cereal::LateralPlan::Builder Event::Builder::getLateralPlan() {
|
||||
KJ_IREQUIRE((which() == Event::LATERAL_PLAN),
|
||||
inline ::cereal::LateralPlan::Builder Event::Builder::getLateralPlanDEPRECATED() {
|
||||
KJ_IREQUIRE((which() == Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::LateralPlan>::get(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void Event::Builder::setLateralPlan( ::cereal::LateralPlan::Reader value) {
|
||||
inline void Event::Builder::setLateralPlanDEPRECATED( ::cereal::LateralPlan::Reader value) {
|
||||
_builder.setDataField<Event::Which>(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::LATERAL_PLAN);
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D);
|
||||
::capnp::_::PointerHelpers< ::cereal::LateralPlan>::set(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::cereal::LateralPlan::Builder Event::Builder::initLateralPlan() {
|
||||
inline ::cereal::LateralPlan::Builder Event::Builder::initLateralPlanDEPRECATED() {
|
||||
_builder.setDataField<Event::Which>(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::LATERAL_PLAN);
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D);
|
||||
return ::capnp::_::PointerHelpers< ::cereal::LateralPlan>::init(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void Event::Builder::adoptLateralPlan(
|
||||
inline void Event::Builder::adoptLateralPlanDEPRECATED(
|
||||
::capnp::Orphan< ::cereal::LateralPlan>&& value) {
|
||||
_builder.setDataField<Event::Which>(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::LATERAL_PLAN);
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D);
|
||||
::capnp::_::PointerHelpers< ::cereal::LateralPlan>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::cereal::LateralPlan> Event::Builder::disownLateralPlan() {
|
||||
KJ_IREQUIRE((which() == Event::LATERAL_PLAN),
|
||||
inline ::capnp::Orphan< ::cereal::LateralPlan> Event::Builder::disownLateralPlanDEPRECATED() {
|
||||
KJ_IREQUIRE((which() == Event::LATERAL_PLAN_D_E_P_R_E_C_A_T_E_D),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::LateralPlan>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
@@ -51946,57 +52243,57 @@ inline ::capnp::Orphan< ::cereal::ControlsStateExt> Event::Builder::disownContro
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
inline bool Event::Reader::isCustomReserved4() const {
|
||||
return which() == Event::CUSTOM_RESERVED4;
|
||||
inline bool Event::Reader::isNavInstructionExt() const {
|
||||
return which() == Event::NAV_INSTRUCTION_EXT;
|
||||
}
|
||||
inline bool Event::Builder::isCustomReserved4() {
|
||||
return which() == Event::CUSTOM_RESERVED4;
|
||||
inline bool Event::Builder::isNavInstructionExt() {
|
||||
return which() == Event::NAV_INSTRUCTION_EXT;
|
||||
}
|
||||
inline bool Event::Reader::hasCustomReserved4() const {
|
||||
if (which() != Event::CUSTOM_RESERVED4) return false;
|
||||
inline bool Event::Reader::hasNavInstructionExt() const {
|
||||
if (which() != Event::NAV_INSTRUCTION_EXT) return false;
|
||||
return !_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline bool Event::Builder::hasCustomReserved4() {
|
||||
if (which() != Event::CUSTOM_RESERVED4) return false;
|
||||
inline bool Event::Builder::hasNavInstructionExt() {
|
||||
if (which() != Event::NAV_INSTRUCTION_EXT) return false;
|
||||
return !_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
|
||||
}
|
||||
inline ::cereal::CustomReserved4::Reader Event::Reader::getCustomReserved4() const {
|
||||
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED4),
|
||||
inline ::cereal::NavInstructionExt::Reader Event::Reader::getNavInstructionExt() const {
|
||||
KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION_EXT),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::CustomReserved4>::get(_reader.getPointerField(
|
||||
return ::capnp::_::PointerHelpers< ::cereal::NavInstructionExt>::get(_reader.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline ::cereal::CustomReserved4::Builder Event::Builder::getCustomReserved4() {
|
||||
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED4),
|
||||
inline ::cereal::NavInstructionExt::Builder Event::Builder::getNavInstructionExt() {
|
||||
KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION_EXT),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::CustomReserved4>::get(_builder.getPointerField(
|
||||
return ::capnp::_::PointerHelpers< ::cereal::NavInstructionExt>::get(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void Event::Builder::setCustomReserved4( ::cereal::CustomReserved4::Reader value) {
|
||||
inline void Event::Builder::setNavInstructionExt( ::cereal::NavInstructionExt::Reader value) {
|
||||
_builder.setDataField<Event::Which>(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED4);
|
||||
::capnp::_::PointerHelpers< ::cereal::CustomReserved4>::set(_builder.getPointerField(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION_EXT);
|
||||
::capnp::_::PointerHelpers< ::cereal::NavInstructionExt>::set(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), value);
|
||||
}
|
||||
inline ::cereal::CustomReserved4::Builder Event::Builder::initCustomReserved4() {
|
||||
inline ::cereal::NavInstructionExt::Builder Event::Builder::initNavInstructionExt() {
|
||||
_builder.setDataField<Event::Which>(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED4);
|
||||
return ::capnp::_::PointerHelpers< ::cereal::CustomReserved4>::init(_builder.getPointerField(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION_EXT);
|
||||
return ::capnp::_::PointerHelpers< ::cereal::NavInstructionExt>::init(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
inline void Event::Builder::adoptCustomReserved4(
|
||||
::capnp::Orphan< ::cereal::CustomReserved4>&& value) {
|
||||
inline void Event::Builder::adoptNavInstructionExt(
|
||||
::capnp::Orphan< ::cereal::NavInstructionExt>&& value) {
|
||||
_builder.setDataField<Event::Which>(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::CUSTOM_RESERVED4);
|
||||
::capnp::_::PointerHelpers< ::cereal::CustomReserved4>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<4>() * ::capnp::ELEMENTS, Event::NAV_INSTRUCTION_EXT);
|
||||
::capnp::_::PointerHelpers< ::cereal::NavInstructionExt>::adopt(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS), kj::mv(value));
|
||||
}
|
||||
inline ::capnp::Orphan< ::cereal::CustomReserved4> Event::Builder::disownCustomReserved4() {
|
||||
KJ_IREQUIRE((which() == Event::CUSTOM_RESERVED4),
|
||||
inline ::capnp::Orphan< ::cereal::NavInstructionExt> Event::Builder::disownNavInstructionExt() {
|
||||
KJ_IREQUIRE((which() == Event::NAV_INSTRUCTION_EXT),
|
||||
"Must check which() before get()ing a union member.");
|
||||
return ::capnp::_::PointerHelpers< ::cereal::CustomReserved4>::disown(_builder.getPointerField(
|
||||
return ::capnp::_::PointerHelpers< ::cereal::NavInstructionExt>::disown(_builder.getPointerField(
|
||||
::capnp::bounded<0>() * ::capnp::POINTERS));
|
||||
}
|
||||
|
||||
@@ -52812,3 +53109,5 @@ inline ::capnp::Orphan< ::capnp::Data> Event::Builder::disownCustomReservedRawDa
|
||||
|
||||
} // namespace
|
||||
|
||||
CAPNP_END_HEADER
|
||||
|
||||
|
||||
Binary file not shown.
+40
-6
@@ -130,8 +130,9 @@ struct InitData {
|
||||
|
||||
struct FrameData {
|
||||
frameId @0 :UInt32;
|
||||
encodeId @1 :UInt32; # DEPRECATED
|
||||
frameIdSensor @25 :UInt32;
|
||||
requestId @28 :UInt32;
|
||||
encodeId @1 :UInt32;
|
||||
|
||||
frameType @7 :FrameType;
|
||||
|
||||
@@ -298,6 +299,29 @@ struct GpsLocationData {
|
||||
}
|
||||
}
|
||||
|
||||
enum Desire {
|
||||
none @0;
|
||||
turnLeft @1;
|
||||
turnRight @2;
|
||||
laneChangeLeft @3;
|
||||
laneChangeRight @4;
|
||||
keepLeft @5;
|
||||
keepRight @6;
|
||||
}
|
||||
|
||||
enum LaneChangeState {
|
||||
off @0;
|
||||
preLaneChange @1;
|
||||
laneChangeStarting @2;
|
||||
laneChangeFinishing @3;
|
||||
}
|
||||
|
||||
enum LaneChangeDirection {
|
||||
none @0;
|
||||
left @1;
|
||||
right @2;
|
||||
}
|
||||
|
||||
struct CanData {
|
||||
address @0 :UInt32;
|
||||
busTime @1 :UInt16;
|
||||
@@ -494,6 +518,7 @@ struct PandaState @0xa7649e2575e4591e {
|
||||
redPanda @7;
|
||||
redPandaV2 @8;
|
||||
tres @9;
|
||||
cuatro @10;
|
||||
}
|
||||
|
||||
enum HarnessStatus {
|
||||
@@ -667,7 +692,6 @@ struct ControlsState @0x97ff69c53601abf1 {
|
||||
aTarget @35 :Float32;
|
||||
curvature @37 :Float32; # path curvature from vehicle model
|
||||
desiredCurvature @61 :Float32; # lag adjusted curvatures used by lateral controllers
|
||||
desiredCurvatureRate @62 :Float32;
|
||||
forceDecel @51 :Bool;
|
||||
|
||||
# UI alerts
|
||||
@@ -689,8 +713,8 @@ struct ControlsState @0x97ff69c53601abf1 {
|
||||
angleState @58 :LateralAngleState;
|
||||
debugState @59 :LateralDebugState;
|
||||
torqueState @60 :LateralTorqueState;
|
||||
curvatureState @65 :LateralCurvatureState;
|
||||
|
||||
curvatureStateDEPRECATED @65 :LateralCurvatureState;
|
||||
lqrStateDEPRECATED @55 :LateralLQRState;
|
||||
}
|
||||
|
||||
@@ -825,6 +849,7 @@ struct ControlsState @0x97ff69c53601abf1 {
|
||||
steerOverrideDEPRECATED @20 :Bool;
|
||||
steeringAngleDesiredDegDEPRECATED @29 :Float32;
|
||||
canMonoTimesDEPRECATED @21 :List(UInt64);
|
||||
desiredCurvatureRateDEPRECATED @62 :Float32;
|
||||
}
|
||||
|
||||
# All SI units and in device frame
|
||||
@@ -876,7 +901,8 @@ struct ModelDataV2 {
|
||||
locationMonoTime @24 :UInt64;
|
||||
|
||||
# e2e lateral planner
|
||||
lateralPlannerSolution @25: LateralPlannerSolution;
|
||||
lateralPlannerSolutionDEPRECATED @25: LateralPlannerSolution;
|
||||
action @26: Action;
|
||||
|
||||
struct LeadDataV2 {
|
||||
prob @0 :Float32; # probability that car is your lead at time t
|
||||
@@ -914,6 +940,9 @@ struct ModelDataV2 {
|
||||
desireState @5 :List(Float32);
|
||||
disengagePredictions @6 :DisengagePredictions;
|
||||
hardBrakePredicted @7 :Bool;
|
||||
laneChangeState @8 :LaneChangeState;
|
||||
laneChangeDirection @9 :LaneChangeDirection;
|
||||
|
||||
|
||||
# deprecated
|
||||
brakeDisengageProbDEPRECATED @2 :Float32;
|
||||
@@ -955,6 +984,9 @@ struct ModelDataV2 {
|
||||
yawRateStd @7 :List(Float32);
|
||||
}
|
||||
|
||||
struct Action {
|
||||
desiredCurvature @0 :Float32;
|
||||
}
|
||||
}
|
||||
|
||||
struct EncodeIndex {
|
||||
@@ -2168,6 +2200,8 @@ struct EncodeData {
|
||||
data @1 :Data;
|
||||
header @2 :Data;
|
||||
unixTimestampNanos @3 :UInt64;
|
||||
width @4 :UInt32;
|
||||
height @5 :UInt32;
|
||||
}
|
||||
|
||||
struct UserFlag {
|
||||
@@ -2215,7 +2249,6 @@ struct Event {
|
||||
carState @22 :Car.CarState;
|
||||
carControl @23 :Car.CarControl;
|
||||
longitudinalPlan @24 :LongitudinalPlan;
|
||||
lateralPlan @64 :LateralPlan;
|
||||
uiPlan @106 :UiPlan;
|
||||
ubloxGnss @34 :UbloxGnss;
|
||||
ubloxRaw @39 :Data;
|
||||
@@ -2291,7 +2324,7 @@ struct Event {
|
||||
longitudinalPlanExt @108 :Custom.LongitudinalPlanExt;
|
||||
lateralPlanExt @109 :Custom.LateralPlanExt;
|
||||
controlsStateExt @110 :Custom.ControlsStateExt;
|
||||
customReserved4 @111 :Custom.CustomReserved4;
|
||||
navInstructionExt @111 :Custom.NavInstructionExt;
|
||||
customReserved5 @112 :Custom.CustomReserved5;
|
||||
customReserved6 @113 :Custom.CustomReserved6;
|
||||
customReserved7 @114 :Custom.CustomReserved7;
|
||||
@@ -2336,5 +2369,6 @@ struct Event {
|
||||
pandaStateDEPRECATED @12 :PandaState;
|
||||
driverStateDEPRECATED @59 :DriverStateDEPRECATED;
|
||||
sensorEventsDEPRECATED @11 :List(SensorEventData);
|
||||
lateralPlanDEPRECATED @64 :LateralPlan;
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,4 +1,4 @@
|
||||
/* Generated by Cython 3.0.5 */
|
||||
/* Generated by Cython 3.0.8 */
|
||||
|
||||
/* BEGIN: Cython Metadata
|
||||
{
|
||||
@@ -41,10 +41,10 @@ END: Cython Metadata */
|
||||
#else
|
||||
#define __PYX_EXTRA_ABI_MODULE_NAME ""
|
||||
#endif
|
||||
#define CYTHON_ABI "3_0_5" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
|
||||
#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
|
||||
#define CYTHON_HEX_VERSION 0x030005F0
|
||||
#define CYTHON_HEX_VERSION 0x030008F0
|
||||
#define CYTHON_FUTURE_DIVISION 1
|
||||
#include <stddef.h>
|
||||
#ifndef offsetof
|
||||
@@ -258,7 +258,7 @@ END: Cython Metadata */
|
||||
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
|
||||
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
|
||||
#endif
|
||||
#elif defined(PY_NOGIL)
|
||||
#elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
|
||||
#define CYTHON_COMPILING_IN_PYPY 0
|
||||
#define CYTHON_COMPILING_IN_CPYTHON 0
|
||||
#define CYTHON_COMPILING_IN_LIMITED_API 0
|
||||
@@ -602,18 +602,19 @@ class __Pyx_FakeReference {
|
||||
PyObject *exception_table = NULL;
|
||||
PyObject *types_module=NULL, *code_type=NULL, *result=NULL;
|
||||
#if __PYX_LIMITED_VERSION_HEX < 0x030B0000
|
||||
PyObject *version_info; // borrowed
|
||||
#endif
|
||||
PyObject *version_info;
|
||||
PyObject *py_minor_version = NULL;
|
||||
#endif
|
||||
long minor_version = 0;
|
||||
PyObject *type, *value, *traceback;
|
||||
PyErr_Fetch(&type, &value, &traceback);
|
||||
#if __PYX_LIMITED_VERSION_HEX >= 0x030B0000
|
||||
minor_version = 11; // we don't yet need to distinguish between versions > 11
|
||||
minor_version = 11;
|
||||
#else
|
||||
if (!(version_info = PySys_GetObject("version_info"))) goto end;
|
||||
if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end;
|
||||
minor_version = PyLong_AsLong(py_minor_version);
|
||||
Py_DECREF(py_minor_version);
|
||||
if (minor_version == -1 && PyErr_Occurred()) goto end;
|
||||
#endif
|
||||
if (!(types_module = PyImport_ImportModule("types"))) goto end;
|
||||
@@ -634,7 +635,6 @@ class __Pyx_FakeReference {
|
||||
Py_XDECREF(code_type);
|
||||
Py_XDECREF(exception_table);
|
||||
Py_XDECREF(types_module);
|
||||
Py_XDECREF(py_minor_version);
|
||||
if (type) {
|
||||
PyErr_Restore(type, value, traceback);
|
||||
}
|
||||
@@ -667,7 +667,7 @@ class __Pyx_FakeReference {
|
||||
PyObject *fv, PyObject *cell, PyObject* fn,
|
||||
PyObject *name, int fline, PyObject *lnos) {
|
||||
PyCodeObject *result;
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0); // we don't have access to __pyx_empty_bytes here
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);
|
||||
if (!empty_bytes) return NULL;
|
||||
result =
|
||||
#if PY_VERSION_HEX >= 0x030C0000
|
||||
@@ -962,7 +962,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
|
||||
#endif
|
||||
#if CYTHON_USE_TYPE_SPECS && PY_VERSION_HEX >= 0x03080000
|
||||
#define __Pyx_PyHeapTypeObject_GC_Del(obj) {\
|
||||
PyTypeObject *type = Py_TYPE(obj);\
|
||||
PyTypeObject *type = Py_TYPE((PyObject*)obj);\
|
||||
assert(__Pyx_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE));\
|
||||
PyObject_GC_Del(obj);\
|
||||
Py_DECREF(type);\
|
||||
@@ -1369,7 +1369,7 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
|
||||
#endif
|
||||
typedef Py_ssize_t __Pyx_compact_pylong;
|
||||
typedef size_t __Pyx_compact_upylong;
|
||||
#else // Py < 3.12
|
||||
#else
|
||||
#define __Pyx_PyLong_IsNeg(x) (Py_SIZE(x) < 0)
|
||||
#define __Pyx_PyLong_IsNonNeg(x) (Py_SIZE(x) >= 0)
|
||||
#define __Pyx_PyLong_IsZero(x) (Py_SIZE(x) == 0)
|
||||
@@ -1798,8 +1798,8 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) __Pyx_NewRef(arg)
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) Py_XDECREF(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg // no-op
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) // no-op - arg is borrowed
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg)
|
||||
#endif
|
||||
#define __Pyx_NumKwargs_VARARGS(kwds) PyDict_Size(kwds)
|
||||
#define __Pyx_KwValues_VARARGS(args, nargs) NULL
|
||||
@@ -1811,12 +1811,13 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
|
||||
static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
#else
|
||||
#define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
|
||||
#endif
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg // no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg) // no-op - arg was returned from array
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg /* no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
to have the same reference counting */
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_FASTCALL __Pyx_Arg_VARARGS
|
||||
#define __Pyx_NumKwargs_FASTCALL __Pyx_NumKwargs_VARARGS
|
||||
@@ -2198,7 +2199,7 @@ typedef struct {
|
||||
#endif
|
||||
void *defaults;
|
||||
int defaults_pyobjects;
|
||||
size_t defaults_size; // used by FusedFunction for copying defaults
|
||||
size_t defaults_size;
|
||||
int flags;
|
||||
PyObject *defaults_tuple;
|
||||
PyObject *defaults_kwdict;
|
||||
@@ -11606,7 +11607,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_messaging_pyx(PyObject *__pyx_pyin
|
||||
__pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
{
|
||||
int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to messaging_pyx pseudovariable */
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to "messaging_pyx" pseudovariable */
|
||||
if (unlikely((add_module_result < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
pystate_addmodule_run = 1;
|
||||
}
|
||||
@@ -12618,14 +12619,14 @@ static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyO
|
||||
{
|
||||
int eq = __Pyx_PyUnicode_Equals(s, PyTuple_GET_ITEM(kwnames, i), Py_EQ);
|
||||
if (unlikely(eq != 0)) {
|
||||
if (unlikely(eq < 0)) return NULL; // error
|
||||
if (unlikely(eq < 0)) return NULL;
|
||||
return kwvalues[i];
|
||||
}
|
||||
}
|
||||
return NULL; // not found (no exception set)
|
||||
return NULL;
|
||||
}
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
Py_ssize_t i, nkwargs = PyTuple_GET_SIZE(kwnames);
|
||||
PyObject *dict;
|
||||
dict = PyDict_New();
|
||||
@@ -12709,7 +12710,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (*name) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_INCREF(value); // transfer ownership of value to values
|
||||
Py_INCREF(value);
|
||||
Py_DECREF(key);
|
||||
#endif
|
||||
key = NULL;
|
||||
@@ -12728,7 +12729,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
&& _PyString_Eq(**name, key)) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -12760,7 +12761,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (cmp == 0) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -13778,38 +13779,38 @@ static int __Pyx_validate_bases_tuple(const char *type_name, Py_ssize_t dictoffs
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#if !CYTHON_USE_TYPE_SLOTS
|
||||
if (dictoffset == 0) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%s.200s': "
|
||||
"unable to validate whether bases have a __dict__ "
|
||||
"when CYTHON_USE_TYPE_SLOTS is off "
|
||||
"(likely because you are building in the limited API). "
|
||||
"Therefore, all extension types with multiple bases "
|
||||
"must add 'cdef dict __dict__' in this compilation mode",
|
||||
type_name);
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
if (dictoffset == 0 && b->tp_dictoffset)
|
||||
if (dictoffset == 0)
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
Py_ssize_t b_dictoffset = 0;
|
||||
#if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
|
||||
b_dictoffset = b->tp_dictoffset;
|
||||
#else
|
||||
PyObject *py_b_dictoffset = PyObject_GetAttrString((PyObject*)b, "__dictoffset__");
|
||||
if (!py_b_dictoffset) goto dictoffset_return;
|
||||
b_dictoffset = PyLong_AsSsize_t(py_b_dictoffset);
|
||||
Py_DECREF(py_b_dictoffset);
|
||||
if (b_dictoffset == -1 && PyErr_Occurred()) goto dictoffset_return;
|
||||
#endif
|
||||
if (b_dictoffset) {
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
}
|
||||
#if !(CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY)
|
||||
dictoffset_return:
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
@@ -16160,7 +16161,7 @@ static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
|
||||
#else
|
||||
py_code = PyCode_NewEmpty(filename, funcname, py_line);
|
||||
#endif
|
||||
Py_XDECREF(py_funcname); // XDECREF since it's only set on Py3 if cline
|
||||
Py_XDECREF(py_funcname);
|
||||
return py_code;
|
||||
bad:
|
||||
Py_XDECREF(py_funcname);
|
||||
|
||||
Binary file not shown.
+42
-42
@@ -42,48 +42,48 @@ static std::map<std::string, service> services = {
|
||||
{ "liveLocationKalman", {"liveLocationKalman", 8036, true, 20, 5}},
|
||||
{ "liveParameters", {"liveParameters", 8037, true, 20, 5}},
|
||||
{ "cameraOdometry", {"cameraOdometry", 8038, true, 20, 5}},
|
||||
{ "lateralPlan", {"lateralPlan", 8039, true, 20, 5}},
|
||||
{ "thumbnail", {"thumbnail", 8040, true, 0, 1}},
|
||||
{ "onroadEvents", {"onroadEvents", 8041, true, 1, 1}},
|
||||
{ "carParams", {"carParams", 8042, true, 0, 1}},
|
||||
{ "roadCameraState", {"roadCameraState", 8043, true, 20, 20}},
|
||||
{ "driverCameraState", {"driverCameraState", 8044, true, 20, 20}},
|
||||
{ "driverEncodeIdx", {"driverEncodeIdx", 8045, false, 20, 1}},
|
||||
{ "driverStateV2", {"driverStateV2", 8046, true, 20, 10}},
|
||||
{ "driverMonitoringState", {"driverMonitoringState", 8047, true, 20, 10}},
|
||||
{ "wideRoadEncodeIdx", {"wideRoadEncodeIdx", 8048, false, 20, 1}},
|
||||
{ "wideRoadCameraState", {"wideRoadCameraState", 8049, true, 20, 20}},
|
||||
{ "modelV2", {"modelV2", 8050, true, 20, 40}},
|
||||
{ "managerState", {"managerState", 8051, true, 2, 1}},
|
||||
{ "uploaderState", {"uploaderState", 8052, true, 0, 1}},
|
||||
{ "navInstruction", {"navInstruction", 8053, true, 1, 10}},
|
||||
{ "navRoute", {"navRoute", 8054, true, 0, -1}},
|
||||
{ "navThumbnail", {"navThumbnail", 8055, true, 0, -1}},
|
||||
{ "navModel", {"navModel", 8056, true, 2, 4}},
|
||||
{ "mapRenderState", {"mapRenderState", 8057, true, 2, 1}},
|
||||
{ "uiPlan", {"uiPlan", 8058, true, 20, 40}},
|
||||
{ "qRoadEncodeIdx", {"qRoadEncodeIdx", 8059, false, 20, -1}},
|
||||
{ "userFlag", {"userFlag", 8060, true, 0, 1}},
|
||||
{ "microphone", {"microphone", 8061, true, 10, 10}},
|
||||
{ "uiDebug", {"uiDebug", 8062, true, 0, 1}},
|
||||
{ "testJoystick", {"testJoystick", 8063, true, 0, -1}},
|
||||
{ "roadEncodeData", {"roadEncodeData", 8064, false, 20, -1}},
|
||||
{ "driverEncodeData", {"driverEncodeData", 8065, false, 20, -1}},
|
||||
{ "wideRoadEncodeData", {"wideRoadEncodeData", 8066, false, 20, -1}},
|
||||
{ "qRoadEncodeData", {"qRoadEncodeData", 8067, false, 20, -1}},
|
||||
{ "livestreamWideRoadEncodeIdx", {"livestreamWideRoadEncodeIdx", 8068, false, 20, -1}},
|
||||
{ "livestreamRoadEncodeIdx", {"livestreamRoadEncodeIdx", 8069, false, 20, -1}},
|
||||
{ "livestreamDriverEncodeIdx", {"livestreamDriverEncodeIdx", 8070, false, 20, -1}},
|
||||
{ "livestreamWideRoadEncodeData", {"livestreamWideRoadEncodeData", 8071, false, 20, -1}},
|
||||
{ "livestreamRoadEncodeData", {"livestreamRoadEncodeData", 8072, false, 20, -1}},
|
||||
{ "livestreamDriverEncodeData", {"livestreamDriverEncodeData", 8073, false, 20, -1}},
|
||||
{ "customReservedRawData0", {"customReservedRawData0", 8074, true, 0, -1}},
|
||||
{ "customReservedRawData1", {"customReservedRawData1", 8075, true, 0, -1}},
|
||||
{ "customReservedRawData2", {"customReservedRawData2", 8076, true, 0, -1}},
|
||||
{ "liveMapData", {"liveMapData", 8077, false, 0, -1}},
|
||||
{ "longitudinalPlanExt", {"longitudinalPlanExt", 8078, false, 20, 5}},
|
||||
{ "lateralPlanExt", {"lateralPlanExt", 8079, false, 20, 5}},
|
||||
{ "controlsStateExt", {"controlsStateExt", 8080, false, 100, 10}},
|
||||
{ "thumbnail", {"thumbnail", 8039, true, 0, 1}},
|
||||
{ "onroadEvents", {"onroadEvents", 8040, true, 1, 1}},
|
||||
{ "carParams", {"carParams", 8041, true, 0, 1}},
|
||||
{ "roadCameraState", {"roadCameraState", 8042, true, 20, 20}},
|
||||
{ "driverCameraState", {"driverCameraState", 8043, true, 20, 20}},
|
||||
{ "driverEncodeIdx", {"driverEncodeIdx", 8044, false, 20, 1}},
|
||||
{ "driverStateV2", {"driverStateV2", 8045, true, 20, 10}},
|
||||
{ "driverMonitoringState", {"driverMonitoringState", 8046, true, 20, 10}},
|
||||
{ "wideRoadEncodeIdx", {"wideRoadEncodeIdx", 8047, false, 20, 1}},
|
||||
{ "wideRoadCameraState", {"wideRoadCameraState", 8048, true, 20, 20}},
|
||||
{ "modelV2", {"modelV2", 8049, true, 20, 40}},
|
||||
{ "managerState", {"managerState", 8050, true, 2, 1}},
|
||||
{ "uploaderState", {"uploaderState", 8051, true, 0, 1}},
|
||||
{ "navInstruction", {"navInstruction", 8052, true, 1, 10}},
|
||||
{ "navRoute", {"navRoute", 8053, true, 0, -1}},
|
||||
{ "navThumbnail", {"navThumbnail", 8054, true, 0, -1}},
|
||||
{ "navModel", {"navModel", 8055, true, 2, 4}},
|
||||
{ "mapRenderState", {"mapRenderState", 8056, true, 2, 1}},
|
||||
{ "uiPlan", {"uiPlan", 8057, true, 20, 40}},
|
||||
{ "qRoadEncodeIdx", {"qRoadEncodeIdx", 8058, false, 20, -1}},
|
||||
{ "userFlag", {"userFlag", 8059, true, 0, 1}},
|
||||
{ "microphone", {"microphone", 8060, true, 10, 10}},
|
||||
{ "uiDebug", {"uiDebug", 8061, true, 0, 1}},
|
||||
{ "testJoystick", {"testJoystick", 8062, true, 0, -1}},
|
||||
{ "roadEncodeData", {"roadEncodeData", 8063, false, 20, -1}},
|
||||
{ "driverEncodeData", {"driverEncodeData", 8064, false, 20, -1}},
|
||||
{ "wideRoadEncodeData", {"wideRoadEncodeData", 8065, false, 20, -1}},
|
||||
{ "qRoadEncodeData", {"qRoadEncodeData", 8066, false, 20, -1}},
|
||||
{ "livestreamWideRoadEncodeIdx", {"livestreamWideRoadEncodeIdx", 8067, false, 20, -1}},
|
||||
{ "livestreamRoadEncodeIdx", {"livestreamRoadEncodeIdx", 8068, false, 20, -1}},
|
||||
{ "livestreamDriverEncodeIdx", {"livestreamDriverEncodeIdx", 8069, false, 20, -1}},
|
||||
{ "livestreamWideRoadEncodeData", {"livestreamWideRoadEncodeData", 8070, false, 20, -1}},
|
||||
{ "livestreamRoadEncodeData", {"livestreamRoadEncodeData", 8071, false, 20, -1}},
|
||||
{ "livestreamDriverEncodeData", {"livestreamDriverEncodeData", 8072, false, 20, -1}},
|
||||
{ "customReservedRawData0", {"customReservedRawData0", 8073, true, 0, -1}},
|
||||
{ "customReservedRawData1", {"customReservedRawData1", 8074, true, 0, -1}},
|
||||
{ "customReservedRawData2", {"customReservedRawData2", 8075, true, 0, -1}},
|
||||
{ "liveMapData", {"liveMapData", 8076, false, 0, -1}},
|
||||
{ "longitudinalPlanExt", {"longitudinalPlanExt", 8077, false, 20, 5}},
|
||||
{ "lateralPlanExt", {"lateralPlanExt", 8078, false, 20, 5}},
|
||||
{ "controlsStateExt", {"controlsStateExt", 8079, false, 100, 10}},
|
||||
{ "navInstructionExt", {"navInstructionExt", 8080, false, 0, -1}},
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,6 @@ services: dict[str, tuple] = {
|
||||
"liveLocationKalman": (True, 20., 5),
|
||||
"liveParameters": (True, 20., 5),
|
||||
"cameraOdometry": (True, 20., 5),
|
||||
"lateralPlan": (True, 20., 5),
|
||||
"thumbnail": (True, 0.2, 1),
|
||||
"onroadEvents": (True, 1., 1),
|
||||
"carParams": (True, 0.02, 1),
|
||||
@@ -104,6 +103,7 @@ services: dict[str, tuple] = {
|
||||
"longitudinalPlanExt": (False, 20., 5),
|
||||
"lateralPlanExt": (False, 20., 5),
|
||||
"controlsStateExt": (False, 100., 10),
|
||||
"navInstructionExt": (False, 0.),
|
||||
}
|
||||
SERVICE_LIST = {name: Service(new_port(idx), *vals) for
|
||||
idx, (name, vals) in enumerate(services.items())}
|
||||
|
||||
@@ -2,11 +2,8 @@
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "cereal/messaging/messaging.h"
|
||||
#include "cereal/visionipc/visionipc.h"
|
||||
#include "cereal/visionipc/visionbuf.h"
|
||||
|
||||
class VisionIpcClient {
|
||||
|
||||
+162
-164
@@ -1,4 +1,4 @@
|
||||
/* Generated by Cython 3.0.5 */
|
||||
/* Generated by Cython 3.0.8 */
|
||||
|
||||
/* BEGIN: Cython Metadata
|
||||
{
|
||||
@@ -43,10 +43,10 @@ END: Cython Metadata */
|
||||
#else
|
||||
#define __PYX_EXTRA_ABI_MODULE_NAME ""
|
||||
#endif
|
||||
#define CYTHON_ABI "3_0_5" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
|
||||
#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
|
||||
#define CYTHON_HEX_VERSION 0x030005F0
|
||||
#define CYTHON_HEX_VERSION 0x030008F0
|
||||
#define CYTHON_FUTURE_DIVISION 1
|
||||
#include <stddef.h>
|
||||
#ifndef offsetof
|
||||
@@ -260,7 +260,7 @@ END: Cython Metadata */
|
||||
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
|
||||
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
|
||||
#endif
|
||||
#elif defined(PY_NOGIL)
|
||||
#elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
|
||||
#define CYTHON_COMPILING_IN_PYPY 0
|
||||
#define CYTHON_COMPILING_IN_CPYTHON 0
|
||||
#define CYTHON_COMPILING_IN_LIMITED_API 0
|
||||
@@ -604,18 +604,19 @@ class __Pyx_FakeReference {
|
||||
PyObject *exception_table = NULL;
|
||||
PyObject *types_module=NULL, *code_type=NULL, *result=NULL;
|
||||
#if __PYX_LIMITED_VERSION_HEX < 0x030B0000
|
||||
PyObject *version_info; // borrowed
|
||||
#endif
|
||||
PyObject *version_info;
|
||||
PyObject *py_minor_version = NULL;
|
||||
#endif
|
||||
long minor_version = 0;
|
||||
PyObject *type, *value, *traceback;
|
||||
PyErr_Fetch(&type, &value, &traceback);
|
||||
#if __PYX_LIMITED_VERSION_HEX >= 0x030B0000
|
||||
minor_version = 11; // we don't yet need to distinguish between versions > 11
|
||||
minor_version = 11;
|
||||
#else
|
||||
if (!(version_info = PySys_GetObject("version_info"))) goto end;
|
||||
if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end;
|
||||
minor_version = PyLong_AsLong(py_minor_version);
|
||||
Py_DECREF(py_minor_version);
|
||||
if (minor_version == -1 && PyErr_Occurred()) goto end;
|
||||
#endif
|
||||
if (!(types_module = PyImport_ImportModule("types"))) goto end;
|
||||
@@ -636,7 +637,6 @@ class __Pyx_FakeReference {
|
||||
Py_XDECREF(code_type);
|
||||
Py_XDECREF(exception_table);
|
||||
Py_XDECREF(types_module);
|
||||
Py_XDECREF(py_minor_version);
|
||||
if (type) {
|
||||
PyErr_Restore(type, value, traceback);
|
||||
}
|
||||
@@ -669,7 +669,7 @@ class __Pyx_FakeReference {
|
||||
PyObject *fv, PyObject *cell, PyObject* fn,
|
||||
PyObject *name, int fline, PyObject *lnos) {
|
||||
PyCodeObject *result;
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0); // we don't have access to __pyx_empty_bytes here
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);
|
||||
if (!empty_bytes) return NULL;
|
||||
result =
|
||||
#if PY_VERSION_HEX >= 0x030C0000
|
||||
@@ -964,7 +964,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
|
||||
#endif
|
||||
#if CYTHON_USE_TYPE_SPECS && PY_VERSION_HEX >= 0x03080000
|
||||
#define __Pyx_PyHeapTypeObject_GC_Del(obj) {\
|
||||
PyTypeObject *type = Py_TYPE(obj);\
|
||||
PyTypeObject *type = Py_TYPE((PyObject*)obj);\
|
||||
assert(__Pyx_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE));\
|
||||
PyObject_GC_Del(obj);\
|
||||
Py_DECREF(type);\
|
||||
@@ -1398,7 +1398,7 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
|
||||
#endif
|
||||
typedef Py_ssize_t __Pyx_compact_pylong;
|
||||
typedef size_t __Pyx_compact_upylong;
|
||||
#else // Py < 3.12
|
||||
#else
|
||||
#define __Pyx_PyLong_IsNeg(x) (Py_SIZE(x) < 0)
|
||||
#define __Pyx_PyLong_IsNonNeg(x) (Py_SIZE(x) >= 0)
|
||||
#define __Pyx_PyLong_IsZero(x) (Py_SIZE(x) == 0)
|
||||
@@ -1518,7 +1518,7 @@ static const char *__pyx_filename;
|
||||
#if !defined(CYTHON_CCOMPLEX)
|
||||
#if defined(__cplusplus)
|
||||
#define CYTHON_CCOMPLEX 1
|
||||
#elif (defined(_Complex_I) && !defined(_MSC_VER)) || ((defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_COMPLEX__))
|
||||
#elif (defined(_Complex_I) && !defined(_MSC_VER)) || ((defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_COMPLEX__) && !defined(_MSC_VER))
|
||||
#define CYTHON_CCOMPLEX 1
|
||||
#else
|
||||
#define CYTHON_CCOMPLEX 0
|
||||
@@ -2325,8 +2325,8 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) __Pyx_NewRef(arg)
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) Py_XDECREF(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg // no-op
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) // no-op - arg is borrowed
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg)
|
||||
#endif
|
||||
#define __Pyx_NumKwargs_VARARGS(kwds) PyDict_Size(kwds)
|
||||
#define __Pyx_KwValues_VARARGS(args, nargs) NULL
|
||||
@@ -2338,12 +2338,13 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
|
||||
static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
#else
|
||||
#define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
|
||||
#endif
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg // no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg) // no-op - arg was returned from array
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg /* no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
to have the same reference counting */
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_FASTCALL __Pyx_Arg_VARARGS
|
||||
#define __Pyx_NumKwargs_FASTCALL __Pyx_NumKwargs_VARARGS
|
||||
@@ -2889,22 +2890,22 @@ static int __Pyx_setup_reduce(PyObject* type_obj);
|
||||
#endif
|
||||
|
||||
/* TypeImport.proto */
|
||||
#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_5
|
||||
#define __PYX_HAVE_RT_ImportType_proto_3_0_5
|
||||
#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_8
|
||||
#define __PYX_HAVE_RT_ImportType_proto_3_0_8
|
||||
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
|
||||
#include <stdalign.h>
|
||||
#endif
|
||||
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
|
||||
#define __PYX_GET_STRUCT_ALIGNMENT_3_0_5(s) alignof(s)
|
||||
#define __PYX_GET_STRUCT_ALIGNMENT_3_0_8(s) alignof(s)
|
||||
#else
|
||||
#define __PYX_GET_STRUCT_ALIGNMENT_3_0_5(s) sizeof(void*)
|
||||
#define __PYX_GET_STRUCT_ALIGNMENT_3_0_8(s) sizeof(void*)
|
||||
#endif
|
||||
enum __Pyx_ImportType_CheckSize_3_0_5 {
|
||||
__Pyx_ImportType_CheckSize_Error_3_0_5 = 0,
|
||||
__Pyx_ImportType_CheckSize_Warn_3_0_5 = 1,
|
||||
__Pyx_ImportType_CheckSize_Ignore_3_0_5 = 2
|
||||
enum __Pyx_ImportType_CheckSize_3_0_8 {
|
||||
__Pyx_ImportType_CheckSize_Error_3_0_8 = 0,
|
||||
__Pyx_ImportType_CheckSize_Warn_3_0_8 = 1,
|
||||
__Pyx_ImportType_CheckSize_Ignore_3_0_8 = 2
|
||||
};
|
||||
static PyTypeObject *__Pyx_ImportType_3_0_5(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_5 check_size);
|
||||
static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_8 check_size);
|
||||
#endif
|
||||
|
||||
/* FetchSharedCythonModule.proto */
|
||||
@@ -2997,7 +2998,7 @@ typedef struct {
|
||||
#endif
|
||||
void *defaults;
|
||||
int defaults_pyobjects;
|
||||
size_t defaults_size; // used by FusedFunction for copying defaults
|
||||
size_t defaults_size;
|
||||
int flags;
|
||||
PyObject *defaults_tuple;
|
||||
PyObject *defaults_kwdict;
|
||||
@@ -23071,7 +23072,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":967
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":968
|
||||
* int _import_umath() except -1
|
||||
*
|
||||
* cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<<
|
||||
@@ -23085,7 +23086,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
|
||||
const char *__pyx_filename = NULL;
|
||||
int __pyx_clineno = 0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":968
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":969
|
||||
*
|
||||
* cdef inline void set_array_base(ndarray arr, object base):
|
||||
* Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<<
|
||||
@@ -23094,16 +23095,16 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
|
||||
*/
|
||||
Py_INCREF(__pyx_v_base);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":969
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":970
|
||||
* cdef inline void set_array_base(ndarray arr, object base):
|
||||
* Py_INCREF(base) # important to do this before stealing the reference below!
|
||||
* PyArray_SetBaseObject(arr, base) # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef inline object get_array_base(ndarray arr):
|
||||
*/
|
||||
__pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 969, __pyx_L1_error)
|
||||
__pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 970, __pyx_L1_error)
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":967
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":968
|
||||
* int _import_umath() except -1
|
||||
*
|
||||
* cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<<
|
||||
@@ -23118,7 +23119,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
|
||||
__pyx_L0:;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
|
||||
* PyArray_SetBaseObject(arr, base)
|
||||
*
|
||||
* cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<<
|
||||
@@ -23133,7 +23134,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
int __pyx_t_1;
|
||||
__Pyx_RefNannySetupContext("get_array_base", 1);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
|
||||
*
|
||||
* cdef inline object get_array_base(ndarray arr):
|
||||
* base = PyArray_BASE(arr) # <<<<<<<<<<<<<<
|
||||
@@ -23142,7 +23143,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
*/
|
||||
__pyx_v_base = PyArray_BASE(__pyx_v_arr);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
|
||||
* cdef inline object get_array_base(ndarray arr):
|
||||
* base = PyArray_BASE(arr)
|
||||
* if base is NULL: # <<<<<<<<<<<<<<
|
||||
@@ -23152,7 +23153,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
__pyx_t_1 = (__pyx_v_base == NULL);
|
||||
if (__pyx_t_1) {
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
|
||||
* base = PyArray_BASE(arr)
|
||||
* if base is NULL:
|
||||
* return None # <<<<<<<<<<<<<<
|
||||
@@ -23163,7 +23164,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
__pyx_r = Py_None; __Pyx_INCREF(Py_None);
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
|
||||
* cdef inline object get_array_base(ndarray arr):
|
||||
* base = PyArray_BASE(arr)
|
||||
* if base is NULL: # <<<<<<<<<<<<<<
|
||||
@@ -23172,7 +23173,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
*/
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":976
|
||||
* if base is NULL:
|
||||
* return None
|
||||
* return <object>base # <<<<<<<<<<<<<<
|
||||
@@ -23184,7 +23185,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
__pyx_r = ((PyObject *)__pyx_v_base);
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
|
||||
* PyArray_SetBaseObject(arr, base)
|
||||
*
|
||||
* cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<<
|
||||
@@ -23199,7 +23200,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":979
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
|
||||
* # Versions of the import_* functions which are more suitable for
|
||||
* # Cython code.
|
||||
* cdef inline int import_array() except -1: # <<<<<<<<<<<<<<
|
||||
@@ -23223,7 +23224,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("import_array", 1);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
|
||||
* # Cython code.
|
||||
* cdef inline int import_array() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23239,16 +23240,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
|
||||
__Pyx_XGOTREF(__pyx_t_3);
|
||||
/*try:*/ {
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
|
||||
* cdef inline int import_array() except -1:
|
||||
* try:
|
||||
* __pyx_import_array() # <<<<<<<<<<<<<<
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.multiarray failed to import")
|
||||
*/
|
||||
__pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 981, __pyx_L3_error)
|
||||
__pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 982, __pyx_L3_error)
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
|
||||
* # Cython code.
|
||||
* cdef inline int import_array() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23262,7 +23263,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
|
||||
goto __pyx_L8_try_end;
|
||||
__pyx_L3_error:;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
|
||||
* try:
|
||||
* __pyx_import_array()
|
||||
* except Exception: # <<<<<<<<<<<<<<
|
||||
@@ -23272,27 +23273,27 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
|
||||
__pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));
|
||||
if (__pyx_t_4) {
|
||||
__Pyx_AddTraceback("numpy.import_array", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
||||
if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 982, __pyx_L5_except_error)
|
||||
if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 983, __pyx_L5_except_error)
|
||||
__Pyx_XGOTREF(__pyx_t_5);
|
||||
__Pyx_XGOTREF(__pyx_t_6);
|
||||
__Pyx_XGOTREF(__pyx_t_7);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":984
|
||||
* __pyx_import_array()
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef inline int import_umath() except -1:
|
||||
*/
|
||||
__pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 983, __pyx_L5_except_error)
|
||||
__pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 984, __pyx_L5_except_error)
|
||||
__Pyx_GOTREF(__pyx_t_8);
|
||||
__Pyx_Raise(__pyx_t_8, 0, 0, 0);
|
||||
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
||||
__PYX_ERR(2, 983, __pyx_L5_except_error)
|
||||
__PYX_ERR(2, 984, __pyx_L5_except_error)
|
||||
}
|
||||
goto __pyx_L5_except_error;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
|
||||
* # Cython code.
|
||||
* cdef inline int import_array() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23308,7 +23309,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
|
||||
__pyx_L8_try_end:;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":979
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
|
||||
* # Versions of the import_* functions which are more suitable for
|
||||
* # Cython code.
|
||||
* cdef inline int import_array() except -1: # <<<<<<<<<<<<<<
|
||||
@@ -23331,7 +23332,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
|
||||
* raise ImportError("numpy.core.multiarray failed to import")
|
||||
*
|
||||
* cdef inline int import_umath() except -1: # <<<<<<<<<<<<<<
|
||||
@@ -23355,7 +23356,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("import_umath", 1);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
|
||||
*
|
||||
* cdef inline int import_umath() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23371,16 +23372,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
|
||||
__Pyx_XGOTREF(__pyx_t_3);
|
||||
/*try:*/ {
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
|
||||
* cdef inline int import_umath() except -1:
|
||||
* try:
|
||||
* _import_umath() # <<<<<<<<<<<<<<
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.umath failed to import")
|
||||
*/
|
||||
__pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 987, __pyx_L3_error)
|
||||
__pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 988, __pyx_L3_error)
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
|
||||
*
|
||||
* cdef inline int import_umath() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23394,7 +23395,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
|
||||
goto __pyx_L8_try_end;
|
||||
__pyx_L3_error:;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
|
||||
* try:
|
||||
* _import_umath()
|
||||
* except Exception: # <<<<<<<<<<<<<<
|
||||
@@ -23404,27 +23405,27 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
|
||||
__pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));
|
||||
if (__pyx_t_4) {
|
||||
__Pyx_AddTraceback("numpy.import_umath", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
||||
if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 988, __pyx_L5_except_error)
|
||||
if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 989, __pyx_L5_except_error)
|
||||
__Pyx_XGOTREF(__pyx_t_5);
|
||||
__Pyx_XGOTREF(__pyx_t_6);
|
||||
__Pyx_XGOTREF(__pyx_t_7);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":990
|
||||
* _import_umath()
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1:
|
||||
*/
|
||||
__pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 989, __pyx_L5_except_error)
|
||||
__pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 990, __pyx_L5_except_error)
|
||||
__Pyx_GOTREF(__pyx_t_8);
|
||||
__Pyx_Raise(__pyx_t_8, 0, 0, 0);
|
||||
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
||||
__PYX_ERR(2, 989, __pyx_L5_except_error)
|
||||
__PYX_ERR(2, 990, __pyx_L5_except_error)
|
||||
}
|
||||
goto __pyx_L5_except_error;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
|
||||
*
|
||||
* cdef inline int import_umath() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23440,7 +23441,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
|
||||
__pyx_L8_try_end:;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
|
||||
* raise ImportError("numpy.core.multiarray failed to import")
|
||||
*
|
||||
* cdef inline int import_umath() except -1: # <<<<<<<<<<<<<<
|
||||
@@ -23463,7 +23464,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
|
||||
* raise ImportError("numpy.core.umath failed to import")
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<<
|
||||
@@ -23487,7 +23488,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("import_ufunc", 1);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23503,16 +23504,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
__Pyx_XGOTREF(__pyx_t_3);
|
||||
/*try:*/ {
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
|
||||
* cdef inline int import_ufunc() except -1:
|
||||
* try:
|
||||
* _import_umath() # <<<<<<<<<<<<<<
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.umath failed to import")
|
||||
*/
|
||||
__pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 993, __pyx_L3_error)
|
||||
__pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 994, __pyx_L3_error)
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23526,7 +23527,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
goto __pyx_L8_try_end;
|
||||
__pyx_L3_error:;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
|
||||
* try:
|
||||
* _import_umath()
|
||||
* except Exception: # <<<<<<<<<<<<<<
|
||||
@@ -23536,27 +23537,27 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
__pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));
|
||||
if (__pyx_t_4) {
|
||||
__Pyx_AddTraceback("numpy.import_ufunc", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
||||
if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 994, __pyx_L5_except_error)
|
||||
if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 995, __pyx_L5_except_error)
|
||||
__Pyx_XGOTREF(__pyx_t_5);
|
||||
__Pyx_XGOTREF(__pyx_t_6);
|
||||
__Pyx_XGOTREF(__pyx_t_7);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":996
|
||||
* _import_umath()
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<<
|
||||
*
|
||||
*
|
||||
*/
|
||||
__pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 995, __pyx_L5_except_error)
|
||||
__pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 996, __pyx_L5_except_error)
|
||||
__Pyx_GOTREF(__pyx_t_8);
|
||||
__Pyx_Raise(__pyx_t_8, 0, 0, 0);
|
||||
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
||||
__PYX_ERR(2, 995, __pyx_L5_except_error)
|
||||
__PYX_ERR(2, 996, __pyx_L5_except_error)
|
||||
}
|
||||
goto __pyx_L5_except_error;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1:
|
||||
* try: # <<<<<<<<<<<<<<
|
||||
@@ -23572,7 +23573,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
__pyx_L8_try_end:;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
|
||||
* raise ImportError("numpy.core.umath failed to import")
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<<
|
||||
@@ -23595,7 +23596,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":999
|
||||
*
|
||||
*
|
||||
* cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<<
|
||||
@@ -23606,7 +23607,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
|
||||
static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
|
||||
int __pyx_r;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1010
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1011
|
||||
* bool
|
||||
* """
|
||||
* return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<<
|
||||
@@ -23616,7 +23617,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
|
||||
__pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":999
|
||||
*
|
||||
*
|
||||
* cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<<
|
||||
@@ -23629,7 +23630,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1014
|
||||
*
|
||||
*
|
||||
* cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<<
|
||||
@@ -23640,7 +23641,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
|
||||
static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
|
||||
int __pyx_r;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1025
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1026
|
||||
* bool
|
||||
* """
|
||||
* return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<<
|
||||
@@ -23650,7 +23651,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
|
||||
__pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1014
|
||||
*
|
||||
*
|
||||
* cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<<
|
||||
@@ -23663,7 +23664,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1029
|
||||
*
|
||||
*
|
||||
* cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<<
|
||||
@@ -23674,7 +23675,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
|
||||
static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
|
||||
npy_datetime __pyx_r;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1035
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1036
|
||||
* also needed. That can be found using `get_datetime64_unit`.
|
||||
* """
|
||||
* return (<PyDatetimeScalarObject*>obj).obval # <<<<<<<<<<<<<<
|
||||
@@ -23684,7 +23685,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
|
||||
__pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1029
|
||||
*
|
||||
*
|
||||
* cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<<
|
||||
@@ -23697,7 +23698,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1039
|
||||
*
|
||||
*
|
||||
* cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<<
|
||||
@@ -23708,7 +23709,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
|
||||
static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
|
||||
npy_timedelta __pyx_r;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1042
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1043
|
||||
* returns the int64 value underlying scalar numpy timedelta64 object
|
||||
* """
|
||||
* return (<PyTimedeltaScalarObject*>obj).obval # <<<<<<<<<<<<<<
|
||||
@@ -23718,7 +23719,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
|
||||
__pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1039
|
||||
*
|
||||
*
|
||||
* cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<<
|
||||
@@ -23731,7 +23732,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1046
|
||||
*
|
||||
*
|
||||
* cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<<
|
||||
@@ -23742,7 +23743,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
|
||||
static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
|
||||
NPY_DATETIMEUNIT __pyx_r;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1049
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1050
|
||||
* returns the unit part of the dtype for a numpy datetime64 object.
|
||||
* """
|
||||
* return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base # <<<<<<<<<<<<<<
|
||||
@@ -23750,7 +23751,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
|
||||
__pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1046
|
||||
*
|
||||
*
|
||||
* cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<<
|
||||
@@ -29694,7 +29695,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
|
||||
__pyx_builtin_Ellipsis = __Pyx_GetBuiltinName(__pyx_n_s_Ellipsis); if (!__pyx_builtin_Ellipsis) __PYX_ERR(1, 408, __pyx_L1_error)
|
||||
__pyx_builtin_id = __Pyx_GetBuiltinName(__pyx_n_s_id); if (!__pyx_builtin_id) __PYX_ERR(1, 618, __pyx_L1_error)
|
||||
__pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_n_s_IndexError); if (!__pyx_builtin_IndexError) __PYX_ERR(1, 914, __pyx_L1_error)
|
||||
__pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_n_s_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(2, 983, __pyx_L1_error)
|
||||
__pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_n_s_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(2, 984, __pyx_L1_error)
|
||||
return 0;
|
||||
__pyx_L1_error:;
|
||||
return -1;
|
||||
@@ -29752,25 +29753,25 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
|
||||
__Pyx_GOTREF(__pyx_tuple__10);
|
||||
__Pyx_GIVEREF(__pyx_tuple__10);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":984
|
||||
* __pyx_import_array()
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef inline int import_umath() except -1:
|
||||
*/
|
||||
__pyx_tuple__16 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_multiarray_failed_to); if (unlikely(!__pyx_tuple__16)) __PYX_ERR(2, 983, __pyx_L1_error)
|
||||
__pyx_tuple__16 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_multiarray_failed_to); if (unlikely(!__pyx_tuple__16)) __PYX_ERR(2, 984, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_tuple__16);
|
||||
__Pyx_GIVEREF(__pyx_tuple__16);
|
||||
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
|
||||
/* "../../usr/local/pyenv/versions/3.11.4/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":990
|
||||
* _import_umath()
|
||||
* except Exception:
|
||||
* raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef inline int import_ufunc() except -1:
|
||||
*/
|
||||
__pyx_tuple__17 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_umath_failed_to_impor); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(2, 989, __pyx_L1_error)
|
||||
__pyx_tuple__17 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_umath_failed_to_impor); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(2, 990, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_tuple__17);
|
||||
__Pyx_GIVEREF(__pyx_tuple__17);
|
||||
|
||||
@@ -30510,33 +30511,33 @@ static int __Pyx_modinit_type_import_code(void) {
|
||||
/*--- Type import code ---*/
|
||||
__pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(4, 9, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_5(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type",
|
||||
__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_8(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type",
|
||||
#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000
|
||||
sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyTypeObject),
|
||||
sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyTypeObject),
|
||||
#elif CYTHON_COMPILING_IN_LIMITED_API
|
||||
sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyTypeObject),
|
||||
sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyTypeObject),
|
||||
#else
|
||||
sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyHeapTypeObject),
|
||||
sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyHeapTypeObject),
|
||||
#endif
|
||||
__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(4, 9, __pyx_L1_error)
|
||||
__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(4, 9, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
||||
__pyx_t_1 = PyImport_ImportModule("numpy"); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 202, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
__pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "dtype", sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyArray_Descr),__Pyx_ImportType_CheckSize_Ignore_3_0_5); if (!__pyx_ptype_5numpy_dtype) __PYX_ERR(2, 202, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "flatiter", sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyArrayIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_5); if (!__pyx_ptype_5numpy_flatiter) __PYX_ERR(2, 225, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "broadcast", sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyArrayMultiIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_5); if (!__pyx_ptype_5numpy_broadcast) __PYX_ERR(2, 229, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyArrayObject),__Pyx_ImportType_CheckSize_Ignore_3_0_5); if (!__pyx_ptype_5numpy_ndarray) __PYX_ERR(2, 238, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_generic = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "generic", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_generic) __PYX_ERR(2, 809, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_number = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "number", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_number) __PYX_ERR(2, 811, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_integer = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "integer", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_integer) __PYX_ERR(2, 813, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "signedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_signedinteger) __PYX_ERR(2, 815, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "unsignedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(2, 817, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "inexact", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_inexact) __PYX_ERR(2, 819, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_floating = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "floating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_floating) __PYX_ERR(2, 821, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "complexfloating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_complexfloating) __PYX_ERR(2, 823, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "flexible", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_flexible) __PYX_ERR(2, 825, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_character = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "character", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_5); if (!__pyx_ptype_5numpy_character) __PYX_ERR(2, 827, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_0_5(__pyx_t_1, "numpy", "ufunc", sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_5(PyUFuncObject),__Pyx_ImportType_CheckSize_Ignore_3_0_5); if (!__pyx_ptype_5numpy_ufunc) __PYX_ERR(2, 865, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "dtype", sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArray_Descr),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_dtype) __PYX_ERR(2, 202, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "flatiter", sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_flatiter) __PYX_ERR(2, 225, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "broadcast", sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayMultiIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_broadcast) __PYX_ERR(2, 229, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_ndarray) __PYX_ERR(2, 238, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_generic = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "generic", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_generic) __PYX_ERR(2, 809, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_number = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "number", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_number) __PYX_ERR(2, 811, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_integer = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "integer", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_integer) __PYX_ERR(2, 813, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "signedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_signedinteger) __PYX_ERR(2, 815, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "unsignedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(2, 817, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "inexact", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_inexact) __PYX_ERR(2, 819, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_floating = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "floating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_floating) __PYX_ERR(2, 821, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "complexfloating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_complexfloating) __PYX_ERR(2, 823, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "flexible", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_flexible) __PYX_ERR(2, 825, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_character = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "character", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_character) __PYX_ERR(2, 827, __pyx_L1_error)
|
||||
__pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "ufunc", sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyUFuncObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_ufunc) __PYX_ERR(2, 866, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
||||
__Pyx_RefNannyFinishContext();
|
||||
return 0;
|
||||
@@ -30758,7 +30759,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_visionipc_pyx(PyObject *__pyx_pyin
|
||||
__pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
{
|
||||
int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to visionipc_pyx pseudovariable */
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to "visionipc_pyx" pseudovariable */
|
||||
if (unlikely((add_module_result < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
pystate_addmodule_run = 1;
|
||||
}
|
||||
@@ -32787,14 +32788,14 @@ static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyO
|
||||
{
|
||||
int eq = __Pyx_PyUnicode_Equals(s, PyTuple_GET_ITEM(kwnames, i), Py_EQ);
|
||||
if (unlikely(eq != 0)) {
|
||||
if (unlikely(eq < 0)) return NULL; // error
|
||||
if (unlikely(eq < 0)) return NULL;
|
||||
return kwvalues[i];
|
||||
}
|
||||
}
|
||||
return NULL; // not found (no exception set)
|
||||
return NULL;
|
||||
}
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
Py_ssize_t i, nkwargs = PyTuple_GET_SIZE(kwnames);
|
||||
PyObject *dict;
|
||||
dict = PyDict_New();
|
||||
@@ -32904,7 +32905,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (*name) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_INCREF(value); // transfer ownership of value to values
|
||||
Py_INCREF(value);
|
||||
Py_DECREF(key);
|
||||
#endif
|
||||
key = NULL;
|
||||
@@ -32923,7 +32924,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
&& _PyString_Eq(**name, key)) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -32955,7 +32956,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (cmp == 0) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -33362,7 +33363,7 @@ static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i,
|
||||
}
|
||||
}
|
||||
#else
|
||||
if (is_list || PySequence_Check(o)) {
|
||||
if (is_list || !PyMapping_Check(o)) {
|
||||
return PySequence_GetItem(o, i);
|
||||
}
|
||||
#endif
|
||||
@@ -34838,11 +34839,7 @@ static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObje
|
||||
}
|
||||
}
|
||||
#else
|
||||
#if CYTHON_COMPILING_IN_PYPY
|
||||
if (is_list || (PySequence_Check(o) && !PyDict_Check(o)))
|
||||
#else
|
||||
if (is_list || PySequence_Check(o))
|
||||
#endif
|
||||
if (is_list || !PyMapping_Check(o))
|
||||
{
|
||||
return PySequence_SetItem(o, i, v);
|
||||
}
|
||||
@@ -35308,38 +35305,38 @@ static int __Pyx_validate_bases_tuple(const char *type_name, Py_ssize_t dictoffs
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#if !CYTHON_USE_TYPE_SLOTS
|
||||
if (dictoffset == 0) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%s.200s': "
|
||||
"unable to validate whether bases have a __dict__ "
|
||||
"when CYTHON_USE_TYPE_SLOTS is off "
|
||||
"(likely because you are building in the limited API). "
|
||||
"Therefore, all extension types with multiple bases "
|
||||
"must add 'cdef dict __dict__' in this compilation mode",
|
||||
type_name);
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
if (dictoffset == 0 && b->tp_dictoffset)
|
||||
if (dictoffset == 0)
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
Py_ssize_t b_dictoffset = 0;
|
||||
#if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
|
||||
b_dictoffset = b->tp_dictoffset;
|
||||
#else
|
||||
PyObject *py_b_dictoffset = PyObject_GetAttrString((PyObject*)b, "__dictoffset__");
|
||||
if (!py_b_dictoffset) goto dictoffset_return;
|
||||
b_dictoffset = PyLong_AsSsize_t(py_b_dictoffset);
|
||||
Py_DECREF(py_b_dictoffset);
|
||||
if (b_dictoffset == -1 && PyErr_Occurred()) goto dictoffset_return;
|
||||
#endif
|
||||
if (b_dictoffset) {
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
}
|
||||
#if !(CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY)
|
||||
dictoffset_return:
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
@@ -35633,10 +35630,10 @@ __PYX_GOOD:
|
||||
#endif
|
||||
|
||||
/* TypeImport */
|
||||
#ifndef __PYX_HAVE_RT_ImportType_3_0_5
|
||||
#define __PYX_HAVE_RT_ImportType_3_0_5
|
||||
static PyTypeObject *__Pyx_ImportType_3_0_5(PyObject *module, const char *module_name, const char *class_name,
|
||||
size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_5 check_size)
|
||||
#ifndef __PYX_HAVE_RT_ImportType_3_0_8
|
||||
#define __PYX_HAVE_RT_ImportType_3_0_8
|
||||
static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject *module, const char *module_name, const char *class_name,
|
||||
size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_8 check_size)
|
||||
{
|
||||
PyObject *result = 0;
|
||||
char warning[200];
|
||||
@@ -35690,7 +35687,7 @@ static PyTypeObject *__Pyx_ImportType_3_0_5(PyObject *module, const char *module
|
||||
module_name, class_name, size, basicsize+itemsize);
|
||||
goto bad;
|
||||
}
|
||||
if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_5 &&
|
||||
if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_8 &&
|
||||
((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
"%.200s.%.200s size changed, may indicate binary incompatibility. "
|
||||
@@ -35698,7 +35695,7 @@ static PyTypeObject *__Pyx_ImportType_3_0_5(PyObject *module, const char *module
|
||||
module_name, class_name, size, basicsize, basicsize+itemsize);
|
||||
goto bad;
|
||||
}
|
||||
else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_5 && (size_t)basicsize > size) {
|
||||
else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_8 && (size_t)basicsize > size) {
|
||||
PyOS_snprintf(warning, sizeof(warning),
|
||||
"%s.%s size changed, may indicate binary incompatibility. "
|
||||
"Expected %zd from C header, got %zd from PyObject",
|
||||
@@ -37260,9 +37257,10 @@ static PyObject* __Pyx_Globals(void) {
|
||||
|
||||
/* UnpackUnboundCMethod */
|
||||
static PyObject *__Pyx_SelflessCall(PyObject *method, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *result;
|
||||
PyObject *selfless_args = PyTuple_GetSlice(args, 1, PyTuple_Size(args));
|
||||
if (unlikely(!selfless_args)) return NULL;
|
||||
PyObject *result = PyObject_Call(method, selfless_args, kwargs);
|
||||
result = PyObject_Call(method, selfless_args, kwargs);
|
||||
Py_DECREF(selfless_args);
|
||||
return result;
|
||||
}
|
||||
@@ -37748,7 +37746,7 @@ static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
|
||||
#else
|
||||
py_code = PyCode_NewEmpty(filename, funcname, py_line);
|
||||
#endif
|
||||
Py_XDECREF(py_funcname); // XDECREF since it's only set on Py3 if cline
|
||||
Py_XDECREF(py_funcname);
|
||||
return py_code;
|
||||
bad:
|
||||
Py_XDECREF(py_funcname);
|
||||
|
||||
Binary file not shown.
@@ -6,10 +6,10 @@
|
||||
#include <map>
|
||||
|
||||
#include "cereal/messaging/messaging.h"
|
||||
#include "cereal/visionipc/visionipc.h"
|
||||
#include "cereal/visionipc/visionbuf.h"
|
||||
|
||||
std::string get_endpoint_name(std::string name, VisionStreamType type);
|
||||
std::string get_ipc_path(const std::string &name);
|
||||
|
||||
class VisionIpcServer {
|
||||
private:
|
||||
|
||||
+1
-48
@@ -1,55 +1,8 @@
|
||||
import os
|
||||
import sys
|
||||
import fcntl
|
||||
import hashlib
|
||||
import platform
|
||||
from cffi import FFI
|
||||
|
||||
|
||||
def suffix():
|
||||
if platform.system() == "Darwin":
|
||||
return ".dylib"
|
||||
else:
|
||||
return ".so"
|
||||
|
||||
def ffi_wrap(name, c_code, c_header, tmpdir="/tmp/ccache", cflags="", libraries=None):
|
||||
if libraries is None:
|
||||
libraries = []
|
||||
|
||||
cache = name + "_" + hashlib.sha1(c_code.encode('utf-8')).hexdigest()
|
||||
try:
|
||||
os.mkdir(tmpdir)
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
fd = os.open(tmpdir, 0)
|
||||
fcntl.flock(fd, fcntl.LOCK_EX)
|
||||
try:
|
||||
sys.path.append(tmpdir)
|
||||
try:
|
||||
mod = __import__(cache)
|
||||
except Exception:
|
||||
print(f"cache miss {cache}")
|
||||
compile_code(cache, c_code, c_header, tmpdir, cflags, libraries)
|
||||
mod = __import__(cache)
|
||||
finally:
|
||||
os.close(fd)
|
||||
|
||||
return mod.ffi, mod.lib
|
||||
|
||||
|
||||
def compile_code(name, c_code, c_header, directory, cflags="", libraries=None):
|
||||
if libraries is None:
|
||||
libraries = []
|
||||
|
||||
ffibuilder = FFI()
|
||||
ffibuilder.set_source(name, c_code, source_extension='.cpp', libraries=libraries)
|
||||
ffibuilder.cdef(c_header)
|
||||
os.environ['OPT'] = "-fwrapv -O2 -DNDEBUG -std=c++1z"
|
||||
os.environ['CFLAGS'] = cflags
|
||||
ffibuilder.compile(verbose=True, debug=False, tmpdir=directory)
|
||||
|
||||
|
||||
def wrap_compiled(name, directory):
|
||||
sys.path.append(directory)
|
||||
mod = __import__(name)
|
||||
return mod.ffi, mod.lib
|
||||
|
||||
+13
-64
@@ -1,50 +1,7 @@
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
from atomicwrites import AtomicWriter
|
||||
|
||||
|
||||
def rm_not_exists_ok(path):
|
||||
try:
|
||||
os.remove(path)
|
||||
except OSError:
|
||||
if os.path.exists(path):
|
||||
raise
|
||||
|
||||
|
||||
def rm_tree_or_link(path):
|
||||
if os.path.islink(path):
|
||||
os.unlink(path)
|
||||
elif os.path.isdir(path):
|
||||
shutil.rmtree(path)
|
||||
|
||||
|
||||
def get_tmpdir_on_same_filesystem(path):
|
||||
normpath = os.path.normpath(path)
|
||||
parts = normpath.split("/")
|
||||
if len(parts) > 1 and parts[1] == "scratch":
|
||||
return "/scratch/tmp"
|
||||
elif len(parts) > 2 and parts[2] == "runner":
|
||||
return f"/{parts[1]}/runner/tmp"
|
||||
return "/tmp"
|
||||
|
||||
|
||||
class NamedTemporaryDir():
|
||||
def __init__(self, temp_dir=None):
|
||||
self._path = tempfile.mkdtemp(dir=temp_dir)
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self._path
|
||||
|
||||
def close(self):
|
||||
shutil.rmtree(self._path)
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc_value, traceback):
|
||||
self.close()
|
||||
import contextlib
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class CallbackReader:
|
||||
@@ -66,24 +23,16 @@ class CallbackReader:
|
||||
return chunk
|
||||
|
||||
|
||||
def _get_fileobject_func(writer, temp_dir):
|
||||
def _get_fileobject():
|
||||
return writer.get_fileobject(dir=temp_dir)
|
||||
return _get_fileobject
|
||||
@contextlib.contextmanager
|
||||
def atomic_write_in_dir(path: str, mode: str = 'w', buffering: int = -1, encoding: Optional[str] = None, newline: Optional[str] = None,
|
||||
overwrite: bool = False):
|
||||
"""Write to a file atomically using a temporary file in the same directory as the destination file."""
|
||||
dir_name = os.path.dirname(path)
|
||||
|
||||
def atomic_write_on_fs_tmp(path, **kwargs):
|
||||
"""Creates an atomic writer using a temporary file in a temporary directory
|
||||
on the same filesystem as path.
|
||||
"""
|
||||
# TODO(mgraczyk): This use of AtomicWriter relies on implementation details to set the temp
|
||||
# directory.
|
||||
writer = AtomicWriter(path, **kwargs)
|
||||
return writer._open(_get_fileobject_func(writer, get_tmpdir_on_same_filesystem(path)))
|
||||
if not overwrite and os.path.exists(path):
|
||||
raise FileExistsError(f"File '{path}' already exists. To overwrite it, set 'overwrite' to True.")
|
||||
|
||||
|
||||
def atomic_write_in_dir(path, **kwargs):
|
||||
"""Creates an atomic writer using a temporary file in the same directory
|
||||
as the destination file.
|
||||
"""
|
||||
writer = AtomicWriter(path, **kwargs)
|
||||
return writer._open(_get_fileobject_func(writer, os.path.dirname(path)))
|
||||
with tempfile.NamedTemporaryFile(mode=mode, buffering=buffering, encoding=encoding, newline=newline, dir=dir_name, delete=False) as tmp_file:
|
||||
yield tmp_file
|
||||
tmp_file_name = tmp_file.name
|
||||
os.replace(tmp_file_name, path)
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
simple_kalman_impl.c
|
||||
@@ -1,12 +0,0 @@
|
||||
from openpilot.common.kalman.simple_kalman_impl import KF1D as KF1D
|
||||
assert KF1D
|
||||
import numpy as np
|
||||
|
||||
def get_kalman_gain(dt, A, C, Q, R, iterations=100):
|
||||
P = np.zeros_like(Q)
|
||||
for _ in range(iterations):
|
||||
P = A.dot(P).dot(A.T) + dt * Q
|
||||
S = C.dot(P).dot(C.T) + R
|
||||
K = P.dot(C.T).dot(np.linalg.inv(S))
|
||||
P = (np.eye(len(P)) - K.dot(C)).dot(P)
|
||||
return K
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,18 +0,0 @@
|
||||
# cython: language_level = 3
|
||||
|
||||
cdef class KF1D:
|
||||
cdef public:
|
||||
double x0_0
|
||||
double x1_0
|
||||
double K0_0
|
||||
double K1_0
|
||||
double A0_0
|
||||
double A0_1
|
||||
double A1_0
|
||||
double A1_1
|
||||
double C0_0
|
||||
double C0_1
|
||||
double A_K_0
|
||||
double A_K_1
|
||||
double A_K_2
|
||||
double A_K_3
|
||||
@@ -1,37 +0,0 @@
|
||||
# distutils: language = c++
|
||||
# cython: language_level=3
|
||||
|
||||
cdef class KF1D:
|
||||
def __init__(self, x0, A, C, K):
|
||||
self.x0_0 = x0[0][0]
|
||||
self.x1_0 = x0[1][0]
|
||||
self.A0_0 = A[0][0]
|
||||
self.A0_1 = A[0][1]
|
||||
self.A1_0 = A[1][0]
|
||||
self.A1_1 = A[1][1]
|
||||
self.C0_0 = C[0]
|
||||
self.C0_1 = C[1]
|
||||
self.K0_0 = K[0][0]
|
||||
self.K1_0 = K[1][0]
|
||||
|
||||
self.A_K_0 = self.A0_0 - self.K0_0 * self.C0_0
|
||||
self.A_K_1 = self.A0_1 - self.K0_0 * self.C0_1
|
||||
self.A_K_2 = self.A1_0 - self.K1_0 * self.C0_0
|
||||
self.A_K_3 = self.A1_1 - self.K1_0 * self.C0_1
|
||||
|
||||
def update(self, meas):
|
||||
cdef double x0_0 = self.A_K_0 * self.x0_0 + self.A_K_1 * self.x1_0 + self.K0_0 * meas
|
||||
cdef double x1_0 = self.A_K_2 * self.x0_0 + self.A_K_3 * self.x1_0 + self.K1_0 * meas
|
||||
self.x0_0 = x0_0
|
||||
self.x1_0 = x1_0
|
||||
|
||||
return [self.x0_0, self.x1_0]
|
||||
|
||||
@property
|
||||
def x(self):
|
||||
return [[self.x0_0], [self.x1_0]]
|
||||
|
||||
@x.setter
|
||||
def x(self, x):
|
||||
self.x0_0 = x[0][0]
|
||||
self.x1_0 = x[1][0]
|
||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
||||
import numpy as np
|
||||
|
||||
|
||||
class KF1D:
|
||||
# this EKF assumes constant covariance matrix, so calculations are much simpler
|
||||
# the Kalman gain also needs to be precomputed using the control module
|
||||
|
||||
def __init__(self, x0, A, C, K):
|
||||
self.x = x0
|
||||
self.A = A
|
||||
self.C = np.atleast_2d(C)
|
||||
self.K = K
|
||||
|
||||
self.A_K = self.A - np.dot(self.K, self.C)
|
||||
|
||||
# K matrix needs to be pre-computed as follow:
|
||||
# import control
|
||||
# (x, l, K) = control.dare(np.transpose(self.A), np.transpose(self.C), Q, R)
|
||||
# self.K = np.transpose(K)
|
||||
|
||||
def update(self, meas):
|
||||
self.x = np.dot(self.A_K, self.x) + np.dot(self.K, meas)
|
||||
return self.x
|
||||
@@ -1,87 +0,0 @@
|
||||
import unittest
|
||||
import random
|
||||
import timeit
|
||||
import numpy as np
|
||||
|
||||
from openpilot.common.kalman.simple_kalman import KF1D
|
||||
from openpilot.common.kalman.simple_kalman_old import KF1D as KF1D_old
|
||||
|
||||
|
||||
class TestSimpleKalman(unittest.TestCase):
|
||||
def setUp(self):
|
||||
dt = 0.01
|
||||
x0_0 = 0.0
|
||||
x1_0 = 0.0
|
||||
A0_0 = 1.0
|
||||
A0_1 = dt
|
||||
A1_0 = 0.0
|
||||
A1_1 = 1.0
|
||||
C0_0 = 1.0
|
||||
C0_1 = 0.0
|
||||
K0_0 = 0.12287673
|
||||
K1_0 = 0.29666309
|
||||
|
||||
self.kf_old = KF1D_old(x0=np.array([[x0_0], [x1_0]]),
|
||||
A=np.array([[A0_0, A0_1], [A1_0, A1_1]]),
|
||||
C=np.array([C0_0, C0_1]),
|
||||
K=np.array([[K0_0], [K1_0]]))
|
||||
|
||||
self.kf = KF1D(x0=[[x0_0], [x1_0]],
|
||||
A=[[A0_0, A0_1], [A1_0, A1_1]],
|
||||
C=[C0_0, C0_1],
|
||||
K=[[K0_0], [K1_0]])
|
||||
|
||||
def test_getter_setter(self):
|
||||
self.kf.x = [[1.0], [1.0]]
|
||||
self.assertEqual(self.kf.x, [[1.0], [1.0]])
|
||||
|
||||
def update_returns_state(self):
|
||||
x = self.kf.update(100)
|
||||
self.assertEqual(x, self.kf.x)
|
||||
|
||||
def test_old_equal_new(self):
|
||||
for _ in range(1000):
|
||||
v_wheel = random.uniform(0, 200)
|
||||
|
||||
x_old = self.kf_old.update(v_wheel)
|
||||
x = self.kf.update(v_wheel)
|
||||
|
||||
# Compare the output x, verify that the error is less than 1e-4
|
||||
np.testing.assert_almost_equal(x_old[0], x[0])
|
||||
np.testing.assert_almost_equal(x_old[1], x[1])
|
||||
|
||||
def test_new_is_faster(self):
|
||||
setup = """
|
||||
import numpy as np
|
||||
|
||||
from openpilot.common.kalman.simple_kalman import KF1D
|
||||
from openpilot.common.kalman.simple_kalman_old import KF1D as KF1D_old
|
||||
|
||||
dt = 0.01
|
||||
x0_0 = 0.0
|
||||
x1_0 = 0.0
|
||||
A0_0 = 1.0
|
||||
A0_1 = dt
|
||||
A1_0 = 0.0
|
||||
A1_1 = 1.0
|
||||
C0_0 = 1.0
|
||||
C0_1 = 0.0
|
||||
K0_0 = 0.12287673
|
||||
K1_0 = 0.29666309
|
||||
|
||||
kf_old = KF1D_old(x0=np.array([[x0_0], [x1_0]]),
|
||||
A=np.array([[A0_0, A0_1], [A1_0, A1_1]]),
|
||||
C=np.array([C0_0, C0_1]),
|
||||
K=np.array([[K0_0], [K1_0]]))
|
||||
|
||||
kf = KF1D(x0=[[x0_0], [x1_0]],
|
||||
A=[[A0_0, A0_1], [A1_0, A1_1]],
|
||||
C=[C0_0, C0_1],
|
||||
K=[[K0_0], [K1_0]])
|
||||
"""
|
||||
kf_speed = timeit.timeit("kf.update(1234)", setup=setup, number=10000)
|
||||
kf_old_speed = timeit.timeit("kf_old.update(1234)", setup=setup, number=10000)
|
||||
self.assertTrue(kf_speed < kf_old_speed / 4)
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -1,12 +0,0 @@
|
||||
class lazy_property():
|
||||
"""Defines a property whose value will be computed only once and as needed.
|
||||
|
||||
This can only be used on instance methods.
|
||||
"""
|
||||
def __init__(self, func):
|
||||
self._func = func
|
||||
|
||||
def __get__(self, obj_self, cls):
|
||||
value = self._func(obj_self)
|
||||
setattr(obj_self, self._func.__name__, value)
|
||||
return value
|
||||
@@ -65,7 +65,7 @@ class SwagFormatter(logging.Formatter):
|
||||
|
||||
return record_dict
|
||||
|
||||
def format(self, record): # noqa: A003
|
||||
def format(self, record):
|
||||
if self.swaglogger is None:
|
||||
raise Exception("must set swaglogger before calling format()")
|
||||
return json_robust_dumps(self.format_dict(record))
|
||||
@@ -95,7 +95,7 @@ class SwagLogFileFormatter(SwagFormatter):
|
||||
k += "$a"
|
||||
return k, v
|
||||
|
||||
def format(self, record): # noqa: A003
|
||||
def format(self, record):
|
||||
if isinstance(record, str):
|
||||
v = json.loads(record)
|
||||
else:
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
import numpy as np
|
||||
|
||||
|
||||
def deep_interp_np(x, xp, fp, axis=None):
|
||||
if axis is not None:
|
||||
fp = fp.swapaxes(0,axis)
|
||||
x = np.atleast_1d(x)
|
||||
xp = np.array(xp)
|
||||
if len(xp) < 2:
|
||||
return np.repeat(fp, len(x), axis=0)
|
||||
if min(np.diff(xp)) < 0:
|
||||
raise RuntimeError('Bad x array for interpolation')
|
||||
j = np.searchsorted(xp, x) - 1
|
||||
j = np.clip(j, 0, len(xp)-2)
|
||||
d = np.divide(x - xp[j], xp[j + 1] - xp[j], out=np.ones_like(x, dtype=np.float64), where=xp[j + 1] - xp[j] != 0)
|
||||
vals_interp = (fp[j].T*(1 - d)).T + (fp[j + 1].T*d).T
|
||||
if axis is not None:
|
||||
vals_interp = vals_interp.swapaxes(0,axis)
|
||||
if len(vals_interp) == 1:
|
||||
return vals_interp[0]
|
||||
else:
|
||||
return vals_interp
|
||||
+67
-65
@@ -1,4 +1,4 @@
|
||||
/* Generated by Cython 3.0.5 */
|
||||
/* Generated by Cython 3.0.8 */
|
||||
|
||||
/* BEGIN: Cython Metadata
|
||||
{
|
||||
@@ -40,10 +40,10 @@ END: Cython Metadata */
|
||||
#else
|
||||
#define __PYX_EXTRA_ABI_MODULE_NAME ""
|
||||
#endif
|
||||
#define CYTHON_ABI "3_0_5" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
|
||||
#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
|
||||
#define CYTHON_HEX_VERSION 0x030005F0
|
||||
#define CYTHON_HEX_VERSION 0x030008F0
|
||||
#define CYTHON_FUTURE_DIVISION 1
|
||||
#include <stddef.h>
|
||||
#ifndef offsetof
|
||||
@@ -257,7 +257,7 @@ END: Cython Metadata */
|
||||
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
|
||||
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
|
||||
#endif
|
||||
#elif defined(PY_NOGIL)
|
||||
#elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
|
||||
#define CYTHON_COMPILING_IN_PYPY 0
|
||||
#define CYTHON_COMPILING_IN_CPYTHON 0
|
||||
#define CYTHON_COMPILING_IN_LIMITED_API 0
|
||||
@@ -601,18 +601,19 @@ class __Pyx_FakeReference {
|
||||
PyObject *exception_table = NULL;
|
||||
PyObject *types_module=NULL, *code_type=NULL, *result=NULL;
|
||||
#if __PYX_LIMITED_VERSION_HEX < 0x030B0000
|
||||
PyObject *version_info; // borrowed
|
||||
#endif
|
||||
PyObject *version_info;
|
||||
PyObject *py_minor_version = NULL;
|
||||
#endif
|
||||
long minor_version = 0;
|
||||
PyObject *type, *value, *traceback;
|
||||
PyErr_Fetch(&type, &value, &traceback);
|
||||
#if __PYX_LIMITED_VERSION_HEX >= 0x030B0000
|
||||
minor_version = 11; // we don't yet need to distinguish between versions > 11
|
||||
minor_version = 11;
|
||||
#else
|
||||
if (!(version_info = PySys_GetObject("version_info"))) goto end;
|
||||
if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end;
|
||||
minor_version = PyLong_AsLong(py_minor_version);
|
||||
Py_DECREF(py_minor_version);
|
||||
if (minor_version == -1 && PyErr_Occurred()) goto end;
|
||||
#endif
|
||||
if (!(types_module = PyImport_ImportModule("types"))) goto end;
|
||||
@@ -633,7 +634,6 @@ class __Pyx_FakeReference {
|
||||
Py_XDECREF(code_type);
|
||||
Py_XDECREF(exception_table);
|
||||
Py_XDECREF(types_module);
|
||||
Py_XDECREF(py_minor_version);
|
||||
if (type) {
|
||||
PyErr_Restore(type, value, traceback);
|
||||
}
|
||||
@@ -666,7 +666,7 @@ class __Pyx_FakeReference {
|
||||
PyObject *fv, PyObject *cell, PyObject* fn,
|
||||
PyObject *name, int fline, PyObject *lnos) {
|
||||
PyCodeObject *result;
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0); // we don't have access to __pyx_empty_bytes here
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);
|
||||
if (!empty_bytes) return NULL;
|
||||
result =
|
||||
#if PY_VERSION_HEX >= 0x030C0000
|
||||
@@ -961,7 +961,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
|
||||
#endif
|
||||
#if CYTHON_USE_TYPE_SPECS && PY_VERSION_HEX >= 0x03080000
|
||||
#define __Pyx_PyHeapTypeObject_GC_Del(obj) {\
|
||||
PyTypeObject *type = Py_TYPE(obj);\
|
||||
PyTypeObject *type = Py_TYPE((PyObject*)obj);\
|
||||
assert(__Pyx_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE));\
|
||||
PyObject_GC_Del(obj);\
|
||||
Py_DECREF(type);\
|
||||
@@ -1366,7 +1366,7 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
|
||||
#endif
|
||||
typedef Py_ssize_t __Pyx_compact_pylong;
|
||||
typedef size_t __Pyx_compact_upylong;
|
||||
#else // Py < 3.12
|
||||
#else
|
||||
#define __Pyx_PyLong_IsNeg(x) (Py_SIZE(x) < 0)
|
||||
#define __Pyx_PyLong_IsNonNeg(x) (Py_SIZE(x) >= 0)
|
||||
#define __Pyx_PyLong_IsZero(x) (Py_SIZE(x) == 0)
|
||||
@@ -1804,8 +1804,8 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) __Pyx_NewRef(arg)
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) Py_XDECREF(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg // no-op
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) // no-op - arg is borrowed
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg)
|
||||
#endif
|
||||
#define __Pyx_NumKwargs_VARARGS(kwds) PyDict_Size(kwds)
|
||||
#define __Pyx_KwValues_VARARGS(args, nargs) NULL
|
||||
@@ -1817,12 +1817,13 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
|
||||
static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
#else
|
||||
#define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
|
||||
#endif
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg // no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg) // no-op - arg was returned from array
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg /* no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
to have the same reference counting */
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_FASTCALL __Pyx_Arg_VARARGS
|
||||
#define __Pyx_NumKwargs_FASTCALL __Pyx_NumKwargs_VARARGS
|
||||
@@ -2102,7 +2103,7 @@ typedef struct {
|
||||
#endif
|
||||
void *defaults;
|
||||
int defaults_pyobjects;
|
||||
size_t defaults_size; // used by FusedFunction for copying defaults
|
||||
size_t defaults_size;
|
||||
int flags;
|
||||
PyObject *defaults_tuple;
|
||||
PyObject *defaults_kwdict;
|
||||
@@ -2367,7 +2368,7 @@ static PyObject *__Pyx_OrderedDict = 0;
|
||||
static PyObject *__Pyx_EnumBase = 0;
|
||||
static PyObject *__Pyx_FlagBase = 0;
|
||||
static PyObject *__Pyx_globals = 0;
|
||||
static PyObject *__Pyx_Enum_ParamKeyType_to_py(enum ParamKeyType); /*proto*/
|
||||
static PyObject *__Pyx_Enum_enum__space_ParamKeyType_to_py(enum ParamKeyType); /*proto*/
|
||||
static std::string __pyx_convert_string_from_py_std__in_string(PyObject *); /*proto*/
|
||||
static CYTHON_INLINE PyObject *__pyx_convert_PyObject_string_to_py_std__in_string(std::string const &); /*proto*/
|
||||
static CYTHON_INLINE PyObject *__pyx_convert_PyUnicode_string_to_py_std__in_string(std::string const &); /*proto*/
|
||||
@@ -3451,13 +3452,13 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
|
||||
|
||||
/* "EnumTypeToPy":132
|
||||
*
|
||||
* @cname("__Pyx_Enum_ParamKeyType_to_py")
|
||||
* cdef __Pyx_Enum_ParamKeyType_to_py(ParamKeyType c_val): # <<<<<<<<<<<<<<
|
||||
* @cname("__Pyx_Enum_enum__space_ParamKeyType_to_py")
|
||||
* cdef __Pyx_Enum_enum__space_ParamKeyType_to_py(ParamKeyType c_val): # <<<<<<<<<<<<<<
|
||||
* cdef object __pyx_enum
|
||||
*
|
||||
*/
|
||||
|
||||
static PyObject *__Pyx_Enum_ParamKeyType_to_py(enum ParamKeyType __pyx_v_c_val) {
|
||||
static PyObject *__Pyx_Enum_enum__space_ParamKeyType_to_py(enum ParamKeyType __pyx_v_c_val) {
|
||||
PyObject *__pyx_v___pyx_enum = 0;
|
||||
int __pyx_v_underlying_c_val;
|
||||
PyObject *__pyx_r = NULL;
|
||||
@@ -3471,7 +3472,7 @@ static PyObject *__Pyx_Enum_ParamKeyType_to_py(enum ParamKeyType __pyx_v_c_val)
|
||||
int __pyx_lineno = 0;
|
||||
const char *__pyx_filename = NULL;
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("__Pyx_Enum_ParamKeyType_to_py", 1);
|
||||
__Pyx_RefNannySetupContext("__Pyx_Enum_enum__space_ParamKeyType_to_py", 1);
|
||||
|
||||
/* "EnumTypeToPy":137
|
||||
*
|
||||
@@ -3733,8 +3734,8 @@ static PyObject *__Pyx_Enum_ParamKeyType_to_py(enum ParamKeyType __pyx_v_c_val)
|
||||
|
||||
/* "EnumTypeToPy":132
|
||||
*
|
||||
* @cname("__Pyx_Enum_ParamKeyType_to_py")
|
||||
* cdef __Pyx_Enum_ParamKeyType_to_py(ParamKeyType c_val): # <<<<<<<<<<<<<<
|
||||
* @cname("__Pyx_Enum_enum__space_ParamKeyType_to_py")
|
||||
* cdef __Pyx_Enum_enum__space_ParamKeyType_to_py(ParamKeyType c_val): # <<<<<<<<<<<<<<
|
||||
* cdef object __pyx_enum
|
||||
*
|
||||
*/
|
||||
@@ -3745,7 +3746,7 @@ static PyObject *__Pyx_Enum_ParamKeyType_to_py(enum ParamKeyType __pyx_v_c_val)
|
||||
__Pyx_XDECREF(__pyx_t_3);
|
||||
__Pyx_XDECREF(__pyx_t_4);
|
||||
__Pyx_XDECREF(__pyx_t_5);
|
||||
__Pyx_AddTraceback("EnumTypeToPy.__Pyx_Enum_ParamKeyType_to_py", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
||||
__Pyx_AddTraceback("EnumTypeToPy.__Pyx_Enum_enum__space_ParamKeyType_to_py", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
||||
__pyx_r = 0;
|
||||
__pyx_L0:;
|
||||
__Pyx_XDECREF(__pyx_v___pyx_enum);
|
||||
@@ -11158,7 +11159,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_params_pyx(PyObject *__pyx_pyinit_
|
||||
__pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
{
|
||||
int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to params_pyx pseudovariable */
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to "params_pyx" pseudovariable */
|
||||
if (unlikely((add_module_result < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
pystate_addmodule_run = 1;
|
||||
}
|
||||
@@ -12205,12 +12206,12 @@ if (!__Pyx_RefNanny) {
|
||||
* self.p.clearAll(tx_type)
|
||||
*
|
||||
*/
|
||||
__pyx_t_9 = __Pyx_Enum_ParamKeyType_to_py(ALL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__pyx_t_9 = __Pyx_Enum_enum__space_ParamKeyType_to_py(ALL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_9);
|
||||
__pyx_k__4 = __pyx_t_9;
|
||||
__Pyx_GIVEREF(__pyx_t_9);
|
||||
__pyx_t_9 = 0;
|
||||
__pyx_t_9 = __Pyx_Enum_ParamKeyType_to_py(ALL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__pyx_t_9 = __Pyx_Enum_enum__space_ParamKeyType_to_py(ALL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_9);
|
||||
__pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_7);
|
||||
@@ -13140,14 +13141,14 @@ static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyO
|
||||
{
|
||||
int eq = __Pyx_PyUnicode_Equals(s, PyTuple_GET_ITEM(kwnames, i), Py_EQ);
|
||||
if (unlikely(eq != 0)) {
|
||||
if (unlikely(eq < 0)) return NULL; // error
|
||||
if (unlikely(eq < 0)) return NULL;
|
||||
return kwvalues[i];
|
||||
}
|
||||
}
|
||||
return NULL; // not found (no exception set)
|
||||
return NULL;
|
||||
}
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
Py_ssize_t i, nkwargs = PyTuple_GET_SIZE(kwnames);
|
||||
PyObject *dict;
|
||||
dict = PyDict_New();
|
||||
@@ -13257,7 +13258,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (*name) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_INCREF(value); // transfer ownership of value to values
|
||||
Py_INCREF(value);
|
||||
Py_DECREF(key);
|
||||
#endif
|
||||
key = NULL;
|
||||
@@ -13276,7 +13277,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
&& _PyString_Eq(**name, key)) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -13308,7 +13309,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (cmp == 0) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -13464,7 +13465,7 @@ static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i,
|
||||
}
|
||||
}
|
||||
#else
|
||||
if (is_list || PySequence_Check(o)) {
|
||||
if (is_list || !PyMapping_Check(o)) {
|
||||
return PySequence_GetItem(o, i);
|
||||
}
|
||||
#endif
|
||||
@@ -14207,38 +14208,38 @@ static int __Pyx_validate_bases_tuple(const char *type_name, Py_ssize_t dictoffs
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#if !CYTHON_USE_TYPE_SLOTS
|
||||
if (dictoffset == 0) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%s.200s': "
|
||||
"unable to validate whether bases have a __dict__ "
|
||||
"when CYTHON_USE_TYPE_SLOTS is off "
|
||||
"(likely because you are building in the limited API). "
|
||||
"Therefore, all extension types with multiple bases "
|
||||
"must add 'cdef dict __dict__' in this compilation mode",
|
||||
type_name);
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
if (dictoffset == 0 && b->tp_dictoffset)
|
||||
if (dictoffset == 0)
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
Py_ssize_t b_dictoffset = 0;
|
||||
#if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
|
||||
b_dictoffset = b->tp_dictoffset;
|
||||
#else
|
||||
PyObject *py_b_dictoffset = PyObject_GetAttrString((PyObject*)b, "__dictoffset__");
|
||||
if (!py_b_dictoffset) goto dictoffset_return;
|
||||
b_dictoffset = PyLong_AsSsize_t(py_b_dictoffset);
|
||||
Py_DECREF(py_b_dictoffset);
|
||||
if (b_dictoffset == -1 && PyErr_Occurred()) goto dictoffset_return;
|
||||
#endif
|
||||
if (b_dictoffset) {
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
}
|
||||
#if !(CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY)
|
||||
dictoffset_return:
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
@@ -16046,9 +16047,10 @@ static PyObject* __Pyx_Globals(void) {
|
||||
|
||||
/* UnpackUnboundCMethod */
|
||||
static PyObject *__Pyx_SelflessCall(PyObject *method, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *result;
|
||||
PyObject *selfless_args = PyTuple_GetSlice(args, 1, PyTuple_Size(args));
|
||||
if (unlikely(!selfless_args)) return NULL;
|
||||
PyObject *result = PyObject_Call(method, selfless_args, kwargs);
|
||||
result = PyObject_Call(method, selfless_args, kwargs);
|
||||
Py_DECREF(selfless_args);
|
||||
return result;
|
||||
}
|
||||
@@ -16511,7 +16513,7 @@ static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
|
||||
#else
|
||||
py_code = PyCode_NewEmpty(filename, funcname, py_line);
|
||||
#endif
|
||||
Py_XDECREF(py_funcname); // XDECREF since it's only set on Py3 if cline
|
||||
Py_XDECREF(py_funcname);
|
||||
return py_code;
|
||||
bad:
|
||||
Py_XDECREF(py_funcname);
|
||||
|
||||
Binary file not shown.
+8
-2
@@ -6,12 +6,14 @@ from typing import Optional
|
||||
|
||||
from openpilot.common.params import Params
|
||||
from openpilot.system.hardware.hw import Paths
|
||||
from openpilot.system.hardware.hw import DEFAULT_DOWNLOAD_CACHE_ROOT
|
||||
|
||||
class OpenpilotPrefix:
|
||||
def __init__(self, prefix: Optional[str] = None, clean_dirs_on_exit: bool = True):
|
||||
def __init__(self, prefix: Optional[str] = None, clean_dirs_on_exit: bool = True, shared_download_cache: bool = False):
|
||||
self.prefix = prefix if prefix else str(uuid.uuid4().hex[0:15])
|
||||
self.msgq_path = os.path.join('/dev/shm', self.prefix)
|
||||
self.clean_dirs_on_exit = clean_dirs_on_exit
|
||||
self.shared_download_cache = shared_download_cache
|
||||
|
||||
def __enter__(self):
|
||||
self.original_prefix = os.environ.get('OPENPILOT_PREFIX', None)
|
||||
@@ -22,6 +24,9 @@ class OpenpilotPrefix:
|
||||
pass
|
||||
os.makedirs(Paths.log_root(), exist_ok=True)
|
||||
|
||||
if self.shared_download_cache:
|
||||
os.environ["COMMA_CACHE"] = DEFAULT_DOWNLOAD_CACHE_ROOT
|
||||
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc_obj, exc_tb):
|
||||
@@ -42,5 +47,6 @@ class OpenpilotPrefix:
|
||||
os.remove(symlink_path)
|
||||
shutil.rmtree(self.msgq_path, ignore_errors=True)
|
||||
shutil.rmtree(Paths.log_root(), ignore_errors=True)
|
||||
shutil.rmtree(Paths.download_cache_root(), ignore_errors=True)
|
||||
if not os.environ.get("COMMA_CACHE", False):
|
||||
shutil.rmtree(Paths.download_cache_root(), ignore_errors=True)
|
||||
shutil.rmtree(Paths.comma_home(), ignore_errors=True)
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
import time
|
||||
|
||||
class Profiler():
|
||||
def __init__(self, enabled=False):
|
||||
self.enabled = enabled
|
||||
self.cp = {}
|
||||
self.cp_ignored = []
|
||||
self.iter = 0
|
||||
self.start_time = time.time()
|
||||
self.last_time = self.start_time
|
||||
self.tot = 0.
|
||||
|
||||
def reset(self, enabled=False):
|
||||
self.enabled = enabled
|
||||
self.cp = {}
|
||||
self.cp_ignored = []
|
||||
self.iter = 0
|
||||
self.start_time = time.time()
|
||||
self.last_time = self.start_time
|
||||
|
||||
def checkpoint(self, name, ignore=False):
|
||||
# ignore flag needed when benchmarking threads with ratekeeper
|
||||
if not self.enabled:
|
||||
return
|
||||
tt = time.time()
|
||||
if name not in self.cp:
|
||||
self.cp[name] = 0.
|
||||
if ignore:
|
||||
self.cp_ignored.append(name)
|
||||
self.cp[name] += tt - self.last_time
|
||||
if not ignore:
|
||||
self.tot += tt - self.last_time
|
||||
self.last_time = tt
|
||||
|
||||
def display(self):
|
||||
if not self.enabled:
|
||||
return
|
||||
self.iter += 1
|
||||
print("******* Profiling %d *******" % self.iter)
|
||||
for n, ms in sorted(self.cp.items(), key=lambda x: -x[1]):
|
||||
if n in self.cp_ignored:
|
||||
print("%30s: %9.2f avg: %7.2f percent: %3.0f IGNORED" % (n, ms*1000.0, ms*1000.0/self.iter, ms/self.tot*100))
|
||||
else:
|
||||
print("%30s: %9.2f avg: %7.2f percent: %3.0f" % (n, ms*1000.0, ms*1000.0/self.iter, ms/self.tot*100))
|
||||
print(f"Iter clock: {self.tot / self.iter:2.6f} TOTAL: {self.tot:2.2f}")
|
||||
+1
-1
@@ -78,7 +78,7 @@ class Ratekeeper:
|
||||
time.sleep(self._remaining)
|
||||
return lagged
|
||||
|
||||
# this only monitor the cumulative lag, but does not enforce a rate
|
||||
# Monitors the cumulative lag, but does not enforce a rate
|
||||
def monitor_time(self) -> bool:
|
||||
prev = self._last_monitor_time
|
||||
self._last_monitor_time = time.monotonic()
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
import numpy as np
|
||||
|
||||
|
||||
def get_kalman_gain(dt, A, C, Q, R, iterations=100):
|
||||
P = np.zeros_like(Q)
|
||||
for _ in range(iterations):
|
||||
P = A.dot(P).dot(A.T) + dt * Q
|
||||
S = C.dot(P).dot(C.T) + R
|
||||
K = P.dot(C.T).dot(np.linalg.inv(S))
|
||||
P = (np.eye(len(P)) - K.dot(C)).dot(P)
|
||||
return K
|
||||
|
||||
|
||||
class KF1D:
|
||||
# this EKF assumes constant covariance matrix, so calculations are much simpler
|
||||
# the Kalman gain also needs to be precomputed using the control module
|
||||
|
||||
def __init__(self, x0, A, C, K):
|
||||
self.x0_0 = x0[0][0]
|
||||
self.x1_0 = x0[1][0]
|
||||
self.A0_0 = A[0][0]
|
||||
self.A0_1 = A[0][1]
|
||||
self.A1_0 = A[1][0]
|
||||
self.A1_1 = A[1][1]
|
||||
self.C0_0 = C[0]
|
||||
self.C0_1 = C[1]
|
||||
self.K0_0 = K[0][0]
|
||||
self.K1_0 = K[1][0]
|
||||
|
||||
self.A_K_0 = self.A0_0 - self.K0_0 * self.C0_0
|
||||
self.A_K_1 = self.A0_1 - self.K0_0 * self.C0_1
|
||||
self.A_K_2 = self.A1_0 - self.K1_0 * self.C0_0
|
||||
self.A_K_3 = self.A1_1 - self.K1_0 * self.C0_1
|
||||
|
||||
# K matrix needs to be pre-computed as follow:
|
||||
# import control
|
||||
# (x, l, K) = control.dare(np.transpose(self.A), np.transpose(self.C), Q, R)
|
||||
# self.K = np.transpose(K)
|
||||
|
||||
def update(self, meas):
|
||||
#self.x = np.dot(self.A_K, self.x) + np.dot(self.K, meas)
|
||||
x0_0 = self.A_K_0 * self.x0_0 + self.A_K_1 * self.x1_0 + self.K0_0 * meas
|
||||
x1_0 = self.A_K_2 * self.x0_0 + self.A_K_3 * self.x1_0 + self.K1_0 * meas
|
||||
self.x0_0 = x0_0
|
||||
self.x1_0 = x1_0
|
||||
return [self.x0_0, self.x1_0]
|
||||
|
||||
@property
|
||||
def x(self):
|
||||
return [[self.x0_0], [self.x1_0]]
|
||||
|
||||
def set_x(self, x):
|
||||
self.x0_0 = x[0][0]
|
||||
self.x1_0 = x[1][0]
|
||||
@@ -1,10 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#define STATLOG_GAUGE "g"
|
||||
#define STATLOG_SAMPLE "sa"
|
||||
|
||||
void statlog_log(const char* metric_type, const char* metric, int value);
|
||||
void statlog_log(const char* metric_type, const char* metric, float value);
|
||||
|
||||
#define statlog_gauge(metric, value) statlog_log(STATLOG_GAUGE, metric, value)
|
||||
#define statlog_sample(metric, value) statlog_log(STATLOG_SAMPLE, metric, value)
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import datetime
|
||||
|
||||
MIN_DATE = datetime.datetime(year=2023, month=6, day=1)
|
||||
MIN_DATE = datetime.datetime(year=2024, month=1, day=28)
|
||||
|
||||
def system_time_valid():
|
||||
return datetime.datetime.now() > MIN_DATE
|
||||
|
||||
Binary file not shown.
@@ -3,7 +3,6 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <zmq.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <atomic>
|
||||
@@ -180,36 +179,3 @@ void update_max_atomic(std::atomic<T>& max, T const& value) {
|
||||
T prev = max;
|
||||
while (prev < value && !max.compare_exchange_weak(prev, value)) {}
|
||||
}
|
||||
|
||||
class LogState {
|
||||
public:
|
||||
bool initialized = false;
|
||||
std::mutex lock;
|
||||
void *zctx = nullptr;
|
||||
void *sock = nullptr;
|
||||
int print_level;
|
||||
std::string endpoint;
|
||||
|
||||
LogState(std::string _endpoint) {
|
||||
endpoint = _endpoint;
|
||||
}
|
||||
|
||||
inline void initialize() {
|
||||
zctx = zmq_ctx_new();
|
||||
sock = zmq_socket(zctx, ZMQ_PUSH);
|
||||
|
||||
// Timeout on shutdown for messages to be received by the logging process
|
||||
int timeout = 100;
|
||||
zmq_setsockopt(sock, ZMQ_LINGER, &timeout, sizeof(timeout));
|
||||
|
||||
zmq_connect(sock, endpoint.c_str());
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
~LogState() {
|
||||
if (initialized) {
|
||||
zmq_close(sock);
|
||||
zmq_ctx_destroy(zctx);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
#define COMMA_VERSION "2023.12.23"
|
||||
#define COMMA_VERSION "2024.02.12"
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
import sys
|
||||
import pygame
|
||||
import cv2
|
||||
|
||||
class Window:
|
||||
def __init__(self, w, h, caption="window", double=False, halve=False):
|
||||
self.w = w
|
||||
self.h = h
|
||||
pygame.display.init()
|
||||
pygame.display.set_caption(caption)
|
||||
self.double = double
|
||||
self.halve = halve
|
||||
if self.double:
|
||||
self.rw, self.rh = w*2, h*2
|
||||
elif self.halve:
|
||||
self.rw, self.rh = w//2, h//2
|
||||
else:
|
||||
self.rw, self.rh = w, h
|
||||
self.screen = pygame.display.set_mode((self.rw, self.rh))
|
||||
pygame.display.flip()
|
||||
|
||||
# hack for xmonad, it shrinks the window by 6 pixels after the display.flip
|
||||
if self.screen.get_width() != self.rw:
|
||||
self.screen = pygame.display.set_mode((self.rw+(self.rw-self.screen.get_width()), self.rh+(self.rh-self.screen.get_height())))
|
||||
pygame.display.flip()
|
||||
|
||||
def draw(self, out):
|
||||
pygame.event.pump()
|
||||
if self.double:
|
||||
out2 = cv2.resize(out, (self.w*2, self.h*2))
|
||||
pygame.surfarray.blit_array(self.screen, out2.swapaxes(0, 1))
|
||||
elif self.halve:
|
||||
out2 = cv2.resize(out, (self.w//2, self.h//2))
|
||||
pygame.surfarray.blit_array(self.screen, out2.swapaxes(0, 1))
|
||||
else:
|
||||
pygame.surfarray.blit_array(self.screen, out.swapaxes(0, 1))
|
||||
pygame.display.flip()
|
||||
|
||||
def getkey(self):
|
||||
while 1:
|
||||
event = pygame.event.wait()
|
||||
if event.type == pygame.QUIT:
|
||||
pygame.quit()
|
||||
sys.exit()
|
||||
if event.type == pygame.KEYDOWN:
|
||||
return event.key
|
||||
|
||||
def getclick(self):
|
||||
for event in pygame.event.get():
|
||||
if event.type == pygame.MOUSEBUTTONDOWN:
|
||||
mx, my = pygame.mouse.get_pos()
|
||||
return mx, my
|
||||
|
||||
if __name__ == "__main__":
|
||||
import numpy as np
|
||||
win = Window(200, 200, double=True)
|
||||
img: np.ndarray = np.zeros((200, 200, 3), np.uint8)
|
||||
while 1:
|
||||
print("draw")
|
||||
img += 1
|
||||
win.draw(img)
|
||||
+17
-13
@@ -4,7 +4,7 @@
|
||||
|
||||
A supported vehicle is one that just works when you install a comma device. All supported cars provide a better experience than any stock system. Supported vehicles reference the US market unless otherwise specified.
|
||||
|
||||
# 273 Supported Cars
|
||||
# 277 Supported Cars
|
||||
|
||||
|Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|<a href="##"><img width=2000></a>Hardware Needed<br> |Video|
|
||||
|---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|
||||
@@ -28,8 +28,9 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Chevrolet|Volt 2017-18[<sup>4</sup>](#footnotes)|Adaptive Cruise Control (ACC)|openpilot|0 mph|7 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-II connector<br>- 1 comma 3X<br>- 2 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chevrolet&model=Volt 2017-18">Buy Here</a></sub></details>|<a href="https://youtu.be/QeMCN_4TFfQ" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Chrysler|Pacifica 2017-18|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica 2017-18">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica 2019-20|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica 2019-20">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica 2021|All|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica 2021">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica Hybrid 2017-18|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica Hybrid 2017-18">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica 2021-23|All|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica 2021-23">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica Hybrid 2017|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica Hybrid 2017">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica Hybrid 2018|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica Hybrid 2018">Buy Here</a></sub></details>||
|
||||
|Chrysler|Pacifica Hybrid 2019-23|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Chrysler&model=Pacifica Hybrid 2019-23">Buy Here</a></sub></details>||
|
||||
|comma|body|All|openpilot|0 mph|0 mph|[](##)|[](##)|None||
|
||||
|Ford|Bronco Sport 2021-22|Co-Pilot360 Assist+|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 RJ45 cable (7 ft)<br>- 1 angled mount (8 degrees)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Ford&model=Bronco Sport 2021-22">Buy Here</a></sub></details>||
|
||||
@@ -60,7 +61,7 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Honda|Civic Hatchback 2022-23|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Civic Hatchback 2022-23">Buy Here</a></sub></details>|<a href="https://youtu.be/ytiOT5lcp6Q" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Honda|CR-V 2015-16|Touring Trim|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=CR-V 2015-16">Buy Here</a></sub></details>||
|
||||
|Honda|CR-V 2017-22|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=CR-V 2017-22">Buy Here</a></sub></details>||
|
||||
|Honda|CR-V Hybrid 2017-19|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=CR-V Hybrid 2017-19">Buy Here</a></sub></details>||
|
||||
|Honda|CR-V Hybrid 2017-20|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=CR-V Hybrid 2017-20">Buy Here</a></sub></details>||
|
||||
|Honda|e 2020|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=e 2020">Buy Here</a></sub></details>||
|
||||
|Honda|Fit 2018-20|Honda Sensing|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Fit 2018-20">Buy Here</a></sub></details>||
|
||||
|Honda|Freed 2020|Honda Sensing|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Freed 2020">Buy Here</a></sub></details>||
|
||||
@@ -71,7 +72,7 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Honda|Odyssey 2018-20|Honda Sensing|openpilot|25 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Odyssey 2018-20">Buy Here</a></sub></details>||
|
||||
|Honda|Passport 2019-23|All|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Passport 2019-23">Buy Here</a></sub></details>||
|
||||
|Honda|Pilot 2016-22|Honda Sensing|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Pilot 2016-22">Buy Here</a></sub></details>||
|
||||
|Honda|Ridgeline 2017-23|Honda Sensing|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Ridgeline 2017-23">Buy Here</a></sub></details>||
|
||||
|Honda|Ridgeline 2017-24|Honda Sensing|openpilot|25 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Honda&model=Ridgeline 2017-24">Buy Here</a></sub></details>||
|
||||
|Hyundai|Azera 2022|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai K connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Hyundai&model=Azera 2022">Buy Here</a></sub></details>||
|
||||
|Hyundai|Azera Hybrid 2019|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Hyundai&model=Azera Hybrid 2019">Buy Here</a></sub></details>||
|
||||
|Hyundai|Azera Hybrid 2020|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai K connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Hyundai&model=Azera Hybrid 2020">Buy Here</a></sub></details>||
|
||||
@@ -132,10 +133,12 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Kia|Niro EV 2021|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro EV 2021">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=lT7zcG6ZpGo" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Kia|Niro EV 2022|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai H connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro EV 2022">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=lT7zcG6ZpGo" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Kia|Niro EV 2023[<sup>6</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro EV 2023">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Hybrid 2021-22|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai F connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Hybrid 2021-22">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Hybrid 2021|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai D connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Hybrid 2021">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Hybrid 2022|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai F connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Hybrid 2022">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Hybrid 2023[<sup>6</sup>](#footnotes)|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Hybrid 2023">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Plug-in Hybrid 2018-19|All|Stock|10 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Plug-in Hybrid 2018-19">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Plug-in Hybrid 2020|All|Stock|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai D connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Plug-in Hybrid 2020">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Plug-in Hybrid 2021|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai D connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Plug-in Hybrid 2021">Buy Here</a></sub></details>||
|
||||
|Kia|Niro Plug-in Hybrid 2022|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai F connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Niro Plug-in Hybrid 2022">Buy Here</a></sub></details>||
|
||||
|Kia|Optima 2017|Advanced Smart Cruise Control|Stock|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai B connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Optima 2017">Buy Here</a></sub></details>||
|
||||
|Kia|Optima 2019-20|Smart Cruise Control (SCC)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai G connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Kia&model=Optima 2019-20">Buy Here</a></sub></details>||
|
||||
@@ -154,11 +157,12 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Lexus|CT Hybrid 2017-18|Lexus Safety System+|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=CT Hybrid 2017-18">Buy Here</a></sub></details>||
|
||||
|Lexus|ES 2017-18|All|openpilot available[<sup>2</sup>](#footnotes)|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=ES 2017-18">Buy Here</a></sub></details>||
|
||||
|Lexus|ES 2019-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=ES 2019-24">Buy Here</a></sub></details>||
|
||||
|Lexus|ES Hybrid 2017-18|All|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=ES Hybrid 2017-18">Buy Here</a></sub></details>||
|
||||
|Lexus|ES Hybrid 2019-23|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=ES Hybrid 2019-23">Buy Here</a></sub></details>|<a href="https://youtu.be/BZ29osRVJeg?t=12" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Lexus|ES Hybrid 2017-18|All|openpilot available[<sup>2</sup>](#footnotes)|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=ES Hybrid 2017-18">Buy Here</a></sub></details>||
|
||||
|Lexus|ES Hybrid 2019-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=ES Hybrid 2019-24">Buy Here</a></sub></details>|<a href="https://youtu.be/BZ29osRVJeg?t=12" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Lexus|GS F 2016|All|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=GS F 2016">Buy Here</a></sub></details>||
|
||||
|Lexus|IS 2017-19|All|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=IS 2017-19">Buy Here</a></sub></details>||
|
||||
|Lexus|IS 2022-23|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=IS 2022-23">Buy Here</a></sub></details>||
|
||||
|Lexus|LC 2024|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=LC 2024">Buy Here</a></sub></details>||
|
||||
|Lexus|NX 2018-19|All|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=NX 2018-19">Buy Here</a></sub></details>||
|
||||
|Lexus|NX 2020-21|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=NX 2020-21">Buy Here</a></sub></details>||
|
||||
|Lexus|NX Hybrid 2018-19|All|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Lexus&model=NX Hybrid 2018-19">Buy Here</a></sub></details>||
|
||||
@@ -180,7 +184,7 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Nissan|Leaf 2018-23|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Nissan&model=Leaf 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/vaMbtAh_0cY" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Nissan|Rogue 2018-20|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Nissan&model=Rogue 2018-20">Buy Here</a></sub></details>||
|
||||
|Nissan|X-Trail 2017|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Nissan&model=X-Trail 2017">Buy Here</a></sub></details>||
|
||||
|Ram|1500 2019-23|Adaptive Cruise Control (ACC)|Stock|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Ram connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Ram&model=1500 2019-23">Buy Here</a></sub></details>||
|
||||
|Ram|1500 2019-24|Adaptive Cruise Control (ACC)|Stock|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Ram connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Ram&model=1500 2019-24">Buy Here</a></sub></details>||
|
||||
|SEAT|Ateca 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=SEAT&model=Ateca 2018">Buy Here</a></sub></details>||
|
||||
|SEAT|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=SEAT&model=Leon 2014-20">Buy Here</a></sub></details>||
|
||||
|Subaru|Ascent 2019-21|All[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Subaru A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Subaru&model=Ascent 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>||
|
||||
@@ -239,12 +243,12 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Toyota|RAV4 2017-18|All|openpilot available[<sup>2</sup>](#footnotes)|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 2017-18">Buy Here</a></sub></details>||
|
||||
|Toyota|RAV4 2019-21|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 2019-21">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=wJxjDd42gGA" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Toyota|RAV4 2022|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 2022">Buy Here</a></sub></details>||
|
||||
|Toyota|RAV4 2023|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 2023">Buy Here</a></sub></details>||
|
||||
|Toyota|RAV4 2023-24|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 2023-24">Buy Here</a></sub></details>||
|
||||
|Toyota|RAV4 Hybrid 2016|Toyota Safety Sense P|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 Hybrid 2016">Buy Here</a></sub></details>|<a href="https://youtu.be/LhT5VzJVfNI?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Toyota|RAV4 Hybrid 2017-18|All|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 Hybrid 2017-18">Buy Here</a></sub></details>|<a href="https://youtu.be/LhT5VzJVfNI?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Toyota|RAV4 Hybrid 2019-21|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 Hybrid 2019-21">Buy Here</a></sub></details>||
|
||||
|Toyota|RAV4 Hybrid 2022|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 Hybrid 2022">Buy Here</a></sub></details>|<a href="https://youtu.be/U0nH9cnrFB0" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Toyota|RAV4 Hybrid 2023|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 Hybrid 2023">Buy Here</a></sub></details>||
|
||||
|Toyota|RAV4 Hybrid 2023-24|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=RAV4 Hybrid 2023-24">Buy Here</a></sub></details>||
|
||||
|Toyota|Sienna 2018-20|All|openpilot available[<sup>2</sup>](#footnotes)|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Toyota&model=Sienna 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=q1UPOo4Sh68" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Volkswagen|Arteon 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Arteon 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Volkswagen|Arteon eHybrid 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Arteon eHybrid 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
@@ -265,8 +269,8 @@ A supported vehicle is one that just works when you install a comma device. All
|
||||
|Volkswagen|Golf R 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Golf R 2015-19">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Golf SportsVan 2015-20">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Grand California 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 angled mount (8 degrees)<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Grand California 2019-23">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>|
|
||||
|Volkswagen|Jetta 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Jetta 2018-22">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Jetta GLI 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Jetta GLI 2021-22">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Jetta 2018-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Jetta 2018-24">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Jetta GLI 2021-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Jetta GLI 2021-24">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Passat 2015-22[<sup>11</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Passat 2015-22">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Passat Alltrack 2015-22">Buy Here</a></sub></details>||
|
||||
|Volkswagen|Passat GTE 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,13</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 J533 connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Volkswagen&model=Passat GTE 2015-22">Buy Here</a></sub></details>||
|
||||
|
||||
@@ -11,7 +11,7 @@ Our software is open source so you can solve your own problems without needing h
|
||||
|
||||
## What contributions are we looking for?
|
||||
|
||||
**openpilot's priorities are [safety](SAFETY.md), stability, quality, and features, in that order.** openpilot is part of comma's mission to *solve self-driving cars while delivering shippable intermediaries*, and **all** developoment is towards that goal.
|
||||
**openpilot's priorities are [safety](SAFETY.md), stability, quality, and features, in that order.** openpilot is part of comma's mission to *solve self-driving cars while delivering shippable intermediaries*, and **all** development is towards that goal.
|
||||
|
||||
### What gets merged?
|
||||
|
||||
|
||||
+7
-10
@@ -14,11 +14,6 @@ function agnos_init {
|
||||
echo -n openpilot > /data/params/d/GithubUsername
|
||||
cat /usr/comma/setup_keys > /data/params/d/GithubSshKeys
|
||||
fi
|
||||
|
||||
# wait longer for weston to come up
|
||||
if [ -f "$BASEDIR/prebuilt" ]; then
|
||||
sleep 5
|
||||
fi
|
||||
|
||||
# TODO: move this to agnos
|
||||
sudo rm -f /data/etc/NetworkManager/system-connections/*.nmmeta
|
||||
@@ -41,9 +36,6 @@ function launch {
|
||||
# Remove orphaned git lock if it exists on boot
|
||||
[ -f "$DIR/.git/index.lock" ] && rm -f $DIR/.git/index.lock
|
||||
|
||||
# Pull time from panda
|
||||
$DIR/selfdrive/boardd/set_time.py
|
||||
|
||||
# Check to see if there's a valid overlay-based update available. Conditions
|
||||
# are as follows:
|
||||
#
|
||||
@@ -83,14 +75,19 @@ function launch {
|
||||
export PYTHONPATH="$PWD"
|
||||
|
||||
# hardware specific init
|
||||
agnos_init
|
||||
if [ -f /AGNOS ]; then
|
||||
agnos_init
|
||||
fi
|
||||
|
||||
# write tmux scrollback to a file
|
||||
tmux capture-pane -pq -S-1000 > /tmp/launch_log
|
||||
|
||||
# start manager
|
||||
cd selfdrive/manager
|
||||
./build.py && ./manager.py
|
||||
if [ ! -f $DIR/prebuilt ]; then
|
||||
./build.py
|
||||
fi
|
||||
./manager.py
|
||||
|
||||
# if broken, keep on screen error
|
||||
while true; do sleep 1; done
|
||||
|
||||
+1
-5
@@ -7,11 +7,7 @@ export OPENBLAS_NUM_THREADS=1
|
||||
export VECLIB_MAXIMUM_THREADS=1
|
||||
|
||||
if [ -z "$AGNOS_VERSION" ]; then
|
||||
export AGNOS_VERSION="9.1"
|
||||
fi
|
||||
|
||||
if [ -z "$PASSIVE" ]; then
|
||||
export PASSIVE="1"
|
||||
export AGNOS_VERSION="9.6"
|
||||
fi
|
||||
|
||||
export STAGING_ROOT="/data/safe_staging"
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#!/usr/bin/bash
|
||||
|
||||
export PASSIVE="0"
|
||||
exec ./launch_chffrplus.sh
|
||||
|
||||
|
||||
Binary file not shown.
+209
-135
@@ -1,4 +1,4 @@
|
||||
/* Generated by Cython 3.0.5 */
|
||||
/* Generated by Cython 3.0.8 */
|
||||
|
||||
/* BEGIN: Cython Metadata
|
||||
{
|
||||
@@ -44,10 +44,10 @@ END: Cython Metadata */
|
||||
#else
|
||||
#define __PYX_EXTRA_ABI_MODULE_NAME ""
|
||||
#endif
|
||||
#define CYTHON_ABI "3_0_5" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME
|
||||
#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
|
||||
#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
|
||||
#define CYTHON_HEX_VERSION 0x030005F0
|
||||
#define CYTHON_HEX_VERSION 0x030008F0
|
||||
#define CYTHON_FUTURE_DIVISION 1
|
||||
#include <stddef.h>
|
||||
#ifndef offsetof
|
||||
@@ -261,7 +261,7 @@ END: Cython Metadata */
|
||||
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
|
||||
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
|
||||
#endif
|
||||
#elif defined(PY_NOGIL)
|
||||
#elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
|
||||
#define CYTHON_COMPILING_IN_PYPY 0
|
||||
#define CYTHON_COMPILING_IN_CPYTHON 0
|
||||
#define CYTHON_COMPILING_IN_LIMITED_API 0
|
||||
@@ -605,18 +605,19 @@ class __Pyx_FakeReference {
|
||||
PyObject *exception_table = NULL;
|
||||
PyObject *types_module=NULL, *code_type=NULL, *result=NULL;
|
||||
#if __PYX_LIMITED_VERSION_HEX < 0x030B0000
|
||||
PyObject *version_info; // borrowed
|
||||
#endif
|
||||
PyObject *version_info;
|
||||
PyObject *py_minor_version = NULL;
|
||||
#endif
|
||||
long minor_version = 0;
|
||||
PyObject *type, *value, *traceback;
|
||||
PyErr_Fetch(&type, &value, &traceback);
|
||||
#if __PYX_LIMITED_VERSION_HEX >= 0x030B0000
|
||||
minor_version = 11; // we don't yet need to distinguish between versions > 11
|
||||
minor_version = 11;
|
||||
#else
|
||||
if (!(version_info = PySys_GetObject("version_info"))) goto end;
|
||||
if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end;
|
||||
minor_version = PyLong_AsLong(py_minor_version);
|
||||
Py_DECREF(py_minor_version);
|
||||
if (minor_version == -1 && PyErr_Occurred()) goto end;
|
||||
#endif
|
||||
if (!(types_module = PyImport_ImportModule("types"))) goto end;
|
||||
@@ -637,7 +638,6 @@ class __Pyx_FakeReference {
|
||||
Py_XDECREF(code_type);
|
||||
Py_XDECREF(exception_table);
|
||||
Py_XDECREF(types_module);
|
||||
Py_XDECREF(py_minor_version);
|
||||
if (type) {
|
||||
PyErr_Restore(type, value, traceback);
|
||||
}
|
||||
@@ -670,7 +670,7 @@ class __Pyx_FakeReference {
|
||||
PyObject *fv, PyObject *cell, PyObject* fn,
|
||||
PyObject *name, int fline, PyObject *lnos) {
|
||||
PyCodeObject *result;
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0); // we don't have access to __pyx_empty_bytes here
|
||||
PyObject *empty_bytes = PyBytes_FromStringAndSize("", 0);
|
||||
if (!empty_bytes) return NULL;
|
||||
result =
|
||||
#if PY_VERSION_HEX >= 0x030C0000
|
||||
@@ -965,7 +965,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyDict_GetItemStrWithError(PyObject *dict,
|
||||
#endif
|
||||
#if CYTHON_USE_TYPE_SPECS && PY_VERSION_HEX >= 0x03080000
|
||||
#define __Pyx_PyHeapTypeObject_GC_Del(obj) {\
|
||||
PyTypeObject *type = Py_TYPE(obj);\
|
||||
PyTypeObject *type = Py_TYPE((PyObject*)obj);\
|
||||
assert(__Pyx_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE));\
|
||||
PyObject_GC_Del(obj);\
|
||||
Py_DECREF(type);\
|
||||
@@ -1386,7 +1386,7 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*);
|
||||
#endif
|
||||
typedef Py_ssize_t __Pyx_compact_pylong;
|
||||
typedef size_t __Pyx_compact_upylong;
|
||||
#else // Py < 3.12
|
||||
#else
|
||||
#define __Pyx_PyLong_IsNeg(x) (Py_SIZE(x) < 0)
|
||||
#define __Pyx_PyLong_IsNonNeg(x) (Py_SIZE(x) >= 0)
|
||||
#define __Pyx_PyLong_IsZero(x) (Py_SIZE(x) == 0)
|
||||
@@ -1725,8 +1725,8 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) __Pyx_NewRef(arg)
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) Py_XDECREF(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg // no-op
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg) // no-op - arg is borrowed
|
||||
#define __Pyx_Arg_NewRef_VARARGS(arg) arg
|
||||
#define __Pyx_Arg_XDECREF_VARARGS(arg)
|
||||
#endif
|
||||
#define __Pyx_NumKwargs_VARARGS(kwds) PyDict_Size(kwds)
|
||||
#define __Pyx_KwValues_VARARGS(args, nargs) NULL
|
||||
@@ -1738,12 +1738,13 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
|
||||
#define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
|
||||
static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);
|
||||
#else
|
||||
#define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
|
||||
#endif
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg // no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg) // no-op - arg was returned from array
|
||||
#define __Pyx_Arg_NewRef_FASTCALL(arg) arg /* no-op, __Pyx_Arg_FASTCALL is direct and this needs
|
||||
to have the same reference counting */
|
||||
#define __Pyx_Arg_XDECREF_FASTCALL(arg)
|
||||
#else
|
||||
#define __Pyx_Arg_FASTCALL __Pyx_Arg_VARARGS
|
||||
#define __Pyx_NumKwargs_FASTCALL __Pyx_NumKwargs_VARARGS
|
||||
@@ -2071,7 +2072,7 @@ typedef struct {
|
||||
#endif
|
||||
void *defaults;
|
||||
int defaults_pyobjects;
|
||||
size_t defaults_size; // used by FusedFunction for copying defaults
|
||||
size_t defaults_size;
|
||||
int flags;
|
||||
PyObject *defaults_tuple;
|
||||
PyObject *defaults_kwdict;
|
||||
@@ -2332,9 +2333,10 @@ static const char __pyx_k_CANPacker___setstate_cython[] = "CANPacker.__setstate_
|
||||
static const char __pyx_k_self_dbc_self_packer_cannot_be_c[] = "self.dbc,self.packer cannot be converted to a Python object for pickling";
|
||||
/* #### Code section: decls ### */
|
||||
static int __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker___init__(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, PyObject *__pyx_v_dbc_name); /* proto */
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2make_can_msg(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, PyObject *__pyx_v_name_or_addr, PyObject *__pyx_v_bus, PyObject *__pyx_v_values); /* proto */
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self); /* proto */
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_6__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */
|
||||
static void __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2__dealloc__(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self); /* proto */
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4make_can_msg(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, PyObject *__pyx_v_name_or_addr, PyObject *__pyx_v_bus, PyObject *__pyx_v_values); /* proto */
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_6__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self); /* proto */
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_8__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */
|
||||
static PyObject *__pyx_tp_new_7opendbc_3can_10packer_pyx_CANPacker(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
|
||||
/* #### Code section: late_includes ### */
|
||||
/* #### Code section: module_state ### */
|
||||
@@ -2956,7 +2958,7 @@ static int __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker___init__(struct __pyx_
|
||||
* msg = self.dbc[0].msgs[i]
|
||||
* self.name_to_address[string(msg.name)] = msg.address # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef vector[uint8_t] pack(self, addr, values):
|
||||
* def __dealloc__(self):
|
||||
*/
|
||||
__pyx_t_9 = __pyx_v_msg.address;
|
||||
try {
|
||||
@@ -2992,6 +2994,69 @@ static int __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker___init__(struct __pyx_
|
||||
/* "opendbc/can/packer_pyx.pyx":29
|
||||
* self.name_to_address[string(msg.name)] = msg.address
|
||||
*
|
||||
* def __dealloc__(self): # <<<<<<<<<<<<<<
|
||||
* if self.packer:
|
||||
* del self.packer
|
||||
*/
|
||||
|
||||
/* Python wrapper */
|
||||
static void __pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
|
||||
static void __pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3__dealloc__(PyObject *__pyx_v_self) {
|
||||
CYTHON_UNUSED PyObject *const *__pyx_kwvalues;
|
||||
__Pyx_RefNannyDeclarations
|
||||
__Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
|
||||
__pyx_kwvalues = __Pyx_KwValues_VARARGS(__pyx_args, __pyx_nargs);
|
||||
__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2__dealloc__(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self));
|
||||
|
||||
/* function exit code */
|
||||
__Pyx_RefNannyFinishContext();
|
||||
}
|
||||
|
||||
static void __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2__dealloc__(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self) {
|
||||
int __pyx_t_1;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":30
|
||||
*
|
||||
* def __dealloc__(self):
|
||||
* if self.packer: # <<<<<<<<<<<<<<
|
||||
* del self.packer
|
||||
*
|
||||
*/
|
||||
__pyx_t_1 = (__pyx_v_self->packer != 0);
|
||||
if (__pyx_t_1) {
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":31
|
||||
* def __dealloc__(self):
|
||||
* if self.packer:
|
||||
* del self.packer # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cdef vector[uint8_t] pack(self, addr, values):
|
||||
*/
|
||||
delete __pyx_v_self->packer;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":30
|
||||
*
|
||||
* def __dealloc__(self):
|
||||
* if self.packer: # <<<<<<<<<<<<<<
|
||||
* del self.packer
|
||||
*
|
||||
*/
|
||||
}
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":29
|
||||
* self.name_to_address[string(msg.name)] = msg.address
|
||||
*
|
||||
* def __dealloc__(self): # <<<<<<<<<<<<<<
|
||||
* if self.packer:
|
||||
* del self.packer
|
||||
*/
|
||||
|
||||
/* function exit code */
|
||||
}
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":33
|
||||
* del self.packer
|
||||
*
|
||||
* cdef vector[uint8_t] pack(self, addr, values): # <<<<<<<<<<<<<<
|
||||
* cdef vector[SignalPackValue] values_thing
|
||||
* values_thing.reserve(len(values))
|
||||
@@ -3020,22 +3085,22 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("pack", 1);
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":31
|
||||
/* "opendbc/can/packer_pyx.pyx":35
|
||||
* cdef vector[uint8_t] pack(self, addr, values):
|
||||
* cdef vector[SignalPackValue] values_thing
|
||||
* values_thing.reserve(len(values)) # <<<<<<<<<<<<<<
|
||||
* cdef SignalPackValue spv
|
||||
*
|
||||
*/
|
||||
__pyx_t_1 = PyObject_Length(__pyx_v_values); if (unlikely(__pyx_t_1 == ((Py_ssize_t)-1))) __PYX_ERR(0, 31, __pyx_L1_error)
|
||||
__pyx_t_1 = PyObject_Length(__pyx_v_values); if (unlikely(__pyx_t_1 == ((Py_ssize_t)-1))) __PYX_ERR(0, 35, __pyx_L1_error)
|
||||
try {
|
||||
__pyx_v_values_thing.reserve(__pyx_t_1);
|
||||
} catch(...) {
|
||||
__Pyx_CppExn2PyErr();
|
||||
__PYX_ERR(0, 31, __pyx_L1_error)
|
||||
__PYX_ERR(0, 35, __pyx_L1_error)
|
||||
}
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":34
|
||||
/* "opendbc/can/packer_pyx.pyx":38
|
||||
* cdef SignalPackValue spv
|
||||
*
|
||||
* for name, value in values.iteritems(): # <<<<<<<<<<<<<<
|
||||
@@ -3045,9 +3110,9 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
__pyx_t_1 = 0;
|
||||
if (unlikely(__pyx_v_values == Py_None)) {
|
||||
PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%.30s'", "iteritems");
|
||||
__PYX_ERR(0, 34, __pyx_L1_error)
|
||||
__PYX_ERR(0, 38, __pyx_L1_error)
|
||||
}
|
||||
__pyx_t_5 = __Pyx_dict_iterator(__pyx_v_values, 0, __pyx_n_s_iteritems, (&__pyx_t_3), (&__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 34, __pyx_L1_error)
|
||||
__pyx_t_5 = __Pyx_dict_iterator(__pyx_v_values, 0, __pyx_n_s_iteritems, (&__pyx_t_3), (&__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 38, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_5);
|
||||
__Pyx_XDECREF(__pyx_t_2);
|
||||
__pyx_t_2 = __pyx_t_5;
|
||||
@@ -3055,7 +3120,7 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
while (1) {
|
||||
__pyx_t_7 = __Pyx_dict_iter_next(__pyx_t_2, __pyx_t_3, &__pyx_t_1, &__pyx_t_5, &__pyx_t_6, NULL, __pyx_t_4);
|
||||
if (unlikely(__pyx_t_7 == 0)) break;
|
||||
if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 34, __pyx_L1_error)
|
||||
if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 38, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_5);
|
||||
__Pyx_GOTREF(__pyx_t_6);
|
||||
__Pyx_XDECREF_SET(__pyx_v_name, __pyx_t_5);
|
||||
@@ -3063,14 +3128,14 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
__Pyx_XDECREF_SET(__pyx_v_value, __pyx_t_6);
|
||||
__pyx_t_6 = 0;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":35
|
||||
/* "opendbc/can/packer_pyx.pyx":39
|
||||
*
|
||||
* for name, value in values.iteritems():
|
||||
* spv.name = name.encode("utf8") # <<<<<<<<<<<<<<
|
||||
* spv.value = value
|
||||
* values_thing.push_back(spv)
|
||||
*/
|
||||
__pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_name, __pyx_n_s_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 35, __pyx_L1_error)
|
||||
__pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_name, __pyx_n_s_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 39, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_5);
|
||||
__pyx_t_8 = NULL;
|
||||
__pyx_t_7 = 0;
|
||||
@@ -3090,25 +3155,25 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
PyObject *__pyx_callargs[2] = {__pyx_t_8, __pyx_n_u_utf8};
|
||||
__pyx_t_6 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_7, 1+__pyx_t_7);
|
||||
__Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
|
||||
if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 35, __pyx_L1_error)
|
||||
if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 39, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_6);
|
||||
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
|
||||
}
|
||||
__pyx_t_9 = __pyx_convert_string_from_py_std__in_string(__pyx_t_6); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 35, __pyx_L1_error)
|
||||
__pyx_t_9 = __pyx_convert_string_from_py_std__in_string(__pyx_t_6); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 39, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
|
||||
__pyx_v_spv.name = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_9);
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":36
|
||||
/* "opendbc/can/packer_pyx.pyx":40
|
||||
* for name, value in values.iteritems():
|
||||
* spv.name = name.encode("utf8")
|
||||
* spv.value = value # <<<<<<<<<<<<<<
|
||||
* values_thing.push_back(spv)
|
||||
*
|
||||
*/
|
||||
__pyx_t_10 = __pyx_PyFloat_AsDouble(__pyx_v_value); if (unlikely((__pyx_t_10 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 36, __pyx_L1_error)
|
||||
__pyx_t_10 = __pyx_PyFloat_AsDouble(__pyx_v_value); if (unlikely((__pyx_t_10 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 40, __pyx_L1_error)
|
||||
__pyx_v_spv.value = __pyx_t_10;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":37
|
||||
/* "opendbc/can/packer_pyx.pyx":41
|
||||
* spv.name = name.encode("utf8")
|
||||
* spv.value = value
|
||||
* values_thing.push_back(spv) # <<<<<<<<<<<<<<
|
||||
@@ -3119,24 +3184,24 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
__pyx_v_values_thing.push_back(__pyx_v_spv);
|
||||
} catch(...) {
|
||||
__Pyx_CppExn2PyErr();
|
||||
__PYX_ERR(0, 37, __pyx_L1_error)
|
||||
__PYX_ERR(0, 41, __pyx_L1_error)
|
||||
}
|
||||
}
|
||||
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":39
|
||||
/* "opendbc/can/packer_pyx.pyx":43
|
||||
* values_thing.push_back(spv)
|
||||
*
|
||||
* return self.packer.pack(addr, values_thing) # <<<<<<<<<<<<<<
|
||||
*
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values):
|
||||
*/
|
||||
__pyx_t_11 = __Pyx_PyInt_As_uint32_t(__pyx_v_addr); if (unlikely((__pyx_t_11 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 39, __pyx_L1_error)
|
||||
__pyx_t_11 = __Pyx_PyInt_As_uint32_t(__pyx_v_addr); if (unlikely((__pyx_t_11 == ((uint32_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 43, __pyx_L1_error)
|
||||
__pyx_r = __pyx_v_self->packer->pack(__pyx_t_11, __pyx_v_values_thing);
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":29
|
||||
* self.name_to_address[string(msg.name)] = msg.address
|
||||
/* "opendbc/can/packer_pyx.pyx":33
|
||||
* del self.packer
|
||||
*
|
||||
* cdef vector[uint8_t] pack(self, addr, values): # <<<<<<<<<<<<<<
|
||||
* cdef vector[SignalPackValue] values_thing
|
||||
@@ -3158,7 +3223,7 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":41
|
||||
/* "opendbc/can/packer_pyx.pyx":45
|
||||
* return self.packer.pack(addr, values_thing)
|
||||
*
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values): # <<<<<<<<<<<<<<
|
||||
@@ -3166,7 +3231,7 @@ static std::vector<uint8_t> __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_pack(
|
||||
* if isinstance(name_or_addr, int):
|
||||
*/
|
||||
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg(PyObject *__pyx_v_self,
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
@@ -3199,9 +3264,9 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
if (unlikely(!__Pyx_object_dict_version_matches(((PyObject *)__pyx_v_self), __pyx_tp_dict_version, __pyx_obj_dict_version))) {
|
||||
PY_UINT64_T __pyx_typedict_guard = __Pyx_get_tp_dict_version(((PyObject *)__pyx_v_self));
|
||||
#endif
|
||||
__pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_make_can_msg); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
__pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_make_can_msg); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg)) {
|
||||
if (!__Pyx_IsSameCFunction(__pyx_t_1, (void*) __pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg)) {
|
||||
__Pyx_XDECREF(__pyx_r);
|
||||
__Pyx_INCREF(__pyx_t_1);
|
||||
__pyx_t_3 = __pyx_t_1; __pyx_t_4 = NULL;
|
||||
@@ -3222,7 +3287,7 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
PyObject *__pyx_callargs[4] = {__pyx_t_4, __pyx_v_name_or_addr, __pyx_v_bus, __pyx_v_values};
|
||||
__pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_5, 3+__pyx_t_5);
|
||||
__Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
|
||||
if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_2);
|
||||
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
||||
}
|
||||
@@ -3244,7 +3309,7 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
#endif
|
||||
}
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":43
|
||||
/* "opendbc/can/packer_pyx.pyx":47
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values):
|
||||
* cdef int addr
|
||||
* if isinstance(name_or_addr, int): # <<<<<<<<<<<<<<
|
||||
@@ -3254,17 +3319,17 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
__pyx_t_6 = PyInt_Check(__pyx_v_name_or_addr);
|
||||
if (__pyx_t_6) {
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":44
|
||||
/* "opendbc/can/packer_pyx.pyx":48
|
||||
* cdef int addr
|
||||
* if isinstance(name_or_addr, int):
|
||||
* addr = name_or_addr # <<<<<<<<<<<<<<
|
||||
* else:
|
||||
* addr = self.name_to_address[name_or_addr.encode("utf8")]
|
||||
*/
|
||||
__pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_name_or_addr); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 44, __pyx_L1_error)
|
||||
__pyx_t_5 = __Pyx_PyInt_As_int(__pyx_v_name_or_addr); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__pyx_v_addr = __pyx_t_5;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":43
|
||||
/* "opendbc/can/packer_pyx.pyx":47
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values):
|
||||
* cdef int addr
|
||||
* if isinstance(name_or_addr, int): # <<<<<<<<<<<<<<
|
||||
@@ -3274,7 +3339,7 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
goto __pyx_L3;
|
||||
}
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":46
|
||||
/* "opendbc/can/packer_pyx.pyx":50
|
||||
* addr = name_or_addr
|
||||
* else:
|
||||
* addr = self.name_to_address[name_or_addr.encode("utf8")] # <<<<<<<<<<<<<<
|
||||
@@ -3282,7 +3347,7 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
* cdef vector[uint8_t] val = self.pack(addr, values)
|
||||
*/
|
||||
/*else*/ {
|
||||
__pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_name_or_addr, __pyx_n_s_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 46, __pyx_L1_error)
|
||||
__pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_name_or_addr, __pyx_n_s_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_2);
|
||||
__pyx_t_3 = NULL;
|
||||
__pyx_t_5 = 0;
|
||||
@@ -3302,57 +3367,57 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_n_u_utf8};
|
||||
__pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_5, 1+__pyx_t_5);
|
||||
__Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
|
||||
if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 46, __pyx_L1_error)
|
||||
if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 50, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
||||
}
|
||||
__pyx_t_7 = __pyx_convert_string_from_py_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 46, __pyx_L1_error)
|
||||
__pyx_t_7 = __pyx_convert_string_from_py_std__in_string(__pyx_t_1); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 50, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
||||
__pyx_v_addr = (__pyx_v_self->name_to_address[__pyx_t_7]);
|
||||
}
|
||||
__pyx_L3:;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":48
|
||||
/* "opendbc/can/packer_pyx.pyx":52
|
||||
* addr = self.name_to_address[name_or_addr.encode("utf8")]
|
||||
*
|
||||
* cdef vector[uint8_t] val = self.pack(addr, values) # <<<<<<<<<<<<<<
|
||||
* return [addr, 0, (<char *>&val[0])[:val.size()], bus]
|
||||
*/
|
||||
__pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_addr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_addr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 52, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
__pyx_t_8 = ((struct __pyx_vtabstruct_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self->__pyx_vtab)->pack(__pyx_v_self, __pyx_t_1, __pyx_v_values); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 48, __pyx_L1_error)
|
||||
__pyx_t_8 = ((struct __pyx_vtabstruct_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self->__pyx_vtab)->pack(__pyx_v_self, __pyx_t_1, __pyx_v_values); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 52, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
||||
__pyx_v_val = __PYX_STD_MOVE_IF_SUPPORTED(__pyx_t_8);
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":49
|
||||
/* "opendbc/can/packer_pyx.pyx":53
|
||||
*
|
||||
* cdef vector[uint8_t] val = self.pack(addr, values)
|
||||
* return [addr, 0, (<char *>&val[0])[:val.size()], bus] # <<<<<<<<<<<<<<
|
||||
*/
|
||||
__Pyx_XDECREF(__pyx_r);
|
||||
__pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_addr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 49, __pyx_L1_error)
|
||||
__pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_addr); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 53, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
__pyx_t_2 = __Pyx_PyBytes_FromStringAndSize(((char *)(&(__pyx_v_val[0]))) + 0, __pyx_v_val.size() - 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 49, __pyx_L1_error)
|
||||
__pyx_t_2 = __Pyx_PyBytes_FromStringAndSize(((char *)(&(__pyx_v_val[0]))) + 0, __pyx_v_val.size() - 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 53, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_2);
|
||||
__pyx_t_3 = PyList_New(4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 49, __pyx_L1_error)
|
||||
__pyx_t_3 = PyList_New(4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 53, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_3);
|
||||
__Pyx_GIVEREF(__pyx_t_1);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_1)) __PYX_ERR(0, 49, __pyx_L1_error);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 0, __pyx_t_1)) __PYX_ERR(0, 53, __pyx_L1_error);
|
||||
__Pyx_INCREF(__pyx_int_0);
|
||||
__Pyx_GIVEREF(__pyx_int_0);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_0)) __PYX_ERR(0, 49, __pyx_L1_error);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_0)) __PYX_ERR(0, 53, __pyx_L1_error);
|
||||
__Pyx_GIVEREF(__pyx_t_2);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 2, __pyx_t_2)) __PYX_ERR(0, 49, __pyx_L1_error);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 2, __pyx_t_2)) __PYX_ERR(0, 53, __pyx_L1_error);
|
||||
__Pyx_INCREF(__pyx_v_bus);
|
||||
__Pyx_GIVEREF(__pyx_v_bus);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 3, __pyx_v_bus)) __PYX_ERR(0, 49, __pyx_L1_error);
|
||||
if (__Pyx_PyList_SET_ITEM(__pyx_t_3, 3, __pyx_v_bus)) __PYX_ERR(0, 53, __pyx_L1_error);
|
||||
__pyx_t_1 = 0;
|
||||
__pyx_t_2 = 0;
|
||||
__pyx_r = __pyx_t_3;
|
||||
__pyx_t_3 = 0;
|
||||
goto __pyx_L0;
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":41
|
||||
/* "opendbc/can/packer_pyx.pyx":45
|
||||
* return self.packer.pack(addr, values_thing)
|
||||
*
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values): # <<<<<<<<<<<<<<
|
||||
@@ -3375,15 +3440,15 @@ static PyObject *__pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(stru
|
||||
}
|
||||
|
||||
/* Python wrapper */
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg(PyObject *__pyx_v_self,
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
#endif
|
||||
); /*proto*/
|
||||
static PyMethodDef __pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg = {"make_can_msg", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0};
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg(PyObject *__pyx_v_self,
|
||||
static PyMethodDef __pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg = {"make_can_msg", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0};
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
@@ -3433,7 +3498,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
(void)__Pyx_Arg_NewRef_FASTCALL(values[0]);
|
||||
kw_args--;
|
||||
}
|
||||
else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
else goto __pyx_L5_argtuple_error;
|
||||
CYTHON_FALLTHROUGH;
|
||||
case 1:
|
||||
@@ -3441,9 +3506,9 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
(void)__Pyx_Arg_NewRef_FASTCALL(values[1]);
|
||||
kw_args--;
|
||||
}
|
||||
else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
else {
|
||||
__Pyx_RaiseArgtupleInvalid("make_can_msg", 1, 3, 3, 1); __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
__Pyx_RaiseArgtupleInvalid("make_can_msg", 1, 3, 3, 1); __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
}
|
||||
CYTHON_FALLTHROUGH;
|
||||
case 2:
|
||||
@@ -3451,14 +3516,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
(void)__Pyx_Arg_NewRef_FASTCALL(values[2]);
|
||||
kw_args--;
|
||||
}
|
||||
else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
else if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
else {
|
||||
__Pyx_RaiseArgtupleInvalid("make_can_msg", 1, 3, 3, 2); __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
__Pyx_RaiseArgtupleInvalid("make_can_msg", 1, 3, 3, 2); __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
}
|
||||
}
|
||||
if (unlikely(kw_args > 0)) {
|
||||
const Py_ssize_t kwd_pos_args = __pyx_nargs;
|
||||
if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "make_can_msg") < 0)) __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "make_can_msg") < 0)) __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
}
|
||||
} else if (unlikely(__pyx_nargs != 3)) {
|
||||
goto __pyx_L5_argtuple_error;
|
||||
@@ -3473,7 +3538,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
}
|
||||
goto __pyx_L6_skip;
|
||||
__pyx_L5_argtuple_error:;
|
||||
__Pyx_RaiseArgtupleInvalid("make_can_msg", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 41, __pyx_L3_error)
|
||||
__Pyx_RaiseArgtupleInvalid("make_can_msg", 1, 3, 3, __pyx_nargs); __PYX_ERR(0, 45, __pyx_L3_error)
|
||||
__pyx_L6_skip:;
|
||||
goto __pyx_L4_argument_unpacking_done;
|
||||
__pyx_L3_error:;
|
||||
@@ -3487,7 +3552,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
__Pyx_RefNannyFinishContext();
|
||||
return NULL;
|
||||
__pyx_L4_argument_unpacking_done:;
|
||||
__pyx_r = __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2make_can_msg(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self), __pyx_v_name_or_addr, __pyx_v_bus, __pyx_v_values);
|
||||
__pyx_r = __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4make_can_msg(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self), __pyx_v_name_or_addr, __pyx_v_bus, __pyx_v_values);
|
||||
|
||||
/* function exit code */
|
||||
{
|
||||
@@ -3500,7 +3565,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2make_can_msg(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, PyObject *__pyx_v_name_or_addr, PyObject *__pyx_v_bus, PyObject *__pyx_v_values) {
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4make_can_msg(struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, PyObject *__pyx_v_name_or_addr, PyObject *__pyx_v_bus, PyObject *__pyx_v_values) {
|
||||
PyObject *__pyx_r = NULL;
|
||||
__Pyx_RefNannyDeclarations
|
||||
PyObject *__pyx_t_1 = NULL;
|
||||
@@ -3509,7 +3574,7 @@ static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2make_can_msg(st
|
||||
int __pyx_clineno = 0;
|
||||
__Pyx_RefNannySetupContext("make_can_msg", 1);
|
||||
__Pyx_XDECREF(__pyx_r);
|
||||
__pyx_t_1 = __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(__pyx_v_self, __pyx_v_name_or_addr, __pyx_v_bus, __pyx_v_values, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
__pyx_t_1 = __pyx_f_7opendbc_3can_10packer_pyx_9CANPacker_make_can_msg(__pyx_v_self, __pyx_v_name_or_addr, __pyx_v_bus, __pyx_v_values, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_1);
|
||||
__pyx_r = __pyx_t_1;
|
||||
__pyx_t_1 = 0;
|
||||
@@ -3533,15 +3598,15 @@ static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_2make_can_msg(st
|
||||
*/
|
||||
|
||||
/* Python wrapper */
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5__reduce_cython__(PyObject *__pyx_v_self,
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__reduce_cython__(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
#endif
|
||||
); /*proto*/
|
||||
static PyMethodDef __pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_5__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0};
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5__reduce_cython__(PyObject *__pyx_v_self,
|
||||
static PyMethodDef __pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_7__reduce_cython__ = {"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0};
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__reduce_cython__(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
@@ -3566,14 +3631,14 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
if (unlikely(__pyx_nargs > 0)) {
|
||||
__Pyx_RaiseArgtupleInvalid("__reduce_cython__", 1, 0, 0, __pyx_nargs); return NULL;}
|
||||
if (unlikely(__pyx_kwds) && __Pyx_NumKwargs_FASTCALL(__pyx_kwds) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__reduce_cython__", 0))) return NULL;
|
||||
__pyx_r = __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4__reduce_cython__(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self));
|
||||
__pyx_r = __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_6__reduce_cython__(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self));
|
||||
|
||||
/* function exit code */
|
||||
__Pyx_RefNannyFinishContext();
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self) {
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_6__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self) {
|
||||
PyObject *__pyx_r = NULL;
|
||||
__Pyx_RefNannyDeclarations
|
||||
int __pyx_lineno = 0;
|
||||
@@ -3613,15 +3678,15 @@ static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_4__reduce_cython
|
||||
*/
|
||||
|
||||
/* Python wrapper */
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__setstate_cython__(PyObject *__pyx_v_self,
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_9__setstate_cython__(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
#endif
|
||||
); /*proto*/
|
||||
static PyMethodDef __pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_7__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0};
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__setstate_cython__(PyObject *__pyx_v_self,
|
||||
static PyMethodDef __pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_9__setstate_cython__ = {"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_9__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0};
|
||||
static PyObject *__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_9__setstate_cython__(PyObject *__pyx_v_self,
|
||||
#if CYTHON_METH_FASTCALL
|
||||
PyObject *const *__pyx_args, Py_ssize_t __pyx_nargs, PyObject *__pyx_kwds
|
||||
#else
|
||||
@@ -3695,7 +3760,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
__Pyx_RefNannyFinishContext();
|
||||
return NULL;
|
||||
__pyx_L4_argument_unpacking_done:;
|
||||
__pyx_r = __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_6__setstate_cython__(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self), __pyx_v___pyx_state);
|
||||
__pyx_r = __pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_8__setstate_cython__(((struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *)__pyx_v_self), __pyx_v___pyx_state);
|
||||
|
||||
/* function exit code */
|
||||
{
|
||||
@@ -3708,7 +3773,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds
|
||||
return __pyx_r;
|
||||
}
|
||||
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_6__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) {
|
||||
static PyObject *__pyx_pf_7opendbc_3can_10packer_pyx_9CANPacker_8__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_7opendbc_3can_10packer_pyx_CANPacker *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) {
|
||||
PyObject *__pyx_r = NULL;
|
||||
__Pyx_RefNannyDeclarations
|
||||
int __pyx_lineno = 0;
|
||||
@@ -3770,6 +3835,14 @@ static void __pyx_tp_dealloc_7opendbc_3can_10packer_pyx_CANPacker(PyObject *o) {
|
||||
}
|
||||
}
|
||||
#endif
|
||||
{
|
||||
PyObject *etype, *eval, *etb;
|
||||
PyErr_Fetch(&etype, &eval, &etb);
|
||||
__Pyx_SET_REFCNT(o, Py_REFCNT(o) + 1);
|
||||
__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_3__dealloc__(o);
|
||||
__Pyx_SET_REFCNT(o, Py_REFCNT(o) - 1);
|
||||
PyErr_Restore(etype, eval, etb);
|
||||
}
|
||||
__Pyx_call_destructor(p->name_to_address);
|
||||
#if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
|
||||
(*Py_TYPE(o)->tp_free)(o);
|
||||
@@ -3782,8 +3855,8 @@ static void __pyx_tp_dealloc_7opendbc_3can_10packer_pyx_CANPacker(PyObject *o) {
|
||||
}
|
||||
|
||||
static PyMethodDef __pyx_methods_7opendbc_3can_10packer_pyx_CANPacker[] = {
|
||||
{"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_5__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0},
|
||||
{"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0},
|
||||
{"__reduce_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_7__reduce_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0},
|
||||
{"__setstate_cython__", (PyCFunction)(void*)(__Pyx_PyCFunction_FastCallWithKeywords)__pyx_pw_7opendbc_3can_10packer_pyx_9CANPacker_9__setstate_cython__, __Pyx_METH_FASTCALL|METH_KEYWORDS, 0},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
#if CYTHON_USE_TYPE_SPECS
|
||||
@@ -3960,17 +4033,17 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
|
||||
__Pyx_RefNannyDeclarations
|
||||
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":41
|
||||
/* "opendbc/can/packer_pyx.pyx":45
|
||||
* return self.packer.pack(addr, values_thing)
|
||||
*
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values): # <<<<<<<<<<<<<<
|
||||
* cdef int addr
|
||||
* if isinstance(name_or_addr, int):
|
||||
*/
|
||||
__pyx_tuple_ = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_name_or_addr, __pyx_n_s_bus, __pyx_n_s_values); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
__pyx_tuple_ = PyTuple_Pack(4, __pyx_n_s_self, __pyx_n_s_name_or_addr, __pyx_n_s_bus, __pyx_n_s_values); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_tuple_);
|
||||
__Pyx_GIVEREF(__pyx_tuple_);
|
||||
__pyx_codeobj__2 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple_, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_opendbc_can_packer_pyx_pyx, __pyx_n_s_make_can_msg, 41, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__2)) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
__pyx_codeobj__2 = (PyObject*)__Pyx_PyCode_New(4, 0, 0, 4, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple_, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_opendbc_can_packer_pyx_pyx, __pyx_n_s_make_can_msg, 45, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__2)) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
|
||||
/* "(tree fragment)":1
|
||||
* def __reduce_cython__(self): # <<<<<<<<<<<<<<
|
||||
@@ -4302,7 +4375,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_packer_pyx(PyObject *__pyx_pyinit_
|
||||
__pyx_t_1 = PyModule_Create(&__pyx_moduledef); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
{
|
||||
int add_module_result = PyState_AddModule(__pyx_t_1, &__pyx_moduledef);
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to packer_pyx pseudovariable */
|
||||
__pyx_t_1 = 0; /* transfer ownership from __pyx_t_1 to "packer_pyx" pseudovariable */
|
||||
if (unlikely((add_module_result < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
pystate_addmodule_run = 1;
|
||||
}
|
||||
@@ -4392,16 +4465,16 @@ if (!__Pyx_RefNanny) {
|
||||
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
||||
#endif
|
||||
|
||||
/* "opendbc/can/packer_pyx.pyx":41
|
||||
/* "opendbc/can/packer_pyx.pyx":45
|
||||
* return self.packer.pack(addr, values_thing)
|
||||
*
|
||||
* cpdef make_can_msg(self, name_or_addr, bus, values): # <<<<<<<<<<<<<<
|
||||
* cdef int addr
|
||||
* if isinstance(name_or_addr, int):
|
||||
*/
|
||||
__pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_3make_can_msg, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANPacker_make_can_msg, NULL, __pyx_n_s_opendbc_can_packer_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__2)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
__pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_5make_can_msg, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANPacker_make_can_msg, NULL, __pyx_n_s_opendbc_can_packer_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__2)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_2);
|
||||
if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7opendbc_3can_10packer_pyx_CANPacker, __pyx_n_s_make_can_msg, __pyx_t_2) < 0) __PYX_ERR(0, 41, __pyx_L1_error)
|
||||
if (__Pyx_SetItemOnTypeDict((PyObject *)__pyx_ptype_7opendbc_3can_10packer_pyx_CANPacker, __pyx_n_s_make_can_msg, __pyx_t_2) < 0) __PYX_ERR(0, 45, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
||||
PyType_Modified(__pyx_ptype_7opendbc_3can_10packer_pyx_CANPacker);
|
||||
|
||||
@@ -4410,7 +4483,7 @@ if (!__Pyx_RefNanny) {
|
||||
* raise TypeError, "self.dbc,self.packer cannot be converted to a Python object for pickling"
|
||||
* def __setstate_cython__(self, __pyx_state):
|
||||
*/
|
||||
__pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_5__reduce_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANPacker___reduce_cython, NULL, __pyx_n_s_opendbc_can_packer_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__4)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 1, __pyx_L1_error)
|
||||
__pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_7__reduce_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANPacker___reduce_cython, NULL, __pyx_n_s_opendbc_can_packer_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__4)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 1, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_2);
|
||||
if (PyDict_SetItem(__pyx_d, __pyx_n_s_reduce_cython, __pyx_t_2) < 0) __PYX_ERR(1, 1, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
||||
@@ -4421,7 +4494,7 @@ if (!__Pyx_RefNanny) {
|
||||
* def __setstate_cython__(self, __pyx_state): # <<<<<<<<<<<<<<
|
||||
* raise TypeError, "self.dbc,self.packer cannot be converted to a Python object for pickling"
|
||||
*/
|
||||
__pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_7__setstate_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANPacker___setstate_cython, NULL, __pyx_n_s_opendbc_can_packer_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__6)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 3, __pyx_L1_error)
|
||||
__pyx_t_2 = __Pyx_CyFunction_New(&__pyx_mdef_7opendbc_3can_10packer_pyx_9CANPacker_9__setstate_cython__, __Pyx_CYFUNCTION_CCLASS, __pyx_n_s_CANPacker___setstate_cython, NULL, __pyx_n_s_opendbc_can_packer_pyx, __pyx_d, ((PyObject *)__pyx_codeobj__6)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 3, __pyx_L1_error)
|
||||
__Pyx_GOTREF(__pyx_t_2);
|
||||
if (PyDict_SetItem(__pyx_d, __pyx_n_s_setstate_cython, __pyx_t_2) < 0) __PYX_ERR(1, 3, __pyx_L1_error)
|
||||
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
||||
@@ -4862,14 +4935,14 @@ static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyO
|
||||
{
|
||||
int eq = __Pyx_PyUnicode_Equals(s, PyTuple_GET_ITEM(kwnames, i), Py_EQ);
|
||||
if (unlikely(eq != 0)) {
|
||||
if (unlikely(eq < 0)) return NULL; // error
|
||||
if (unlikely(eq < 0)) return NULL;
|
||||
return kwvalues[i];
|
||||
}
|
||||
}
|
||||
return NULL; // not found (no exception set)
|
||||
return NULL;
|
||||
}
|
||||
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
|
||||
static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
|
||||
Py_ssize_t i, nkwargs = PyTuple_GET_SIZE(kwnames);
|
||||
PyObject *dict;
|
||||
dict = PyDict_New();
|
||||
@@ -4953,7 +5026,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (*name) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_INCREF(value); // transfer ownership of value to values
|
||||
Py_INCREF(value);
|
||||
Py_DECREF(key);
|
||||
#endif
|
||||
key = NULL;
|
||||
@@ -4972,7 +5045,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
&& _PyString_Eq(**name, key)) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -5004,7 +5077,7 @@ static int __Pyx_ParseOptionalKeywords(
|
||||
if (cmp == 0) {
|
||||
values[name-argnames] = value;
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
value = NULL; // ownership transferred to values
|
||||
value = NULL;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -5504,9 +5577,10 @@ bad:
|
||||
|
||||
/* IterFinish */
|
||||
static CYTHON_INLINE int __Pyx_IterFinish(void) {
|
||||
PyObject* exc_type;
|
||||
__Pyx_PyThreadState_declare
|
||||
__Pyx_PyThreadState_assign
|
||||
PyObject* exc_type = __Pyx_PyErr_CurrentExceptionType();
|
||||
exc_type = __Pyx_PyErr_CurrentExceptionType();
|
||||
if (unlikely(exc_type)) {
|
||||
if (unlikely(!__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)))
|
||||
return -1;
|
||||
@@ -6064,38 +6138,38 @@ static int __Pyx_validate_bases_tuple(const char *type_name, Py_ssize_t dictoffs
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#if !CYTHON_USE_TYPE_SLOTS
|
||||
if (dictoffset == 0) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%s.200s': "
|
||||
"unable to validate whether bases have a __dict__ "
|
||||
"when CYTHON_USE_TYPE_SLOTS is off "
|
||||
"(likely because you are building in the limited API). "
|
||||
"Therefore, all extension types with multiple bases "
|
||||
"must add 'cdef dict __dict__' in this compilation mode",
|
||||
type_name);
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
if (dictoffset == 0 && b->tp_dictoffset)
|
||||
if (dictoffset == 0)
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
Py_ssize_t b_dictoffset = 0;
|
||||
#if CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY
|
||||
b_dictoffset = b->tp_dictoffset;
|
||||
#else
|
||||
PyObject *py_b_dictoffset = PyObject_GetAttrString((PyObject*)b, "__dictoffset__");
|
||||
if (!py_b_dictoffset) goto dictoffset_return;
|
||||
b_dictoffset = PyLong_AsSsize_t(py_b_dictoffset);
|
||||
Py_DECREF(py_b_dictoffset);
|
||||
if (b_dictoffset == -1 && PyErr_Occurred()) goto dictoffset_return;
|
||||
#endif
|
||||
if (b_dictoffset) {
|
||||
{
|
||||
__Pyx_TypeName b_name = __Pyx_PyType_GetName(b);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"extension type '%.200s' has no __dict__ slot, "
|
||||
"but base type '" __Pyx_FMT_TYPENAME "' has: "
|
||||
"either add 'cdef dict __dict__' to the extension type "
|
||||
"or add '__slots__ = [...]' to the base type",
|
||||
type_name, b_name);
|
||||
__Pyx_DECREF_TypeName(b_name);
|
||||
}
|
||||
#if !(CYTHON_USE_TYPE_SLOTS || CYTHON_COMPILING_IN_PYPY)
|
||||
dictoffset_return:
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if CYTHON_AVOID_BORROWED_REFS
|
||||
Py_DECREF(b0);
|
||||
#endif
|
||||
@@ -7885,7 +7959,7 @@ static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(
|
||||
#else
|
||||
py_code = PyCode_NewEmpty(filename, funcname, py_line);
|
||||
#endif
|
||||
Py_XDECREF(py_funcname); // XDECREF since it's only set on Py3 if cline
|
||||
Py_XDECREF(py_funcname);
|
||||
return py_code;
|
||||
bad:
|
||||
Py_XDECREF(py_funcname);
|
||||
|
||||
Binary file not shown.
+318
-243
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -22,18 +22,47 @@ BO_ 280 ECM_TRQ: 8 XXX
|
||||
|
||||
BO_ 284 ESP_8: 8 XXX
|
||||
SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 288 ECM_2: 7 XXX
|
||||
SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX
|
||||
SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX
|
||||
|
||||
BO_ 320 ESP_1: 8 XXX
|
||||
SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX
|
||||
SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX
|
||||
SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX
|
||||
|
||||
BO_ 268 ESP_2: 8 ESC
|
||||
SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX
|
||||
SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX
|
||||
SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX
|
||||
|
||||
BO_ 344 ESP_6: 8 XXX
|
||||
SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX
|
||||
SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX
|
||||
@@ -72,7 +101,11 @@ BO_ 501 DAS_4: 8 XXX
|
||||
SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX
|
||||
SG_ ACC_STATE : 38|3@0+ (1,0) [0|7] "" XXX
|
||||
SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 544 EPS_2: 8 XXX
|
||||
SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX
|
||||
@@ -112,6 +145,11 @@ BO_ 625 DAS_5: 8 XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 669 EPB_1: 3 XXX
|
||||
SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX
|
||||
SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 678 DAS_6: 8 XXX
|
||||
SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX
|
||||
@@ -134,11 +172,14 @@ BO_ 820 BCM_1: 8 XXX
|
||||
SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
VAL_ 320 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE"
|
||||
VAL_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ;
|
||||
VAL_ 669 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ;
|
||||
|
||||
CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision";
|
||||
CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque";
|
||||
@@ -219,12 +260,6 @@ BO_ 608 PARKSENSE_SIGNAL: 8 XXX
|
||||
BO_ 729 LKAS_HEARTBIT: 5 XXX
|
||||
SG_ LKAS_STATUS_OK : 31|16@0+ (1,0) [0|65535] "" XXX
|
||||
|
||||
BO_ 288 ACCEL_RELATED_120: 7 XXX
|
||||
SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ ACCEL : 23|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ GAS_ENGINE_RPM_MAYBE : 31|16@0+ (1,0) [0|65535] "" XXX
|
||||
|
||||
BO_ 257 ACCEL_RELATED_101: 5 XXX
|
||||
SG_ ENERGY_OR_RPM : 31|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
@@ -288,11 +323,6 @@ BO_ 324 SPEED_2: 8 XXX
|
||||
BO_ 832 UNKNOWN_340: 8 XXX
|
||||
SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX
|
||||
|
||||
BO_ 268 ACC_10c: 8 XXX
|
||||
SG_ BRAKE_PERHAPS : 48|1@0+ (1,0) [0|3] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ SG_ 653 BRAKE_PRESSURE "max seems to be 148";
|
||||
CM_ SG_ 746 PRNDL "5=L, 4=D, 3=N, 2=R, 1=P";
|
||||
CM_ SG_ 320 BRAKE_PRESSED_2 "Value is 5 when brake is pressed by human, 1 when ACC brake";
|
||||
|
||||
@@ -24,18 +24,47 @@ BO_ 181 ECM_TRQ: 8 XXX
|
||||
|
||||
BO_ 121 ESP_8: 8 XXX
|
||||
SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 123 ECM_2: 7 XXX
|
||||
SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX
|
||||
SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX
|
||||
|
||||
BO_ 131 ESP_1: 8 XXX
|
||||
SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX
|
||||
SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX
|
||||
SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX
|
||||
|
||||
BO_ 113 ESP_2: 8 ESC
|
||||
SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX
|
||||
SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX
|
||||
SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX
|
||||
|
||||
BO_ 139 ESP_6: 8 XXX
|
||||
SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX
|
||||
SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX
|
||||
@@ -74,7 +103,11 @@ BO_ 232 DAS_4: 8 XXX
|
||||
SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX
|
||||
SG_ ACC_STATE : 38|3@0+ (1,0) [0|7] "" XXX
|
||||
SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 49 EPS_2: 8 XXX
|
||||
SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX
|
||||
@@ -114,6 +147,11 @@ BO_ 163 DAS_5: 8 XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 213 EPB_1: 3 XXX
|
||||
SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX
|
||||
SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 250 DAS_6: 8 XXX
|
||||
SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX
|
||||
@@ -136,11 +174,14 @@ BO_ 657 BCM_1: 8 XXX
|
||||
SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
VAL_ 131 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE"
|
||||
VAL_ 147 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ;
|
||||
VAL_ 213 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ;
|
||||
|
||||
CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision";
|
||||
CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque";
|
||||
@@ -158,10 +199,14 @@ BO_ 53 PCM_2: 8 XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
|
||||
BO_ 133 TCM_1: 8 XXX
|
||||
SG_ DESIRED_GEAR : 15|4@0+ (1,0) [0|1] "" XXX
|
||||
SG_ SHIFT_PENDING : 2|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ SPEED_TURBINE : 27|12@0+ (0.04,0) [0|1] "km/h" XXX
|
||||
SG_ ACTUAL_GEAR : 11|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ DESIRED_GEAR : 15|4@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TC_LOCKED : 17|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ OUTPUT_SPEED : 31|16@0+ (1,0) [0|65534] "rpm" XXX
|
||||
SG_ INPUT_SPEED : 47|16@0+ (1,0) [0|65534] "rpm" XXX
|
||||
SG_ OUTPUT_SPEED_SIGN : 57|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ COUNTER : 61|4@0+ (1,0) [0|15] "" XXX
|
||||
|
||||
BO_ 135 ABS_2: 8 XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
@@ -24,18 +24,47 @@ BO_ 280 ECM_TRQ: 8 XXX
|
||||
|
||||
BO_ 284 ESP_8: 8 XXX
|
||||
SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 288 ECM_2: 7 XXX
|
||||
SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX
|
||||
SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX
|
||||
|
||||
BO_ 320 ESP_1: 8 XXX
|
||||
SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX
|
||||
SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX
|
||||
SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX
|
||||
|
||||
BO_ 268 ESP_2: 8 ESC
|
||||
SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX
|
||||
SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX
|
||||
SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX
|
||||
|
||||
BO_ 344 ESP_6: 8 XXX
|
||||
SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX
|
||||
SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX
|
||||
@@ -74,7 +103,11 @@ BO_ 501 DAS_4: 8 XXX
|
||||
SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX
|
||||
SG_ ACC_STATE : 38|3@0+ (1,0) [0|7] "" XXX
|
||||
SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 544 EPS_2: 8 XXX
|
||||
SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX
|
||||
@@ -114,6 +147,11 @@ BO_ 625 DAS_5: 8 XXX
|
||||
SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 669 EPB_1: 3 XXX
|
||||
SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX
|
||||
SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX
|
||||
SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
BO_ 629 DAS_6: 8 XXX
|
||||
SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX
|
||||
SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX
|
||||
@@ -136,11 +174,14 @@ BO_ 820 BCM_1: 8 XXX
|
||||
SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
VAL_ 320 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE"
|
||||
VAL_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ;
|
||||
VAL_ 669 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ;
|
||||
|
||||
CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision";
|
||||
CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque";
|
||||
|
||||
@@ -125,6 +125,10 @@ BO_ 320 BCMTurnSignals: 3 K9_BCM
|
||||
SG_ HighBeamsActive : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ HighBeamsTemporary : 5|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 322 BCMBlindSpotMonitor: 7 K9_BCM
|
||||
SG_ LeftBSM : 6|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ RightBSM : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 328 PSCM_148: 1 K43_PSCM
|
||||
|
||||
BO_ 381 ESPStatus: 6 K20_ECM
|
||||
@@ -244,12 +248,10 @@ BO_ 840 EBCMWheelSpdFront: 5 K17_EBCM
|
||||
SG_ FRWheelSpd : 23|16@0+ (0.0311,0) [0|255] "km/h" NEO
|
||||
|
||||
BO_ 842 EBCMWheelSpdRear: 5 K17_EBCM
|
||||
SG_ RLWheelSpd : 7|16@0+ (0.0311,0) [0|255] "km/h" NEO
|
||||
SG_ RRWheelSpd : 23|16@0+ (0.0311,0) [0|255] "km/h" NEO
|
||||
SG_ MovingForward : 32|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ MovingBackward : 33|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ MovingForward2 : 35|1@1+ (1,0) [0|1] "" XXX
|
||||
SG_ MovingBackward2 : 36|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ RLWheelSpd : 7|16@0+ (0.0311,0) [0|255] "km/h" NEO
|
||||
SG_ RRWheelSpd : 23|16@0+ (0.0311,0) [0|255] "km/h" NEO
|
||||
SG_ RRWheelDir : 34|3@0+ (1,0) [0|7] "" NEO
|
||||
SG_ RLWheelDir : 37|3@0+ (1,0) [0|7] "" NEO
|
||||
|
||||
BO_ 869 ASCM_365: 4 K124_ASCM
|
||||
|
||||
@@ -317,6 +319,8 @@ CM_ BU_ K124_ASCM "Active Safety Control Module";
|
||||
CM_ SG_ 381 MSG17D_AccPower "Need to investigate";
|
||||
CM_ BO_ 190 "Length varies from 6 to 8 bytes by car";
|
||||
CM_ SG_ 190 GasPedalAndAcc "ACC baseline is 62";
|
||||
CM_ SG_ 322 LeftBSM "For some cars, this can only be when the blinker is also active";
|
||||
CM_ SG_ 322 RightBSM "For some cars, this can only be when the blinker is also active";
|
||||
CM_ SG_ 352 ImmobilizerInfo "Non-zero when ignition or accessory mode";
|
||||
CM_ SG_ 451 GasPedalAndAcc2 "ACC baseline is 62";
|
||||
CM_ SG_ 481 ACCAlwaysOne "Usually 1 if the car is equipped with ACC";
|
||||
@@ -347,6 +351,8 @@ VAL_ 452 CruiseState 4 "Standstill" 3 "Faulted" 1 "Active" 0 "Off" ;
|
||||
VAL_ 309 PRNDL 3 "R" 2 "D" 1 "N" 0 "P" ;
|
||||
VAL_ 309 ESPButton 1 "Active" 0 "Inactive" ;
|
||||
VAL_ 384 LKASteeringCmdActive 1 "Active" 0 "Inactive" ;
|
||||
VAL_ 842 RRWheelDir 0 "Stationary" 1 "Forward" 2 "Reverse" 3 "Unsupported" 4 "Fault";
|
||||
VAL_ 842 RLWheelDir 0 "Stationary" 1 "Forward" 2 "Reverse" 3 "Unsupported" 4 "Fault";
|
||||
VAL_ 880 ACCCruiseState 2 "Adaptive" 3 "Adaptive" 4 "Non-adaptive" 5 "Non-adaptive" ;
|
||||
VAL_ 880 ACCLeadCar 1 "Present" 0 "Not Present" ;
|
||||
VAL_ 880 ACCGapLevel 3 "Far" 2 "Med" 1 "Near" 0 "Inactive" ;
|
||||
|
||||
@@ -279,6 +279,7 @@ BO_ 289 ES_STATIC_2: 8 XXX
|
||||
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
|
||||
SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
|
||||
SG_ SET_3 : 15|2@1+ (1,0) [0|3] "" XXX
|
||||
SG_ Cruise_Fault : 18|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
|
||||
CM_ SG_ 313 Brake_Lights "Driver or Cruise Brake on";
|
||||
@@ -322,8 +323,8 @@ BO_ 545 ES_Distance: 8 XXX
|
||||
SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
|
||||
SG_ Signal1 : 12|3@1+ (1,0) [0|7] "" XXX
|
||||
SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX
|
||||
SG_ Cruise_Throttle : 16|12@1+ (1,0) [0|4095] "" XXX
|
||||
SG_ Signal2 : 28|4@1+ (1,0) [0|15] "" XXX
|
||||
SG_ Cruise_Throttle : 16|13@1+ (1,0) [0|4095] "" XXX
|
||||
SG_ Signal2 : 29|3@1+ (1,0) [0|15] "" XXX
|
||||
SG_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
|
||||
SG_ Low_Speed_Follow : 33|1@1+ (1,0) [0|1] "" XXX
|
||||
SG_ Cruise_Soft_Disable : 34|1@1+ (1,0) [0|1] "" XXX
|
||||
@@ -344,8 +345,7 @@ BO_ 546 ES_Status: 8 XXX
|
||||
SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
|
||||
SG_ Signal1 : 12|3@1+ (1,0) [0|1] "" XXX
|
||||
SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX
|
||||
SG_ Cruise_RPM : 16|12@1+ (1,0) [0|4095] "" XXX
|
||||
SG_ Signal2 : 28|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Cruise_RPM : 16|13@1+ (1,0) [0|4095] "" XXX
|
||||
SG_ Cruise_Activated : 29|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ Brake_Lights : 30|1@1+ (1,0) [0|1] "" XXX
|
||||
SG_ Cruise_Hold : 31|1@1+ (1,0) [0|1] "" XXX
|
||||
|
||||
@@ -279,6 +279,7 @@ BO_ 289 ES_STATIC_2: 8 XXX
|
||||
SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
|
||||
SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" XXX
|
||||
SG_ SET_3 : 15|2@1+ (1,0) [0|3] "" XXX
|
||||
SG_ Cruise_Fault : 18|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
|
||||
CM_ SG_ 313 Brake_Lights "Driver or Cruise Brake on";
|
||||
|
||||
@@ -38,6 +38,12 @@ CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor th
|
||||
BO_ 767 SDSU: 8 XXX
|
||||
SG_ FD_BUTTON : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 1880 DEBUG: 8 XXX
|
||||
SG_ BLINDSPOTSIDE : 7|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOT : 38|1@0+ (1,0) [0|15] "" XXX
|
||||
SG_ BLINDSPOTD1 : 47|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ "BO_ SDSU: The sDSU is a modified DSU for use in TSS1 Toyotas. Learn more: https://github.com/wocsor/panda/tree/smart_dsu";
|
||||
CM_ SG_ 767 FD_BUTTON "The follow distance button signal as forwarded by the sdsu";
|
||||
|
||||
@@ -426,12 +432,6 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
|
||||
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 1880 DEBUG: 8 XXX
|
||||
SG_ BLINDSPOTSIDE : 7|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOT : 38|1@0+ (1,0) [0|15] "" XXX
|
||||
SG_ BLINDSPOTD1 : 47|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ SG_ 36 YAW_RATE "verify";
|
||||
CM_ SG_ 36 ACCEL_X "x-axis accel";
|
||||
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
|
||||
|
||||
@@ -38,6 +38,12 @@ CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor th
|
||||
BO_ 767 SDSU: 8 XXX
|
||||
SG_ FD_BUTTON : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 1880 DEBUG: 8 XXX
|
||||
SG_ BLINDSPOTSIDE : 7|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOT : 38|1@0+ (1,0) [0|15] "" XXX
|
||||
SG_ BLINDSPOTD1 : 47|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ "BO_ SDSU: The sDSU is a modified DSU for use in TSS1 Toyotas. Learn more: https://github.com/wocsor/panda/tree/smart_dsu";
|
||||
CM_ SG_ 767 FD_BUTTON "The follow distance button signal as forwarded by the sdsu";
|
||||
|
||||
@@ -426,12 +432,6 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
|
||||
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 1880 DEBUG: 8 XXX
|
||||
SG_ BLINDSPOTSIDE : 7|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOT : 38|1@0+ (1,0) [0|15] "" XXX
|
||||
SG_ BLINDSPOTD1 : 47|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ SG_ 36 YAW_RATE "verify";
|
||||
CM_ SG_ 36 ACCEL_X "x-axis accel";
|
||||
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
|
||||
|
||||
@@ -38,6 +38,12 @@ CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor th
|
||||
BO_ 767 SDSU: 8 XXX
|
||||
SG_ FD_BUTTON : 7|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 1880 DEBUG: 8 XXX
|
||||
SG_ BLINDSPOTSIDE : 7|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOT : 38|1@0+ (1,0) [0|15] "" XXX
|
||||
SG_ BLINDSPOTD1 : 47|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ "BO_ SDSU: The sDSU is a modified DSU for use in TSS1 Toyotas. Learn more: https://github.com/wocsor/panda/tree/smart_dsu";
|
||||
CM_ SG_ 767 FD_BUTTON "The follow distance button signal as forwarded by the sdsu";
|
||||
|
||||
@@ -426,12 +432,6 @@ BO_ 1592 DOOR_LOCKS: 8 XXX
|
||||
SG_ LOCK_STATUS : 20|1@0+ (1,0) [0|1] "" XXX
|
||||
SG_ LOCKED_VIA_KEYFOB : 23|1@0+ (1,0) [0|1] "" XXX
|
||||
|
||||
BO_ 1880 DEBUG: 8 XXX
|
||||
SG_ BLINDSPOTSIDE : 7|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOT : 38|1@0+ (1,0) [0|15] "" XXX
|
||||
SG_ BLINDSPOTD1 : 47|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ BLINDSPOTD2 : 55|8@0+ (1,0) [0|255] "" XXX
|
||||
|
||||
CM_ SG_ 36 YAW_RATE "verify";
|
||||
CM_ SG_ 36 ACCEL_X "x-axis accel";
|
||||
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
|
||||
|
||||
@@ -15,7 +15,6 @@ typedef float (*board_get_channel_power)(uint8_t channel);
|
||||
typedef uint16_t (*board_get_sbu_mV)(uint8_t channel, uint8_t sbu);
|
||||
|
||||
struct board {
|
||||
const char *board_type;
|
||||
const bool has_canfd;
|
||||
const bool has_sbu_sense;
|
||||
const uint16_t avdd_mV;
|
||||
@@ -36,7 +35,6 @@ struct board {
|
||||
|
||||
// TODO: shouldn't need these
|
||||
bool has_spi;
|
||||
bool has_hw_gmlan;
|
||||
};
|
||||
|
||||
// ******************* Definitions ********************
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// ///////////////////////// //
|
||||
// Jungle board v1 (STM32F4) //
|
||||
// ///////////////////////// //
|
||||
|
||||
void board_v1_set_led(uint8_t color, bool enabled) {
|
||||
switch (color) {
|
||||
@@ -155,7 +158,6 @@ void board_v1_init(void) {
|
||||
void board_v1_tick(void) {}
|
||||
|
||||
const board board_v1 = {
|
||||
.board_type = "V1",
|
||||
.has_canfd = false,
|
||||
.has_sbu_sense = false,
|
||||
.avdd_mV = 3300U,
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// ///////////////////////// //
|
||||
// Jungle board v2 (STM32H7) //
|
||||
// ///////////////////////// //
|
||||
|
||||
const gpio_t power_pins[] = {
|
||||
{.bank = GPIOA, .pin = 0},
|
||||
@@ -305,7 +308,6 @@ void board_v2_init(void) {
|
||||
void board_v2_tick(void) {}
|
||||
|
||||
const board board_v2 = {
|
||||
.board_type = "V2",
|
||||
.has_canfd = true,
|
||||
.has_sbu_sense = true,
|
||||
.avdd_mV = 3300U,
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
void debug_ring_callback(uart_ring *ring) {
|
||||
char rcv;
|
||||
while (getc(ring, &rcv)) {
|
||||
while (get_char(ring, &rcv)) {
|
||||
(void)injectc(ring, rcv);
|
||||
}
|
||||
}
|
||||
@@ -155,7 +155,7 @@ int main(void) {
|
||||
}
|
||||
|
||||
print("Config:\n");
|
||||
print(" Board type: "); print(current_board->board_type); print("\n");
|
||||
print(" Board type: 0x"); puth(hw_type); print("\n");
|
||||
|
||||
// init board
|
||||
current_board->init();
|
||||
|
||||
@@ -29,7 +29,7 @@ int get_jungle_health_pkt(void *dat) {
|
||||
}
|
||||
|
||||
// send on serial, first byte to select the ring
|
||||
void comms_endpoint2_write(uint8_t *data, uint32_t len) {
|
||||
void comms_endpoint2_write(const uint8_t *data, uint32_t len) {
|
||||
UNUSED(data);
|
||||
UNUSED(len);
|
||||
}
|
||||
@@ -192,7 +192,7 @@ int comms_control_handler(ControlPacket_t *req, uint8_t *resp) {
|
||||
// **** 0xe0: debug read
|
||||
case 0xe0:
|
||||
// read
|
||||
while ((resp_len < MIN(req->length, USBPACKET_MAX_SIZE)) && getc(get_ring_by_number(0), (char*)&resp[resp_len])) {
|
||||
while ((resp_len < MIN(req->length, USBPACKET_MAX_SIZE)) && get_char(get_ring_by_number(0), (char*)&resp[resp_len])) {
|
||||
++resp_len;
|
||||
}
|
||||
break;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
const uint8_t gitversion[] = "DEV-4ba36d72-DEBUG";
|
||||
const uint8_t gitversion[] = "DEV-e92d1f09-DEBUG";
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user