Add support for 24LC256 memory

Now I have two memories with the same i2c address,
so I couldn't identify them by their address anymore.
The easiest way to solve this was to just introduce the name
of the memory each time by hand in the cli, and then verify
in the uC that the corresponding i2c device is alive.

Author: feer9

eeprom_programmer_PC/eeprom-programmer.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 6.0.2, 2022-03-23T00:50:34. -->
+<!-- Written by QtCreator 6.0.2, 2022-03-24T00:36:43. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

eeprom_programmer_PC/src/app.h

@@ -28,6 +28,7 @@ class App: public MemoryComm
 		ST_DISCONNECTED,
 		ST_INIT,
 		ST_IDLE,
+		ST_MEMID,
 		ST_PING,
 		ST_WAIT_READMEM,
 		ST_WAIT_WRITEMEM
@@ -64,6 +65,7 @@ private slots:
 	QString m_filename_out = "mem_out.bin";
 	void setSignals();
 	bool doSomething();
+	void retryConnection();
 };
 
 // m_ = member

eeprom_programmer_PC/src/app_.cpp

@@ -76,6 +76,7 @@ bool App::doSomething()
 		if(!App::writeMem()) {
 			m_currentOperation = OP_NONE;
 			m_xferState = ST_IDLE;
+			QCoreApplication::exit(1);
 		}
 		break;
 
@@ -100,6 +101,14 @@ bool App::doSomething()
 	return m_currentOperation != OP_NONE;
 }
 
