Version 8.8 (#232)

Version 8.8

.gitignore

@@ -44,8 +44,9 @@ relocation_table
 # executables
 *.hex
 *.8xv
+*.8xg
 *.8xp
-!*var_gfx.8xv
+!*vargfx.8xv
 
 # debug files
 *.dSYM/

.gitmodules

@@ -1,15 +1,12 @@
-[submodule "src/tools/convhex"]
-	path = tools/convhex
-	url = https://github.com/mateoconlechuga/convhex
-[submodule "src/tools/convpng"]
-	path = tools/convpng
-	url = https://github.com/mateoconlechuga/convpng
-[submodule "tools/convcsv"]
-	path = tools/convcsv
-	url = https://github.com/mateoconlechuga/convcsv.git
 [submodule "tools/fasmg/fasmg-ez80"]
 	path = tools/fasmg/fasmg-ez80
 	url = https://github.com/jacobly0/fasmg-ez80.git
 [submodule "tools/convfont"]
 	path = tools/convfont
 	url = https://github.com/drdnar/convfont.git
+[submodule "tools/convbin"]
+	path = tools/convbin
+	url = https://github.com/mateoconlechuga/convbin.git
+[submodule "tools/convimg"]
+	path = tools/convimg
+	url = https://github.com/mateoconlechuga/convimg.git

.travis.yml

@@ -29,7 +29,7 @@ script:
   - curl -s https://tiplanet.org/scripts/travis/$ROM_FILE_NAME 2>/dev/null > $ROM_FILE_NAME
   - export AUTOTESTER_ROM=$(pwd)/$ROM_FILE_NAME
 # Test toolchain examples
-  - RESULT=0; for f in $CEDEV/examples/*/*.json; do echo "Launching autotester on $f"; autotester "$f"; RESULT=`expr $RESULT + $?`; done; return $RESULT
+  - RESULT=0; for f in $CEDEV/examples/*/*/*.json; do echo "Launching autotester on $f"; autotester "$f"; RESULT=`expr $RESULT + $?`; done; return $RESULT
 
 after_success:
 # Update the funcs_tested file (WIP)

changelog.md

@@ -2,7 +2,23 @@
 
 ## [Unreleased](https://github.com/CE-Programming/toolchain/tree/HEAD)
 
-[Full commit list](https://github.com/CE-Programming/toolchain/compare/v8.7...HEAD)
+[Full commit list](https://github.com/CE-Programming/toolchain/compare/v8.8...HEAD)
+
+
+# [v8.8](https://github.com/CE-Programming/toolchain/releases/tag/v8.8) (2020-01-??)
+
+ - Documentation fixes and headers cleanup
+ - Fix `gfx_TilePtr` and `gfx_TilePtrMapped`
+ - Expose more OS functions (see `tice.h`)
+ - Add LCD cursor defines
+ - MMIO defines are all volatile
+ - Submodules update
+ - "development library" generation
+ - Examples folders hierarchy improved
+ - Prepare makefile for future changes
+ - Fix warnings
+
+[Full commit list](https://github.com/CE-Programming/toolchain/compare/v8.7...v8.8)
 
 # [v8.7](https://github.com/CE-Programming/toolchain/releases/tag/v8.7) (2019-08-25)
 

examples/combined/appvar_tilemap/makefile

@@ -0,0 +1,20 @@
+# ----------------------------
+# Program Options
+# ----------------------------
+
+NAME         ?= DEMO
+ICON         ?= icon.png
+DESCRIPTION  ?= "CE C SDK Demo"
+COMPRESSED   ?= NO
+ARCHIVED     ?= NO
+
+# ----------------------------
+# Debug Options
+# ----------------------------
+
+OUTPUT_MAP   ?= NO
+
+include $(CEDEV)/include/.makefile
+
+tilemap: src/tilemap/tilemap.csv
+	cd src && cd tilemap && convbin --iformat csv -i tilemap.csv -o tilemap.c --oformat c --name tilemap_map

examples/combined/appvar_tilemap/readme.md

@@ -0,0 +1,7 @@
+### Tilemap Appvar Demo
+
+Demonstrates storage of a tileset in an appvar.
+
+---
+
+This demo is part of the CE C SDK Toolchain.

examples/combined/appvar_tilemap/src/gfx/convimg.yaml

@@ -0,0 +1,18 @@
+output: appvar
+  name: vargfx
+  source-format: c
+  include-file: vargfx.h
+  palettes:
+    - global_palette
+  converts:
+    - tileset
+
+palette: global_palette
+  fixed-color: {index:0, r:255, g:255, b:255}
+  fixed-color: {index:1, r:255, g:216, b:0}
+  images: automatic
+
+convert: tileset
+  palette: global_palette
+  tilesets: {tile-width:16, tile-height:16}
+    - tileset.png

examples/combined/appvar_tilemap/src/gfx/vargfx.c

@@ -0,0 +1,171 @@
+#include "vargfx.h"
+#include <fileioc.h>
+
+unsigned char *vargfx_appvar[2] =
+{
+    (unsigned char*)0,
+    (unsigned char*)154,
+};
+
+unsigned char *tileset_tiles_data[128] =
+{
+    (unsigned char*)0,
+    (unsigned char*)258,
+    (unsigned char*)516,
+    (unsigned char*)774,
+    (unsigned char*)1032,
+    (unsigned char*)1290,
+    (unsigned char*)1548,
+    (unsigned char*)1806,
+    (unsigned char*)2064,
+    (unsigned char*)2322,
+    (unsigned char*)2580,
+    (unsigned char*)2838,
+    (unsigned char*)3096,
+    (unsigned char*)3354,
+    (unsigned char*)3612,
+    (unsigned char*)3870,
+    (unsigned char*)4128,
+    (unsigned char*)4386,
+    (unsigned char*)4644,
+    (unsigned char*)4902,
+    (unsigned char*)5160,
+    (unsigned char*)5418,
+    (unsigned char*)5676,
+    (unsigned char*)5934,
+    (unsigned char*)6192,
+    (unsigned char*)6450,
+    (unsigned char*)6708,
+    (unsigned char*)6966,
+    (unsigned char*)7224,
+    (unsigned char*)7482,
+    (unsigned char*)7740,
+    (unsigned char*)7998,
+    (unsigned char*)8256,
+    (unsigned char*)8514,
+    (unsigned char*)8772,
+    (unsigned char*)9030,
+    (unsigned char*)9288,
+    (unsigned char*)9546,
+    (unsigned char*)9804,
+    (unsigned char*)10062,
+    (unsigned char*)10320,
+    (unsigned char*)10578,
+    (unsigned char*)10836,
+    (unsigned char*)11094,
+    (unsigned char*)11352,
+    (unsigned char*)11610,
+    (unsigned char*)11868,
+    (unsigned char*)12126,
+    (unsigned char*)12384,
+    (unsigned char*)12642,
+    (unsigned char*)12900,
+    (unsigned char*)13158,
+    (unsigned char*)13416,
+    (unsigned char*)13674,
+    (unsigned char*)13932,
+    (unsigned char*)14190,
+    (unsigned char*)14448,
+    (unsigned char*)14706,
+    (unsigned char*)14964,
+    (unsigned char*)15222,
+    (unsigned char*)15480,
+    (unsigned char*)15738,
+    (unsigned char*)15996,
+    (unsigned char*)16254,
+    (unsigned char*)16512,
+    (unsigned char*)16770,
+    (unsigned char*)17028,
+    (unsigned char*)17286,
+    (unsigned char*)17544,
+    (unsigned char*)17802,
+    (unsigned char*)18060,
+    (unsigned char*)18318,
+    (unsigned char*)18576,
+    (unsigned char*)18834,
+    (unsigned char*)19092,
+    (unsigned char*)19350,
+    (unsigned char*)19608,
+    (unsigned char*)19866,
+    (unsigned char*)20124,
+    (unsigned char*)20382,
+    (unsigned char*)20640,
+    (unsigned char*)20898,
+    (unsigned char*)21156,
+    (unsigned char*)21414,
+    (unsigned char*)21672,
+    (unsigned char*)21930,
+    (unsigned char*)22188,
+    (unsigned char*)22446,
+    (unsigned char*)22704,
+    (unsigned char*)22962,
+    (unsigned char*)23220,
+    (unsigned char*)23478,
+    (unsigned char*)23736,
+    (unsigned char*)23994,
+    (unsigned char*)24252,
+    (unsigned char*)24510,
+    (unsigned char*)24768,
+    (unsigned char*)25026,
+    (unsigned char*)25284,
+    (unsigned char*)25542,
+    (unsigned char*)25800,
+    (unsigned char*)26058,
+    (unsigned char*)26316,
+    (unsigned char*)26574,
+    (unsigned char*)26832,
+    (unsigned char*)27090,
+    (unsigned char*)27348,
+    (unsigned char*)27606,
+    (unsigned char*)27864,
+    (unsigned char*)28122,
+    (unsigned char*)28380,
+    (unsigned char*)28638,
+    (unsigned char*)28896,
+    (unsigned char*)29154,
+    (unsigned char*)29412,
+    (unsigned char*)29670,
+    (unsigned char*)29928,
+    (unsigned char*)30186,
+    (unsigned char*)30444,
+    (unsigned char*)30702,
+    (unsigned char*)30960,
+    (unsigned char*)31218,
+    (unsigned char*)31476,
+    (unsigned char*)31734,
+    (unsigned char*)31992,
+    (unsigned char*)32250,
+    (unsigned char*)32508,
+    (unsigned char*)32766,
+};
+
+unsigned char vargfx_init(void)
+{
+    unsigned int data, i;
+    ti_var_t appvar;
+
+    ti_CloseAll();
+
+    appvar = ti_Open("vargfx", "r");
+    if (appvar == 0)
+    {
+        return 0;
+    }
+
+    data = (unsigned int)ti_GetDataPtr(appvar) - (unsigned int)vargfx_appvar[0];
+    for (i = 0; i < 2; i++)
+    {
+        vargfx_appvar[i] += data;
+    }
+
+    ti_CloseAll();
+
+    data = (unsigned int)vargfx_appvar[1] - (unsigned int)tileset_tiles_data[0];
+    for (i = 0; i < tileset_tiles_num; i++)
+    {
+        tileset_tiles_data[i] += data;
+    }
+
+    return 1;
+}
+

examples/gfx_tilemap_appvar/src/gfx/var_gfx.h → examples/combined/appvar_tilemap/src/gfx/vargfx.h

@@ -1,17 +1,17 @@
-// convpng
-// this file contains all the graphics sources for easy inclusion in a project
-#ifndef __var_gfx__
-#define __var_gfx__
-#include <stdint.h>
+#ifndef vargfx_appvar_include_file
+#define vargfx_appvar_include_file
 
-#include <stdbool.h>
-
-#define var_gfx_num 2
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-extern uint8_t *var_gfx[2];
-#define tileset ((gfx_sprite_t*)var_gfx[0])
+#define sizeof_global_palette 154
+#define global_palette (vargfx_appvar[0])
+#define tileset_tile_width 16
+#define tileset_tile_height 16
+#define tileset vargfx_appvar[1]
 #define tileset_tiles_num 128
-extern uint8_t *tileset_tiles_data[128];
+extern unsigned char *tileset_tiles_data[128];
 #define tileset_tiles ((gfx_sprite_t**)tileset_tiles_data)
 #define tileset_tile_0 ((gfx_sprite_t*)tileset_tiles_data[0])
 #define tileset_tile_1 ((gfx_sprite_t*)tileset_tiles_data[1])
@@ -141,8 +141,11 @@ extern uint8_t *tileset_tiles_data[128];
 #define tileset_tile_125 ((gfx_sprite_t*)tileset_tiles_data[125])
 #define tileset_tile_126 ((gfx_sprite_t*)tileset_tiles_data[126])
 #define tileset_tile_127 ((gfx_sprite_t*)tileset_tiles_data[127])
-#define sizeof_tiles_gfx_pal 152
-#define tiles_gfx_pal ((uint16_t*)var_gfx[1])
-bool var_gfx_init(void);
+extern unsigned char *vargfx_appvar[2];
+unsigned char vargfx_init(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif