Merge pull request #9 from GadgetFactory/work-0200

Release 2.0.2

Author: alvieboy

build/shared/revisions.txt

@@ -1,4 +1,15 @@
 
+ZAP 2.0.2 BETA - 2013.06.05
+
+[zpuino]
+* Fix for bootloader issue introduced in 2.0.1
+* Fix for VGALiquidCrystal library
+
+ZAP 2.0.1 BETA - 2013.06.04
+
+[zpuino]
+* Fix for missing Hyperion board type from VGA.h
+
 ZAP 2.0.0 BETA - 2013.06.04
 
 [zpuino]

hardware/zpuino/zpu/boards.txt

@@ -45,7 +45,7 @@ zpuino_s3e_eval_v.build.toolchain=zpu
 zpuino_s3e_eval_v.build.extra_flags=-D__ZPUINO_S3E_EVAL__ -DCLK_FREQ=92000000 -DBOARD_MEMORYSIZE=0x4000 -DBOARD_ID=0x83010E01 -nostartfiles 
 zpuino_s3e_eval_v.build.extraSflags=-DBOARD_ID=0x83010E01
 ##############################################################
-zpuino_papilio_one250.name=ZPUino on Papilio One (250) board
+zpuino_papilio_one250.name=ZPUino on Papilio One (250) board, Vanilla Variant
 zpuino_papilio_one250.boardid=0xA4020E00
 zpuino_papilio_one250.upload.protocol=zpuino-serial
 zpuino_papilio_one250.upload.maximum_size=12160
@@ -60,26 +60,9 @@ zpuino_papilio_one250.build.toolchain=zpu
 zpuino_papilio_one250.build.extra_flags=-D__ZPUINO_PAPILIO_ONE__ -DBOARD_ID=0xA4020E00 -DBOARD_MEMORYSIZE=0x4000 -D__S3E_250__ -nostartfiles
 zpuino_papilio_one250.build.extraSflags=-DBOARD_ID=0xA4020E00
 zpuino_papilio_one250.bootloader.tool=papilioprog
-zpuino_papilio_one250.bootloader.file=p1_250k/zpuino-1.0-PapilioOne-S3E250.bit
+zpuino_papilio_one250.bootloader.file=p1_250k/zpuino-1.0-PapilioOne-S3E250-Vanilla-1.0.bit
 ##############################################################
-zpuino_papilio_one250_e.name=ZPUino on Papilio One (250) board (extra RAM)
-zpuino_papilio_one250_e.boardid=0xA4020F00
-zpuino_papilio_one250_e.upload.protocol=zpuino-serial
-zpuino_papilio_one250_e.upload.maximum_size=16256
-zpuino_papilio_one250_e.upload.size_sections=all
-zpuino_papilio_one250_e.upload.speed=1000000
-zpuino_papilio_one250_e.upload.tool=zpuinoprogrammer
-zpuino_papilio_one250_e.build.f_cpu=96000000L
-zpuino_papilio_one250_e.build.core=zpuino
-zpuino_papilio_one250_e.build.mcu=zpu
-zpuino_papilio_one250_e.build.pins=standard
-zpuino_papilio_one250_e.build.toolchain=zpu
-zpuino_papilio_one250_e.build.extra_flags=-D__ZPUINO_PAPILIO_ONE__ -DBOARD_ID=0xA4020F00 -DBOARD_MEMORYSIZE=0x4000 -D__S3E_250__ -nostartfiles
-zpuino_papilio_one250_e.build.extraSflags=-DBOARD_ID=0xA4020F00
-zpuino_papilio_one250_e.bootloader.tool=papilioprog
-zpuino_papilio_one250_e.bootloader.file=p1_250k/zpuino-1.0-PapilioOne-S3E250.bit
-##############################################################
-zpuino_papilio_one500.name=ZPUino on Papilio One (500) board
+zpuino_papilio_one500.name=ZPUino on Papilio One (500) board, Vanilla Variant
 zpuino_papilio_one500.boardid=0xA4010F00
 zpuino_papilio_one500.upload.protocol=zpuino-serial
 zpuino_papilio_one500.upload.maximum_size=27648
@@ -95,7 +78,7 @@ zpuino_papilio_one500.build.toolchain=zpu
 zpuino_papilio_one500.build.extra_flags=-D__ZPUINO_PAPILIO_ONE__ -DBOARD_ID=0xA4010F00 -DBOARD_MEMORYSIZE=0x8000 -D__S3E_500__ -nostartfiles
 zpuino_papilio_one500.build.extraSflags=-DBOARD_ID=0xA4010F00
 zpuino_papilio_one500.bootloader.tool=papilioprog
