Skip to content

Add support for 14 additional TPMS protocols #3003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jLynx wants to merge 1 commit into
base: next
Choose a base branch
from
+594 −3
Draft

Add support for 14 additional TPMS protocols #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions firmware/application/external/tpmsrx/tpms_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,34 @@ std::string type_name(tpms::Reading::Type type) {
return "Schrader";
case tpms::Reading::Type::GMC_96:
return "GMC_96";
case tpms::Reading::Type::Toyota:
return "Toyota";
case tpms::Reading::Type::Ford:
return "Ford";
case tpms::Reading::Type::Citroen:
return "Citroen";
case tpms::Reading::Type::Renault:
return "Renault";
case tpms::Reading::Type::Hyundai_VDO:
return "Hyundai-VDO";
case tpms::Reading::Type::Nissan:
return "Nissan";
case tpms::Reading::Type::Abarth124:
return "Abarth124";
case tpms::Reading::Type::Jansite:
return "Jansite";
case tpms::Reading::Type::Jansite_Solar:
return "Jansite-Solar";
case tpms::Reading::Type::Kia:
return "Kia";
case tpms::Reading::Type::Elantra2012:
return "Elantra2012";
case tpms::Reading::Type::PMV107J:
return "PMV-107J";
case tpms::Reading::Type::Renault_0435R:
return "Renault-0435R";
case tpms::Reading::Type::AVE:
return "AVE";
default:
return "Unknown";
}
Expand Down
31 changes: 29 additions & 2 deletions firmware/application/external/tpmstx/tpms_tx_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,20 @@ void TPMSTXView::update_signal_type_from_packet() {
case tpms::Reading::Type::FLM_64:
case tpms::Reading::Type::FLM_72:
case tpms::Reading::Type::FLM_80:
case tpms::Reading::Type::Toyota:
case tpms::Reading::Type::Ford:
case tpms::Reading::Type::Citroen:
case tpms::Reading::Type::Renault:
case tpms::Reading::Type::Hyundai_VDO:
case tpms::Reading::Type::Nissan:
case tpms::Reading::Type::Abarth124:
case tpms::Reading::Type::Jansite:
case tpms::Reading::Type::Jansite_Solar:
case tpms::Reading::Type::Kia:
case tpms::Reading::Type::Elantra2012:
case tpms::Reading::Type::PMV107J:
case tpms::Reading::Type::Renault_0435R:
case tpms::Reading::Type::AVE:
signal_type_ = tpms::SignalType::FSK_19k2_Schrader;
break;
case tpms::Reading::Type::GMC_96:
Expand Down Expand Up @@ -103,7 +117,20 @@ void TPMSTXView::update_packet_display() {
if (packet_type_ == tpms::Reading::Type::GMC_96 ||
packet_type_ == tpms::Reading::Type::FLM_64 ||
packet_type_ == tpms::Reading::Type::FLM_72 ||
packet_type_ == tpms::Reading::Type::FLM_80) {
packet_type_ == tpms::Reading::Type::FLM_80 ||
packet_type_ == tpms::Reading::Type::Toyota ||
packet_type_ == tpms::Reading::Type::Ford ||
packet_type_ == tpms::Reading::Type::Citroen ||
packet_type_ == tpms::Reading::Type::Renault ||
packet_type_ == tpms::Reading::Type::Hyundai_VDO ||
packet_type_ == tpms::Reading::Type::Abarth124 ||
packet_type_ == tpms::Reading::Type::Jansite ||
packet_type_ == tpms::Reading::Type::Jansite_Solar ||
packet_type_ == tpms::Reading::Type::Kia ||
packet_type_ == tpms::Reading::Type::Elantra2012 ||
packet_type_ == tpms::Reading::Type::PMV107J ||
packet_type_ == tpms::Reading::Type::Renault_0435R ||
packet_type_ == tpms::Reading::Type::AVE) {
status += " " + to_string_dec_int(temperature_c_) + "C";
} else {
status += " (no temp)";
Expand Down Expand Up @@ -724,7 +751,7 @@ TPMSTXView::TPMSTXView(NavigationView& nav)
if (!type_str.empty()) {
int type = std::stoi(type_str);
if (type >= static_cast<int>(tpms::Reading::Type::FLM_64) &&
type <= static_cast<int>(tpms::Reading::Type::GMC_96)) {
type <= static_cast<int>(tpms::Reading::Type::AVE)) {
packet_type_ = static_cast<tpms::Reading::Type>(type);
options_packet_type.set_by_value(type);
}
Expand Down
16 changes: 15 additions & 1 deletion firmware/application/external/tpmstx/tpms_tx_app.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,27 @@ class TPMSTXView : public View {

OptionsField options_packet_type{
{6 * 8, 1 * 16},
10,
12,
{
{"Schrader", (int32_t)tpms::Reading::Type::Schrader},
{"FLM_64", (int32_t)tpms::Reading::Type::FLM_64},
{"FLM_72", (int32_t)tpms::Reading::Type::FLM_72},
{"FLM_80", (int32_t)tpms::Reading::Type::FLM_80},
{"GMC_96", (int32_t)tpms::Reading::Type::GMC_96},
{"Toyota", (int32_t)tpms::Reading::Type::Toyota},
{"Ford", (int32_t)tpms::Reading::Type::Ford},
{"Citroen", (int32_t)tpms::Reading::Type::Citroen},
{"Renault", (int32_t)tpms::Reading::Type::Renault},
{"Hyundai", (int32_t)tpms::Reading::Type::Hyundai_VDO},
{"Nissan", (int32_t)tpms::Reading::Type::Nissan},
{"Abarth", (int32_t)tpms::Reading::Type::Abarth124},
{"Jansite", (int32_t)tpms::Reading::Type::Jansite},
{"Jansite-S", (int32_t)tpms::Reading::Type::Jansite_Solar},
{"Kia", (int32_t)tpms::Reading::Type::Kia},
{"Elantra", (int32_t)tpms::Reading::Type::Elantra2012},
{"PMV107J", (int32_t)tpms::Reading::Type::PMV107J},
{"Renault-R", (int32_t)tpms::Reading::Type::Renault_0435R},
{"AVE", (int32_t)tpms::Reading::Type::AVE},
}};

OptionsField options_pressure{
Expand Down
Loading