diff --git a/BASIC_V3.0.dwg b/dwg/BASIC_V3.0.dwg similarity index 100% rename from BASIC_V3.0.dwg rename to dwg/BASIC_V3.0.dwg diff --git a/examples/axp202_adc/axp202_adc.ino b/examples/Basic unit/AXP20x_ADC/AXP20x_ADC.ino similarity index 100% rename from examples/axp202_adc/axp202_adc.ino rename to examples/Basic unit/AXP20x_ADC/AXP20x_ADC.ino diff --git a/examples/axp202_irq/axp202_irq.ino b/examples/Basic unit/AXP20x_IRQ/AXP20x_IRQ.ino similarity index 100% rename from examples/axp202_irq/axp202_irq.ino rename to examples/Basic unit/AXP20x_IRQ/AXP20x_IRQ.ino diff --git a/examples/Audio/BuiltInDAC/PlayMP3FromSDToDAC/PlayMP3FromSDToDAC.ino b/examples/Basic unit/Audio/BuiltInDAC/PlayMP3FromSDToDAC/PlayMP3FromSDToDAC.ino similarity index 100% rename from examples/Audio/BuiltInDAC/PlayMP3FromSDToDAC/PlayMP3FromSDToDAC.ino rename to examples/Basic unit/Audio/BuiltInDAC/PlayMP3FromSDToDAC/PlayMP3FromSDToDAC.ino diff --git a/examples/Audio/ExternalDAC/SD_Play/SD_Play.ino b/examples/Basic unit/Audio/ExternalDAC/SD_Play/SD_Play.ino similarity index 100% rename from examples/Audio/ExternalDAC/SD_Play/SD_Play.ino rename to examples/Basic unit/Audio/ExternalDAC/SD_Play/SD_Play.ino diff --git a/examples/Audio/ExternalDAC/external_dac_play/external_dac_play.ino b/examples/Basic unit/Audio/ExternalDAC/external_dac_play/external_dac_play.ino similarity index 100% rename from examples/Audio/ExternalDAC/external_dac_play/external_dac_play.ino rename to examples/Basic unit/Audio/ExternalDAC/external_dac_play/external_dac_play.ino diff --git a/examples/Audio/ExternalDAC/external_dac_play/image.h b/examples/Basic unit/Audio/ExternalDAC/external_dac_play/image.h similarity index 100% rename from examples/Audio/ExternalDAC/external_dac_play/image.h rename to examples/Basic unit/Audio/ExternalDAC/external_dac_play/image.h diff --git a/examples/BMA423_Accel/BMA423_Accel.ino b/examples/Basic unit/BMA423_Accel/BMA423_Accel.ino similarity index 100% rename from examples/BMA423_Accel/BMA423_Accel.ino rename to examples/Basic unit/BMA423_Accel/BMA423_Accel.ino diff --git a/examples/BMA423_StepCount/BMA423_StepCount.ino b/examples/Basic unit/BMA423_StepCount/BMA423_StepCount.ino similarity index 100% rename from examples/BMA423_StepCount/BMA423_StepCount.ino rename to examples/Basic unit/BMA423_StepCount/BMA423_StepCount.ino diff --git a/examples/drawSD_BMP/drawSD_BMP.ino b/examples/Basic unit/DrawSD_BMP/DrawSD_BMP.ino similarity index 95% rename from examples/drawSD_BMP/drawSD_BMP.ino rename to examples/Basic unit/DrawSD_BMP/DrawSD_BMP.ino index 776ff0d..8d0c232 100644 --- a/examples/drawSD_BMP/drawSD_BMP.ino +++ b/examples/Basic unit/DrawSD_BMP/DrawSD_BMP.ino @@ -1,3 +1,5 @@ +// There is no SDCard in Twatch-2020 + #include TTGOClass *ttgo = nullptr; diff --git a/examples/drawSD_BMP/bmp1.bmp b/examples/Basic unit/DrawSD_BMP/bmp1.bmp similarity index 100% rename from examples/drawSD_BMP/bmp1.bmp rename to examples/Basic unit/DrawSD_BMP/bmp1.bmp diff --git a/examples/drawSD_BMP/bmp2.bmp b/examples/Basic unit/DrawSD_BMP/bmp2.bmp similarity index 100% rename from examples/drawSD_BMP/bmp2.bmp rename to examples/Basic unit/DrawSD_BMP/bmp2.bmp diff --git a/examples/Basic unit/Motor/Motor.ino b/examples/Basic unit/Motor/Motor.ino new file mode 100644 index 0000000..2ce46ca --- /dev/null +++ b/examples/Basic unit/Motor/Motor.ino @@ -0,0 +1,32 @@ + +// #define LILYGO_TWATCH_2020_V1 // If you are using T-Watch-2020 version, please open this macro definition + +#include + +TTGOClass *ttgo; + +void setup() +{ + Serial.begin(115200); + ttgo = TTGOClass::getWatch(); + ttgo->begin(); + ttgo->openBL(); + + //! begin motor attach to 33 pin , In TWatch-2020 it is IO4 + ttgo->motor_begin(); + + ttgo->eTFT->fillScreen(TFT_BLACK); + ttgo->eTFT->setTextColor(TFT_WHITE, TFT_BLACK); + ttgo->eTFT->drawString("Please touch screen", 50, 100, 2); + + //attach touch screen interrupt pin + pinMode(TP_INT,INPUT); +} + +void loop() +{ + if(digitalRead(TP_INT) == LOW){ + ttgo->motor->onec(); + } + delay(20); +} diff --git a/examples/Rtc/Rtc.ino b/examples/Basic unit/RTC/RTC.ino similarity index 100% rename from examples/Rtc/Rtc.ino rename to examples/Basic unit/RTC/RTC.ino diff --git a/examples/sdcard/sdcard.ino b/examples/Basic unit/SDCard/SDCard.ino similarity index 94% rename from examples/sdcard/sdcard.ino rename to examples/Basic unit/SDCard/SDCard.ino index 0fc0252..87f5c5b 100644 --- a/examples/sdcard/sdcard.ino +++ b/examples/Basic unit/SDCard/SDCard.ino @@ -1,4 +1,6 @@ +// There is no SDCard in Twatch-2020 + #include TTGOClass *ttgo; diff --git a/examples/TouchPad/TouchPad.ino b/examples/Basic unit/TouchPad/TouchPad.ino similarity index 100% rename from examples/TouchPad/TouchPad.ino rename to examples/Basic unit/TouchPad/TouchPad.ino diff --git a/examples/UserButton/UserButton.ino b/examples/Basic unit/UserButton/UserButton.ino similarity index 91% rename from examples/UserButton/UserButton.ino rename to examples/Basic unit/UserButton/UserButton.ino index 71f948f..28c7400 100644 --- a/examples/UserButton/UserButton.ino +++ b/examples/Basic unit/UserButton/UserButton.ino @@ -1,4 +1,6 @@ +// There is no User Button in Twatch-2020 + #include TTGOClass *ttgo; diff --git a/examples/analogRead/analogRead.ino b/examples/Module/AnalogRead/analogRead.ino similarity index 100% rename from examples/analogRead/analogRead.ino rename to examples/Module/AnalogRead/analogRead.ino diff --git a/examples/modules/veml6075/veml6075.ino b/examples/Module/VEMl6075/VEMl6075.ino similarity index 100% rename from examples/modules/veml6075/veml6075.ino rename to examples/Module/VEMl6075/VEMl6075.ino diff --git a/examples/modules/veml6075_lvgl/BG_PNG.c b/examples/Module/VEMl6075_LVGL/BG_PNG.c similarity index 100% rename from examples/modules/veml6075_lvgl/BG_PNG.c rename to examples/Module/VEMl6075_LVGL/BG_PNG.c diff --git a/examples/modules/veml6075_lvgl/ERR_PNG.c b/examples/Module/VEMl6075_LVGL/ERR_PNG.c similarity index 100% rename from examples/modules/veml6075_lvgl/ERR_PNG.c rename to examples/Module/VEMl6075_LVGL/ERR_PNG.c diff --git a/examples/modules/veml6075_lvgl/veml6075_lvgl.ino b/examples/Module/VEMl6075_LVGL/VEMl6075_LVGL.ino similarity index 100% rename from examples/modules/veml6075_lvgl/veml6075_lvgl.ino rename to examples/Module/VEMl6075_LVGL/VEMl6075_LVGL.ino diff --git a/examples/Motor/Motor.ino b/examples/Motor/Motor.ino deleted file mode 100644 index d54fdca..0000000 --- a/examples/Motor/Motor.ino +++ /dev/null @@ -1,43 +0,0 @@ - -#include - -TTGOClass *ttgo; - -void pressed() -{ - uint16_t color = random(0xFFFF); - ttgo->eTFT->fillScreen(color); - ttgo->eTFT->setTextColor(color, TFT_WHITE); - ttgo->eTFT->drawString("User Button pressed", 5, 100, 4); - ttgo->motor->onec(); //! Start motor onec -} - -void released() -{ - uint16_t color = random(0xFFFF); - ttgo->eTFT->fillScreen(color); - ttgo->eTFT->setTextColor(color, TFT_WHITE); - ttgo->eTFT->drawString("User Button released", 5, 100, 4); -} - -void setup() -{ - Serial.begin(115200); - ttgo = TTGOClass::getWatch(); - ttgo->begin(); - ttgo->openBL(); - ttgo->motor_begin(); //! begin motor attach to 33 pin - - ttgo->eTFT->fillScreen(TFT_BLACK); - ttgo->eTFT->setTextColor(TFT_WHITE, TFT_BLACK); - ttgo->eTFT->setTextFont(4); - ttgo->eTFT->drawString("User Button released", 5, 100, 4); - - ttgo->button->setPressedHandler(pressed); - ttgo->button->setReleasedHandler(released); -} - -void loop() -{ - ttgo->button->loop(); -} diff --git a/examples/alarm_clock/alarm_clock.ino b/examples/Other/AlarmClock/AlarmClock.ino similarity index 100% rename from examples/alarm_clock/alarm_clock.ino rename to examples/Other/AlarmClock/AlarmClock.ino diff --git a/examples/alarm_clock/pika.h b/examples/Other/AlarmClock/pika.h similarity index 100% rename from examples/alarm_clock/pika.h rename to examples/Other/AlarmClock/pika.h diff --git a/examples/Games/FlappyBird/FlappyBird.ino b/examples/Other/FlappyBird/FlappyBird.ino similarity index 100% rename from examples/Games/FlappyBird/FlappyBird.ino rename to examples/Other/FlappyBird/FlappyBird.ino diff --git a/examples/IOTA_Price/IOTA_Price.ino b/examples/Other/IOTA_Price/IOTA_Price.ino similarity index 100% rename from examples/IOTA_Price/IOTA_Price.ino rename to examples/Other/IOTA_Price/IOTA_Price.ino diff --git a/examples/IOTA_Price/alert.h b/examples/Other/IOTA_Price/alert.h similarity index 100% rename from examples/IOTA_Price/alert.h rename to examples/Other/IOTA_Price/alert.h diff --git a/examples/IOTA_Price/info.h b/examples/Other/IOTA_Price/info.h similarity index 100% rename from examples/IOTA_Price/info.h rename to examples/Other/IOTA_Price/info.h diff --git a/examples/IOTA_Price/iota.h b/examples/Other/IOTA_Price/iota.h similarity index 100% rename from examples/IOTA_Price/iota.h rename to examples/Other/IOTA_Price/iota.h diff --git a/examples/IOTA_Price/iota2.h b/examples/Other/IOTA_Price/iota2.h similarity index 100% rename from examples/IOTA_Price/iota2.h rename to examples/Other/IOTA_Price/iota2.h diff --git a/examples/bbq_keyboard/bbq_keyboard.ino b/examples/Shield/BBQKeyboard/BBQKeyboard.ino similarity index 100% rename from examples/bbq_keyboard/bbq_keyboard.ino rename to examples/Shield/BBQKeyboard/BBQKeyboard.ino diff --git a/examples/DRV8833/DRV8833.ino b/examples/Shield/DRV8833/DRV8833.ino similarity index 100% rename from examples/DRV8833/DRV8833.ino rename to examples/Shield/DRV8833/DRV8833.ino diff --git a/examples/GameControl/GameControl.ino b/examples/Shield/GameControl/GameControl.ino similarity index 100% rename from examples/GameControl/GameControl.ino rename to examples/Shield/GameControl/GameControl.ino diff --git a/examples/HeartRate/HeartRate.ino b/examples/Shield/HeartRate/HeartRate.ino similarity index 100% rename from examples/HeartRate/HeartRate.ino rename to examples/Shield/HeartRate/HeartRate.ino diff --git a/examples/Mic/INMP441_Mic/INMP441_Mic.ino b/examples/Shield/INMP441_Mic/INMP441_Mic.ino similarity index 100% rename from examples/Mic/INMP441_Mic/INMP441_Mic.ino rename to examples/Shield/INMP441_Mic/INMP441_Mic.ino diff --git a/examples/loar/lora.ino b/examples/Shield/LoRa_SX127x/LoRa_SX127x.ino similarity index 100% rename from examples/loar/lora.ino rename to examples/Shield/LoRa_SX127x/LoRa_SX127x.ino diff --git a/examples/gps/gps.ino b/examples/Shield/M6_GPS/M6_GPS.ino similarity index 90% rename from examples/gps/gps.ino rename to examples/Shield/M6_GPS/M6_GPS.ino index c3345b9..7d86e5c 100644 --- a/examples/gps/gps.ino +++ b/examples/Shield/M6_GPS/M6_GPS.ino @@ -1,4 +1,4 @@ -//! This example is an M8M GPS backplane, not an S7XG backplane. +//! This example is an M8/M6 GPS backplane, not an S7XG backplane. #include @@ -18,7 +18,7 @@ void setup(void) tft->fillScreen(TFT_BLACK); tft->setTextFont(2); - tft->println("Begin ublox M8M/GPS Module..."); + tft->println("Begin ublox M8/M6 GPS Module..."); //! Open gps power ttgo->enableLDO3(); @@ -42,9 +42,6 @@ void loop(void) } } - - - void displayInfo() { tft->setCursor(0, 0); diff --git a/examples/nfc_lock/nfc_lock.ino b/examples/Shield/NFC_Lock/NFC_Lock.ino similarity index 100% rename from examples/nfc_lock/nfc_lock.ino rename to examples/Shield/NFC_Lock/NFC_Lock.ino diff --git a/examples/s7xg/gps/gps.ino b/examples/Shield/S7xG_GPS/S7xG_GPS.ino similarity index 100% rename from examples/s7xg/gps/gps.ino rename to examples/Shield/S7xG_GPS/S7xG_GPS.ino diff --git a/examples/s7xg/lora/lora.ino b/examples/Shield/S7xG_LoRa/S7xG_LoRa.ino similarity index 100% rename from examples/s7xg/lora/lora.ino rename to examples/Shield/S7xG_LoRa/S7xG_LoRa.ino diff --git a/examples/Mic/SPM1423HM4H_Mic/SPM1423HM4H_Mic.ino b/examples/Shield/SPM1423HM4H_Mic/SPM1423HM4H_Mic.ino similarity index 100% rename from examples/Mic/SPM1423HM4H_Mic/SPM1423HM4H_Mic.ino rename to examples/Shield/SPM1423HM4H_Mic/SPM1423HM4H_Mic.ino diff --git a/examples/BatmanDial/BatmanDial.ino b/examples/lvgl/BatmanDial/BatmanDial.ino similarity index 91% rename from examples/BatmanDial/BatmanDial.ino rename to examples/lvgl/BatmanDial/BatmanDial.ino index 3ce4870..38ab9ee 100644 --- a/examples/BatmanDial/BatmanDial.ino +++ b/examples/lvgl/BatmanDial/BatmanDial.ino @@ -2,6 +2,8 @@ * Simple clock display interface, power consumption is about 20mA * Written by lewishe * */ + +// #define LILYGO_TWATCH_2020_V1 // If you are using T-Watch-2020 version, please open this macro definition #include typedef struct { diff --git a/examples/BatmanDial/batman_png.c b/examples/lvgl/BatmanDial/batman_png.c similarity index 100% rename from examples/BatmanDial/batman_png.c rename to examples/lvgl/BatmanDial/batman_png.c diff --git a/examples/BatmanDial/morgnite_bold_64.c b/examples/lvgl/BatmanDial/morgnite_bold_64.c similarity index 100% rename from examples/BatmanDial/morgnite_bold_64.c rename to examples/lvgl/BatmanDial/morgnite_bold_64.c diff --git a/examples/lvgl_base/lvgl_base.ino b/examples/lvgl/Lvgl_Base/Lvgl_Base.ino similarity index 95% rename from examples/lvgl_base/lvgl_base.ino rename to examples/lvgl/Lvgl_Base/Lvgl_Base.ino index 47eb828..590a0ee 100644 --- a/examples/lvgl_base/lvgl_base.ino +++ b/examples/lvgl/Lvgl_Base/Lvgl_Base.ino @@ -1,5 +1,5 @@ -// #define LILYGO_TWATCH_2020_V1 // If you are using T-Watch-2020 version, please open this macro definition +// #define LILYGO_TWATCH_2020_V1 // If you are using T-Watch-2020 version, please open this macro definition #include TTGOClass *ttgo; diff --git a/examples/lvgl_button/lvgl_button.ino b/examples/lvgl/Lvgl_Button/Lvgl_Button.ino similarity index 95% rename from examples/lvgl_button/lvgl_button.ino rename to examples/lvgl/Lvgl_Button/Lvgl_Button.ino index aa20848..36970f8 100644 --- a/examples/lvgl_button/lvgl_button.ino +++ b/examples/lvgl/Lvgl_Button/Lvgl_Button.ino @@ -1,6 +1,5 @@ // #define LILYGO_TWATCH_2020_V1 // If you are using T-Watch-2020 version, please open this macro definition - #include TTGOClass *ttgo; diff --git a/examples/SimpleWatch/SimpleWatch.ino b/examples/lvgl/SimpleWatch/SimpleWatch.ino similarity index 100% rename from examples/SimpleWatch/SimpleWatch.ino rename to examples/lvgl/SimpleWatch/SimpleWatch.ino diff --git a/examples/SimpleWatch/gui.cpp b/examples/lvgl/SimpleWatch/gui.cpp similarity index 100% rename from examples/SimpleWatch/gui.cpp rename to examples/lvgl/SimpleWatch/gui.cpp diff --git a/examples/SimpleWatch/gui.h b/examples/lvgl/SimpleWatch/gui.h similarity index 100% rename from examples/SimpleWatch/gui.h rename to examples/lvgl/SimpleWatch/gui.h diff --git a/examples/Thermometer/Thermometer.ino b/examples/lvgl/Thermometer/Thermometer.ino similarity index 100% rename from examples/Thermometer/Thermometer.ino rename to examples/lvgl/Thermometer/Thermometer.ino diff --git a/examples/Thermometer/chinese_font.c b/examples/lvgl/Thermometer/chinese_font.c similarity index 100% rename from examples/Thermometer/chinese_font.c rename to examples/lvgl/Thermometer/chinese_font.c diff --git a/examples/Thermometer/color_palette_png.c b/examples/lvgl/Thermometer/color_palette_png.c similarity index 100% rename from examples/Thermometer/color_palette_png.c rename to examples/lvgl/Thermometer/color_palette_png.c diff --git a/examples/Thermometer/digital_font.c b/examples/lvgl/Thermometer/digital_font.c similarity index 100% rename from examples/Thermometer/digital_font.c rename to examples/lvgl/Thermometer/digital_font.c diff --git a/examples/Thermometer/gui.cpp b/examples/lvgl/Thermometer/gui.cpp similarity index 100% rename from examples/Thermometer/gui.cpp rename to examples/lvgl/Thermometer/gui.cpp diff --git a/examples/Thermometer/gui.h b/examples/lvgl/Thermometer/gui.h similarity index 100% rename from examples/Thermometer/gui.h rename to examples/lvgl/Thermometer/gui.h diff --git a/examples/Thermometer/mlx90614.h b/examples/lvgl/Thermometer/mlx90614.h similarity index 100% rename from examples/Thermometer/mlx90614.h rename to examples/lvgl/Thermometer/mlx90614.h diff --git a/examples/Thermometer/nCov.c b/examples/lvgl/Thermometer/nCov.c similarity index 100% rename from examples/Thermometer/nCov.c rename to examples/lvgl/Thermometer/nCov.c diff --git a/examples/Thermometer/qiut.c b/examples/lvgl/Thermometer/qiut.c similarity index 100% rename from examples/Thermometer/qiut.c rename to examples/lvgl/Thermometer/qiut.c diff --git a/examples/Thermometer/thermometer.c b/examples/lvgl/Thermometer/thermometer.c similarity index 100% rename from examples/Thermometer/thermometer.c rename to examples/lvgl/Thermometer/thermometer.c diff --git a/examples/nCov2019/chinese_font.c b/examples/lvgl/nCov2019/chinese_font.c similarity index 100% rename from examples/nCov2019/chinese_font.c rename to examples/lvgl/nCov2019/chinese_font.c diff --git a/examples/nCov2019/gui.cpp b/examples/lvgl/nCov2019/gui.cpp similarity index 100% rename from examples/nCov2019/gui.cpp rename to examples/lvgl/nCov2019/gui.cpp diff --git a/examples/nCov2019/gui.h b/examples/lvgl/nCov2019/gui.h similarity index 100% rename from examples/nCov2019/gui.h rename to examples/lvgl/nCov2019/gui.h diff --git a/examples/nCov2019/nCov.c b/examples/lvgl/nCov2019/nCov.c similarity index 100% rename from examples/nCov2019/nCov.c rename to examples/lvgl/nCov2019/nCov.c diff --git a/examples/nCov2019/nCov2019.ino b/examples/lvgl/nCov2019/nCov2019.ino similarity index 95% rename from examples/nCov2019/nCov2019.ino rename to examples/lvgl/nCov2019/nCov2019.ino index 92e2ff5..3ab2e0f 100644 --- a/examples/nCov2019/nCov2019.ino +++ b/examples/lvgl/nCov2019/nCov2019.ino @@ -13,6 +13,8 @@ cd ~/Arduino/libraries git clone https://github.com/bblanchon/ArduinoJson.git */ +// #define LILYGO_TWATCH_2020_V1 // If you are using T-Watch-2020 version, please open this macro definition + #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/firmware/s7xg_v1.65/v1.6.5-g9.bin b/firmware/s7xg_v1.65/v1.6.5-g9.bin deleted file mode 100644 index b45da50..0000000 Binary files a/firmware/s7xg_v1.65/v1.6.5-g9.bin and /dev/null differ diff --git a/src/TTGO.h b/src/TTGO.h index d3ddee3..3ee327b 100644 --- a/src/TTGO.h +++ b/src/TTGO.h @@ -59,6 +59,9 @@ public: if (tft) { eTFT = new TFT_eSPI(); eTFT->init(); +#ifdef LILYGO_TWATCH_2020_V1 + eTFT->setRotation(2); +#endif } } @@ -360,7 +363,7 @@ private: bl = new BackLight(TWATCH_TFT_BL); power = new AXP20X_Class(); bma = new BMA(*i2c); - //In the 2020 version, Button IO36 is not used. + //In the 2020 version, Button IO36 is not used. //In order to be compatible with the original sample code, keep it here button = new Button2(USER_BUTTON); };