From 5a39bbe11c7d32216d6cbcf7778a4422f078ef85 Mon Sep 17 00:00:00 2001 From: jim Date: Thu, 5 Feb 2009 23:42:14 +0000 Subject: [PATCH] Fix typo in util.h Use pin output to indicate ISR state git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7174 ddd99763-3ecb-0310-9145-efcb8ce7c51f --- firmware/util.h | 2 +- firmware/zoom.c | 4 +++- firmware/zoom.mcw | Bin 41472 -> 41472 bytes 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/firmware/util.h b/firmware/util.h index 8c1ffc7..c86643e 100644 --- a/firmware/util.h +++ b/firmware/util.h @@ -6,7 +6,7 @@ /* Convert from ascii hex digit to number */ uint8_t from_hex(uint8_t ch); extern const uint8_t hex[16]; -int32_t hex_to_u16(char x[4]) +int32_t hex_to_u16(char x[4]); /* Array length */ #define array_len(x) (sizeof(x)/sizeof(x[0])) diff --git a/firmware/zoom.c b/firmware/zoom.c index 252ad9c..77b72d9 100644 --- a/firmware/zoom.c +++ b/firmware/zoom.c @@ -32,7 +32,7 @@ void TISR_HANDLER(5) float i; /* toggle A9 every time an interrupt occurs */ - LATAbits.LATA9 ^= 1; + LATAbits.LATA9 = 1; timer_clear_txif(5); /* Get most recent sample from 12-bit ADC. */ @@ -65,6 +65,8 @@ void TISR_HANDLER(5) /* Now send it out */ dac_cmd = current_to_dac(dac_current); dac_write(dac_cmd); + + LATAbits.LATA9 = 0; } void send_to_pc(uint16_t adc, uint16_t dac) diff --git a/firmware/zoom.mcw b/firmware/zoom.mcw index 2d09df99290d91a7e18e5b60bc54958d130fa398..310cce7f8999181eb51369589ad83dfdfba6326e 100644 GIT binary patch literal 41472 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 hoL`LReXMGJ%;j8Zr_!onn~N5Hwv}!XyZV7`(Z? zbAv4nE^XgQW}*(vqKxgsr13-N2lxO6jV2@rpBAzYBrbKCV~%Yh3-FwK=>q?O*Laef zbKduy^W68G=k#rBUXaZT^4O9rmb8FS6`zPG)oPrGa?R)SYKJ#*ysgadYz~tLS!T7I*dq}= z&j`?JEKHMIr)d?|iB!r@=nq=?8GL2lXyIQ{s zS%S@&LpS|tss+F>931Y0{nF22%VyB>i$d6Exm1zUd$ZGY1M6nkp+}4K5j4Lri~W;$ zN-i6#9WgKT#El1W*#BK>t^WJS_ypq(%{BQ+d2u9q=F_XIzwV;M`1i|yKMO}|Z`{ZN zpawdGZk+$=WBLP606r{N#8mIlN6VV(qTmZ&4iZyj1$2b_^d3fePX@(SUQQw zGJX4DGkp>0(~JQ2QqU~S(B$wF)Cd%2sL2(y7-C<8n$!8TjLIzV9?R_EAgR#x$SJco z2|Q+x9am&3Tv_#{DmtnH1#|U{?JMJMkG(k1avQ#Nh0HtGBe|W86(ax}6_WD!4}0pR zv!9sS*&}}{YxboYYAch;18oNn!g#;qP#aWyU$RY@#+Z0Y^$D}TTOPP2`aY|v;_jF0 zZCdb)yXm*@ySxv(M4uVm@EcCf!qwBY6BPpscJ=LUdp@~p_q7wEsw)_UuCU`9DS`da z451T6Vy=pta(c^x@OIW|rvb5TK^R@(b&NKD%GAeVL3*Z%4MjFVx}i5raFD{=%TpYnRj?Gce?7dQBY*Fe*K3_9EG1ptTtubST^?@Iyd^W4~<0I$%dE1z`=50&f>GSq- zzcp`L^2f!Ue$DaowsJX_jyj#0nI4Oo($PLK)~o&pnEC&X{&)VMiD~v7Ei!{n|IGBA Ns#EY~gMVrb_W;Mr%T@pY