 #include <SALT_FETs.h>
 #include <NAP_pod_load_defs.h>
 
-/**
- * These are the addresses of the I2C devices which drive the related
- * Core DB15 connector and the Core FETs
- * @TODO make these addresses manifest constants in some appropriate way; put them in a common .h file somewhere if they are needed in more than one file
- */
-#define I2C_J2 0x1B
-#define I2C_J3 0x1A
-#define I2C_J4 0x19
-
-// TODO: move to common .h file
-#define JX_LED_ON	false		// yes, opposite to the other bits.  writing a 1 to the 9557 output register
-#define JX_LED_OFF	true		// turns the output FET OFF
-
-
-/**
- *  These are signal names specific to our custom SALT2 hardware; TODO: move to common .h file
- */
-
-// SALT2 Core SDOUT on J2,3,4 pins 1/2 to '595 SDIN of DC and AC boards: 9557 IO7, 0x80 
-// output from 9557 to '595 Din
-#define SDOUT BIT7 	// 0x80
-
-// SALT2 Core SCLK on J2,3,4 pins 5/6 to '595 and '165 SCLK of DC and AC boards: 9557 IO6, 0x40,
-// serial clock, used by both 595 and 165
-#define SCLK BIT6	// 0x40
-
-// SALT2 J2,3,4 pins 9/10 to '165 Shift/Load of DC boards: Core SH/LD is 9557 IO5, 0x20
-// SHIFT(H), LOAD(L) only used by DC board '165
-#define SHIFT165 BIT5	// 0x20
-
-// SALT2 Core SDIN on J2,3,4 pins 3/4 from '165 SDOUT of DC boards: 9557 IO4, 0x10 
-// input to 9577 from '165 Qout
-#define SDIN BIT4	// 0x10
-
-// SALT2 RCLK on J2,3,4 pins 7/8 to DC and AC boards '595 RCLK: 9557 IO3, 0x08 
-// only used by '595, must idle high
-#define RCLK595 BIT3	// 0x08		
-
-// bits 1 and 2 (0x02, 0x04) not connected
-
-// SALT2 yellow LED for J2,3,4 intended to show activity on that port: 9557 IO0, 0x01 
-// open drain, SETTING (yes, opposite to the other bits) this bit drives output low = LED on
-#define LED BIT0	// 0x01
-
-
-
-
-/**
- *  bit 5 is input; bits 2 and 1 are not connected, Bit 0 is the activity LED for that device
- *  so this mask has a '1' for every bit which is used as output
- *  Note: enclosing parentheses are required to force the '~' operator to operate on the whole quantity
- *  not just the first manifest constant! TODO: move to common .h file
- */
-#define OUTMASK (RCLK595 | SCLK | SDOUT | SHIFT165 | LED)
-
-/**
- *  Only one actual input, serial data in; TODO: move to common .h file
- */
-#define INMASK (SDIN)
-
 #ifdef USE_CLASS
 SALT_JX coreJ2 (2);
 //SALT_JX coreJ3 (3);

	/**
	* Start, now inits invert and output bit enable, clears outputs
	*/
	coreJ2reg.begin();
	coreJ3reg.begin();
	coreJ4reg.begin();
//	coreFETreg.begin();
	
	// outmask, outdata, inputinvert
//	coreJ2reg.init(OUTMASK, (SCLK | RCLK595 | LED), 0);
//	coreJ3reg.init(OUTMASK, (SCLK | RCLK595 | LED), 0);
//	coreJ4reg.init(OUTMASK, (SCLK | RCLK595 | LED), 0);

	coreFETs.init ();

#ifdef USE_CLASS

extern void J2_update (void);
extern void J3_update (void);
extern void J4_update (void);
extern void JX_init (void);
extern struct J_data J2_data, J3_data, J4_data;
#endif

