From 6242d52fbc7677eb81e8088a1751e83a340d5b9e Mon Sep 17 00:00:00 2001
From: bymfd <frukolosko@gmail.com>
Date: Fri, 17 May 2019 01:37:07 +0300
Subject: [PATCH] =?UTF-8?q?hata=20denetiminin=20can=C4=B1=20cehenneme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

proje hall effect sensor ile kullanıma geçti otomatik ve manuel mod çalışıyor ama mod değişim butonu yok ekrana görüntü basılmıyor geçiş kodu işte
---
 .idea/arduino-project-settings.xml            |   6 -
 .idea/misc.xml                                |   9 -
 .idea/modules.xml                             |   8 -
 .idea/serialmonitor_settings.xml              |   4 -
 .idea/vcs.xml                                 |   6 -
 .idea/velesbit.iml                            |   2 -
 .idea/workspace.xml                           | 219 -------
 alpha3.ino/alpha3/alpha3.ino                  | 568 ++++++++++--------
 .../CMakeFiles/clion-log.txt                  |   1 -
 9 files changed, 327 insertions(+), 496 deletions(-)
 delete mode 100644 .idea/arduino-project-settings.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/serialmonitor_settings.xml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/velesbit.iml
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 alpha3.ino/alpha3/cmake-build-debug/CMakeFiles/clion-log.txt

