Skip to content

Commit 124eaa4

Browse files
author
Ben Hughes
committed
timer library compiles!
1 parent 7f25360 commit 124eaa4

10 files changed

Lines changed: 2700 additions & 1235 deletions

File tree

main.asm

Lines changed: 406 additions & 133 deletions
Large diffs are not rendered by default.

main.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#include "pins.c"
99
#include "utilities.c"
1010
#include "lcd.c"
11+
#include "pwm.c"
1112

12-
// XTAL is twice the clock speed of the p89lpc we're using
13-
// XTAL is in Hz (7.373MHz)
14-
#define XTAL 7373000L
15-
#define BAUD 115200L
13+
char time_string[8];
14+
// display the current time on the LCD
15+
void display_time(void);
1616

1717
// initialize the ports to proper I/O mode
1818
void init_ports();
@@ -37,6 +37,7 @@ void main(void)
3737
LCD_writeString("HI");
3838
LCD_setCursor(0,1);
3939
LCD_writeString("Hello");
40+
4041
lights(0x01);
4142
delay();
4243
}
@@ -57,4 +58,9 @@ void lights(char i) {
5758
light_1 = (i>>1) & 0x01;
5859
}
5960

61+
// display the current time on the LCD
62+
void display_time()
63+
{
64+
time_string[0] = (char)(tenths%10);
65+
}
6066

main.hex

