From 5c9cf855af7ac7023068fdbc02bea9851f7a292c Mon Sep 17 00:00:00 2001
From: eddyem <eddyem@yandex.ru>
Date: Wed, 9 Sep 2015 11:33:27 +0300
Subject: [PATCH] Modified VID/PID for working in mustdie

---
 Timelapse_keyboard/Readme.md    |   4 ++--
 Timelapse_keyboard/main.c       |   8 ++++----
 Timelapse_keyboard/main.h       |   8 ++++++++
 Timelapse_keyboard/timelaps.bin | Bin 10392 -> 10384 bytes
 Timelapse_keyboard/usbkeybrd.c  |   8 ++++----
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Timelapse_keyboard/Readme.md b/Timelapse_keyboard/Readme.md
index fad2b00..e124af5 100644
--- a/Timelapse_keyboard/Readme.md
+++ b/Timelapse_keyboard/Readme.md
@@ -19,7 +19,7 @@ To get precision time this tool use GPS module (NEO-6M)
 
 #### Connection diagram
 | Pin  | Function  |
-| :-: |:-|
+| :--: | :-------- |
 | PA0 | Infrared sensor data |
 | PA1 | Laser photoresistor data |
 | PA2 | GPS Rx (MCU Tx) |
@@ -27,7 +27,7 @@ To get precision time this tool use GPS module (NEO-6M)
 | PA4 | GPS PPS signal |
 | PA5 | Trigger (button) switch |
 | PB10 | Ultrasonic "TRIG" pin |
-| PB11 | Ultrasonic "ECHO" pin|
+| PB11 | Ultrasonic "ECHO" pin |
 
 #### Powering devices
 * To power up GPS module you can use +5V or +3.3V.
diff --git a/Timelapse_keyboard/main.c b/Timelapse_keyboard/main.c
index 7035689..c2a5553 100644
--- a/Timelapse_keyboard/main.c
+++ b/Timelapse_keyboard/main.c
@@ -64,7 +64,7 @@ int main(void){
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 	// init systick (1ms)
 	systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8); // Systyck: 72/8=9MHz
-	systick_set_reload(8999); // 9000 pulses: 1kHz
+	systick_set_reload(STK_RVR_DEFAULT_VAL); // 9000 pulses: 1kHz
 	systick_interrupt_enable();
 	systick_counter_enable();
 
