fixed wrong timer issue

Author: atar-axis

tc1-u4/Objects/u4

@@ -1,46 +1,58 @@
-:0C0DD600040841200000040C4120000033
-:03005300020DE3B8
-:010DE30032DD
-:03000B00020DC91A
-:0D0DC900C0E00515E51570020514D0E032FC
-:03001B00020B1FB6
-:100B1F00C0E0C0F0C083C082C0D075D000C000C09C
-:0D0B2F0001C002C003C004C005C006C0071D
-:100B3C00A2B4E4FE33FF7C007D0A120AFFAC06ADC2
-:100B4C0007EC120A7C7BCD7ACC79CC783D1208F874
-:100B5C00C004C005C006C0077466FFFEFD7C3FAB39
-:100B6C000BAA0AA909A8081208F8D003D002D001D0
-:100B7C00D0001208078F0B8E0A8D098C08A2B3E4E3
-:100B8C00FE33FF7C007D0A120AFFAC06AD07EC12A7
-:100B9C000A7C7BCD7ACC79CC783D1208F8C004C0A5
-:100BAC0005C006C0077466FFFEFD7C3FAB0FAA0EA6
-:100BBC00A90DA80C1208F8D003D002D001D0001255
-:100BCC0008078F0F8E0E8D0D8C0CE4FFFE7DA07C24
-:100BDC0040AB0BAA0AA909A8081209FE600A400832
-:100BEC00751A00751B018006751A00751B00E4FF51
-:100BFC00FE7DA07C40AB0FAA0EA90DA80C1209FE1D
-:100C0C00600A4008751C00751D018006751C007576
-:100C1C001D00E51B65137004E51A6512600E851A3C
-:100C2C0012851B137518007519018006751800754F
-:100C3C001900E51D65177004E51C65166006851C1A
-:040C4C0016851D17D5
-:100C5000D007D006D005D004D003D002D001D000F8
-:0B0C6000D0D0D082D083D0F0D0E032A2
-:100D560043B22053B1DF43B20453B1FBE4F510F5BF
-:100D660011F514F515F518F519F512751301F516A3
-:100D7600F517C2B2C2B5D2B4D2B3438F105389F0BD
-:100D8600538E7F758CFC758A1853890F538EBF75E9
-:0E0D96008DFE758B0CD2A9D2ABD28CD28E22E0
-:100DA400E4FDFCC3ED9FEC9E501AE4FAFB00000046
-:100DB40000000BBB00010ABA02F3BB58F00DBD00E2
-:040DC400010C80DFBF
-:010DC8002208
-:100CF700120D56D2AFE510704FE51114601D146048
-:100D07003124027043758702C2B27F017E00120D43
-:100D1700A4D2B575100075110180DAE512451324C8
-:100D2700FF92B2E5176401451670CAF510751102F6
-:100D370080C3E512451324FF92B2E517451670B537
-:0F0D4700C2B5F510F51180ADE4F510F51180A6D9
+:0C0E800004104120000004144120000078
+:03005300020E8D0D
+:010E8D003232
+:03000B00020E32B0
+:100E3200C0E0C0D075D000C004C005C006C007AF76
+:100E42001FAE1EAD1DAC1CEF2401F51FE43EF51EC6
+:100E5200E43DF51DE43CF51CD007D006D005D004D6
+:050E6200D0D0D0E03209
+:03006300020B305D
+:0D0B3000C0E0C0F0C083C082C0D075D00806
+:100B3D00A2B4E4FE33FF7C007D0A120AFFAC0EADB9
+:100B4D000FEC120A7C7BCD7ACC79CC783D1208F86B
+:100B5D00C00CC00DC00EC00F7466FFFEFD7C3FAB18
+:100B6D0013AA12A911A8101208F8D00BD00AD00997
+:100B7D00D0081208078F138E128D118C10A2B3E4BA
+:100B8D00FE33FF7C007D0A120AFFAC0EAD0FEC1296
+:100B9D000A7C7BCD7ACC79CC783D1208F8C00CC09C
+:100BAD000DC00EC00F7466FFFEFD7C3FAB17AA167D
+:100BBD00A915A8141208F8D00BD00AD009D0081224
+:100BCD0008078F178E168D158C14E4FFFE7DA07C03
+:100BDD0040AB13AA12A911A8101209FE600A400811
+:100BED007528007529018006752800752900E4FF18
+:100BFD00FE7DA07C40AB17AA16A915A8141209FEFC
+:100C0D00600A4008752A00752B018006752A00754B
+:100C1D002B00E529651B7004E528651A600E8528F3
+:100C2D001A85291B75260075270180067526007506
+:100C3D002700E52B65217004E52A65206006852ACD
+:040C4D0020852B21B2
+:0B0C5100D0D0D082D083D0F0D0E032B1
+:100D720043B22053B1DF43B20453B1FBE4F51FF594
+:100D82001EF51DF51CF518F519AF1FAE1EAD1DACF5
+:100D92001C8F258E248D238C22F526F527F51A75B6
+:100DA2001B01F520F521C2B2C2B5D2B4D2B3438F32
+:100DB200105389F0538E7F758CFC758A18438E040C
+:100DC20075D7A075D615D2A943AF04D28C438E1025
+:010DD20022FE
+:080DD3008F2F8E2E8D2D8C2C2C
+:100DDB00AF1FAE1EAD1DAC1C8F338E328D318C30E0
+:100DEB00AF2FAE2EAD2DAC2CAB33AA32A931A83020
+:100DFB00C3120B1F4015E533952FFFE532952EFEE1
+:100E0B00E531952DFDE530952CFC22AF2FAE2EADA7
+:100E1B002DAC2C120B11EF2533FFEE3532FEED35D9
+:060E2B0031FDEC3530FC46
+:010E3100229E
+:100E6700AB07AA06AF1FAE1EAD1DAC1C8F258E2487
+:090E77008D238C228A188B1922AC
+:100CE800120D72D2AFE5187078E51914601414600B
+:100CF8002614605624037069758702007F017E0000
+:100D0800805AE527452660DDE51B451A70D7D2B520
+:100D1800C2B27F02FE8045E51A451B24FF92B2E568
+:100D2800216401452070067F03FE120E67AF25AED1
+:100D380024AD23AC22120DD3E47BE87A03F9F8C37F
+:100D4800120B1F50A0E4FFFE8012E51A451B24FF7A
+:100D580092B2E5214520708DC2B5FFFE120E678064
+:0A0D680084E4FFFE120E67020CED9A
 :10080000020AEAE86480F8E933E83360110460F032
 :10081000ED33EC337009E8FCE9FDEAFEEBFF22045E
 :1008200060DED3EB9FEA9EE99DE8C2E78CF0C2F759
