fixing ram mode (teensy)

#40

Author: neu-rah

lib/readme.txt

@@ -0,0 +1,38 @@
+
+This directory is intended for the project specific (private) libraries.
+PlatformIO will compile them to static libraries and link to executable file.
+
+The source code of each library should be placed in separate directory, like
+"lib/private_lib/[here are source files]".
+
+For example, see how can be organized `Foo` and `Bar` libraries:
+
+|--lib
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |- readme.txt --> THIS FILE
+|- platformio.ini
+|--src
+   |- main.c
+
+Then in `src/main.c` you should use:
+
+#include <Foo.h>
+#include <Bar.h>
+
+// rest H/C/CPP code
+
+PlatformIO will find your libraries automatically, configure preprocessor's
+include paths and build them.
+
+See additional options for PlatformIO Library Dependency Finder `lib_*`:
+
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
+

platformio.ini

@@ -0,0 +1,10 @@
+#
+# PlatformIO Project Configuration File
+#
+# Please make sure to read documentation with examples first
+# http://docs.platformio.org/en/stable/projectconf.html
+#
+[env:nanoatmega328]
+platform = atmelavr
+framework = arduino
+board = nanoatmega328

src/macros.h

@@ -3,13 +3,13 @@
 #ifdef pgm_read_ptr_near
   //storing some values into avr flash memory (saving ram space)
   #define MEMMODE PROGMEM
-  #define pgmPtrNear(addr) pgm_read_ptr_near(addr)
+  #define pgmPtrNear(addr) pgm_read_ptr_near(&(addr))
   #define pgmByteNear(addr) (pgm_read_byte_near(addr))
 #else
   //use ram for non-avr devices
   #define MEMMODE
   #define pgmPtrNear(addr) (addr)
-  #define pgmByteNear(addr) (*addr)
+  #define pgmByteNear(addr) (*(addr))
 #endif
 
 class prompt;

src/menu.cpp

@@ -36,17 +36,15 @@ menuNode* menuNode::activeNode=NULL;
 
 //PROGMEM AUX PRINT
 void print_P(menuOut& s,const char* at) {
-  int len=strlen_P(at);
-  for(;len;len--,at++)
-    s.write(pgmByteNear(at));
+  while(uint8_t ch=pgmByteNear(at++)) s.write(ch);
 }
 
 bool menuOut::needRedraw(menu& m,int i) {
   return
     (drawn!=&m)//menu changed
     ||(top!=lastTop)//screen scrolled
     ||(m.sel!=lastSel&&((i==m.sel)||(i==lastSel)))//selection changed
-    ||((prompt*)pgmPtrNear(&m.data[i]))->needRedraw(*this,i==m.sel);//reflexivity, value changed
+    ||((prompt*)pgmPtrNear(m.data[i]))->needRedraw(*this,i==m.sel);//reflexivity, value changed
   }
 
 //menu navigation engine
