Revision: 1205
Author: [email protected]
Date: Sun Aug 16 12:22:14 2009
Log: replace var is by alias for _af board files and their derived samples
http://code.google.com/p/jallib/source/detail?r=1205
Modified:
/trunk/include/peripheral/usb/usb_drv.jal
/trunk/include/peripheral/usb/usb_drv_core.jal
/trunk/project/pic18f14k50_usb_io/bootloader/18f14k50_usb_bootloader.hex
/trunk/sample/16f723_i2c_hw_slave_check_bus.jal
/trunk/sample/16f723_i2c_hw_slave_echo.jal
/trunk/sample/16f723_i2c_hw_slave_eeprom_simulator.jal
/trunk/sample/16f723_i2c_hw_slave_msg.jal
/trunk/sample/16f723_i2c_sw_l1.jal
/trunk/sample/16f723_i2c_sw_master_check_bus.jal
/trunk/sample/16f723_i2c_sw_master_echo.jal
/trunk/sample/16f723_pwm_led.jal
/trunk/sample/16f723_pwm_led_highres.jal
/trunk/sample/16f723_pwm_sound.jal
/trunk/sample/16f723_random.jal
/trunk/sample/16f723_serial_format.jal
/trunk/sample/16f723_serial_hardware.jal
/trunk/sample/16f723_serial_hw_int_cts.jal
/trunk/sample/16f723_serial_print.jal
/trunk/sample/16f723_timer0_interval.jal
/trunk/sample/18f14k50_i2c_hw_l0.jal
/trunk/sample/18f14k50_i2c_hw_l1.jal
/trunk/sample/18f14k50_i2c_hw_slave_check_bus.jal
/trunk/sample/18f14k50_i2c_hw_slave_echo.jal
/trunk/sample/18f14k50_i2c_hw_slave_eeprom_simulator.jal
/trunk/sample/18f14k50_i2c_hw_slave_msg.jal
/trunk/sample/18f14k50_i2c_sw_l1.jal
/trunk/sample/18f14k50_i2c_sw_master_check_bus.jal
/trunk/sample/18f14k50_i2c_sw_master_echo.jal
/trunk/sample/18f14k50_random.jal
/trunk/sample/18f14k50_serial_format.jal
/trunk/sample/18f14k50_serial_hardware.jal
/trunk/sample/18f14k50_serial_hw_int_cts.jal
/trunk/sample/18f14k50_serial_print.jal
/trunk/sample/18f14k50_usb_bootloader.jal
/trunk/sample/18f14k50_usb_bootloader_autostart.jal
/trunk/sample/18f2450_i2c_sw_l1.jal
/trunk/sample/18f2450_i2c_sw_master_check_bus.jal
/trunk/sample/18f2450_i2c_sw_master_echo.jal
/trunk/sample/18f2450_lcd_hd44780_4.jal
/trunk/sample/18f2450_random.jal
/trunk/sample/18f2450_serial_format.jal
/trunk/sample/18f2450_serial_hardware.jal
/trunk/sample/18f2450_serial_hw_int_cts.jal
/trunk/sample/18f2450_serial_print.jal
/trunk/sample/18f2450_usb_bootloader.jal
/trunk/sample/18f2450_usb_bootloader_autostart.jal
/trunk/sample/18f4550_i2c_hw_l0.jal
/trunk/sample/18f4550_i2c_hw_l1.jal
/trunk/sample/18f4550_i2c_hw_slave_check_bus.jal
/trunk/sample/18f4550_i2c_hw_slave_echo.jal
/trunk/sample/18f4550_i2c_hw_slave_eeprom_simulator.jal
/trunk/sample/18f4550_i2c_hw_slave_msg.jal
/trunk/sample/18f4550_i2c_sw_l1.jal
/trunk/sample/18f4550_i2c_sw_master_check_bus.jal
/trunk/sample/18f4550_i2c_sw_master_echo.jal
/trunk/sample/18f4550_lcd_hd44780_4.jal
/trunk/sample/18f4550_random.jal
/trunk/sample/18f4550_serial_format.jal
/trunk/sample/18f4550_serial_hardware.jal
/trunk/sample/18f4550_serial_hw_int_cts.jal
/trunk/sample/18f4550_serial_print.jal
/trunk/sample/18f4550_usb_bootloader.jal
/trunk/sample/18f4550_usb_bootloader_autostart.jal
/trunk/test/board/board_16f723_af.jal
/trunk/test/board/board_18f14k50_af.jal
/trunk/test/board/board_18f2450_af.jal
/trunk/test/board/board_18f4550_af.jal
=======================================
--- /trunk/include/peripheral/usb/usb_drv.jal Wed Aug 12 00:26:59 2009
+++ /trunk/include/peripheral/usb/usb_drv.jal Sun Aug 16 12:22:14 2009
@@ -399,11 +399,8 @@
-- obtain request
- var byte req01
- req01 = ( usb_sdp_request_type >>
USB_REQUEST_TYPE0_BIT ) &
0b_0000_0011
-
- case req01 of
- 0x00:
+ case ( usb_sdp_request_type & 0b_0110_000 ) of
+ (0x00 << USB_REQUEST_TYPE0_BIT ):
block
-- serial_hw_write( "S" )
-- standard request
@@ -423,7 +420,7 @@
_usb_handle_standard_request()
end block
- 0x01:
+ (0x01 << USB_REQUEST_TYPE0_BIT ):
block
-- class request
if USB_DEBUG > 0 then
@@ -434,7 +431,7 @@
usb_handle_class_request_callback()
end if
end block
- 0x10:
+ (0x10 << USB_REQUEST_TYPE0_BIT ):
block
-- class request
if USB_DEBUG > 0 then
@@ -874,12 +871,15 @@
--
--------------------------------------------------------------------------------------
procedure _usb_ints_on() is
pragma inline
- UIE= 0x00
- UIE_STALLIE = high -- interrupt on stall
- UIE_TRNIE = high -- on transaction complete
- UIE_URSTIE = high -- on reset
- UIE_SOFIE = high
+ -- set STALLIE, TRNIE, URSTIE, SOFIE, USBIE high
+ UIE= 0b_0110_1011
+-- UIE_STALLIE = high -- interrupt on stall
+-- UIE_TRNIE = high -- on transaction complete
+-- UIE_URSTIE = high -- on reset
+-- UIE_SOFIE = high
+
PIE2_USBIE = low -- general USB interrupts
+
end procedure
=======================================
--- /trunk/include/peripheral/usb/usb_drv_core.jal Wed Aug 12 00:26:59 2009
+++ /trunk/include/peripheral/usb/usb_drv_core.jal Sun Aug 16 12:22:14 2009
@@ -255,8 +255,7 @@
usb_bd2in_stat = 0b_1100_1000
end if
end if
- end block
-
+ end block
3:
block
if USB_EP3 then
=======================================
---
/trunk/project/pic18f14k50_usb_io/bootloader/18f14k50_usb_bootloader.hex
Wed Aug 12 00:26:59 2009
+++
/trunk/project/pic18f14k50_usb_io/bootloader/18f14k50_usb_bootloader.hex
Sun Aug 16 12:22:14 2009
@@ -1,129 +1,130 @@
:020000040000FA
-:0408000006EF04F00B
-:08080800D8EF07F023EF04F024
-:100810001201000200000008D8040B0001000000D3
-:1008200000010902200001010080640904000002A7
-:10083000000000000705810240000007050102409A
-:10084000000004030904D1EF07F0846F7E51E16ECC
-:100850007F51E26E856B43EF04F081518525606F17
-:10086000000E5E6E82515E20616F83515E20626F6A
-:100870006051F66E6151F76E6251F86EF89C090096
-:10088000F550E66E852B8551845DD8A42DEF04F0DC
-:100890001200020104BF120000016D516A5DD8B45C
-:1008A00057EF04F0D8B057EF04F06A516D6FD8805D
-:1008B0006D516B55806F80516C5DD8B465EF04F05D
-:1008C000D8B065EF04F06C51806F780E6B25606FC7
-:1008D000000E5E6E020E5E20616F60510201066FB7
-:1008E000000161510201076F000180510201056F93
-:1008F00004AD7FEF04F0880E046F81EF04F0C80EA2
-:10090000046F000180516B276B516D5D1200080E62
-:100910006C6F6B6B6D6B6A6B0201049D49EF04F0A9
-:100920007E6F7E510201786F080E00016C6F6B6B59
-:10093000010E6D6F010E6A6F0201049D49EF04F014
-:100940000F015489548554835487400E02010C6F63
-:10095000400E096F200E0A6F020E0B6F800E086F9B
-:100960001200840E020100131200080E0201016F32
-:10097000100E026F020E036F030E00016F5DD8A40C
-:10098000C8EF04F08C0E7C6F0201046BCAEF04F018
-:10099000C80E7C6F00017C510201006F12007C6F59
-:1009A000D8907C35806FD8908037D8908037802958
-:1009B0007E6F02EE00F07E51E9267D51EF6E02EE71
-:1009C00000F08051E926800EEF6E12000CADECEFC6
-:1009D00004F0880E0C6F1200C80E0C6F1200550E3A
-:1009E000A76EAA0EA76EA68212002451F86E23519C
-:1009F000F76E2251F66E12000201F9510001696F83
-:100A0000060E695DD8A476EF05F00201FB510001E6
-:100A10007C6F0201FA5100017D6F6D6B010E7C5DF0
-:100A2000D8A425EF05F0120E6D6F780E7E6F020EC2
-:100A30007F6F100E816F080E826F000E4009836F6A
-:100A40006D5125EC04F059EF05F0020E7C5DD8A441
-:100A50003CEF05F0200E6D6F780E7E6F020E7F6FFB
-:100A6000220E816F080E826F000E4009836F6D5158
-:100A700025EC04F059EF05F0030E7C5DD8A457EF88
-:100A800005F07D51D8A459EF05F0040E6D6F780E76
-:100A90007E6F020E7F6F420E816F080E826F000E16
-:100AA0004009836F6D5125EC04F059EF05F0220EDB
-:100AB0007C5D00016D51D8B474EF05F0080E6C6FC9
-:100AC0000201FF51D8A46AEF05F0FE5100016A6FE0
-:100AD0006DEF05F0FF0E00016A6F030E6F6F6B6B19
-:100AE0000201049D49EF04F0B1EF04F0050E695DC9
-:100AF000D8A487EF05F00201FA510001706F010ED2
-:100B00006E6F87EC04F0060E00016F6F1200090E85
-:100B1000695DD8A492EF05F0060E6F6F87EC04F0C4
-:100B2000A0EF04F00A0E695DD8A49CEF05F0030E57
-:100B30006F6F010E90EF04F06951D8A4A3EF05F098
-:100B4000000E90EF04F01200D8906330736FD890CD
-:100B50007333D890733363A4BAEF05F0D8900201D1
-:100B600004310001756FD89075330F0E7515746FD1
-:100B7000C4EF05F0D890020100310001756FD890E4
-:100B800075330F0E7515746F7351D8A44BEF06F0C3
-:100B90000D0E745DD8A4F8EF05F0766B02EE10F040
-:100BA0007651E926EF50606F02EEF8F07651E926B3
-:100BB0006051EF6E762B080E765DD8A4CEEF05F06F
-:100BC0006498B5EC04F00201F8390F0B0001756F61
-:100BD000D8907533030E7515776F7751D8B4FCEF45
-:100BE00004F0010E775DD8B41200100E775D12008C
-:100BF000090E745DD8A41AEF06F0030E6F5DD8B429
-:100C000049EF04F0060E6F5DD8A413EF06F06F6B8A
-:100C1000010E6E5DD8A419EF06F070510F015C6FE4
-:100C200000016E6B1200050E6F5DD8B41200040E49
-:100C30006F5D1200020E745DD8A42DEF06F0030E56
-:100C40006F5DD8B449EF04F0040E6F5DD8B41200A4
-:100C5000060E6F5DD8B46F6B1200010E745DD8A4E0
-:100C600078EF07F0050E6F5DD8A43AEF06F06F6BD2
-:100C7000B5EF04F0020E6F5DD8B4B5EF04F0030ECB
-:100C80006F5DD8A449EF06F0B5EC04F000016F6B7E
-:100C90001200B5EF04F063B41200D8907335766F8C
-:100CA000D8907637D8907637020E7625756F02EE9B
-:100CB00000F07551E926EF50776F030E7625756FBA
-:100CC00002EE00F07551E926EF50786F7629756FC6
-:100CD00002010D6B2051D8A476EF06F0140E226F9E
-:100CE000010E236F040E0D6F6DEF07F0040E205DF3
-:100CF000D8A498EF06F0A69EA69C00017A6B8DEF13
-:100D000006F0225100017A25A96EA68002EE25F098
-:100D10007A51E926A850EF6E7A2B7A510201215DB3
-:100D2000D8A481EF06F0050E21250D6F6DEF07F0B9
-:100D3000010E205DD8B4A2EF06F0060E205DD8A407
-:100D4000BCEF06F0F5EC04F000017A6BB1EF06F0B1
-:100D5000090002EE25F000017A51E926F550EF6E08
-:100D60007A2B7A510201215DD8A4A8EF06F0050E76
-:100D700021250D6F6DEF07F0020E205DD8A4EAEF7C
-:100D800006F0840EA66EF5EC04F0F00EF6160001E7
-:100D9000686BE0EF06F002EE25F000016851E926ED
-:100DA000EF50F56E0D000F0E6815796F0F0E795D1F
-:100DB000D8A4DEEF06F00A00EFEC04F00001682B87
-:100DC00068510201215DD8A4CBEF06F0010E0D6F32
-:100DD0006DEF07F0030E205DD8A40AEF07F0940E24
-:100DE000A66EF5EC04F000017A6B00EF07F0EFEC73
-:100DF00004F0200EF626F650D8B4F72A00017A2B1C
-:100E00007A510201215DD8A4F7EF06F0010E0D6FB3
-:100E10006DEF07F0050E205DD8A42EEF07F000015E
-:100E20007A6B24EF07F0225100017A25A96E02EEB9
-:100E300025F07A51E926EF50A86EEFEC04F0A6B247
-:100E40001FEF07F000017A2B7A510201215DD8A42F
-:100E500013EF07F0010E0D6F6DEF07F0070E205D29
-:100E6000D8A452EF07F0840EA66EF5EC04F0000152
-:100E70007A6B48EF07F002EE25F000017A51E9267F
-:100E8000EF50F56E0C00EFEC04F00D0000017A2B32
-:100E90007A510201215DD8A43BEF07F0010E0D6FDE
-:100EA0006DEF07F0320E205DD8B46DEF07F0FF0E46
-:100EB000205DD8A46DEF07F0FF0E00017A6F7B6F05
-:100EC000646A7A517B11D8B46CEF07F07A077A29FB
-:100ED000D8B47B0761EF07F0FF0002010D51D8A4E1
-:100EE000E6EC04F0400E00017D6F7351CFEF04F08B
-:100EF00012000F015F6B626A0001706B0F01546B8F
-:100F0000556B566B576B586B596B5A6B160E536F6C
-:100F100062A68EEF07F0629688EF07F000016F6B14
-:100F20006E6B6498080E0201056F180E066F020EB4
-:100F3000076F046B080E016F100E026F020E036F35
-:100F40008C0E006F1200A1A4C6EF07F0A19400015F
-:100F5000726B62A6AFEF07F0A4EC05F06296000199
-:100F6000722B040E725DD8A4A9EF07F062A0BCEF4B
-:100F700007F079EC07F0629062BA629A62B8629800
-:100F800062BC629C62A2C6EF07F062921200646AC1
-:100F9000140E616E606A608A60866080608CA094C6
-:100FA0001200F29E94847E50716F7E6ADBEF07F030
-:100FB00004EF04F0110082A4E2EF07F071517E6E9D
-:100FC00000EF04F0C7EC07F0626A646A6486200EE2
-:100FD00002010E6F020E0F6FA3EC07F0ECEF07F0AB
+:0400000021EF00F0FC
+:08000800C5EF03F01201000234
+:1000100000000008D8040B000100000000010902E4
+:1000200020000101008064090400000200000000BB
+:10003000070581024000000705010240000004039B
+:100040000904BEEF03F0846F7E51E16E7F51E26ED2
+:10005000856B41EF00F081518525606F000E5E6E6B
+:1000600082515E20616F83515E20626F6051F66E37
+:100070006151F76E6251F86EF89C0900F550E66E1A
+:10008000852B8551845DD8A42BEF00F0120002016E
+:1000900004BF120000016D516A5DD8B455EF00F045
+:1000A000D8B055EF00F06A516D6FD8806D516B5527
+:1000B000806F80516C5DD8B463EF00F0D8B063EF0F
+:1000C00000F06C51806F780E6B25606F000E5E6ED5
+:1000D000020E5E20616F60510201066F00016151E6
+:1000E0000201076F000180510201056F04AD7DEF31
+:1000F00000F0880E046F7FEF00F0C80E046F00015F
+:1001000080516B276B516D5D1200080E6C6F6B6B2D
+:100110006D6B6A6B0201049D47EF00F07E6F7E51AC
+:100120000201786F080E00016C6F6B6B010E6D6F32
+:10013000010E6A6F0201049D47EF00F0840E020178
+:1001400000131200080E0201016F100E026F020E62
+:10015000036F030E00016F5DD8A4B5EF00F08C0EA5
+:100160007C6F0201046BB7EF00F0C80E7C6F0001DA
+:100170007C510201006F12007C6FD8907C35806F3B
+:10018000D8908037D890803780297E6F02EE00F0BB
+:100190007E51E9267D51EF6E02EE00F08051E92696
+:1001A000800EEF6E12000CADD9EF00F0880E0C6FD0
+:1001B0001200C80E0C6F1200550EA76EAA0EA76E85
+:1001C000A68212002451F86E2351F76E2251F66E6A
+:1001D00012000201F9510001696F060E695DD8A491
+:1001E00063EF01F00201FB5100017C6F0201FA5143
+:1001F00000017D6F6D6B010E7C5DD8A412EF01F0E4
+:10020000120E6D6F780E7E6F020E7F6F0C0E816F77
+:10021000000E826F000E4009836F6D5123EC00F0D9
+:1002200046EF01F0020E7C5DD8A429EF01F0200E0C
+:100230006D6F780E7E6F020E7F6F1E0E816F000E47
+:10024000826F000E4009836F6D5123EC00F046EF82
+:1002500001F0030E7C5DD8A444EF01F07D51D8A4D9
+:1002600046EF01F0040E6D6F780E7E6F020E7F6F09
+:100270003E0E816F000E826F000E4009836F6D513C
+:1002800023EC00F046EF01F0220E7C5D00016D5181
+:10029000D8B461EF01F0080E6C6F0201FF51D8A4D1
+:1002A00057EF01F0FE5100016A6F5AEF01F0FF0EA7
+:1002B00000016A6F030E6F6F6B6B0201049D47EFC5
+:1002C00000F09EEF00F0050E695DD8A474EF01F018
+:1002D0000201FA510001706F010E6E6F85EC00F0A3
+:1002E000060E00016F6F1200090E695DD8A48EEF33
+:1002F00001F0060E6F6F85EC00F00F0154895485F4
+:1003000054835487400E02010C6F400E096F200E7B
+:100310000A6F020E0B6F800E086F12000A0E695DE5
+:10032000D8A498EF01F0030E6F6F010E8EEF00F06E
+:100330006951D8A49FEF01F0000E8EEF00F012007B
+:10034000D8906330736FD8907333D890733363A4AD
+:10035000B6EF01F0D890020104310001756FD8901A
+:1003600075330F0E7515746FC0EF01F0D890020150
+:1003700000310001756FD89075330F0E7515746FCD
+:100380007351D8A445EF02F00D0E745DD8A4F2EFBE
+:1003900001F0766B02EE10F07651E926EF50606FB7
+:1003A00002EEF8F07651E9266051EF6E762B080EDA
+:1003B000765DD8A4CAEF01F06498A2EC00F0300E8C
+:1003C0000201F8150001756F7551D8B4E9EF00F01E
+:1003D000200E755DD8B41200000E755D606F020EC0
+:1003E00060111200090E745DD8A414EF02F0030E20
+:1003F0006F5DD8B447EF00F0060E6F5DD8A40DEF27
+:1004000002F06F6B010E6E5DD8A413EF02F0705115
+:100410000F015C6F00016E6B1200050E6F5DD8B4AA
+:100420001200040E6F5D1200020E745DD8A427EF57
+:1004300002F0030E6F5DD8B447EF00F0040E6F5D5D
+:10044000D8B41200060E6F5DD8B46F6B1200010EA7
+:10045000745DD8A472EF03F0050E6F5DD8A434EF7D
+:1004600002F06F6BA2EF00F0020E6F5DD8B4A2EF46
+:1004700000F0030E6F5DD8A443EF02F0A2EC00F091
+:1004800000016F6B1200A2EF00F063B41200D8906D
+:100490007335766FD8907637D8907637020E7625FA
+:1004A000756F02EE00F07551E926EF50776F030E7D
+:1004B0007625756F02EE00F07551E926EF50786FE2
+:1004C0007629756F02010D6B2051D8A470EF02F0F0
+:1004D000140E226F010E236F040E0D6F67EF03F0F1
+:1004E000040E205DD8A492EF02F0A69EA69C000107
+:1004F0007A6B87EF02F0225100017A25A96EA6805F
+:1005000002EE25F07A51E926A850EF6E7A2B7A5147
+:100510000201215DD8A47BEF02F0050E21250D6FAD
+:1005200067EF03F0010E205DD8B49CEF02F0060ED9
+:10053000205DD8A4B6EF02F0E2EC00F000017A6B87
+:10054000ABEF02F0090002EE25F000017A51E92636
+:10055000F550EF6E7A2B7A510201215DD8A4A2EFFB
+:1005600002F0050E21250D6F67EF03F0020E205DEE
+:10057000D8A4E4EF02F0840EA66EE2EC00F0F00ED8
+:10058000F6160001686BDAEF02F002EE25F00001CA
+:100590006851E926EF50F56E0D000F0E6815796F62
+:1005A0000F0E795DD8A4D8EF02F00A00DCEC00F061
+:1005B0000001682B68510201215DD8A4C5EF02F04B
+:1005C000010E0D6F67EF03F0030E205DD8A404EF5A
+:1005D00003F0940EA66EE2EC00F000017A6BFAEFE5
+:1005E00002F0DCEC00F0200EF626F650D8B4F72A24
+:1005F00000017A2B7A510201215DD8A4F1EF02F0BB
+:10060000010E0D6F67EF03F0050E205DD8A428EFF3
+:1006100003F000017A6B1EEF03F0225100017A25EE
+:10062000A96E02EE25F07A51E926EF50A86EDCECB7
+:1006300000F0A6B219EF03F000017A2B7A51020103
+:10064000215DD8A40DEF03F0010E0D6F67EF03F0ED
+:10065000070E205DD8A44CEF03F0840EA66EE2ECEA
+:1006600000F000017A6B42EF03F002EE25F000018A
+:100670007A51E926EF50F56E0C00DCEC00F00D002D
+:1006800000017A2B7A510201215DD8A435EF03F0E5
+:10069000010E0D6F67EF03F0320E205DD8B467EFE7
+:1006A00003F0FF0E205DD8A467EF03F0FF0E0001FA
+:1006B0007A6F7B6F646A7A517B11D8B466EF03F06E
+:1006C0007A077A29D8B47B075BEF03F0FF000201B9
+:1006D0000D51D8A4D3EC00F0400E00017D6F735192
+:1006E000BCEF00F01200A1A4BDEF03F0A194000143
+:1006F000726B62A67FEF03F0A0EC01F0629600013E
+:10070000722B040E725DD8A479EF03F062A0B3EFF0
+:1007100003F00F015F6B626A0001706B0F01546B95
+:10072000556B566B576B586B596B5A6B160E536F54
+:1007300062A69EEF03F0629698EF03F000016F6BE4
+:100740006E6B6498080E0201056F180E066F020E9C
+:10075000076F046B080E016F100E026F020E036F1D
+:100760008C0E006F629062BA629A62B8629862BC44
+:10077000629C62A2BDEF03F062921200F29E94842A
+:100780007E50716F7E6AC8EF03F004EF04F0110031
+:1007900082A4CFEF03F071517E6E00EF04F0646A23
+:1007A000140E616E6B0E606EA094626A646A648659
+:1007B000200E02010E6F020E0F6F73EC03F0DDEFDF
+:0207C00003F044
+:020000040030CA
+:0E0000000032211E0080C90003C003E003404F
:00000001FF
=======================================
--- /trunk/sample/16f723_i2c_hw_slave_check_bus.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_i2c_hw_slave_check_bus.jal Sun Aug 16 12:22:14 2009
@@ -27,7 +27,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -45,14 +45,12 @@
enable_digital_io()
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
--- whether or not using the serial port
-
-- i2c setup
-- with Start/Stop interrupts
const bit i2c_enable_start_stop_interrupts = true
=======================================
--- /trunk/sample/16f723_i2c_hw_slave_echo.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_i2c_hw_slave_echo.jal Sun Aug 16 12:22:14 2009
@@ -26,7 +26,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -43,13 +43,11 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
-
-
--- whether or not using the serial port
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
+
led_direction = output
include i2c_hw_slave
=======================================
--- /trunk/sample/16f723_i2c_hw_slave_eeprom_simulator.jal Wed Aug 12
00:26:59 2009
+++ /trunk/sample/16f723_i2c_hw_slave_eeprom_simulator.jal Sun Aug 16
12:22:14 2009
@@ -27,7 +27,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -44,13 +44,11 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
-
-
--- whether or not using the serial port
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
+
led_direction = output
-- setup serial (see echo.jal for more details);@jallib section serial
=======================================
--- /trunk/sample/16f723_i2c_hw_slave_msg.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_i2c_hw_slave_msg.jal Sun Aug 16 12:22:14 2009
@@ -34,7 +34,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -51,13 +51,11 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
-
-
--- whether or not using the serial port
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
+
led_direction = output
-- setup serial (see echo.jal for more details);@jallib section serial
=======================================
--- /trunk/sample/16f723_i2c_sw_l1.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_i2c_sw_l1.jal Sun Aug 16 12:22:14 2009
@@ -36,7 +36,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -53,10 +53,10 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_c3
-var volatile bit i2c_scl_direction is pin_c3_direction
-var volatile bit i2c_sda is pin_c4
-var volatile bit i2c_sda_direction is pin_c4_direction
+alias i2c_scl is pin_c3
+alias i2c_scl_direction is pin_c3_direction
+alias i2c_sda is pin_c4
+alias i2c_sda_direction is pin_c4_direction
-- generic setup (see releated examples for more details);@jallib section
serial
const serial_hw_baudrate = 115_200
=======================================
--- /trunk/sample/16f723_i2c_sw_master_check_bus.jal Wed Aug 12 00:26:59
2009
+++ /trunk/sample/16f723_i2c_sw_master_check_bus.jal Sun Aug 16 12:22:14
2009
@@ -26,7 +26,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -45,13 +45,11 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
-
-
--- whether or not using the serial port
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
+
-- blink a little, then send i2c command
led_direction = output
for 8 loop
@@ -63,10 +61,10 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_c3
-var volatile bit i2c_scl_direction is pin_c3_direction
-var volatile bit i2c_sda is pin_c4
-var volatile bit i2c_sda_direction is pin_c4_direction
+alias i2c_scl is pin_c3
+alias i2c_scl_direction is pin_c3_direction
+alias i2c_sda is pin_c4
+alias i2c_sda_direction is pin_c4_direction
-- i2c setup
const word _i2c_bus_speed = 4 ; 400kHz
const bit _i2c_level = true ; i2c levels (not SMB)
=======================================
--- /trunk/sample/16f723_i2c_sw_master_echo.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_i2c_sw_master_echo.jal Sun Aug 16 12:22:14 2009
@@ -30,7 +30,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -47,10 +47,10 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_c3
-var volatile bit i2c_scl_direction is pin_c3_direction
-var volatile bit i2c_sda is pin_c4
-var volatile bit i2c_sda_direction is pin_c4_direction
+alias i2c_scl is pin_c3
+alias i2c_scl_direction is pin_c3_direction
+alias i2c_sda is pin_c4
+alias i2c_sda_direction is pin_c4_direction
-- i2c setup
const word _i2c_bus_speed = 4 ; 400kHz
const bit _i2c_level = true ; i2c levels (not SMB)
=======================================
--- /trunk/sample/16f723_pwm_led.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_pwm_led.jal Sun Aug 16 12:22:14 2009
@@ -23,7 +23,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
=======================================
--- /trunk/sample/16f723_pwm_led_highres.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_pwm_led_highres.jal Sun Aug 16 12:22:14 2009
@@ -22,7 +22,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
=======================================
--- /trunk/sample/16f723_pwm_sound.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_pwm_sound.jal Sun Aug 16 12:22:14 2009
@@ -25,7 +25,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
=======================================
--- /trunk/sample/16f723_random.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_random.jal Sun Aug 16 12:22:14 2009
@@ -30,7 +30,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -47,13 +47,11 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
-
-
--- whether or not using the serial port
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
+
led_direction = output
include delay
=======================================
--- /trunk/sample/16f723_serial_format.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_serial_format.jal Sun Aug 16 12:22:14 2009
@@ -27,7 +27,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -44,13 +44,11 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
-
-
--- whether or not using the serial port
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
+
include delay
-- set all IO as digital
=======================================
--- /trunk/sample/16f723_serial_hardware.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_serial_hardware.jal Sun Aug 16 12:22:14 2009
@@ -33,7 +33,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -50,14 +50,12 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
--- whether or not using the serial port
-
include delay
-- set all IO as digital
=======================================
--- /trunk/sample/16f723_serial_hw_int_cts.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_serial_hw_int_cts.jal Sun Aug 16 12:22:14 2009
@@ -33,7 +33,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -50,14 +50,12 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
--- whether or not using the serial port
-
include delay
-- set all IO as digital
=======================================
--- /trunk/sample/16f723_serial_print.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_serial_print.jal Sun Aug 16 12:22:14 2009
@@ -30,7 +30,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -47,14 +47,12 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
--- whether or not using the serial port
-
include delay
-- set all IO as digital
=======================================
--- /trunk/sample/16f723_timer0_interval.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/16f723_timer0_interval.jal Sun Aug 16 12:22:14 2009
@@ -26,7 +26,7 @@
include 16f723
-- Internal osc, running at 16 MHz
-pragma target clock 16_000_000
+pragma target clock 16_000_000
-- fuses
@@ -43,14 +43,12 @@
pragma target VCAPEN VCAP_FUNCTIONALITY_IS_ENABLED_ON_RA0
;@jallib section led
-- LED IO definition
-var bit led is pin_a7
-var bit led_direction is pin_a7_direction
-var bit led2 is pin_a6
-var bit led2_direction is pin_a6_direction
+alias led is pin_a7
+alias led_direction is pin_a7_direction
+alias led2 is pin_a6
+alias led2_direction is pin_a6_direction
--- whether or not using the serial port
-
led_direction = output
led2_direction = output
=======================================
--- /trunk/sample/18f14k50_i2c_hw_l0.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_hw_l0.jal Sun Aug 16 12:22:14 2009
@@ -79,10 +79,10 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_b6
-var volatile bit i2c_scl_direction is pin_b6_direction
-var volatile bit i2c_sda is pin_b4
-var volatile bit i2c_sda_direction is pin_b4_direction
+alias i2c_scl is pin_b6
+alias i2c_scl_direction is pin_b6_direction
+alias i2c_sda is pin_b4
+alias i2c_sda_direction is pin_b4_direction
-- generic setup (see releated examples for more details);@jallib section
serial
=======================================
--- /trunk/sample/18f14k50_i2c_hw_l1.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_hw_l1.jal Sun Aug 16 12:22:14 2009
@@ -79,10 +79,10 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_b6
-var volatile bit i2c_scl_direction is pin_b6_direction
-var volatile bit i2c_sda is pin_b4
-var volatile bit i2c_sda_direction is pin_b4_direction
+alias i2c_scl is pin_b6
+alias i2c_scl_direction is pin_b6_direction
+alias i2c_sda is pin_b4
+alias i2c_sda_direction is pin_b4_direction
-- generic setup (see releated examples for more details);@jallib section
serial
=======================================
--- /trunk/sample/18f14k50_i2c_hw_slave_check_bus.jal Mon Jul 27 14:40:40
2009
+++ /trunk/sample/18f14k50_i2c_hw_slave_check_bus.jal Sun Aug 16 12:22:14
2009
@@ -71,10 +71,10 @@
enable_digital_io()
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
-- i2c setup
-- with Start/Stop interrupts
=======================================
--- /trunk/sample/18f14k50_i2c_hw_slave_echo.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_hw_slave_echo.jal Sun Aug 16 12:22:14 2009
@@ -69,10 +69,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
led_direction = output
include i2c_hw_slave
=======================================
--- /trunk/sample/18f14k50_i2c_hw_slave_eeprom_simulator.jal Mon Jul 27
14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_hw_slave_eeprom_simulator.jal Sun Aug 16
12:22:14 2009
@@ -70,10 +70,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
led_direction = output
-- setup serial (see echo.jal for more details);@jallib section serial
=======================================
--- /trunk/sample/18f14k50_i2c_hw_slave_msg.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_hw_slave_msg.jal Sun Aug 16 12:22:14 2009
@@ -77,10 +77,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
led_direction = output
-- setup serial (see echo.jal for more details);@jallib section serial
=======================================
--- /trunk/sample/18f14k50_i2c_sw_l1.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_sw_l1.jal Sun Aug 16 12:22:14 2009
@@ -79,10 +79,10 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_b6
-var volatile bit i2c_scl_direction is pin_b6_direction
-var volatile bit i2c_sda is pin_b4
-var volatile bit i2c_sda_direction is pin_b4_direction
+alias i2c_scl is pin_b6
+alias i2c_scl_direction is pin_b6_direction
+alias i2c_sda is pin_b4
+alias i2c_sda_direction is pin_b4_direction
-- generic setup (see releated examples for more details);@jallib section
serial
=======================================
--- /trunk/sample/18f14k50_i2c_sw_master_check_bus.jal Mon Jul 27 14:40:40
2009
+++ /trunk/sample/18f14k50_i2c_sw_master_check_bus.jal Sun Aug 16 12:22:14
2009
@@ -71,10 +71,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
-- blink a little, then send i2c command
led_direction = output
for 8 loop
@@ -86,10 +86,10 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_b6
-var volatile bit i2c_scl_direction is pin_b6_direction
-var volatile bit i2c_sda is pin_b4
-var volatile bit i2c_sda_direction is pin_b4_direction
+alias i2c_scl is pin_b6
+alias i2c_scl_direction is pin_b6_direction
+alias i2c_sda is pin_b4
+alias i2c_sda_direction is pin_b4_direction
-- i2c setup
const word _i2c_bus_speed = 4 ; 400kHz
=======================================
--- /trunk/sample/18f14k50_i2c_sw_master_echo.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_i2c_sw_master_echo.jal Sun Aug 16 12:22:14 2009
@@ -73,10 +73,10 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C
-var volatile bit i2c_scl is pin_b6
-var volatile bit i2c_scl_direction is pin_b6_direction
-var volatile bit i2c_sda is pin_b4
-var volatile bit i2c_sda_direction is pin_b4_direction
+alias i2c_scl is pin_b6
+alias i2c_scl_direction is pin_b6_direction
+alias i2c_sda is pin_b4
+alias i2c_sda_direction is pin_b4_direction
-- i2c setup
const word _i2c_bus_speed = 4 ; 400kHz
=======================================
--- /trunk/sample/18f14k50_random.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_random.jal Sun Aug 16 12:22:14 2009
@@ -73,10 +73,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
led_direction = output
include delay
=======================================
--- /trunk/sample/18f14k50_serial_format.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_serial_format.jal Sun Aug 16 12:22:14 2009
@@ -70,10 +70,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
include delay
-- set all IO as digital
=======================================
--- /trunk/sample/18f14k50_serial_hardware.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_serial_hardware.jal Sun Aug 16 12:22:14 2009
@@ -76,10 +76,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
include delay
=======================================
--- /trunk/sample/18f14k50_serial_hw_int_cts.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_serial_hw_int_cts.jal Sun Aug 16 12:22:14 2009
@@ -76,10 +76,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
include delay
=======================================
--- /trunk/sample/18f14k50_serial_print.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f14k50_serial_print.jal Sun Aug 16 12:22:14 2009
@@ -73,10 +73,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_c4
-var bit led_direction is pin_c4_direction
-var bit led2 is pin_c6
-var bit led2_direction is pin_c6_direction
+alias led is pin_c4
+alias led_direction is pin_c4_direction
+alias led2 is pin_c6
+alias led2_direction is pin_c6_direction
include delay
=======================================
--- /trunk/sample/18f14k50_usb_bootloader.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/18f14k50_usb_bootloader.jal Sun Aug 16 12:22:14 2009
@@ -83,8 +83,8 @@
;@jallib section bootloader
-var volatile bit bootloader_program_pin is pin_c4
-var volatile bit bootloader_program_pin_direction is pin_c4_direction
+alias bootloader_program_pin is pin_c4
+alias bootloader_program_pin_direction is pin_c4_direction
const byte READ_VERSION = 0x00
=======================================
--- /trunk/sample/18f14k50_usb_bootloader_autostart.jal Wed Aug 12 00:26:59
2009
+++ /trunk/sample/18f14k50_usb_bootloader_autostart.jal Sun Aug 16 12:22:14
2009
@@ -91,8 +91,8 @@
;@jallib section bootloader
-var volatile bit bootloader_program_pin is pin_c4
-var volatile bit bootloader_program_pin_direction is pin_c4_direction
+alias bootloader_program_pin is pin_c4
+alias bootloader_program_pin_direction is pin_c4_direction
const byte READ_VERSION = 0x00
=======================================
--- /trunk/sample/18f2450_i2c_sw_l1.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_i2c_sw_l1.jal Sun Aug 16 12:22:14 2009
@@ -73,15 +73,10 @@
pragma target EBTRB DISABLED -- boot block not protected
;@jallib section i2c
--- I2C io definition
-var volatile bit i2c_scl is pin_b4
-var volatile bit i2c_scl_direction is pin_b4_direction
-
--- b3 is pin-compatible with 16f648a board file, b1 is on hardware pins
-;var volatile bit i2c_sda is pin_b3
-;var volatile bit i2c_sda_direction is pin_b3_direction
-var volatile bit i2c_sda is pin_b1
-var volatile bit i2c_sda_direction is pin_b1_direction
+alias i2c_scl is pin_b4
+alias i2c_scl_direction is pin_b4_direction
+alias i2c_sda is pin_b1
+alias i2c_sda_direction is pin_b1_direction
-- generic setup (see releated examples for more details);@jallib section
serial
const serial_hw_baudrate = 115_200
=======================================
--- /trunk/sample/18f2450_i2c_sw_master_check_bus.jal Mon Jul 27 14:40:40
2009
+++ /trunk/sample/18f2450_i2c_sw_master_check_bus.jal Sun Aug 16 12:22:14
2009
@@ -66,10 +66,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
-- blink a little, then send i2c command
led_direction = output
for 8 loop
@@ -80,15 +80,10 @@
end loop
;@jallib section i2c
--- I2C io definition
-var volatile bit i2c_scl is pin_b4
-var volatile bit i2c_scl_direction is pin_b4_direction
-
--- b3 is pin-compatible with 16f648a board file, b1 is on hardware pins
-;var volatile bit i2c_sda is pin_b3
-;var volatile bit i2c_sda_direction is pin_b3_direction
-var volatile bit i2c_sda is pin_b1
-var volatile bit i2c_sda_direction is pin_b1_direction
+alias i2c_scl is pin_b4
+alias i2c_scl_direction is pin_b4_direction
+alias i2c_sda is pin_b1
+alias i2c_sda_direction is pin_b1_direction
-- i2c setup
const word _i2c_bus_speed = 4 ; 400kHz
const bit _i2c_level = true ; i2c levels (not SMB)
=======================================
--- /trunk/sample/18f2450_i2c_sw_master_echo.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_i2c_sw_master_echo.jal Sun Aug 16 12:22:14 2009
@@ -67,15 +67,10 @@
pragma target EBTRB DISABLED -- boot block not protected
;@jallib section i2c
--- I2C io definition
-var volatile bit i2c_scl is pin_b4
-var volatile bit i2c_scl_direction is pin_b4_direction
-
--- b3 is pin-compatible with 16f648a board file, b1 is on hardware pins
-;var volatile bit i2c_sda is pin_b3
-;var volatile bit i2c_sda_direction is pin_b3_direction
-var volatile bit i2c_sda is pin_b1
-var volatile bit i2c_sda_direction is pin_b1_direction
+alias i2c_scl is pin_b4
+alias i2c_scl_direction is pin_b4_direction
+alias i2c_sda is pin_b1
+alias i2c_sda_direction is pin_b1_direction
-- i2c setup
const word _i2c_bus_speed = 4 ; 400kHz
const bit _i2c_level = true ; i2c levels (not SMB)
=======================================
--- /trunk/sample/18f2450_lcd_hd44780_4.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_lcd_hd44780_4.jal Sun Aug 16 12:22:14 2009
@@ -72,21 +72,21 @@
;@jallib section lcd_hd44780_4
-- LCD IO definition
-var bit lcd_rs is pin_b4 -- LCD command/data select.
-var bit lcd_rs_direction is pin_b4_direction
-var bit lcd_en is pin_b0 -- LCD data trigger
-var bit lcd_en_direction is pin_b0_direction
-
-var byte lcd_dataport is porta_low -- LCD data port
-var byte lcd_dataport_direction is porta_low_direction
+alias lcd_rs is pin_b4 -- LCD command/data select.
+alias lcd_rs_direction is pin_b4_direction
+alias lcd_en is pin_b0 -- LCD data trigger
+alias lcd_en_direction is pin_b0_direction
+
+alias lcd_dataport is porta_low -- LCD data port
+alias lcd_dataport_direction is porta_low_direction
const byte LCD_ROWS = 2 -- 2 lines
const byte LCD_CHARS = 16 -- 16 chars per line
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
enable_digital_io()
=======================================
--- /trunk/sample/18f2450_random.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_random.jal Sun Aug 16 12:22:14 2009
@@ -68,10 +68,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
led_direction = output
include delay
=======================================
--- /trunk/sample/18f2450_serial_format.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_serial_format.jal Sun Aug 16 12:22:14 2009
@@ -65,10 +65,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
include delay
-- set all IO as digital
=======================================
--- /trunk/sample/18f2450_serial_hardware.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_serial_hardware.jal Sun Aug 16 12:22:14 2009
@@ -71,10 +71,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
include delay
=======================================
--- /trunk/sample/18f2450_serial_hw_int_cts.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_serial_hw_int_cts.jal Sun Aug 16 12:22:14 2009
@@ -71,10 +71,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
include delay
=======================================
--- /trunk/sample/18f2450_serial_print.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f2450_serial_print.jal Sun Aug 16 12:22:14 2009
@@ -68,10 +68,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
include delay
=======================================
--- /trunk/sample/18f2450_usb_bootloader.jal Wed Aug 12 00:26:59 2009
+++ /trunk/sample/18f2450_usb_bootloader.jal Sun Aug 16 12:22:14 2009
@@ -78,8 +78,8 @@
;@jallib section bootloader
-var volatile bit bootloader_program_pin is pin_b5
-var volatile bit bootloader_program_pin_direction is pin_b5_direction
+alias bootloader_program_pin is pin_b5
+alias bootloader_program_pin_direction is pin_b5_direction
const byte READ_VERSION = 0x00
=======================================
--- /trunk/sample/18f2450_usb_bootloader_autostart.jal Wed Aug 12 00:26:59
2009
+++ /trunk/sample/18f2450_usb_bootloader_autostart.jal Sun Aug 16 12:22:14
2009
@@ -86,8 +86,8 @@
;@jallib section bootloader
-var volatile bit bootloader_program_pin is pin_b5
-var volatile bit bootloader_program_pin_direction is pin_b5_direction
+alias bootloader_program_pin is pin_b5
+alias bootloader_program_pin_direction is pin_b5_direction
const byte READ_VERSION = 0x00
=======================================
--- /trunk/sample/18f4550_i2c_hw_l0.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f4550_i2c_hw_l0.jal Sun Aug 16 12:22:14 2009
@@ -83,16 +83,15 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C, currently mutual exlusive with
display
-- this will be fixed in next board
-var volatile bit i2c_scl is pin_b1
-var volatile bit i2c_scl_direction is pin_b1_direction
-var volatile bit i2c_sda is pin_b0
-var volatile bit i2c_sda_direction is pin_b0_direction
+alias i2c_scl is pin_b1
+alias i2c_scl_direction is pin_b1_direction
+alias i2c_sda is pin_b0
+alias i2c_sda_direction is pin_b0_direction
-- generic setup (see releated examples for more details);@jallib section
serial
const serial_hw_baudrate = 115_200
-
include serial_hardware
serial_hw_init()
include print
=======================================
--- /trunk/sample/18f4550_i2c_hw_l1.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f4550_i2c_hw_l1.jal Sun Aug 16 12:22:14 2009
@@ -83,16 +83,15 @@
;@jallib section i2c
-- I2C io definition, using hardware I2C, currently mutual exlusive with
display
-- this will be fixed in next board
-var volatile bit i2c_scl is pin_b1
-var volatile bit i2c_scl_direction is pin_b1_direction
-var volatile bit i2c_sda is pin_b0
-var volatile bit i2c_sda_direction is pin_b0_direction
+alias i2c_scl is pin_b1
+alias i2c_scl_direction is pin_b1_direction
+alias i2c_sda is pin_b0
+alias i2c_sda_direction is pin_b0_direction
-- generic setup (see releated examples for more details);@jallib section
serial
const serial_hw_baudrate = 115_200
-
include serial_hardware
serial_hw_init()
include print
=======================================
--- /trunk/sample/18f4550_i2c_hw_slave_check_bus.jal Mon Jul 27 14:40:40
2009
+++ /trunk/sample/18f4550_i2c_hw_slave_check_bus.jal Sun Aug 16 12:22:14
2009
@@ -74,10 +74,10 @@
enable_digital_io()
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
-- i2c setup
-- with Start/Stop interrupts
=======================================
--- /trunk/sample/18f4550_i2c_hw_slave_echo.jal Mon Jul 27 14:40:40 2009
+++ /trunk/sample/18f4550_i2c_hw_slave_echo.jal Sun Aug 16 12:22:14 2009
@@ -72,10 +72,10 @@
;@jallib section led
-- LED IO definition
-var bit led is pin_b3
-var bit led_direction is pin_b3_direction
-var bit led2 is pin_b1
-var bit led2_direction is pin_b1_direction
+alias led is pin_b3
+alias led_direction is pin_b3_direction
+alias led2 is pin_b1
+alias led2_direction is pin_b1_direction
led_direction = output
include i2c_hw_slave
=======================================
***Additional files exist in this changeset.***
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
