ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added nokia 1600 code from the_nihilant

This commit is contained in:
schneider 2011-12-18 21:57:17 +01:00
parent c0cb4b636a
commit 3fe091a31f
3 changed files with 144 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
firmware/lcd/display.c
View File

@ -10,7 +10,9 @@
#include "usb/usbmsc.h" #include "usb/usbmsc.h"
#undef N1600 #define DISPLAY_UNKNOWN 0
#define DISPLAY_N1200 1
#define DISPLAY_N1600 2
/**************************************************************************/ /**************************************************************************/
/* Utility routines to manage nokia display */ /* Utility routines to manage nokia display */
@ -19,6 +21,7 @@
uint8_t lcdBuffer[RESX*RESY_B]; uint8_t lcdBuffer[RESX*RESY_B];
uint32_t intstatus; // Caches USB interrupt state uint32_t intstatus; // Caches USB interrupt state
// (need to disable MSC while displaying) // (need to disable MSC while displaying)
uint8_t displayType;
#define TYPE_CMD 0 #define TYPE_CMD 0
#define TYPE_DATA 1 #define TYPE_DATA 1
@ -125,6 +128,8 @@ uint8_t lcdRead(uint8_t data)
void lcdInit(void) { void lcdInit(void) {
int id1,id2,id3,id4;
sspInit(0, sspClockPolarity_Low, sspClockPhase_RisingEdge); sspInit(0, sspClockPolarity_Low, sspClockPhase_RisingEdge);
gpioSetValue(RB_LCD_CS, 1); gpioSetValue(RB_LCD_CS, 1);
@ -139,8 +144,17 @@ void lcdInit(void) {
gpioSetValue(RB_LCD_RST, 1); gpioSetValue(RB_LCD_RST, 1);
delayms(100); delayms(100);
id1=lcdRead(128+64+16+8 +2 ); // it will screw up everything.. better do it before anything else --the_nihilant
id2=lcdRead(128+64+16+8 +2+1); // .. but after the code above! --the_nihilant
// id3=lcdRead(128+64+16+8+4 ); // id1 and id2 are enough for most screens
// id4=lcdRead(128+64+16+8+4 +1); // id3 and id4 would only use up PRECIOUS SPACE --the_nihilant
lcd_select(); lcd_select();
if((id1==69)&&(id2==214))displayType=DISPLAY_N1600;
//if((id1==254)&&(id2==2))displayType=DISPLAY_N1200;
else displayType=DISPLAY_N1200; // unknown displays are treated like N1200s anyway, this saves an if (PRECIOUS SPACE) --the_nihilant
/* Small Nokia 1200 LCD docs: /* Small Nokia 1200 LCD docs:
* clear/ set * clear/ set
* on 0xae / 0xaf * on 0xae / 0xaf
@ -154,93 +168,64 @@ void lcdInit(void) {
* 0xd0+x black lines from top? (-0xdf?) * 0xd0+x black lines from top? (-0xdf?)
* *
*/ */
#ifndef N1600 if(displayType<=DISPLAY_N1200){
lcdWrite(TYPE_CMD,0xE2); // lcdWrite(TYPE_CMD,0xE2);
delayms(5); // delayms(5);
uint8_t initseq[] = {0xAF, // Display ON uint8_t initseq[] = {0xE2,0xAF, // Display ON
0xA1, // Mirror-X 0xA1, // Mirror-X
0xA4, 0x2F, 0xB0, 0x10}; 0xA4, 0x2F, 0xB0, 0x10};
int i = 0; int i = 0;
while(i<sizeof(initseq))
lcdWrite(TYPE_CMD,initseq[i++]);
// lcdWrite(TYPE_CMD,0x00);
#else
#if 0
uint8_t initseq[] = {
//TYPE_CMD,0x01, TYPE_CMD,0x11, TYPE_CMD,0x36,
//TYPE_DATA,0x00,TYPE_CMD,0x25, TYPE_DATA,0x3F,
TYPE_CMD,0x29, TYPE_CMD,0xBA, TYPE_DATA,0x07,
TYPE_DATA,0x15,TYPE_CMD,0x25, TYPE_DATA,0x3f,
TYPE_CMD,0x11, TYPE_CMD,0x13, TYPE_CMD,0X37,
TYPE_DATA,0x00, TYPE_CMD,0x3A, TYPE_DATA,0x05,
TYPE_CMD,0x2A, TYPE_DATA,0, TYPE_DATA,98-1,
TYPE_CMD,0x2B, TYPE_DATA,0, TYPE_DATA,70-1};
int i = 0
#endif
delayms(10);
lcdWrite(TYPE_CMD,0x01); //sw reset
delayms(10);
lcdWrite(TYPE_CMD,0x11); //sleepout
delayms(10);
lcdWrite(TYPE_CMD,0x36); //MADCTL MY MX V LAO RGB X X X
lcdWrite(TYPE_DATA,0x00);
lcdWrite(TYPE_CMD,0x25); // contrast...
lcdWrite(TYPE_DATA,0x3F);
delayms(10);
#if 0
while(i<sizeof(initseq)){ while(i<sizeof(initseq)){
lcdWrite(initseq[i++], initseq[i++]); lcdWrite(TYPE_CMD,initseq[i++]);
delayms(5); // this is only needed after the first command (0xE2), but doing like this saves space and it still works --the_nihilant
} }
#else // lcdWrite(TYPE_CMD,0x00);
lcdWrite(TYPE_CMD,0x29); //display on }else if(displayType==DISPLAY_N1600){
uint8_t initseq_d[] = {
0x36,
0x29, 0xBA, 0x07,
0x15,0x25, 0x3f,
0x11, 0x13, 0X37,
0x00, 0x3A, 0x05,
0x2A, 0, 98-1,
0x2B, 0, 70-1};
uint32_t initseq_c = ~/*0x95a7;*/0x12BA7; // this saves 12 bytes overall --the_nihilant
int i = 0;
//// delayms(10); // useless --the_nihilant
lcdWrite(TYPE_CMD,0x01); //sw reset
//// delayms(10); // useless
//// lcdWrite(TYPE_CMD,0x11); //sleepout (useless --the_nihilant)
delayms(10); // NOT useless! --the_nihilant
lcdWrite(TYPE_CMD,0xBA); //data order // lcdWrite(TYPE_CMD,0x36); //MADCTL MY MX V LAO RGB X X X
lcdWrite(TYPE_DATA,0x07); //// lcdWrite(TYPE_DATA,0x00); // useless
lcdWrite(TYPE_DATA,0x15);
lcdWrite(TYPE_CMD,0x25); //contrast... again? //// lcdWrite(TYPE_CMD,0x25); // contrast... useless (set below anyway)
lcdWrite(TYPE_DATA,0x3f); //// lcdWrite(TYPE_DATA,0x3F);
//// delayms(10); // useless --the_nihilant
lcdWrite(TYPE_CMD,0x11); //Sleepout while(i<sizeof(initseq_d)){
lcdWrite(TYPE_CMD,0x13); //display mode normal lcdWrite(initseq_c&1, initseq_d[i++]);
initseq_c = initseq_c >> 1;
lcdWrite(TYPE_CMD,0X37); //vscroll addr }
lcdWrite(TYPE_DATA,0x00); }
lcdWrite(TYPE_CMD,0x3A); // COLMOD pixel format 4=12, 5=16, 6=18
lcdWrite(TYPE_DATA,0x05);
lcdWrite(TYPE_CMD,0x2A); //no clue... I think it's setting up the size of the display?
lcdWrite(TYPE_DATA,0);
lcdWrite(TYPE_DATA,98-1); //98 = width
lcdWrite(TYPE_CMD,0x2B);
lcdWrite(TYPE_DATA,0);
lcdWrite(TYPE_DATA,70-1); //70 = height
#endif
#endif
/*
uint16_t i;
for(i=0; i<100; i++)
lcdWrite(TYPE_DATA,0x00);
*/
lcd_deselect(); lcd_deselect();
} }
void lcdFill(char f){ void lcdFill(char f){
int x; // using memset saves 4 bytes compared with the loop!
memset(lcdBuffer,f,RESX*RESY_B);
/* int x;
for(x=0;x<RESX*RESY_B;x++) { for(x=0;x<RESX*RESY_B;x++) {
lcdBuffer[x]=f; lcdBuffer[x]=f;
} }*/
}; };
/* it's not used... it would have no footprint anyway as it's apparently removed anyway at some point (yes I tried, same size) --the_nihilant
void lcdSafeSetPixel(char x, char y, bool f){ void lcdSafeSetPixel(char x, char y, bool f){
if (x>=0 && x<RESX && y>=0 && y < RESY) if (x>=0 && x<RESX && y>=0 && y < RESY)
lcdSetPixel(x, y, f); lcdSetPixel(x, y, f);
} }*/
void lcdSetPixel(char x, char y, bool f){ void lcdSetPixel(char x, char y, bool f){
if (x<0 || x> RESX || y<0 || y > RESY) if (x<0 || x> RESX || y<0 || y > RESY)
@ -263,25 +248,28 @@ bool lcdGetPixel(char x, char y){
return byte & (1 << y_off); return byte & (1 << y_off);
} }
static void _helper_pixel16(uint16_t color){ // putting this here saves a few bytes overall --the_nihilant
lcdWrite(TYPE_DATA,color>>8);
lcdWrite(TYPE_DATA,color&0xFF);
}
static void _helper_hline(uint16_t color){ // same for this --the_nihilant
for(int cx=0;cx<98;cx++) _helper_pixel16(color);
}
#define THECOLOR_R 0x0 #define THECOLOR_R 0x0
#define THECOLOR_G 0x80 #define THECOLOR_G 0x60
#define THECOLOR_B 0x0 #define THECOLOR_B 0x0
void lcdDisplay(void) { void lcdDisplay(void) {
char byte; char byte;
lcd_select(); lcd_select();
#ifndef N1600 if(displayType<=DISPLAY_N1200){
lcdWrite(TYPE_CMD,0xB0); lcdWrite(TYPE_CMD,0xB0);
lcdWrite(TYPE_CMD,0x10); lcdWrite(TYPE_CMD,0x10);
lcdWrite(TYPE_CMD,0x00); lcdWrite(TYPE_CMD,0x00);
#else
lcdWrite(TYPE_CMD,0x2C);
#endif
#ifndef N1600
uint16_t i,page; uint16_t i,page;
for(page=0; page<RESY_B;page++) { for(page=0; page<RESY_B;page++) {
for(i=0; i<RESX; i++) { for(i=0; i<RESX; i++) {
@ -296,7 +284,7 @@ void lcdDisplay(void) {
lcdWrite(TYPE_DATA,byte); lcdWrite(TYPE_DATA,byte);
} }
} }
#else }else if(displayType==DISPLAY_N1600){
unsigned char r=THECOLOR_R,g=THECOLOR_G,b=THECOLOR_B; unsigned char r=THECOLOR_R,g=THECOLOR_G,b=THECOLOR_B;
unsigned char br=0xFF, bg=0xFF, bb=0xFF; unsigned char br=0xFF, bg=0xFF, bb=0xFF;
unsigned char frame_r=0x00, frame_g=0x00, frame_b=0x80; unsigned char frame_r=0x00, frame_g=0x00, frame_b=0x80;
@ -308,16 +296,14 @@ void lcdDisplay(void) {
framecolor= ((frame_r&0xF8) << 8) | ((frame_g&0xFC)<<3) | ((frame_b&0xF8) >> 3); framecolor= ((frame_r&0xF8) << 8) | ((frame_g&0xFC)<<3) | ((frame_b&0xF8) >> 3);
backcolor= ((br&0xF8) << 8) | ((bg&0xFC)<<3) | ((bb&0xF8) >> 3); backcolor= ((br&0xF8) << 8) | ((bg&0xFC)<<3) | ((bb&0xF8) >> 3);
lcdWrite(TYPE_CMD,0x2C);
//top line of the frame... //top line of the frame...
for(i=0;i<98;i++){ _helper_hline(framecolor);
lcdWrite(TYPE_DATA,framecolor>>8);
lcdWrite(TYPE_DATA,framecolor&0xFF);
}
for(y=RESY;y>0;y--){ for(y=RESY;y>0;y--){
//left line of the frame //left line of the frame
lcdWrite(TYPE_DATA,framecolor>>8); _helper_pixel16(framecolor);
lcdWrite(TYPE_DATA,framecolor&0xFF);
for(x=RESX;x>0;x--){ for(x=RESX;x>0;x--){
if(GLOBAL(lcdmirror)) if(GLOBAL(lcdmirror))
@ -328,21 +314,15 @@ void lcdDisplay(void) {
if((!px)^(!GLOBAL(lcdinvert))) actualcolor=color; if((!px)^(!GLOBAL(lcdinvert))) actualcolor=color;
else actualcolor=backcolor; /* white */ else actualcolor=backcolor; /* white */
lcdWrite(TYPE_DATA,actualcolor>>8); _helper_pixel16(actualcolor);
lcdWrite(TYPE_DATA,actualcolor&0xFF);
} }
//right line of the frame //right line of the frame
lcdWrite(TYPE_DATA,framecolor>>8); _helper_pixel16(framecolor);
lcdWrite(TYPE_DATA,framecolor&0xFF);
} }
//bottom line of the frame //bottom line of the frame
for(i=0;i<98;i++){ _helper_hline(framecolor);
lcdWrite(TYPE_DATA,framecolor>>8);
lcdWrite(TYPE_DATA,framecolor&0xFF);
} }
#endif
lcd_deselect(); lcd_deselect();
} }
void lcdRefresh() __attribute__ ((weak, alias ("lcdDisplay"))); void lcdRefresh() __attribute__ ((weak, alias ("lcdDisplay")));
@ -352,32 +332,32 @@ inline void lcdInvert(void) {
} }
void lcdSetContrast(int c) { void lcdSetContrast(int c) {
#ifndef N1600 lcd_select();
if(displayType<=DISPLAY_N1200){
c+=0x80; c+=0x80;
if(c>0x9F) if(c>0x9F) goto end;
return;
lcd_select();
lcdWrite(TYPE_CMD,c); lcdWrite(TYPE_CMD,c);
lcd_deselect(); }else if(displayType==DISPLAY_N1600){
#else if(c>=0x40) goto end;
if(c>=0x40)
return;
lcd_select();
lcdWrite(TYPE_CMD,0x25); lcdWrite(TYPE_CMD,0x25);
lcdWrite(TYPE_DATA,4*c); lcdWrite(TYPE_DATA,4*c);
}
end:
lcd_deselect(); lcd_deselect();
#endif
}; };
void lcdSetInvert(int c) { void lcdSetInvert(int c) {
/* if it's just to force c to be either 0 or 1, it can be done more efficiently --the_nihilant
if(c>1) if(c>1)
c=1; c=1;
if(c<0) if(c<0)
c=1; c=1;
*/
c+=0xa6; c=(c&1)+0xa6; // like this --the_nihilant
lcd_select(); lcd_select();
// if(displayType<=DISPLAY_N1200){ // it doesn't harm N1600 displays, does nothing. The if, on the other hand, uses PRECIOUS SPACE --the_nihilant
lcdWrite(TYPE_CMD,c); lcdWrite(TYPE_CMD,c);
// }
lcd_deselect(); lcd_deselect();
}; };

2
firmware/lcd/display.h
View File

@ -27,7 +27,7 @@ void lcdDisplay(void);
void lcdInvert(void); void lcdInvert(void);
void lcdToggleFlag(int flag); void lcdToggleFlag(int flag);
void lcdSetPixel(char x, char y, bool f); void lcdSetPixel(char x, char y, bool f);
void lcdSafeSetPixel(char x, char y, bool f); //void lcdSafeSetPixel(char x, char y, bool f); //useless. see in display.c to learn why --the_nihilant
bool lcdGetPixel(char x, char y); bool lcdGetPixel(char x, char y);
void lcdShift(int x, int y, bool wrap); void lcdShift(int x, int y, bool wrap);
void lcdSetContrast(int c); void lcdSetContrast(int c);

2
firmware/lcd/image.c
View File

@ -25,7 +25,7 @@ uint8_t lcdShowAnim(char *fname, uint32_t framems) {
getInputWaitRelease(); getInputWaitRelease();
while(!getInputRaw()){ while(!getInputRaw()){
lcdFill(0x55); // lcdFill(0x55); // useless, as it will be overwritten anyway by the next instruction --the_nihilant
res = f_read(&file, (char *)lcdBuffer, RESX*RESY_B, &readbytes); res = f_read(&file, (char *)lcdBuffer, RESX*RESY_B, &readbytes);
if(res) if(res)
return -1; return -1;