diff --git a/.vscode/arduino.json b/.vscode/arduino.json index 8b7bafb..e0b924b 100644 --- a/.vscode/arduino.json +++ b/.vscode/arduino.json @@ -1,6 +1,6 @@ { "board": "bsfrance:avr:lora32u4", "sketch": "crossbow.ino", - "port": "COM15", + "port": "COM17", "output": "./build" } \ No newline at end of file diff --git a/crossbow.ino b/crossbow.ino index c20429d..63b343d 100644 --- a/crossbow.ino +++ b/crossbow.ino @@ -9,6 +9,7 @@ // #define WAIT_FOR_SERIAL #include +// #include #include "variables.h" #include "qsp.h" @@ -24,12 +25,13 @@ int ppm[PPM_CHANNEL_COUNT] = {0}; */ #ifdef DEVICE_MODE_TX -#define OLED_RESET -1 +// #define OLED_RESET -1 #include -#include +// #include PPMReader ppmReader(PPM_INPUT_PIN, PPM_INPUT_INTERRUPT); -Adafruit_SSD1306 display(OLED_RESET); +// PPMReader ppmReader(11, 2, MODE_PIN_CHANGE_INTERRUPT); +// Adafruit_SSD1306 display(OLED_RESET); #endif @@ -243,7 +245,6 @@ void setup(void) #ifdef DEBUG_LED qsp.debugConfig |= DEBUG_FLAG_LED; #endif - } #ifdef DEVICE_MODE_RX diff --git a/variables.h b/variables.h index ee00af8..a323a53 100644 --- a/variables.h +++ b/variables.h @@ -4,7 +4,7 @@ #define UART_SPEED 57600 #define E45_TTL_100_UART_DOWNTIME 30 -#define PPM_CHANNEL_COUNT 10 +#define PPM_CHANNEL_COUNT 11 #define RX_RX_HEALTH_FRAME_RATE 5000 #define TX_RC_FRAME_RATE 1000 //ms @@ -51,8 +51,8 @@ enum debugConfigFlags { DEBUG_FLAG_LED = 0b00000010 }; -#define PPM_INPUT_PIN 2 -#define PPM_INPUT_INTERRUPT 1 //For Pro Micro 1, For Pro Mini 0 +#define PPM_INPUT_PIN 0 // Has to be one of Interrupt pins +#define PPM_INPUT_INTERRUPT 2 // For Pro Micro 1, For Pro Mini 0 #define PPM_CHANNEL_DEFAULT_VALUE 1500 //set the default servo value #define PPM_FRAME_LENGTH 22500 //set the PPM frame length in microseconds (1ms = 1000µs)