diff --git a/.idea/arduino-project-settings.xml b/.idea/arduino-project-settings.xml
deleted file mode 100644
index dca1c67..0000000
--- a/.idea/arduino-project-settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Arduino Project Settings">
-    <option name="serialEndOfLine" value="3" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index b13378d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$/alpha3.ino/alpha3">
-    <contentRoot DIR="$PROJECT_DIR$" />
-  </component>
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index a2ff395..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/velesbit.iml" filepath="$PROJECT_DIR$/.idea/velesbit.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/serialmonitor_settings.xml b/.idea/serialmonitor_settings.xml
deleted file mode 100644
index b45564e..0000000
--- a/.idea/serialmonitor_settings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SerialMonitorSettings" BaudRate="9600" LineEndingsIndex="0" />
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/velesbit.iml b/.idea/velesbit.iml
deleted file mode 100644
index f08604b..0000000
--- a/.idea/velesbit.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4" />
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index cd5101c..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BuildServerSettings">
-    <option name="LOGIN" value="" />
-    <option name="SERVER_URL" value="http://buildserver" />
-    <option name="REMEMBER_ME" value="true" />
-    <option name="USE_IDEA_PROXY_SETTINGS" value="true" />
-    <option name="INSPECTIONS_BUILD_TYPE_IDS" />
-    <option name="DUPLICATES_BUILD_TYPE_IDS" />
-    <option name="COVERAGE_SETTINGS" />
-    <option name="TEST_STATUS_ENABLED" value="true" />
-    <option name="TEST_STATUS_SHOW_SUCCESSFUL" value="false" />
-    <option name="POSTPONE_SUITABLE_CONFIGURATIONS_SEARCH" value="false" />
-    <option name="ARTIFACTS_BUILD_TYPE_IDS" />
-    <option name="PERFORM_COMMIT_IF_SUCCESSFUL" value="true" />
-    <option name="PERFORM_COMMIT_IF_NO_NEW_FAILED_TESTS" value="false" />
-    <option name="REQUEST_CONFIRMATON" value="false" />
-    <option name="PRE_TESTED_COMMIT" value="true" />
-    <option name="FILTER_BY_STATUS" value="false" />
-    <option name="FILTER_MARKED_AS_FIXED" value="false" />
-    <option name="SHOW_CLOSE_PROMPT" value="true" />
-    <option name="TOOL_WINDOW_SELECTED_CONTENT_INDEX" value="0" />
-    <option name="FILTER_BY_CURRENT_PROJECT" value="true" />
-  </component>
-  <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
-    <generated>
-      <config projectName="Project" targetName="untitled_0-size" />
-      <config projectName="Project" targetName="uno_CORE" />
-      <config projectName="Project" targetName="untitled_0" />
-    </generated>
-  </component>
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="0903f43a-8012-4fe2-b1ed-bafdd7988272" name="Default Changelist" comment="" />
-    <ignored path="$USER_HOME$/CLionProjects/cmake-build-debug/" />
-    <ignored path="$PROJECT_DIR$/alpha3.ino/alpha3/cmake-build-debug/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/alpha3.ino/alpha3/alpha3.ino">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="14" column="11" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="CMakeLists.txt" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/alpha3.ino/alpha3/CMakeLists.txt" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectConfigurationFiles">
-    <option name="files">
-      <list>
-        <option value="$PROJECT_DIR$/.idea/velesbit.iml" />
-        <option value="$PROJECT_DIR$/.idea/misc.xml" />
-        <option value="$PROJECT_DIR$/.idea/modules.xml" />
-        <option value="$PROJECT_DIR$/.idea/vcs.xml" />
-        <option value="$PROJECT_DIR$/.idea/serialmonitor_settings.xml" />
-        <option value="$PROJECT_DIR$/.idea/arduino-project-settings.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="260" />
-    <option name="y" value="20" />
-    <option name="width" value="1400" />
-    <option name="height" value="1000" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="velesbit" type="b2602c69:ProjectViewProjectNode" />
-              <item name="velesbit" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="velesbit" type="b2602c69:ProjectViewProjectNode" />
-              <item name="velesbit" type="462c0819:PsiDirectoryNode" />
-              <item name="alpha3.ino" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="velesbit" type="b2602c69:ProjectViewProjectNode" />
-              <item name="velesbit" type="462c0819:PsiDirectoryNode" />
-              <item name="alpha3.ino" type="462c0819:PsiDirectoryNode" />
-              <item name="alpha3" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="0903f43a-8012-4fe2-b1ed-bafdd7988272" name="Default Changelist" comment="" />
-      <created>1555861927213</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1555861927213</updated>
-      <workItem from="1555861934735" duration="239000" />
-      <workItem from="1555862190364" duration="1323000" />
-      <workItem from="1555863713131" duration="271000" />
-      <workItem from="1556375294549" duration="79000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1912000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="-1" width="1920" height="1040" extended-state="6" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25773746" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32969433" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Arduino Support" order="7" weight="0.32969433" />
-      <window_info anchor="bottom" id="Serial Monitor" order="8" weight="0.32969433" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="TeamCity" order="10" />
-      <window_info anchor="bottom" id="Terminal" order="11" />
-      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="13" weight="0.32969433" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.32969433" />
-      <window_info anchor="bottom" id="CMake" order="15" visible="true" weight="0.32969433" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Database" order="3" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/CLionProjects/cmake-build-debug/untitled_0_untitled_0.ino.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/alpha3.ino/alpha3/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/alpha3.ino/alpha3/alpha3.ino">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="14" column="11" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/alpha3.ino/alpha3/alpha3.ino b/alpha3.ino/alpha3/alpha3.ino
index 1a0e092..6b47b15 100644
--- a/alpha3.ino/alpha3/alpha3.ino
+++ b/alpha3.ino/alpha3/alpha3.ino
@@ -1,282 +1,368 @@
-#include <LiquidCrystal.h>
-const int rs = 12, en = 10, d4 = A3, d5 = A2, d6 = A1, d7 = A0;
-LiquidCrystal lcd(rs, en, d4, d5, d6, d7);
-bool pyon=false; //pedal yönü değişkeni
-int hiz=0;         //rpm 
-float sabit=0.33;//step motordann alınan veriyi km/s e çevirmek için sabit çarpan 
-int hizpin=A0;
-int oto=0;      // otomatik mod kontrol değişkeni oto mod =0
-int limit[9] = {1,15,16,30,31,45,46,50,51};  // vites hız sınırları 
-			//       | 1 ||  2 ||  3 || 4 || 5|
-int g=1;
-int tur = 0;    //tel asılma sistemi üzerindeki butonun dönüşünü tutan sayaç
-int abut,ibut,dbut,mothiz,tbut,mbut;
-int ln3 =2;//motor 1.pim
-int ln4 =3;//mootor2.pin
-
-const int b4=7;//tur butonu tbut
-const int b1 =8;//manuel vites -
-const int b2 =10;//manuel vites +
-const int b0 =11;//durdurma butonu dbut
-const int b3 =12;//mod butonu mbut
+int oto=1;
+int ln3 =6;
+int ln4 =5;
+const int butondur =11;
+const int butonpin =7;
+const int vazb =2;
+const int vartb =4;
+int tur=0;
 int vites=1;
