Modularize esp8266 components

embedded8266/user/adc.c

@@ -0,0 +1,82 @@
+//I did not write this file, but I don't know where it came from.
+//It was also heavily modified by me, Charles Lohr.  I personally
+//renounce any copyright over this file, so all of my modifications
+//are hereby placed into the public domain.
+
+#include "ets_sys.h"
+#include "osapi.h"
+
+#include "adc.h"
+
+#define i2c_bbpll                           0x67
+#define i2c_bbpll_en_audio_clock_out        4
+#define i2c_bbpll_en_audio_clock_out_msb    7
+#define i2c_bbpll_en_audio_clock_out_lsb    7
+#define i2c_bbpll_hostid                    4
+#define i2c_saradc                          0x6C
+#define i2c_saradc_hostid                   2
+
+#define i2c_saradc_en_test        0
+#define i2c_saradc_en_test_msb    5
+#define i2c_saradc_en_test_lsb    5
+
+#define i2c_writeReg_Mask(block, host_id, reg_add, Msb, Lsb, indata) \
+    rom_i2c_writeReg_Mask(block, host_id, reg_add, Msb, Lsb, indata)
+
+#define i2c_readReg_Mask(block, host_id, reg_add, Msb, Lsb) \
+    rom_i2c_readReg_Mask_(block, host_id, reg_add, Msb, Lsb)
+
+#define i2c_writeReg_Mask_def(block, reg_add, indata) \
+    i2c_writeReg_Mask(block, block##_hostid, reg_add, reg_add##_msb, reg_add##_lsb, indata)
+
+#define i2c_readReg_Mask_def(block, reg_add) \
+    i2c_readReg_Mask(block, block##_hostid, reg_add, reg_add##_msb, reg_add##_lsb)
+
+
+void ICACHE_FLASH_ATTR hs_adc_start(void)
+{
+    i2c_writeReg_Mask_def(i2c_saradc, i2c_saradc_en_test, 1); //select test mux
+
+    //PWDET_CAL_EN=0, PKDET_CAL_EN=0
+    SET_PERI_REG_MASK(0x60000D5C, 0x200000);
+
+    while (GET_PERI_REG_BITS(0x60000D50, 26, 24) > 0); //wait r_state == 0
+
+    CLEAR_PERI_REG_MASK(0x60000D50, 0x02);    //force_en=0
+    SET_PERI_REG_MASK(0x60000D50, 0x02);    //force_en=1
+}
+
+uint16 hs_adc_read(void)
+{
+    uint8 i;
+    uint16 sardata[8];
+	uint16_t sar_dout = 0;
+
+    while (GET_PERI_REG_BITS(0x60000D50, 26, 24) > 0); //wait r_state == 0
+
+    read_sar_dout(sardata);
+
+    for (i = 0; i < 8; i++) {
+        sar_dout += sardata[i];
+    }
+
+#ifdef OLDWAY_NEEDS_RESTART
+    //tout = (sar_dout + 8) >> 4;   //tout is 10 bits fraction
+// ??? Why does this exist ??? It didn't start commented out, but now that I did comment it, it still seems happy.
+//    i2c_writeReg_Mask_def(i2c_saradc, i2c_saradc_en_test, 1); //select test mux
+//    while (GET_PERI_REG_BITS(0x60000D50, 26, 24) > 0); //wait r_state == 0
+
+//    CLEAR_PERI_REG_MASK(0x60000D5C, 0x200000);
+ //   SET_PERI_REG_MASK(0x60000D60, 0x1);    //force_en=1
+ //   CLEAR_PERI_REG_MASK(0x60000D60, 0x1);    //force_en=1
+#else
+
+	//Start reading a new sample.
+    CLEAR_PERI_REG_MASK(0x60000D50, 0x02);    //force_en=0
+    SET_PERI_REG_MASK(0x60000D50, 0x02);    //force_en=1
+#endif
+
+    return sar_dout;      //tout is 10 bits fraction
+}
+
+

embedded8266/user/adc.h

@@ -0,0 +1,6 @@
+#ifndef __ADC_H__
+#define __ADC_H__
+void hs_adc_start(void);
+uint16 hs_adc_read(void);
+#endif
+

embedded8266/user/hpatimer.c

@@ -2,7 +2,7 @@
 // ColorChord License.  You Choose.
 
 #include "hpatimer.h"
-#include <driver/adc.h>
+#include "adc.h"
 #include "osapi.h"
 #include "mem.h"
 #include "eagle_soc.h"

embedded8266/user/pin_mux_register.h

@@ -0,0 +1,139 @@
+/*
+ *  Copyright (c) Espressif System 2010 - 2012
+ *
+ */
+
+#ifndef _PIN_MUX_H_
+#define _PIN_MUX_H_
+
+#define PERIPHS_IO_MUX			        0x60000800
+
+#define PERIPHS_IO_MUX_FUNC             0x13
+#define PERIPHS_IO_MUX_FUNC_S           4
+#define PERIPHS_IO_MUX_PULLUP           BIT7
+#define PERIPHS_IO_MUX_PULLDWN          BIT6
+#define PERIPHS_IO_MUX_SLEEP_PULLUP     BIT3
+#define PERIPHS_IO_MUX_SLEEP_PULLDWN    BIT2
+#define PERIPHS_IO_MUX_SLEEP_OE         BIT1
+#define PERIPHS_IO_MUX_OE               BIT0
+
+#define PERIPHS_IO_MUX_CONF_U           (PERIPHS_IO_MUX + 0x00)
+#define SPI0_CLK_EQU_SYS_CLK                BIT8
+#define SPI1_CLK_EQU_SYS_CLK                BIT9
+
+#define PERIPHS_IO_MUX_MTDI_U           (PERIPHS_IO_MUX + 0x04)
+#define FUNC_MTDI                           0
+#define FUNC_I2SI_DATA                      1
+#define FUNC_HSPIQ_MISO                     2
+#define FUNC_GPIO12                         3
+#define FUNC_UART0_DTR                      4
+
+#define PERIPHS_IO_MUX_MTCK_U           (PERIPHS_IO_MUX + 0x08)
+#define FUNC_MTCK                            0
+#define FUNC_I2SI_BCK                        1
+#define FUNC_HSPID_MOSI                      2
+#define FUNC_GPIO13                          3
+#define FUNC_UART0_CTS                       4
+
+#define PERIPHS_IO_MUX_MTMS_U           (PERIPHS_IO_MUX + 0x0C)
+#define FUNC_MTMS                           0
+#define FUNC_I2SI_WS                        1
+#define FUNC_HSPI_CLK                       2
+#define FUNC_GPIO14                         3
+#define FUNC_UART0_DSR                      4
+
+#define PERIPHS_IO_MUX_MTDO_U           (PERIPHS_IO_MUX + 0x10)
+#define FUNC_MTDO                           0
+#define FUNC_I2SO_BCK                       1
+#define FUNC_HSPI_CS0                       2
+#define FUNC_GPIO15                         3
+#define FUNC_U0RTS                          4
+#define FUNC_UART0_RTS                      4
+
+#define PERIPHS_IO_MUX_U0RXD_U          (PERIPHS_IO_MUX + 0x14)
+#define FUNC_U0RXD                          0
+#define FUNC_I2SO_DATA                      1
+#define FUNC_GPIO3                          3
+#define FUNC_CLK_XTAL_BK                    4
+
+#define PERIPHS_IO_MUX_U0TXD_U          (PERIPHS_IO_MUX + 0x18)
+#define FUNC_U0TXD                          0
+#define FUNC_SPICS1                         1
+#define FUNC_GPIO1                          3
+#define FUNC_CLK_RTC_BK                     4
+
+#define PERIPHS_IO_MUX_SD_CLK_U         (PERIPHS_IO_MUX + 0x1c)
+#define FUNC_SDCLK                          0
+#define FUNC_SPICLK                         1
+#define FUNC_GPIO6                          3
+#define UART1_CTS                           4
+
+#define PERIPHS_IO_MUX_SD_DATA0_U       (PERIPHS_IO_MUX + 0x20)
+#define FUNC_SDDATA0                        0
+#define FUNC_SPIQ_MISO                      1
+#define FUNC_GPIO7                          3
+#define FUNC_U1TXD                          4
+#define FUNC_UART1_TXD                      4
+
+#define PERIPHS_IO_MUX_SD_DATA1_U       (PERIPHS_IO_MUX + 0x24)
+#define FUNC_SDDATA1                        0
+#define FUNC_SPID_MOSI                      1
+#define FUNC_GPIO8                          3
+#define FUNC_U1RXD                          4
+#define FUNC_UART1_RXD                      4
+
+#define PERIPHS_IO_MUX_SD_DATA2_U       (PERIPHS_IO_MUX + 0x28)
+#define FUNC_SDDATA2                        0
+#define FUNC_SPIHD                          1
+#define FUNC_GPIO9                          3
+#define UFNC_HSPIHD                         4
+
+#define PERIPHS_IO_MUX_SD_DATA3_U       (PERIPHS_IO_MUX + 0x2c)
+#define FUNC_SDDATA3                        0
+#define FUNC_SPIWP                          1
+#define FUNC_GPIO10                         3
+#define FUNC_HSPIWP                         4
+
+#define PERIPHS_IO_MUX_SD_CMD_U         (PERIPHS_IO_MUX + 0x30)
+#define FUNC_SDCMD                          0
+#define FUNC_SPICS0                         1
+#define FUNC_GPIO11                         3
+#define U1RTS                               4
+#define UART1_RTS                           4
+
+#define PERIPHS_IO_MUX_GPIO0_U          (PERIPHS_IO_MUX + 0x34)
+#define FUNC_GPIO0                          0
+#define FUNC_SPICS2                         1
+#define FUNC_CLK_OUT                        4
+
+#define PERIPHS_IO_MUX_GPIO2_U          (PERIPHS_IO_MUX + 0x38)
+#define FUNC_GPIO2                          0
+#define FUNC_I2SO_WS                        1
+#define FUNC_U1TXD_BK                       2
+#define FUNC_UART1_TXD_BK                   2
+#define FUNC_U0TXD_BK                       4
+#define FUNC_UART0_TXD_BK                   4
+
+#define PERIPHS_IO_MUX_GPIO4_U          (PERIPHS_IO_MUX + 0x3C)
+#define FUNC_GPIO4                          0
+#define FUNC_CLK_XTAL                       1
+
+#define PERIPHS_IO_MUX_GPIO5_U          (PERIPHS_IO_MUX + 0x40)
+#define FUNC_GPIO5                          0
+#define FUNC_CLK_RTC                        1
+
+#define PIN_PULLUP_DIS(PIN_NAME)         CLEAR_PERI_REG_MASK(PIN_NAME, PERIPHS_IO_MUX_PULLUP)
+#define PIN_PULLUP_EN(PIN_NAME)          SET_PERI_REG_MASK(PIN_NAME, PERIPHS_IO_MUX_PULLUP)
+
+//XXX THIS LOOKS WRONG.
+
+#undef PIN_FUNC_SELECT
+
+#define PIN_FUNC_SELECT(PIN_NAME, FUNC)  do { \
+        CLEAR_PERI_REG_MASK(PIN_NAME, (PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)); \
+        SET_PERI_REG_MASK(PIN_NAME, (((FUNC&BIT2)<<2)|(FUNC&0x3))<<PERIPHS_IO_MUX_FUNC_S); \
+    } while (0)
+
+
+#endif //_PIN_MUX_H_
+

embedded8266/user/user_main.c

@@ -5,13 +5,13 @@
 #include "c_types.h"
 #include "user_interface.h"
 #include "ets_sys.h"
-#include "driver/uart.h"
+#include "uart.h"
 #include "osapi.h"
 #include "espconn.h"
 #include "mystuff.h"
 #include "ws2812_i2s.h"
 #include "hpatimer.h"
-#include <DFT32.h>
+#include "DFT32.h"
 #include "ccconfig.h"
 #include <embeddednf.h>
 #include <embeddedout.h>