@@ -98,7 +98,7 @@ int main(void){
 			GPS_parse_answer(string);
 		}
 		if(trigger_ms != DIDNT_TRIGGERED && trigger_ms != Timer){
-			if(msctr - trigrtm > 500 || trigrtm > msctr){
+			if(msctr - trigrtm > TRIGGER_DEBOUNCE_DELAY || trigrtm > msctr){
 				trigrtm = msctr;
 				P("Trigger time: ");
 				print_time(&trigger_time, trigger_ms);
@@ -107,7 +107,7 @@ int main(void){
 		}
 		for(i = 0; i < ADC_CHANNEL_NUMBER; ++i){
 			if(adc_ms[i] != DIDNT_TRIGGERED && adc_ms[i] != Timer){
-				if(msctr - adctm[i] > 500 || adctm[i] > msctr){
+				if(msctr - adctm[i] > ADC_DEBOUNCE_DELAY || adctm[i] > msctr){
 					adctm[i] = msctr;
 					P("ADC");
 					put_char_to_buf('0'+i);
@@ -125,7 +125,7 @@ int main(void){
 			}
 		}
 		if(ultrasonic_ms != DIDNT_TRIGGERED && ultrasonic_ms != Timer){
-			if(msctr - ultrasonictm > 500 || ultrasonictm > msctr){
+			if(msctr - ultrasonictm > ULTRASONIC_DEBOUNCE_DELAY || ultrasonictm > msctr){
 				ultrasonictm = msctr;
 				P("Ultrasonic time: ");
 				print_time(&ultrasonic_time, ultrasonic_ms);
diff --git a/Timelapse_keyboard/main.h b/Timelapse_keyboard/main.h
index 2f71378..ebfcd50 100644
--- a/Timelapse_keyboard/main.h
+++ b/Timelapse_keyboard/main.h
@@ -50,6 +50,14 @@ extern void *memcpy(void *dest, const void *src, int n);
 
 #define DIDNT_TRIGGERED (2000)
 
+// debounce delays:
+// Trigger (button) - 500ms
+#define TRIGGER_DEBOUNCE_DELAY     (500)
+// ADC debounce - 1000ms
+#define ADC_DEBOUNCE_DELAY         (1000)
+// ultrasonic - 1500ms
+#define ULTRASONIC_DEBOUNCE_DELAY  (1500)
+
 typedef struct{
 	uint8_t H;
 	uint8_t M;
diff --git a/Timelapse_keyboard/timelaps.bin b/Timelapse_keyboard/timelaps.bin
index 4f324ddda2a1c108a03baabc54d070485e4ab715..aa155587c48ca3e22b4ccb1987dab840a044fba2 100755
GIT binary patch
delta 407
zcmbOcI3aKWE2F?>M%MkzoB?VK94ZV93bB(<avWu>n%vJh(ZDFf;nSVqOVYEPm~I$n
z%y;6vDd}<Z2SdUC?-hSVy~RBwGyZ@7{!iH3|I4o=sf76FlLNR!OpAdAnF0-J0@4mZ
zx(!Ho0&x!z&tPRxm=2`p0O|QaS|2Dc0mQ2|&*b7~Wcr~tc@?)4>u;b8>*SBz>Woh&
zOY%fB@^3EXS<ED=uFk*#Qmg~SB0y{m<l9Zw<#%Ru-dxCkm{D{QPyl3O4bb#uKsHF>
zs?DB))43TROnxXM&$wYTqiirMBgf=WrPHb|8Vno^KovefJb{ft0mR3^n_ZQonMC4P
zVi*{h7@3$EIhhz37#SH37`aT|qUx_1l9`*DlUPuks*s&pnUtScl)~WZ8pcp&V93D9
z0#wNiRBH_Mjn!lmH3dew$)Re~1%-hw69-~xAeIMW<;{Q9!Wmh`fXbvMM{3vu0Q!((
AIsgCw

delta 415
zcmbObI3sWYE2G3_M%MkzoDpga94ZV93aOJ%avWv+HMyU2qJeS7ZRyQlf7LVHFwU6o
z#CcQF<K_>Bg8$zu|B88wdq`&d|Ni5ju($u0UrAC43C|h!PY&P`F|7s~WC}E>3rITv
z={_Jm5s0S%@eEc5h50~w4v=0Br1gRF5<t9Z^Gq&&MkWUJ$*Z`XSeexsICv+2<W^^V
zGg*=+no)dnDbHdiQGK8=NU;tOivY1Tknc8Gm*1JudvhWGVMftaKmm}AH9*tX0ofph
zn>Kq2PUmKPG5Mj4JmZedjIzP3i~^HGl}@YrXfSXv09E(^@dP#?4di3s&92JPOd_wD
zofH_D7@3$EIhhz37#SH382L=zqUvuLoS9pYld6!LSW=W(p^%+gnUtScl%il<VZz|*
z8pcp&V93D90@T3_)ME|wuhV25H3des$-ZjS1*L&5lm}vEAXW!r?ag1+!WmiRfXb96
I2Wr>@0B8+m!2kdN

diff --git a/Timelapse_keyboard/usbkeybrd.c b/Timelapse_keyboard/usbkeybrd.c
index 85c1165..095d382 100644
--- a/Timelapse_keyboard/usbkeybrd.c
+++ b/Timelapse_keyboard/usbkeybrd.c
@@ -37,9 +37,9 @@ const struct usb_device_descriptor dev = {
 	.bDeviceSubClass = 0,
 	.bDeviceProtocol = 0,
 	.bMaxPacketSize0 = 64,
-// 0x03EB 0x2042  -  Atmel Keyboard Demo Application
-	.idVendor = 0x03EB,
-	.idProduct = 0x2042,
+// 0x045E 0x005C  - Microsoft Office Keyboard (106/109)
+	.idVendor = 0x045E,
+	.idProduct = 0x005C,
 	.bcdDevice = 0x0200,
 	.iManufacturer = 1,
 	.iProduct = 2,
@@ -154,7 +154,7 @@ const struct usb_config_descriptor config = {
 };
 
 static const char *usb_strings[] = {
-	"Simple matrix keyboard 3x4",
+	"Timelapse keyboard",
 	"EEV",
 	"v01",
 };