Jump to content
IGNORED

New release


Al_Nafuur

Recommended Posts

I tried...

git clone git@gitlab.com:firmaplus/atari-2600-pluscart.git
git branch dev
<made changes>
git push
  

The push was rejected; it was trying to write to master.

So I guess I don't know how to properly branch a new dev so I can contribute the new menu/keyboard speed/delay stuff.

Link to comment
Share on other sites

6 minutes ago, Andrew Davie said:

I tried...


git clone git@gitlab.com:firmaplus/atari-2600-pluscart.git
git branch dev
<made changes>
git push
  

The push was rejected; it was trying to write to master.

So I guess I don't know how to properly branch a new dev so I can contribute the new menu/keyboard speed/delay stuff.


 
 git checkout -b dev

makes a new branch named "dev"

 

Link to comment
Share on other sites

10 minutes ago, Andrew Davie said:

 

So I guess I don't know how to properly branch a new dev so I can contribute the new menu/keyboard speed/delay stuff.

Maybe push your changes to the "reunion" branch, so they will be available for "UnoCart" and SD Logo builds too?

 

but I am about to push my new changes because of the new keyboard handling

Edited by Al_Nafuur
Link to comment
Share on other sites

I'll send you the files as attachments here I'm having issues ATM

The changes involve

 a) initialisation of delay counter (which was causing long delay on initialisation of menu)

 b) reduction of delay between joystick up/down from 10 to 7

 

PlusCart.asm firmware_pal_rom.h firmware_pal60_rom.h firmware_ntsc_rom.h

  • Thanks 1
Link to comment
Share on other sites

3 minutes ago, Andrew Davie said:

I'll send you the files as attachments here I'm having issues ATM

The changes involve

 a) initialisation of delay counter (which was causing long delay on initialisation of menu)

 b) reduction of delay between joystick up/down from 10 to 7

 

PlusCart.asm 45.86 kB · 0 downloads firmware_pal_rom.h 4.11 kB · 0 downloads firmware_pal60_rom.h 4.12 kB · 0 downloads firmware_ntsc_rom.h 4.42 kB · 0 downloads

I need the (3) header files with SD-Logo (SPINNER = 1) too.
?

 

but I can build them myself.

 

Link to comment
Share on other sites

3 hours ago, Andrew Davie said:

2.07: wifi -- select network, start to enter password, select (Go Back)

You see the abandoned password with menu option ("..")

So something's not quite right there, still.

 

?

seems like a new version of the old exit from search result bug.

Link to comment
Share on other sites

9 hours ago, Andrew Davie said:

I'll send you the files as attachments here I'm having issues ATM

The changes involve

 a) initialisation of delay counter (which was causing long delay on initialisation of menu)

 b) reduction of delay between joystick up/down from 10 to 7

 

PlusCart.asm 45.86 kB · 1 download firmware_pal_rom.h 4.11 kB · 2 downloads firmware_pal60_rom.h 4.12 kB · 1 download firmware_ntsc_rom.h 4.42 kB · 1 download

I have added (and pushed) the changes to the reunion branch with everything that's in the v2.0.8 draft release.

 

Link to comment
Share on other sites

19 hours ago, Andrew Davie said:

2.07: wifi -- select network, start to enter password, select (Go Back)

You see the abandoned password with menu option ("..")

So something's not quite right there, still.

 

should be fixed now with v2.0.9

Link to comment
Share on other sites

I've created a dev branch and pushed.

I put the keyboard speed changes in, as I based it of master

I've added a new row to keyboards with space/!/?/,/.  that should make text entry way way quicker

For example, to select "A. K." before you'd have to do (and this is rough because it depends on the random position of the menu bar on changes)

59 joystick moves/button presses in the old version vs. 32 in the new keyboards.

Having to switch to "SYMBOLS.... find row... find punctuation/space" is quite tedious. Putting Space in particular on the alpha keyboards is a huge improvement.

 

As to the SPINNER thing, I don't know how that's managed. I don't think I ran into that before. I just generated the ntsc/pal60/pal header fies before this.

 

Anyway, all pushed to dev. Hope it's usable.

 

 

 

Link to comment
Share on other sites

26 minutes ago, Andrew Davie said:

I've created a dev branch and pushed.

I put the keyboard speed changes in, as I based it of master

I've added a new row to keyboards with space/!/?/,/.  that should make text entry way way quicker

For example, to select "A. K." before you'd have to do (and this is rough because it depends on the random position of the menu bar on changes)

59 joystick moves/button presses in the old version vs. 32 in the new keyboards.

Having to switch to "SYMBOLS.... find row... find punctuation/space" is quite tedious. Putting Space in particular on the alpha keyboards is a huge improvement.

good idea.?

26 minutes ago, Andrew Davie said:

As to the SPINNER thing, I don't know how that's managed. I don't think I ran into that before. I just generated the ntsc/pal60/pal header fies before this.

have already added all to the reunion branch. Basically there are 3 new header files "firmware_uno_(ntsc/pal60/pal)_rom.h" for the SD-Logo build now.

