diff --git a/order_site/static/picker.js b/order_site/static/picker.js
index 337e9ef..c17de50 100644
--- a/order_site/static/picker.js
+++ b/order_site/static/picker.js
@@ -1,36 +1,39 @@
+
$(document).ready(function(){
var quantitiy=0;
- $('.quantity-right-plus').click(function(e){
-
- // Stop acting like a button
- e.preventDefault();
- // Get the field name
- var quantity = parseInt($('#quantity').val());
-
- // If is not undefined
-
- $('#quantity').val(quantity + 1);
-
+ $('.quantity-right-plus').click(function(e){
+
+ // Stop acting like a button
+ e.preventDefault();
+ // Get the field name
+ var quantity = parseInt( $(this).parent().siblings('input').val() ) ;
+
+ // If is not undefined
- // Increment
-
- });
+ // $('#quantity').val(quantity + 1);
+
+ $(this).parent().siblings('input').val(quantity + 1)
- $('.quantity-left-minus').click(function(e){
- // Stop acting like a button
- e.preventDefault();
- // Get the field name
- var quantity = parseInt($('#quantity').val());
- // If is not undefined
+ // Increment
+
+ });
+
+ $('.quantity-left-minus').click(function(e){
+ // Stop acting like a button
+ e.preventDefault();
+ // Get the field name
+ var quantity = parseInt( $(this).parent().siblings('input').val() ) ;
- // Increment
- if(quantity>0){
- $('#quantity').val(quantity - 1);
- }
- });
+ // If is not undefined
+ // Increment
+ if(quantity>0){
+ $(this).parent().siblings('input').val(quantity - 1);
+ }
+ });
+
});
function submitOrder(){
diff --git a/order_site/templates/index.html b/order_site/templates/index.html
index 09395e5..f161699 100644
--- a/order_site/templates/index.html
+++ b/order_site/templates/index.html
@@ -2,6 +2,7 @@
+
Alepa Twitch Grabs Candy
@@ -13,7 +14,7 @@
-
Simple Quantity increment buttons with Javascript
+
Choose your sweets with a wicked system made out of an awesome humanless deployment process
Tasty treats
@@ -84,10 +85,10 @@
-
-
-
-
+
+
+
+
diff --git a/scale/scale.ino b/scale/scale.ino
index 8d90c47..0eeb557 100644
--- a/scale/scale.ino
+++ b/scale/scale.ino
@@ -4,48 +4,48 @@
HX711 scale;
void setup() {
- Serial.begin(38400);
- Serial.println("HX711 Demo");
+ Serial.begin(115200);
+ //Serial.println("HX711 Demo");
- Serial.println("Initializing the scale");
+ //Serial.println("Initializing the scale");
// parameter "gain" is ommited; the default value 128 is used by the library
// HX711.DOUT - pin #A1
// HX711.PD_SCK - pin #A0
scale.begin(2, 3);
- Serial.println("Before setting up the scale:");
- Serial.print("read: \t\t");
- Serial.println(scale.read()); // print a raw reading from the ADC
+ //Serial.println("Before setting up the scale:");
+ //Serial.print("read: \t\t");
+ //Serial.println(scale.read()); // print a raw reading from the ADC
- Serial.print("read average: \t\t");
- Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC
+ //Serial.print("read average: \t\t");
+ //Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC
- Serial.print("get value: \t\t");
- Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight (not set yet)
+ //Serial.print("get value: \t\t");
+ //Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight (not set yet)
- Serial.print("get units: \t\t");
- Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight (not set) divided
+ //Serial.print("get units: \t\t");
+ //Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight (not set) divided
// by the SCALE parameter (not set yet)
scale.set_scale(2280.f); // this value is obtained by calibrating the scale with known weights; see the README for details
scale.tare(); // reset the scale to 0
- Serial.println("After setting up the scale:");
+ //Serial.println("After setting up the scale:");
- Serial.print("read: \t\t");
- Serial.println(scale.read()); // print a raw reading from the ADC
+ //Serial.print("read: \t\t");
+ //Serial.println(scale.read()); // print a raw reading from the ADC
- Serial.print("read average: \t\t");
- Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC
+ //Serial.print("read average: \t\t");
+ //Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC
- Serial.print("get value: \t\t");
- Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight, set with tare()
+ //Serial.print("get value: \t\t");
+ //Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight, set with tare()
- Serial.print("get units: \t\t");
- Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight, divided
+ //Serial.print("get units: \t\t");
+ //Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight, divided
// by the SCALE parameter set with set_scale
- Serial.println("Readings:");
+ //Serial.println("Readings:");
}
void loop() {
@@ -53,10 +53,11 @@ void loop() {
//Serial.print(scale.get_units(), 1);
//Serial.print("\t| average:\t");
if (Serial.available() > 0) {
- Serial.println(scale.get_units(10), 1);
+ Serial.read();
+ Serial.println(scale.get_units(), 1);
- scale.power_down(); // put the ADC in sleep mode
- delay(100);
- scale.power_up();
+ //scale.power_down(); // put the ADC in sleep mode
+ //delay(100);
+ //scale.power_up();
}
}