Compare commits

...

5 commits

Author SHA1 Message Date
7e9d8b418b we can do the 10print demo
it's a bit unreliable (probably not my fault) so you might have to boot several times before successfully having it type in.

just hit the "Button #1" once to boot, and again to enter the code.
2025-02-28 14:00:17 -06:00
9e4b109fad fruit jam pinning 2025-02-28 10:10:06 -06:00
52c019e7b7 compile warning about redefinition 2025-02-28 10:09:57 -06:00
33c1208b8c compile warning about improper use of backslash 2025-02-28 10:09:43 -06:00
d3ad57db6b pinout for fruit jam 2025-02-28 09:53:30 -06:00
5 changed files with 34 additions and 25 deletions

View file

@ -13,24 +13,24 @@
// TFT
#define TFT_SPIREG spi1
#define TFT_SPIDREQ DREQ_SPI1_TX
#define TFT_SCLK 14
#define TFT_MOSI 15
#define TFT_MISO 12
#define TFT_DC 28
#define TFT_CS 13 // 255 for LORES ST7789 (NO CS)
#define TFT_RST 255 // 255 for ILI/ST if connected to 3.3V
#define TFT_SCLK 30
#define TFT_MOSI 31
#define TFT_MISO 28
#define TFT_DC 3
#define TFT_CS 46 // 255 for LORES ST7789 (NO CS)
#define TFT_RST 22 // 255 for ILI/ST if connected to 3.3V
#define TFT_BACKLIGHT 255 // hardwired to 3.3v
// 2 buttons
#define PIN_KEY_USER1 28
#define PIN_KEY_USER2 27
#define PIN_KEY_USER1 0
#define PIN_KEY_USER2 4
// SD
#define SD_SCLK 6
#define SD_MOSI 7
#define SD_MISO 4
#define SD_CS 5
#define SD_DETECT 255
#define SD_SCLK 34
#define SD_MOSI 35
#define SD_MISO 36
#define SD_CS 39
#define SD_DETECT 33
// Second SPI bus and DMA not conflicting with USB
#define SD_SPIREG spi0
@ -48,4 +48,21 @@
#define PSRAM_CS 9
#define PSRAM_SPIREG spi1
#if 0 // metro rp2350
#define PIN_CKN (15u)
#define PIN_CKP (14u)
#define PIN_D0N (19u)
#define PIN_D0P (18u)
#define PIN_D1N (17u)
#define PIN_D1P (16u)
#define PIN_D2N (13u)
#define PIN_D2P (12u)
#endif
#define PIN_CKP (13u)
#define PIN_D0P (15u)
#define PIN_D1P (17u)
#define PIN_D2P (19u)
#endif

View file

@ -338,15 +338,6 @@ void hdmi_framebuffer(hdmi_framebuffer_obj_t *self, uint16_t width, uint16_t hei
// If we want the exact rate then we'll have to reconfigure PLLs.
// HSTX outputs 0 through 7 appear on GPIO 12 through 19.
#define PIN_CKN (15u)
#define PIN_CKP (14u)
#define PIN_D0N (19u)
#define PIN_D0P (18u)
#define PIN_D1N (17u)
#define PIN_D1P (16u)
#define PIN_D2N (13u)
#define PIN_D2P (12u)
constexpr int HSTX_FIRST_PIN = 12;
struct { uint8_t clk_p, rgb_p[3]; } pinout = { PIN_CKP, PIN_D0P, PIN_D1P, PIN_D2P };

View file

@ -102,6 +102,7 @@ static volatile bool cancelled = false;
static volatile uint8_t curTransfer = 0;
static uint8_t nbTransfer = 0;
#undef B16
/* VGA structures / constants */
#define R16(rgb) ((rgb>>8)&0xf8)
#define G16(rgb) ((rgb>>3)&0xfc)

View file

@ -291,7 +291,7 @@ static uint8_t kcnt = 0;
static bool toggle = true;
static char * textseq;
static char * textload = "LOAD\"\"\r\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tRUN\r";
static char * textload = "10?CHR$(205.5+RND(1));:GOTO10\rRUN\r";
static char textkey[1];
static bool res=false;

View file

@ -68,8 +68,8 @@ const unsigned short key_map1[] = {
#define keylables_map2_2 (char *)" ()?/\"<>,: "
const unsigned short key_map2[] = {
'1','2','3','4','5','6','7','8','9','0',0,
0, '!','@','#','$','%','+','&','*','-','\/',
0, '(',')','?','\/','"','<','>',',',':',
0, '!','@','#','$','%','+','&','*','-','/',
0, '(',')','?','/','"','<','>',',',':',
145,157,29,17 //U L R D
};