Author: sebastien.lelong
Date: Sun Jan 4 22:53:29 2009
New Revision: 726
Modified:
trunk/include/peripheral/i2c/i2c_hw_slave.jal
trunk/sample/by_device/16f88/16f88_i2c_sw_master_echo.jal
trunk/sample/test/peripheral/i2c/test_i2c_hw_slave_echo.jal
trunk/tools/jallib.py
Log:
test_i2c_hw_slave_echo.jal: remove delay include (not needed)
jallib.py: fix some carriage return while merging sample generation info
and headers + fix compiling in current dir
16f88_i2c_sw_master_echo.jal: regenerate due to JSG error
i2c_hw_slave.jal: warnings in comments about interrupts being enabled in
init func
Modified: trunk/include/peripheral/i2c/i2c_hw_slave.jal
==============================================================================
--- trunk/include/peripheral/i2c/i2c_hw_slave.jal (original)
+++ trunk/include/peripheral/i2c/i2c_hw_slave.jal Sun Jan 4 22:53:29 2009
@@ -18,6 +18,8 @@
-- - the start_stop_int argument can be set to true to generate
START/STOP interrupts
-- it's usually not necessary, and be useful to implement a master, or
more importantly,
-- can be used to debug an i2c bus (hardware bus check)
+--
+-- /!\ careful: calling this procedure will enable interrupts (global,
peripherals and i2c)
procedure i2c_hw_slave_init(byte in height_bits_icaddress, bit in
start_stop_int) is
-- For testing purpose (checking if slave is responding to START/STOP
signals)
-- you may want to activate 7bits address with interrupts (see spec)
Modified: trunk/sample/by_device/16f88/16f88_i2c_sw_master_echo.jal
==============================================================================
--- trunk/sample/by_device/16f88/16f88_i2c_sw_master_echo.jal (original)
+++ trunk/sample/by_device/16f88/16f88_i2c_sw_master_echo.jal Sun Jan 4
22:53:29 2009
@@ -17,11 +17,14 @@
-- get "b". How great :)
--
-- Sources:
-----
--- This file has been generated on Sun Jan 4 11:40:34 2009, from:
+--
+--
+-- This file has been generated on Mon Jan 5 07:49:56 2009, from:
-- * board: board_16f88_sl.jal
-- * test : test_i2c_sw_master_echo.jal
--
+
+
;@jallib section chipdef
-- chip setup
include 16f88
Modified: trunk/sample/test/peripheral/i2c/test_i2c_hw_slave_echo.jal
==============================================================================
--- trunk/sample/test/peripheral/i2c/test_i2c_hw_slave_echo.jal (original)
+++ trunk/sample/test/peripheral/i2c/test_i2c_hw_slave_echo.jal Sun Jan 4
22:53:29 2009
@@ -24,8 +24,6 @@
-- tell the world we're ready
serial_hw_write("!")
-include delay
-
;@jallib use i2c
include i2c_hw_slave
-- this will be the slave address. It looks like:
Modified: trunk/tools/jallib.py
==============================================================================
--- trunk/tools/jallib.py (original)
+++ trunk/tools/jallib.py Sun Jan 4 22:53:29 2009
@@ -204,10 +204,9 @@
if not srcfile.endswith(".jal"):
print >> sys.stderr, "Can't clean, because
can't know which file is
the source file"
return status
- outdir = os.path.dirname(srcfile)
+ outdir = os.path.dirname(srcfile) or os.path.curdir
outfile = os.path.basename(srcfile)
noext = outfile[:-4]
- print "noext: %s" % noext
for f in os.listdir(outdir):
# luckily all product files have 3-letters
extension
if f[:-4] == noext and f[-4:] in
[".asm",".hex",".err",".cod",".obj",".lst"]:
@@ -928,11 +927,13 @@
test = [t for t in enumerate(test)]
header = extract_header(test)
header = os.linesep.join([h for i,h in header])
- header += os.linesep.join(["--",
+ header += os.linesep.join([
+ os.linesep + "--",
"-- This file has been generated on %s, from:" %
time.strftime("%c",datetime.datetime.now().timetuple()),
"-- * board: %s" % os.path.basename(boardfile),
"-- * test : %s" % os.path.basename(testfile),
- "--"])
+ "--",
+ os.linesep])
# back to content without index
test = [l for i,l in test]
merged = merge_board_testfile(board,test)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
