LCD rework, syncing sketches

Author: BrixCRM

Mpe/I2CPIR/I2CPIR.ino

@@ -23,9 +23,9 @@ PortI2C i2cbus (1); /* Virtual I2C bus at JeeNode Port 1*/
 /** LCD 16x2 Character Display at 8bit I2C I/O expander (PCF8574 compatible) */
 #define I2C_ADDR    0x20
 #define BACKLIGHT_PIN     7
-#define En_pin  4
+#define En_pin  6
 #define Rw_pin  5
-#define Rs_pin  6
+#define Rs_pin  4
 #define D4_pin  0
 #define D5_pin  1
 #define D6_pin  2
@@ -185,7 +185,7 @@ void setup()
   Serial.begin(57600);
   Serial.println("I2C_ALL");
 
-  lux_init();
+  //lux_init();
   i2c_lcd_init();
   //exp_setup();
 }
@@ -194,7 +194,7 @@ void loop()
 {
   //cycle_dimmer();
   //cycle_expander();
-  cycle_lux();
+  //cycle_lux();
 
   //Wire.beginTransmission(address);
   //Wire.send(REGISTER_CONFIG);
@@ -222,13 +222,13 @@ void loop()
    need to a second or so wait after changing the gain
    see http://talk.jeelabs.net/topic/608 
    */
-  if (lux_value < 1000) {
-    highGain = 1;
-  } 
-  else {
-    highGain = 0;
-  }
-  lux.setGain(highGain);
+//  if (lux_value < 1000) {
+//    highGain = 1;
+//  } 
+//  else {
+//    highGain = 0;
+//  }
+//  lux.setGain(highGain);
 
   delay(1000);
 }

Mpe/i2c_all/i2c_all.ino

@@ -1,16 +1,18 @@
 /* 
 Atmega EEPROM routines */
-#include <OneWire.h>
-#include <DotmpeLib.h>
-#include <EEPROM.h>
 
 
 /* *** Globals and sketch configuration *** */
-#define DEBUG           1 /* Enable trace statements */
 #define SERIAL          1 /* Enable serial */
+#define DEBUG           1 /* Enable trace statements */
 
 #define MAXLENLINE      79
 
+#include <OneWire.h>
+#include <DotmpeLib.h>
+#include <EEPROM.h>
+
+
 
 const String sketch = "X-AtmegaEEPROM";
 const int version = 0;
@@ -19,15 +21,33 @@ char node[] = "nx";
 // determined upon handshake 
 char node_id[7];
 
-
-static int tick = 0;
-static int pos = 0;
+/* IO pins */
+//              RXD      0
+//              TXD      1
+//              INT0     2 
+//              MOSI     11
+//              MISO     12
+//#       define _DBG_LED 13 // SCK
 
 
 MpeSerial mpeser (57600);
 
+/* *** InputParser *** {{{ */
+
 extern InputParser::Commands cmdTab[] PROGMEM;
-InputParser parser (50, cmdTab);
+byte* buffer = (byte*) malloc(50);
+InputParser parser (buffer, 50, cmdTab);
+
+
+/* *** /InputParser }}} *** */
+
+/* *** Report variables *** {{{ */
+
+/* *** /Report variables }}} *** */
+
+/* *** Scheduled tasks *** {{{ */
+
+/* *** /Scheduled tasks }}} *** */
 
 /* *** EEPROM config *** {{{ */
 
@@ -90,16 +110,99 @@ void writeConfig(Config &c)
 	}
 }
 
-/* }}} *** */
 
+/* *** /EEPROM config }}} *** */
 
+/* *** Peripheral devices *** {{{ */
 
+#if LDR_PORT
+#endif
 
-/* }}} *** */
+#if _DHT
+#endif // DHT
+
+#if _LCD84x48
+#endif // LCD84x48
+
+#if _DS
+#endif // DS
+
+#if _NRF24
+/* nRF24L01+: nordic 2.4Ghz digital radio  */
+
+#endif // NRF24
+
+#if _RTC
+#endif //_RTC
+
+#if _HMC5883L
+/* Digital magnetometer I2C module */
+
+#endif // HMC5883L
+
+
+/* *** /Peripheral devices }}} *** */
+
+/* *** UI *** {{{ */
+
+
+
+
+
+
+/* *** /UI }}} *** */
 
 /* *** Peripheral hardware routines *** {{{ */
 
