fix against regression of GitHub Actions CI build

lyusupov · Aug 3, 2023 · 7613da4 · 7613da4
1 parent cda0bf9
commit 7613da4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/software/firmware/source/libraries/LibAPRS_ESP32/parse_aprs.cpp b/software/firmware/source/libraries/LibAPRS_ESP32/parse_aprs.cpp
@@ -2051,10 +2051,7 @@ int ParseAPRS::parse_aprs_wx(struct pbuf_t* pb, char const* input, unsigned int
 
 void ParseAPRS::parse_aprs_comment(struct pbuf_t* pb, char const* input, unsigned int const input_len)
 {
-	char course[4], speed[4], range[5], altitude[7], dao[3];
-#if defined(SOFTRF_SKETCH)
-	char id[9];
-#endif /* SOFTRF_SKETCH */
+	char course[4], speed[4], range[5], altitude[7], dao[3], id[9];
 	int i, tmp_s;
 	char* tmp_str, * rest = NULL;
 	unsigned int rest_len = 0, tmp_us;
@@ -2221,7 +2218,6 @@ void ParseAPRS::parse_aprs_comment(struct pbuf_t* pb, char const* input, unsigne
 	/* Check for base-91 comment telemetry. */
 	/*fapint_parse_comment_telemetry(packet, &rest, &rest_len);*/
 
-#if defined(SOFTRF_SKETCH)
 	if (rest_len >=11)
 	{
 		/* Check for optional OGN ID anywhere in the comment, take the first occurrence. */
@@ -2244,7 +2240,6 @@ void ParseAPRS::parse_aprs_comment(struct pbuf_t* pb, char const* input, unsigne
 			rest = parse_remove_part(rest, rest_len, res - rest, res - rest + 11, &rest_len);
 		}
 	}
-#endif /* SOFTRF_SKETCH */
 
 	/* If there's something left, save it as a comment. */
 	rest_len=strlen(rest);

diff --git a/software/firmware/source/libraries/LibAPRS_ESP32/pbuf.h b/software/firmware/source/libraries/LibAPRS_ESP32/pbuf.h
@@ -93,9 +93,7 @@
 #define F_EQNS		(1 << 9)
 #define F_BITS		(1 << 10)
 #define F_TLM		(1 << 11)
-#if defined(SOFTRF_SKETCH)
 #define F_OGNID		(1 << 12)
-#endif /* SOFTRF_SKETCH */
 
 #define W_WD	(1 << 0)
 #define W_WS	(1 << 1)
@@ -286,9 +284,7 @@ struct pbuf_t {
 	/// Land speed in km/h.
 	double speed;
 
-#if defined(SOFTRF_SKETCH)
 	uint32_t ogn_id;
-#endif /* SOFTRF_SKETCH */
 
 	/// Weather report.
 	fap_wx_report_t wx_report;