From 7d7c43b4c9993af3eb5e32b1ac9fcd83d37b6a6a Mon Sep 17 00:00:00 2001 From: William Harrington Date: Sat, 27 Jul 2019 22:34:16 -0500 Subject: Refactor weekofday to weekOfDay --- build/default/production/ds3231.i | 4 +- build/default/production/ds3231.p1 | 10 +- build/default/production/main.i | 8 +- build/default/production/main.p1 | 18 +-- dist/default/production/I2C_LCD.X.production.cmf | 146 +++++++++++------------ dist/default/production/I2C_LCD.X.production.elf | Bin 31403 -> 31403 bytes dist/default/production/I2C_LCD.X.production.lst | 36 +++--- dist/default/production/I2C_LCD.X.production.map | 10 +- dist/default/production/I2C_LCD.X.production.o | Bin 65755 -> 65755 bytes dist/default/production/I2C_LCD.X.production.rlf | Bin 435063 -> 435063 bytes dist/default/production/I2C_LCD.X.production.sdb | 2 +- dist/default/production/I2C_LCD.X.production.sym | 4 +- ds3231.c | 2 +- main.c | 10 +- main.h | 4 +- 15 files changed, 127 insertions(+), 127 deletions(-) diff --git a/build/default/production/ds3231.i b/build/default/production/ds3231.i index 717d2e9..c360bea 100755 --- a/build/default/production/ds3231.i +++ b/build/default/production/ds3231.i @@ -1764,7 +1764,7 @@ unsigned short I2C_Master_Read(unsigned short); unsigned int sec = 30; unsigned int min = 42; unsigned int hour = 21; -unsigned int dayofweek = 7; +unsigned int dayOfWeek = 7; unsigned int date = 27; unsigned int month = 7; unsigned int year = 19; @@ -1866,7 +1866,7 @@ void Set_DayOfWeek() { I2C_Master_Start(); I2C_Master_Write(0xD0); I2C_Master_Write(3); - I2C_Master_Write(dayofweek); + I2C_Master_Write(dayOfWeek); I2C_Master_Stop(); } diff --git a/build/default/production/ds3231.p1 b/build/default/production/ds3231.p1 index 0594743..c573cb5 100755 --- a/build/default/production/ds3231.p1 +++ b/build/default/production/ds3231.p1 @@ -233,9 +233,9 @@ Version 4.0 HI-TECH Software Intermediate Code -> -> 21 `i `ui ] "5 -[; ;./main.h: 5: unsigned int dayofweek = 7; -[v _dayofweek `ui ~T0 @X0 1 e ] -[i _dayofweek +[; ;./main.h: 5: unsigned int dayOfWeek = 7; +[v _dayOfWeek `ui ~T0 @X0 1 e ] +[i _dayOfWeek -> -> 7 `i `ui ] "6 @@ -495,8 +495,8 @@ Version 4.0 HI-TECH Software Intermediate Code [; ;ds3231.c: 65: I2C_Master_Write(3); [e ( _I2C_Master_Write (1 -> -> 3 `i `ui ] "66 -[; ;ds3231.c: 66: I2C_Master_Write(dayofweek); -[e ( _I2C_Master_Write (1 _dayofweek ] +[; ;ds3231.c: 66: I2C_Master_Write(dayOfWeek); +[e ( _I2C_Master_Write (1 _dayOfWeek ] "67 [; ;ds3231.c: 67: I2C_Master_Stop(); [e ( _I2C_Master_Stop .. ] diff --git a/build/default/production/main.i b/build/default/production/main.i index 94710f3..037b4d1 100755 --- a/build/default/production/main.i +++ b/build/default/production/main.i @@ -1842,7 +1842,7 @@ extern __bank0 __bit __timeout; unsigned int sec = 30; unsigned int min = 42; unsigned int hour = 21; -unsigned int dayofweek = 7; +unsigned int dayOfWeek = 7; unsigned int date = 27; unsigned int month = 7; unsigned int year = 19; @@ -2022,7 +2022,7 @@ int main() { - getWeekDay(dayofweek); + getWeekDay(dayOfWeek); if (sec_chg != sec) { @@ -2104,8 +2104,8 @@ void format_Temperature() { -void getWeekDay(unsigned int dayofweek) { - switch (dayofweek) { +void getWeekDay(unsigned int dayOfWeek) { + switch (dayOfWeek) { case 1: weekday = "Sun"; break; diff --git a/build/default/production/main.p1 b/build/default/production/main.p1 index cf2668c..64b2aa8 100755 --- a/build/default/production/main.p1 +++ b/build/default/production/main.p1 @@ -279,9 +279,9 @@ Version 4.0 HI-TECH Software Intermediate Code -> -> 21 `i `ui ] "5 -[; ;./main.h: 5: unsigned int dayofweek = 7; -[v _dayofweek `ui ~T0 @X0 1 e ] -[i _dayofweek +[; ;./main.h: 5: unsigned int dayOfWeek = 7; +[v _dayOfWeek `ui ~T0 @X0 1 e ] +[i _dayOfWeek -> -> 7 `i `ui ] "6 @@ -483,8 +483,8 @@ Version 4.0 HI-TECH Software Intermediate Code [; ;main.c: 87: format_Temperature(); [e ( _format_Temperature .. ] "91 -[; ;main.c: 91: getWeekDay(dayofweek); -[e ( _getWeekDay (1 _dayofweek ] +[; ;main.c: 91: getWeekDay(dayOfWeek); +[e ( _getWeekDay (1 _dayOfWeek ] "94 [; ;main.c: 94: if (sec_chg != sec) { [e $ ! != _sec_chg _sec 100 ] @@ -679,14 +679,14 @@ Version 4.0 HI-TECH Software Intermediate Code [e :UE 102 ] } "193 -[; ;main.c: 193: void getWeekDay(unsigned int dayofweek) { +[; ;main.c: 193: void getWeekDay(unsigned int dayOfWeek) { [v _getWeekDay `(v ~T0 @X0 1 ef1`ui ] { [e :U _getWeekDay ] -[v _dayofweek `ui ~T0 @X0 1 r1 ] +[v _dayOfWeek `ui ~T0 @X0 1 r1 ] [f ] "194 -[; ;main.c: 194: switch (dayofweek) { +[; ;main.c: 194: switch (dayOfWeek) { [e $U 111 ] { "195 @@ -757,7 +757,7 @@ Version 4.0 HI-TECH Software Intermediate Code } [e $U 110 ] [e :U 111 ] -[e [\ _dayofweek , $ -> -> 1 `i `ui 112 +[e [\ _dayOfWeek , $ -> -> 1 `i `ui 112 , $ -> -> 2 `i `ui 113 , $ -> -> 3 `i `ui 114 , $ -> -> 4 `i `ui 115 diff --git a/dist/default/production/I2C_LCD.X.production.cmf b/dist/default/production/I2C_LCD.X.production.cmf index 9ec38ed..f02dff8 100755 --- a/dist/default/production/I2C_LCD.X.production.cmf +++ b/dist/default/production/I2C_LCD.X.production.cmf @@ -11,7 +11,7 @@ # All addresses and the length are given in unqualified hexadecimal # in delta units. Any other numeric values are decimal. %PSECTS -$C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +$C:\Users\kb0iic\AppData\Local\Temp\s310.o end_init CODE 0 0 0 3 2 config CONFIG 0 2007 2007 1 2 $dist/default/production\I2C_LCD.X.production.o @@ -110,38 +110,38 @@ STRING 1000-1FFF 2 # All other numeric values are in decimal. %LINETAB $dist/default/production\I2C_LCD.X.production.o -7D3 cinit CODE >1340:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D3 cinit CODE >1343:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D3 cinit CODE >1557:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D4 cinit CODE >1558:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D5 cinit CODE >1559:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D6 cinit CODE >1560:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D7 cinit CODE >1561:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D8 cinit CODE >1562:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7D9 cinit CODE >1563:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7DA cinit CODE >1564:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7DB cinit CODE >1565:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7DC cinit CODE >1566:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E1 cinit CODE >1570:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E2 cinit CODE >1571:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E3 cinit CODE >1572:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E4 cinit CODE >1573:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E5 cinit CODE >1574:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E6 cinit CODE >1575:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E7 cinit CODE >1576:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E8 cinit CODE >1577:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7E9 cinit CODE >1578:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7EE cinit CODE >1597:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7EF cinit CODE >1598:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7F0 cinit CODE >1599:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7F1 cinit CODE >1600:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7F6 cinit CODE >1603:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7F7 cinit CODE >1604:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7F8 cinit CODE >1605:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7F9 cinit CODE >1606:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7FC cinit CODE >1612:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7FC cinit CODE >1614:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -7FD cinit CODE >1615:C:\Users\kb0iic\AppData\Local\Temp\s7ls. +7D3 cinit CODE >1340:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D3 cinit CODE >1343:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D3 cinit CODE >1557:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D4 cinit CODE >1558:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D5 cinit CODE >1559:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D6 cinit CODE >1560:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D7 cinit CODE >1561:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D8 cinit CODE >1562:C:\Users\kb0iic\AppData\Local\Temp\s310. +7D9 cinit CODE >1563:C:\Users\kb0iic\AppData\Local\Temp\s310. +7DA cinit CODE >1564:C:\Users\kb0iic\AppData\Local\Temp\s310. +7DB cinit CODE >1565:C:\Users\kb0iic\AppData\Local\Temp\s310. +7DC cinit CODE >1566:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E1 cinit CODE >1570:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E2 cinit CODE >1571:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E3 cinit CODE >1572:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E4 cinit CODE >1573:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E5 cinit CODE >1574:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E6 cinit CODE >1575:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E7 cinit CODE >1576:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E8 cinit CODE >1577:C:\Users\kb0iic\AppData\Local\Temp\s310. +7E9 cinit CODE >1578:C:\Users\kb0iic\AppData\Local\Temp\s310. +7EE cinit CODE >1597:C:\Users\kb0iic\AppData\Local\Temp\s310. +7EF cinit CODE >1598:C:\Users\kb0iic\AppData\Local\Temp\s310. +7F0 cinit CODE >1599:C:\Users\kb0iic\AppData\Local\Temp\s310. +7F1 cinit CODE >1600:C:\Users\kb0iic\AppData\Local\Temp\s310. +7F6 cinit CODE >1603:C:\Users\kb0iic\AppData\Local\Temp\s310. +7F7 cinit CODE >1604:C:\Users\kb0iic\AppData\Local\Temp\s310. +7F8 cinit CODE >1605:C:\Users\kb0iic\AppData\Local\Temp\s310. +7F9 cinit CODE >1606:C:\Users\kb0iic\AppData\Local\Temp\s310. +7FC cinit CODE >1612:C:\Users\kb0iic\AppData\Local\Temp\s310. +7FC cinit CODE >1614:C:\Users\kb0iic\AppData\Local\Temp\s310. +7FD cinit CODE >1615:C:\Users\kb0iic\AppData\Local\Temp\s310. D08 text32 CODE >221:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c D08 text32 CODE >222:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c D10 text32 CODE >223:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c @@ -546,33 +546,33 @@ F64 text2 CODE >14:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\beep.c 296 maintext CODE >94:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c 2A6 maintext CODE >96:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c 2AB maintext CODE >99:C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c -CCE clrtext CODE >1584:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CCE clrtext CODE >1585:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CCF clrtext CODE >1586:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CCF clrtext CODE >1587:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CD0 clrtext CODE >1588:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CD1 clrtext CODE >1589:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CD2 clrtext CODE >1590:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CD3 clrtext CODE >1591:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CD4 clrtext CODE >1592:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CD5 clrtext CODE >1593:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CF7 inittext CODE >1531:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CF7 inittext CODE >1532:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CF8 inittext CODE >1533:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CF9 inittext CODE >1534:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CFA inittext CODE >1535:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CFB inittext CODE >1542:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CFB inittext CODE >1543:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CFE inittext CODE >1544:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -CFF inittext CODE >1545:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D00 inittext CODE >1546:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D01 inittext CODE >1547:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D02 inittext CODE >1548:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D03 inittext CODE >1549:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D04 inittext CODE >1550:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D05 inittext CODE >1551:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D06 inittext CODE >1552:C:\Users\kb0iic\AppData\Local\Temp\s7ls. -D07 inittext CODE >1553:C:\Users\kb0iic\AppData\Local\Temp\s7ls. +CCE clrtext CODE >1584:C:\Users\kb0iic\AppData\Local\Temp\s310. +CCE clrtext CODE >1585:C:\Users\kb0iic\AppData\Local\Temp\s310. +CCF clrtext CODE >1586:C:\Users\kb0iic\AppData\Local\Temp\s310. +CCF clrtext CODE >1587:C:\Users\kb0iic\AppData\Local\Temp\s310. +CD0 clrtext CODE >1588:C:\Users\kb0iic\AppData\Local\Temp\s310. +CD1 clrtext CODE >1589:C:\Users\kb0iic\AppData\Local\Temp\s310. +CD2 clrtext CODE >1590:C:\Users\kb0iic\AppData\Local\Temp\s310. +CD3 clrtext CODE >1591:C:\Users\kb0iic\AppData\Local\Temp\s310. +CD4 clrtext CODE >1592:C:\Users\kb0iic\AppData\Local\Temp\s310. +CD5 clrtext CODE >1593:C:\Users\kb0iic\AppData\Local\Temp\s310. +CF7 inittext CODE >1531:C:\Users\kb0iic\AppData\Local\Temp\s310. +CF7 inittext CODE >1532:C:\Users\kb0iic\AppData\Local\Temp\s310. +CF8 inittext CODE >1533:C:\Users\kb0iic\AppData\Local\Temp\s310. +CF9 inittext CODE >1534:C:\Users\kb0iic\AppData\Local\Temp\s310. +CFA inittext CODE >1535:C:\Users\kb0iic\AppData\Local\Temp\s310. +CFB inittext CODE >1542:C:\Users\kb0iic\AppData\Local\Temp\s310. +CFB inittext CODE >1543:C:\Users\kb0iic\AppData\Local\Temp\s310. +CFE inittext CODE >1544:C:\Users\kb0iic\AppData\Local\Temp\s310. +CFF inittext CODE >1545:C:\Users\kb0iic\AppData\Local\Temp\s310. +D00 inittext CODE >1546:C:\Users\kb0iic\AppData\Local\Temp\s310. +D01 inittext CODE >1547:C:\Users\kb0iic\AppData\Local\Temp\s310. +D02 inittext CODE >1548:C:\Users\kb0iic\AppData\Local\Temp\s310. +D03 inittext CODE >1549:C:\Users\kb0iic\AppData\Local\Temp\s310. +D04 inittext CODE >1550:C:\Users\kb0iic\AppData\Local\Temp\s310. +D05 inittext CODE >1551:C:\Users\kb0iic\AppData\Local\Temp\s310. +D06 inittext CODE >1552:C:\Users\kb0iic\AppData\Local\Temp\s310. +D07 inittext CODE >1553:C:\Users\kb0iic\AppData\Local\Temp\s310. # %SYMTAB Section # An enumeration of all symbols in the program. # The beginning of the section is indicated by %SYMTAB. @@ -614,14 +614,14 @@ _SPEN C7 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o _SYNC 4C4 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o _TXEN 4C5 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o _TXIF 64 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o -___sp 0 0 STACK 2 stack C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +___sp 0 0 STACK 2 stack C:\Users\kb0iic\AppData\Local\Temp\s310.o _date 66 0 BANK0 1 dataBANK0 dist/default/production\I2C_LCD.X.production.o _hour 68 0 BANK0 1 dataBANK0 dist/default/production\I2C_LCD.X.production.o _main 498 0 CODE 0 maintext dist/default/production\I2C_LCD.X.production.o _year 62 0 BANK0 1 dataBANK0 dist/default/production\I2C_LCD.X.production.o btemp 7E 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o _Lcd_Write_Char 1C66 0 CODE 0 text13 dist/default/production\I2C_LCD.X.production.o -start 0 0 CODE 0 init C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +start 0 0 CODE 0 init C:\Users\kb0iic\AppData\Local\Temp\s310.o __size_of___awdiv 0 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o __size_of___awmod 0 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o __size_of_main 0 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o @@ -641,12 +641,12 @@ __Hpowerup 0 0 CODE 0 powerup - _Get_Alarm_Status 1A10 0 CODE 0 text32 dist/default/production\I2C_LCD.X.production.o ___awmod@sign 76 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o _format_DateTimeChars C34 0 CODE 0 text7 dist/default/production\I2C_LCD.X.production.o -intlevel0 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s7ls.o -intlevel1 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s7ls.o -intlevel2 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s7ls.o -intlevel3 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s7ls.o -intlevel4 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s7ls.o -intlevel5 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +intlevel0 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s310.o +intlevel1 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s310.o +intlevel2 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s310.o +intlevel3 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s310.o +intlevel4 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s310.o +intlevel5 0 0 ENTRY 0 functab C:\Users\kb0iic\AppData\Local\Temp\s310.o wtemp0 7E 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o __end_of_Update_Current_Date_Time 838 0 CODE 0 text16 dist/default/production\I2C_LCD.X.production.o __Hfunctab 0 0 ENTRY 0 functab - @@ -655,6 +655,7 @@ __size_of_Lcd_Set_Cursor 0 0 ABS 0 - dist/default/production\I2C_LCD.X.productio ___awdiv@sign 76 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o __Hclrtext 0 0 ABS 0 clrtext - __end_of_Lcd_Write_Char 1CD8 0 CODE 0 text13 dist/default/production\I2C_LCD.X.production.o +getWeekDay@dayOfWeek 70 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o ___wmul@multiplicand 72 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o alarm@i 75 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o alarm@j 77 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o @@ -670,8 +671,8 @@ __end_of___lldiv 498 0 CODE 0 text31 dist/default/production\I2C_LCD.X.productio __end_of___lwdiv 1D50 0 CODE 0 text9 dist/default/production\I2C_LCD.X.production.o __end_of___lwmod 1BFC 0 CODE 0 text8 dist/default/production\I2C_LCD.X.production.o _control_reg 24 0 BANK0 1 bssBANK0 dist/default/production\I2C_LCD.X.production.o -___stackhi 0 0 ABS 0 - C:\Users\kb0iic\AppData\Local\Temp\s7ls.o -___stacklo 0 0 ABS 0 - C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +___stackhi 0 0 ABS 0 - C:\Users\kb0iic\AppData\Local\Temp\s310.o +___stacklo 0 0 ABS 0 - C:\Users\kb0iic\AppData\Local\Temp\s310.o __end_of_Get_Alarm_Status 1A3C 0 CODE 0 text32 dist/default/production\I2C_LCD.X.production.o __end_of_getWeekDay 1CC 0 CODE 0 text3 dist/default/production\I2C_LCD.X.production.o ___lwdiv@quotient 75 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o @@ -703,7 +704,7 @@ _alarm2_hour_0 35 0 BANK0 1 bssBANK0 dist/default/production\I2C_LCD.X.productio _alarm2_hour_1 34 0 BANK0 1 bssBANK0 dist/default/production\I2C_LCD.X.production.o BCD_2_DEC@to_convert 76 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o __size_of_Lcd_Cmd 0 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o -___int_sp 0 0 STACK 2 stack C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +___int_sp 0 0 STACK 2 stack C:\Users\kb0iic\AppData\Local\Temp\s310.o __Hbank0 0 0 ABS 0 bank0 - __Hbank1 0 0 ABS 0 bank1 - __Hbank2 0 0 ABS 0 bank2 - @@ -744,7 +745,6 @@ __Lsfr1 0 0 ABS 0 sfr1 - __Lsfr2 0 0 ABS 0 sfr2 - __Lsfr3 0 0 ABS 0 sfr3 - __Ltext 0 0 ABS 0 text - -getWeekDay@dayofweek 70 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o ___lmul 1D50 0 CODE 0 text30 dist/default/production\I2C_LCD.X.production.o ___wmul 1AA4 0 CODE 0 text25 dist/default/production\I2C_LCD.X.production.o __LcstackBANK0 0 0 ABS 0 cstackBANK0 - @@ -786,7 +786,7 @@ _hour_0 48 0 BANK0 1 bssBANK0 dist/default/production\I2C_LCD.X.production.o _hour_1 47 0 BANK0 1 bssBANK0 dist/default/production\I2C_LCD.X.production.o Lcd_Write_String@a 75 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o Lcd_Write_String@i 77 0 COMMON 1 cstackCOMMON dist/default/production\I2C_LCD.X.production.o -reset_vec 0 0 CODE 0 reset_vec C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +reset_vec 0 0 CODE 0 reset_vec C:\Users\kb0iic\AppData\Local\Temp\s310.o __size_of_Lcd_Clear 0 0 ABS 0 - dist/default/production\I2C_LCD.X.production.o __end_of_format_Temperature 672 0 CODE 0 text4 dist/default/production\I2C_LCD.X.production.o __pdataBANK0 62 0 BANK0 1 dataBANK0 dist/default/production\I2C_LCD.X.production.o diff --git a/dist/default/production/I2C_LCD.X.production.elf b/dist/default/production/I2C_LCD.X.production.elf index 51a824e..391f217 100755 Binary files a/dist/default/production/I2C_LCD.X.production.elf and b/dist/default/production/I2C_LCD.X.production.elf differ diff --git a/dist/default/production/I2C_LCD.X.production.lst b/dist/default/production/I2C_LCD.X.production.lst index 5a80686..51cb0d1 100755 --- a/dist/default/production/I2C_LCD.X.production.lst +++ b/dist/default/production/I2C_LCD.X.production.lst @@ -1,7 +1,7 @@ Microchip MPLAB XC8 Assembler V2.05 build -831301201 - Sat Jul 27 21:52:44 2019 + Sat Jul 27 22:33:52 2019 Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1 processor 16F877A @@ -554,7 +554,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 540 0070 3414 retlw 20 541 0071 3400 retlw 0 542 - 543 ;initializer for _dayofweek + 543 ;initializer for _dayOfWeek 544 0072 3407 retlw 7 545 0073 3400 retlw 0 546 001A _RCREG set 26 @@ -879,7 +879,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 865 00CE __pdataBANK1: 866 00CE _century: 867 00CE ds 2 - 868 00D0 _dayofweek: + 868 00D0 _dayOfWeek: 869 00D0 ds 2 870 871 psect inittext @@ -1029,7 +1029,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1015 0070 Lcd_Port@a: 1016 ; 4 bytes @ 0x0 1017 - 1018 0070 getWeekDay@dayofweek: + 1018 0070 getWeekDay@dayOfWeek: 1019 ; 1 bytes @ 0x0 1020 1021 0070 I2C_Master_Write@data: @@ -1395,9 +1395,9 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1381 ;main.c: 87: format_Temperature(); 1382 0288 120A 118A 22B8 120A 118A fcall _format_Temperature 1383 028D 3007 movlw 7 - 1384 028E 00F0 movwf getWeekDay@dayofweek + 1384 028E 00F0 movwf getWeekDay@dayOfWeek 1385 028F 3000 movlw 0 - 1386 0290 00F1 movwf getWeekDay@dayofweek+1 + 1386 0290 00F1 movwf getWeekDay@dayOfWeek+1 1387 0291 120A 118A 2097 120A 118A fcall _getWeekDay 1388 1389 ;main.c: 94: if (sec_chg != sec) { @@ -1833,7 +1833,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1819 ;; Defined at: 1820 ;; line 193 in file "main.c" 1821 ;; Parameters: Size Location Type - 1822 ;; dayofweek 2 0[COMMON] unsigned int + 1822 ;; dayOfWeek 2 0[COMMON] unsigned int 1823 ;; Auto vars: Size Location Type 1824 ;; None 1825 ;; Return value: Size Location Type @@ -1862,7 +1862,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1848 ;psect for function _getWeekDay 1849 0097 _getWeekDay: 1850 - 1851 ;main.c: 194: switch (dayofweek) { + 1851 ;main.c: 194: switch (dayOfWeek) { 1852 1853 ;incstack = 0 1854 ; Regs used in _getWeekDay: [wreg-fsr0h+status,2+status,0] @@ -1963,7 +1963,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1948 ; direct_byte 11 8 (fixed) 1949 ; jumptable 260 6 (fixed) 1950 ; Chosen strategy is simple_byte - 1951 00C9 0871 movf getWeekDay@dayofweek+1,w + 1951 00C9 0871 movf getWeekDay@dayOfWeek+1,w 1952 00CA 3A00 xorlw 0 ; case 0 1953 00CB 1903 skipnz 1954 00CC 28CE goto l2146 @@ -1978,7 +1978,7 @@ Microchip MPLAB XC8 C Compiler v2.05 (Free license) build 20181220022703 Og1 1963 ; direct_byte 32 11 (fixed) 1964 ; jumptable 263 9 (fixed) 1965 ; Chosen strategy is simple_byte - 1966 00CE 0870 movf getWeekDay@dayofweek,w + 1966 00CE 0870 movf getWeekDay@dayOfWeek,w 1967 00CF 3A01 xorlw 1 ; case 1 1968 00D0 1903 skipnz 1969 00D1 2898 goto l2028 @@ -5757,7 +5757,7 @@ EEDATA 100 0 0 0 0.0% Microchip Technology PIC Macro Assembler V2.05 build -831301201 -Symbol Table Sat Jul 27 21:52:44 2019 +Symbol Table Sat Jul 27 22:33:52 2019 __end_of_format_DateTimeChars 07D3 pc 0002 __CFG_CP$OFF 0000 ___awdiv@sign 0076 @@ -5951,11 +5951,11 @@ Symbol Table ?_I2C_Master_Repeated_Start 0070 ___latbits 0002 __pcstackBANK0 004D ?_format_Temperature 0070 _Get_Alarm_Status 0D08 ?_Lcd_Cmd 0070 - _I2C_Master_Start 0CB8 _I2C_Master_Write 0CC6 - ??_format_Temperature 0079 ___lwdiv@dividend 0072 - ??_Lcd_Set_Cursor 0075 ?___awdiv 0070 - ?___awmod 0070 ?___lldiv 004D - _dayofweek 00D0 ?___lwdiv 0070 + _dayOfWeek 00D0 _I2C_Master_Start 0CB8 + _I2C_Master_Write 0CC6 ??_format_Temperature 0079 + ___lwdiv@dividend 0072 ??_Lcd_Set_Cursor 0075 + ?___awdiv 0070 ?___awmod 0070 + ?___lldiv 004D ?___lwdiv 0070 ?___lwmod 0070 I2C_Master_Write@data 0070 __pstrings 0003 __end_of_I2C_Master_Repeated_Start 0CB8 ___lwdiv@quotient 0075 __size_of_alarm 0043 @@ -5986,8 +5986,8 @@ Symbol Table __ptext17 041C __ptext26 0190 __ptext18 0CC6 __ptext27 0D38 __ptext19 0CBF __ptext28 0D1E - __ptext29 00E6 __size_of_main 006C - getWeekDay@dayofweek 0070 __end_of_Get_Alarm_Status 0D1E + __ptext29 00E6 getWeekDay@dayOfWeek 0070 + __size_of_main 006C __end_of_Get_Alarm_Status 0D1E __size_of_display_Intro 0035 I2C_Master_Read@ack 0070 ??_I2C_Master_Repeated_Start 0070 __end_of_I2C_Master_Start 0CBF __end_of_I2C_Master_Write 0CCE init_ram0 0CFB diff --git a/dist/default/production/I2C_LCD.X.production.map b/dist/default/production/I2C_LCD.X.production.map index 10ccf99..661070e 100755 --- a/dist/default/production/I2C_LCD.X.production.map +++ b/dist/default/production/I2C_LCD.X.production.map @@ -5,7 +5,7 @@ Linker command line: -W-3 --edf=C:\Program Files (x86)\Microchip\xc8\v2.05\pic\dat\en_msgs.txt \ -cs -h+dist/default/production\I2C_LCD.X.production.sym \ --cmf=dist/default/production\I2C_LCD.X.production.cmf -z -Q16F877A \ - -oC:\Users\kb0iic\AppData\Local\Temp\s7ls.2 --defsym=__MPLAB_BUILD=1 \ + -oC:\Users\kb0iic\AppData\Local\Temp\s310.2 --defsym=__MPLAB_BUILD=1 \ -Mdist/default/production/I2C_LCD.X.production.map -E1 -ver=XC8 \ --acfsm=1493 -ASTACK=0110h-016Fh -pstack=STACK -ACODE=00h-07FFhx4 \ -ASTRCODE=00h-01FFFh -ASTRING=00h-0FFhx32 -ACONST=00h-0FFhx32 \ @@ -18,7 +18,7 @@ Linker command line: -pfunctab=ENTRY -ACONFIG=02007h-02007h -pconfig=CONFIG -DCONFIG=2 \ -AIDLOC=02000h-02003h -pidloc=IDLOC -DIDLOC=2 -AEEDATA=00h-0FFh/02100h \ -peeprom_data=EEDATA -DEEDATA=2 -DCODE=2 -DSTRCODE=2 -DSTRING=2 -DCONST=2 \ - -DENTRY=2 -k C:\Users\kb0iic\AppData\Local\Temp\s7ls.o \ + -DENTRY=2 -k C:\Users\kb0iic\AppData\Local\Temp\s310.o \ dist/default/production\I2C_LCD.X.production.o Object code version is 3.11 @@ -28,7 +28,7 @@ Machine type is 16F877A Name Link Load Length Selector Space Scale -C:\Users\kb0iic\AppData\Local\Temp\s7ls.o +C:\Users\kb0iic\AppData\Local\Temp\s310.o end_init 0 0 3 0 0 config 2007 2007 1 400E 0 dist/default/production\I2C_LCD.X.production.o @@ -638,7 +638,7 @@ alarm@numberOfBeeps cstackCOMMON 0070 btemp (abs) 007E clear_ram0 clrtext 0CCE end_of_initialization cinit 07FC -getWeekDay@dayofweek cstackCOMMON 0070 +getWeekDay@dayOfWeek cstackCOMMON 0070 init_fetch0 inittext 0CF7 init_ram0 inittext 0CFB intlevel0 functab 0000 @@ -761,7 +761,7 @@ Total ram usage: 9 bytes Defined at: line 193 in file "main.c" Parameters: Size Location Type - dayofweek 2 0[COMMON] unsigned int + dayOfWeek 2 0[COMMON] unsigned int Auto vars: Size Location Type None Return value: Size Location Type diff --git a/dist/default/production/I2C_LCD.X.production.o b/dist/default/production/I2C_LCD.X.production.o index 50d31c2..d23f320 100755 Binary files a/dist/default/production/I2C_LCD.X.production.o and b/dist/default/production/I2C_LCD.X.production.o differ diff --git a/dist/default/production/I2C_LCD.X.production.rlf b/dist/default/production/I2C_LCD.X.production.rlf index 13a71ee..57b69f2 100755 Binary files a/dist/default/production/I2C_LCD.X.production.rlf and b/dist/default/production/I2C_LCD.X.production.rlf differ diff --git a/dist/default/production/I2C_LCD.X.production.sdb b/dist/default/production/I2C_LCD.X.production.sdb index 1d181a0..de64fe5 100755 --- a/dist/default/production/I2C_LCD.X.production.sdb +++ b/dist/default/production/I2C_LCD.X.production.sdb @@ -253,7 +253,7 @@ "193 C:\Users\kb0iic\MPLABXProjects\I2C_LCD.X\main.c [v _getWeekDay getWeekDay `(v 1 e 1 0 ] { -[v getWeekDay@dayofweek dayofweek `ui 1 p 2 0 ] +[v getWeekDay@dayOfWeek dayOfWeek `ui 1 p 2 0 ] "217 } 0 "156 diff --git a/dist/default/production/I2C_LCD.X.production.sym b/dist/default/production/I2C_LCD.X.production.sym index cb19113..fb39e32 100755 --- a/dist/default/production/I2C_LCD.X.production.sym +++ b/dist/default/production/I2C_LCD.X.production.sym @@ -222,11 +222,11 @@ _Update_Current_Date_Time 339 0 CODE 0 _status_reg CC 0 BANK1 1 __size_of_I2C_Master_Repeated_Start 0 0 ABS 0 _BCD_2_DEC 74 0 CODE 0 +getWeekDay@dayOfWeek 70 0 COMMON 1 __size_of_Read_Alarms_Temp 0 0 ABS 0 __end_of__initialization 7FC 0 CODE 0 Lcd_Write_String@a 75 0 COMMON 1 Lcd_Write_String@i 77 0 COMMON 1 -getWeekDay@dayofweek 70 0 COMMON 1 __end_of___lwdiv EA8 0 CODE 0 _alarm1_sec_0 3D 0 BANK0 1 _Lcd_Cmd D38 0 CODE 0 @@ -443,7 +443,7 @@ text21 1962 196F CODE 1962 0 idataBANK1 E0 E7 CODE E0 0 %locals dist/default/production\I2C_LCD.X.production.o -C:\Users\kb0iic\AppData\Local\Temp\s7ls. +C:\Users\kb0iic\AppData\Local\Temp\s310. 1340 7D3 0 CODE 0 1343 7D3 0 CODE 0 1557 7D3 0 CODE 0 diff --git a/ds3231.c b/ds3231.c index 53a944f..ae90d36 100755 --- a/ds3231.c +++ b/ds3231.c @@ -63,7 +63,7 @@ void Set_DayOfWeek() { I2C_Master_Start(); // Start I2C I2C_Master_Write(0xD0); // RTC Chip address I2C_Master_Write(3); // send register address - I2C_Master_Write(dayofweek); //update day of week + I2C_Master_Write(dayOfWeek); //update day of week I2C_Master_Stop(); } diff --git a/main.c b/main.c index 4fd1b5c..86caf6a 100755 --- a/main.c +++ b/main.c @@ -88,7 +88,7 @@ int main() { // Determine day of the week //UART_send_string("Determining day of week"); - getWeekDay(dayofweek); + getWeekDay(dayOfWeek); // Enter loop and update display if sec changes from DS3231 if (sec_chg != sec) { @@ -112,7 +112,7 @@ int main() { alarm2_status); UART_send_string(buf); sprintf(buf, "%sWKDAY:%s\t%d\t\t%sDAY:%s\t%s\r\n", YELLOW, CLRATTR, - dayofweek, YELLOW, CLRATTR, weekday); + dayOfWeek, YELLOW, CLRATTR, weekday); UART_send_string(buf); sprintf(buf, "%sTEMP:\t%s%c%c%c.%c%cC%s", YELLOW, CLRATTR, temp_sign, temp_2, temp_1, temp_0, 0xB0, CLRATTR); @@ -188,10 +188,10 @@ void format_Temperature() { temp_2 = temperature_msb / 10 + '0'; } -// Determine day of week with dayofweek from DS3231 +// Determine day of week from DS3231 -void getWeekDay(unsigned int dayofweek) { - switch (dayofweek) { +void getWeekDay(unsigned int dayOfWeek) { + switch (dayOfWeek) { case 1: weekday = "Sun"; break; diff --git a/main.h b/main.h index 5b5101f..d51ebe3 100755 --- a/main.h +++ b/main.h @@ -2,7 +2,7 @@ unsigned int sec = 30; unsigned int min = 42; unsigned int hour = 21; -unsigned int dayofweek = 7; +unsigned int dayOfWeek = 7; unsigned int date = 27; unsigned int month = 7; unsigned int year = 19; @@ -44,7 +44,7 @@ void format_DateTimeChars(void); // Format msb and lsb for temperature display void format_Temperature(void); -// Determine day of week with dayofweek from DS3231 +// Determine day of week from DS3231 void getWeekDay(unsigned int); // Determine Alarm status from control registers -- cgit v1.2.3-54-g00ecf