Filamentstr/04_zumbach
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made fix correction blynk.h/blynk.c 16.02.2019 to match BLYNK protocol

Browse Source 
0.6.0
This commit is contained in:
maxxir
2019-03-16 16:09:17 +04:00
parent b6a3e05684
commit 46e1104869
4 changed files with 205 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
19_m1284p_WIZNET_blynk/Application/Blynk/blynkDependency.c
View File

@@ -66,23 +66,25 @@ void digitalWrite(uint8_t pin, uint8_t val)
uint16_t analogRead(uint8_t pin)
{
uint8_t analog_pin = 0;
uint16_t val = 0;
if(pin > 14) analog_pin = pin - 14;
#ifdef WIZNET_WIZ550WEB
uint8_t analog_pin = 0;
if(pin > 14) analog_pin = pin - 14;
//PRINTF("analog_pin = %d\r\n", analog_pin);
val = get_ADC_val(analog_pin);
#elif defined WIZNET_W5500_EVB
uint8_t analog_pin = 0;
if(pin > 14) analog_pin = pin - 14;
PRINTF("analog_pin = %d\r\n", analog_pin);
if(analog_pin == A0) analog_pin = AIN;
PRINTF("changed analog_pin = %d\r\n", analog_pin);
val = get_ADC_val(analog_pin);
#else
if(pin = 6)
if(pin == 6)
{
val = adc_read(6);
}
PRINTF("analog pin %d = %d\r\n", analog_pin, val);
PRINTF("analog pin %d = %d\r\n", pin, val);
#endif
return val;
}
@@ -112,6 +114,7 @@ void analogWrite(uint8_t pin, uint8_t val)
// 2: Input Pull-up
void pinMode(uint8_t pin, pinmode_dir dir)
{
// TODO: Add here example for AVR PULL-UP
#ifdef WIZNET_WIZ550WEB
if(dir == INPUT) IOdata.io[pin] = Input;
else if(dir == INPUT_PULLUP) IOdata.io[pin] = Input;
@@ -137,14 +140,48 @@ void pinMode(uint8_t pin, pinmode_dir dir)
#endif
}
// Virtual Pin Read / Write functions; Not fully supported yet
// Virtual Pin Read
uint16_t virtualRead(uint8_t pin)
{
uint16_t val = 0;
PRINTF("virtual pin %d read\r\n", pin);
return pin;
//Example virtual pin reading
//Override your own handlers here like:
if(pin == 13)
{
//Digital read example from Virtual Pin 13
val = led2_read()?1:0;
PRINTF("LED2 is: %d %s\r\n", val, val?"HIGH":"LOW");
}
else if(pin == 6)
{
//Analog read example from Virtual Pin 6
val = adc_read(6);
PRINTF("analog pin %d = %d\r\n", pin, val);
}
return val;
}
void virtualWrite(uint8_t pin, uint16_t val)
{
PRINTF("virtual pin %d write val %d\r\n", pin, val);
//Example virtual pin writing
//Override your own handlers here like:
if(pin == 15)
{
//Analog write example to Virtual Pin 15
OCR2A = (uint8_t)val;
}
else if(pin == 20)
{
//Digital write example to Virtual Pin 20
if(val == 0)
{
led1_low();
}
else
{
led1_high();
}
}
}