fixed ATmega328 pcint tables

Author: neu-rah

README.md

@@ -9,7 +9,7 @@ Works either over serial or with LCD + encoder
 V2.0 
 
 main changes:
-	- non-blocking menu mode
+	- non-blocking menu main cycle
 	- Menufields as menu prompts with associated value
 		values can be:
 			numeric withing range
@@ -23,45 +23,45 @@ notes:
 -------------------------------------------------------------------------------
 example of menu definition (c++ macros)
 
-		//a submenu
-		MENU(ledMenu,"LED on pin 13",
-			OP("LED On",ledOn),
-			OP("LED Off",ledOff)
-		);
-		
-		//field value toggle on click
-		TOGGLE(targetVar,trigModes,"Mode: ",
-			VALUE("None",trigPoint::None),
-			VALUE("On rise",trigPoint::onRise),
-			VALUE("On fall",trigPoint::onFall),
-			VALUE("Both",trigPoint::isIn)
-		);
-		
-		//field value, click to browse, click to choose
-		CHOOSE(adc_prescale,sample_clock,"Sample clock",
-			VALUE("/128",avrADC::clk_128,setADCClk),
-			VALUE("/64",avrADC::clk_64,setADCClk),
-			VALUE("/32",avrADC::clk_32,setADCClk),
-			VALUE("/16",avrADC::clk_16,setADCClk),
-			VALUE("/8",avrADC::clk_8,setADCClk),
-			VALUE("/4",avrADC::clk_4,setADCClk),
-			VALUE("/2",avrADC::clk_2,setADCClk)
-		);
-
-		//the main menu...
-		//Fields are numeric and show selected value. click to start change, click to fine tune, click to end
-		MENU(mainMenu,"Main menu",
-		  FIELD(frequency,"Freq","Hz",0,16000000,100,1,updateFreq),
-		  FIELD(dutty,"Duty","%",0,100,1,0,updateDutty),
-			OP("Handler test",completeHandlerTest),
-			SUBMENU(trigModes),
-			SUBMENU(ledMenu)
-		);
+	//a submenu
+	MENU(ledMenu,"LED on pin 13",
+		OP("LED On",ledOn),
+		OP("LED Off",ledOff)
+	);
+
+	//field value toggle on click
+	TOGGLE(targetVar,trigModes,"Mode: ",
+		VALUE("None",trigPoint::None),
+		VALUE("On rise",trigPoint::onRise),
+		VALUE("On fall",trigPoint::onFall),
+		VALUE("Both",trigPoint::isIn)
+	);
+
+	//field value, click to browse, click to choose
+	CHOOSE(adc_prescale,sample_clock,"Sample clock",
+		VALUE("/128",avrADC::clk_128,setADCClk),
+		VALUE("/64",avrADC::clk_64,setADCClk),
+		VALUE("/32",avrADC::clk_32,setADCClk),
+		VALUE("/16",avrADC::clk_16,setADCClk),
+		VALUE("/8",avrADC::clk_8,setADCClk),
+		VALUE("/4",avrADC::clk_4,setADCClk),
+		VALUE("/2",avrADC::clk_2,setADCClk)
+	);
+
+	//the main menu...
+	//Fields are numeric and show selected value. click to start change, click to fine tune, click to end
+	MENU(mainMenu,"Main menu",
+		FIELD(frequency,"Freq","Hz",0,16000000,100,1,updateFreq),
+		FIELD(dutty,"Duty","%",0,100,1,0,updateDutty),
+		OP("Handler test",completeHandlerTest),
+		SUBMENU(trigModes),
+		SUBMENU(ledMenu)
+	);
 
 -------------------------------------------------------------------------------
 syntax:
 
-	OP(name,function)
+  OP(name,function)
 		name string to be shown as menu option prompt
 		function to be called on click
 

examples/gfx_menu/gfx_menu.ino

@@ -14,22 +14,35 @@ ruihfazevedo@[email protected]
 #include <Adafruit_ST7735.h> // Hardware-specific library
 #include <menuGFX.h>
 
