Arduino/DIY-Arduino-variometer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimizations

Browse Source
This commit is contained in:
sinseman
2014-08-30 10:08:17 +02:00
parent 5cfe29fa98
commit ef5cb43d1c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Variometer/Variometer.ino
View File

@@ -11,6 +11,10 @@
#include <RTClib.h> #include <RTClib.h>
#include <Arduino.h> #include <Arduino.h>
/////////////////////////////////////////
bool initialisation = false; //If true, reset and update eeprom memory at arduino start
/////////////////////////////////////////
//////////////////RTC/////////////////////// //////////////////RTC///////////////////////
RTC_DS1307 rtc; RTC_DS1307 rtc;
#define DATE_DAY 1 #define DATE_DAY 1
@@ -91,10 +95,6 @@ MenuItem m_recreset = MenuItem(NULL, MENU_RECRESET); //Reset records
Adafruit_PCD8544 display = Adafruit_PCD8544(PIN_SCLK, PIN_SDIN, PIN_DC, PIN_SCE, PIN_RESET); Adafruit_PCD8544 display = Adafruit_PCD8544(PIN_SCLK, PIN_SDIN, PIN_DC, PIN_SCE, PIN_RESET);
///////////////////////////////////////// /////////////////////////////////////////
/////////////////////////////////////////
bool initialisation = false; //If true, reset and update eeprom memory at arduino start
/////////////////////////////////////////
/////////////////////VARIO///////////////////////// /////////////////////VARIO/////////////////////////
Adafruit_BMP085_Unified bmp085 = Adafruit_BMP085_Unified(10085); //set up bmp085 sensor Adafruit_BMP085_Unified bmp085 = Adafruit_BMP085_Unified(10085); //set up bmp085 sensor
#define ALTI_TRIGGER 4 //Trigger to start and stop chrono in meter #define ALTI_TRIGGER 4 //Trigger to start and stop chrono in meter
@@ -308,9 +308,9 @@ void renderVarioBar()
float vario_abs = abs(vario); float vario_abs = abs(vario);
display.fillRect(0, 32, 84, 9, WHITE); display.fillRect(0, 32, 84, 9, WHITE);
if (vario >= 0) if (vario >= 0)
display.fillRect(42, 32, round(vario_abs * 15), 8, BLACK); display.fillRect(42, 32, round(vario_abs * 10), 8, BLACK);
else else
display.drawRect(42, 32, -round(vario_abs * 15), 8, BLACK); display.drawRect(42, 32, -round(vario_abs * 10), 8, BLACK);
display.display(); display.display();
} }
@@ -820,7 +820,7 @@ uint8_t getBeepLatency()
uint16_t getBeepFrequency() uint16_t getBeepFrequency()
{ {
int frequency = 790 + (200 * vario); int frequency = 790 + (100 * vario);
return (frequency < 100)? 100: (frequency > 1300)? 1300 :frequency; return (frequency < 100)? 100: (frequency > 1300)? 1300 :frequency;
} }
@@ -922,8 +922,8 @@ void loop()
} }
} }
//every 67 milliseconds, //every 100 milliseconds,
if (millis() >= (get_time1 + 67)) if (millis() >= (get_time1 + 100))
{ {
get_time1 = millis(); get_time1 = millis();