kazu/ESP8266lib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjusted old code to new spi and gpi

Browse Source 
minor fixes
This commit is contained in:
FrankE
2020-06-16 21:50:13 +02:00
parent ccfa7d83d3
commit 6dfce7803a
3 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ext/lcd/ILI9341.h
View File

@@ -76,8 +76,8 @@
#include "../../io/SoftSPI.h" //#include "../../io/SoftSPI.h"
#include "../../io/HardSPI.h" //#include "../../io/HardSPI.h"
static constexpr const uint8_t initcmd[] = { static constexpr const uint8_t initcmd[] = {
@@ -107,7 +107,7 @@ static constexpr const uint8_t initcmd[] = {
}; };
//template <int PIN_CS, int PIN_MISO, int PIN_MOSI, int PIN_CLK, int PIN_DATA_COMMAND> class ILI9341 { //template <int PIN_CS, int PIN_MISO, int PIN_MOSI, int PIN_CLK, int PIN_DATA_COMMAND> class ILI9341 {
template <int PIN_CS, int PIN_DATA_COMMAND, typename SPI> class ILI9341 { template <typename SPI, int PIN_CS, int PIN_DATA_COMMAND> class ILI9341 {
private: private:
@@ -124,8 +124,8 @@ public:
ILI9341(SPI& spi) : spi(spi) { ILI9341(SPI& spi) : spi(spi) {
GPIO::setOutput(PIN_DATA_COMMAND); MyGPIO::setOutput(PIN_DATA_COMMAND);
GPIO::setOutput(PIN_CS); MyGPIO::setOutput(PIN_CS);
//spi.init(); //spi.init();
@@ -296,7 +296,7 @@ private:
/** select the display (CS=0) */ /** select the display (CS=0) */
inline void chipSelect() { inline void chipSelect() {
//spi::chipSelect(); //spi::chipSelect();
GPIO::clear(PIN_CS); MyGPIO::clear(PIN_CS);
} }
@@ -344,19 +344,19 @@ private:
/** unselect the display (CS=1) */ /** unselect the display (CS=1) */
inline void chipDeselect() { inline void chipDeselect() {
//spi::chipDeselect(); //spi::chipDeselect();
GPIO::set(PIN_CS); MyGPIO::set(PIN_CS);
} }
/** switch to command-mode */ /** switch to command-mode */
inline void modeCMD() { inline void modeCMD() {
//gpio_set_level((gpio_num_t)PIN_DATA_COMMAND, 0); //gpio_set_level((gpio_num_t)PIN_DATA_COMMAND, 0);
GPIO::clear(PIN_DATA_COMMAND); MyGPIO::clear(PIN_DATA_COMMAND);
} }
/** switch to data-mode */ /** switch to data-mode */
inline void modeDATA() { inline void modeDATA() {
//gpio_set_level((gpio_num_t)PIN_DATA_COMMAND, 1); //gpio_set_level((gpio_num_t)PIN_DATA_COMMAND, 1);
GPIO::set(PIN_DATA_COMMAND); MyGPIO::set(PIN_DATA_COMMAND);
} }

84
ext/lcd/ST7735.h
View File

@@ -1,7 +1,7 @@
#ifndef LCD_SSD1306 #ifndef LCD_SSD1306
#define LCD_SSD1306 #define LCD_SSD1306
#include "../../io/SoftSPI.h" //#include "../../io/SoftSPI.h"
/** /**
@@ -17,46 +17,24 @@
* CS = chip-select * CS = chip-select
*/ */
class ST7735 { template <typename SPI, int PIN_CS, int PIN_DATA_COMMAND> class ST7735 {
private: private:
static constexpr const char* NAME = "ST7735"; static constexpr const char* NAME = "ST7735";
bool inited = false; SPI& spi;
/** switch D/C line low */
inline void modeCommand() {
GPIO5_OUTPUT_SET;
GPIO5_L;
}
/** switch D/C line high */
inline void modeData() {
GPIO5_OUTPUT_SET;
GPIO5_H;
}
/** set CS = low */
inline void select() {
spi::chipSelect();
}
/** set CS = high */
inline void deselect() {
spi::chipDeselect();
}
public: public:
/** ctor */
void initOnce() { ST7735(SPI& spi) : spi(spi) {
if (inited) {return;} MyGPIO::setOutput(PIN_DATA_COMMAND);
MyGPIO::setOutput(PIN_CS);
init(); init();
inited = true;
} }
#define ST7735_NOP 0x00 #define ST7735_NOP 0x00
#define ST7735_SWRESET 0x01 #define ST7735_SWRESET 0x01
#define ST7735_RDDID 0x04 #define ST7735_RDDID 0x04
@@ -111,17 +89,19 @@ private:
void waitLong() { void waitLong() {
for (int i = 0; i < 50; ++i) { for (int i = 0; i < 50; ++i) {
os_delay_us(10*1000); //os_delay_us(10*1000);
vTaskDelay(10 / portTICK_PERIOD_MS);
} }
} }
void waitShort() { void waitShort() {
os_delay_us(10*1000); //os_delay_us(10*1000);
vTaskDelay(10 / portTICK_PERIOD_MS);
} }
void init() { void init() {
spi::init(); //spi::init();
select(); select();
@@ -239,7 +219,7 @@ private:
public: public:
void flush(uint16_t* data) { void flush(const uint16_t* data) {
select(); select();
@@ -264,7 +244,8 @@ public:
//const uint8_t hi = color >> 8; //const uint8_t hi = color >> 8;
//sendData(lo); //sendData(lo);
//sendData(hi); //sendData(hi);
spi::writeWord(color); //spi::writeWord(color);
spi.writeWord(color);
} }
deselect(); deselect();
@@ -278,17 +259,46 @@ private:
void sendData(uint8_t data) { void sendData(uint8_t data) {
modeData(); modeData();
//select(); //select();
spi::writeByte(data); //spi::writeByte(data);
spi.writeByte(data);
//deselect(); //deselect();
} }
void sendCommand(uint8_t cmd) { void sendCommand(uint8_t cmd) {
modeCommand(); modeCommand();
//select(); //select();
spi::writeByte(cmd); //spi::writeByte(cmd);
spi.writeByte(cmd);
//deselect(); //deselect();
} }
/** switch D/C line low */
inline void modeCommand() {
//GPIO5_OUTPUT_SET;
//GPIO5_L;
MyGPIO::clear(PIN_DATA_COMMAND);
}
/** switch D/C line high */
inline void modeData() {
//GPIO5_OUTPUT_SET;
//GPIO5_H;
MyGPIO::set(PIN_DATA_COMMAND);
}
/** set CS = low */
inline void select() {
MyGPIO::clear(PIN_CS);
//spi::chipSelect();
}
/** set CS = high */
inline void deselect() {
//spi::chipDeselect();
MyGPIO::set(PIN_CS);
}
}; };

10
ext/rf/SX1276.h
View File

@@ -369,12 +369,12 @@ private:
/** perform hard reset */ /** perform hard reset */
void reset() { void reset() {
debugMod(NAME, "reset"); debugMod(NAME, "reset");
//MyGPIO::set(PIN_RESET);
//usleep(20*1000);
MyGPIO::clear(PIN_RESET); // perform reset
usleep(20*1000);
MyGPIO::set(PIN_RESET); MyGPIO::set(PIN_RESET);
usleep(20*1000); usleep(50*1000);
MyGPIO::clear(PIN_RESET); // perform reset
usleep(50*1000);
MyGPIO::set(PIN_RESET);
usleep(50*1000);
debugMod(NAME, "reset done"); debugMod(NAME, "reset done");
} }