chore(color): color UI code cleanup - round 3 (#5351)

radio/src/storage/modelslist.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _MODELSLIST_H_
-#define _MODELSLIST_H_
+#pragma once
 
 #include <stdint.h>
 
@@ -281,5 +280,3 @@ ModelLabelsVector getUniqueLabels();
 
 extern ModelsList modelslist;
 extern ModelMap modelslabels;
-
-#endif  // _MODELSLIST_H_

radio/src/storage/sdcard_yaml.h

@@ -22,7 +22,8 @@
 #pragma once
 
 enum class ChecksumResult {Success, Failed, None};
-#include "sdcard_common.h" // TODO CHECK REQUIRED
+
+struct YamlParserCalls;
 
 constexpr uint8_t MODELIDX_STRLEN = sizeof(MODEL_FILENAME_PREFIX "00");
 
@@ -32,3 +33,7 @@ const char * readModelYaml(const char * filename, uint8_t * buffer, uint32_t siz
 bool YamlFileChecksum(const YamlNode* root_node, uint8_t* data, uint16_t* checksum);
 
 void getModelNumberStr(uint8_t idx, char* model_idx);
+
+const char* readYamlFile(const char* fullpath,
+                         const YamlParserCalls* calls, void* parser_ctx,
+                         ChecksumResult* checksum_result);

radio/src/storage/yaml/yaml_bits.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _yaml_bits_h_
-#define _yaml_bits_h_
+#pragma once
 
 #include <stdint.h>
 
@@ -45,5 +44,3 @@ char* yaml_unsigned2hex(uint32_t i);
 char* yaml_rgb2hex(uint32_t i);
 
 int32_t yaml_to_signed(uint32_t i, uint32_t bits);
-
-#endif

radio/src/storage/yaml/yaml_datastructs.h

@@ -19,13 +19,10 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _YAML_DATASTRUCTS_H_
-#define _YAML_DATASTRUCTS_H_
+#pragma once
 
 struct YamlNode;
 
 const YamlNode* get_radiodata_nodes();
 const YamlNode* get_modeldata_nodes();
 const YamlNode* get_partialmodel_nodes();
-
-#endif

radio/src/storage/yaml/yaml_defs.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _YAML_DEFS_H_
-#define _YAML_DEFS_H_
+#pragma once
 
 #if defined(YAML_GENERATOR)
 
@@ -71,5 +70,3 @@
 #define CUST_IDX(tag, read, write)
 
 #endif
-
-#endif

radio/src/storage/yaml/yaml_labelslist.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _YAML_LABELSLIST_H_
-#define _YAML_LABELSLIST_H_
+#pragma once
 
 #define MODULE_ID_STR "mod%did"
 #define MODULE_TYPE_STR "mod%dtype"
@@ -30,5 +29,3 @@ struct YamlParserCalls;
 
 void* get_labelslist_iter();
 const YamlParserCalls* get_labelslist_parser_calls();
-
-#endif

radio/src/storage/yaml/yaml_modelslist.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _YAML_MODELSLIST_H_
-#define _YAML_MODELSLIST_H_
+#pragma once
 
 #include <vector>
 #include <string>
@@ -29,5 +28,3 @@ struct YamlParserCalls;
 
 void* get_modelslist_iter(std::vector<std::string>* filelist);
 const YamlParserCalls* get_modelslist_parser_calls();
-
-#endif

radio/src/storage/yaml/yaml_node.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _node_h_
-#define _node_h_
+#pragma once
 
 #include <stdint.h>
 #include <stddef.h>
@@ -210,5 +209,3 @@ struct YamlNode
     { 0, YDT_ARRAY, 1, NULL, {{ (nodes), {{ NULL }}}} }
 
 #endif
-
-#endif

radio/src/storage/yaml/yaml_parser.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _yaml_parser_h_
-#define _yaml_parser_h_
+#pragma once
 
 #include <stdint.h>
 
@@ -102,5 +101,3 @@ public:
 
     void set_eof() { eof = true; }
 };
-
-#endif

radio/src/storage/yaml/yaml_tree_walker.h

@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _YAML_TREE_WALKER_H_
-#define _YAML_TREE_WALKER_H_
+#pragma once
 
 #include <stdint.h>
 #include "yaml_node.h"
@@ -168,6 +167,3 @@ public:
 // utils
 uint32_t yaml_parse_enum(const struct YamlIdStr* choices, const char* val, uint8_t val_len);
 const char* yaml_output_enum(int32_t i, const struct YamlIdStr* choices);
-
-
-#endif