A web server for monitoring and controlling a MakerBot Replicator over the USB host and ethernet.

Dependencies:   IAP NTPClient RTC mbed-rtos mbed Socket lwip-sys lwip BurstSPI

Fork of LPC1768_Mini-DK by Frank Vannieuwkerke

Makerbot Server for LPC1768 Copyright (c) 2013, jake (at) allaboutjake (dot) com All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

  • Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
  • Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
  • The name of the author and/or copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, AUTHOR, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Warnings:

This is not a commercial product or a hardened and secure network appliance. It is intended as a thought experiment or proof of concept and should not be relied upon in any way. Always operate your 3D printer in a safe and controlled manner.

Do not connect this directly to the exposed internet. It is intended to be behind a secure firewall (and NAT) such that it will only accept commands from the local network. Imagine how much fun a hacker could have instructing your 3D printer to continually print Standford bunnies. Well it could be much worse then that- a malicious user could send commands that could crash your machine (both in the software sense, as well as in the "smash your moving parts against the side of the machine repeatedly sense), overheat your extruders, cause your build plate to catch fire, and do severe damage to the machine, any surrounding building and propery. You have been warned.

Never print unattended and be ready to step in and stop the machine if something goes wrong. Keep in mind, a 3D printer has heaters that are operating at high temperatures, and if something starts to burn, it could cause damage to the machine, other property, and/or hurt yourself, pets, or others.

You should understand what you are doing. The source code here is not intended as a finished product or set of step by step instructions. You should engineer your own solution, which may wind up being better than mine.

Proceed at your own risk. You've been warned. (Several times) If you break your Makerbot, burn your house down, or injure yourself or others, I take no responsibility.

Introduction

I've been working on a side project to solve the "last mile" problem for people wanting to print from the network on their bots. I feel like the first half of the problem is solved with the FlashAir- getting the files to the card. The next step is a lightweight way of sending the "play back capture" command to the bot.

I looked around for a microcontroller platform that supports both networking and can function as a USB host. I happened to have an mbed (mbed) on hand that fit the bill. The mbed also has a working online toolchain (you need to own an mbed to gain access to the compiler). Some people don't like the online development environment, but I'm a fan of "working" and "Mac compatible." It was a good start, but cost wise, you would need an mbed LPC1768 module and some sort of carrier board that has both USB host and ethernet, or rig up your own connector solution. I happened to also have a Seedstudio mbed shield carrier board. This provides ethernet and USB connectors, but is another $25, putting the solution at around $75.

I also had an LPC1768 development board here called the "Mini-DK2". It has a USB host and a wired ethernet connector on board (search ebay if you're interested). It's a single-board solution that costs only $32 (and for $40 you can get one with a touchscreen) Its the cheapest development board I've seen with both USB host and an ethernet connector. I considered RasPi, but I'm not on that bandwagon. Since I had the Mini-DK2 on hand from another project that never went anywhere, I moved from the mbed module and carrier board to the DK2.

The mbed environment can compile binaries that work on the DK2 (again, you need to own at least one 1768 mbed already to get a license to use the compiler), and the mbed libraries provide some nice features. A USB Host library and and Ethernet library were readily available. The USBHost library didn't quite work out of the box. It took some time and more learning about the USB protocols than I would have liked, but I have the board communicating over the USB Host and the Makerbot.

Changes to stock mbed libraries

Many libraries are imported, but then converted to folders as to unlink them.

mbed provides a USHost library that includes a USBHostSerial object for connecting to CDC serial devices. Unfortunately, it did not work for me out of the box. I spent some time learning about USB protocols. One good reference is [Jan Axelson's Lakeview Research](http://www.lvr.com/usb_virtual_com_port.htm) discussion about CDC.

I found that the stock library was sending the control transfers to Interface 1. From what I understand, the control transfers needed to go to interface 0. I modified the USBHostSerial library to correct this, and the serial port interface came to life.

Next, I found that I wasn't able to get reliable communication. I traced it to what I think is an odd C++ inheritance and override problem. The USBHostSerial class implements the Stream interface, allowing printf/scanf operations. This is done by overriding the virtual _getc and _putc methods. Unfortunately, and for a reason I can't understand, these methods were not being called consistently. Sometimes they would work, but other times they would not. My solution was to implement transmit/receive methods with different names, and since the names were different, they seemed to get called consistently. I'd like to learn exactly what's going on here, but I don't feel like debugging it for academic purposes when it works just fine with the added methods.

Usage

Connect up your chosen dev board to power, ethernet and the USB host to the Makerbot's USB cable. The Mini-DK uses a USB-OTG adapter for the USB host. If you're using a Mini-DK board with an LCD, it will inform you of it's IP address on the display. This means it is now listening for a connection on port 7654.

If you are using an mbed dev board, or a Mini-DK without a display, the message will be directed to the serial console. Connect your computer to the appropriate port at a baud rate of 115200 to see the messages.

Use a telnet client to connect to the given IP address at port 7654. Telnet clients typically revert to "line mode" on ports other than 21. This means you get a local echo and the command isn't sent until you press enter.

Once connected, you can send the following commands:

A <username>:<password> : Set a username & password for the web interface and the telnet interface. Use the format shown with a colon separating the username from the password.

V : Print the version and Makerbot name, as well as the local firmware version (the Makerbot_Server firmware as discussed here).

B <filename.x3g> : Build from SD the given filename. According tot he protocol spec, this command is limited to 12 characters, so 8.3 filenames only.

P : Pause an active build

R : Resume active build

C : Cancel build- note that this immediately halts the build and does not clear the build area. You might want to pause the build first, and then cancel shortly after to make sure the nozzle isn't left hot and in contact with a printed part.

S : Print build status, tool and platform temps

Q : Quit and logout

The Mini-DK has two onboard buttons (besides the ISP and reset buttons). Currently one button will trigger a pause (if the Makerbot is printing) and the other will resume (if the Makerbot it paused)

Compiling

Edit "Target.h" to set whether you're building for an MBED module or the Mini-DK2

Installation

If you are using a mbed, then you can simply load the BIN file to the mbed using the mass storage bootloader. The mbed mounts as if it were a USB thumbdrive, and you copy the BIN file to the drive. After a reset, you're running the installed firmware.

The MiniDK has a serial bootloader. You connect to this bootloader from the "top" USB connector (not the USB host one). Hold down the ISP button and then tap the reset button and then release the ISP button to put it into programming mode. I use [lpc21isp](http://sourceforge.net/projects/lpc21isp/) to load the binary. The other option is FlashMagic, which uses HEX files, so you'll need to use some sort of bin2hex utility to convert the firmware file if you use this utility. I can't really say if/how this works, as I don't use this method. See this (http://mbed.org/users/frankvnk/notebook/lpc1768-mini-dk/) for more info.

Credits

Some credits, where credit is due.

EthernetInterface - modified to include PHY code for both the MiniDK2 and MBED based on selected #definitions

Mini-DK - Thanks for Frank and Erik for doing all the heavy lifting getting the MBED compiler and libraries and peripherals working on the Mini-DK2

NTP Client - Thanks to Donatien for this library to set the clock over the network

RTC - Thanks to Erik for the RTC library. I've got it in my project, but I don't think I'm using it for anything (yet).

SimpleSocket - Thanks to Yamaguchi-san. Modified slightly to take out references to EthernetInterface::init() and ::getIPAddress(). For some reason these don't like to be called in a thread.

JPEGCamera - Thanks again to Yamaguchi-san. Modified to output the JPEG binary over a socket rather than to a file descriptor.

USBHost - modified as noted above

IAP - Thanks to Okano-san. Pulled out of the Mini-DK folder so that I could link it back to the base repository at the root level.

Committer:
frankvnk
Date:
Thu Jan 03 10:54:09 2013 +0000
Revision:
2:d0acbd263ec7
Parent:
SPI_TFT/GraphicsDisplay.cpp@0:ee7076d8260a
ONLY FOR TEST

Who changed what in which revision?

UserRevisionLine numberNew contents of line
frankvnk 0:ee7076d8260a 1 /* mbed GraphicsDisplay Display Library Base Class
frankvnk 0:ee7076d8260a 2 * Copyright (c) 2007-2009 sford
frankvnk 0:ee7076d8260a 3 * Released under the MIT License: http://mbed.org/license/mit
frankvnk 0:ee7076d8260a 4 */
frankvnk 0:ee7076d8260a 5
frankvnk 0:ee7076d8260a 6 #include "GraphicsDisplay.h"
frankvnk 0:ee7076d8260a 7
frankvnk 0:ee7076d8260a 8 const unsigned char FONT8x8[97][8] = {
frankvnk 0:ee7076d8260a 9 0x08,0x08,0x08,0x00,0x00,0x00,0x00,0x00, // columns, rows, num_bytes_per_char
frankvnk 0:ee7076d8260a 10 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // space 0x20
frankvnk 0:ee7076d8260a 11 0x30,0x78,0x78,0x30,0x30,0x00,0x30,0x00, // !
frankvnk 0:ee7076d8260a 12 0x6C,0x6C,0x6C,0x00,0x00,0x00,0x00,0x00, // "
frankvnk 0:ee7076d8260a 13 0x6C,0x6C,0xFE,0x6C,0xFE,0x6C,0x6C,0x00, // #
frankvnk 0:ee7076d8260a 14 0x18,0x3E,0x60,0x3C,0x06,0x7C,0x18,0x00, // $
frankvnk 0:ee7076d8260a 15 0x00,0x63,0x66,0x0C,0x18,0x33,0x63,0x00, // %
frankvnk 0:ee7076d8260a 16 0x1C,0x36,0x1C,0x3B,0x6E,0x66,0x3B,0x00, // &
frankvnk 0:ee7076d8260a 17 0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00, // '
frankvnk 0:ee7076d8260a 18 0x0C,0x18,0x30,0x30,0x30,0x18,0x0C,0x00, // (
frankvnk 0:ee7076d8260a 19 0x30,0x18,0x0C,0x0C,0x0C,0x18,0x30,0x00, // )
frankvnk 0:ee7076d8260a 20 0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00, // *
frankvnk 0:ee7076d8260a 21 0x00,0x30,0x30,0xFC,0x30,0x30,0x00,0x00, // +
frankvnk 0:ee7076d8260a 22 0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x30, // ,
frankvnk 0:ee7076d8260a 23 0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00, // -
frankvnk 0:ee7076d8260a 24 0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00, // .
frankvnk 0:ee7076d8260a 25 0x03,0x06,0x0C,0x18,0x30,0x60,0x40,0x00, // / (forward slash)
frankvnk 0:ee7076d8260a 26 0x3E,0x63,0x63,0x6B,0x63,0x63,0x3E,0x00, // 0 0x30
frankvnk 0:ee7076d8260a 27 0x18,0x38,0x58,0x18,0x18,0x18,0x7E,0x00, // 1
frankvnk 0:ee7076d8260a 28 0x3C,0x66,0x06,0x1C,0x30,0x66,0x7E,0x00, // 2
frankvnk 0:ee7076d8260a 29 0x3C,0x66,0x06,0x1C,0x06,0x66,0x3C,0x00, // 3
frankvnk 0:ee7076d8260a 30 0x0E,0x1E,0x36,0x66,0x7F,0x06,0x0F,0x00, // 4
frankvnk 0:ee7076d8260a 31 0x7E,0x60,0x7C,0x06,0x06,0x66,0x3C,0x00, // 5
frankvnk 0:ee7076d8260a 32 0x1C,0x30,0x60,0x7C,0x66,0x66,0x3C,0x00, // 6
frankvnk 0:ee7076d8260a 33 0x7E,0x66,0x06,0x0C,0x18,0x18,0x18,0x00, // 7
frankvnk 0:ee7076d8260a 34 0x3C,0x66,0x66,0x3C,0x66,0x66,0x3C,0x00, // 8
frankvnk 0:ee7076d8260a 35 0x3C,0x66,0x66,0x3E,0x06,0x0C,0x38,0x00, // 9
frankvnk 0:ee7076d8260a 36 0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x00, // :
frankvnk 0:ee7076d8260a 37 0x00,0x18,0x18,0x00,0x00,0x18,0x18,0x30, // ;
frankvnk 0:ee7076d8260a 38 0x0C,0x18,0x30,0x60,0x30,0x18,0x0C,0x00, // <
frankvnk 0:ee7076d8260a 39 0x00,0x00,0x7E,0x00,0x00,0x7E,0x00,0x00, // =
frankvnk 0:ee7076d8260a 40 0x30,0x18,0x0C,0x06,0x0C,0x18,0x30,0x00, // >
frankvnk 0:ee7076d8260a 41 0x3C,0x66,0x06,0x0C,0x18,0x00,0x18,0x00, // ?
frankvnk 0:ee7076d8260a 42 0x3E,0x63,0x6F,0x69,0x6F,0x60,0x3E,0x00, // @ 0x40
frankvnk 0:ee7076d8260a 43 0x18,0x3C,0x66,0x66,0x7E,0x66,0x66,0x00, // A
frankvnk 0:ee7076d8260a 44 0x7E,0x33,0x33,0x3E,0x33,0x33,0x7E,0x00, // B
frankvnk 0:ee7076d8260a 45 0x1E,0x33,0x60,0x60,0x60,0x33,0x1E,0x00, // C
frankvnk 0:ee7076d8260a 46 0x7C,0x36,0x33,0x33,0x33,0x36,0x7C,0x00, // D
frankvnk 0:ee7076d8260a 47 0x7F,0x31,0x34,0x3C,0x34,0x31,0x7F,0x00, // E
frankvnk 0:ee7076d8260a 48 0x7F,0x31,0x34,0x3C,0x34,0x30,0x78,0x00, // F
frankvnk 0:ee7076d8260a 49 0x1E,0x33,0x60,0x60,0x67,0x33,0x1F,0x00, // G
frankvnk 0:ee7076d8260a 50 0x66,0x66,0x66,0x7E,0x66,0x66,0x66,0x00, // H
frankvnk 0:ee7076d8260a 51 0x3C,0x18,0x18,0x18,0x18,0x18,0x3C,0x00, // I
frankvnk 0:ee7076d8260a 52 0x0F,0x06,0x06,0x06,0x66,0x66,0x3C,0x00, // J
frankvnk 0:ee7076d8260a 53 0x73,0x33,0x36,0x3C,0x36,0x33,0x73,0x00, // K
frankvnk 0:ee7076d8260a 54 0x78,0x30,0x30,0x30,0x31,0x33,0x7F,0x00, // L
frankvnk 0:ee7076d8260a 55 0x63,0x77,0x7F,0x7F,0x6B,0x63,0x63,0x00, // M
frankvnk 0:ee7076d8260a 56 0x63,0x73,0x7B,0x6F,0x67,0x63,0x63,0x00, // N
frankvnk 0:ee7076d8260a 57 0x3E,0x63,0x63,0x63,0x63,0x63,0x3E,0x00, // O
frankvnk 0:ee7076d8260a 58 0x7E,0x33,0x33,0x3E,0x30,0x30,0x78,0x00, // P 0x50
frankvnk 0:ee7076d8260a 59 0x3C,0x66,0x66,0x66,0x6E,0x3C,0x0E,0x00, // Q
frankvnk 0:ee7076d8260a 60 0x7E,0x33,0x33,0x3E,0x36,0x33,0x73,0x00, // R
frankvnk 0:ee7076d8260a 61 0x3C,0x66,0x30,0x18,0x0C,0x66,0x3C,0x00, // S
frankvnk 0:ee7076d8260a 62 0x7E,0x5A,0x18,0x18,0x18,0x18,0x3C,0x00, // T
frankvnk 0:ee7076d8260a 63 0x66,0x66,0x66,0x66,0x66,0x66,0x7E,0x00, // U
frankvnk 0:ee7076d8260a 64 0x66,0x66,0x66,0x66,0x66,0x3C,0x18,0x00, // V
frankvnk 0:ee7076d8260a 65 0x63,0x63,0x63,0x6B,0x7F,0x77,0x63,0x00, // W
frankvnk 0:ee7076d8260a 66 0x63,0x63,0x36,0x1C,0x1C,0x36,0x63,0x00, // X
frankvnk 0:ee7076d8260a 67 0x66,0x66,0x66,0x3C,0x18,0x18,0x3C,0x00, // Y
frankvnk 0:ee7076d8260a 68 0x7F,0x63,0x46,0x0C,0x19,0x33,0x7F,0x00, // Z
frankvnk 0:ee7076d8260a 69 0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00, // [
frankvnk 0:ee7076d8260a 70 0x60,0x30,0x18,0x0C,0x06,0x03,0x01,0x00, // \ (back slash)
frankvnk 0:ee7076d8260a 71 0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00, // ]
frankvnk 0:ee7076d8260a 72 0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00, // ^
frankvnk 0:ee7076d8260a 73 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF, // _
frankvnk 0:ee7076d8260a 74 0x18,0x18,0x0C,0x00,0x00,0x00,0x00,0x00, // ` 0x60
frankvnk 0:ee7076d8260a 75 0x00,0x00,0x3C,0x06,0x3E,0x66,0x3B,0x00, // a
frankvnk 0:ee7076d8260a 76 0x70,0x30,0x3E,0x33,0x33,0x33,0x6E,0x00, // b
frankvnk 0:ee7076d8260a 77 0x00,0x00,0x3C,0x66,0x60,0x66,0x3C,0x00, // c
frankvnk 0:ee7076d8260a 78 0x0E,0x06,0x3E,0x66,0x66,0x66,0x3B,0x00, // d
frankvnk 0:ee7076d8260a 79 0x00,0x00,0x3C,0x66,0x7E,0x60,0x3C,0x00, // e
frankvnk 0:ee7076d8260a 80 0x1C,0x36,0x30,0x78,0x30,0x30,0x78,0x00, // f
frankvnk 0:ee7076d8260a 81 0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x7C, // g
frankvnk 0:ee7076d8260a 82 0x70,0x30,0x36,0x3B,0x33,0x33,0x73,0x00, // h
frankvnk 0:ee7076d8260a 83 0x18,0x00,0x38,0x18,0x18,0x18,0x3C,0x00, // i
frankvnk 0:ee7076d8260a 84 0x06,0x00,0x06,0x06,0x06,0x66,0x66,0x3C, // j
frankvnk 0:ee7076d8260a 85 0x70,0x30,0x33,0x36,0x3C,0x36,0x73,0x00, // k
frankvnk 0:ee7076d8260a 86 0x38,0x18,0x18,0x18,0x18,0x18,0x3C,0x00, // l
frankvnk 0:ee7076d8260a 87 0x00,0x00,0x66,0x7F,0x7F,0x6B,0x63,0x00, // m
frankvnk 0:ee7076d8260a 88 0x00,0x00,0x7C,0x66,0x66,0x66,0x66,0x00, // n
frankvnk 0:ee7076d8260a 89 0x00,0x00,0x3C,0x66,0x66,0x66,0x3C,0x00, // o
frankvnk 0:ee7076d8260a 90 0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78, // p
frankvnk 0:ee7076d8260a 91 0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F, // q
frankvnk 0:ee7076d8260a 92 0x00,0x00,0x6E,0x3B,0x33,0x30,0x78,0x00, // r
frankvnk 0:ee7076d8260a 93 0x00,0x00,0x3E,0x60,0x3C,0x06,0x7C,0x00, // s
frankvnk 0:ee7076d8260a 94 0x08,0x18,0x3E,0x18,0x18,0x1A,0x0C,0x00, // t
frankvnk 0:ee7076d8260a 95 0x00,0x00,0x66,0x66,0x66,0x66,0x3B,0x00, // u
frankvnk 0:ee7076d8260a 96 0x00,0x00,0x66,0x66,0x66,0x3C,0x18,0x00, // v
frankvnk 0:ee7076d8260a 97 0x00,0x00,0x63,0x6B,0x7F,0x7F,0x36,0x00, // w
frankvnk 0:ee7076d8260a 98 0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00, // x
frankvnk 0:ee7076d8260a 99 0x00,0x00,0x66,0x66,0x66,0x3E,0x06,0x7C, // y
frankvnk 0:ee7076d8260a 100 0x00,0x00,0x7E,0x4C,0x18,0x32,0x7E,0x00, // z
frankvnk 0:ee7076d8260a 101 0x0E,0x18,0x18,0x70,0x18,0x18,0x0E,0x00, // {
frankvnk 0:ee7076d8260a 102 0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x00, // |
frankvnk 0:ee7076d8260a 103 0x70,0x18,0x18,0x0E,0x18,0x18,0x70,0x00, // }
frankvnk 0:ee7076d8260a 104 0x3B,0x6E,0x00,0x00,0x00,0x00,0x00,0x00, // ~
frankvnk 0:ee7076d8260a 105 0x1C,0x36,0x36,0x1C,0x00,0x00,0x00,0x00}; // DEL
frankvnk 0:ee7076d8260a 106
frankvnk 0:ee7076d8260a 107 GraphicsDisplay::GraphicsDisplay(const char *name):TextDisplay(name) {
frankvnk 0:ee7076d8260a 108 foreground(0xFFFF);
frankvnk 0:ee7076d8260a 109 background(0x0000);
frankvnk 0:ee7076d8260a 110 }
frankvnk 0:ee7076d8260a 111
frankvnk 0:ee7076d8260a 112 void GraphicsDisplay::character(int column, int row, int value) {
frankvnk 0:ee7076d8260a 113 blitbit(column * 8, row * 8, 8, 8, (char*)&(FONT8x8[value - 0x1F][0]));
frankvnk 0:ee7076d8260a 114 }
frankvnk 0:ee7076d8260a 115
frankvnk 0:ee7076d8260a 116 void GraphicsDisplay::window(int x, int y, int w, int h) {
frankvnk 0:ee7076d8260a 117 // current pixel location
frankvnk 0:ee7076d8260a 118 _x = x;
frankvnk 0:ee7076d8260a 119 _y = y;
frankvnk 0:ee7076d8260a 120 // window settings
frankvnk 0:ee7076d8260a 121 _x1 = x;
frankvnk 0:ee7076d8260a 122 _x2 = x + w - 1;
frankvnk 0:ee7076d8260a 123 _y1 = y;
frankvnk 0:ee7076d8260a 124 _y2 = y + h - 1;
frankvnk 0:ee7076d8260a 125 }
frankvnk 0:ee7076d8260a 126
frankvnk 0:ee7076d8260a 127 void GraphicsDisplay::putp(int colour) {
frankvnk 0:ee7076d8260a 128 // put pixel at current pixel location
frankvnk 0:ee7076d8260a 129 pixel(_x, _y, colour);
frankvnk 0:ee7076d8260a 130 // update pixel location based on window settings
frankvnk 0:ee7076d8260a 131 _x++;
frankvnk 0:ee7076d8260a 132 if(_x > _x2) {
frankvnk 0:ee7076d8260a 133 _x = _x1;
frankvnk 0:ee7076d8260a 134 _y++;
frankvnk 0:ee7076d8260a 135 if(_y > _y2) {
frankvnk 0:ee7076d8260a 136 _y = _y1;
frankvnk 0:ee7076d8260a 137 }
frankvnk 0:ee7076d8260a 138 }
frankvnk 0:ee7076d8260a 139 }
frankvnk 0:ee7076d8260a 140
frankvnk 0:ee7076d8260a 141 void GraphicsDisplay::fill(int x, int y, int w, int h, int colour) {
frankvnk 0:ee7076d8260a 142 window(x, y, w, h);
frankvnk 0:ee7076d8260a 143 for(int i=0; i<w*h; i++) {
frankvnk 0:ee7076d8260a 144 putp(colour);
frankvnk 0:ee7076d8260a 145 }
frankvnk 0:ee7076d8260a 146 }
frankvnk 0:ee7076d8260a 147
frankvnk 0:ee7076d8260a 148 void GraphicsDisplay::cls() {
frankvnk 0:ee7076d8260a 149 fill(0, 0, width(), height(), _background);
frankvnk 0:ee7076d8260a 150 }
frankvnk 0:ee7076d8260a 151
frankvnk 0:ee7076d8260a 152 void GraphicsDisplay::blit(int x, int y, int w, int h, const int *colour) {
frankvnk 0:ee7076d8260a 153 window(x, y, w, h);
frankvnk 0:ee7076d8260a 154 for(int i=0; i<w*h; i++) {
frankvnk 0:ee7076d8260a 155 putp(colour[i]);
frankvnk 0:ee7076d8260a 156 }
frankvnk 0:ee7076d8260a 157 }
frankvnk 0:ee7076d8260a 158
frankvnk 0:ee7076d8260a 159 void GraphicsDisplay::blitbit(int x, int y, int w, int h, const char* colour) {
frankvnk 0:ee7076d8260a 160 window(x, y, w, h);
frankvnk 0:ee7076d8260a 161 for(int i = 0; i < w*h; i++) {
frankvnk 0:ee7076d8260a 162 char byte = colour[i >> 3];
frankvnk 0:ee7076d8260a 163 int offset = i & 0x7;
frankvnk 0:ee7076d8260a 164 int c = ((byte << offset) & 0x80) ? _foreground : _background;
frankvnk 0:ee7076d8260a 165 putp(c);
frankvnk 0:ee7076d8260a 166 }
frankvnk 0:ee7076d8260a 167 }
frankvnk 0:ee7076d8260a 168
frankvnk 0:ee7076d8260a 169 int GraphicsDisplay::columns() {
frankvnk 0:ee7076d8260a 170 return width() / 8;
frankvnk 0:ee7076d8260a 171 }
frankvnk 0:ee7076d8260a 172
frankvnk 0:ee7076d8260a 173 int GraphicsDisplay::rows() {
frankvnk 0:ee7076d8260a 174 return height() / 8;
frankvnk 0:ee7076d8260a 175 }
frankvnk 0:ee7076d8260a 176