-#define RLOGE_IF(cond, ...) \
- ( (CONDITION(cond)) \
- ? ((void)RLOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \
- : (void)0 )
+#define RLOGE_IF(cond, format, arg...) \
+ (((CONDITION(cond)) && (LOG_ON())) ? \
+ (RLOG(LOG_ERROR, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+#endif
+/**
+ * Simplified radio macro to send an error log message using the current LOG_TAG.
+ */
+#ifndef RLOGF
+#define RLOGF(format, arg...) \
+ (LOG_ON() ? (RLOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))
+#endif
+/**
+ * Simplified radio macro to send a conditional verbose log message using the current LOG_TAG.
+ */
+#ifndef RLOGF_IF
+#define RLOGF_IF(cond, format, arg...) \
+ (((CONDITION(cond)) && (LOG_ON())) ? \
+ (RLOG(LOG_FATAL, LOG_TAG, "%s:%s(%d)>" format, __MODULE__, __func__, __LINE__, ##arg)) : (0))