Convert to Ardino IDE structure

Author: rfjakob

lib/ads1231/ads1231.cpp renamed to ads1231.cpp

@@ -17,11 +17,11 @@
 #include <Arduino.h>
 #include <limits.h>
 
-#include <ads1231.h>
-#include <custom_eeprom.h>
-#include <utils.h>
-#include "../../config.h"
-#include <errors.h>
+#include "ads1231.h"
+#include "custom_eeprom.h"
+#include "utils.h"
+#include "config.h"
+#include "errors.h"
 
 unsigned long ads1231_last_millis = 0;
 int ads1231_offset = 0;

lib/ads1231/ads1231.h renamed to ads1231.h

@@ -5,7 +5,7 @@
 #ifndef ADS1231_H
 #define ADS1231_H
 
-#include <errors.h>
+#include "errors.h"
 
 extern unsigned long ads1231_last_millis;
 extern int ads1231_offset;

src/sketch.ino renamed to barwin-arduino.ino

@@ -19,10 +19,10 @@
  */
 
 #include <Arduino.h>
-#include <ads1231.h>
-#include <bottle.h>
-#include <utils.h>
-#include <errors.h>
+#include "ads1231.h"
+#include "bottle.h"
+#include "utils.h"
+#include "errors.h"
 #include "config.h"
 
 

lib/bottle/bottle.cpp renamed to bottle.cpp

@@ -3,11 +3,12 @@
  */
 
 #include <Arduino.h>
-#include <bottle.h>
-#include <ads1231.h>
-#include <utils.h>
-#include <errors.h>
-#include "../../config.h"
+
+#include "bottle.h"
+#include "ads1231.h"
+#include "utils.h"
+#include "errors.h"
+#include "config.h"
 
 
 /*

bottle.h

@@ -0,0 +1,44 @@
+/**
+ * Bottle class.
+ */
+
+#ifndef BOTTLE_H
+#define BOTTLE_H
+
+// 'pos' should be always between following two constants, when calling
+// Bottle::turn_to(pos, delay_ms). Edit this values according to used servos.
+// The constants might be used to initialize pos_down and pos_up (in config.h).
+// See also:
+// http://arduino.cc/en/Reference/ServoWriteMicroseconds
+#define SERVO_MIN 500
+#define SERVO_MAX 2500
+
+#include <Servo.h>
+#include "errors.h"
+
+// Macro initialising a array 'bottles' of Bottle instances as defined
+// in config.h by the comma separated list BOTTLES of constructor calls:
+#define DEFINE_BOTTLES()  Bottle bottles[] = {BOTTLES};\
+                          char bottles_nr = sizeof(bottles)/sizeof(bottles[0]);
+
+
+
+class Bottle {
+    public:
+        Bottle(unsigned char, unsigned char, int, int);
+        static void init(Bottle* bottles, int bottles_nr);
+        errv_t turn_to(int pos, int delay_ms, bool check_weight=false, int* stable_weight=NULL, bool enable_abortcheck=true);
+        errv_t turn_up(int delay_ms, bool enable_abortcheck=true);
+        errv_t turn_down(int delay_ms, bool check_weight=false);
+        int get_pause_pos();
+        errv_t turn_to_pause_pos(int delay_ms);
+        errv_t pour(int requested_amount, int& measured_amount);
+        Servo servo;          // servo used for turning the bottle
+        const unsigned char number;     // all bottles have a unique number (0-n)
+        const unsigned char pin;       // pin to attach the servo
+        const int pos_down;   // servo position for bottle down (pouring)
+        const int pos_up;     // servo position for bottle up (not pouring)
+};
+
+#endif
+

lib/custom_eeprom/custom_eeprom.cpp renamed to custom_eeprom.cpp

@@ -1,4 +1,5 @@
 #include <Arduino.h>
+
 #include "errors.h"
 
 /**

lib/custom_eeprom/custom_eeprom.h renamed to custom_eeprom.h

@@ -14,7 +14,7 @@
 #define SERVO_MAX 2500
 
 #include <Servo.h>
-#include <errors.h>
+#include "errors.h"
 
 // Macro initialising a array 'bottles' of Bottle instances as defined
 // in config.h by the comma separated list BOTTLES of constructor calls: