Author: [email protected]
Date: Wed Apr 29 12:11:47 2009
New Revision: 952
Modified:
trunk/include/peripheral/usb/usb_serial.jal
trunk/sample/18f2450_usb_serial.jal
trunk/sample/18f4550_usb_serial.jal
trunk/test/peripheral/usb/test_usb_serial.jal
Log:
minor header fixes for USB serial
Modified: trunk/include/peripheral/usb/usb_serial.jal
==============================================================================
--- trunk/include/peripheral/usb/usb_serial.jal (original)
+++ trunk/include/peripheral/usb/usb_serial.jal Wed Apr 29 12:11:47 2009
@@ -21,6 +21,9 @@
-- ;-- main loop
-- var byte ch
-- forever loop
+-- ; -- call the flush routine on a regular base in the main loop
+-- ; -- in order to keep the USB communicaiton alive
+-- usb_serial_flush()
-- if ( usb_serial_read( ch ) )
-- usb_serial_data = ch -- echo
-- end if
@@ -41,7 +44,6 @@
-- --
-- const byte USB_CDC_RX_BUFFER_SIZE = 0x?? -- set receive FIFO size
-- const byte USB_CDC_TX_BUFFER_SIZE = 0x?? -- set transmit FIFO size
--- const byte USB_CDC_RX_BUFFER_SIZE = 0x?? -- set receive FIFO size
-- const word USB_SERIAL_PRODUCT_ID = 0x???? -- set USB device product ID
-- const word USB_SERIAL_VENDOR_ID = 0x???? -- set USB device vendor ID
-- const byte USB_STRING0[] = { .. } -- set USB language string
@@ -141,8 +143,11 @@
const byte USB_CDC_RX_BUFFER_SIZE = 0x10
end if
+-------------------------------------------------------------------------
+-- USB_CDC_DATA_ENDPOINT specifies the USB CDC Data end point
+-- This usb serial library uses end point 3
+-------------------------------------------------------------------------
const byte USB_CDC_DATA_ENDPOINT = 3
-
-------------------------------------------------------------------------
-- CDC class Functional Descriptors related constants
Modified: trunk/sample/18f2450_usb_serial.jal
==============================================================================
--- trunk/sample/18f2450_usb_serial.jal (original)
+++ trunk/sample/18f2450_usb_serial.jal Wed Apr 29 12:11:47 2009
@@ -1,5 +1,5 @@
--
-----------------------------------------------------------------------------
--- Title: USB CDC demo
+-- Title: demo of usb_serial library
-- Author: Albert Faber, Copyright (c) 2009, all rights reserved.
-- Adapted-by: -
-- Compiler: >=2.4j
@@ -18,43 +18,36 @@
-- Sources: http://www.usb.org for USB specifications
--
-- Notes: compiled with following flags
--- -loader18 -no-fuse
--- use -no-variable-reuse when debugging flags are
--- set due to a compiler issue
---
+-- -loader18 -no-fuse ; when the microchip 18f bootloader is present
+-- add -no-variable-reuse when debugging flags are set due to a compiler
issue
+-- -
-- Some instructions for use:
---
+-- -
-- 1. Make sure you logon as administrator, or with administrator
privileges,
-- on Windows XP.
-- 2. If needed convert to the correct PIC device (change include file),
-- adapt fuses fuses and speed
-- 3. Create a basic board with USB PIC device
--- 4. Compile the program (usb_test_cdc) and transfer into the PIC.
+-- 4. Compile the this file and program the hex file into the PIC.
-- 5. After a (short) while you'll get the "new hardware found" message for
-- "JALLIB Serial". Point Windows manually to the driver in the
-- driver directory xp_drivers The drivers can be found at:
--- http://groups.google.com/group/jallib/files?upload=1
(usb_cdc_drivers_winxp32.zip)
+-- http://groups.google.com/group/jallib/ (usb_cdc_drivers_winxp32.zip)
-- Ignore the warning that this driver doesn't have a certificate.
-- Wait for the installation to complete.
---
-- 6. Open the Windows Device Manager and check out the "ports" section. A
new
-- communications port will be there, with a COM number.
---
-- 7. Open a terminal program (for example HyperTerminal) and select the
COM
-- port you found in the previous step. Pick any baudrate, Windows will
-- accommodate automatically, and use 8-N-1-no for the other settings.
---
-- 8. Press enter and read the message. Now everything you type will be
echoed
-- back.
---
-- 9. Have fun, adapt to your needs
--
-- ------------------------------------------------------
--- ------------------------------------------------------
--
--
---
--- This file has been generated on 04/28/09 21:22:13, from:
+-- This file has been generated on 04/29/09 21:07:02, from:
-- * board: board_18f2450_af.jal
-- * test : test_usb_serial.jal
--
@@ -111,13 +104,9 @@
const byte str_welcome[] = "JALLIB USB Serial Demo app\n"
-- variables
-var word i = 0
-
-- interrupts? No thanks
-while INTCON_GIE loop
- INTCON_GIE = false
-end loop
+INTCON_GIE = false
-- setup the USB serial library
Modified: trunk/sample/18f4550_usb_serial.jal
==============================================================================
--- trunk/sample/18f4550_usb_serial.jal (original)
+++ trunk/sample/18f4550_usb_serial.jal Wed Apr 29 12:11:47 2009
@@ -1,5 +1,5 @@
--
-----------------------------------------------------------------------------
--- Title: USB CDC demo
+-- Title: demo of usb_serial library
-- Author: Albert Faber, Copyright (c) 2009, all rights reserved.
-- Adapted-by: -
-- Compiler: >=2.4j
@@ -18,43 +18,36 @@
-- Sources: http://www.usb.org for USB specifications
--
-- Notes: compiled with following flags
--- -loader18 -no-fuse
--- use -no-variable-reuse when debugging flags are
--- set due to a compiler issue
---
+-- -loader18 -no-fuse ; when the microchip 18f bootloader is present
+-- add -no-variable-reuse when debugging flags are set due to a compiler
issue
+-- -
-- Some instructions for use:
---
+-- -
-- 1. Make sure you logon as administrator, or with administrator
privileges,
-- on Windows XP.
-- 2. If needed convert to the correct PIC device (change include file),
-- adapt fuses fuses and speed
-- 3. Create a basic board with USB PIC device
--- 4. Compile the program (usb_test_cdc) and transfer into the PIC.
+-- 4. Compile the this file and program the hex file into the PIC.
-- 5. After a (short) while you'll get the "new hardware found" message for
-- "JALLIB Serial". Point Windows manually to the driver in the
-- driver directory xp_drivers The drivers can be found at:
--- http://groups.google.com/group/jallib/files?upload=1
(usb_cdc_drivers_winxp32.zip)
+-- http://groups.google.com/group/jallib/ (usb_cdc_drivers_winxp32.zip)
-- Ignore the warning that this driver doesn't have a certificate.
-- Wait for the installation to complete.
---
-- 6. Open the Windows Device Manager and check out the "ports" section. A
new
-- communications port will be there, with a COM number.
---
-- 7. Open a terminal program (for example HyperTerminal) and select the
COM
-- port you found in the previous step. Pick any baudrate, Windows will
-- accommodate automatically, and use 8-N-1-no for the other settings.
---
-- 8. Press enter and read the message. Now everything you type will be
echoed
-- back.
---
-- 9. Have fun, adapt to your needs
--
-- ------------------------------------------------------
--- ------------------------------------------------------
--
--
---
--- This file has been generated on 04/28/09 21:22:34, from:
+-- This file has been generated on 04/29/09 21:07:21, from:
-- * board: board_18f4550_af.jal
-- * test : test_usb_serial.jal
--
@@ -119,13 +112,9 @@
const byte str_welcome[] = "JALLIB USB Serial Demo app\n"
-- variables
-var word i = 0
-
-- interrupts? No thanks
-while INTCON_GIE loop
- INTCON_GIE = false
-end loop
+INTCON_GIE = false
-- setup the USB serial library
Modified: trunk/test/peripheral/usb/test_usb_serial.jal
==============================================================================
--- trunk/test/peripheral/usb/test_usb_serial.jal (original)
+++ trunk/test/peripheral/usb/test_usb_serial.jal Wed Apr 29 12:11:47 2009
@@ -1,5 +1,5 @@
--
-----------------------------------------------------------------------------
--- Title: USB CDC demo
+-- Title: demo of usb_serial library
-- Author: Albert Faber, Copyright (c) 2009, all rights reserved.
-- Adapted-by: -
-- Compiler: >=2.4j
@@ -18,40 +18,33 @@
-- Sources: http://www.usb.org for USB specifications
--
-- Notes: compiled with following flags
--- -loader18 -no-fuse
--- use -no-variable-reuse when debugging flags are
--- set due to a compiler issue
---
+-- -loader18 -no-fuse ; when the microchip 18f bootloader is present
+-- add -no-variable-reuse when debugging flags are set due to a compiler
issue
+-- -
-- Some instructions for use:
---
+-- -
-- 1. Make sure you logon as administrator, or with administrator
privileges,
-- on Windows XP.
-- 2. If needed convert to the correct PIC device (change include file),
-- adapt fuses fuses and speed
-- 3. Create a basic board with USB PIC device
--- 4. Compile the program (usb_test_cdc) and transfer into the PIC.
+-- 4. Compile the this file and program the hex file into the PIC.
-- 5. After a (short) while you'll get the "new hardware found" message for
-- "JALLIB Serial". Point Windows manually to the driver in the
-- driver directory xp_drivers The drivers can be found at:
--- http://groups.google.com/group/jallib/files?upload=1
(usb_cdc_drivers_winxp32.zip)
+-- http://groups.google.com/group/jallib/ (usb_cdc_drivers_winxp32.zip)
-- Ignore the warning that this driver doesn't have a certificate.
-- Wait for the installation to complete.
---
-- 6. Open the Windows Device Manager and check out the "ports" section. A
new
-- communications port will be there, with a COM number.
---
-- 7. Open a terminal program (for example HyperTerminal) and select the
COM
-- port you found in the previous step. Pick any baudrate, Windows will
-- accommodate automatically, and use 8-N-1-no for the other settings.
---
-- 8. Press enter and read the message. Now everything you type will be
echoed
-- back.
---
-- 9. Have fun, adapt to your needs
--
-- ------------------------------------------------------
--- ------------------------------------------------------
---
--
;@jallib use chipdef
@@ -64,13 +57,9 @@
const byte str_welcome[] = "JALLIB USB Serial Demo app\n"
-- variables
-var word i = 0
-
-- interrupts? No thanks
-while INTCON_GIE loop
- INTCON_GIE = false
-end loop
+INTCON_GIE = false
-- setup the USB serial library
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
