From 740b4c22430c288fab80a9ff5abfe8df875f915f Mon Sep 17 00:00:00 2001 From: DIvan2000 Date: Tue, 23 Sep 2025 03:25:49 +0400 Subject: [PATCH 1/3] revert f680f7c425fac829476983b707cb946eb017bb63 revert Merge pull request 'dev' (#2) from dev into main Reviewed-on: https://git.divan2000.su/DIvan2000/SegaMouseRAW/pulls/2 --- .gitignore | 1 - inc/mouse.h | 17 ------ res/fluttershy.png | Bin 194 -> 0 bytes src/main.c | 128 +++++++++++++++++++++------------------------ src/mouse.c | 47 ----------------- 5 files changed, 61 insertions(+), 132 deletions(-) delete mode 100644 inc/mouse.h delete mode 100644 res/fluttershy.png delete mode 100644 src/mouse.c diff --git a/.gitignore b/.gitignore index c301112..89f9ac0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ out/ -*.bin diff --git a/inc/mouse.h b/inc/mouse.h deleted file mode 100644 index 46fab17..0000000 --- a/inc/mouse.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MOUSE_H -#define MOUSE_H - -#include "genesis.h" - -typedef struct { - u8 valid; // =1 если мышь (сигнатура совпала) - u8 buttons; - s16 dx; - s16 dy; - u8 nibbles[10]; // для вывода RAW -} MouseData; - -// Чтение мыши с порта -void read_mouse(MouseData* dst, volatile u8* port); - -#endif diff --git a/res/fluttershy.png b/res/fluttershy.png deleted file mode 100644 index 4ce4bc0826b199ac632b9c42d3e956986df2369f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0MfU zUFX|%`+RRh19^0Y!W~T^vIsrndG6@*ObXaB4mD zcm1A>?OV#ckM)0A#HPG2b$9iouT{K5L-1IyM84nG*z=sx#YbtvS- j?vu%D*Rl86|0`kKf0r@MTWN6!&|C&jS3j3^P69999) x1=-9999; else if(x1<-9999) x1=9999; - if(y1>9999) y1=-9999; else if(y1<-9999) y1=9999; + while(TRUE) { - sprintf(buf, "buttons: %c%c%c%c", - ((m1.buttons>>3)&1)+'0', - ((m1.buttons>>2)&1)+'0', - ((m1.buttons>>1)&1)+'0', - ((m1.buttons>>0)&1)+'0'); - VDP_drawText(buf, 2, 23); + SYS_doVBlankProcess(); + + VDP_clearTextArea(0, 1, 40, 13); - sprintf(buf, "PORT1: dx:%+04d dy:%+04d x:%+05d y:%+05d", m1.dx,m1.dy,x1,y1); - VDP_drawText(buf, 1, 24); - } else { - VDP_clearTextArea(2,23,13,1); - sprintf(buf, "PORT1: Mouse not recognized"); - VDP_drawText(buf, 1, 24); - } - MouseData m2; - read_mouse(&m2, PORT2); - sprintf(buf, "%X%X%X%X %X %X %X%X %X%X+", - m2.nibbles[0], m2.nibbles[1], m2.nibbles[2], m2.nibbles[3], - m2.nibbles[4], m2.nibbles[5], m2.nibbles[6], m2.nibbles[7], - m2.nibbles[8], m2.nibbles[9]); - VDP_clearTextArea(38,2,1,20); - VDP_drawText(buf, 24, 2 + frame%20); + //опрос мыши + Z80_HALT = 0x0100; + *MOUSE_PORT = 0x60; delay(); - if(m2.valid) { - x2 += m2.dx; y2 += m2.dy; - if(x2>9999) x2=-9999; else if(x2<-9999) x2=9999; - if(y2>9999) y2=-9999; else if(y2<-9999) y2=9999; + nibbles[0] = *MOUSE_PORT & 0x0F; - sprintf(buf, "buttons: %c%c%c%c", - ((m2.buttons>>3)&1)+'0', - ((m2.buttons>>2)&1)+'0', - ((m2.buttons>>1)&1)+'0', - ((m2.buttons>>0)&1)+'0'); - VDP_drawText(buf, 25, 23); - sprintf(buf, "PORT2: dx:%+04d dy:%+04d x:%+05d y:%+05d", m2.dx,m2.dy,x2,y2); - VDP_drawText(buf, 1, 25); - } else { - sprintf(buf, "PORT2: Mouse not recognized"); - VDP_clearTextArea(25,23,13,1); - VDP_drawText(buf, 1, 25); - } + for(int i=1;i<10;i++) { + *MOUSE_PORT = (i&1)?0x20:0x00; + delay(); + nibbles[i] = *MOUSE_PORT & 0x0F; + delay(); + } + + *MOUSE_PORT = 0x60; delay(); + Z80_HALT = 0x0000; + //конец опроса мыши + + // выводим нибблы на экран + sprintf(buf, "%X%X%X%X %X %X %X%X %X%X", nibbles[0],nibbles[1],nibbles[2],nibbles[3],nibbles[4],nibbles[5],nibbles[6],nibbles[7],nibbles[8],nibbles[9]); + VDP_drawText(buf, 13,1); + + //считаем dx dy + s16 dx = (nibbles[6] << 4) | nibbles[7]; + s16 dy = (nibbles[8] << 4) | nibbles[9]; + if (nibbles[4]&8) dy = 255; + if (nibbles[4]&4) dx = 255; + if (nibbles[4]&2) dy = dy|0xFF00; //sign-extend to 16-bit + if (nibbles[4]&1) dx = dx|0xFF00; + x+=dx; + y+=dy; + + //выводим на экран полезные данные + sprintf(buf, "buttons: %c%c%c%c", (nibbles[5]&8&&1)+'0',(nibbles[5]&4&&1)+'0',(nibbles[5]&2&&1)+'0',(nibbles[5]&1&&1)+'0'); + VDP_drawText(buf, 2, 10); + sprintf(buf, "dx: %+04d dy: %+04d x: %+04d y: %+04d", dx,dy,x,y); + VDP_drawText(buf, 2, 12); - //счётчик кадров для вывода истории нибблов - frame++; + } - //конец кадра - VDP_waitVSync(); - } - - return 0; + return 0; } diff --git a/src/mouse.c b/src/mouse.c deleted file mode 100644 index 1420cb0..0000000 --- a/src/mouse.c +++ /dev/null @@ -1,47 +0,0 @@ -#include "mouse.h" - -#define MOUSE_DELAY 16 -#define Z80_HALT *((volatile u16*)0xA11100) - -static inline void delay(void) { - __asm__ volatile ( - "move.w %0,%%d0\n\t" - "1: subq.w #1,%%d0\n\t" - "bne.s 1b" - : - : "i"(MOUSE_DELAY) - : "d0" - ); -} - -void read_mouse(MouseData* dst, volatile u8* port) { - - dst->valid = 0; - - Z80_HALT = 0x0100; - *port = 0x60; delay(); - - dst->nibbles[0] = *port & 0x0F; - for(int i=1; i<10; i++) { - *port = (i&1) ? 0x20 : 0x00; - delay(); - dst->nibbles[i] = *port & 0x0F; - delay(); - } - - *port = 0x60; delay(); - Z80_HALT = 0x0000; - - // проверка сигнатуры 0BFF - if (dst->nibbles[0]==0x0 && dst->nibbles[1]==0xB && dst->nibbles[2]==0xF && dst->nibbles[3]==0xF) { - dst->valid = 1; - dst->dx = (dst->nibbles[6] << 4) | dst->nibbles[7]; - dst->dy = (dst->nibbles[8] << 4) | dst->nibbles[9]; - if (dst->nibbles[4] & 8) dst->dy = 255; - if (dst->nibbles[4] & 4) dst->dx = 255; - if (dst->nibbles[4] & 2) dst->dy |= 0xFF00; // sign-extend - if (dst->nibbles[4] & 1) dst->dx |= 0xFF00; - - dst->buttons = dst->nibbles[5]; - } -} From 47236203cc939d9a1d86f3f981171a73d3f484ac Mon Sep 17 00:00:00 2001 From: DIvan2000 Date: Tue, 23 Sep 2025 03:26:55 +0400 Subject: [PATCH 2/3] revert 740b4c22430c288fab80a9ff5abfe8df875f915f revert revert f680f7c425fac829476983b707cb946eb017bb63 revert Merge pull request 'dev' (#2) from dev into main Reviewed-on: https://git.divan2000.su/DIvan2000/SegaMouseRAW/pulls/2 --- .gitignore | 1 + inc/mouse.h | 17 ++++++ res/fluttershy.png | Bin 0 -> 194 bytes src/main.c | 128 ++++++++++++++++++++++++--------------------- src/mouse.c | 47 +++++++++++++++++ 5 files changed, 132 insertions(+), 61 deletions(-) create mode 100644 inc/mouse.h create mode 100644 res/fluttershy.png create mode 100644 src/mouse.c diff --git a/.gitignore b/.gitignore index 89f9ac0..c301112 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ out/ +*.bin diff --git a/inc/mouse.h b/inc/mouse.h new file mode 100644 index 0000000..46fab17 --- /dev/null +++ b/inc/mouse.h @@ -0,0 +1,17 @@ +#ifndef MOUSE_H +#define MOUSE_H + +#include "genesis.h" + +typedef struct { + u8 valid; // =1 если мышь (сигнатура совпала) + u8 buttons; + s16 dx; + s16 dy; + u8 nibbles[10]; // для вывода RAW +} MouseData; + +// Чтение мыши с порта +void read_mouse(MouseData* dst, volatile u8* port); + +#endif diff --git a/res/fluttershy.png b/res/fluttershy.png new file mode 100644 index 0000000000000000000000000000000000000000..4ce4bc0826b199ac632b9c42d3e956986df2369f GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0MfU zUFX|%`+RRh19^0Y!W~T^vIsrndG6@*ObXaB4mD zcm1A>?OV#ckM)0A#HPG2b$9iouT{K5L-1IyM84nG*z=sx#YbtvS- j?vu%D*Rl86|0`kKf0r@MTWN6!&|C&jS3j3^P69999) x1=-9999; else if(x1<-9999) x1=9999; + if(y1>9999) y1=-9999; else if(y1<-9999) y1=9999; - SYS_doVBlankProcess(); - - VDP_clearTextArea(0, 1, 40, 13); + sprintf(buf, "buttons: %c%c%c%c", + ((m1.buttons>>3)&1)+'0', + ((m1.buttons>>2)&1)+'0', + ((m1.buttons>>1)&1)+'0', + ((m1.buttons>>0)&1)+'0'); + VDP_drawText(buf, 2, 23); + sprintf(buf, "PORT1: dx:%+04d dy:%+04d x:%+05d y:%+05d", m1.dx,m1.dy,x1,y1); + VDP_drawText(buf, 1, 24); + } else { + VDP_clearTextArea(2,23,13,1); + sprintf(buf, "PORT1: Mouse not recognized"); + VDP_drawText(buf, 1, 24); + } - //опрос мыши - Z80_HALT = 0x0100; - *MOUSE_PORT = 0x60; delay(); + MouseData m2; + read_mouse(&m2, PORT2); + sprintf(buf, "%X%X%X%X %X %X %X%X %X%X+", + m2.nibbles[0], m2.nibbles[1], m2.nibbles[2], m2.nibbles[3], + m2.nibbles[4], m2.nibbles[5], m2.nibbles[6], m2.nibbles[7], + m2.nibbles[8], m2.nibbles[9]); + VDP_clearTextArea(38,2,1,20); + VDP_drawText(buf, 24, 2 + frame%20); - nibbles[0] = *MOUSE_PORT & 0x0F; + if(m2.valid) { + x2 += m2.dx; y2 += m2.dy; + if(x2>9999) x2=-9999; else if(x2<-9999) x2=9999; + if(y2>9999) y2=-9999; else if(y2<-9999) y2=9999; + sprintf(buf, "buttons: %c%c%c%c", + ((m2.buttons>>3)&1)+'0', + ((m2.buttons>>2)&1)+'0', + ((m2.buttons>>1)&1)+'0', + ((m2.buttons>>0)&1)+'0'); + VDP_drawText(buf, 25, 23); - for(int i=1;i<10;i++) { - *MOUSE_PORT = (i&1)?0x20:0x00; - delay(); - nibbles[i] = *MOUSE_PORT & 0x0F; - delay(); - } - - *MOUSE_PORT = 0x60; delay(); - Z80_HALT = 0x0000; - //конец опроса мыши - - // выводим нибблы на экран - sprintf(buf, "%X%X%X%X %X %X %X%X %X%X", nibbles[0],nibbles[1],nibbles[2],nibbles[3],nibbles[4],nibbles[5],nibbles[6],nibbles[7],nibbles[8],nibbles[9]); - VDP_drawText(buf, 13,1); - - //считаем dx dy - s16 dx = (nibbles[6] << 4) | nibbles[7]; - s16 dy = (nibbles[8] << 4) | nibbles[9]; - if (nibbles[4]&8) dy = 255; - if (nibbles[4]&4) dx = 255; - if (nibbles[4]&2) dy = dy|0xFF00; //sign-extend to 16-bit - if (nibbles[4]&1) dx = dx|0xFF00; - x+=dx; - y+=dy; - - //выводим на экран полезные данные - sprintf(buf, "buttons: %c%c%c%c", (nibbles[5]&8&&1)+'0',(nibbles[5]&4&&1)+'0',(nibbles[5]&2&&1)+'0',(nibbles[5]&1&&1)+'0'); - VDP_drawText(buf, 2, 10); - sprintf(buf, "dx: %+04d dy: %+04d x: %+04d y: %+04d", dx,dy,x,y); - VDP_drawText(buf, 2, 12); + sprintf(buf, "PORT2: dx:%+04d dy:%+04d x:%+05d y:%+05d", m2.dx,m2.dy,x2,y2); + VDP_drawText(buf, 1, 25); + } else { + sprintf(buf, "PORT2: Mouse not recognized"); + VDP_clearTextArea(25,23,13,1); + VDP_drawText(buf, 1, 25); + } - } + //счётчик кадров для вывода истории нибблов + frame++; - return 0; + //конец кадра + VDP_waitVSync(); + } + + return 0; } diff --git a/src/mouse.c b/src/mouse.c new file mode 100644 index 0000000..1420cb0 --- /dev/null +++ b/src/mouse.c @@ -0,0 +1,47 @@ +#include "mouse.h" + +#define MOUSE_DELAY 16 +#define Z80_HALT *((volatile u16*)0xA11100) + +static inline void delay(void) { + __asm__ volatile ( + "move.w %0,%%d0\n\t" + "1: subq.w #1,%%d0\n\t" + "bne.s 1b" + : + : "i"(MOUSE_DELAY) + : "d0" + ); +} + +void read_mouse(MouseData* dst, volatile u8* port) { + + dst->valid = 0; + + Z80_HALT = 0x0100; + *port = 0x60; delay(); + + dst->nibbles[0] = *port & 0x0F; + for(int i=1; i<10; i++) { + *port = (i&1) ? 0x20 : 0x00; + delay(); + dst->nibbles[i] = *port & 0x0F; + delay(); + } + + *port = 0x60; delay(); + Z80_HALT = 0x0000; + + // проверка сигнатуры 0BFF + if (dst->nibbles[0]==0x0 && dst->nibbles[1]==0xB && dst->nibbles[2]==0xF && dst->nibbles[3]==0xF) { + dst->valid = 1; + dst->dx = (dst->nibbles[6] << 4) | dst->nibbles[7]; + dst->dy = (dst->nibbles[8] << 4) | dst->nibbles[9]; + if (dst->nibbles[4] & 8) dst->dy = 255; + if (dst->nibbles[4] & 4) dst->dx = 255; + if (dst->nibbles[4] & 2) dst->dy |= 0xFF00; // sign-extend + if (dst->nibbles[4] & 1) dst->dx |= 0xFF00; + + dst->buttons = dst->nibbles[5]; + } +} From c7f395339f21ff8da675407f219763d87a65a95f Mon Sep 17 00:00:00 2001 From: DIvan2000 Date: Tue, 23 Sep 2025 15:56:13 +0400 Subject: [PATCH 3/3] v1.3.1 --- res/fluttershy.png | Bin 194 -> 202 bytes res/pinkie_pie.png | Bin 0 -> 198 bytes res/resources.h | 9 ++++++ res/resources.res | 2 ++ src/main.c | 67 +++++++++++++++++++++++++++++++++++++++------ 5 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 res/pinkie_pie.png create mode 100644 res/resources.h create mode 100644 res/resources.res diff --git a/res/fluttershy.png b/res/fluttershy.png index 4ce4bc0826b199ac632b9c42d3e956986df2369f..fa57a8a618d49c903bb86b0caaa6a6c2f22436a2 100644 GIT binary patch delta 63 zcmX@ac#3g?p{YcGPlzi61H<=sop0Ce2Qsd%V84|=_nK4LUgq!xw+cmoLL4PQe!&d? NA>it%5Tl84DF8AB9Ebn_ delta 55 zcmX@bc!+U=p{`JXPlzi61H<=sop0Ce2Qsd%V84|=ccr7wBOr&ZB*-tA;XepeRX+GP HF)alETH6?c diff --git a/res/pinkie_pie.png b/res/pinkie_pie.png new file mode 100644 index 0000000000000000000000000000000000000000..f9fc9dbd9183a34a7d3aba0ec3b6ac63d3489df7 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0MfU zUFX|%`+f$A9++osOr4&1A6!Rj(eJNWsL)vmTRuKV2m l6U3!rL;jq4`}O=zMz1c$uSs*`B!Ol!c)I$ztaD0e0swa>MT7tV literal 0 HcmV?d00001 diff --git a/res/resources.h b/res/resources.h new file mode 100644 index 0000000..38436f0 --- /dev/null +++ b/res/resources.h @@ -0,0 +1,9 @@ +#include + +#ifndef _RES_RESOURCES_H_ +#define _RES_RESOURCES_H_ + +extern const SpriteDefinition FLUTTERSHY; +extern const SpriteDefinition PINKIE_PIE; + +#endif // _RES_RESOURCES_H_ diff --git a/res/resources.res b/res/resources.res new file mode 100644 index 0000000..79025da --- /dev/null +++ b/res/resources.res @@ -0,0 +1,2 @@ +SPRITE FLUTTERSHY "fluttershy.png" 2 2 NONE 0 +SPRITE PINKIE_PIE "pinkie_pie.png" 2 2 NONE 0 diff --git a/src/main.c b/src/main.c index f64fbb4..38e51eb 100644 --- a/src/main.c +++ b/src/main.c @@ -1,21 +1,41 @@ #include "genesis.h" #include "mouse.h" +#include "resources.h" #define PORT1 ((volatile u8*)0xA10003) #define PORT2 ((volatile u8*)0xA10005) +Sprite* ptr1; +Sprite* ptr2; + int main() { VDP_setTextPlane(0); VDP_drawText("Sega Mega Mouse RAW reader", 7, 27); VDP_drawText("RAW nibbles:", 14,0); + + SPR_init(); + PAL_setPalette(PAL1, FLUTTERSHY.palette->data, DMA); s16 x1=0,y1=0, x2=0,y2=0; u8 frame = 0; char buf[40]; //буфер строки для вывода на экран + MouseData m1, m2; + + u8 code1[6] = {0}; + u8 code2[6] = {0}; + + u8 ptr_active1=0,ptr_active2=0; + while(TRUE) { - MouseData m1; + //считывание портов и вывод информации + u8 btnFront1=m1.buttons, btnFront2=m2.buttons; read_mouse(&m1, PORT1); + read_mouse(&m2, PORT2); + + btnFront1^=m1.buttons; + btnFront2^=m2.buttons; + sprintf(buf, "+%X%X%X%X %X %X %X%X %X%X", m1.nibbles[0], m1.nibbles[1], m1.nibbles[2], m1.nibbles[3], m1.nibbles[4], m1.nibbles[5], m1.nibbles[6], m1.nibbles[7], @@ -25,8 +45,20 @@ int main() { if(m1.valid) { x1 += m1.dx; y1 += m1.dy; - if(x1>9999) x1=-9999; else if(x1<-9999) x1=9999; - if(y1>9999) y1=-9999; else if(y1<-9999) y1=9999; + if(x1>304) x1=304; else if(x1<0) x1=0; + if(y1>208) y1=208; else if(y1<0) y1=0; + + if(!ptr_active1 && btnFront1) { + u8* code = code1; + for(int i=1;i<6;i++) code[i-1]=code[i]; + code[5]=btnFront1; + if(code[0]==0x4&&code[1]==0x1&&code[2]==0x1&&code[3]==0x2&&code[4]==0x2&&code[5]==0x4){ + ptr_active1=1; + ptr1 = SPR_addSprite(&FLUTTERSHY, 0, 0, TILE_ATTR(PAL1, TRUE, FALSE, TRUE)); + } + } + + if(ptr_active1) SPR_setPosition(ptr1, x1, 208-y1); sprintf(buf, "buttons: %c%c%c%c", ((m1.buttons>>3)&1)+'0', @@ -43,8 +75,6 @@ int main() { VDP_drawText(buf, 1, 24); } - MouseData m2; - read_mouse(&m2, PORT2); sprintf(buf, "%X%X%X%X %X %X %X%X %X%X+", m2.nibbles[0], m2.nibbles[1], m2.nibbles[2], m2.nibbles[3], m2.nibbles[4], m2.nibbles[5], m2.nibbles[6], m2.nibbles[7], @@ -54,9 +84,22 @@ int main() { if(m2.valid) { x2 += m2.dx; y2 += m2.dy; - if(x2>9999) x2=-9999; else if(x2<-9999) x2=9999; - if(y2>9999) y2=-9999; else if(y2<-9999) y2=9999; + if(x2>304) x2=304; else if(x2<0) x2=0; + if(y2>208) y2=208; else if(y2<0) y2=0; + + if(!ptr_active2 && btnFront2) { + u8* code = code2; + for(int i=1;i<6;i++) code[i-1]=code[i]; + code[5]=btnFront2; + if(code[0]==0x4&&code[1]==0x1&&code[2]==0x1&&code[3]==0x2&&code[4]==0x2&&code[5]==0x4){ + ptr_active2=1; + ptr2 = SPR_addSprite(&PINKIE_PIE, 0, 0, TILE_ATTR(PAL1, TRUE, FALSE, FALSE)); + } + } + + if(ptr_active2) SPR_setPosition(ptr2, x2, 208-y2); + sprintf(buf, "buttons: %c%c%c%c", ((m2.buttons>>3)&1)+'0', ((m2.buttons>>2)&1)+'0', @@ -71,12 +114,20 @@ int main() { VDP_clearTextArea(25,23,13,1); VDP_drawText(buf, 1, 25); } + + //спрайты + + SPR_update(); //счётчик кадров для вывода истории нибблов frame++; //конец кадра - VDP_waitVSync(); + + //Я не уверен почему, но SYS_doVBlankProcess в какой-то момент вызывал странное поведение. После добавления спрайтов, кажется, всё в порядке. + + //VDP_waitVSync(); + SYS_doVBlankProcess(); } return 0;