fix button A, B

akkera102 · Jul 12, 2016 · 45643a5 · 45643a5
1 parent b55dae7
commit 45643a5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 1,118 deletions.
diff --git a/readme_jp.txt b/readme_jp.txt
@@ -34,6 +34,7 @@ https://www.geocities.co.jp/Hollywood-Kouen/9343/music.html
 
 
 ������
+v1.03 2016/07/12    A�{�^����B�{�^���̊ԈႢ���C��
 v1.02 2016/05/17    Arduboy 1.0��osx�X�N���v�g��ǉ�
 v1.01 2016/02/23    64bit�p�\�R����reset�ł��Ȃ������C��
 v1.00 2015/12/25    �Ƃ肠��������

diff --git a/src/Makefile b/src/Makefile
@@ -2,9 +2,9 @@ MAKEFLAGS	+=--no-print-directory
 
 BINPATH			= "C:/Program Files/Arduino/hardware/tools/avr/bin/"
 CONFFILE		= "C:/Program Files/Arduino/hardware/tools/avr/etc/avrdude.conf"
-COM				= COM4
-ARDUBOY_MODEL	= ARDUBOY_10
+COM				= COM9
 
+ARDUBOY_MODEL	= ARDUBOY_10
 #ARDUBOY_MODEL	= ARDUBOY_DEVKIT
 
 #=============================================================================

diff --git a/src/lib/key.h b/src/lib/key.h
@@ -47,8 +47,8 @@ enum {
 
 #elif defined(ARDUBOY_DEVKIT)
 
-	KEY_A = _BV(0),
-	KEY_B = _BV(1),
+	KEY_A = _BV(1),
+	KEY_B = _BV(0),
 	KEY_R = _BV(2),
 	KEY_U = _BV(4),
 	KEY_L = _BV(5),

diff --git a/src/make_usb.bat b/src/make_usb.bat
@@ -12,7 +12,7 @@ cls
 goto loop
 
 :usb
-..\tool\reset COM5
+..\tool\reset COM10
 make usb
 avr-size test.elf -C --mcu=atmega32u4
 

diff --git a/src/ship.cpp b/src/ship.cpp
@@ -94,11 +94,11 @@ void ShipFire(void)
 
 	if(trg & KEY_A)
 	{
-		fx = Ship.fx + FT(SHIP_CX);
+		fx = Ship.fx - FT(BULLET1_CX);
 	}
 	else
 	{
-		fx = Ship.fx - FT(BULLET1_CX);
+		fx = Ship.fx + FT(SHIP_CX);
 	}
 
 	BulletShipSet(fx, Ship.fy + (FrameGetCnt() & 0x40) ? 0 : FT(1));

diff --git a/test.bat b/test.bat
@@ -1,14 +1,13 @@
 @echo off
 SET VAL1="C:\Program Files\Arduino\hardware\tools\avr\bin"
-SET VAL2=COM5
+SET VAL2=COM10
 SET VAL3="C:\Program Files\Arduino\hardware\tools\avr\etc\avrdude.conf"
-SET VAL4=COM4
-SET VAL5=test_arduboy_10.hex
+SET VAL4=COM9
 
 set PATH=%VAL1%;%PATH%
 
 
 tool\reset %VAL2%
-avrdude -C%VAL3% -v -patmega32u4 -cavr109 -P%VAL4% -b57600 -D -Uflash:w:%VAL5%:i
+avrdude -C%VAL3% -v -patmega32u4 -cavr109 -P%VAL4% -b57600 -D -Uflash:w:test.hex:i
 
 pause
diff --git a/test_arduboy_10.hex → test.hex b/test_arduboy_10.hex → test.hex
@@ -598,7 +598,7 @@
 :102550002302809121022DE048E18C5F0E94AD1C96
 :102560008093240208950F931F93CF93DF930E94CB
 :10257000F51583FD08C082FF22C0C0912002D091D2
-:102580002102D65005C0C0912002D0912102D45E14
+:102580002102D45E05C0C0912002D0912102D65014
 :1025900000912202109123020E942F158074080FCF
 :1025A000111D012B19F060E070E002C060E071E0E5
 :1025B000CE01DF91CF911F910F910C948F1BDF9172

diff --git a/test.sh b/test.sh
@@ -2,7 +2,7 @@
 
 export avrdudeconf=/Applications/Arduino.app/Contents/Java/hardware/tools/avr/etc/avrdude.conf
 export uart=/dev/tty.usbmodem1421
-export hexfile=test_arduboy_10.hex
+export hexfile=test.hex
 
 python -c "import serial;ser=serial.Serial('/dev/tty.usbmodem1421',1200);ser.write('');ser.close()"
 sleep 2