-int gvites=0;
+int buton=0;
+int vaz=0;
+int vart=0;
+int buta=0;
+int vites2=5;
+int vites3=11;
+int vites4=17;
+int vites5=23;
+
+int first=0;
+#define reed 8//pin connected to read switch
+
+float radius = 20.0;// tire radius (in inches)- CHANGE THIS FOR YOUR OWN BIKE
+float limit[8] = {0.00,8.00,8.01,15.00,15.01,22.00,22.01,30.00};  // vites hız sınırları 
+int reedVal,say;
+float mphh=0.00;
+float hiz=0.00;
+long timer = 0;// time between one full rotation (in ms)
+float mph = 0.00;
+float circumference;
+int maxReedCounter = 100;//min time (in ms) of one rotation (for debouncing)
+int reedCounter;
+
+
 
 void setup() {
-pinMode (hizpin,INPUT);
+
+Serial.begin(9600);
+  Serial.println("-----------------------------------------------------------------*************----------------------------------");
+  // TIMER SETUP- the timer interrupt allows preceise timed measurements of the reed switch
+  //for mor info about configuration of arduino timers see http://arduino.cc/playground/Code/Timer1
+  cli();//stop interrupts
+
+  //set timer1 interrupt at 1kHz
+  TCCR1A = 0;// set entire TCCR1A register to 0
+  TCCR1B = 0;// same for TCCR1B
+  TCNT1  = 0;
+  // set timer count for 1khz increments
+  OCR1A = 1999;// = (1/1000) / ((1/(16*10^6))*8) - 1
+  // turn on CTC mode
+  TCCR1B |= (1 << WGM12);
+  // Set CS11 bit for 8 prescaler
+  TCCR1B |= (1 << CS11);   
+  // enable timer compare interrupt
+  TIMSK1 |= (1 << OCIE1A);
+  
+  sei();//allow interrupts
+
+  //END TIMER SETUP
+
+
+  
+  reedCounter = maxReedCounter;
+  circumference = 2*3.14*radius;
+  pinMode(1,OUTPUT);//tx
 pinMode (ln3 ,OUTPUT);
 pinMode (ln4 ,OUTPUT);
-pinMode (b0,INPUT);
-pinMode (b1,INPUT);
-pinMode (b2,INPUT);
-pinMode (b3,INPUT);
-pinMode (b4,INPUT);
-Serial.begin(9600);
-lcd.begin(16, 4);
-//motoru birinci vitese çekme 
- dbut = digitalRead(b0);
- while(dbut == LOW){//sınır butonu 1 olana kadar çalışacağı için başa gelmek zorunda
-digitalWrite (ln4, HIGH);
-digitalWrite (ln3, LOW);
- dbut = digitalRead(b0);
-  }//motoru durdur 
- digitalWrite (ln4, LOW);
-digitalWrite (ln3, LOW); 
-//lcd ile bilgi ver 
-  lcd.clear();
-  lcd.print("otomatik mod etkin"); 
- lcd.setCursor(0,4);
-     lcd.println("kaskinizi takin");
-}
+pinMode (butonpin,INPUT);
+pinMode (vazb,INPUT);
+pinMode (vartb,INPUT);
+pinMode (butondur,INPUT);
+//Serial.begin(9600);
+buta = digitalRead(butondur);
 