-///////////////////////////////////////////////////////////////////////////
-//TFT + SD
-#define sdCS  9
-#define tftCS 8
-#define dc    6
-#define rst   7
+#if defined(__AVR_ATmega2560__)
+  ///////////////////////////////////////////////////////////////////////////
+  //TFT + SD
+  //#define sdCS  9//not using SD card
+  #define tftCS 8
+  #define dc    6
+  #define rst   7
+  ////////////////////////////////////////////
+  // ENCODER (aka rotary switch) PINS
+  #define encA 12
+  #define encB 10
+  #define encBtn 13
+#elif defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
+  ///////////////////////////////////////////////////////////////////////////
+  //TFT + SD
+  //#define sdCS  9//not using SD card
+  #define tftCS 10
+  #define dc    7
+  #define rst   8
+  ////////////////////////////////////////////
+  // ENCODER (aka rotary switch) PINS
+  #define encA A2
+  #define encB A1
+  #define encBtn A3
+#else
+  #error "Uknown pinout"
+#endif
 
 Adafruit_ST7735 tft(tftCS, dc, rst);
-
-////////////////////////////////////////////
-// ENCODER (aka rotary switch) PINS
-// mega 2560
-#define encA 10
-#define encB 12
-#define encBtn 13
-
 ///////////////////////////////////////////////////////////////////////////
 //functions to wire as menu actions
 

pcint.h

@@ -36,9 +36,8 @@ Nov.2014 large changes
 	#endif
 
 	#define digitalPinFromPCINTSlot(slot,bit) pgm_read_byte(pcintPinMap+(((slot)<<3)+(bit)))
-	#define pcintPinMapBank(slot) ((uint8_t*)(pcintPinMap+((slot)<<3)))
-	#define digitalPinFromPCINTBank(bank,bit) pgm_read_byte(bank+bit)
-
+	#define pcintPinMapBank(slot) ((uint8_t*)((uint8_t*)pcintPinMap+((slot)<<3)))
+	#define digitalPinFromPCINTBank(bank,bit) pgm_read_byte((uint8_t*)bank+bit)
 
 	//this handler can be used instead of any void(*)() and optionally it can have an associated void *
 	//and use it to call void(*)(void* payload)
@@ -62,12 +61,12 @@ Nov.2014 large changes
 
 	static int PCintMode[3][8];
 	static HANDLER_TYPE PCintFunc[3][8];
-	static uint8_t PCintLast[3][8];
+	static bool PCintLast[3][8];//?we can use only 3 bytes... but will use more processing power calculating masks
 
 	/*
 	 * attach an interrupt to a specific pin using pin change interrupts.
 	 */
-	void PCattachInterrupt(uint8_t pin, class mixHandler userFunc, int mode) {
+	void PCattachInterrupt(uint8_t pin, class mixHandler userFunc, uint8_t mode) {
 		volatile uint8_t *pcmask=digitalPinToPCMSK(pin);
 		if (!pcmask) return;//runtime checking if pin has PCINT, i would prefer a compile time check
 		uint8_t bit = digitalPinToPCMSKbit(pin);
@@ -93,24 +92,24 @@ Nov.2014 large changes
 		  PCICR &= ~(1<<digitalPinToPCICRbit(pin));
 	}
 
-        volatile int x=0;
 	// common code for isr handler. "port" is the PCINT number.
 	// there isn't really a good way to back-map ports and masks to pins.
 	// here we consider only the first change found ignoring subsequent, assuming no interrupt cascade
 	static void PCint(uint8_t port) {
 		const uint8_t* map=pcintPinMapBank(port);//get 8 bits pin change map
 		for(int i=0;i<8;i++) {
-			uint8_t p=digitalPinFromPCINTBank(map,i);
-			if (p==-1) continue;//its not assigned
+    	uint8_t p=digitalPinFromPCINTBank(map,i);
+			if (p==-1)
+			  continue;//its not assigned
 			//uint8_t bit = digitalPinToPCMSKbit(p);
 			//uint8_t mask = (1<<bit);
 			if (PCintFunc[port][i]!=NULL) {//only check active pins
-				uint8_t stat=(*portInputRegister(digitalPinToPort(p)))&digitalPinToBitMask(p);
+				bool stat=(*portInputRegister(digitalPinToPort(p)))&digitalPinToBitMask(p);
 				if (PCintLast[port][i]^stat) {//pin changed!
- 				  PCintLast[port][i]=stat;
+				  PCintLast[port][i]=stat;//register change
 					if (
-            PCintMode[port][i]==CHANGE
-            || (stat&&(PCintMode[port][i]==RISING))
+            (PCintMode[port][i]==CHANGE)
+            || ((stat)&&(PCintMode[port][i]==RISING))
             || ((!stat)&&(PCintMode[port][i]==FALLING))
 		      ) {
 	 				  PCintFunc[port][i]();