marek
/
Twitch-grabs-candy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy

Browse Source
master^2
Davide Bongiovanni 6 years ago
parent 6c45e79137 46801a586f
commit 3500e29157
3 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File

53
order_site/static/picker.js
Unescape View File

@ -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(){

11
order_site/templates/index.html
Unescape View File

@ -2,6 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Alepa Twitch Grabs Candy</title>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="{{url_for('static', filename='picker.js')}}"></script>
@ -13,7 +14,7 @@
<div class="container">
<div class="row">
<h2>Simple Quantity increment buttons with Javascript </h2>
<h2>Choose your sweets with a wicked system made out of an awesome humanless deployment process</h2>
<div class="col-lg-2">
Tasty treats
<div class="input-group">
@ -84,10 +85,10 @@
</div>
</div>
<div class="col-lg-2">
<div class="input-group">
<button class="btn btn-magick" onClick="submitOrder()">Place sweet order!</button>
</div>
<div class="col-lg-2 center-block ">
<div class="input-group center-block">
<button class="btn btn-magick center-block" onClick="submitOrder()">Place sweet order!</button>
</div>
</div>
</div>
</div>

53
scale/scale.ino
Unescape View File

@ -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();
}
}

Write Preview
Loading…
Cancel
Save