From 4e56f524fdfe5a996eaab5d65a0f6e7da5851aaf Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Mon, 13 Dec 2021 19:46:51 +1000 Subject: [PATCH] `FUNC_SOUNDS`, not `FUNC_FIRST_WITHOUT_ENABLE` --- radio/src/dataconstants.h | 2 +- radio/src/storage/yaml/yaml_datastructs_nv14.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_t12.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_t8.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_tlite.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_tx12.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x10.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x12s.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x7.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x9d.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x9e.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x9lite.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_x9lites.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_xlite.cpp | 1 - radio/src/storage/yaml/yaml_datastructs_xlites.cpp | 1 - 15 files changed, 1 insertion(+), 15 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index a3b374c4e..fd108bf56 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -813,7 +813,7 @@ enum Functions { FUNC_RANGECHECK, FUNC_BIND, // then the other functions - FUNC_FIRST_WITHOUT_ENABLE, + FUNC_FIRST_WITHOUT_ENABLE SKIP, FUNC_PLAY_SOUND = FUNC_FIRST_WITHOUT_ENABLE, FUNC_PLAY_TRACK, FUNC_PLAY_VALUE, diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index 630bb8d87..c7b5b5070 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp index 351bc34de..9f0a9a2d9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp index 351bc34de..9f0a9a2d9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp index 351bc34de..9f0a9a2d9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp index 8209c9c9e..dcd423eb4 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index ea9d0ead6..46a2d5c7e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp index 3ce7524ac..8fe2b54b3 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp index 351bc34de..9f0a9a2d9 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index c7387384a..84fcfce79 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index 9e1b8ac36..9bdc6d821 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp index 8dce40971..16c328337 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp index 90a62a1fa..38b94d9be 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index 92efe6570..e81a59816 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" }, diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index a0356abbb..f4b621251 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = { { FUNC_SET_FAILSAFE, "SET_FAILSAFE" }, { FUNC_RANGECHECK, "RANGECHECK" }, { FUNC_BIND, "BIND" }, - { FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE" }, { FUNC_PLAY_SOUND, "PLAY_SOUND" }, { FUNC_PLAY_TRACK, "PLAY_TRACK" }, { FUNC_PLAY_VALUE, "PLAY_VALUE" },