Syning. Fixing temp-cal and eeprom, serial

Author: BrixCRM

Makefile

@@ -1 +1 @@
-/usr/local/share/mkdoc/Mkdocs-minimal.mk
+/usr/local/share/mkdoc/Mkdoc-full.mk

Mpe/CarrierCase/CarrierCase.ino

@@ -66,8 +66,7 @@ ToDo
 				motion
 			LDR
 
-  -
-*/
+ */
 
 //#ifdef MYCMDLINE
 
@@ -79,26 +78,28 @@ ToDo
 #define DEBUG           1 /* Enable trace statements */
 
 #define _MEM            1   // Report free memory
-#define _RFM12B         1
-#define _RFM12BLOBAT    1   // Use JeeNode lowbat measurement
-#define _NRF24          0
-#define _HMC5883L       1
 #define _DHT            0
+#define LDR_PORT        0   // defined if LDR is connected to a port's AIO pin
 #define _DS             0
 #define DS_PIN          A5
 #define DEBUG_DS        1
 //#define FIND_DS    1
-#define PIR_PORT        0
 #define DHT_PIN         0   // DIO for DHTxx
-#define LDR_PORT        0   // defined if LDR is connected to a port's AIO pin
+#define DHT_HIGH        1   // enable for DHT22/AM2302, low for DHT11
+#define PIR_PORT        0
+#define _HMC5883L       1
+#define _LCD84x48       0
+#define _RFM12B         1
+#define _RFM12LOBAT    1   // Use JeeNode lowbat measurement
+#define _NRF24          0
 
 #define REPORT_EVERY    5   // report every N measurement cycles
 #define SMOOTH          5   // smoothing factor used for running averages
 #define MEASURE_PERIOD  50  // how often to measure, in tenths of seconds
 #define RETRY_PERIOD    10  // how soon to retry if ACK didn't come in
 #define RETRY_LIMIT     2   // maximum number of times to retry
 #define ACK_TIME        10  // number of milliseconds to wait for an ack
-#define UI_IDLE         4000  // tenths of seconds idle time, ...
+#define UI_SCHED_IDLE         4000  // tenths of seconds idle time, ...
 #define UI_STDBY        8000  // ms
 
 #define MAXLENLINE      79
@@ -114,15 +115,17 @@ ToDo
 #include <avr/sleep.h>
 #include <util/atomic.h>
 
+//#include <EEPROM.h>
+// include EEPROMEx.h
 // Adafruit DHT
 #include <DHT.h>
 #include <Wire.h>
-#include <JeeLib.h>
 #include <OneWire.h>
+#include <JeeLib.h>
+//#include <SPI.h>
+//#include <RF24.h>
 #include <DotmpeLib.h>
 #include <mpelib.h>
-//#include <EEPROM.h>
-// include EEPROMEx.h
 #include <EmBencode.h>
 
 
@@ -178,10 +181,10 @@ struct {
 	int magny;
 	int magnz;
 #endif //_HMC5883L
-#ifdef _MEM
+#if _MEM
 	int memfree     :16;
 #endif
-#ifdef _RFM12BLOBAT
+#if _RFM12LOBAT
 	byte lobat      :1;  // supply voltage dropped under 3.1V: 0..1
 #endif
 } payload;
@@ -198,8 +201,8 @@ enum {
 	TASK_END
 };
 // Scheduler.pollWaiting returns -1 or -2
-static const char WAITING = 0xFF; // -1: waiting to run
-static const char IDLE = 0xFE; // -2: no tasks running
+static const char SCHED_WAITING = 0xFF; // -1: waiting to run
+static const char SCHED_IDLE = 0xFE; // -2: no tasks running
 
 static word schedbuf[TASK_END];
 Scheduler scheduler (schedbuf, TASK_END);
@@ -208,7 +211,7 @@ Scheduler scheduler (schedbuf, TASK_END);
 ISR(WDT_vect) { Sleepy::watchdogEvent(); }
 
 
-/* *** /Scheduled tasks }}} *** */
+/* *** /Scheduled tasks *** }}} */
 
 /* *** EEPROM config *** {{{ */
 
@@ -237,10 +240,14 @@ void writeConfig()
 }
 
 
-/* *** /EEPROM config }}} *** */
+/* *** /EEPROM config *** }}} */
 
 /* *** Peripheral devices *** {{{ */
 
+#if SHT11_PORT
+SHT11 sht11 (SHT11_PORT);
+#endif
+
 #if LDR_PORT
 Port ldr (LDR_PORT);
 #endif
@@ -417,12 +424,13 @@ void freeEmbencBuff() {
 
 /* *** Peripheral hardware routines *** {{{ */
 
+
 #if LDR_PORT
 #endif
 
 /* *** PIR support *** {{{ */
 #if PIR_PORT
-#endif
+#endif // PIR_PORT
 /* *** /PIR support *** }}} */
 
 #if _DHT
@@ -443,7 +451,7 @@ static bool waitForAck() {
                 // see http://talk.jeelabs.net/topic/811#post-4712
                 rf12_hdr == (RF12_HDR_DST | RF12_HDR_CTL | rf12_id))
             return 1;
-        set_sleep_mode(SLEEP_MODE_IDLE);
+        set_sleep_mode(SLEEP_MODE_SCHED_IDLE);
         sleep_mode();
     }
     return 0;
@@ -454,7 +462,6 @@ static bool waitForAck() {
 
 #if _LCD84x48
 
-
 #endif // LCD84x48
 
 #if _DS
@@ -1071,14 +1078,14 @@ void doMeasure()
 	Serial.println(payload.memfree);
 #endif
 #endif //_MEM
-#if _RFM12BLOBAT
+#if _RFM12LOBAT
 	payload.lobat = rf12_lowbat();
 #if SERIAL && DEBUG_MEASURE
 	if (payload.lobat) {
 		Serial.println("Low battery");
 	}
 #endif
-#endif //_RFM12BLOBAT
+#endif //_RFM12LOBAT
 }
 
 // periodic report, i.e. send out a packet and optionally report on serial port
@@ -1130,10 +1137,10 @@ void doReport(void)
 	Serial.print(' ');
 	Serial.print((int) payload.memfree);
 #endif //_MEM
-#if _RFM12BLOBAT
+#if _RFM12LOBAT
 	Serial.print(' ');
 	Serial.print((int) payload.lobat);
-#endif //_RFM12BLOBAT
+#endif //_RFM12LOBAT
 
 	Serial.println();
 #endif //SERIAL
@@ -1186,7 +1193,7 @@ void doTrigger(void)
 // Add UI or not..
 //void uiStart()
 //{
-//	idle.set(UI_IDLE);
+//	idle.set(UI_SCHED_IDLE);
 //	if (!ui) {
 //		ui = true;
 //	}
@@ -1233,8 +1240,8 @@ void runScheduler(char task)
 			break;
 
 #if DEBUG && SERIAL
-		case WAITING:
-		case IDLE:
+		case SCHED_WAITING:
+		case SCHED_IDLE:
 			Serial.print("!");
 			serialFlush();
 			break;
@@ -1347,7 +1354,7 @@ void loop(void)
 #endif
 
 	char task = scheduler.poll();
