Merge pull request #55 from brad-colbert/atract_mode_redo_two

v1.2.18: Atract mode redo two

server/yailsrv.py

@@ -25,6 +25,7 @@
 
 bind_ip = '0.0.0.0'
 bind_port = 5556
+connections = 0
 
 server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 server.bind((bind_ip, bind_port))
@@ -299,6 +300,10 @@ def handle_client_connection(client_socket):
  # Set up a new event loop for this thread
  #loop = asyncio.new_event_loop()
  #asyncio.set_event_loop(loop)
+ global connections
+
+ connections = connections + 1
+ print('Starting Connection:', connections)
 
  gfx_mode = GRAPHICS_9
  try:
@@ -357,6 +362,9 @@ def handle_client_connection(client_socket):
 
  finally:
  client_socket.close()
+ print('Closing Connection:', connections)
+ connections = connections - 1
+
  #loop.close() # Close the loop when done
 
 import signal
@@ -367,7 +375,7 @@ def handler(signum, frame):
 signal.signal(signal.SIGINT, handler)
 
 def main():
- threads = []
+ #threads = []
  while True:
  client_sock, address = server.accept()
  print('Accepted connection from {}:{}'.format(address[0], address[1]))
@@ -377,8 +385,8 @@ def main():
  )
  client_handler.daemon = True
  client_handler.start()
- threads.append(client_handler)
- print('Connections:', len(threads))
+ #threads.append(client_handler)
+ #print('Connections:', len(threads))
  '''
  try:
  except KeyboardInterrupt:

src/disable_atract_vbi.s

@@ -1,9 +1,9 @@
 ;; Simple VBI routine to disable the attract mode
 
 .export _add_attract_disable_vbi
-.export disable_atract
+.export _remove_attract_disable_vbi
 
-.segment "DATA"
+.import _ORIG_VBII_SAVE
 
 .segment "CODE"
 
@@ -14,7 +14,7 @@ SYSVBV = $E45F
 ATRACT = $4D
 
 ; Disable ATRACT mode by setting the "register" to zero
-.PROC disable_atract
+.PROC disable_attract
  pha
  lda #0
  sta ATRACT
@@ -25,8 +25,17 @@ ATRACT = $4D
 _add_attract_disable_vbi:
 
  lda #6 ; Immediate mode
- ldy #<disable_atract ; hight byte of address
- ldx #>disable_atract ; low byte of address
+ ldy #<disable_attract ; high byte of address
+ ldx #>disable_attract ; low byte of address
+ jsr SETVBV
+
+ rts
+
+_remove_attract_disable_vbi:
+
+ lda #6 ; Immediate mode
+ ldy _ORIG_VBII_SAVE ; high byte of address
+ ldx _ORIG_VBII_SAVE+1 ; low byte of address
  jsr SETVBV
 
  rts

src/imgload.c

@@ -21,6 +21,7 @@ char version[] = "YAIL (Yet Another Image Loader) v" TOSTR(MAJOR_VERSION) "." TO
 byte buff[256]; // A block of memory to be used by all.
 bool done = false;
 extern Settings settings;
+extern ushort ORIG_VBII_SAVE;
 
 void help()
 {
@@ -80,6 +81,7 @@ int main(int argc, char* argv[])
  clearFrameBuffer();
 
  // Stop the attract mode
+ ORIG_VBII_SAVE = OS.vvblki;
  add_attract_disable_vbi();
 
  // Show console on startup

src/netimage.c

@@ -26,7 +26,6 @@ void show_error_and_close_network(const char* message)
 
 char stream_image(char* args[])
 {
- byte ATRACT_MODE_SAVE = OS.atract;
  const ushort bytes_per_line = 40;
  const ushort lines = 220;
  ushort buffer_start;
@@ -122,6 +121,10 @@ char stream_image(char* args[])
  return 0x0;
  }
 
+ // We are starting streaming so remove the attract mode disbale VBI becasue we will
+ // diable attract mode ourselves.
+ remove_attract_disable_vbi();
+
  while(true)
  {
  buffer_start = (ushort)image.data;
@@ -202,7 +205,9 @@ char stream_image(char* args[])
  network_close(settings.url);
 
  OS.soundr = 3; // Restore SIO beeping sound
- OS.atract = ATRACT_MODE_SAVE;
+
+ // We are no longer streaming so disable attract mode with a VBI
+ add_attract_disable_vbi();
 
  return input;
 }

src/settings.c

@@ -110,8 +110,11 @@ uint8_t put_settings(byte select)
  {
  byte keylen = strlen(settings.url);
 
- if (0 == sio_openkey(&data, 1, FN_URL_KEY_ID))
+ r = sio_openkey(&data, 1, FN_URL_KEY_ID);
+
+ if (1 == r)
  return 1;
+
  strncpy((char *)data.write.value, settings.url, MAX_APPKEY_LEN);
  r = fn_io_appkey_write(keylen, &data.write);
 
@@ -121,8 +124,11 @@ uint8_t put_settings(byte select)
  break;
  case SETTINGS_GFX:
  {
- if (0 == sio_openkey(&data, 1, FN_GFX_KEY_ID))
+ r = sio_openkey(&data, 1, FN_GFX_KEY_ID);
+
+ if (1 == r)
  return 1;
+
  data.write.value[0] = settings.gfx_mode & ~GRAPHICS_CONSOLE_EN; // Don't capture the console bit
  r = fn_io_appkey_write(1, &data.write);
 

src/utility.c

@@ -6,6 +6,10 @@
 
 #include <conio.h>
 #include <stdbool.h>
+#include <atari.h>
+
+// Globals
+ushort ORIG_VBII_SAVE;// = OS.vvblki;
 
 void pause(const char* message)
 {

src/utility.h

@@ -13,5 +13,6 @@ void internal_to_atascii(char* buff, byte len);
 void atascii_to_internal(char* buff, byte len);
 void show_error(const char* message);
 extern void add_attract_disable_vbi();
+extern void remove_attract_disable_vbi();
 
 #endif

src/version.h

@@ -5,6 +5,6 @@
 
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 2
-#define BUILD_VERSION 17
+#define BUILD_VERSION 18
 
 #endif // YAIL_VERSION_H