@@ -92,18 +104,20 @@
 :100ADC000BEB6014A2D5EB13FCED92E7FD2274FF37
 :100AEC00FCFDFEFF22E480F8A2D574FF13FC7D8090
 :030AFC00E480EFA4
-:03000000020C6B84
-:0C0C6B00787FE4F6D8FD75811D020CB204
+:03000000020C5C93
+:0C0C5C00787FE4F6D8FD758133020CA30C
 :100AFF00EF8DF0A4A8F0CF8CF0A428CE8DF0A42E0B
 :020B0F00FE22C4
 :0E0B1100C3E49FFFE49EFEE49DFDE49CFC22F5
-:100C7700020CF7E493A3F8E493A34003F68001F290
-:100C870008DFF48029E493A3F85407240CC8C3337E
-:100C9700C4540F4420C8834004F456800146F6DF4D
-:100CA700E4800B0102040810204080900DD6E47EFA
-:100CB700019360BCA3FF543F30E509541FFEE49342
-:100CC700A360010ECF54C025E060A840B8E493A309
-:100CD700FAE493A3F8E493A3C8C582C8CAC583CA34
-:100CE700F0A3C8C582C8CAC583CADFE9DEE780BEEC
-:010DE2000010
+:100B1F00EB9FF5F0EA9E42F0E99D42F0E89C45F02C
+:010B2F0022A3
+:100C6800020CE8E493A3F8E493A34003F68001F2AE
+:100C780008DFF48029E493A3F85407240CC8C3338D
+:100C8800C4540F4420C8834004F456800146F6DF5C
+:100C9800E4800B0102040810204080900E80E47E5E
+:100CA800019360BCA3FF543F30E509541FFEE49351
+:100CB800A360010ECF54C025E060A840B8E493A318
+:100CC800FAE493A3F8E493A3C8C582C8CAC583CA43
+:100CD800F0A3C8C582C8CAC583CADFE9DEE780BEFB
+:010E8C000065
 :00000001FF

