# HG changeset patch
# User heinrichsweikamp
# Date 1429015811 -7200
# Node ID c87b9f2fb2f65b91e7f9ac11aa59f8df3954f2a7
# Parent  86efd57c158cc6c3bb96fa7759810c2b84cb6d0a
wakeup from deep sleep mode automatically upon USB connect

diff -r 86efd57c158c -r c87b9f2fb2f6 code_part1/OSTC_code_asm_part1/divemode.asm
--- a/code_part1/OSTC_code_asm_part1/divemode.asm	Wed Mar 25 18:24:58 2015 +0100
+++ b/code_part1/OSTC_code_asm_part1/divemode.asm	Tue Apr 14 14:50:11 2015 +0200
@@ -168,7 +168,7 @@
 	call	timeout_divemenu				; Yes, so check for timeout divemenu
 	call	set_leds_divemode				; Sets warnings, if required. Also Sets buzzer
 	btfsc	enter_error_sleep				; Enter Fatal Error Routine?
-	call	fatal_error_sleep				; Yes (In Sleepmode.asm!)
+	goto	fatal_error_sleep				; Yes (In Sleepmode.asm!)
 
 diveloop_loop3:
 	btfss	menubit							; Divemode menu active?
diff -r 86efd57c158c -r c87b9f2fb2f6 code_part1/OSTC_code_asm_part1/sleepmode.asm
--- a/code_part1/OSTC_code_asm_part1/sleepmode.asm	Wed Mar 25 18:24:58 2015 +0100
+++ b/code_part1/OSTC_code_asm_part1/sleepmode.asm	Tue Apr 14 14:50:11 2015 +0200
@@ -64,7 +64,7 @@
 onemin_sleep:
 	call	get_battery_voltage		; get battery voltage
 	btfsc	enter_error_sleep		; Enter Fatal Error Routine?
-	call	fatal_error_sleep		; Yes (In Sleepmode_vxx.asm!)
+	goto	fatal_error_sleep		; Yes (In Sleepmode_vxx.asm!)
 	
     ;---- adjust airpressure compensation any 15 minutes
 	incf	divemins+1,F			; counts to 14...
@@ -214,6 +214,10 @@
 	call	get_battery_voltage			; get battery voltage
 	btfss	enter_error_sleep			; REALLY enter Fatal Error Routine?
 	goto    restart                     ; No
+
+	btfss	CHRG_IN						; If CHRG_IN=0 -> CC active
+    goto    restart                     ; wake up
+
 	bsf		LED_red
 	clrwdt
 	WAIT10US	d'5'
diff -r 86efd57c158c -r c87b9f2fb2f6 code_part1/OSTC_code_asm_part1/surfmode.asm
--- a/code_part1/OSTC_code_asm_part1/surfmode.asm	Wed Mar 25 18:24:58 2015 +0100
+++ b/code_part1/OSTC_code_asm_part1/surfmode.asm	Tue Apr 14 14:50:11 2015 +0200
@@ -143,7 +143,7 @@
     call    DISP_display_gf_surface     ; Display GF (if > CF8).
 
     btfsc	enter_error_sleep			; Enter Fatal Error Routine?
-    call	fatal_error_sleep			; Yes (In Sleepmode.asm!)
+    goto	fatal_error_sleep			; Yes (In Sleepmode.asm!)
     bcf		onesecupdate				; every second tasks done
 	
 surfloop_loop2: