From 9e7e0478703cc222a2cd6ddf9926b894b18fe160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20R=C3=B6mer?= <torsten.roemer@luniks.net>
Date: Tue, 9 Dec 2025 11:05:03 +0100
Subject: [PATCH 1/2] Switch to RFM95 for LoRa support

---
 avrenv-rx/Makefile | 2 +-
 avrenv-rx/avrenv.c | 2 +-
 avrenv-rx/data.c   | 2 +-
 avrenv-rx/data.h   | 2 +-
 avrenv-rx/rfm.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/avrenv-rx/Makefile b/avrenv-rx/Makefile
index 87b7000..ac2ef21 100644
--- a/avrenv-rx/Makefile
+++ b/avrenv-rx/Makefile
@@ -47,7 +47,7 @@ CFLAGS += -std=gnu99
 
 TARGET = $(strip $(basename $(MAIN)))
 SRC += $(TARGET).c
-SRC += ../../librfm69/librfm69.a ../../libtft/libtft.a
+SRC += ../../librfm95/librfm95.a ../../libtft/libtft.a
 
 OBJ = $(SRC:.c=.o)
 OBJ = $(SRC:.S=.o)
diff --git a/avrenv-rx/avrenv.c b/avrenv-rx/avrenv.c
index 51cbfe5..58dc040 100644
--- a/avrenv-rx/avrenv.c
+++ b/avrenv-rx/avrenv.c
@@ -154,7 +154,7 @@ int main(void) {
     spiMid();
 
     bool radio = false;
-    radio = rfmInit(433600, 0x24, 0x84);
+    radio = rfmInit(433600, 0x24, 0x84, LORA);
     if (radio) {
         rfmSetOutputPower(2);
     } else if (USART) {
diff --git a/avrenv-rx/data.c b/avrenv-rx/data.c
index 56006ab..117dc5c 100644
--- a/avrenv-rx/data.c
+++ b/avrenv-rx/data.c
@@ -100,7 +100,7 @@ void receiveData(void) {
 #if LORA
      RxFlags flags = rfmLoRaRxDone();
 #else
-     PayloadFlags flags = rfmPayloadReady();
+     RxFlags flags = rfmPayloadReady();
 #endif
     if (flags.ready) {
         uint8_t dur = min(UCHAR_MAX, pitints - rxtstart);
diff --git a/avrenv-rx/data.h b/avrenv-rx/data.h
index 877751d..66bcaad 100644
--- a/avrenv-rx/data.h
+++ b/avrenv-rx/data.h
@@ -15,7 +15,7 @@
 #include "utils.h"
 #include "usart.h"
 #include "spi.h"
-#include "librfm69/librfm69.h"
+#include "librfm95/librfm95.h"
 #include "libtft/libtft.h"
 #include "libtft/unifont.h"
 
diff --git a/avrenv-rx/rfm.c b/avrenv-rx/rfm.c
index c4c6d0a..f56451e 100644
--- a/avrenv-rx/rfm.c
+++ b/avrenv-rx/rfm.c
@@ -7,7 +7,7 @@
 
 #include <util/delay.h>
 
-#include "librfm69/librfm69.h"
+#include "librfm95/librfm95.h"
 #include "pins.h"
 #include "spi.h"
 

From 3e2a93cb5a4ff76ffeb09097f0699808cd0a78f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20R=C3=B6mer?= <torsten.roemer@luniks.net>
Date: Tue, 9 Dec 2025 19:25:44 +0100
Subject: [PATCH 2/2] Switch to RFM95 + LoRa, reorganize libs

---
 avrenv-rx/Makefile                     |  8 ++++----
 avrenv-rx/data.h                       |  6 +++---
 avrenv-rx/nbproject/Makefile-Custom.mk | 14 +++++++-------
 avrenv-rx/nbproject/configurations.xml |  7 +++++++
 avrenv-rx/rfm.c                        |  2 +-
 avrenv-rx/tft.c                        |  2 +-
 avrenv-tx/Makefile                     |  9 ++++-----
 avrenv-tx/avrenv.c                     |  2 +-
 avrenv-tx/data.h                       |  4 ++--
 avrenv-tx/nbproject/Makefile-Custom.mk | 24 ++++++++++++------------
 avrenv-tx/nbproject/configurations.xml |  7 +++++++
 avrenv-tx/rfm.c                        |  2 +-
 avrenv-tx/sdc.c                        |  2 +-
 13 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/avrenv-rx/Makefile b/avrenv-rx/Makefile
index ac2ef21..e531a2b 100644
--- a/avrenv-rx/Makefile
+++ b/avrenv-rx/Makefile
@@ -8,7 +8,7 @@ BAUD = 9600
 PROGRAMMER_TYPE = atmelice_updi
 PROGRAMMER_ARGS = -B 125kHz
 
-LORA = 0
+LORA = 1
 
 # Display dimensions
 DISPLAY_WIDTH = 320
@@ -23,6 +23,7 @@ VFLIP = true
 
 MAIN = avrenv.c
 SRC = data.c rfm.c spi.c tft.c usart.c utils.c
+LIB = -lrfm95 -ltft
 
 CC = avr-gcc
 OBJCOPY = avr-objcopy
@@ -36,7 +37,7 @@ CFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU)UL -DBAUDRATE=$(BAUD)
 CFLAGS += -DLORA=$(LORA)
 CFLAGS += -DDISPLAY_WIDTH=$(DISPLAY_WIDTH) -DDISPLAY_HEIGHT=$(DISPLAY_HEIGHT)
 CFLAGS += -DINVERT=$(INVERT) -DBGR=$(BGR) -DHFLIP=$(HFLIP) -DVFLIP=$(VFLIP)
-CFLAGS += -O2 -I. -I../../
+CFLAGS += -O2 -I. -I/usr/local/include/dode -L/usr/local/lib/dode
 CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums 
 CFLAGS += -Wall -Wstrict-prototypes
 CFLAGS += -g -ggdb
@@ -47,7 +48,6 @@ CFLAGS += -std=gnu99
 
 TARGET = $(strip $(basename $(MAIN)))
 SRC += $(TARGET).c
-SRC += ../../librfm95/librfm95.a ../../libtft/libtft.a
 
 OBJ = $(SRC:.c=.o)
 OBJ = $(SRC:.S=.o)
@@ -60,7 +60,7 @@ all: $(TARGET).hex
 	$(OBJCOPY) -R .eeprom -O ihex $< $@
 
 %.elf: $(SRC)
-	$(CC) $(CFLAGS) $(SRC) --output $@ 
+	$(CC) $(CFLAGS) $(SRC) $(LIB) --output $@
 
 disasm: $(TARGET).lst
 
diff --git a/avrenv-rx/data.h b/avrenv-rx/data.h
index 66bcaad..328934b 100644
--- a/avrenv-rx/data.h
+++ b/avrenv-rx/data.h
@@ -15,9 +15,9 @@
 #include "utils.h"
 #include "usart.h"
 #include "spi.h"
-#include "librfm95/librfm95.h"
-#include "libtft/libtft.h"
-#include "libtft/unifont.h"
+#include "librfm95.h"
+#include "libtft.h"
+#include "unifont.h"
 
 /* Expected length of payload from transmitter */
 #define PAYLOAD_LEN 24
diff --git a/avrenv-rx/nbproject/Makefile-Custom.mk b/avrenv-rx/nbproject/Makefile-Custom.mk
index d0ad96a..09cdeb1 100644
--- a/avrenv-rx/nbproject/Makefile-Custom.mk
+++ b/avrenv-rx/nbproject/Makefile-Custom.mk
@@ -70,31 +70,31 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/avrenv-rx: ${OBJECTFILES}
 
 ${OBJECTDIR}/_ext/7eff1f40/avrenv.o: /home/dode/dev/avrenv/avrenv-rx/avrenv.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -std=c99 -o ${OBJECTDIR}/_ext/7eff1f40/avrenv.o /home/dode/dev/avrenv/avrenv-rx/avrenv.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -std=c99 -o ${OBJECTDIR}/_ext/7eff1f40/avrenv.o /home/dode/dev/avrenv/avrenv-rx/avrenv.c
 
 ${OBJECTDIR}/_ext/7eff1f40/data.o: /home/dode/dev/avrenv/avrenv-rx/data.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f40/data.o /home/dode/dev/avrenv/avrenv-rx/data.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f40/data.o /home/dode/dev/avrenv/avrenv-rx/data.c
 
 ${OBJECTDIR}/_ext/7eff1f40/rfm.o: /home/dode/dev/avrenv/avrenv-rx/rfm.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f40/rfm.o /home/dode/dev/avrenv/avrenv-rx/rfm.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f40/rfm.o /home/dode/dev/avrenv/avrenv-rx/rfm.c
 
 ${OBJECTDIR}/_ext/7eff1f40/spi.o: /home/dode/dev/avrenv/avrenv-rx/spi.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f40/spi.o /home/dode/dev/avrenv/avrenv-rx/spi.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f40/spi.o /home/dode/dev/avrenv/avrenv-rx/spi.c
 
 ${OBJECTDIR}/_ext/7eff1f40/tft.o: /home/dode/dev/avrenv/avrenv-rx/tft.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f40/tft.o /home/dode/dev/avrenv/avrenv-rx/tft.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f40/tft.o /home/dode/dev/avrenv/avrenv-rx/tft.c
 
 ${OBJECTDIR}/_ext/7eff1f40/usart.o: /home/dode/dev/avrenv/avrenv-rx/usart.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f40/usart.o /home/dode/dev/avrenv/avrenv-rx/usart.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f40/usart.o /home/dode/dev/avrenv/avrenv-rx/usart.c
 
 ${OBJECTDIR}/_ext/7eff1f40/utils.o: /home/dode/dev/avrenv/avrenv-rx/utils.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f40
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f40/utils.o /home/dode/dev/avrenv/avrenv-rx/utils.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DBGR=1 -DDISPLAY_HEIGHT=240 -DDISPLAY_WIDTH=320 -DF_CPU=10000000UL -DHFLIP=1 -DINVERT=0 -DRFM=69 -DVFLIP=1 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f40/utils.o /home/dode/dev/avrenv/avrenv-rx/utils.c
 
 # Subprojects
 .build-subprojects:
diff --git a/avrenv-rx/nbproject/configurations.xml b/avrenv-rx/nbproject/configurations.xml
index a84d677..7d03144 100644
--- a/avrenv-rx/nbproject/configurations.xml
+++ b/avrenv-rx/nbproject/configurations.xml
@@ -105,6 +105,13 @@
             tool="0"
             flavor2="0">
       </item>
+      <folder path="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/local/include/dode</pElem>
+          </incDir>
+        </cTool>
+      </folder>
     </conf>
   </confs>
 </configurationDescriptor>
diff --git a/avrenv-rx/rfm.c b/avrenv-rx/rfm.c
index f56451e..2c122cc 100644
--- a/avrenv-rx/rfm.c
+++ b/avrenv-rx/rfm.c
@@ -7,7 +7,7 @@
 
 #include <util/delay.h>
 
-#include "librfm95/librfm95.h"
+#include "librfm95.h"
 #include "pins.h"
 #include "spi.h"
 
diff --git a/avrenv-rx/tft.c b/avrenv-rx/tft.c
index 20daf2d..95944da 100644
--- a/avrenv-rx/tft.c
+++ b/avrenv-rx/tft.c
@@ -7,7 +7,7 @@
 
 #include <util/delay.h>
 
-#include "libtft/libtft.h"
+#include "libtft.h"
 #include "pins.h"
 #include "spi.h"
 
diff --git a/avrenv-tx/Makefile b/avrenv-tx/Makefile
index 82da597..65621cb 100644
--- a/avrenv-tx/Makefile
+++ b/avrenv-tx/Makefile
@@ -8,11 +8,12 @@ BAUD = 9600
 PROGRAMMER_TYPE = atmelice_updi
 PROGRAMMER_ARGS = -B 125kHz
 
-LORA = 0
+LORA = 1
 
 MAIN = avrenv.c
 SRC = data.c rfm.c sdc.c spi.c i2c.c usart.c utils.c bme68x/bme68x.c \
 	bme688.c ens160.c pa1616s.c
+LIB = -lrfm95 -lsdc
 
 CC = avr-gcc
 OBJCOPY = avr-objcopy
@@ -24,7 +25,7 @@ AVRDUDE = avrdude
 # CFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU)UL -DBAUD=$(BAUD)
 CFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU)UL -DBAUDRATE=$(BAUD)
 CFLAGS += -DLORA=$(LORA)
-CFLAGS += -O2 -I. -I../../
+CFLAGS += -O2 -I. -I/usr/local/include/dode -L/usr/local/lib/dode
 CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums 
 CFLAGS += -Wall -Wstrict-prototypes
 CFLAGS += -g -ggdb
@@ -35,8 +36,6 @@ CFLAGS += -std=gnu99
 
 TARGET = $(strip $(basename $(MAIN)))
 SRC += $(TARGET).c
-SRC += ../../librfm69/librfm69.a
-SRC += ../../libsdc/libsdc.a
 
 OBJ = $(SRC:.c=.o)
 OBJ = $(SRC:.S=.o)
@@ -50,7 +49,7 @@ all: $(TARGET).hex
 	$(OBJCOPY) -R .eeprom -O ihex $< $@
 
 %.elf: $(SRC)
-	$(CC) $(CFLAGS) $(SRC) --output $@ 
+	$(CC) $(CFLAGS) $(SRC) $(LIB) --output $@
 
 disasm: $(TARGET).lst
 
diff --git a/avrenv-tx/avrenv.c b/avrenv-tx/avrenv.c
index f53ff87..6d0ed74 100644
--- a/avrenv-tx/avrenv.c
+++ b/avrenv-tx/avrenv.c
@@ -303,7 +303,7 @@ int main(void) {
     // slow down SPI for the breadboard wiring
     spiMid();
 
-    bool radio = rfmInit(FREQUENCY, NODE_ADDR, CAST_ADDR);
+    bool radio = rfmInit(FREQUENCY, NODE_ADDR, CAST_ADDR, LORA);
     if (radio) {
         rfmSetOutputPower(2);
     } else if (USART) {
diff --git a/avrenv-tx/data.h b/avrenv-tx/data.h
index e77e66e..ced93d2 100644
--- a/avrenv-tx/data.h
+++ b/avrenv-tx/data.h
@@ -19,8 +19,8 @@
 #include "bme688.h"
 #include "ens160.h"
 #include "pa1616s.h"
-#include "librfm69/librfm69.h"
-#include "libsdc/libsdc.h"
+#include "librfm95.h"
+#include "libsdc.h"
 
 /* Battery low threshold */
 #define BAT_LOW_MV  2400
diff --git a/avrenv-tx/nbproject/Makefile-Custom.mk b/avrenv-tx/nbproject/Makefile-Custom.mk
index ef8a1ee..1eb6ce0 100644
--- a/avrenv-tx/nbproject/Makefile-Custom.mk
+++ b/avrenv-tx/nbproject/Makefile-Custom.mk
@@ -75,51 +75,51 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/avrenv-tx: ${OBJECTFILES}
 
 ${OBJECTDIR}/_ext/7eff1f7e/avrenv.o: /home/dode/dev/avrenv/avrenv-tx/avrenv.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -std=c99 -o ${OBJECTDIR}/_ext/7eff1f7e/avrenv.o /home/dode/dev/avrenv/avrenv-tx/avrenv.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -std=c99 -o ${OBJECTDIR}/_ext/7eff1f7e/avrenv.o /home/dode/dev/avrenv/avrenv-tx/avrenv.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/bme688.o: /home/dode/dev/avrenv/avrenv-tx/bme688.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/bme688.o /home/dode/dev/avrenv/avrenv-tx/bme688.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/bme688.o /home/dode/dev/avrenv/avrenv-tx/bme688.c
 
 ${OBJECTDIR}/_ext/3d12a1ed/bme68x.o: /home/dode/dev/avrenv/avrenv-tx/bme68x/bme68x.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/3d12a1ed
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/3d12a1ed/bme68x.o /home/dode/dev/avrenv/avrenv-tx/bme68x/bme68x.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/3d12a1ed/bme68x.o /home/dode/dev/avrenv/avrenv-tx/bme68x/bme68x.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/data.o: /home/dode/dev/avrenv/avrenv-tx/data.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/data.o /home/dode/dev/avrenv/avrenv-tx/data.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/data.o /home/dode/dev/avrenv/avrenv-tx/data.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/ens160.o: /home/dode/dev/avrenv/avrenv-tx/ens160.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/ens160.o /home/dode/dev/avrenv/avrenv-tx/ens160.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/ens160.o /home/dode/dev/avrenv/avrenv-tx/ens160.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/i2c.o: /home/dode/dev/avrenv/avrenv-tx/i2c.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/i2c.o /home/dode/dev/avrenv/avrenv-tx/i2c.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/i2c.o /home/dode/dev/avrenv/avrenv-tx/i2c.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/pa1616s.o: /home/dode/dev/avrenv/avrenv-tx/pa1616s.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/pa1616s.o /home/dode/dev/avrenv/avrenv-tx/pa1616s.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/pa1616s.o /home/dode/dev/avrenv/avrenv-tx/pa1616s.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/rfm.o: /home/dode/dev/avrenv/avrenv-tx/rfm.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/rfm.o /home/dode/dev/avrenv/avrenv-tx/rfm.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/rfm.o /home/dode/dev/avrenv/avrenv-tx/rfm.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/sdc.o: /home/dode/dev/avrenv/avrenv-tx/sdc.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/sdc.o /home/dode/dev/avrenv/avrenv-tx/sdc.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/sdc.o /home/dode/dev/avrenv/avrenv-tx/sdc.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/spi.o: /home/dode/dev/avrenv/avrenv-tx/spi.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/spi.o /home/dode/dev/avrenv/avrenv-tx/spi.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/spi.o /home/dode/dev/avrenv/avrenv-tx/spi.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/usart.o: /home/dode/dev/avrenv/avrenv-tx/usart.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/usart.o /home/dode/dev/avrenv/avrenv-tx/usart.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/usart.o /home/dode/dev/avrenv/avrenv-tx/usart.c
 
 ${OBJECTDIR}/_ext/7eff1f7e/utils.o: /home/dode/dev/avrenv/avrenv-tx/utils.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/7eff1f7e
-	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -o ${OBJECTDIR}/_ext/7eff1f7e/utils.o /home/dode/dev/avrenv/avrenv-tx/utils.c
+	$(COMPILE.c) -g -DBAUD=9600 -DBAUDRATE=9600 -DF_CPU=10000000UL -DRFM=69 -D__AVR_AVR64EA28__ -D__flash=volatile -I. -I/home/dode/dev -I/usr/local/include/dode -o ${OBJECTDIR}/_ext/7eff1f7e/utils.o /home/dode/dev/avrenv/avrenv-tx/utils.c
 
 # Subprojects
 .build-subprojects:
diff --git a/avrenv-tx/nbproject/configurations.xml b/avrenv-tx/nbproject/configurations.xml
index 6868d6a..8044c3f 100644
--- a/avrenv-tx/nbproject/configurations.xml
+++ b/avrenv-tx/nbproject/configurations.xml
@@ -167,6 +167,13 @@
             tool="0"
             flavor2="0">
       </item>
+      <folder path="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/local/include/dode</pElem>
+          </incDir>
+        </cTool>
+      </folder>
     </conf>
   </confs>
 </configurationDescriptor>
diff --git a/avrenv-tx/rfm.c b/avrenv-tx/rfm.c
index c4c6d0a..2c122cc 100644
--- a/avrenv-tx/rfm.c
+++ b/avrenv-tx/rfm.c
@@ -7,7 +7,7 @@
 
 #include <util/delay.h>
 
-#include "librfm69/librfm69.h"
+#include "librfm95.h"
 #include "pins.h"
 #include "spi.h"
 
diff --git a/avrenv-tx/sdc.c b/avrenv-tx/sdc.c
index 29b1806..4855b73 100644
--- a/avrenv-tx/sdc.c
+++ b/avrenv-tx/sdc.c
@@ -7,7 +7,7 @@
 
 #include <util/delay.h>
 
-#include "libsdc/libsdc.h"
+#include "libsdc.h"
 #include "pins.h"
 #include "spi.h"