+//while(digitalRead(buta) ==HIGH){//sınır butonu 1 olana kadar çalışacağı için başa gelmek zorunda
+//  Serial.println("stop butonuna basana kadar");
+//digitalWrite (ln4, HIGH);
+//digitalWrite (ln3, LOW);
+// buta = digitalRead(butondur);
+//  }//motoru durdur 
+//digitalWrite (ln4, LOW);
+//digitalWrite (ln3, LOW); 
+//delay(100);
+//  Serial.println("stop durdu");
+////lcd ile bilgi ver 
+// // lcd.clear();
+//  //lcd.print("otomatik mod etkin"); 
+//// lcd.setCursor(0,4);
+//  //   lcd.println("kaskinizi takin");
+// digitalWrite (ln4, LOW);
+//digitalWrite (ln3, HIGH);
+//delay(100);
+// digitalWrite (ln4, LOW);
+//digitalWrite (ln3, LOW); 
+//delay(1);
+//  Serial.println("bitti");
 
-void loop() {
+pinMode (ln3 ,OUTPUT);
+pinMode (ln4 ,OUTPUT);
 
- 
-if(oto==0)
-    {
-		hizal();
-	}
-	else
-	{	
-	    bul();
-	}
-//mod değişim butonu 
-mbut = digitalRead(b3);
-if(mbut==HIGH){
-  if(oto!=0)
-  {oto=0;
-    lcd.clear();
-  lcd.print("otomatik mod etkin"); 
- Serial.println("otomatik mod");
+delay(2000);
+sol();
+while (first==0){
+ buta = digitalRead(butondur);
+if(buta==HIGH){
+  dur();
+//  lcd.clear();
+  //lcd.print("BASMAA"); 
+    vites=0;
+  sag();
+  delay(200);
+  dur();
+  tur=0;
+  first=1;
+}
 }
-  else {oto=1;
-    lcd.clear();
-  lcd.print("manuel mod etkin"); 
- Serial.println("mauel mod");
+
+ 
 }
-  while(mbut == HIGH){
-  dbut = digitalRead(b3);
+
+
+ISR(TIMER1_COMPA_vect) {
+   // Serial.println("hiz alma zimbirtisi");
+  //Interrupt at freq of 1kHz to measure reed switch
+  reedVal = digitalRead(reed);//get val of A0
+  if (reedVal){//if reed switch is closed
+    if (reedCounter == 0){//min time between pulses has passed
+      mph = (56.8*float(circumference))/float(timer);//calculate miles per hour
+      timer = 0;//reset timer
+      reedCounter = maxReedCounter;//reset reedCounter
+    }
+    else{
+      if (reedCounter > 0){//don't let reedCounter go negative
+        reedCounter -= 1;//decrement reedCounter
+      }
+    }
   }
- }
+  else{//if reed switch is open
+    if (reedCounter > 0){//don't let reedCounter go negative
+      reedCounter -= 1;//decrement reedCounter
+    }
+  }
+  if (timer > 2000){
+    mph = 0;//if no new pulses from reed switch- tire is still, set mph to 0
+  }
+  else{
+    timer += 1;//increment timer
+  }
+  //  Serial.println("hizal zimbirtisi sonu"); 
+}
+
+
+
+
 
+
+
+
+void loop() {
+//-----------------------------------------
+ buta = digitalRead(butondur);
+if(buta==HIGH){
+  dur();
 }
-bool pedal(){
+if (oto==1){
+  Serial.println("hizal");
+  hizal();
   
-  return(true);
   }
-//vitesin artılıp azaltılacağını belirleme
-void otovites(int gvites){
-	
-	if (vites==gvites)
-	{
-		loop();
-	}
-	else if (vites<gvites)
-	{
-		sol(gvites);
-	}
-	else if (vites>gvites)
-	{
-		sag(gvites);
-	}		
-} 
- //otomatik vites değiştirmek için hız alma ve hız aralıklarına bağlı vites kararı
-void hizal(){		
-mothiz = analogRead(hizpin);
-delay(10);
-hiz=mothiz*sabit;
-		if (hiz>=limit[0] or hiz<=limit[1])
-		{
-		 
-		 gvites=1;
-		 otovites(gvites);
-		}
-		else if (hiz>=limit[2] or hiz<=limit[3])
-		{
-		
-		 gvites=2;
-		 otovites(gvites);	
-		}
-		else if (hiz>=limit[4] or hiz<=limit[5])
-		{
-		
-		 gvites=3;
-		 otovites(gvites);	
-		}
-		else if (hiz>=limit[6] or hiz<=limit[7])
-		{
-		
-		 gvites=4;
-		 otovites(gvites);	
-		}
-		else if (hiz>=limit[8] or hiz<=limit[9])
-		{
-		
-		 gvites=5;
-		 otovites(gvites);	
-		}
-	
-} 
+  else{
 
+ vart = digitalRead(vartb);
 
- 
- //vites artırmak için tur hesabı
-int sayi()
-{
-tbut = digitalRead(b4);
- tbut = digitalRead(b4);
-if(tbut==1){
+if(vart==1 and vites < 5){
+  delay(100);
+  vites ++;
+
+  while(vart == HIGH){
+     vart = digitalRead(vartb);
+  }
+  delay(100);
+}
+//-------------------------------------------
+ vaz = digitalRead(vazb); 
+if(vaz==1 and vites>1){
+  delay(100);
+  vites --;
+
+  while(vaz == HIGH){
+     vaz = digitalRead(vazb);
+  }
+  delay(100);
+}}
+//--------------------------------------------
+
+
+}
+
+void sag(){
+    Serial.println("sag");
+  digitalWrite (ln3, HIGH);
+  digitalWrite (ln4, LOW);
+  buton = digitalRead(butonpin); 
+if(buton==1){
  delay(10);
  tur ++;
- lcd.setCursor(0,4);
-     lcd.print(tur);
-     lcd.println(". tur");
-  while(tbut == HIGH){
-     tbut = digitalRead(b4);
+
+  while(buton == HIGH){
+     buton = digitalRead(butonpin);
   }
  delay(10);
 }
-    return(tur);
-  }
+}
 
-  
- //vites düşürmek için tur hesabı 
-int sayi2(){
-   tbut = digitalRead(b4);
-if(tbut==1){
+void sol(){
+    Serial.println("sol");
+  digitalWrite (ln4, HIGH);
+  digitalWrite (ln3, LOW);
+  buton = digitalRead(butonpin); 
+if(buton==1){
  delay(10);
  tur --;
- lcd.setCursor(0,4);
-     lcd.print(tur);
-     lcd.println(". tur");
-  while(tbut == HIGH){
-     tbut = digitalRead(b4);
+
+  while(buton == HIGH){
+     buton = digitalRead(butonpin);
   }
  delay(10);
 }
-    return(tur);
 }
 
-//manuel vites değiştirme kararı
-void bul(){
-  abut = digitalRead(b1);
-  ibut = digitalRead(b2);
-//artırma butonuna basma denetim başı
-//---------------------------------
-  if (abut == HIGH) {
-     delay(20);
-  while(abut == HIGH){ 
-   abut= digitalRead(b1); 
-   delay(10);
-   }
-     if(vites!=1 and vites>1){
-        vites --;
-      }
-     else {
-    vites=1;
-    } 
-   gvites=vites;
-   sol(gvites);
- }
-//artırma butonuna basma denetim sonu
-//-------------------------------
-//düşürme butonuna basma denetim başı
-//----------------------------------
-  if (ibut == HIGH) {
- ibut = digitalRead(b2);
-     delay(20);
-while(ibut == HIGH){ 
-     ibut= digitalRead(b2); 
-     delay(10);
-     }
-    if(vites!=5 and vites<5){
-       vites ++;
-       }
- else {
-  vites=5;
- }
-     gvites=vites;
-     sag(gvites); 
- }
-//düşürme denetim sonu
-//------------------------
-   }
+void dur(){
+    Serial.println("dur");
+  digitalWrite (ln4, LOW);
+  digitalWrite (ln3, LOW);
 
-//vitesler arasındaki tur sayıları ve sisteme bildirmek için değiken ataması
-int hesaplar(){
-int vites1=0;
-int vites2=5;
-int vites3=11;
-int vites4=17;
-int vites5=23;
+}
+
+void hizal(){
+
+
+
+  
+ //   Serial.println(limit[1]);
+hiz=mph;
+
+
+   Serial.println("Speed =");
+  Serial.println(mph);
+     Serial.print("vites =");
+  Serial.println(vites);
+  
+    if (hiz>=limit[0] and hiz<=limit[1])
+    {
+
+     vites=1; 
+    vitesbul(); 
+    
+    
+    }
+    else if (hiz>=limit[2] and hiz<=limit[3])
+    {
+
+     vites=2; 
+     vitesbul(); 
+     
+    }
+    else if (hiz>=limit[4] and hiz<=limit[5])
+    {
+
+     vites=3;
+     vitesbul(); 
+  
+    }
+    else if (hiz>=limit[6] and hiz<=limit[7])
+    {
+   
+     vites=4;
+     vitesbul(); 
+
+    }
+    else if (hiz>=limit[8])
+    {
+       
+     vites=5;
+     vitesbul(); 
+
+    }
+   
+    else {vites=vites;
+
+    Serial.println("gvites else");
+    }
+  
+
+
+}
 
-if(gvites==1){
-  g=vites1;
+void vitesbul(){
+  
+  
+if(vites==1){
+  if(tur<0){
+    sag();
   }
- else if(gvites==2){
-  g=vites2;
+  else if(tur>0){
+    sol(); 
   }
- else if(gvites==3){
-  g=vites3;
+  else{
+    dur();
+
   }
- else if(gvites==4){
-  g=vites4;
+}
+//-----------------------
+if(vites==2){
+  if(tur<vites2){
+    sag();
   }
- else if(gvites==5){
-  g=vites5;
+  else if(tur>vites2){
+    sol(); 
+  }
+  else{
+    dur();
+
   }
-return g;
 }
-//vites artırmak için motor hareket kodları
-void sag(int gvites){
-  g=hesaplar();  
-  if(pedal()){//pedal saat yönünde dönüyorsa devam et
-  while (g>=sayi())             //tur tamamlanana kadar motora güç ver
-  {
-    digitalWrite (ln3, HIGH);
-    digitalWrite (ln4, LOW);
-  }}
-dur();
+//-----------------------
+if(vites==3){
+  if(tur<vites3){
+    sag();
+  }
+  else if(tur>vites3){
+    sol(); 
+  }
+  else{
+    dur();
+   
+  }
 }
-
-//vitesdüşürmek için motor hareket kodları
-void sol(int gvites){
-  g=hesaplar();
-  if(pedal()){//pedal saat yönünde dönüyorrsa devam et
-  while(g<=sayi2())                 //tur tamamlanana kadar motora güç ver
-   {
-    digitalWrite (ln4, HIGH);
-    digitalWrite (ln3, LOW);  
-    }}
-dur();
+//------------------------
+if(vites==4){
+  if(tur<vites4){
+    sag();
+  }
+  else if(tur>vites4){
+    sol(); 
+  }
+  else{
+    dur();
+    
+  }
 }
-//motor harekeetini durdurmak için
-void dur()
-{
-  digitalWrite (ln4, LOW);
-  digitalWrite (ln3, LOW);
-//moda göre geldiği yere dönme 
-if (oto!=0){bul();}
-else{hizal();}
+//------------------------
+if(vites==5){
+  if(tur<vites5){
+    sag();
+  }
+  else if(tur>vites5){
+    sol(); 
+  }
+  else{
+    dur();
+    
+  }
 }
+  
+
+  }
+
+
diff --git a/alpha3.ino/alpha3/cmake-build-debug/CMakeFiles/clion-log.txt b/alpha3.ino/alpha3/cmake-build-debug/CMakeFiles/clion-log.txt
deleted file mode 100644
index 7254903..0000000
--- a/alpha3.ino/alpha3/cmake-build-debug/CMakeFiles/clion-log.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMakeLists.txt not found in /home/mfd/Desktop/velesbit/alpha3.ino/alpha3 Select CMakeLists.txt file...