-/* }}} *** */
+#if LDR_PORT
+#endif
+
+/* *** PIR support *** {{{ */
+#if PIR_PORT
+#endif
+/* *** /PIR support *** }}} */
+
+
+#if _DHT
+/* DHT temp/rh sensor 
+ - AdafruitDHT
+*/
+
+#endif // DHT
+
+#if _RFM12B
+/* HopeRF RFM12B 868Mhz digital radio */
+
+#endif //_RFM12B
+
+#if _LCD84x48
+
+
+#endif // LCD84x48
+
+#if _DS
+/* Dallas DS18B20 thermometer routines */
+
+
+#endif // DS
+
+#if _NRF24
+/* Nordic nRF24L01+ radio routines */
+
+
+#endif // NRF24 funcs
+
+#if _RTC
+#endif //_RTC
+
+#if _HMC5883L
+/* Digital magnetometer I2C routines */
+
+
+#endif // HMC5883L
+
+
+/* *** /Peripheral hardware routines }}} *** */
 
 /* *** Initialization routines *** {{{ */
 
@@ -116,51 +219,24 @@ void initLibs()
 }
 
 
-/* }}} *** */
-
-/* Initialization routines *** {{{ */
-
-
-void helpCmd() {
-	Serial.println("Help!");
-}
-
-void handshakeCmd() {
-	int v;
-	char buf[7];
-	node.toCharArray(buf, 7);
-	parser >> v;
-	sprintf(node_id, "%s%i", buf, v);
-	Serial.print("handshakeCmd:");
-	Serial.println(node_id);
-	serialFlush();
-}
-
-InputParser::Commands cmdTab[] = {
-	{ 'h', 0, helpCmd },
-	{ 'A', 0, handshakeCmd }
-};
-
-
-
-/* }}} *** */
+/* *** /Initialization routines *** }}} */
 
 /* *** Run-time handlers *** {{{ */
 
-
 void doReset(void)
 {
-	tick = 0;
-
 	doConfig();
 
+	tick = 0;
+
 }
 
 bool doAnnounce()
 {
 /* see CarrierCase */
 #if SERIAL && DEBUG
 #endif // SERIAL && DEBUG
+	return false;
 }
 
 // readout all the sensors and other values
@@ -174,12 +250,33 @@ void runScheduler(char task)
 	}
 }
 
-/* }}} *** */
 
-/* InputParser handlers {{{ */
+/* *** /Run-time handlers }}} *** */
 
+/* *** InputParser handlers *** {{{ */
 
-/* }}} *** */
+void helpCmd() {
+	Serial.println("Help!");
+}
+
+void handshakeCmd() {
+	int v;
+	char buf[7];
+	node.toCharArray(buf, 7);
+	parser >> v;
+	sprintf(node_id, "%s%i", buf, v);
+	Serial.print("handshakeCmd:");
+	Serial.println(node_id);
+	serialFlush();
+}
+
+InputParser::Commands cmdTab[] = {
+	{ 'h', 0, helpCmd },
+	{ 'A', 0, handshakeCmd }
+};
+
+
+/* *** /InputParser handlers }}} *** */
 
 /* *** Main *** {{{ */
 
@@ -188,7 +285,11 @@ void setup(void)
 {
 #if SERIAL
 	mpeser.begin();
-	mpeser.startAnnounce(sketch, String(version));
+	mpeser.startAnnounce(sketch, version);
+#if DEBUG || _MEM
+	Serial.print("Free RAM: ");
+	Serial.println(freeRam());
+#endif
 	serialFlush();
 #endif
 
@@ -204,6 +305,5 @@ void loop(void)
 	//runScheduler(task);
 }
 
-
 /* }}} *** */
 

Prototype/AtmegaEEPROM/AtmegaEEPROM.ino

@@ -1,8 +1,9 @@
 /* AtmegaSRAM - measure memory usage */
 
 /** Globals and sketch configuration  */
-#define DEBUG           1 /* Enable trace statements */
+/* *** Globals and sketch configuration *** */
 #define SERIAL          1 /* Enable serial */
+#define DEBUG           1 /* Enable trace statements */
 
 #define DEBUG_MEASURE   1