tc1-u4/Objects/u4.hex

@@ -58,10 +58,11 @@ void timer0_ISR(void) interrupt 1
 	 */
 }
 
-void timer1_ISR(void) interrupt 3
+void timer2_ISR(void) interrupt 12 using 1
 {
 	// TODO: Way too long for an ISR...
 
+
 	static float avg_button = 10;
 	static float avg_avr_online = 10;
 
@@ -87,6 +88,7 @@ void timer1_ISR(void) interrupt 3
 	if (new_avr_online_state != avr_online_state) {
 		avr_online_state = new_avr_online_state;
 	}
+
 }
 
 void setup()
@@ -122,16 +124,16 @@ void setup()
 	SET_BIT(INT_CLKO, 4); // Interrupt on falling edge of INT2/P34 (Button)
 
 	// Timer 0
-	TMOD &= 0xF0;     // Mode 0, 16Bit, Auto Reload
-	CLR_BIT(AUXR, 7); // 12T Mode
+	TMOD &= 0xF0;     // T/C10 Mode 0, 16Bit, Auto Reload
+	CLR_BIT(AUXR, 7); // Timer 0 in 12T Mode
 	TH0 = (65536 - 1000) / 256; // Reload values after overflow, High value
 	TL0 = (65536 - 1000) % 256; // Low value
+	
+	// Timer 2
+	AUXR |= 0x04;		//Timer clock is 1T mode
+	T2L   = 0xA0;		//Initial timer value
+	T2H   = 0x15;		//Initial timer value
 
-	// Timer 1
-	TMOD &= 0x0F;      // Set T/C1 Mode 0, 16Bit, Auto Reload
-	CLR_BIT(AUXR, 6);  // Timer 1 in 12T mode, not 1T mode
-	TH1 = (65536 - 500) / 256; // High byte reload value
-	TL1 = (65536 - 500) % 256; // Low byte reload value
 
 	/* NOTE on Reload Values for STC15 uC:
 	 * Any value written into TH0/TL0 are passed to the reload registers
@@ -140,10 +142,11 @@ void setup()
 	 */
 
 	ET0 = 1; // Enable Timer 0 interrupts
-	ET1 = 1; // Enable Timer 1 interrupts
+	SET_BIT(IE2, 2); // IE2, ET2: Enable Timer 2 interrupts
 
 	TR0 = 1; // Start Timer 0
-	TR1 = 1; // Start Timer 1
+	AUXR |= 0x10;		// Start Timer 2
+	
 }
 
 unsigned long int ticks_since(unsigned long since)
@@ -156,7 +159,7 @@ unsigned long int ticks_since(unsigned long since)
 	return (now + (1 + ULONG_MAX - since));
 }
 
-void set_state(int new_state)
+void transition_to_state(int new_state)
 {
 	state_start_time = system_tick;
 	state = new_state;
@@ -173,15 +176,15 @@ void main()
 		case SLEEP:
 			PCON = 0x02; // Stop/PowerDown Mode
 			_nop_();     // We need at least one NOP after waking up
-			set_state(IDLE);
+			transition_to_state(IDLE);
 
 			break;
 
 		case IDLE:
 			if(button_changed && button_state == LOW){
 				O_BOOST = HIGH;     // powering the booster, avr, 5v rail
 				O_AVR_BUTTON = LOW; // notify avr about the pressed button
-				set_state(BOOT);
+				transition_to_state(BOOT);
 			}
 
 			break;
@@ -190,11 +193,11 @@ void main()
 			O_AVR_BUTTON = button_state;
 
 			if (avr_online_state == HIGH){
-				set_state(ONLINE);
+				transition_to_state(ONLINE);
 			}
 
 			if (ticks_since(state_start_time) > 1000){
-				set_state(SLEEP);
+				transition_to_state(SLEEP);
 			}
 
 			break;
@@ -204,13 +207,13 @@ void main()
 
 			if (avr_online_state == LOW) {
 				O_BOOST = LOW;
-				set_state(SLEEP);
+				transition_to_state(SLEEP);
 			}
 
 			break;
 
 		default:
-			set_state(SLEEP);
+			transition_to_state(SLEEP);
 			break;
 		}