Menu
▾
▴
[Krobot-commits] [SCM] krobot branch, master, updated. 0a76a1bcc9c4ddcca1672e62f43a87bb80b26758
|
From: Olivier B. <Ba...@us...> - 2010-05-08 17:10:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".
The branch, master has been updated
via 0a76a1bcc9c4ddcca1672e62f43a87bb80b26758 (commit)
from 3236513213c1e9c032db58fa87984a51896a9533 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0a76a1bcc9c4ddcca1672e62f43a87bb80b26758
Author: Olivier BICHLER <oli...@cr...>
Date: Sat May 8 19:10:05 2010 +0200
Bug with infrared sensor interrupt routine
-----------------------------------------------------------------------
Changes:
diff --git a/elec/boards/Interface_Robot/Firmware/Robot_Interface.mcw b/elec/boards/Interface_Robot/Firmware/Robot_Interface.mcw
index f4bc2bf..83af6e5 100644
Binary files a/elec/boards/Interface_Robot/Firmware/Robot_Interface.mcw and b/elec/boards/Interface_Robot/Firmware/Robot_Interface.mcw differ
diff --git a/elec/boards/Interface_Robot/Firmware/main.c b/elec/boards/Interface_Robot/Firmware/main.c
index f42183b..2becbd3 100644
--- a/elec/boards/Interface_Robot/Firmware/main.c
+++ b/elec/boards/Interface_Robot/Firmware/main.c
@@ -245,10 +245,6 @@ char ResetSource(void);
}
#ifdef KROBOT_2010
- interruptIF();
- #endif
-
- #ifdef KROBOT_2010
// Interruption par le timer0
if (INTCONbits.TMR0IF) {
interruptMotor1();
@@ -606,6 +602,11 @@ void ProcessIO(void) {
if(blinkStatusValid) {
BlinkUSBStatus();
}
+
+ #ifdef KROBOT_2010
+ interruptIF();
+ #endif
+
/*
if (!HIDTxHandleBusy(USBInHandle) && glbReceived) {
ToSendDataBuffer.HSEQ = 0; // Num sence PC
diff --git a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof
index 2a5e2d1..73426c0 100644
Binary files a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof and b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.cof differ
diff --git a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex
index acf2a75..21c56c2 100644
--- a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex
+++ b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.hex
@@ -4,7 +4,7 @@
:060018000CEF04F01200E1
:060800004DEF22F0120092
:060808003AEF04F01200BB
-:060818009CEF04F0120049
+:060818009AEF04F012004B
:06082A000600504500002D
:1008300026010000240000002F4500006B0100008D
:10084000210000002C450000BB0100000300000057
@@ -17,28 +17,28 @@
:1008A000140EE80403E3EECFE4FFFBD700EE00F004
:1008B000220EE80403E3EECFE4FFFBD7A4EC0DF037
:1008C000A1A203D019EC1BF0A1929EAA03D0BFEC09
-:1008D00013F09E9A6FEC19F0F2A403D058EC1CF0C0
-:1008E000F294B7EC0DF002E2E16AE552B5EC0DF0DE
-:1008F000E55200EE21F0220EE80403E3E5CFEDFF20
-:10090000FBD700EE35F0140EE80403E3E5CFEDFF6E
-:10091000FBD7E5CFFAFFE5CFF4FFE5CFF3FFE5CF57
-:10092000F5FFE5CFF7FFE5CFF6FFE5CFEAFFE5CF2F
-:10093000E9FFE5CFDAFF1100D8CFE4FFE0CFE4FF15
-:10094000E46EDACFE4FFE2CFDAFFF3CFE4FFF4CFD7
-:10095000E4FFA4EC0DF0B7EC0DF002E2E16AE55221
-:10096000B5EC0DF0E552E5CFF4FFE5CFF3FFE5CFB1
-:10097000DAFFE550E5CFE0FFE5CFD8FF100004D85F
-:100980004AEC0EF047D8FCD70F0EC11202D814EF74
-:100990000EF0EFEC0DF0E6522BEC0DF00101B86F0C
-:1009A000070EB85D10E1E66A63EC20F0E552DF6EF9
-:1009B000000EDF80BFEC0DF0E66A1FEC22F0E5527E
-:1009C000DF70BFEC0DF093809382948C948ED08E68
-:1009D000F28EF28C770EC86E070EE66EDCEC1DF020
-:1009E000E5523F0E8A1693160101AF6BB06BB16BE7
-:1009F000B26B010EB36FBAEC13F004EC1BF0E66AB5
-:100A000032EC1CF0E55248EC1DF05FEC19F0E552B9
-:100A100000EF0EF0D9CFE6FFE1CFD9FF170EE126A8
-:100A2000160EDB6A0101B35102E01FEC0CF0200E40
+:1008D00013F09E9AF2A403D058EC1CF0F294B7ECFB
+:1008E0000DF002E2E16AE552B5EC0DF0E55200EEE2
+:1008F00021F0220EE80403E3E5CFEDFFFBD700EE85
+:1009000035F0140EE80403E3E5CFEDFFFBD7E5CFA8
+:10091000FAFFE5CFF4FFE5CFF3FFE5CFF5FFE5CF35
+:10092000F7FFE5CFF6FFE5CFEAFFE5CFE9FFE5CF3B
+:10093000DAFF1100D8CFE4FFE0CFE4FFE46EDACFB6
+:10094000E4FFE2CFDAFFF3CFE4FFF4CFE4FFA4EC5F
+:100950000DF0B7EC0DF002E2E16AE552B5EC0DF0F6
+:10096000E552E5CFF4FFE5CFF3FFE5CFDAFFE55041
+:10097000E5CFE0FFE5CFD8FF100004D84AEC0EF039
+:1009800047D8FCD70F0EC11202D814EF0EF0EFECCF
+:100990000DF0E6522BEC0DF00101B86F070EB85DBB
+:1009A00010E1E66A63EC20F0E552DF6E000EDF80B6
+:1009B000BFEC0DF0E66A1FEC22F0E552DF70BFECF1
+:1009C0000DF093809382948C948ED08EF28EF28C64
+:1009D000770EC86E070EE66EDCEC1DF0E5523F0E9A
+:1009E0008A1693160101AF6BB06BB16BB26B010E3F
+:1009F000B36FBAEC13F004EC1BF0E66A32EC1CF0B7
+:100A0000E55248EC1DF05FEC19F0E55200EF0EF0F6
+:100A1000D9CFE6FFE1CFD9FF170EE126160EDB6A2C
+:100A20000101B35102E01FEC0CF06FEC19F0200E45
:100A30000101005D03E36D50020B02E015EF0CF0C5
:100A4000160EDB5036E020EC1DF0000932E001010B
:100A5000B151B21102E1000E08D0B1C1E9FFB2C13B
@@ -956,7 +956,7 @@
:10423000C96EC6AE02D0FF0E09D0C7B0FED76FEC74
:1042400022F0C5AC02D0FE0E01D0000EE552E5CF43
:08425000DAFFE7CFD9FF1200ED
-:0842580031383A34313A3431B7
+:0842580031393A30393A3137AF
:104260000020004D6179203038203230313000524A
:104270006F626F7420496E74657266616365203188
:104280002E300A4F6C697669657220424943484C6A
@@ -1004,7 +1004,7 @@
:10448000AC900101C0B3AC80FD0EDB50AD6EE552C7
:0A449000E5CFDAFFE7CFD9FF1200F5
:06449A0013EE00F023EE1A
-:1044A00000F0F86A239C07EC1FF084EC22F0BFECCC
+:1044A00000F0F86A239C07EC1FF084EC22F0BDECCE
:0644B00004F0FBD712002E
:0A44B600FF0EE350E84E1200000074
:0C44C00000D000D000D0E82EFAD7120087
diff --git a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map
index 63e01df..41e1322 100644
--- a/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map
+++ b/elec/boards/Interface_Robot/Firmware/output/Robot_Interface.map
@@ -1,5 +1,5 @@
MPLINK 4.21, Linker
-Linker Map File - Created Sat May 08 18:41:47 2010
+Linker Map File - Created Sat May 08 19:09:22 2010
Section Info
Section Type Address Location Size(Bytes)
@@ -249,7 +249,7 @@ REMAPPED_LOW_INTERRUPT_VECTOR code 0x000818 program 0x000006
INT3216 0x0030e6 program extern C:\MCC18\src\traditional\math\castFP16.asm
INT3232 0x003144 program extern C:\MCC18\src\traditional\math\castFP32.asm
IdleI2C 0x0044de program extern C:\MCC18\src\pmc_common\i2c\i2c_idle.c
- InitializeSystem 0x000988 program static C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ InitializeSystem 0x000984 program static C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
Low_ISR 0x000018 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
OpenADC 0x003fac program extern C:\MCC18\src\pmc_common\ADC\adcopen.c
OpenI2C 0x004372 program extern C:\MCC18\src\pmc_common\i2c\i2c_open.c
@@ -259,7 +259,7 @@ REMAPPED_LOW_INTERRUPT_VECTOR code 0x000818 program 0x000006
OpenTimer2 0x00433c program extern C:\MCC18\src\pmc_common\Timers\t2open.c
OpenTimer3 0x004198 program extern C:\MCC18\src\pmc_common\Timers\t3open.c
OpenUSART 0x003eac program extern C:\MCC18\src\pmc_common\USART\uopen.c
- ProcessIO 0x000a14 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ ProcessIO 0x000a10 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
ReadADC 0x0044cc program extern C:\MCC18\src\pmc_common\ADC\adcread.c
ReadEEPROM 0x0040c6 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\eeprom.c
ReadUSART 0x0041de program extern C:\MCC18\src\pmc_common\USART\uread.c
@@ -303,14 +303,14 @@ USBPrepareForNextSetupTrf 0x001f34 program extern C:\krobot\elec\boards
USB_CD_Ptr 0x003e06 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\usb_descriptors.c
USB_SD_Ptr 0x003e08 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\usb_descriptors.c
USER_USB_CALLBACK_EVENT_HANDLER 0x0019c0 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- UserInit 0x000992 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ UserInit 0x00098e program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
WriteEEPROM 0x004086 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\eeprom.c
WriteI2C 0x00421c program extern C:\MCC18\src\pmc_common\i2c\i2c_writ.c
WriteTimer0 0x0042cc program extern C:\MCC18\src\pmc_common\Timers\t0write.c
WriteTimer3 0x004294 program extern C:\MCC18\src\pmc_common\Timers\t3write.c
WriteUSART 0x00446c program extern C:\MCC18\src\pmc_common\USART\uwrite.c
YourHighPriorityISRCode 0x000874 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- YourLowPriorityISRCode 0x000938 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ YourLowPriorityISRCode 0x000934 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
_2jContinue 0x00403a program static C:\MCC18\src\traditional\stdclib\memset.asm
_3jEnd 0x004044 program static C:\MCC18\src\traditional\stdclib\memset.asm
_D10KTCYXCODE_0010 0x00444e program static C:\MCC18\src\traditional\delays\d10ktcyx.asm
@@ -424,7 +424,7 @@ USER_USB_CALLBACK_EVENT_HANDLER 0x0019c0 program extern C:\krobot\elec\
___for_lbl00057 0x002bd4 program static
___for_lbl00058 0x002bde program static
___for_lbl00060 0x002b60 program static
- ___if_lbl00017 0x000a2e program static
+ ___if_lbl00017 0x000a2a program static
___if_lbl00019 0x000a40 program static
___if_lbl00024 0x000ab2 program static
___if_lbl00028 0x000b4c program static
@@ -722,7 +722,7 @@ USER_USB_CALLBACK_EVENT_HANDLER 0x0019c0 program extern C:\krobot\elec\
lcd_write_line 0x003c18 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\lcd.c
loop 0x00415e program static
loop 0x0044aa program static
- main 0x00097e program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ main 0x00097a program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
memset 0x00401a program extern C:\MCC18\src\traditional\stdclib\memset.asm
move 0x0038f6 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\mcc.c
pingAX12 0x0029a4 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\ax12.c
@@ -1114,12 +1114,12 @@ USER_USB_CALLBACK_EVENT_HANDLER 0x0019c0 program extern C:\krobot\elec\
Remapped_Low_ISR 0x000818 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
___return_lbl00002 0x00081c program static
YourHighPriorityISRCode 0x000874 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- YourLowPriorityISRCode 0x000938 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- main 0x00097e program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- InitializeSystem 0x000988 program static C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- UserInit 0x000992 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- ProcessIO 0x000a14 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
- ___if_lbl00017 0x000a2e program static
+ YourLowPriorityISRCode 0x000934 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ main 0x00097a program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ InitializeSystem 0x000984 program static C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ UserInit 0x00098e program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ ProcessIO 0x000a10 program extern C:\krobot\elec\boards\Interface_Robot\Firmware\main.c
+ ___if_lbl00017 0x000a2a program static
__tmplbl_1 0x000a36 program static
__tmplbl_0 0x000a3c program static
___if_lbl00019 0x000a40 program static
hooks/post-receive
--
krobot
|