Lines changed: 72 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,73 @@
1-
:1000000002000375810B12025AE582600302006F41
2-
:10001000780079007A007B007C007D00EC4D601C4C
3-
:1000200088828983E493A3A882A9838A828B83F040
4-
:10003000A3AA82AB831CBCFFE31D80E07582007520
5-
:1000400083007C007D00EC4D600AE4F0A31CBCFF43
6-
:10005000F51D80F27582007583007C007D00EC4DFB
7-
:10006000600AE4F0A31CBCFFF51D80F212007D12B3
8-
:1000700001E280FE48490048656C6C6F00E4F508B9
9-
:10008000F50922227A007B00C3EA9464EB64809431
10-
:100090008050147CE87D031CBCFF011DEC4D70F703
11-
:1000A0000ABA00E40B80E122D2A7C2A61201AB0279
12-
:1000B00001DAAA82AB83ACF07D007E00ED2AFFEE70
13-
:1000C0003BF88C018F82888389F012023EFF60200A
14-
:1000D0008F82C002C003C004C005C0061200A8D0B1
15-
:1000E00006D005D004D003D0020DBD00CF0E80CCC9
16-
:1000F00022AA82AB83758210C002C00312014BD0CA
17-
:1001000003D002AC0AE50BC454F0CCC4CC6CCC5484
18-
:10011000F0CC6CFDEC2AFAED3BFB7C007D00C3ECDF
19-
:100120009AED64808BF063F08095F0501D75821419
20-
:10013000C002C003C004C00512014BD005D004D0DA
21-
:1001400003D0020CBC00D70D80D422C2A7C2A612D5
22-
:1001500001AB0201DAC2A512008475823012014B94
23-
:1001600012008475823012014B12008475823012A5
24-
:10017000014B1200847401B50806E4B5090280023F
25-
:10018000800875823812014B800675822812014B57
26-
:1001900075821012014B75820C12014B758206128A
27-
:1001A000014B12008475820102014BE582FA139221
28-
:1001B000A4EAA2E192A3EAA2E292A2EAA2E392A1B5
29-
:1001C000E50845096013EAA2E492A0EAA2E5929745
30-
:1001D000EAA2E69296EA33929422D2A5120084C251
31-
:1001E000A522120225120155758202120232758271
32-
:1001F000411200A81200847582421200A890007477
33-
:1002000075F0801200B2E4F50AF50B9000011200BF
34-
:10021000F190007775F0801200B2758201120232FF
35-
:1002200012008480C375910075920075A40075A5B5
36-
:100230000022E582FA139292EAA2E192932220F739
37-
:100240001430F6148883A88220F507E6A883758306
38-
:100250000022E280F7E49322E0227582002200006F
1+
:1000000002000E00000000000000000201D6758111
2+
:100010004112046EE582600302007A780079007A6A
3+
:10002000007B007C007D00EC4D601C88828983E4AD
4+
:1000300093A3A882A9838A828B83F0A3AA82AB832D
5+
:100040001CBCFFE31D80E07582007583007C007D91
6+
:1000500000EC4D600AE4F0A31CBCFFF51D80F275B6
7+
:1000600082007583007C007D00EC4D600AE4F0A303
8+
:100070001CBCFFF51D80F212008812030780FE48A9
9+
:10008000490048656C6C6F00E4F536F537E4F538E7
10+
:10009000F539227A007B00C3EA9464EB6480948093
11+
:1000A00050147CE87D031CBCFF011DEC4D70F70A69
12+
:1000B000BA00E40B80E122D2A7C2A61201A5020178
13+
:1000C000CEAA82AB83ACF07D007E00ED2AFFEE3B32
14+
:1000D000F88C018F82888389F0120380FF60208F63
15+
:1000E00082C002C003C004C005C0061200B7D0061B
16+
:1000F000D005D004D003D0020DBD00CF0E80CC229D
17+
:10010000AA82AB83758210C002C00312015AD003C9
18+
:10011000D002AC21E522C454F0CCC4CC6CCC54F059
19+
:10012000CC6CFDEC2AFAED3BFB7C007D00C3EC9A25
20+
:10013000ED64808BF063F08095F0501D758214C0E3
21+
:1001400002C003C004C00512015AD005D004D00378
22+
:10015000D0020CBC00D70D80D422C2A7C2A61201C7
23+
:10016000A50201CEC2A512009375823012015A1267
24+
:10017000009375823012015A120093758230120179
25+
:100180005A12009375823812015A75821012015A60
26+
:1001900075820C12015A75820612015A120093756B
27+
:1001A000820102015AE582FA1392A4EAA2E192A323
28+
:1001B000EAA2E292A2EAA2E392A1EAA2E492A0EA6F
29+
:1001C000A2E59297EAA2E69296EA33929422D2A509
30+
:1001D000120093C2A522C020C0E0C0F0C082C0833C
31+
:1001E000C002C003C004C005C006C007C000C001F3
32+
:1001F000C0D075D0001202E875D0080523E523248D
33+
:100200009C5003752300E53845396007C3E5239505
34+
:100210002492B0E53645376007C3E523952592B1B2
35+
:1002200074012526F526E43527F527E43528F52839
36+
:10023000E43529F529C374E8952674039527E495D8
37+
:1002400028E464808529F063F08095F0501EE4F581
38+
:1002500026F527F528F5297401252AF52AE4352BFA
39+
:10026000F52BE4352CF52CE4352DF52D7401252ED8
40+
:10027000F52EE4352FF52FE43530F530E43531F542
41+
:1002800031C37464952EE4952FE49530E464808541
42+
:1002900031F063F08095F0501EE4F52EF52FF53027
43+
:1002A000F53174012532F532E43533F533E4353474
44+
:1002B000F534E43535F535D0D0D001D000D007D0B5
45+
:1002C00006D005D004D003D002D083D082D0F0D0A5
46+
:1002D000E0D02032C28CC28D74F055894401F5897A
47+
:1002E0001202E8D2A9D2AF22C28DC28C758CFE75E3
48+
:1002F0008A90D28C22E4F52AF52BF52CF52DF532D7
49+
:10030000F533F534F5352212034A12016475820281
50+
:100310001203577582411200B71200937582421280
51+
:1003200000B790007F75F0801200C1E4F521F5223E
52+
:1003300090000112010090008275F0801200C175DA
53+
:10034000820112035712009380C3759100759200C9
54+
:1003500075A40075A50022E582FA139292EAA2E143
55+
:1003600092932275100AE4F511F512F513852A828D
56+
:10037000852B83852CF0E52D12041FAA828A3A2250
57+
:1003800020F71430F6148883A88220F507E6A883A6
58+
:1003900075830022E280F7E49322E022F9E510451C
59+
:1003A000114512451360777800C308E51320E73B39
60+
:1003B000E51025E0F510E51133F511E51233F512DE
61+
:1003C000E51333F513E5829510E5839511E5F09576
62+
:1003D00012E9951350D4C3E51313F513E51213F581
63+
:1003E00012E51113F511E51013F510E5829510FCD7
64+
:1003F000E5839511FDE5F09512FEE995134007F9A7
65+
:100400008EF08D838C82C3E51313F513E51213F57B
66+
:1004100012E51113F511E51013F510D8CEE922F904
67+
:10042000C2D530E715D2D5E4C39582F582E4958331
68+
:10043000F583E495F0F5F0E499F9E51330E715E478
69+
:10044000C39510F510E49511F511E49512F512E439
70+
:100450009513F513E912039C30D512E4C39582F588
71+
:1004600082E49583F583E495F0F5F0E499227582B2
72+
:10047000002200000000000000000000000000005A
3973
:00000001FF

main.lkr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
path=C:\CrossIDE\Call51\Bin\..\lib\small
1+
path=C:\Program Files (x86)\CrossIDE\Call51\Bin\..\lib\small
22
lib=libc51.lib
33
lib=libint.lib
44
lib=liblong.lib

0 commit comments

Comments
 (0)