added ubsio to lora-test and renamed it to usb-lora

3 files changed, 129 insertions, 54 deletions

diff --git a/lora-test/lora-test.cpp b/lora-test/lora-test.cpp
deleted file mode 100644
index aecb0a6..0000000
--- a/lora-test/lora-test.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  spreadspace avr utils
- *
- *
- *  Copyright (C) 2013-2016 Christian Pointner <equinox@spreadspace.org>
- *
- *  This file is part of spreadspace avr utils.
- *
- *  spreadspace avr utils is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  any later version.
- *
- *  spreadspace avr utils is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <avr/power.h>
-#include <stdio.h>
-
-#include "util.h"
-#include "led.h"
-
-#include "RadioHead.h"
-#include "RH_RF95.h"
-
-RH_RF95 rf95;
-
-int main(void)
-{
-  MCUSR &= ~(1 << WDRF);
-  wdt_disable();
-
-  cpu_init();
-  led_init();
-  sei();
-
-  rf95.init();
-  rf95.setFrequency(868.0);
-  for(;;) {
-     // for now we don't do anything here...
-  }
-}
diff --git a/lora-test/Makefile b/usb-lora/Makefile
index 8b2dc08..07e3a9a 100644
--- a/lora-test/Makefile
+++ b/usb-lora/Makefile
@@ -20,13 +20,29 @@
 ##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-NAME := lora-test
+NAME := usb-lora
 BOARD_TYPE := elecrow32u4lora
 CXX_OBJ := $(NAME).o
-LIBS := util led
-EXTERNAL_LIBS := radiohead
+LIBS := util led lufa-descriptor-usbserial usbio
+EXTERNAL_LIBS := lufa radiohead
 SPREADAVR_PATH := ..
 
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-151115
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\""
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-lora example\""
+
+LUFA_COMPONENTS := USB USBCLASS
+
+
 RADIOHEAD_PATH := $(SPREADAVR_PATH)/contrib/RadioHead
 
 RADIOHEAD_DRIVER := RF95
diff --git a/usb-lora/usb-lora.cpp b/usb-lora/usb-lora.cpp
new file mode 100644
index 0000000..c0ad3ae
--- /dev/null
+++ b/usb-lora/usb-lora.cpp
@@ -0,0 +1,110 @@
+/*
+ *  spreadspace avr utils
+ *
+ *
+ *  Copyright (C) 2013-2016 Christian Pointner <equinox@spreadspace.org>
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <avr/power.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "usbio.h"
+
+#include "RadioHead.h"
+#include "RH_RF95.h"
+
+RH_RF95 lora;
+
+void recv_lora_msg()
+{
+	uint8_t buf[RH_RF95_MAX_MESSAGE_LEN];
+	uint8_t len = sizeof(buf);
+
+	led_on();
+	if(!lora.recv(buf, &len)) {
+		printf("lora.recv(): failed\r\n");
+		led_off();
+		return;
+	}
+
+	printf("lora.recv() got message: SNR = %d, data = ", lora.lastSNR());
+	for(uint8_t i = 0; i < len; ++i) printf("%s0x%02X", (i==0) ? "" : " ", buf[i]);
+	printf("\r\n");
+	led_off();
+}
+
+void send_lora_msg()
+{
+	uint8_t data[] = "spreadspace.org/avr-utils usb-lora test using radiohead library";
+
+	led2_on();
+	if(!lora.send(data, sizeof(data))) {
+		printf("lora.send(): failed\r\n");
+		led2_off();
+		return;
+	}
+	lora.waitPacketSent();
+	printf("lora.send(): success\r\n");
+	led2_off();
+}
+
+void handle_cmd(uint8_t cmd)
+{
+  switch(cmd) {
+  case 's': send_lora_msg(); break;
+  case 'r': reset2bootloader(); break;
+  default: printf("error\r\n"); return;
+  }
+  printf("ok\r\n");
+}
+
+int main(void)
+{
+  MCUSR &= ~(1 << WDRF);
+  wdt_disable();
+
+  cpu_init();
+  led_init();
+  usbio_init();
+  sei();
+
+  lora.init();
+  lora.setFrequency(868.0);
+
+  for(;;) {
+		if(lora.available()) {
+			recv_lora_msg();
+		}
+
+    int16_t BytesReceived = usbio_bytes_received();
+    while(BytesReceived > 0) {
+      int ReceivedByte = fgetc(stdin);
+      if(ReceivedByte != EOF) {
+        handle_cmd(ReceivedByte);
+      }
+      BytesReceived--;
+    }
+
+    usbio_task();
+  }
+}