Merge pull request #243 from felipesanches/rambo

New non-working driver: Metamáquina 2 desktop 3d printer
This commit is contained in:
David Haywood 2015-07-06 10:23:01 +01:00
commit d0e97a8d6d
4 changed files with 245 additions and 6 deletions

View File

@ -837,6 +837,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"toshiba",
"trainer",
"trs",
"ultimachine",
"ultratec",
"unisys",
"veb",
@ -2444,6 +2445,11 @@ files {
MAME_DIR .. "src/mess/machine/tandy2kb.c",
}
createMESSProjects(_target, _subtarget, "ultimachine")
files {
MAME_DIR .. "src/mess/drivers/rambo.c",
}
createMESSProjects(_target, _subtarget, "ultratec")
files {
MAME_DIR .. "src/mess/drivers/minicom.c",

View File

@ -12,9 +12,12 @@
the existing opcodes has been shown to wildly corrupt the video output in Craft, so one can assume that the
existing timing is 100% correct.
Unimplemented opcodes: SPM, SPM Z+, EIJMP, SLEEP, BREAK, WDR, EICALL, JMP, CALL
Unimplemented opcodes: SPM, SPM Z+, SLEEP, BREAK, WDR, EICALL, JMP, CALL
- Changelist -
05 Jul. 2015 [Felipe Sanches]
- Implemented EIJMP instruction
29 Dec. 2013 [Felipe Sanches]
- Added crude boilerplate code for Timer/Counter #4
@ -621,7 +624,7 @@ atmega1280_device::atmega1280_device(const machine_config &mconfig, const char *
//-------------------------------------------------
atmega2560_device::atmega2560_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: avr8_device(mconfig, "ATMEGA2560", tag, owner, clock, ATMEGA2560, 0x3ffff, ADDRESS_MAP_NAME(atmega2560_internal_map), CPU_TYPE_ATMEGA2560, "atmega2560", __FILE__)
: avr8_device(mconfig, "ATMEGA2560", tag, owner, clock, ATMEGA2560, 0x1ffff, ADDRESS_MAP_NAME(atmega2560_internal_map), CPU_TYPE_ATMEGA2560, "atmega2560", __FILE__)
{
}
@ -1174,11 +1177,11 @@ void avr8_device::timer0_tick()
switch(AVR8_WGM0)
{
case WGM02_NORMAL:
printf("WGM02_NORMAL: Unimplemented timer#0 waveform generation mode\n");
//printf("WGM02_NORMAL: Unimplemented timer#0 waveform generation mode\n");
break;
case WGM02_PWM_PC:
printf("WGM02_PWM_PC: Unimplemented timer#0 waveform generation mode\n");
//printf("WGM02_PWM_PC: Unimplemented timer#0 waveform generation mode\n");
break;
case WGM02_CTC_CMP:
@ -3538,8 +3541,8 @@ void avr8_device::execute_run()
opcycles = 2;
break;
case 0x0010: // EIJMP
//output += sprintf( output, "EIJMP" );
unimplemented_opcode(op);
m_pc = ZREG + m_r[AVR8_REGIDX_EIND] - 1;
opcycles = 2;
break;
default:
//output += sprintf( output, "Undefined (%04x)", op );

View File

@ -283,6 +283,9 @@ odyssey3 // Magnavox Odyssey 3 / Command Center (prototype)
// Makerbot
replica1 // Makerbot Replicator 1 desktop 3d printer
// Metamaquina
metamaq2 // Metamaquina 2 desktop 3d printer
// Hartung, Watara, ...
gmaster // Hartung Gamemaster

227
src/mess/drivers/rambo.c Normal file
View File

@ -0,0 +1,227 @@
// license:GPL-2.0+
// copyright-holders:Felipe Sanches
/*
RAMBo (RepRap Arduino-compatible Mother Board) by UltiMachine
for controlling desktop 3d printers
http://reprap.org/wiki/Rambo
driver by Felipe Correa da Silva Sanches <fsanches@metamaquina.com.br>
This driver is based on the schematics of the version 1.1b:
http://reprap.org/mediawiki/images/7/75/Rambo1-1-schematic.png
3d printers currently supported by this driver:
* Metamáquina 2
3d printers known to use this board:
* TODO: list them all here
*/
#include "emu.h"
#include "cpu/avr8/avr8.h"
#define MASTER_CLOCK 16000000
#define LOG_PORTS 0
/****************************************************\
* I/O devices *
\****************************************************/
class rambo_state : public driver_device
{
public:
rambo_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
{
}
UINT8 m_port_a;
UINT8 m_port_b;
UINT8 m_port_c;
UINT8 m_port_d;
UINT8 m_port_e;
UINT8 m_port_f;
UINT8 m_port_g;
UINT8 m_port_h;
UINT8 m_port_j;
UINT8 m_port_k;
UINT8 m_port_l;
required_device<avr8_device> m_maincpu;
DECLARE_READ8_MEMBER(port_r);
DECLARE_WRITE8_MEMBER(port_w);
DECLARE_DRIVER_INIT(rambo);
virtual void machine_start();
virtual void machine_reset();
};
void rambo_state::machine_start()
{
}
READ8_MEMBER(rambo_state::port_r)
{
switch( offset )
{
case AVR8_IO_PORTA:
{
#if LOG_PORTS
printf("[%08X] Port A READ \n", m_maincpu->m_shifted_pc);
#endif
return m_port_a;
}
default:
break;
}
return 0;
}
WRITE8_MEMBER(rambo_state::port_w)
{
switch( offset )
{
case AVR8_IO_PORTA:
{
if (data == m_port_a) break;
#if LOG_PORTS
UINT8 old_port_a = m_port_a;
UINT8 changed = data ^ old_port_a;
#endif
m_port_a = data;
break;
}
default:
break;
}
}
/****************************************************\
* Address maps *
\****************************************************/
static ADDRESS_MAP_START( rambo_prg_map, AS_PROGRAM, 8, rambo_state )
AM_RANGE(0x0000, 0x1FFFF) AM_ROM
ADDRESS_MAP_END
static ADDRESS_MAP_START( rambo_data_map, AS_DATA, 8, rambo_state )
AM_RANGE(0x0200, 0x21FF) AM_RAM /* ATMEGA2560 Internal SRAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( rambo_io_map, AS_IO, 8, rambo_state )
AM_RANGE(AVR8_IO_PORTA, AVR8_IO_PORTL) AM_READWRITE( port_r, port_w )
ADDRESS_MAP_END
/****************************************************\
* Machine definition *
\****************************************************/
DRIVER_INIT_MEMBER(rambo_state, rambo)
{
}
void rambo_state::machine_reset()
{
m_port_a = 0;
m_port_b = 0;
m_port_c = 0;
m_port_d = 0;
m_port_e = 0;
m_port_f = 0;
m_port_g = 0;
m_port_h = 0;
m_port_j = 0;
m_port_k = 0;
m_port_l = 0;
}
static MACHINE_CONFIG_START( rambo, rambo_state )
MCFG_CPU_ADD("maincpu", ATMEGA2560, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(rambo_prg_map)
MCFG_CPU_DATA_MAP(rambo_data_map)
MCFG_CPU_IO_MAP(rambo_io_map)
MCFG_CPU_AVR8_EEPROM("eeprom")
MCFG_CPU_AVR8_LFUSE(0xFF)
MCFG_CPU_AVR8_HFUSE(0xDA)
MCFG_CPU_AVR8_EFUSE(0xF4)
MCFG_CPU_AVR8_LOCK(0x0F)
/*TODO: Add an ATMEGA32U2 for USB-Serial communications */
/*TODO: Emulate the AD5206 digipot */
/*TODO: Emulate the A4982 stepper motor drivers and instantiate 5 of these here
for controlling the X, Y, Z, E1 (and optionally E2) motors */
/*TODO: Simulate the heating elements */
/*TODO: Implement the thermistor measurements */
MACHINE_CONFIG_END
ROM_START( metamaq2 )
ROM_REGION( 0x20000, "maincpu", 0 )
ROM_DEFAULT_BIOS("20131015")
ROM_SYSTEM_BIOS( 0, "20130619", "June 19th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_06_19) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-06-19.bin", 0x0000, 0x1000e, CRC(4279b178) SHA1(e4d3c9d6421287c980639c2df32d07b754adc8fc), ROM_BIOS(1))
ROM_SYSTEM_BIOS( 1, "20130624", "June 24th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_RC2_RAMBo_rev10e_2013_06_24) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-06-24_mm2rc2_rambo_rev10e.bin", 0x0000, 0xcebc, CRC(82400a3c) SHA1(0781ce29406ce69b63edb93d776b9c081bed841e), ROM_BIOS(2))
ROM_SYSTEM_BIOS( 2, "20130625", "June 25th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_06_25) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-06-25.bin", 0x0000, 0x10076, CRC(e7e4db38) SHA1(0c307bb0a0ee4e9d38253936e7030d0efb3c1845), ROM_BIOS(3))
ROM_SYSTEM_BIOS( 3, "20130709", "July 9th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_09) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-07-09.bin", 0x0000, 0x10078, CRC(9a45509f) SHA1(3a2e6516b45cc0ea1aef039335b02208847aaebf), ROM_BIOS(4))
ROM_SYSTEM_BIOS( 4, "20130712", "July 12th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_12) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-07-12.bin", 0x0000, 0x10184, CRC(9aeac87c) SHA1(c1441096553c214c12a34da87fa42cc3f0eaf74d), ROM_BIOS(5))
ROM_SYSTEM_BIOS( 5, "20130717", "July 17th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_07_17) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-07-17.bin", 0x0000, 0x10180, CRC(7c053ed0) SHA1(7abeabcbfdb411b6e681e2d0c9398c40b142f76b), ROM_BIOS(6))
ROM_SYSTEM_BIOS( 6, "20130806", "August 6th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_06) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-08-06.bin", 0x0000, 0x1017e, CRC(6aaf5a14) SHA1(93cebee8ab9eda9d81e70504b407268a198577f0), ROM_BIOS(7))
ROM_SYSTEM_BIOS( 7, "20130809", "August 9th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_09) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-08-09.bin", 0x0000, 0x1018a, CRC(ee53a011) SHA1(666d09fe69220a172528fe8d1c358e3ddaaa743a), ROM_BIOS(8))
ROM_SYSTEM_BIOS( 8, "20130822", "August 22nd, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_08_22) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-08-22.bin", 0x0000, 0x1018a, CRC(70a5a3c9) SHA1(20e52ea7bf40e71020b815b9fb6385d880677927), ROM_BIOS(9))
ROM_SYSTEM_BIOS( 9, "20130913", "September 13th, 2013" )
/* source code for this one is unavailable as it was an unreleased internal development build */
ROMX_LOAD("repetier-fw-metamaquina2-2013-09-13-devel.bin", 0x0000, 0x101bc, CRC(5e7c7933) SHA1(5b9bfe919daf705ad7a9a2de3cf4c51e3338ec47), ROM_BIOS(10))
ROM_SYSTEM_BIOS( 10, "20130920", "September 20th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_09_20) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-09-20.bin", 0x0000, 0x10384, CRC(48378e58) SHA1(513f0a0c65219875cc467420cc091e3489b58919), ROM_BIOS(11))
ROM_SYSTEM_BIOS( 11, "20131015", "October 15th, 2013" )
/* SOURCE(https://github.com/Metamaquina/Repetier-Firmware/tree/MM2_2013_10_15) */
ROMX_LOAD("repetier-fw-metamaquina2-2013-10-15.bin", 0x0000, 0x102c8, CRC(520134bd) SHA1(dfe2251aad06972f237eb4920ce14ccb32da5af0), ROM_BIOS(12))
/*Arduino MEGA bootloader */
/* This is marked as a BAD_DUMP because we're not sure this is the bootloader we're actually using.
This is inherited from the Replicator 1 driver.
A proper dump would be good.
Also, it is not clear whether there's any difference in the bootloader
between the ATMEGA1280 and the ATMEGA2560 MCUs */
ROM_LOAD( "atmegaboot_168_atmega1280.bin", 0x1f000, 0x0f16, BAD_DUMP CRC(c041f8db) SHA1(d995ebf360a264cccacec65f6dc0c2257a3a9224) )
/* on-die 4kbyte eeprom */
ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
COMP(2012, metamaq2, 0, rambo, rambo, 0, rambo_state, rambo, "Metamaquina", "Metamaquina 2 desktop 3d printer", GAME_NOT_WORKING | GAME_NO_SOUND)