Skip to content

Instantly share code, notes, and snippets.

@ecerulm
ecerulm / diffmerge-diff.sh
Created August 5, 2010 15:46
Cygwin Git: wrappers for diffmerge and winmerge
#!/bin/sh
# Use SourceGear DiffMerge as mergetool for git in cygwin.
# git config --global mergetool.diffmerge.cmd "diffmergetool.sh \"\$LOCAL\" \"\$REMOTE\" \"\$BASE\" \"\$MERGED\""
# git config --global mergetool.diffmerge.trustExitCode false
# git difftool -t diffmerge branch1..branch2
# Reference: http://www.tldp.org/LDP/abs/abs-guide.pdf
library=githelperfunctions.sh
<script type="text/javascript">
/**
* var disqus_developer = true;
*/
{% if page.post_id %}
var disqus_identifier = {{ page.post_id }};
{% else %}
var disqus_identifier = "{{ page.url }}";
{% endif %}
</script>
markdown: rdiscount
pygments: true
url: http://rubenlaguna.com
require "rubygems"
require "rbosa"
require "cgi"
require "htmlentities"
require 'iconv'
OSA.utf8_strings = true
evernote = OSA.app('Evernote')
coder = HTMLEntities.new
#include "mma7260q.h"
//set up MMA7260Q
Mma7260q mma7260q = Mma7260q(0,1,2);
long time = millis();
void setup() {
Serial.begin(9600);
/*
* hmc6352example.pde
*
* Copyright (c) 2009 Ruben Laguna <ruben.laguna at gmail.com>. All rights reserved.
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
/*
XBee sensor
ZCL Temperature Measurement Cluster
*/
#define ledPin 13
#define lcdPin 6
#define temt6000Pin 3
/* Sleep Demo Serial
* -----------------
* Example code to demonstrate the sleep functions in a Arduino. Arduino will wake up
* when new data is received in the serial port USART
* Based on Sleep Demo Serial from http://www.arduino.cc/playground/Learning/ArduinoSleepCode
*
* Copyright (C) 2006 MacSimski 2006-12-30
* Copyright (C) 2007 D. Cuartielles 2007-07-08 - Mexico DF
*
* With modifications from Ruben Laguna 2008-10-15
/*
DS160 example
Reading temperature from DS1620 digital temperature sensor
and showing the result via serial interface.
Arduino DS1620
pin 3 -> RST
pin 4 -> CLK
// to generate the following JSON output
// {"identifier":"abbreviation",
// "items":[ {"name":"Alaska","label":"Alaska","abbreviation":"AK"},
// {"name":"Wyoming","label":"Wyoming","abbreviation":"WY"}
// ]}
package com.rubenlaguna.json.flexjson;
import flexjson.JSONSerializer;