@@ -116,7 +114,7 @@ promptFeedback menu::activate(menuOut& p,Stream& c,bool canExit) {
   op=menuKeys(p,c,canExit);
   if (op>=0&&op<sz) {
   	sel=op;
-    prompt* cp=(prompt*)pgmPtrNear(&data[op]);
+    prompt* cp=(prompt*)pgmPtrNear(data[op]);
     if (cp->enabled) {
       printMenu(p,canExit);//clearing old selection
       if (cp->activate(p,c,true)) {

src/menu.h

@@ -169,7 +169,7 @@ v2.1 - Add full support of SetPosition(x,y) to move the menu inside the screen (
     bool canExit;//store last canExit value for inner reference
     menu(const char * text,int sz,prompt* const data[]):menuNode(text),sz(sz),data(data),canExit(false) {}
 
-    inline prompt& operator[](int i) {return *(prompt*)pgmPtrNear(&data[i]);}
+    inline prompt& operator[](int i) {return *(prompt*)pgmPtrNear(data[i]);}
     inline void setPosition(int x,int y) {ox=x;oy=y;}
     int menuKeys(menuOut &p,Stream& c,bool drawExit);
     inline void printMenu(menuOut& p,bool drawExit=false) {

src/menuFields.h

@@ -135,22 +135,22 @@ v2.0 - 	Calling action on every elements
 		menuVariant(T& target,const char *text,unsigned int sz,menuValue<T>* const data[]):
 	    menu(text,sz,(prompt**)data),target(target) {sync();}
 		virtual bool needRedraw(menuOut&p,bool selected) {
-			bool nr=((menuValue<T>*)pgmPtrNear(&data[sel]))->value!=target;//||p.lastSel!=sel;
-			//T v=((menuValue<T>*)pgmPtrNear(&data[sel]))->value;
+			bool nr=((menuValue<T>*)pgmPtrNear(data[sel]))->value!=target;//||p.lastSel!=sel;
+			//T v=((menuValue<T>*)pgmPtrNear(data[sel]))->value;
 			//if (nr) Serial<<"Variant need redraw:"<<*this<<endl<<"value:"<<v<<" target:"<<target<<" sel:"<<sel<<" lastSel:"<<p.lastSel<<endl;;
 			return nr;
 		}
 		void sync() {//if possible make selection match the target value
 			sel=0;
 	  	for(int n=0;n<sz;n++)
-	  		if (((menuValue<T>*)pgmPtrNear(&data[n]))->value==target)
+	  		if (((menuValue<T>*)pgmPtrNear(data[n]))->value==target)
 	  			sel=n;
     }
 		virtual void printTo(menuOut& p) {
 			menuVariant<T>::sync();
 			print_P(p,text);
-			((prompt*)pgmPtrNear(&data[sel]))->printTo(p);
-			//print_P(p,((menuValue<T>*)pgmPtrNear(&data[sel]))->text);
+			((prompt*)pgmPtrNear(data[sel]))->printTo(p);
+			//print_P(p,((menuValue<T>*)pgmPtrNear(data[sel]))->text);
 		}
   };
 
@@ -164,8 +164,8 @@ v2.0 - 	Calling action on every elements
 			menuVariant<T>(target,text,sz,data) {menuVariant<T>::sync();}
 		virtual bool needRedraw(menuOut&p,bool selected) {
 			if (selected) {
-				bool nr=lastDrawnOp!=menu::sel;//||((menuValue<T>*)pgmPtrNear(&menu::data[menu::sel]))->value==menuVariant<T>::target;
-				//T v=((menuValue<T>*)pgmPtrNear(&menu::data[menu::sel]))->value;
+				bool nr=lastDrawnOp!=menu::sel;//||((menuValue<T>*)pgmPtrNear(menu::data[menu::sel]))->value==menuVariant<T>::target;
+				//T v=((menuValue<T>*)pgmPtrNear(menu::data[menu::sel]))->value;
 				//if (nr) Serial<<"Variant need redraw:"<<*this<<endl
 				/*Serial
 					<<"       value:"<<v<<endl
@@ -178,13 +178,13 @@ v2.0 - 	Calling action on every elements
 				lastDrawnOp=menu::sel;
 				return nr;
 			}
-			return ((menuValue<T>*)pgmPtrNear(&menu::data[menu::sel]))->value!=menuVariant<T>::target;
+			return ((menuValue<T>*)pgmPtrNear(menu::data[menu::sel]))->value!=menuVariant<T>::target;
 		}
 		virtual void printTo(menuOut& p) {
 			//Serial<<"drawing menuSelect"<<endl;
 			print_P(p,menu::text);
 			p.print(menu::activeNode==this?':':' ');
-			((prompt*)pgmPtrNear(&menu::data[menu::sel]))->printTo(p);
+			((prompt*)pgmPtrNear(menu::data[menu::sel]))->printTo(p);
 		}
 		promptFeedback activate(menuOut& p,Stream& c,bool) {
 			if (menu::activeNode!=this) {
@@ -203,7 +203,7 @@ v2.0 - 	Calling action on every elements
 			if (op>=0&&op<this->menu::sz) {
 				//Serial<<"Selecting op:"<<op<<endl;
 				this->menu::sel=op;
-				menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(&this->menu::data[op]);
+				menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(this->menu::data[op]);
 				if (cp->enabled) {
 					this->menuVariant<T>::target=cp->value;
 					cp->activate(p,c,true);
@@ -240,7 +240,7 @@ v2.0 - 	Calling action on every elements
 			op=menu::menuKeys(p,c,false);
 			if (op>=0&&op<this->menu::sz) {
 				this->menu::sel=op;
-				menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(&this->menu::data[op]);
+				menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(this->menu::data[op]);
 				if (cp->enabled) {
 					this->menuVariant<T>::target=cp->value;
 					cp->activate(p,c,true);
@@ -264,7 +264,7 @@ v2.0 - 	Calling action on every elements
 			this->menu::sel++;
 			if (this->menu::sel>=this->menu::sz) this->menu::sel=0;
 		 	p.lastSel=-1;//redraw only affected option
-			menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(&this->menu::data[menu::sel]);
+			menuValue<T>* cp=(menuValue<T>*)pgmPtrNear(this->menu::data[menu::sel]);
 			this->menuVariant<T>::target=cp->value;
 			cp->activate(p,c,true);
 			return 0;

src/menuGFX.h

@@ -79,7 +79,7 @@ www.r-site.net
 			int i=top;for(;i<m.sz;i++) {
 				  if(i-top>=maxY) break;
 				  if (needRedraw(m,i)) {
-				  	printPrompt(*(prompt*)pgmPtrNear(&m.data[i]),i==m.sel,i+1,0,i-top,m.width);
+				  	printPrompt(*(prompt*)pgmPtrNear(m.data[i]),i==m.sel,i+1,0,i-top,m.width);
 				  }
 			}
 			if (drawExit&&i-top<maxY&&needRedraw(m,i))

src/menuLCD.h

@@ -44,7 +44,7 @@ www.r-site.net
 			int i=0;for(;i<m.sz;i++) {
 				if ((i>=top)&&((i-top)<maxY)) {
 				  if (needRedraw(m,i)) {
-				  	printPrompt(*(prompt*)pgmPtrNear(&m.data[i]),i==m.sel,i+1,0,i-top,m.width);
+				  	printPrompt(*(prompt*)pgmPtrNear(m.data[i]),i==m.sel,i+1,0,i-top,m.width);
 				  }
 				}
 			}

src/menuLCDs.h

@@ -44,7 +44,7 @@ www.r-site.net
 			int i=top;for(;i<m.sz;i++) {
 			  if(i-top>=maxY) break;
 			  if (needRedraw(m,i))
-			  	printPrompt(*(prompt*)pgmPtrNear(&m.data[i]),i==m.sel,i+1,i-top,m.width);
+			  	printPrompt(*(prompt*)pgmPtrNear(m.data[i]),i==m.sel,i+1,i-top,m.width);
 			}
 			if (drawExit&&i-top<maxY&&needRedraw(m,i))
 				printPrompt(menu::exitOption,m.sel==m.sz,0,i-top,m.width);

src/menuPrint.h

@@ -35,7 +35,7 @@ www.r-site.net
 			clear();
 			int i=0;
 			for(;i<m.sz;i++)
-			  printPrompt(*(prompt*)pgmPtrNear(&m.data[i]),i==m.sel,i+1,i-top,0,m.width);
+				printPrompt(*(prompt*)pgmPtrNear(m.data[i]),i==m.sel,i+1,i-top,0,m.width);
 			if (drawExit) printPrompt(menu::exitOption,m.sel==m.sz,i,0,i-top,m.width);
 			lastTop=top;
 			lastSel=m.sel;