Importing my changes

.gitignore

@@ -56,3 +56,5 @@ avr-toolchain-*.zip
 /hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/
 /hardware/tools/bossac.exe
 /hardware/tools/listComPorts.exe
+
+build/macosx/esptool-*-osx.zip

cores/esp8266/Arduino.h

@@ -36,17 +36,27 @@ extern "C" {
 #include "stdlib_noniso.h"
 #include "binary.h"
 #include "pgmspace.h"
+#include "esp8266_peri.h"
+#include "si2c.h"
 
 void yield(void);
 
 #define HIGH 0x1
 #define LOW  0x0
 
-#define INPUT 0x0
-#define OUTPUT 0x1
-#define INPUT_PULLUP 0x2
-#define INPUT_PULLDOWN 0x3
-#define OUTPUT_OPEN_DRAIN 0x4
+#define PWMRANGE 1023
+
+//GPIO FUNCTIONS
+#define INPUT           0x00
+#define OUTPUT          0x01
+#define INPUT_PULLUP    0x02
+#define INPUT_PULLDOWN  0x04
+#define SPECIAL         0xF8 //defaults to the usable BUSes uart0rx/tx uart1tx and hspi
+#define FUNCTION_0      0x08
+#define FUNCTION_1      0x18
+#define FUNCTION_2      0x28
+#define FUNCTION_3      0x38
+#define FUNCTION_4      0x48
 
 #define PI 3.1415926535897932384626433832795
 #define HALF_PI 1.5707963267948966192313216916398
@@ -61,13 +71,41 @@ void yield(void);
 #define LSBFIRST 0
 #define MSBFIRST 1
 
-#define CHANGE 1
-#define FALLING 2
-#define RISING 3
+//Interrupt Modes
+#define DISABLED  0x00
+#define RISING    0x01
+#define FALLING   0x02
+#define CHANGE    0x03
+#define ONLOW     0x04
+#define ONHIGH    0x05
+#define ONLOW_WE  0x0C
+#define ONHIGH_WE 0x0D
 
 #define DEFAULT 1
 #define EXTERNAL 0
 
+//timer dividers
+#define TIM_DIV1 	0 //80MHz (80 ticks/us - 104857.588 us max)
+#define TIM_DIV16	1 //5MHz (5 ticks/us - 1677721.4 us max)
+#define TIM_DIV265	3 //312.5Khz (1 tick = 3.2us - 26843542.4 us max)
+//timer int_types
+#define TIM_EDGE	0
+#define TIM_LEVEL	1
+//timer reload values
+#define TIM_SINGLE	0 //on interrupt routine you need to write a new value to start the timer again
+#define TIM_LOOP	1 //on interrupt the counter will start with the same value again
+
+#define timer1_read()           (T1V)
+#define timer1_enabled()        ((T1C & (1 << TCTE)) != 0)
+#define timer1_interrupted()    ((T1C & (1 << TCIS)) != 0)
+
+void timer1_isr_init(void);
+void timer1_enable(uint8_t divider, uint8_t int_type, uint8_t reload);
+void timer1_disable(void);
+void timer1_attachInterrupt(void (*userFunc)(void));
+void timer1_detachInterrupt(void);
+void timer1_write(uint32_t ticks); //maximum ticks 8388607
+
 // undefine stdlib's abs if encountered
 #ifdef abs
 #undef abs
@@ -145,13 +183,12 @@ void loop(void);
 
 uint32_t digitalPinToPort(uint32_t pin);
 uint32_t digitalPinToBitMask(uint32_t pin);
-#define analogInPinToBit(P) (P)
 volatile uint32_t* portOutputRegister(uint32_t port);
 volatile uint32_t* portInputRegister(uint32_t port);
 volatile uint32_t* portModeRegister(uint32_t port);
 
-#define NOT_A_PIN 0
-#define NOT_A_PORT 0
+#define NOT_A_PIN -1
+#define NOT_A_PORT -1
 #define NOT_AN_INTERRUPT -1
 
 #ifdef __cplusplus

cores/esp8266/core_esp8266_timer.c

@@ -0,0 +1,61 @@
+/* 
+  timer.c - Timer1 library for esp8266
+
+  Copyright (c) 2015 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "wiring_private.h"
+#include "pins_arduino.h"
+#include "c_types.h"
+
+void (*timer1_user_cb)(void);
+
+void timer1_isr_handler(void *para){
+    if((T1C & ((1 << TCAR) | (1 << TCIT))) == 0) TEIE &= ~TEIE1;//edge int disable
+    T1I = 0;
+    if(timer1_user_cb) timer1_user_cb();
+}
+
+void timer1_attachInterrupt(void (*userFunc)(void)) {
+    timer1_user_cb = userFunc;
+    ETS_FRC1_INTR_ENABLE();
+}
+
+void timer1_detachInterrupt() {
+    timer1_user_cb = 0;
+    TEIE &= ~TEIE1;//edge int disable
+    ETS_FRC1_INTR_DISABLE();
+}
+
+void timer1_enable(uint8_t divider, uint8_t int_type, uint8_t reload){
+    T1C = (1 << TCTE) | ((divider & 3) << TCPD) | ((int_type & 1) << TCIT) | ((reload & 1) << TCAR);
+    T1I = 0;
+}
+
+void timer1_write(uint32_t ticks){
+    T1L = ((ticks) & 0x7FFFFF);
+    if((T1C & (1 << TCIT)) == 0) TEIE |= TEIE1;//edge int enable
+}
+
+void timer1_disable(){
+    T1C = 0;
+    T1I = 0;
+}
+
+void timer1_isr_init(){
+    ETS_FRC_TIMER1_INTR_ATTACH(timer1_isr_handler, NULL);
+}

cores/esp8266/core_esp8266_wiring_analog.c

@@ -1,35 +1,56 @@
 /* 
- core_esp8266_analog.c - an interface to the esp8266 ADC
+  analog.c - analogRead implementation for esp8266
 
- Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
- This file is part of the esp8266 core for Arduino environment.
+  Copyright (c) 2015 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
  
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 #include "wiring_private.h"
 #include "pins_arduino.h"
 
-void analogReference(uint8_t mode) {
-}
+void analogReference(uint8_t mode) {}
 
 extern int __analogRead(uint8_t pin) {
-    if(pin == 0)
-        return system_adc_read();
-
-    return 0;
+  if(pin == 17){
+    //return system_adc_read();
+    uint8_t i;
+    uint16_t data[8];
+
+    rom_i2c_writeReg_Mask(0x6C,2,0,5,5,1);
+
+    ESP8266_REG(0xD5C) |= (1 << 21);
+    while ((ESP8266_REG(0xD50) & (7 << 24)) > 0);
+    ESP8266_REG(0xD50) &= ~(1 << 1);
+    ESP8266_REG(0xD50) |= (1 << 1);
+    delayMicroseconds(2);
+    while ((ESP8266_REG(0xD50) & (7 << 24)) > 0);
+
+    read_sar_dout(data);
+    rom_i2c_writeReg_Mask(0x6C,2,0,5,5,1);
+
+    while ((ESP8266_REG(0xD50) & (7 << 24)) > 0);
+    ESP8266_REG(0xD5C) &= ~(1 << 21);
+    ESP8266_REG(0xD60) |= (1 << 0);
+    ESP8266_REG(0xD60) &= ~(1 << 0);
+
+    uint16_t tout = 0;
+    for (i = 0; i < 8; i++) tout += data[i];
+    return tout >> 4;//tout is 10 bits fraction
+  }
+  return digitalRead(pin) * 1023;
 }
 
 extern int analogRead(uint8_t pin) __attribute__ ((weak, alias("__analogRead")));