-	if (-1 < task && task < IDLE) {
+	if (-1 < task && task < SCHED_IDLE) {
 		runScheduler(task);
 	}
 

Mpe/Cassette328P/Cassette328P.ino

@@ -12,8 +12,8 @@ An atmega328p TQFP chip with various peripherals:
 * Voltage is 3.3v and speed 16Mhz, external ceramic resonator.
   Hope this will keep working as such.
 * Arduino library is used while I'm learning from chip datasheets,
-	perhaps where needed there is time for more efficient and low-power
-	implementation.
+  perhaps where needed there is time for more efficient and low-power
+  implementation.
 
 Plans
   - Hookup a low-pass filter and play with PWM, sine generation at D10 (m328p: PB2).
@@ -29,7 +29,8 @@ Free pins
   - D4  PD4
   - D10 PB2 PWM
   - D20 A6 ADC6
-*/
+
+ */
 
 #include <avr/io.h>
 #include <avr/sleep.h>
@@ -40,7 +41,7 @@ Free pins
 #include <Wire.h>
 #include <SPI.h>
 #include <EEPROM.h>
-//include <RF24.h>
+#include <RF24.h>
 //include <LiquidCrystalTmp_I2C.h>
 #include <SimpleFIFO.h> //code.google.com/p/alexanderbrevig/downloads/list
 
@@ -50,8 +51,8 @@ Free pins
 /* *** Globals and sketch configuration *** */
 #define DEBUG           1 /* Enable trace statements */
 #define SERIAL          1 /* Enable serial */
-							
-#define _MEM            1   // Report free memory 
+
+#define _MEM            1   // Report free memory
 //#define LDR_PORT    0   // defined if LDR is connected to a port's AIO pin
 #define _DHT            1
 #define DHT_PIN         14
@@ -60,27 +61,27 @@ Free pins
 #define _LCD84x48       0
 #define _RTC            0
 #define _RFM12          0
-#define _NRF24          0
-							
+#define _NRF24          1
+
 #define REPORT_EVERY    5   // report every N measurement cycles
 #define SMOOTH          5   // smoothing factor used for running averages
 #define MEASURE_PERIOD  50  // how often to measure, in tenths of seconds
 #define DEBUG_MEASURE   1
-							
+
 #define RETRY_PERIOD    10  // how soon to retry if ACK didn't come in
 #define RETRY_LIMIT     5   // maximum number of times to retry
 #define ACK_TIME        10  // number of milliseconds to wait for an ack
-							
+
 #define RADIO_SYNC_MODE 2
-							
+
 #if defined(__AVR_ATtiny84__)
 #define SRAM_SIZE       512
 #elif defined(__AVR_ATmega168__)
 #define SRAM_SIZE       1024
 #elif defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
 #define SRAM_SIZE       2048
 #endif
-							
+
 
 const String sketch = "Cassette328P";
 const int version = 0;
@@ -115,7 +116,7 @@ struct Config {
 
 Config config;
 
-bool loadConfig(Config &c) 
+bool loadConfig(Config &c)
 {
 	int w = sizeof(c);
 
@@ -143,7 +144,7 @@ bool loadConfig(Config &c)
 void writeConfig(Config &c)
 {
 	for (unsigned int t=0; t<sizeof(c); t++) {
-		
+
 		EEPROM.write(CONFIG_START + t, *((char*)&c + t));
 
 		// verify
@@ -168,8 +169,8 @@ static byte reportCount;    // count up until next report, i.e. packet send
 /* Allow invokation of commands with up to 7 args */
 SimpleFIFO<uint8_t,8> cmdseq; //store 10 ints
 
-typedef enum { 
-	cmd_wait_for_command = 0x01,  
+typedef enum {
+	cmd_wait_for_command = 0x01,
 	cmd_stand_by = 0x20,
 	cmd_report_all = 0x10,
 	cmd_read_time = 0x11,
@@ -195,14 +196,14 @@ int service_mode = 0;
 ISR(WDT_vect) { Sleepy::watchdogEvent(); }
 
 /* Roles supported by this sketch */
-typedef enum { 
+typedef enum {
   role_reporter = 1,  /* start enum at 1, 0 is reserved for invalid */
   role_logger
 } Role;
 
-const char* role_friendly_name[] = { 
-  "invalid", 
-  "Reporter", 
+const char* role_friendly_name[] = {
+  "invalid",
+  "Reporter",
   "Logger"
 };
 
@@ -252,9 +253,9 @@ DHT dht(DHT_PIN, DHTTYPE);
 /* *** AVR routines *** {{{ */
 
 int freeRam () {
-	extern int __heap_start, *__brkval; 
+	extern int __heap_start, *__brkval;
 	int v;
-	return (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval); 
+	return (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval);
 }
 
 int usedRam () {
@@ -510,7 +511,7 @@ void i2c_lcd_init()
 	//lcd.noBacklight();
 	lcd.off();
 	//lcd.setBacklight(LED_ON);
-	lcd.leftToRight();	
+	lcd.leftToRight();
 	lcd.noBlink();
 	lcd.noCursor();
 //lcd.createChar(0, bell);
@@ -672,7 +673,7 @@ void initLibs()
 #endif
 #if _DHT
 	dht.begin();
-#if DEBUG 
+#if DEBUG
 	Serial.println("Initialized DHT");
 	float t = dht.readTemperature();
 	Serial.println(t);
@@ -721,7 +722,7 @@ void serialEvent()
  * Using this to wake up chip by hardware jumper.
  * Need to look for an interrupt.
  */
-int serviceMode(void) 
+int serviceMode(void)
 {
 	pinMode(LED_RED, INPUT);
 	digitalWrite( LED_RED, LOW);
@@ -980,7 +981,7 @@ void setup(void)
 	rf12_sleep(RF12_SLEEP); // power down
 
 	/* Read config from memory, or initialize with defaults */
-//	if (!loadConfig(config)) 
+//	if (!loadConfig(config))
 //	{
 //		saveRF24Config(static_config);
 //		config = static_config;

Mpe/Cassette328P/Cassette328P.rst

@@ -12,6 +12,6 @@ modes
   reporter
     rf12, serial
   repeater
-    rf12, 
-    
+    rf12,
+