To see them, and to build/test the branch locally you should do:

git fetch
git checkout --track origin/reunion

 

Link to comment
Share on other sites

4 minutes ago, Andrew Davie said:

I forgot to mention in the comment/commit...

I put a full TIA clear (0..$3F) in the menu initialisation. I think that will address @alex_79's point about register init.

That should make its way into the reunion/master version.

I can't find it in the commit changes:

https://gitlab.com/firmaplus/atari-2600-pluscart/-/commit/752742e507eafb42908ef358510215994d382bec

 

is this at boot only or at "emulation exit" events too or after every RAM waitroutine?

 

Link to comment
Share on other sites

3 minutes ago, Al_Nafuur said:

I can't find it in the commit changes:

https://gitlab.com/firmaplus/atari-2600-pluscart/-/commit/752742e507eafb42908ef358510215994d382bec

 

is this at boot only or at "emulation exit" events too or after every RAM waitroutine?

 

WaitCart            SUBROUTINE

                    lda StatusByteReboot
  	                beq .dontReboot


                    ldx #$3F
                    lda #0
.clearTIA           sta 0,x	                        ; Clear TIA ($00-$3f) inclusive
                    dex
                    bpl .clearTIA

    ; copy exit routine to ram

                    ldx #ZP_REQUIRED_EXIT-1
.add                lda ExitCartRoutine,x
                    sta $80+RESERVED_ZP,x
                    dex
                    bpl .add

                    jmp EXIT_WAITCART


.dontReboot         rts

I guess it must already have been there from before...?

 

Link to comment
Share on other sites

46 minutes ago, Andrew Davie said:

WaitCart            SUBROUTINE

                    lda StatusByteReboot
  	                beq .dontReboot


                    ldx #$3F
                    lda #0
.clearTIA           sta 0,x	                        ; Clear TIA ($00-$3f) inclusive
                    dex
                    bpl .clearTIA

    ; copy exit routine to ram

                    ldx #ZP_REQUIRED_EXIT-1
.add                lda ExitCartRoutine,x
                    sta $80+RESERVED_ZP,x
                    dex
                    bpl .add

                    jmp EXIT_WAITCART


.dontReboot         rts

I guess it must already have been there from before...?

 

Yes this has been in there before. But these are TIA addresses ($0 - $3f)

 

I think SWCHA, SWACNT, SWCHB and SWBCNT are RIOT addresses ($280 - $283) and we have to reset them after "emulation exit" too.

 

 

  • Like 1
Link to comment
Share on other sites

Just now, Al_Nafuur said:

Yes this has been in there before. But these are TIA addresses ($0 - $3f)

 

I think SWCHA, SWACNT, SWCHB and SWBCNT are RIOT addresses ($280 - $283) and we have to reset them after "emulation exit" too.

 

 

Ah, what was I thinking.

OK. Well I guess that seems the right spot to put those....?

Link to comment
Share on other sites

2 minutes ago, Andrew Davie said:

Ah, what was I thinking.

OK. Well I guess that seems the right spot to put those....?

Yes this would a right spot to put those too (if we have enough space in VCS RAM ?)

 

otherwise I would put it into the emulation exit function in the firmware..

 

https://gitlab.com/firmaplus/atari-2600-pluscart/-/blob/master/source/STM32firmware/PlusCart/Src/cartridge_emulation.c#L25

 

Edited by Al_Nafuur
Link to comment
Share on other sites

2 minutes ago, Al_Nafuur said:

Yes this would a right spot to put those too (if we have enough space in VCS RAM ?)

 

otherwise I would put it into the emulation exit function in the firmware..

 

https://gitlab.com/firmaplus/atari-2600-pluscart/-/blob/master/source/STM32firmware/PlusCart/Src/cartridge_emulation.c#L25

 

btw. does the break (BRK) :
https://gitlab.com/firmaplus/atari-2600-pluscart/-/blob/master/source/STM32firmware/PlusCart/Src/cartridge_emulation.c#L32

 

not trigger the reset sequence of the 6532 too?

Link to comment
Share on other sites

1 minute ago, Andrew Davie said:

There's 2 bytes free and little hope of finding more space.

my proposal is to feed this exit sequence in the exit_cartridge function (instead of the just the NOP and BRK):

const uint8_t exit_sequence[] __attribute__((section(".flash01"))) = {
    0xea,                   //      NOP
    0xa9, 0x00,             //      LDA	#0
    0x8d, 0x80, 0x02,       //      STA	SWCHA 
    0x8d, 0x81, 0x02,       //      STA	SWACNT
    0x8d, 0x82, 0x02,       //      STA	SWCHB
    0x8d, 0x83, 0x02,       //      STA	SWBCNT
    00x0                    //      BRK
};

 

Link to comment
Share on other sites

21 minutes ago, Al_Nafuur said:

I didn't write that...!

Looks to me like it would have to be doing that. The BRK vector is pointing to FirstStart.

 

Link to comment
Share on other sites

  • Recently Browsing   0 members

    • No registered users viewing this page.
×
×
  • Create New...