+void App::retryConnection()
+{
+	clearBuffers();
+	m_xferState = ST_DISCONNECTED;
+	m_connected = false;
+	QTimer::singleShot(1000, this, &App::reconnect);
+}
+
 void App::handleXfer(pkgdata_t *pkg) {
 	// TODO: handle error packages
 
@@ -119,13 +128,26 @@ void App::handleXfer(pkgdata_t *pkg) {
 		if(pkg->cmd == CMD_INIT) {
 			m_standardOutput << "Connected to uC." << Qt::endl;
 			m_connected = true;
+			m_xferState = ST_MEMID;
+			sendCommand_memid();
+		}
+		else {
+			m_standardOutput << "Could not connect to uC" << Qt::endl;
+			retryConnection();
+		}
+		break;
+
+	case ST_MEMID:
+		if(!pkg)
+			break;
+
+		if(pkg->cmd == CMD_OK) {
 			m_xferState = ST_IDLE;
 			doSomething();
 		}
 		else {
-			m_standardOutput << "Could not connect to uC" << Qt::endl;
-			clearBuffers();
-			m_xferState = ST_DISCONNECTED;
+			printError(pkg);
+			QCoreApplication::exit(1);
 		}
 		break;
 
@@ -144,8 +166,7 @@ void App::handleXfer(pkgdata_t *pkg) {
 		}
 		else {
 			m_standardOutput << "Connection error" << Qt::endl;
-			m_connected = false;
-			m_xferState = ST_DISCONNECTED;
+			retryConnection();
 		}
 		break;
 
@@ -154,36 +175,40 @@ void App::handleXfer(pkgdata_t *pkg) {
 		if(!pkg)
 			break;
 
+		m_currentOperation = OP_NONE;
 		if(pkg->cmd == CMD_MEMDATA) {
 			// finished receiving memory data
 			m_memBuffer = pkg->data;
 			printData();
 			saveData();
-			m_currentOperation = OP_NONE;
+			m_xferState = ST_IDLE;
+			QTimer::singleShot(50, qApp, SLOT(quit()));
 		}
 		else {
 			printError(pkg);
+			setNextOperation(OP_RX);
+			doSomething();
 		}
-		clearBuffers();
-		m_xferState = ST_IDLE;
-QTimer::singleShot(50, qApp, SLOT(quit()));
+//		clearBuffers();
 		break;
 
 	case ST_WAIT_WRITEMEM: // requested eeprom full write - waiting confirmation
 
 		if(!pkg)
 			break;
 
+		m_currentOperation = OP_NONE;
 		if(pkg->cmd == CMD_TXRX_DONE) {
 			m_standardOutput << "Memory write SUCCESSFULLY" << Qt::endl;
-			m_currentOperation = OP_NONE;
+			m_xferState = ST_IDLE;
+			QTimer::singleShot(50, qApp, SLOT(quit()));
 		}
 		else {
 			printError(pkg);
+			setNextOperation(OP_TX);
+			doSomething();
 		}
-		clearBuffers();
-		m_xferState = ST_IDLE;
-QTimer::singleShot(50, qApp, SLOT(quit()));
+//		clearBuffers();
 		break;
 
 	default:

eeprom_programmer_PC/src/memorycomm.cpp

@@ -123,6 +123,7 @@ bool MemoryComm::writeMem(const QByteArray& memBuffer) {
 	m_memindex = 0;
 	m_memBuffer = memBuffer; // CHECK HOW THIS WORKS
 
+	m_buffer.clear();
 	m_serialPortReader.clearBuffer();
 	m_serialPort.clear(QSerialPort::Input);
 
@@ -136,6 +137,11 @@ bool MemoryComm::sendMemoryBlock() {
 	return sendCommand(CMD_MEMDATA, m_memBuffer.mid(memidx, PKG_DATA_MAX));
 }
 
+bool MemoryComm::sendCommand_memid() {
+	return sendCommand(CMD_MEMID, m_memtype);
+}
+
+
 bool MemoryComm::sendCommand_ping(void) {
 	return sendCommand(CMD_PING);
 }

eeprom_programmer_PC/src/memorycomm.h

@@ -54,6 +54,7 @@ class MemoryComm : public QCoreApplication, public EEPROM
 	bool writeMem(const QByteArray& memBuffer);
 	bool readMem(void);
 	bool sendCommand_ping(void);
+	bool sendCommand_memid(void);
 	bool sendCommand(commands_e cmd);
 	bool sendCommand(commands_e cmd, uint8_t data);
 	bool sendCommand(commands_e cmd, const QByteArray& data);

eeprom_programmer_STM32/.gitignore

@@ -1 +1,2 @@
 Debug 
+/Release/

eeprom_programmer_STM32/.settings/language.settings.xml

@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1155191438658769878" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1833027373205504229" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1155191438658769878" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1833027373205504229" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

eeprom_programmer_STM32/Core/Inc/main.h

@@ -53,9 +53,8 @@ enum memtype_e {
 // 24LC256 NOT SUPPORTED!!!
 typedef enum memtype_e memtype_t;
 
-extern uint32_t g_memsize;
+extern uint16_t g_memsize;
 extern enum memtype_e g_memtype;
-//extern uint8_t membuffer[];
 extern uint8_t g_buffer[];
 
 extern I2C_HandleTypeDef hi2c2;
@@ -148,19 +147,15 @@ void Error_Handler(void);
 
 /* USER CODE BEGIN EFP */
 
+
+HAL_StatusTypeDef EEPROM_InitMemory(enum memtype_e dev_id);
+uint16_t EEPROM_getMemSize(enum memtype_e memtype);
 int EEPROM_write(memtype_t device, const uint8_t *buffer, uint16_t register_base, uint16_t size);
-int EEPROM_write_page(memtype_t device, const uint8_t *pagebuffer, uint16_t register_address);
-int EEPROM_write_reg(memtype_t device, uint8_t reg, uint16_t register_address);
+int EEPROM_writePage(memtype_t device, const uint8_t *pagebuffer, uint16_t register_address);
+int EEPROM_writeReg(memtype_t device, uint8_t reg, uint16_t register_address);
 int EEPROM_read(memtype_t device, uint8_t *buffer, uint16_t register_base, uint16_t size);
-int EEPROM_read_page(memtype_t device, uint8_t *pagebuffer, uint16_t register_address);
-int EEPROM_read_reg(memtype_t device, uint8_t *reg, uint16_t register_address);
-
-int MEMX24645_write_page(const uint8_t *page, uint16_t register_address);
-int MEMX24645_write(const uint8_t *buffer, uint16_t register_base, uint16_t size);
-int MEMX24645_write_reg(uint8_t reg, uint16_t register_address);
-int MEMX24645_read_reg(uint8_t *reg, uint16_t register_address);
-int MEMX24645_read_page(uint8_t *page, uint16_t register_address);
-int MEMX24645_read(uint8_t *buf, uint16_t register_base, uint16_t size);
+int EEPROM_readPage(memtype_t device, uint8_t *pagebuffer, uint16_t register_address);
+int EEPROM_readReg(memtype_t device, uint8_t *reg, uint16_t register_address);
 
 int serial_write(const uint8_t *data, uint16_t len);
 int serial_writebyte(uint8_t byte);
@@ -195,8 +190,6 @@ HAL_StatusTypeDef sendPackage(uint8_t cmd, uint8_t *data, uint16_t len);
 HAL_StatusTypeDef receivePackage(package_t *pkg);
 HAL_StatusTypeDef try_receive(package_t *pkg);
 
-uint32_t getMemSize(enum memtype_e memtype);
-
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/

eeprom_programmer_STM32/Core/Src/AP_application.c

@@ -23,30 +23,30 @@
 /*
  * Electrical connections:
  *
- * I2C2:
- * 	 SCL: PB10
- * 	 SDA: PB11
+ * uC I2C2:
+ * 	 PB10: SCL
+ * 	 PB11: SDA
  *
  * EEPROM (DIP-8):
- * 	 1: GND
- * 	 2: GND
- * 	 3: VCC
- * 	 4: GND
- * 	 5: SDA
- * 	 6: SCL
- * 	 7: GND
- * 	 8: VCC
+ * 	 1.  A0: GND
+ * 	 2.  A1: GND
+ * 	 3.  A2: VCC
+ * 	 4. Vss: GND
+ * 	 5. SDA: SDA
+ * 	 6. SCL: SCL
+ * 	 7.  WP: GND
+ * 	 8. Vcc: Vcc
  *
- * Add a  10kohm pullup resistor on SCL and SDA
+ * Add a pullup resistor on SCL and SDA.
+ * For 100kHz as used here, 10kOhm should do.
+ * If changed to 400kHz or 1MHz, use a 2kOhm resistor (or similar)
  */
 
 #define SEND(x) do {if((x) != HAL_OK) return HAL_ERROR;} while(0)
 #define RECV(x) do {if((x) != HAL_OK) return HAL_ERROR;} while(0)
 
 static int cmdHasData(uint8_t command);
 
-enum memtype_e g_memtype = MEMTYPE_NONE;
-uint32_t       g_memsize = 0UL;
 uint8_t        g_buffer[PKG_DATA_MAX];
 
 
@@ -152,7 +152,6 @@ int cmdHasData(command_t command) {
 	return 0;
 }
 
-
 static errorcode_t sendMemoryBlock(uint8_t cmd, uint16_t offset)
 {
 //	package_t pkg;
@@ -215,11 +214,11 @@ void uart_fsm(void)
 	static uint16_t mem_idx = 0;
 	HAL_StatusTypeDef ret;
 
-	if(HAL_GetTick() > timeout) {
-		if(st != 0) {
+	if(st != 0 && HAL_GetTick() > timeout) {
+
 			sendErr(ERROR_TIMEOUT);
 			st = 0;
-		}
+
 	}
 
 	switch (st)
@@ -233,12 +232,28 @@ void uart_fsm(void)
 			if(package.cmd == CMD_INIT) {
 				sendCommand(CMD_INIT);
 				led_on();
-				st++;
+				st = CMD_MEMID;
 				timeout = HAL_GetTick()+TIMEOUT_MS;
 			}
 		}
 		break;
 
+	case CMD_MEMID:
+		ret = receivePackage(&package);
+		if(ret == HAL_OK && package.cmd == CMD_MEMID)
+		{
+			enum memtype_e memid = package.data[0];
+			if(EEPROM_InitMemory(memid) == HAL_OK) {
+				sendCommand(CMD_OK);
+				st = 1;
+			}
+			else {
+				sendErr(ERROR_MEMID);
+				st = 0;
+			}
+		}
+		break;
+
 	case 1: /* waiting to receive a package */
 		ret = receivePackage(&package);
 		if(ret != HAL_OK)
@@ -378,11 +393,6 @@ void uart_fsm(void)
 		st = 1;
 		break;
 
-	case CMD_MEMID:
-		sendCommandWithData(CMD_DATA, g_memtype);
-		st = 1;
-		break;
-
 	case CMD_DISCONNECT:
 		st = 0;
 		break;