Merge remote-tracking branch 'remotes/ficeto/esp8266' into esp8266

Author: Links2004

hardware/esp8266com/esp8266/cores/esp8266/Arduino.h

@@ -172,6 +172,7 @@ int digitalRead(uint8_t);
 int analogRead(uint8_t);
 void analogReference(uint8_t mode);
 void analogWrite(uint8_t, int);
+void analogWriteFreq(uint32_t freq);
 
 unsigned long millis(void);
 unsigned long micros(void);

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_timer.c

@@ -30,32 +30,39 @@ void timer1_isr_handler(void *para){
     if(timer1_user_cb) timer1_user_cb();
 }
 
-void timer1_attachInterrupt(void (*userFunc)(void)) {
+extern void __timer1_isr_init(){
+    ETS_FRC_TIMER1_INTR_ATTACH(timer1_isr_handler, NULL);
+}
+
+extern void __timer1_attachInterrupt(void (*userFunc)(void)) {
     timer1_user_cb = userFunc;
     ETS_FRC1_INTR_ENABLE();
 }
 
-void timer1_detachInterrupt() {
+extern 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){
+extern 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){
+extern void __timer1_write(uint32_t ticks){
     T1L = ((ticks) & 0x7FFFFF);
     if((T1C & (1 << TCIT)) == 0) TEIE |= TEIE1;//edge int enable
 }
 
-void timer1_disable(){
+extern void __timer1_disable(){
     T1C = 0;
     T1I = 0;
 }
 
-void timer1_isr_init(){
-    ETS_FRC_TIMER1_INTR_ATTACH(timer1_isr_handler, NULL);
-}
+extern void timer1_isr_init(void) __attribute__ ((weak, alias("__timer1_isr_init")));
+extern void timer1_detachInterrupt(void) __attribute__ ((weak, alias("__timer1_detachInterrupt")));
+extern void timer1_disable(void) __attribute__ ((weak, alias("__timer1_disable")));
+extern void timer1_attachInterrupt(void (*userFunc)(void)) __attribute__ ((weak, alias("__timer1_attachInterrupt")));
+extern void timer1_write(uint32_t ticks) __attribute__ ((weak, alias("__timer1_write")));
+extern void timer1_enable(uint8_t divider, uint8_t int_type, uint8_t reload) __attribute__ ((weak, alias("__timer1_enable")));

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring.c

@@ -75,6 +75,7 @@ void delayMicroseconds(unsigned int us) {
 
 void init() {
     initPins();
+    timer1_isr_init();
     os_timer_setfn(&micros_overflow_timer, (os_timer_func_t*) &micros_overflow_tick, 0);
     os_timer_arm(&micros_overflow_timer, 60000, REPEAT);
 }

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_pwm.c

@@ -139,4 +139,10 @@ extern void __analogWrite(uint8_t pin, int value) {
 	}
 }
 
+extern void __analogWriteFreq(uint32_t freq){
+  pwm_freq = freq;
+  prep_pwm_steps();
+}
+
 extern void analogWrite(uint8_t pin, int val) __attribute__ ((weak, alias("__analogWrite")));
+extern void analogWriteFreq(uint32_t freq) __attribute__ ((weak, alias("__analogWriteFreq")));