-zpuino_papilio_one500.bootloader.file=p1_500k/zpuino-1.0-PapilioOne-S3E500.bit
+zpuino_papilio_one500.bootloader.file=p1_500k/zpuino-1.0-PapilioOne-S3E500-Vanilla-1.0.bit
 ##############################################################
 zpuino_papilio_one500vam.name=ZPUino on Papilio One (500) board, Hyperion with 8-bit HQVGA on Arcade MegaWing
 zpuino_papilio_one500vam.boardid=0xA4010E01
@@ -148,6 +131,22 @@ zpuino_papilio_one500vps.build.extraSflags=-DBOARD_ID=0xA4010E01
 zpuino_papilio_one500vps.bootloader.tool=papilioprog
 zpuino_papilio_one500vps.bootloader.file=p1_500k/zpuino-1.0-PapilioOne-S3E500-Hyperion-HQVGA-PinSelect.bit
 ##############################################################
+zpuino_papilio_prolx9van.name=ZPUino on Papilio Pro (LX9), Vanilla Variant
+zpuino_papilio_prolx9van.boardid=0xA4041700
+zpuino_papilio_prolx9van.upload.protocol=zpuino-serial
+zpuino_papilio_prolx9van.upload.maximum_size=8388608
+zpuino_papilio_prolx9van.upload.size_sections=all
+zpuino_papilio_prolx9van.upload.speed=1000000
+zpuino_papilio_prolx9van.upload.tool=zpuinoprogrammer
+zpuino_papilio_prolx9van.build.f_cpu=96000000L
+zpuino_papilio_prolx9van.build.core=zpuino
+zpuino_papilio_prolx9van.build.mcu=zpu
+zpuino_papilio_prolx9van.build.toolchain=zpu
+zpuino_papilio_prolx9van.build.extra_flags=-D__ZPUINO_PAPILIO_PRO__ -DBOARD_ID=0xA4041700 -DBOARD_MEMORYSIZE=0x800000 -nostartfiles
+zpuino_papilio_prolx9van.build.extraSflags=-DBOARD_ID=0xA4041700
+zpuino_papilio_prolx9van.bootloader.tool=papilioprog
+zpuino_papilio_prolx9van.bootloader.file=lx9/zpuino-1.0-PapilioPro-S6LX9-Vanilla-1.0.bit
+##############################################################
 zpuino_papilio_prolx9vam.name=ZPUino on Papilio Pro (LX9), Hyperion with 8-bit HQVGA on Arcade MegaWing
 zpuino_papilio_prolx9vam.boardid=0xA4041700
 zpuino_papilio_prolx9vam.upload.protocol=zpuino-serial

hardware/zpuino/zpu/bootloaders/lx9/zpuino-1.0-PapilioPro-S6LX9-Vanilla-1.0.bit

@@ -6,6 +6,7 @@
 #include "zpuino.h"
 
 #if ( (BOARD_ID == 0xA4010E01) || \
+	  (BOARD_ID == 0xA4041700) || \ 
      (BOARD_ID == 0x83010E01) )
 
 #define VGABASE IO_SLOT(9)

hardware/zpuino/zpu/bootloaders/p1_250k/zpuino-1.0-PapilioOne-S3E250-Vanilla-1.0.bit

@@ -407,7 +407,7 @@ void VGALiquidCrystal::updateDisplay() {
 
 
 
-void VGALiquidCrystal::write(uint8_t value) {
+size_t VGALiquidCrystal::write(uint8_t value) {
 	ddram[AC] = value;
 	if(scrool_on){
 		shiftChars += increment;
@@ -445,6 +445,7 @@ void VGALiquidCrystal::write(uint8_t value) {
 	if (vmem_offset > sizeof(vmem))
 	vmem_offset=0;
     */
+	return 1;
 }
 
 unsigned char VGALiquidCrystal::chrtbl[2048] = {

hardware/zpuino/zpu/bootloaders/p1_250k/zpuino-1.0-PapilioOne-S3E250.bit

@@ -45,7 +45,7 @@ class VGALiquidCrystal : public Print {
 
   void createChar(uint8_t, uint8_t[]);
   void setCursor(uint8_t, uint8_t); 
-  virtual void write(uint8_t);
+  virtual size_t write(uint8_t);
   void command(uint8_t);
 
   void blinkUpdate(int);