save some bytes by replacing int with uint8_t in Prints, digitalRead() and analogWrite()

Author: tico-tico

hardware/arduino/avr/cores/arduino/Arduino.h

@@ -124,10 +124,10 @@ int atexit(void (*func)()) __attribute__((weak));
 
 void pinMode(uint8_t, uint8_t);
 void digitalWrite(uint8_t, uint8_t);
-int digitalRead(uint8_t);
-int analogRead(uint8_t);
+uint8_t digitalRead(uint8_t);
+uint16_t analogRead(uint8_t);
 void analogReference(uint8_t mode);
-void analogWrite(uint8_t, int);
+void analogWrite(uint8_t, uint8_t);
 
 unsigned long millis(void);
 unsigned long micros(void);

hardware/arduino/avr/cores/arduino/Print.cpp

@@ -69,22 +69,22 @@ size_t Print::print(char c)
   return write(c);
 }
 
-size_t Print::print(unsigned char b, int base)
+size_t Print::print(unsigned char b, uint8_t base)
 {
   return print((unsigned long) b, base);
 }
 
-size_t Print::print(int n, int base)
+size_t Print::print(int n, uint8_t base)
 {
   return print((long) n, base);
 }
 
-size_t Print::print(unsigned int n, int base)
+size_t Print::print(unsigned int n, uint8_t base)
 {
   return print((unsigned long) n, base);
 }
 
-size_t Print::print(long n, int base)
+size_t Print::print(long n, uint8_t base)
 {
   if (base == 0) {
     return write(n);
@@ -100,13 +100,13 @@ size_t Print::print(long n, int base)
   }
 }
 
-size_t Print::print(unsigned long n, int base)
+size_t Print::print(unsigned long n, uint8_t base)
 {
   if (base == 0) return write(n);
   else return printNumber(n, base);
 }
 
-size_t Print::print(double n, int digits)
+size_t Print::print(double n, uint8_t digits)
 {
   return printFloat(n, digits);
 }
@@ -149,42 +149,42 @@ size_t Print::println(char c)
   return n;
 }
 
-size_t Print::println(unsigned char b, int base)
+size_t Print::println(unsigned char b, uint8_t base)
 {
   size_t n = print(b, base);
   n += println();
   return n;
 }
 
-size_t Print::println(int num, int base)
+size_t Print::println(int num, uint8_t base)
 {
   size_t n = print(num, base);
   n += println();
   return n;
 }
 
-size_t Print::println(unsigned int num, int base)
+size_t Print::println(unsigned int num, uint8_t base)
 {
   size_t n = print(num, base);
   n += println();
   return n;
 }
 
-size_t Print::println(long num, int base)
+size_t Print::println(long num, uint8_t base)
 {
   size_t n = print(num, base);
   n += println();
   return n;
 }
 
-size_t Print::println(unsigned long num, int base)
+size_t Print::println(unsigned long num, uint8_t base)
 {
   size_t n = print(num, base);
   n += println();
   return n;
 }
 
-size_t Print::println(double num, int digits)
+size_t Print::println(double num, uint8_t digits)
 {
   size_t n = print(num, digits);
   n += println();
@@ -237,7 +237,7 @@ size_t Print::printFloat(double number, uint8_t digits)
 
   // Round correctly so that print(1.999, 2) prints as "2.00"
   double rounding = 0.5;
-  for (uint8_t i=0; i<digits; ++i)
+  for (uint8_t i = 0; i < digits; ++i)
     rounding /= 10.0;
 
   number += rounding;
@@ -249,7 +249,7 @@ size_t Print::printFloat(double number, uint8_t digits)
 
   // Print the decimal point, but only if there are digits beyond
   if (digits > 0) {
-    n += print("."); 
+    n += print('.');
   }
 
   // Extract digits from the remainder one at a time

hardware/arduino/avr/cores/arduino/Print.h

@@ -59,24 +59,24 @@ class Print
     size_t print(const String &);
     size_t print(const char[]);
     size_t print(char);
-    size_t print(unsigned char, int = DEC);
-    size_t print(int, int = DEC);
-    size_t print(unsigned int, int = DEC);
-    size_t print(long, int = DEC);
-    size_t print(unsigned long, int = DEC);
-    size_t print(double, int = 2);
+    size_t print(unsigned char, uint8_t = DEC);
+    size_t print(int, uint8_t = DEC);
+    size_t print(unsigned int, uint8_t = DEC);
+    size_t print(long, uint8_t = DEC);
+    size_t print(unsigned long, uint8_t = DEC);
+    size_t print(double, uint8_t = 2);
     size_t print(const Printable&);
 
     size_t println(const __FlashStringHelper *);
     size_t println(const String &s);
     size_t println(const char[]);
     size_t println(char);
-    size_t println(unsigned char, int = DEC);
-    size_t println(int, int = DEC);
-    size_t println(unsigned int, int = DEC);
-    size_t println(long, int = DEC);
-    size_t println(unsigned long, int = DEC);
-    size_t println(double, int = 2);
+    size_t println(unsigned char, uint8_t = DEC);
+    size_t println(int, uint8_t = DEC);
+    size_t println(unsigned int, uint8_t = DEC);
+    size_t println(long, uint8_t = DEC);
+    size_t println(unsigned long, uint8_t = DEC);
+    size_t println(double, uint8_t = 2);
     size_t println(const Printable&);
     size_t println(void);
 };

hardware/arduino/avr/cores/arduino/wiring_analog.c

@@ -35,7 +35,7 @@ void analogReference(uint8_t mode)
 	analog_reference = mode;
 }
 
-int analogRead(uint8_t pin)
+uint16_t analogRead(uint8_t pin)
 {
 	uint8_t low, high;
 
@@ -97,7 +97,7 @@ int analogRead(uint8_t pin)
 // hardware support.  These are defined in the appropriate
 // pins_*.c file.  For the rest of the pins, we default
 // to digital output.
-void analogWrite(uint8_t pin, int val)
+void analogWrite(uint8_t pin, uint8_t val)
 {
 	// We need to make sure the PWM output is enabled for those pins
 	// that support it, as we turn it off when digitally reading or

hardware/arduino/avr/cores/arduino/wiring_digital.c

@@ -162,7 +162,7 @@ void digitalWrite(uint8_t pin, uint8_t val)
 	SREG = oldSREG;
 }
 
-int digitalRead(uint8_t pin)
+uint8_t digitalRead(uint8_t pin)
 {
 	uint8_t timer = digitalPinToTimer(pin);
 	uint8_t bit = digitalPinToBitMask(pin);