Author: [email protected]
Date: Wed Mar 25 09:17:11 2009
New Revision: 887
Modified:
trunk/sample/18f2450_usb_cdc.jal
trunk/sample/18f2450_usb_hid_generic.jal
trunk/sample/18f4550_usb_cdc.jal
trunk/sample/18f4550_usb_hid_generic.jal
trunk/test/board/board_18f2450_af.jal
trunk/test/board/board_18f4550_af.jal
trunk/test/peripheral/usb/test_usb_cdc.jal
trunk/test/peripheral/usb/test_usb_hid_generic.jal
Log:
fixed compiler errors due to changes in the device files
Modified: trunk/sample/18f2450_usb_cdc.jal
==============================================================================
--- trunk/sample/18f2450_usb_cdc.jal (original)
+++ trunk/sample/18f2450_usb_cdc.jal Wed Mar 25 09:17:11 2009
@@ -22,7 +22,7 @@
-- use -no-variable-reuse when debugging flags are
-- set due to a compiler issue
--
--- Some instructions for people who want to try Albert's program too:
+-- Some instructions for use:
--
-- 1. Make sure you logon as administrator, or with administrator
privileges,
-- on Windows XP.
@@ -45,14 +45,14 @@
-- 8. Press enter and read the message. Now everything you type will be
echoed
-- back.
--
--- have fun, adapt to your needs
+-- 9. Have fun, adapt to your needs
--
-- ------------------------------------------------------
-- ------------------------------------------------------
--
--
--
--- This file has been generated on 03/25/09 10:21:26, from:
+-- This file has been generated on 03/25/09 17:13:37, from:
-- * board: board_18f2450_af.jal
-- * test : test_usb_cdc.jal
--
@@ -419,9 +419,8 @@
include usb_drv
-- constants
-const byte str_welcome[] = "1234JAL USB CDC RS-232 emulation demo version
0.30 (JALLIB)\nplease wait (takes ~10 seconds) before the device is fully
configured"
+const byte str_welcome[] = "JAL USB CDC RS-232 emulation demo version
0.30 (JALLIB)\nplease wait (takes ~10 seconds) before the device is fully
configured"
const byte str_cdc_welcome[] = "\nJAL USB CDC RS-232 echo demo,
characters will be echoed\n"
--- const byte str_cdc_welcome[] = "12345678"
const byte str_tqbf[] = "The quick brown fox jumps over the lazy dog"
-- variables
Modified: trunk/sample/18f2450_usb_hid_generic.jal
==============================================================================
--- trunk/sample/18f2450_usb_hid_generic.jal (original)
+++ trunk/sample/18f2450_usb_hid_generic.jal Wed Mar 25 09:17:11 2009
@@ -6,10 +6,9 @@
-- This file is part of jallib (http://jallib.googlecode.com)
-- Released under the BSD license
(http://www.opensource.org/licenses/bsd-license.php)
--
--- Description: This application emulates a mouse pointing USB human
interface device
--- (HID), once the USB device has been conifgured and the USB HID is
recognized by
--- the host operating systems, it will move around the mouse pointer
--- --
+-- Description: This sample implements a generic HID device. The advantage
of a generic
+-- HID device is that it can use the HID driver on the HOST operation
system.
+--
--
-- Sources: http://www.usb.org for USB specifications
--
@@ -24,7 +23,7 @@
--
-- compiled with following flags: -loader18 -no-fuse -no-variable-reuse
--
--- This file has been generated on 03/25/09 10:21:19, from:
+-- This file has been generated on 03/25/09 17:13:30, from:
-- * board: board_18f2450_af.jal
-- * test : test_usb_hid_generic.jal
--
@@ -393,7 +392,7 @@
var byte s_fsr1l = FSR1L
var byte s_fsr1h = FSR1H
- if REG_T0IF then
+ if ( INTCON_TMR0IF ) then
num_timer_ints = num_timer_ints + 1
if ( num_timer_ints == 100 ) then
@@ -452,7 +451,7 @@
TMR0 = TMR0 + TMR0_OFFSET
-- Clear timer 0 interrupt flag
- REG_T0IF = low
+ INTCON_TMR0IF = low
end if
-- restore FSR register
Modified: trunk/sample/18f4550_usb_cdc.jal
==============================================================================
--- trunk/sample/18f4550_usb_cdc.jal (original)
+++ trunk/sample/18f4550_usb_cdc.jal Wed Mar 25 09:17:11 2009
@@ -22,7 +22,7 @@
-- use -no-variable-reuse when debugging flags are
-- set due to a compiler issue
--
--- Some instructions for people who want to try Albert's program too:
+-- Some instructions for use:
--
-- 1. Make sure you logon as administrator, or with administrator
privileges,
-- on Windows XP.
@@ -45,14 +45,14 @@
-- 8. Press enter and read the message. Now everything you type will be
echoed
-- back.
--
--- have fun, adapt to your needs
+-- 9. Have fun, adapt to your needs
--
-- ------------------------------------------------------
-- ------------------------------------------------------
--
--
--
--- This file has been generated on 03/25/09 10:21:44, from:
+-- This file has been generated on 03/25/09 17:13:54, from:
-- * board: board_18f4550_af.jal
-- * test : test_usb_cdc.jal
--
@@ -427,9 +427,8 @@
include usb_drv
-- constants
-const byte str_welcome[] = "1234JAL USB CDC RS-232 emulation demo version
0.30 (JALLIB)\nplease wait (takes ~10 seconds) before the device is fully
configured"
+const byte str_welcome[] = "JAL USB CDC RS-232 emulation demo version
0.30 (JALLIB)\nplease wait (takes ~10 seconds) before the device is fully
configured"
const byte str_cdc_welcome[] = "\nJAL USB CDC RS-232 echo demo,
characters will be echoed\n"
--- const byte str_cdc_welcome[] = "12345678"
const byte str_tqbf[] = "The quick brown fox jumps over the lazy dog"
-- variables
Modified: trunk/sample/18f4550_usb_hid_generic.jal
==============================================================================
--- trunk/sample/18f4550_usb_hid_generic.jal (original)
+++ trunk/sample/18f4550_usb_hid_generic.jal Wed Mar 25 09:17:11 2009
@@ -6,10 +6,9 @@
-- This file is part of jallib (http://jallib.googlecode.com)
-- Released under the BSD license
(http://www.opensource.org/licenses/bsd-license.php)
--
--- Description: This application emulates a mouse pointing USB human
interface device
--- (HID), once the USB device has been conifgured and the USB HID is
recognized by
--- the host operating systems, it will move around the mouse pointer
--- --
+-- Description: This sample implements a generic HID device. The advantage
of a generic
+-- HID device is that it can use the HID driver on the HOST operation
system.
+--
--
-- Sources: http://www.usb.org for USB specifications
--
@@ -24,7 +23,7 @@
--
-- compiled with following flags: -loader18 -no-fuse -no-variable-reuse
--
--- This file has been generated on 03/25/09 10:21:36, from:
+-- This file has been generated on 03/25/09 17:13:47, from:
-- * board: board_18f4550_af.jal
-- * test : test_usb_hid_generic.jal
--
@@ -401,7 +400,7 @@
var byte s_fsr1l = FSR1L
var byte s_fsr1h = FSR1H
- if REG_T0IF then
+ if ( INTCON_TMR0IF ) then
num_timer_ints = num_timer_ints + 1
if ( num_timer_ints == 100 ) then
@@ -460,7 +459,7 @@
TMR0 = TMR0 + TMR0_OFFSET
-- Clear timer 0 interrupt flag
- REG_T0IF = low
+ INTCON_TMR0IF = low
end if
-- restore FSR register
Modified: trunk/test/board/board_18f2450_af.jal
==============================================================================
--- trunk/test/board/board_18f2450_af.jal (original)
+++ trunk/test/board/board_18f2450_af.jal Wed Mar 25 09:17:11 2009
@@ -1,6 +1,6 @@
-- ------------------------------------------------------
-- Title: BOARD FILE for [see filename]
--- Author: Albert Faber, Copyright (c) 2008..2008, all rights reserved.
+-- Author: Albert Faber, Copyright (c) 2008..2009, all rights reserved.
-- Adapted-by:
-- Compiler: >=2.4g
--
@@ -12,7 +12,7 @@
-- BOARD DESCRIPTION
-- -----------------
-- --
--- This file is the setup for my homebrew, PICDEM like 18f2550 board
+-- This file is the setup for my homebrew, PICDEM like 18f2450 board
-- The board consist of a reset button switch to gnd (tied to pin1, with
4k7 pull up)
-- A program button switch to gnd (tided to pin24, with 4k7 pull up)
-- A 20 MHz external crystal and 15pf caps connected to OSC1/2
Modified: trunk/test/board/board_18f4550_af.jal
==============================================================================
--- trunk/test/board/board_18f4550_af.jal (original)
+++ trunk/test/board/board_18f4550_af.jal Wed Mar 25 09:17:11 2009
@@ -1,6 +1,6 @@
-- ------------------------------------------------------
-- Title: BOARD FILE for [see filename]
--- Author: Albert Faber, Copyright (c) 2008..2008, all rights reserved.
+-- Author: Albert Faber, Copyright (c) 2008..2009, all rights reserved.
-- Adapted-by:
-- Compiler: >=2.4g
--
Modified: trunk/test/peripheral/usb/test_usb_cdc.jal
==============================================================================
--- trunk/test/peripheral/usb/test_usb_cdc.jal (original)
+++ trunk/test/peripheral/usb/test_usb_cdc.jal Wed Mar 25 09:17:11 2009
@@ -22,7 +22,7 @@
-- use -no-variable-reuse when debugging flags are
-- set due to a compiler issue
--
--- Some instructions for people who want to try Albert's program too:
+-- Some instructions for use:
--
-- 1. Make sure you logon as administrator, or with administrator
privileges,
-- on Windows XP.
@@ -45,7 +45,7 @@
-- 8. Press enter and read the message. Now everything you type will be
echoed
-- back.
--
--- have fun, adapt to your needs
+-- 9. Have fun, adapt to your needs
--
-- ------------------------------------------------------
-- ------------------------------------------------------
@@ -371,9 +371,8 @@
include usb_drv
-- constants
-const byte str_welcome[] = "1234JAL USB CDC RS-232 emulation demo version
0.30 (JALLIB)\nplease wait (takes ~10 seconds) before the device is fully
configured"
+const byte str_welcome[] = "JAL USB CDC RS-232 emulation demo version
0.30 (JALLIB)\nplease wait (takes ~10 seconds) before the device is fully
configured"
const byte str_cdc_welcome[] = "\nJAL USB CDC RS-232 echo demo,
characters will be echoed\n"
--- const byte str_cdc_welcome[] = "12345678"
const byte str_tqbf[] = "The quick brown fox jumps over the lazy dog"
-- variables
Modified: trunk/test/peripheral/usb/test_usb_hid_generic.jal
==============================================================================
--- trunk/test/peripheral/usb/test_usb_hid_generic.jal (original)
+++ trunk/test/peripheral/usb/test_usb_hid_generic.jal Wed Mar 25 09:17:11
2009
@@ -6,10 +6,9 @@
-- This file is part of jallib (http://jallib.googlecode.com)
-- Released under the BSD license
(http://www.opensource.org/licenses/bsd-license.php)
--
--- Description: This application emulates a mouse pointing USB human
interface device
--- (HID), once the USB device has been conifgured and the USB HID is
recognized by
--- the host operating systems, it will move around the mouse pointer
--- --
+-- Description: This sample implements a generic HID device. The advantage
of a generic
+-- HID device is that it can use the HID driver on the HOST operation
system.
+--
--
-- Sources: http://www.usb.org for USB specifications
--
@@ -345,7 +344,7 @@
var byte s_fsr1l = FSR1L
var byte s_fsr1h = FSR1H
- if REG_T0IF then
+ if ( INTCON_TMR0IF ) then
num_timer_ints = num_timer_ints + 1
if ( num_timer_ints == 100 ) then
@@ -404,7 +403,7 @@
TMR0 = TMR0 + TMR0_OFFSET
-- Clear timer 0 interrupt flag
- REG_T0IF = low
+ INTCON_TMR0IF = low
end if
-- restore FSR register
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"jallib" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/jallib?hl=en
-~----------~----~----~----~------~----~------~--~---
