Add balloon info to nodeinfo

Author: Cam K.

CMakeLists.txt

@@ -3,6 +3,7 @@ project(libCATS)
 
 option(OPT_BUILD_TESTS OFF)
 option(OPT_BUILD_RADIO_IFACE ON)
+option(OPT_BUILD_FELINET ON)
 
 file(GLOB SOURCES lib/buffer.c
                 lib/error.c
@@ -61,6 +62,10 @@ if(OPT_BUILD_TESTS)
     endif()
 endif(OPT_BUILD_TESTS)
 
+if(OPT_BUILD_FELINET)
+    
+endif(OPT_BUILD_FELINET)
+
 target_link_libraries(CATS labrador_ldpc)
 target_include_directories(CATS PUBLIC include ${labrador_ldpc_SOURCE_DIR}/capi/include)
 set_property(TARGET CATS PROPERTY C_STANDARD 11)

include/cats/whisker.h

@@ -23,6 +23,11 @@
 #define CATS_NODEINFO_VOLTAGE 64
 #define CATS_NODEINFO_TEMP 128
 #define CATS_NODEINFO_BATTERY 256
+#define CATS_NODEINFO_ALTITUDE 512
+#define CATS_NODEINFO_IS_BALLOON 1024
+#define CATS_NODEINFO_AMBIENT_TEMP 2048
+#define CATS_NODEINFO_AMBIENT_HUMIDITY 4096
+#define CATS_NODEINFO_AMBIENT_PRESSURE 8192
 
 #define CATS_MAX_WHISKER_LEN 255
 #define CATS_MAX_WHISKERS 255
@@ -92,6 +97,15 @@ struct nodeinfo_i32 {
 	int32_t val;
 };
 
+struct nodeinfo_f32 {
+	bool enabled;
+	float val;
+};
+
+struct nodeinfo_bool {
+	bool enabled;
+};
+
 typedef struct cats_ident_whisker {
 	uint16_t icon;
 	uint8_t callsign[252]; // 252 = 255 - icon - ssid
@@ -155,6 +169,11 @@ typedef struct cats_nodeinfo_whisker {
 	struct nodeinfo_voltage voltage;
 	struct nodeinfo_i8 temperature;
 	struct nodeinfo_u8 battery_level;
+	struct nodeinfo_f32 altitude;
+	struct nodeinfo_bool is_balloon;
+	struct nodeinfo_i8 ambient_temp;
+	struct nodeinfo_u8 ambient_humidity;
+	struct nodeinfo_u16 ambient_pressure;
 } cats_nodeinfo_whisker_t;
 
 typedef union cats_whisker_data {

lib/whiskers/nodeinfo.c

@@ -57,6 +57,27 @@ size_t cats_nodeinfo_encode(const cats_whisker_data_t* data, uint8_t* dest)
 		dest[ptr++] = info->battery_level.val * 2.55;
 		bitmap |= CATS_NODEINFO_BATTERY;
 	}
+	if(info->altitude.enabled) {
+		memcpy(dest + ptr, &(info->altitude.val), 4); // TODO: Do this another way
+		ptr += 4;
+		bitmap |= CATS_NODEINFO_ALTITUDE;
+	}
+	if(info->is_balloon.enabled) {
+		bitmap |= CATS_NODEINFO_IS_BALLOON;
+	}
+	if(info->ambient_temp.enabled) {
+		dest[ptr++] = info->ambient_temp.val;
+		bitmap |= CATS_NODEINFO_AMBIENT_TEMP;
+	}
+	if(info->ambient_humidity.enabled) {
+		dest[ptr++] = info->ambient_humidity.val * 2.55;
+		bitmap |= CATS_NODEINFO_AMBIENT_HUMIDITY;
+	}
+	if(info->ambient_pressure.enabled) {
+		dest[ptr++] = info->ambient_pressure.val;
+		dest[ptr++] = info->ambient_pressure.val >> 8;
+		bitmap |= CATS_NODEINFO_AMBIENT_PRESSURE;
+	}
 
 	dest[4] = bitmap;
 	dest[3] = bitmap >> 8;
@@ -110,6 +131,26 @@ void cats_nodeinfo_decode(const uint8_t* data, size_t len, cats_whisker_data_t*
 		info->battery_level.val = data[ptr++] / 2.55;
 		info->battery_level.enabled = true;
 	}
+	if(CHECK_MASK(bitmap, CATS_NODEINFO_ALTITUDE)) {
+		memcpy(&(info->altitude.val), data + ptr, 4); // TODO: Do this another way
+		ptr += 4;
+		info->altitude.enabled = true;
+	}
+	if(CHECK_MASK(bitmap, CATS_NODEINFO_IS_BALLOON)) {
+		info->is_balloon.enabled = true;
+	}
+	if(CHECK_MASK(bitmap, CATS_NODEINFO_AMBIENT_TEMP)) {
+		info->ambient_temp.val = data[ptr++];
+		info->ambient_temp.enabled = true;
+	}
+	if(CHECK_MASK(bitmap, CATS_NODEINFO_AMBIENT_HUMIDITY)) {
+		info->ambient_humidity.val = data[ptr++] / 2.55;
+		info->ambient_humidity.enabled = true;
+	}
+	if(CHECK_MASK(bitmap, CATS_NODEINFO_AMBIENT_PRESSURE)) {
+		info->ambient_pressure.val = (data[ptr + 1] << 8) | data[ptr];
+		info->ambient_pressure.enabled = true;
+	}
 }
 
 int cats_packet_get_nodeinfo(const cats_packet_t* pkt, cats_nodeinfo_whisker_t** out)

tests/whisker.c

@@ -280,6 +280,11 @@ void test_nodeinfo()
     info.tx_power.enabled = true;
     info.uptime.enabled = true;
     info.voltage.enabled = true;
+    info.altitude.enabled = true;
+    info.is_balloon.enabled = true;
+    info.ambient_humidity.enabled = false;
+    info.ambient_temp.enabled = false;
+    info.ambient_pressure.enabled = false;
     info.hardware_id.val = 7408;
     info.uptime.val = 98;
     info.tx_power.val = 30;
@@ -310,6 +315,11 @@ void test_nodeinfo()
     assert(info.tx_power.enabled == true);
     assert(info.uptime.enabled == true);
     assert(info.voltage.enabled == true);
+    assert(info.altitude.enabled == true);
+    assert(info.is_balloon.enabled == true);
+    assert(info.ambient_humidity.enabled == false);
+    assert(info.ambient_temp.enabled == false);
+    assert(info.ambient_pressure.enabled == false);
     assert(info.hardware_id.val == 7408);
     assert(info.tx_power.val == 30);
     assert(info.voltage.val = 12.8);