From b915b2e47ffb979dfdfe7d9b072b86283e0d9c95 Mon Sep 17 00:00:00 2001
From: elig0n <31196036+elig0n@users.noreply.github.com>
Date: Tue, 22 Nov 2022 00:53:24 +0200
Subject: [PATCH 1/2] Deliberate blocking UploadAndSerial() implementation

Issue #52
---
 autoload/arduino.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoload/arduino.vim b/autoload/arduino.vim
index 1db8615..bba8491 100644
--- a/autoload/arduino.vim
+++ b/autoload/arduino.vim
@@ -601,10 +601,14 @@ function! arduino#Serial() abort
 endfunction
 
 function! arduino#UploadAndSerial() abort
+  " Since 'terminal!' is non-blocking '!' must be used to provide this functionality
+  let termBackup = s:TERM
+  let s:TERM = '!'
   let ret = arduino#Upload()
   if ret == 0
     call arduino#Serial()
   endif
+  let s:TERM = termBackup
 endfunction
 
 " Serial helpers {{{2

From 53c845eefa772b74c2e9470a24531f5fc48983b0 Mon Sep 17 00:00:00 2001
From: elig0n <31196036+elig0n@users.noreply.github.com>
Date: Tue, 22 Nov 2022 05:34:44 +0200
Subject: [PATCH 2/2] removed abort

---
 autoload/arduino.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/arduino.vim b/autoload/arduino.vim
index bba8491..a444a42 100644
--- a/autoload/arduino.vim
+++ b/autoload/arduino.vim
@@ -600,7 +600,7 @@ function! arduino#Serial() abort
   call arduino#RunCmd(cmd)
 endfunction
 
-function! arduino#UploadAndSerial() abort
+function! arduino#UploadAndSerial()
   " Since 'terminal!' is non-blocking '!' must be used to provide this functionality
   let termBackup = s:TERM
   let s:TERM = '!'