@@ -99,30 +99,18 @@ const BBPANELDEF panelDefs[] = {
9999 {960 , 540 , 20000000 , BB_PANEL_FLAG_NONE, {6 ,14 ,7 ,12 ,9 ,11 ,8 ,10 }, 8 , 46 , 17 , 18 , 13 , 45 , 15 ,
100100 16 , BB_NOT_USED, BB_NOT_USED, BB_NOT_USED, BB_NOT_USED, BB_NOT_USED, 47 , u8M5Matrix, sizeof (u8M5Matrix), 0 }, // BB_PANEL_M5PAPERS3
101101
102-
103- {960 , 540 , 12000000 , BB_PANEL_FLAG_SLOW_SPH, {8 ,1 ,2 ,3 ,4 ,5 ,6 ,7 }, 8 , 1 , 4 , 38 , 40 , 7 , BB_NOT_USED,
104- 41 , BB_NOT_USED, 13 , 12 , 0 , 0x32 , 47 ,u8GrayMatrix, sizeof (u8GrayMatrix), 32 }, // BB_PANEL_T5EPAPERS3
105-
106-
107102 {0 , 0 , 20000000 , BB_PANEL_FLAG_NONE, {5 ,6 ,7 ,15 ,16 ,17 ,18 ,8 }, 8 , 11 , 45 , 48 , 41 , 8 , 42 ,
108103 4 , 14 , 39 , 40 , BB_NOT_USED, 0 , 0 , u8SixInchMatrix, sizeof (u8SixInchMatrix), 0 }, // BB_PANEL_EPDIY_V7
104+
109105 {1024 , 758 , 13333333 , BB_PANEL_FLAG_SLOW_SPH, {4 ,5 ,18 ,19 ,23 ,25 ,26 ,27 }, 8 , 4 , 2 , 32 , 33 , 0 , 2 ,
110106 0 , 7 , 21 , 22 , 3 , 5 , 15 , u8GrayMatrix, sizeof (u8GrayMatrix), 0 }, // BB_PANEL_INKPLATE6PLUS
111107
112108 {1280 , 720 , 13333333 , BB_PANEL_FLAG_SLOW_SPH | BB_PANEL_FLAG_MIRROR_X, {4 ,5 ,18 ,19 ,23 ,25 ,26 ,27 }, 8 , 4 , 2 , 32 , 33 , 0 , 2 ,
113109 0 , 7 , 21 , 22 , 3 , 5 , 15 , u8GrayMatrix, sizeof (u8GrayMatrix), 16 }, // BB_PANEL_INKPLATE5V2
114110
115-
116- {960 , 540 , 10000000 , BB_PANEL_FLAG_SLOW_SPH, {33 ,32 ,4 ,19 ,2 ,27 ,21 ,22 }, 8 , 1 , 4 , 25 , 26 , 7 , 15 ,
117- 5 , BB_NOT_USED, 23 , 18 , 0 , 0x32 , 14 , u8GrayMatrix, sizeof (u8GrayMatrix), 32 }, // BB_PANEL_T5EPAPERV1
118- {960 , 540 , 12000000 , BB_PANEL_FLAG_NONE, {5 ,6 ,7 ,15 ,16 ,17 ,8 ,7 }, 8 , 11 , 45 , 48 , 41 , 8 , 42 ,
119- 4 , 14 , 39 , 40 , BB_NOT_USED, 0 , 13 ,u8GrayMatrix, sizeof (u8GrayMatrix), 0 }, // BB_PANEL_T5EPAPERS3PRO
120111 {0 , 0 , 16000000 , BB_PANEL_FLAG_NONE, {9 ,10 ,11 ,12 ,13 ,14 ,21 ,47 ,5 ,6 ,7 ,15 ,16 ,17 ,18 ,8 }, 16 , 11 , 45 , 48 , 41 , 8 , 42 ,
121112 4 , 14 , 39 , 40 , BB_NOT_USED, 0 , 46 , u8GrayMatrix, sizeof (u8GrayMatrix), 0 }, // BB_PANEL_EPDIY_V7_16
122- {1200 , 820 , 13333333 , BB_PANEL_FLAG_SLOW_SPH, {4 ,5 ,18 ,19 ,23 ,25 ,26 ,27 }, 8 , 4 , 2 , 32 , 33 , 0 , 2 ,
123- 0 , 7 , 21 , 22 , 3 , 5 , 15 , u8GrayMatrix, sizeof (u8GrayMatrix), 16 }, // BB_PANEL_INKPLATE10
124- {800 , 600 , 13333333 , BB_PANEL_FLAG_SLOW_SPH, {4 ,5 ,18 ,19 ,23 ,25 ,26 ,27 }, 8 , 4 , 2 , 32 , 33 , 0 , 2 ,
125- 0 , 7 , 21 , 22 , 3 , 5 , 15 , u8GrayMatrix, sizeof (u8GrayMatrix), 16 }, // BB_PANEL_INKPLATE6
113+
126114 {0 , 0 , 20000000 , BB_PANEL_FLAG_NONE, {5 ,6 ,7 ,15 ,16 ,17 ,18 ,8 }, 8 , 11 , 45 , 48 , 41 , 9 , 42 ,
127115 4 , 14 , 39 , 40 , BB_NOT_USED, 0 , 0 , u8M5Matrix, sizeof (u8M5Matrix), 0 }, // BB_PANEL_V7_RAW
128116};
@@ -133,10 +121,6 @@ const BBPANELDEF panelDefs[] = {
133121int PaperS3EinkPower (void *pBBEP, int bOn);
134122int PaperS3IOInit (void *pBBEP);
135123void PaperS3RowControl (void *pBBEP, int iMode);
136- // LilyGo T5 Epaper S3 V2.4
137- int LilyGoV24EinkPower (void *pBBEP, int bOn);
138- int LilyGoV24IOInit (void *pBBEP);
139- void LilyGoV24RowControl (void *pBBEP, int iMode);
140124// EPDiy V7
141125int EPDiyV7EinkPower (void *pBBEP, int bOn);
142126int EPDiyV7IOInit (void *pBBEP);
@@ -157,15 +141,10 @@ void Inkplate5V2RowControl(void *pBBEP, int iMode);
157141const BBPANELPROCS panelProcs[] = {
158142 {0 }, // BB_PANEL_NONE
159143 {PaperS3EinkPower, PaperS3IOInit, PaperS3RowControl}, // BB_PANEL_M5PAPERS3
160- {LilyGoV24EinkPower, LilyGoV24IOInit, LilyGoV24RowControl}, // BB_PANEL_T5EPAPERS3
161144 {EPDiyV7EinkPower, EPDiyV7IOInit, EPDiyV7RowControl}, // BB_PANEL_EPDIY_V7
162145 {Inkplate6PlusEinkPower, Inkplate6PlusIOInit, Inkplate6PlusRowControl}, // BB_PANEL_INKPLATE6PLUS
163146 {Inkplate5V2EinkPower, Inkplate5V2IOInit, Inkplate5V2RowControl}, // Inkplate5V2
164- {LilyGoV24EinkPower, LilyGoV24IOInit, LilyGoV24RowControl}, // BB_PANEL_T5EPAPERV1
165- {EPDiyV7EinkPower, EPDiyV7IOInit, EPDiyV7RowControl}, // BB_PANEL_T5EPAPERS3PRO
166147 {EPDiyV7EinkPower, EPDiyV7IOInit, EPDiyV7RowControl}, // BB_PANEL_EPDIY_V7_16
167- {Inkplate6PlusEinkPower, Inkplate6PlusIOInit, Inkplate6PlusRowControl}, // BB_PANEL_INKPLATE10
168- {Inkplate6PlusEinkPower, Inkplate6PlusIOInit, Inkplate6PlusRowControl}, // BB_PANEL_INKPLATE6 (old)
169148 {EPDiyV7RAWEinkPower, EPDiyV7RAWIOInit, EPDiyV7RowControl}, // BB_PANEL_V7_RAW
170149};
171150
@@ -469,35 +448,6 @@ int PaperS3EinkPower(void *pBBEP, int bOn)
469448 }
470449 return BBEP_SUCCESS;
471450} /* PaperS3EinkPower() */
472- int LilyGoV24EinkPower (void *pBBEP, int bOn)
473- {
474- FASTEPDSTATE *pState = (FASTEPDSTATE *)pBBEP;
475- if (bOn == pState->pwr_on ) return BBEP_SUCCESS; // already on
476- if (bOn) {
477- bbepSetShiftBit (pState, 1 , 0 ); // power_disable = false
478- delayMicroseconds (100 );
479- bbepSetShiftBit (pState, 3 , 1 ); // negative_power_enable = true
480- delayMicroseconds (500 );
481- bbepSetShiftBit (pState, 2 , 1 ); // positive_power_enable = true
482- delayMicroseconds (100 );
483- bbepSetShiftBit (pState, 4 , 1 ); // stv = true
484- gpio_set_level ((gpio_num_t )pState->panelDef .ioSPH , 1 );
485- bbepSetShiftBit (pState, 5 , 1 ); // pwr en = true
486- pState->pwr_on = 1 ;
487- } else { // power off
488- bbepSetShiftBit (pState, 2 , 0 ); // positive_power_enable = false
489- delayMicroseconds (10 );
490- bbepSetShiftBit (pState, 3 , 0 ); // negative_power_enable = false
491- delayMicroseconds (100 );
492- bbepSetShiftBit (pState, 1 , 1 ); // power_disable = true
493- bbepSetShiftBit (pState, 4 , 0 ); // STV = false
494- // gpio_set_level((gpio_num_t)pState->panelDef.ioSPV, 0); // stv = false
495- bbepSetShiftBit (pState, 5 , 0 ); // pwr en = false
496- bbepSetShiftBit (pState, 7 , 0 ); // output_enable = false
497- pState->pwr_on = 0 ;
498- }
499- return BBEP_SUCCESS;
500- }
501451#define TPS_REG_ENABLE 0x01
502452#define TPS_REG_PG 0x0F
503453int EPDiyV7EinkPower (void *pBBEP, int bOn)
@@ -715,27 +665,6 @@ int PaperS3IOInit(void *pBBEP)
715665 return BBEP_SUCCESS;
716666} /* PaperS3IOInit() */
717667//
718- // Initialize the IO for the LilyGo T5 4.7" V2.4 PCB
719- //
720- int LilyGoV24IOInit (void *pBBEP)
721- {
722- FASTEPDSTATE *pState = (FASTEPDSTATE *)pBBEP;
723- // Serial.println("Using shift register");
724- bbepPinMode (pState->panelDef .ioSPH , OUTPUT);
725- bbepPinMode (pState->panelDef .ioCKV , OUTPUT);
726- bbepPinMode (pState->panelDef .ioCL , OUTPUT);
727- if (pState->panelDef .ioLE != BB_NOT_USED) {
728- bbepPinMode (pState->panelDef .ioLE , OUTPUT);
729- }
730- pState->shift_data = pState->panelDef .ioShiftMask ;
731- bbepPinMode (pState->panelDef .ioShiftSTR , OUTPUT);
732- bbepPinMode (pState->panelDef .ioSDA , OUTPUT);
733- bbepPinMode (pState->panelDef .ioSCL , OUTPUT);
734- gpio_set_level ((gpio_num_t )pState->panelDef .ioShiftSTR , 0 );
735- bbepSendShiftData (pState); // send default control bits
736- return BBEP_SUCCESS;
737- } /* LilyGoV24IOInit() */
738- //
739668// Initialize the IO for the EPDiy V7 PCB
740669//
741670int EPDiyV7IOInit (void *pBBEP)
@@ -868,50 +797,6 @@ void PaperS3RowControl(void *pBBEP, int iType)
868797 }
869798} /* PaperS3RowControl() */
870799
871- void LilyGoV24RowControl (void *pBBEP, int iType)
872- {
873- FASTEPDSTATE *pState = (FASTEPDSTATE *)pBBEP;
874- gpio_num_t ckv = (gpio_num_t )pState->panelDef .ioCKV ;
875- gpio_num_t spv = (gpio_num_t )pState->panelDef .ioSPV ;
876- gpio_num_t le = (gpio_num_t )pState->panelDef .ioLE ;
877-
878- if (iType == ROW_START) {
879- bbepSetShiftBit (pState, 6 , 1 ); // GMODE = 1
880- gpio_set_level (ckv, 1 ); // CKV on
881- delayMicroseconds (10 );
882- gpio_set_level (ckv, 0 ); // CKV off
883- delayMicroseconds (10 );
884- bbepSetShiftBit (pState, 4 , 0 ); // STV off
885- // gpio_set_level(spv, 0); //SPV off;
886- delayMicroseconds (1 );
887- gpio_set_level (ckv, 1 ); // CKV on
888- delayMicroseconds (100 );
889- gpio_set_level (ckv, 0 ); // CKV off
890- delayMicroseconds (100 );
891- bbepSetShiftBit (pState, 4 , 1 ); // STV on
892- // gpio_set_level(spv, 1); // SPV on
893- gpio_set_level (ckv, 1 ); // CKV on
894- delayMicroseconds (100 );
895- gpio_set_level (ckv, 0 ); // CKV on
896- bbepSetShiftBit (pState, 7 , 1 ); // output_enable = true
897- gpio_set_level (ckv, 1 ); // CKV on
898- delayMicroseconds (10 );
899- gpio_set_level (ckv, 0 ); // CKV off
900- delayMicroseconds (10 );
901- } else if (iType == ROW_STEP) {
902- gpio_set_level (ckv, 0 ); // CKV off
903- delayMicroseconds (500 );
904- if (le == BB_NOT_USED) {
905- bbepSetShiftBit (pState, 0 , 1 ); // LE toggle
906- bbepSetShiftBit (pState, 0 , 0 );
907- } else {
908- gpio_set_level (le, 1 ); // LE toggle
909- gpio_set_level (le, 0 );
910- }
911- delayMicroseconds (0 );
912- gpio_set_level (ckv, 1 ); // CKV on
913- }
914- }
915800void EPDiyV7RowControl (void *pBBEP, int iType)
916801{
917802 FASTEPDSTATE *pState = (FASTEPDSTATE *)pBBEP;
0 commit comments