Hackjob attempt at changing from USB to UART1

Author: vintagepc

include/marlin/Configuration_A3ides_2209_MINI.h

@@ -104,7 +104,7 @@
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
-#define SERIAL_PORT -1
+#define SERIAL_PORT 1
 
 /**
  * Select a secondary serial port on the board to use for communication with the host.

lib/Arduino_Core_A3ides/CMakeLists.txt

@@ -33,6 +33,7 @@ target_compile_definitions(
   ARDUINO=187
   $<$<STREQUAL:${ARDUINO_CORE_TARGET},STM32F4xx>:STM32F4xx>
   HAVE_HWSERIAL2
+  HAVE_HWSERIAL1
   USBD_USE_CDC
   USBCON
   )

lib/Arduino_Core_A3ides/cores/arduino/HardwareSerial.h

@@ -19,6 +19,23 @@ class HardwareSerial : public Stream {
     operator bool();
 };
 
+
+// ultra-mega-terrible-hack. 
+class HardwareSerial2 : public Stream {
+public:
+    HardwareSerial2(void *p){};
+    void begin(unsigned long baud);
+    virtual int available(void);
+    virtual int peek(void) { return -1; };
+    virtual int read(void);
+    virtual void flush(void);
+    virtual size_t write(uint8_t);
+    virtual size_t write(uint8_t *buffer, size_t size);
+    operator bool() { return true;};
+};
+
 extern HardwareSerial Serial3;
+extern HardwareSerial2 SerialUART1;
+
 
 #endif //_HARDWARESERIAL_H

src/common/hardware_serial.cpp

@@ -13,6 +13,8 @@ void HardwareSerial::begin(unsigned long baud) {
     BufferedSerial::uart2.Open();
 }
 
+
+
 void HardwareSerial::begin(unsigned long baud, byte config) {
 }
 
@@ -47,4 +49,56 @@ HardwareSerial::operator bool() {
     return true;
 }
 
+extern "C" {
+extern UART_HandleTypeDef huart1;
+extern uartrxbuff_t uart1rxbuff;
+}
+
+void HardwareSerial2::begin(unsigned long baud) {
+    // Do nothing, the MX_UART_Init() function takes care of this. 
+}
+
+int HardwareSerial2::read(void) 
+{
+    //return uartrxbuff_getchar(&uart1rxbuff);
+    if (huart1.Instance->SR & UART_FLAG_RXNE)
+        return huart1.Instance->DR;
+    else
+        return -1;
+
+}
+
+int HardwareSerial2::available()
+{
+    return (huart1.Instance->SR & UART_FLAG_RXNE)>0;
+}
+
+void HardwareSerial2::flush() {
+  // Nothing to do here, the TX is blocking.
+}
+
+size_t HardwareSerial2::write(uint8_t c) {
+    if (HAL_UART_Transmit(&huart1, &c, 1, HAL_MAX_DELAY) == HAL_OK)
+    {
+        return 1;
+    } 
+    else
+    {
+        return 0;
+    } 
+}
+
+size_t HardwareSerial2::write(uint8_t *buffer, size_t size) {
+    if (HAL_UART_Transmit(&huart1, buffer, size, HAL_MAX_DELAY) == HAL_OK)
+    {
+        return size;
+    } 
+    else
+    {
+        return 0;
+    } 
+}
+
 HardwareSerial Serial3(USART3);
+
+HardwareSerial2 SerialUART1(USART1);

src/main.cpp

@@ -97,7 +97,7 @@ TIM_HandleTypeDef htim2;
 TIM_HandleTypeDef htim3;
 TIM_HandleTypeDef htim14;
 
-static UART_HandleTypeDef huart1;
+UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
 UART_HandleTypeDef huart6;
 DMA_HandleTypeDef hdma_usart1_rx;
@@ -228,9 +228,9 @@ int main(void) {
 
     buddy::hw::BufferedSerial::uart2.Open();
 
-    uartrxbuff_init(&uart1rxbuff, &huart1, &hdma_usart1_rx, sizeof(uart1rx_data), uart1rx_data);
-    HAL_UART_Receive_DMA(&huart1, uart1rxbuff.buffer, uart1rxbuff.buffer_size);
-    uartrxbuff_reset(&uart1rxbuff);
+    // uartrxbuff_init(&uart1rxbuff, &huart1, &hdma_usart1_rx, sizeof(uart1rx_data), uart1rx_data);
+    // HAL_UART_Receive_DMA(&huart1, uart1rxbuff.buffer, uart1rxbuff.buffer_size);
+    // uartrxbuff_reset(&uart1rxbuff);
 
     uartrxbuff_init(&uart6rxbuff, &huart6, &hdma_usart6_rx, sizeof(uart6rx_data), uart6rx_data);
     HAL_UART_Receive_DMA(&huart6, uart6rxbuff.buffer, uart6rxbuff.buffer_size);