Changeset 068b1fa in thomson

Timestamp:

Mar 17, 2014, 10:51:11 AM (10 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

05f2b4a

Parents:

87bafa6

Message:

gfx2mo5: make TO mode a run-time option

• Use getopt for parsing option.
• The "MO5 gate array fixup" is now option -f
• The "TO modeis now option -t

git-svn-id: ​svn://localhost/thomson@49 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

Location:

tools/gfx2mo5

Files:

• libraw2mo5.c (modified) (3 diffs)
• libraw2mo5.h (modified) (1 diff)
• png2mo5.c (modified) (4 diffs)

tools/gfx2mo5/libraw2mo5.c

@@ -7 +7 @@
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-unsigned char *raw2mo5(unsigned char *input, int height, int fixup)
+unsigned char *raw2mo5(unsigned char *input, int height, int fixup, bool to)
 {
   unsigned char *tmpBuffer;
   int x,y;
   int previous = 0;
+  bool lfo = false;
+  uint8_t val;
 
   tmpBuffer = (unsigned char*)calloc(0x4000,1);
@@ -25 +28 @@
         #define width 320
 
-  bool lfo = false;
   for (y = 0; y < height; y++)
         for (x = 0; x < 320; x+=8) {
@@ -71 +73 @@
                 // are both FORME or both FOND, else we get an ugly glitch on the
                 // EFGJ033 Gate Array MO5!
-                if(fixup > 0 && oldlfo == !(tmpBuffer[(y*320+x)/8] & 0x80))
+                val = tmpBuffer[(y*320+x)/8];
+                if(fixup > 0 && ((oldlfo == !(val & 0x80) && val != 0) || val == 0xFF))
                 {
-                        previous = (previous >> 4) | (previous << 4);
+                        previous = 7 | (previous << 4);
                         tmpBuffer[(y*320+x)/8] ^= 0xFF;
 
                         lfo = !lfo;
+                }
+
+                // TO8 mode
+                if(to)
+                {
+                        previous = (previous & 0x7) | ((previous & 0xF0) >> 1) | ((previous & 0x8) << 4);
+                        previous ^= 0xC0;
                 }
 

tools/gfx2mo5/libraw2mo5.h

@@ -10 +10 @@
 #define LIBRAW2mo5_H 1
 
-unsigned char * raw2mo5(unsigned char *input, int height, int fixup);
+unsigned char * raw2mo5(unsigned char *input, int height, int fixup, bool to);
 
 #endif

tools/gfx2mo5/png2mo5.c

@@ -1 +1 @@
 /* GFX2mo5 - png2mo5.c
  * CloudStrife - 20080921
+ * PulkoMandy - 2012-2014
  * Diffusé sous licence libre CeCILL v2
  * Voir LICENCE
  */
 
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -33 +35 @@
 
   png_bytep * ptrRow;
+  int pxsize;
+
+  char opt;
+  int fixup = -1;
+  bool to = false;
+
   unsigned char thomheader[] = {
         // Block 1 : address A7C0, 1 byte, select FORME
@@ -46 +54 @@
   if(argc < 3) 
   {
-    printf("Utilisation : %s input_filename output_filename options\n",argv[0]);
+    printf("Utilisation : %s [options] input_filename output_filename\n",argv[0]);
     exit(0);
   }
 
-  inFile = fopen(argv[1],"rb");
+  while((opt = getopt(argc, argv, "tf:")) != -1) {
+    switch(opt) {
+      case 't':
+                  to = true;
+                  thomheader[3] = 0xE7;
+                  thomheader[4] = 0xC3;
+                  thomheader[5] = 0x65;
+                  thomheader[9] = 0x40;
+                  break;
+          case 'f':
+                  fixup = atoi(optarg);
+                  break;
+        }
+  }
+
+  inFile = fopen(argv[optind++],"rb");
 
   if (inFile == NULL)
@@ -127 +150 @@
   png_read_image(png_ptr, ptrRow);
 
-  outBuffer = raw2mo5(inBuffer, height, argc > 3 ? atoi(argv[3]):-1);
+  outBuffer = raw2mo5(inBuffer, height, fixup, to);
 
-  int pxsize = width * height / 8;
+  pxsize = width * height / 8;
   thomheader[7] = pxsize >> 8;
   thomheader[8] = pxsize;
 
-  outFile = fopen(argv[2], "wb");
+  outFile = fopen(argv[optind++], "wb");
   fwrite(thomheader, 1, sizeof(thomheader), outFile);
   //write forme data
   fwrite(outBuffer, 1, pxsize, outFile);
-  thomheader[5] = 0x50;
+  --thomheader[5];
   fwrite(thomheader, 1, sizeof(thomheader), outFile);
   // write color data