Corrected serial.availableI(), normalize programmers

serial.available() was not working, used Tx pointers vs. Rx pointers - seems original source was old?? Future project: Starting with latest Arduino CORE files, port over mods. programmers.txt changes to ID ATmegaxxM1 when selecting.
thomasonw · Feb 28, 2016 · 928e5f0 · 928e5f0
1 parent 364ad0f
commit 928e5f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/avr/cores/arduino/HardwareSerial.cpp b/avr/cores/arduino/HardwareSerial.cpp
@@ -562,7 +562,8 @@ void HardwareSerial::end()
 
 int HardwareSerial::available(void)
 {
-  return (unsigned int)(SERIAL_BUFFER_SIZE + _tx_buffer->head - _tx_buffer->tail) % SERIAL_BUFFER_SIZE;
+  return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % SERIAL_BUFFER_SIZE;
+
 }
 
 int HardwareSerial::peek(void)

diff --git a/avr/programmers.txt b/avr/programmers.txt
@@ -1,42 +1,42 @@
-avrisp.name=AVR ISP
+avrisp.name=(ATmegaCAN) AVR ISP
 avrisp.communication=serial
 avrisp.protocol=stk500v1
 avrisp.program.protocol=stk500v1
 avrisp.program.tool=avrdude
 avrisp.program.extra_params=-P{serial.port}
-
-avrispmkii.name=AVRISP mkII
+ 
+avrispmkii.name=(ATmegaCAN) AVRISP mkII 
 avrispmkii.communication=usb
 avrispmkii.protocol=stk500v2
 avrispmkii.program.protocol=stk500v2
 avrispmkii.program.tool=avrdude
 avrispmkii.program.extra_params=-Pusb
 
-usbtinyisp.name=USBtinyISP
+usbtinyisp.name=(ATmegaCAN) USBtinyISP
 usbtinyisp.protocol=usbtiny
 usbtinyisp.program.tool=avrdude
 usbtinyisp.program.extra_params=
 
-arduinoisp.name=ArduinoISP
+arduinoisp.name=(ATmegaCAN) ArduinoISP 
 arduinoisp.protocol=arduinoisp
 arduinoisp.program.tool=avrdude
 arduinoisp.program.extra_params=
 
-usbasp.name=USBasp
+usbasp.name=(ATmegaCAN) USBasp 
 usbasp.communication=usb
 usbasp.protocol=usbasp
 usbasp.program.protocol=usbasp
 usbasp.program.tool=avrdude
 usbasp.program.extra_params=-Pusb
 
-parallel.name=Parallel Programmer
+parallel.name=(ATmegaCAN) Parallel Programmer 
 parallel.protocol=dapa
 parallel.force=true
 # parallel.delay=200
 parallel.program.tool=avrdude
 parallel.program.extra_params=-F
 
-arduinoasisp.name=Arduino as ISP
+arduinoasisp.name=(ATmegaCAN) Arduino as ISP 
 arduinoasisp.communication=serial
 arduinoasisp.protocol=stk500v1
 arduinoasisp.speed=19200

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ATmegaCAN
-version=1.0.2
+version=1.0.3
 author=Al Thomason <[email protected]>
 maintainer=Al Thomason <[email protected]>
 sentence=Arduino IDE support files for CAN enabled Amtel AVR chips.