@Martin *******
, if you have a year long, multi-entry Non-B visa that you got from a thai consulate in another country and your current 90 day entry stamp is running out you are indeed covered by the amnesty for a stay no longer than the 31st of July.
You need to pay attention to the border openings and the news as far as what amnesty holders do once that happens..