diff --git a/asoft_presenter/asoft_presenter.c b/asoft_presenter/asoft_presenter.c index 758c84d8..38a177d5 100644 --- a/asoft_presenter/asoft_presenter.c +++ b/asoft_presenter/asoft_presenter.c @@ -139,7 +139,8 @@ struct footer_info { #define SLIDE_HGR2 3 #define SLIDE_HGR_PLOT 4 #define SLIDE_NOCHANGE 5 -#define GR_PLOT 6 +#define SLIDE_GR 6 +#define SLIDE_GR_FULL 7 #define MAX_SLIDES 89 @@ -428,6 +429,33 @@ static void generate_slide(int num, int max, char*filename) { print_til_eof(fff,&line_num); + } + else if (strstr(type,"GRFULL")) { + printf("%d GR\n",line_num); line_num++; + while(1) { + result=fgets(string,BUFSIZ,fff); + if (result==NULL) break; + if ((string[0]=='#') || (string[0]=='\n')) { + continue; + } + break; + } + + string[strlen(string)-1]='\0'; + printf("%d PRINT CHR$(4);\"BLOAD %s,A$800\"\n", + line_num,string); + line_num++; + + // C055, switch to page2, full screen + printf("%d POKE 49237,1: POKE 49234,1\n", + line_num); line_num++; + + + /* print rest of stuff */ + printf("%d VTAB 21\n",line_num); line_num++; + + print_til_eof(fff,&line_num); + } else if (strstr(type,"GR")) { printf("%d GR\n",line_num); line_num++; @@ -476,7 +504,7 @@ static void generate_slide(int num, int max, char*filename) { /* wait for keypress and move to next slide */ printf("%d GOSUB 9000\n",line_num); line_num++; - if (!strcmp(type,"GR")) printf("%d TEXT\n",line_num); + if (!strncmp(type,"GR",2)) printf("%d TEXT\n",line_num); line_num++; printf("%d ON N%% GOTO %d,%d,%d\n", diff --git a/asoft_presenter/kansasfest_2018/ENTROPY.HGR b/asoft_presenter/kansasfest_2018/ENTROPY.HGR new file mode 100644 index 00000000..edc750c0 Binary files /dev/null and b/asoft_presenter/kansasfest_2018/ENTROPY.HGR differ diff --git a/asoft_presenter/kansasfest_2018/MODE7DEMO.GR b/asoft_presenter/kansasfest_2018/MODE7DEMO.GR new file mode 100644 index 00000000..31e0b593 Binary files /dev/null and b/asoft_presenter/kansasfest_2018/MODE7DEMO.GR differ diff --git a/asoft_presenter/kansasfest_2018/Makefile b/asoft_presenter/kansasfest_2018/Makefile index 17e662f4..232ba240 100644 --- a/asoft_presenter/kansasfest_2018/Makefile +++ b/asoft_presenter/kansasfest_2018/Makefile @@ -9,18 +9,20 @@ all: kfest2018_slides.dsk kfest2018_slides.dsk: KANSASFEST_2018 \ TITLE.HGR KATAHDINC.BIN VINCEC.BIN PI_PLAYERC.BIN \ - KSP_TITLE.HGR PORTAL.HGR \ - CHIPTUNE.GR TB1.GR \ + KSP_TITLE.HGR PORTAL.HGR ENTROPY.HGR \ + CHIPTUNE.GR TB1.GR MODE7DEMO.GR \ LOAD_DEMO $(DOS33) -y kfest2018_slides.dsk SAVE A KANSASFEST_2018 $(DOS33) -y kfest2018_slides.dsk SAVE B TITLE.HGR $(DOS33) -y kfest2018_slides.dsk SAVE B KSP_TITLE.HGR $(DOS33) -y kfest2018_slides.dsk SAVE B PORTAL.HGR + $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x2000 ENTROPY.HGR $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x2000 KATAHDINC.BIN $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x2000 VINCEC.BIN $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x2000 PI_PLAYERC.BIN $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x800 CHIPTUNE.GR $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x800 TB1.GR + $(DOS33) -y kfest2018_slides.dsk BSAVE -a 0x800 MODE7DEMO.GR $(DOS33) -y kfest2018_slides.dsk SAVE A LOAD_DEMO LOAD_DEMO: load_demo.bas diff --git a/asoft_presenter/kansasfest_2018/TODO b/asoft_presenter/kansasfest_2018/TODO index 4fe4e35f..a61f5601 100644 --- a/asoft_presenter/kansasfest_2018/TODO +++ b/asoft_presenter/kansasfest_2018/TODO @@ -1,9 +1,2 @@ -HGR Slides: -+ Kerbal Screenshot? -+ Portal Screenshot? - -GR display slides -+ Mode7 -+ TFV Ability to print quotes? diff --git a/asoft_presenter/kansasfest_2018/info b/asoft_presenter/kansasfest_2018/info index c5e862b0..989bbc6b 100644 --- a/asoft_presenter/kansasfest_2018/info +++ b/asoft_presenter/kansasfest_2018/info @@ -16,18 +16,19 @@ slide_04_early slide_05_later slide_06_college slide_07_tb1_gr -slide_07_tb1 -slide_08_presentation -slide_09_asoft_games -slide_09_ksp -slide_09_portal -slide_10_mockingboard -slide_11_busy_times -slide_12_chiptune_gr -slide_12_chiptune -slide_13_mode7 -slide14_other_demos -slide15_vaporlock -slide16_tfv -slide_31_questions +slide_08_tb1 +slide_09_presentation +slide_10_applesoft +slide_11_ksp +slide_12_portal +slide_13_mockingboard +slide_14_busy_times +slide_15_chiptune_gr +slide_16_chiptune +slide_17_tfv +slide_18_vaporlock +slide_19_mode7 +slide_20_mode7_demo +slide_21_other_demos +slide_22_questions END_SLIDES diff --git a/asoft_presenter/kansasfest_2018/slide_04_early b/asoft_presenter/kansasfest_2018/slide_04_early index 25f633e3..21b958e4 100644 --- a/asoft_presenter/kansasfest_2018/slide_04_early +++ b/asoft_presenter/kansasfest_2018/slide_04_early @@ -12,4 +12,4 @@ from library books, 3-2-1 contact * I have disks full of half-baked - BASIC programs (vince.dsk) + BASIC programs (old.dsk) diff --git a/asoft_presenter/kansasfest_2018/slide_07_tb1 b/asoft_presenter/kansasfest_2018/slide_08_tb1 similarity index 88% rename from asoft_presenter/kansasfest_2018/slide_07_tb1 rename to asoft_presenter/kansasfest_2018/slide_08_tb1 index 6f6655d8..4208616c 100644 --- a/asoft_presenter/kansasfest_2018/slide_07_tb1 +++ b/asoft_presenter/kansasfest_2018/slide_08_tb1 @@ -7,7 +7,7 @@ * Part of a 1k game challenge. Did not get full version in 1k. - Atari 2600 said graphcis 'blocky' + Atari 2600 said graphics 'blocky' * Started my dos33fsutils. Linux dos33 filesystem driver diff --git a/asoft_presenter/kansasfest_2018/slide_09_asoft_games b/asoft_presenter/kansasfest_2018/slide_09_asoft_games deleted file mode 100644 index 90798428..00000000 --- a/asoft_presenter/kansasfest_2018/slide_09_asoft_games +++ /dev/null @@ -1,9 +0,0 @@ -40COL -%c%Applesoft Games - -* Got inspired by playing some games. - Can I do this on the Apple II? - -* Also did a Uthernet webserver in - BASIC. Worked well, but memory - copy slow if not done in 6502 diff --git a/asoft_presenter/kansasfest_2018/slide_08_presentation b/asoft_presenter/kansasfest_2018/slide_09_presentation similarity index 70% rename from asoft_presenter/kansasfest_2018/slide_08_presentation rename to asoft_presenter/kansasfest_2018/slide_09_presentation index 5c11319f..cec61fcd 100644 --- a/asoft_presenter/kansasfest_2018/slide_08_presentation +++ b/asoft_presenter/kansasfest_2018/slide_09_presentation @@ -1,10 +1,13 @@ 40COL %c%Asoft Presenter -* SW I'm using here - * In 2012 co-worker presented w/ iPad Thought I could do better, used A2 Wrote code to auto-generate BASIC +* Beginning of projects on + Hackaday + +* Software I'm using here + * Went mildly viral diff --git a/asoft_presenter/kansasfest_2018/slide_10_applesoft b/asoft_presenter/kansasfest_2018/slide_10_applesoft new file mode 100644 index 00000000..258a34e6 --- /dev/null +++ b/asoft_presenter/kansasfest_2018/slide_10_applesoft @@ -0,0 +1,13 @@ +40COL +%c%Anachronistic Applesoft + +* Started porting modern things + to Applesoft BASIC + +* Wrote a Uthernet webserver in + BASIC + +* Worked well, but memory + copy slow if not done in 6502 asm + +* Doesn't make for an exciting demo diff --git a/asoft_presenter/kansasfest_2018/slide_11_ksp b/asoft_presenter/kansasfest_2018/slide_11_ksp new file mode 100644 index 00000000..e4533844 --- /dev/null +++ b/asoft_presenter/kansasfest_2018/slide_11_ksp @@ -0,0 +1,5 @@ +HGR +KSP_TITLE.HGR +%c%Kerbal Space Program +%c%Surprisingly easy (for 2D) +%c%ATAN bug in tokenizer diff --git a/asoft_presenter/kansasfest_2018/slide_12_portal b/asoft_presenter/kansasfest_2018/slide_12_portal new file mode 100644 index 00000000..3b8ea3e2 --- /dev/null +++ b/asoft_presenter/kansasfest_2018/slide_12_portal @@ -0,0 +1,5 @@ +HGR +PORTAL.HGR +%c%Portal (the Valve one) +%c%15-minutes of internet fame +%c%Music quality drove me to AY-3-8910 diff --git a/asoft_presenter/kansasfest_2018/slide_10_mockingboard b/asoft_presenter/kansasfest_2018/slide_13_mockingboard similarity index 100% rename from asoft_presenter/kansasfest_2018/slide_10_mockingboard rename to asoft_presenter/kansasfest_2018/slide_13_mockingboard diff --git a/asoft_presenter/kansasfest_2018/slide_11_busy_times b/asoft_presenter/kansasfest_2018/slide_14_busy_times similarity index 58% rename from asoft_presenter/kansasfest_2018/slide_11_busy_times rename to asoft_presenter/kansasfest_2018/slide_14_busy_times index 660d8c81..7ca317ce 100644 --- a/asoft_presenter/kansasfest_2018/slide_11_busy_times +++ b/asoft_presenter/kansasfest_2018/slide_14_busy_times @@ -3,7 +3,4 @@ * I find 6502 coding relaxing -* Started on nosalgic Talbot - Fantasy 7 game - diff --git a/asoft_presenter/kansasfest_2018/slide_12_chiptune_gr b/asoft_presenter/kansasfest_2018/slide_15_chiptune_gr similarity index 100% rename from asoft_presenter/kansasfest_2018/slide_12_chiptune_gr rename to asoft_presenter/kansasfest_2018/slide_15_chiptune_gr diff --git a/asoft_presenter/kansasfest_2018/slide_12_chiptune b/asoft_presenter/kansasfest_2018/slide_16_chiptune similarity index 82% rename from asoft_presenter/kansasfest_2018/slide_12_chiptune rename to asoft_presenter/kansasfest_2018/slide_16_chiptune index e11cc802..fd30fc56 100644 --- a/asoft_presenter/kansasfest_2018/slide_12_chiptune +++ b/asoft_presenter/kansasfest_2018/slide_16_chiptune @@ -7,6 +7,8 @@ on a 140k floppy, 48k RAM * Secret is LZ4 (thanks qkumba) + Load compressed from disk + Uncompress in chunks while playing * Still bothersome sound quality issues I have not resolved. @@ -15,5 +17,3 @@ the emulators aren't being faithful. * Drives me nuts - -* Demo it? diff --git a/asoft_presenter/kansasfest_2018/slide16_tfv b/asoft_presenter/kansasfest_2018/slide_17_tfv similarity index 97% rename from asoft_presenter/kansasfest_2018/slide16_tfv rename to asoft_presenter/kansasfest_2018/slide_17_tfv index ee10a493..b9214c0d 100644 --- a/asoft_presenter/kansasfest_2018/slide16_tfv +++ b/asoft_presenter/kansasfest_2018/slide_17_tfv @@ -16,5 +16,3 @@ * Going to be a challenge to fit in 48, with music. Load from disk? own complications - -* Demo diff --git a/asoft_presenter/kansasfest_2018/slide_18_vaporlock b/asoft_presenter/kansasfest_2018/slide_18_vaporlock new file mode 100644 index 00000000..ef8a85e2 --- /dev/null +++ b/asoft_presenter/kansasfest_2018/slide_18_vaporlock @@ -0,0 +1,13 @@ +40COL +%c%Credits from TF7 + +* Cycle-couting, multi-mode + Vapor lock + +* Loop invariant code + +* One of trickiest things I've + done (that worked as designed) + ARMv7 cache code is harder + + (demo) diff --git a/asoft_presenter/kansasfest_2018/slide_13_mode7 b/asoft_presenter/kansasfest_2018/slide_20_mode7_demo similarity index 76% rename from asoft_presenter/kansasfest_2018/slide_13_mode7 rename to asoft_presenter/kansasfest_2018/slide_20_mode7_demo index 01bee16e..39be55d7 100644 --- a/asoft_presenter/kansasfest_2018/slide_13_mode7 +++ b/asoft_presenter/kansasfest_2018/slide_20_mode7_demo @@ -9,8 +9,9 @@ * Turned into a Demoscene Demo +* So of course had to add + rasterbars, starfield, greets, etc. + * Also a PoC||GTFO paper * (run the demo) - - diff --git a/asoft_presenter/kansasfest_2018/slide_21_other_demos b/asoft_presenter/kansasfest_2018/slide_21_other_demos new file mode 100644 index 00000000..bfa186ba --- /dev/null +++ b/asoft_presenter/kansasfest_2018/slide_21_other_demos @@ -0,0 +1,5 @@ +HGR +ENTROPY.HGR +%c%128B Entropy demo +%c%Based on BASIC 2-liner from +%c%Beagle Bros Disk diff --git a/asoft_presenter/kansasfest_2018/slide_31_questions b/asoft_presenter/kansasfest_2018/slide_22_questions similarity index 100% rename from asoft_presenter/kansasfest_2018/slide_31_questions rename to asoft_presenter/kansasfest_2018/slide_22_questions